ports/189204: port update: monkeysphere 0.36

Charlie & root at rtr0.core0-arin01.koumbit.net
Thu May 1 15:40:01 UTC 2014 

>Number:         189204
>Category:       ports
>Synopsis:       port update: monkeysphere 0.36
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 01 15:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Antoine Beaupre
>Release:        FreeBSD 9.1-RELEASE-p12 amd64
>Organization:
Koumbit.org
>Environment:
System: FreeBSD rtr0.koumbit.net 9.1-RELEASE-p12 FreeBSD 9.1-RELEASE-p12 #8: Wed Apr 30 17:31:08 EDT 2014 root at rtr0.koumbit.net:/usr/obj/usr/src/sys/KOUMBIT1 amd64


>Description:

Please update the Monkeysphere port to 0.36.

>How-To-Repeat:
	
>Fix:

anarcat at marcos:monkeysphere-port$ svn diff
Index: Makefile
===================================================================
--- Makefile    (révision 352755)
+++ Makefile    (copie de travail)
@@ -2,7 +2,7 @@
 # $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
@@ -43,8 +43,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 \
@@ -62,8 +61,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 <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo    (révision 352755)
+++ distinfo    (copie de travail)
@@ -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
Index: pkg-plist
===================================================================
--- pkg-plist   (révision 352755)
+++ pkg-plist   (copie de travail)
@@ -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
- at 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
- at exec if [ ! -f %D/etc/monkeysphere/monkeysphere.conf ] ; then cp -p %D/%F %B/monkeysphere.conf; fi
- at 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
- at exec if [ ! -f %D/etc/monkeysphere/monkeysphere-host.conf ] ; then cp -p %D/%F %B/monkeysphere-host.conf; fi
- at 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
- at exec if [ ! -f %D/etc/monkeysphere/monkeysphere-authentication.conf ] ; then cp -p %D/%F %B/monkeysphere-authentication.conf; fi
- at 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
- at dirrm %%DATADIR%%
+ at dirrm share/doc/monkeysphere/examples
+ at dirrm share/doc/monkeysphere
 @dirrm etc/monkeysphere

The following patch in files/patch-Makefile is also necessary:


--- 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
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list