FreeBSD port upgrade
The FreeBSD port is really outdated. I have tried updating it, but it's still incomplete, so I am not submitting the update to the port system, and instead opening an issue here.
Here's the half-assed patch:
? files/patch-makefile cvs diff: Diffing . Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/monkeysphere/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 28 Mar 2012 20:43:06 -0000 1.3 +++ Makefile 29 Jun 2012 17:05:03 -0000 @@ -6,7 +6,7 @@ # PORTNAME= monkeysphere -PORTVERSION= 0.24 +PORTVERSION= 0.35 CATEGORIES= security MASTER_SITES= http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/ # hack for debian orig tarballs @@ -46,8 +46,7 @@ ${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 \ @@ -65,8 +64,5 @@ @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 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/security/monkeysphere/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 3 Jul 2011 14:02:58 -0000 1.2 +++ distinfo 29 Jun 2012 17:05:03 -0000 @@ -1,2 +1,2 @@ -SHA256 (monkeysphere_0.24.orig.tar.gz) = 2a58cee998ddb1b21b953826fc746a743e17d94e6fa34ac9cbee4262873b5c5f -SIZE (monkeysphere_0.24.orig.tar.gz) = 86044 +SHA256 (monkeysphere_0.35.orig.tar.gz) = c18bf0d0af4426226cfa2cdd8e004c7b7b249347f1214107be12882de2e7a50e +SIZE (monkeysphere_0.35.orig.tar.gz) = 94991 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/security/monkeysphere/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- pkg-plist 28 Mar 2012 20:43:06 -0000 1.2 +++ pkg-plist 29 Jun 2012 17:05:03 -0000 @@ -1,49 +1,46 @@ sbin/monkeysphere-host sbin/monkeysphere-authentication -%%DOCSDIR%%/TODO -%%DOCSDIR%%/MonkeySpec -%%DOCSDIR%%/getting-started-user.mdwn -%%DOCSDIR%%/getting-started-admin.mdwn 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 +share/doc/monkeysphere/Changelog +share/doc/monkeysphere/examples/crontab +share/doc/monkeysphere/examples/ssh_config +share/doc/monkeysphere/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%%/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%% +%%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.28 +%%DATADIR%%/transitions/README.txt @dirrm %%DATADIR%%/transitions @dirrm %%DATADIR%%/mh @dirrm %%DATADIR%%/ma @dirrm %%DATADIR%%/m -@dirrm %%DATADIR%% +@dirrm share/doc/monkeysphere/examples +@dirrm share/doc/monkeysphere @dirrm etc/monkeysphere cvs diff: Diffing files cvs diff: cannot find files/patch-src_monkeysphere-host cvs diff: cannot find files/patch-src_share_keytrans
Notice how the existing patches were removed and the following patch was added:
--- Makefile.orig 2012-06-28 19:02:07.000000000 -0400 +++ Makefile 2012-06-28 19:02:08.000000000 -0400 @@ -42,23 +42,23 @@ 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.orig '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.orig '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.orig 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere install -m 0644 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.orig 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv + sed -i.orig '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 ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2ssh 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.orig 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23 + sed -i.orig '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 @@ -78,15 +78,15 @@ install man/man8/* $(DESTDIR)$(MANPREFIX)/man8 gzip -d man/*/* gzip -d $(DESTDIR)$(MANPREFIX)/man1/monkeysphere.1.gz - sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man1/monkeysphere.1 + sed -i.orig '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.orig 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-host.8 + sed -i.orig '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.orig 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(MANPREFIX)/man8/monkeysphere-authentication.8 + sed -i.orig '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
the above goes in files/patch-makefile, but should probably be factored in.
This is incomplete, especially because of the above patch, which leaves .orig files lying around. The plist also looks strange - the data files used to be in /var/monkeysphere and now they are in /var/lib/monkeysphere, and there are other weird things.
i am using this in production nevertheless.
(from redmine: created on 2012-06-29)