Date: Fri, 20 Jun 2014 01:47:27 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358491 - in head/security/monkeysphere: . files Message-ID: <201406200147.s5K1lRHF083755@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Fri Jun 20 01:47:27 2014 New Revision: 358491 URL: http://svnweb.freebsd.org/changeset/ports/358491 QAT: https://qat.redports.org/buildarchive/r358491/ Log: security/monkeysphere: update to 0.36 - Update to 0.36 [1] - Support stage [1] - Use @sample - Pass maintainership to submitter PR: 189205 (based on) Submitted by: anarcat koumbit org Approved by: maintainer Added: head/security/monkeysphere/files/patch-Makefile (contents, props changed) Deleted: head/security/monkeysphere/files/patch-src_monkeysphere-host head/security/monkeysphere/files/patch-src_share_keytrans Modified: head/security/monkeysphere/Makefile head/security/monkeysphere/distinfo head/security/monkeysphere/pkg-plist Modified: head/security/monkeysphere/Makefile ============================================================================== --- head/security/monkeysphere/Makefile Fri Jun 20 01:40:42 2014 (r358490) +++ head/security/monkeysphere/Makefile Fri Jun 20 01:47:27 2014 (r358491) @@ -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/gn 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> Modified: head/security/monkeysphere/distinfo ============================================================================== --- head/security/monkeysphere/distinfo Fri Jun 20 01:40:42 2014 (r358490) +++ head/security/monkeysphere/distinfo Fri Jun 20 01:47:27 2014 (r358491) @@ -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 Added: head/security/monkeysphere/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/monkeysphere/files/patch-Makefile Fri Jun 20 01:47:27 2014 (r358491) @@ -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 Modified: head/security/monkeysphere/pkg-plist ============================================================================== --- head/security/monkeysphere/pkg-plist Fri Jun 20 01:40:42 2014 (r358490) +++ head/security/monkeysphere/pkg-plist Fri Jun 20 01:47:27 2014 (r358491) @@ -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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406200147.s5K1lRHF083755>