6 files changed, 129 insertions, 91 deletions

diff --git a/security/monkeysphere/Makefile b/security/monkeysphere/Makefile
index ad782216af45..f7437fc98a79 100644
--- a/security/monkeysphere/Makefile
+++ b/security/monkeysphere/Makefile
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	monkeysphere
-PORTVERSION=	0.24
+PORTVERSION=	0.36
 CATEGORIES=	security
 MASTER_SITES=	http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
 # hack for debian orig tarballs
 DISTFILES=	${PORTNAME}_${DISTVERSION}.orig.tar.gz
 
-MAINTAINER=	dkg@fifthhorseman.net
+MAINTAINER=	anarcat@koumbit.org
 COMMENT=	Use the OpenPGP web of trust to verify ssh connections
 
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1 \
@@ -17,20 +17,17 @@ RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1 \
 		p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
 		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 
-MAN1=		monkeysphere.1 openpgp2ssh.1 pem2openpgp.1
-MAN7=		monkeysphere.7
-MAN8=		monkeysphere-host.8 monkeysphere-authentication.8
-MANCOMPRESSED=	yes
+USES=		shebangfix
+SHEBANG_FILES=	src/share/keytrans
 
 USERS=	monkeysphere
 GROUPS=	monkeysphere
 
-MAKE_ARGS=	ETCPREFIX=${PREFIX} MANPREFIX=${PREFIX}/man ETCSUFFIX=.sample
+MAKE_ARGS+=	ETCPREFIX=${PREFIX} MANPREFIX=${PREFIX}/man ETCSUFFIX=.sample
 
-NO_STAGE=	yes
 # use proper system paths for FreeBSD instead of debian's:
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/monkeysphere|/usr/local/etc/monkeysphere|g' \
+	@${REINPLACE_CMD} -e 's|/etc/monkeysphere|${LOCALBASE}/etc/monkeysphere|g' \
 	  ${WRKSRC}/src/share/defaultenv \
 	  ${WRKSRC}/src/transitions/0.23 \
 	  ${WRKSRC}/man/man1/monkeysphere.1 \
@@ -43,8 +40,7 @@ post-patch:
 	  ${WRKSRC}/man/man8/monkeysphere-authentication.8 \
 	  ${WRKSRC}/man/man8/monkeysphere-host.8 \
 	  ${WRKSRC}/src/monkeysphere-host \
-	  ${WRKSRC}/src/monkeysphere-authentication \
-	  ${WRKSRC}/doc/getting-started-admin.mdwn
+	  ${WRKSRC}/src/monkeysphere-authentication
 	@${REINPLACE_CMD} -e 's|/usr/share/monkeysphere|/usr/local/share/monkeysphere|g' \
 	  ${WRKSRC}/src/monkeysphere-host \
 	  ${WRKSRC}/src/monkeysphere-authentication \
@@ -52,18 +48,4 @@ post-patch:
 	# and clean up cruft from the sed replacements:
 	${FIND} ${WRKSRC} -name '*.bak' -delete
 
-post-install:
-	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere.conf ]; then \
-		${CP} -p ${PREFIX}/etc/monkeysphere/monkeysphere.conf.sample ${PREFIX}/etc/monkeysphere/monkeysphere.conf ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere-host.conf ]; then \
-		${CP} -p ${PREFIX}/etc/monkeysphere/monkeysphere-host.conf.sample ${PREFIX}/etc/monkeysphere/monkeysphere-host.conf ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere-authentication.conf ]; then \
-		${CP} -p ${PREFIX}/etc/monkeysphere/monkeysphere-authentication.conf.sample ${PREFIX}/etc/monkeysphere/monkeysphere-authentication.conf ; \
-	fi
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-
 .include <bsd.port.mk>
diff --git a/security/monkeysphere/distinfo b/security/monkeysphere/distinfo
index fa4d9dffb074..0410cca4908a 100644
--- a/security/monkeysphere/distinfo
+++ b/security/monkeysphere/distinfo
@@ -1,2 +1,2 @@
-SHA256 (monkeysphere_0.24.orig.tar.gz) = 2a58cee998ddb1b21b953826fc746a743e17d94e6fa34ac9cbee4262873b5c5f
-SIZE (monkeysphere_0.24.orig.tar.gz) = 86044
+SHA256 (monkeysphere_0.36.orig.tar.gz) = 6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7
+SIZE (monkeysphere_0.36.orig.tar.gz) = 98876
diff --git a/security/monkeysphere/files/patch-Makefile b/security/monkeysphere/files/patch-Makefile
new file mode 100644
index 000000000000..4a8bc6da61eb
--- /dev/null
+++ b/security/monkeysphere/files/patch-Makefile
@@ -0,0 +1,56 @@
+--- Makefile.orig	2013-07-11 14:07:53.000000000 -0400
++++ Makefile	2014-05-01 11:16:46.000000000 -0400
+@@ -42,16 +42,16 @@
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+ 	printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
+ 	install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
++	sed -i'' -e  's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
+ 	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
++	sed -i'' -e  's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
+ 	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
++	sed -i'' -e  's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
+ 	install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0755 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
+-	sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
+-	sed -i 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
++	sed -i'' -e  's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
++	sed -i'' -e  's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
+ 	install -m 0755 src/share/checkperms $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0755 src/share/keytrans $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/pem2openpgp
+@@ -59,8 +59,8 @@
+ 	ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2pem
+ 	ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2spki
+ 	install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28
++	sed -i'' -e  's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23
++	sed -i'' -e  's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28
+ 	install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+ 	install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
+ 	install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
+@@ -82,15 +82,15 @@
+ 	ln -s openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1/openpgp2spki.1.gz
+ 	gzip -d man/*/*
+ 	gzip -d $(DESTDIR)$(MANPREFIX)/man1/monkeysphere.1.gz
+-	sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man1/monkeysphere.1
++	sed -i'' -e  's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man1/monkeysphere.1
+ 	gzip -n $(DESTDIR)$(MANPREFIX)/man1/monkeysphere.1
+ 	gzip -d $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-host.8.gz
+-	sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-host.8
+-	sed -i 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-host.8
++	sed -i'' -e  's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-host.8
++	sed -i'' -e  's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-host.8
+ 	gzip -n $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-host.8
+ 	gzip -d $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-authentication.8.gz
+-	sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-authentication.8
+-	sed -i 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-authentication.8
++	sed -i'' -e  's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-authentication.8
++	sed -i'' -e  's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-authentication.8
+ 	gzip -n $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-authentication.8
+ 
+ # this target depends on you having the monkeysphere-docs
diff --git a/security/monkeysphere/files/patch-src_monkeysphere-host b/security/monkeysphere/files/patch-src_monkeysphere-host
deleted file mode 100644
index 9414c7355010..000000000000
--- a/security/monkeysphere/files/patch-src_monkeysphere-host
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/monkeysphere-host
-+++ src/monkeysphere-host
-@@ -103,7 +103,7 @@ update_gpg_pub_file() {
- load_fingerprint() {
-     if [ -f "$HOST_KEY_FILE" ] ; then
- 	HOST_FINGERPRINT=$( \
--	    (FUBAR=$(mktemp -d) && export GNUPGHOME="$FUBAR" \
-+	    (FUBAR=$(msmktempdir) && export GNUPGHOME="$FUBAR" \
- 	    && gpg --quiet --import \
- 	    && gpg --quiet --list-keys --with-colons --with-fingerprint \
- 	    && rm -rf "$FUBAR") <"$HOST_KEY_FILE" \
diff --git a/security/monkeysphere/files/patch-src_share_keytrans b/security/monkeysphere/files/patch-src_share_keytrans
deleted file mode 100644
index 9d584acbeed6..000000000000
--- a/security/monkeysphere/files/patch-src_share_keytrans
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/share/keytrans	2009-03-01 13:39:50.000000000 -0500
-+++ src/share/keytrans	2009-03-10 00:39:53.681890554 -0400
-@@ -199,7 +199,7 @@
- sub simple_checksum {
-   my $bytes = shift;
- 
--  return unpack("%32W*",$bytes) % 65536;
-+  return unpack("%32U*",$bytes) % 65536;
- }
- 
- # calculate the multiplicative inverse of a mod b this is euclid's
diff --git a/security/monkeysphere/pkg-plist b/security/monkeysphere/pkg-plist
index 7779f9a4cd0f..ba984ae1789b 100644
--- a/security/monkeysphere/pkg-plist
+++ b/security/monkeysphere/pkg-plist
@@ -1,49 +1,71 @@
-sbin/monkeysphere-host
-sbin/monkeysphere-authentication
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/MonkeySpec
-%%DOCSDIR%%/getting-started-user.mdwn
-%%DOCSDIR%%/getting-started-admin.mdwn
+@sample %%ETCDIR%%/monkeysphere-authentication.conf.sample
+@sample %%ETCDIR%%/monkeysphere-host.conf.sample
+@sample %%ETCDIR%%/monkeysphere.conf.sample
+bin/monkeysphere
+bin/monkeysphere-e
+bin/openpgp2pem
+bin/openpgp2spki
 bin/openpgp2ssh
 bin/pem2openpgp
-bin/monkeysphere
-%%DATADIR%%/mh/publish_key
-%%DATADIR%%/mh/import_key
-%%DATADIR%%/mh/set_expire
-%%DATADIR%%/mh/diagnostics
-%%DATADIR%%/mh/add_hostname
-%%DATADIR%%/mh/add_revoker
-%%DATADIR%%/mh/revoke_hostname
-%%DATADIR%%/mh/revoke_key
-%%DATADIR%%/keytrans
-%%DATADIR%%/defaultenv
+man/man1/monkeysphere.1-e.gz
+man/man1/monkeysphere.1.gz
+man/man1/openpgp2pem.1.gz
+man/man1/openpgp2spki.1.gz
+man/man1/openpgp2ssh.1.gz
+man/man1/pem2openpgp.1.gz
+man/man7/monkeysphere.7.gz
+man/man8/monkeysphere-authentication.8-e.gz
+man/man8/monkeysphere-authentication.8.gz
+man/man8/monkeysphere-host.8-e.gz
+man/man8/monkeysphere-host.8.gz
+sbin/monkeysphere-authentication
+sbin/monkeysphere-authentication-e
+sbin/monkeysphere-host
+sbin/monkeysphere-host-e
+%%PORTDOCS%%%%DOCSDIR%%/Changelog
+%%PORTDOCS%%%%DOCSDIR%%/examples/make-x509-certreqs
+%%PORTDOCS%%%%DOCSDIR%%/examples/monkeysphere-monitor-keys
+%%PORTDOCS%%%%DOCSDIR%%/examples/crontab
+%%PORTDOCS%%%%DOCSDIR%%/examples/ssh_config
+%%PORTDOCS%%%%DOCSDIR%%/examples/sshd_config
 %%DATADIR%%/VERSION
-%%DATADIR%%/transitions/0.23
-%%DATADIR%%/transitions/README.txt
-%%DATADIR%%/ma/list_certifiers
-%%DATADIR%%/ma/add_certifier
-%%DATADIR%%/ma/update_users
-%%DATADIR%%/ma/setup
-%%DATADIR%%/ma/remove_certifier
-%%DATADIR%%/ma/diagnostics
+%%DATADIR%%/checkperms
 %%DATADIR%%/common
+%%DATADIR%%/defaultenv
+%%DATADIR%%/defaultenv-e
+%%DATADIR%%/keytrans
 %%DATADIR%%/m/gen_subkey
+%%DATADIR%%/m/import_subkey
+%%DATADIR%%/m/keys_for_userid
 %%DATADIR%%/m/ssh_proxycommand
 %%DATADIR%%/m/subkey_to_ssh_agent
-%%DATADIR%%/m/import_subkey
-@unexec if cmp -s %D/etc/monkeysphere/monkeysphere.conf.sample %D/etc/monkeysphere/monkeysphere.conf; then rm -f %D/etc/monkeysphere/monkeysphere.conf; fi
-etc/monkeysphere/monkeysphere.conf.sample
-@exec if [ ! -f %D/etc/monkeysphere/monkeysphere.conf ] ; then cp -p %D/%F %B/monkeysphere.conf; fi
-@unexec if cmp -s %D/etc/monkeysphere/monkeysphere-host.conf.sample %D/etc/monkeysphere/monkeysphere-host.conf; then rm -f %D/etc/monkeysphere/monkeysphere-host.conf; fi
-etc/monkeysphere/monkeysphere-host.conf.sample
-@exec if [ ! -f %D/etc/monkeysphere/monkeysphere-host.conf ] ; then cp -p %D/%F %B/monkeysphere-host.conf; fi
-@unexec if cmp -s %D/etc/monkeysphere/monkeysphere-authentication.conf.sample %D/etc/monkeysphere/monkeysphere-authentication.conf; then rm -f %D/etc/monkeysphere/monkeysphere-authentication.conf; fi
-etc/monkeysphere/monkeysphere-authentication.conf.sample
-@exec if [ ! -f %D/etc/monkeysphere/monkeysphere-authentication.conf ] ; then cp -p %D/%F %B/monkeysphere-authentication.conf; fi
-@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/transitions
-@dirrm %%DATADIR%%/mh
-@dirrm %%DATADIR%%/ma
-@dirrm %%DATADIR%%/m
-@dirrm %%DATADIR%%
-@dirrm etc/monkeysphere
+%%DATADIR%%/m/update_authorized_keys
+%%DATADIR%%/m/update_known_hosts
+%%DATADIR%%/ma/add_certifier
+%%DATADIR%%/ma/diagnostics
+%%DATADIR%%/ma/list_certifiers
+%%DATADIR%%/ma/remove_certifier
+%%DATADIR%%/ma/setup
+%%DATADIR%%/ma/update_users
+%%DATADIR%%/mh/add_name
+%%DATADIR%%/mh/add_revoker
+%%DATADIR%%/mh/diagnostics
+%%DATADIR%%/mh/import_key
+%%DATADIR%%/mh/publish_key
+%%DATADIR%%/mh/revoke_key
+%%DATADIR%%/mh/revoke_name
+%%DATADIR%%/mh/set_expire
+%%DATADIR%%/monkeysphere-authentication-keys-for-user
+%%DATADIR%%/transitions/0.23
+%%DATADIR%%/transitions/0.23-e
+%%DATADIR%%/transitions/0.28
+%%DATADIR%%/transitions/0.28-e
+%%DATADIR%%/transitions/README.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry %%DATADIR%%/transitions
+@dirrmtry %%DATADIR%%/mh
+@dirrmtry %%DATADIR%%/ma
+@dirrmtry %%DATADIR%%/m
+@dirrmtry %%DATADIR%%
+@dirrmtry %%ETCDIR%%