From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 15 22:20:02 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0959D106566B for ; Mon, 15 Aug 2011 22:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D3F7E8FC12 for ; Mon, 15 Aug 2011 22:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p7FMK1Lo037188 for ; Mon, 15 Aug 2011 22:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p7FMK1YC037187; Mon, 15 Aug 2011 22:20:01 GMT (envelope-from gnats) Resent-Date: Mon, 15 Aug 2011 22:20:01 GMT Resent-Message-Id: <201108152220.p7FMK1YC037187@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Antoine Beaupre Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AFD5106566B for ; Mon, 15 Aug 2011 22:11:30 +0000 (UTC) (envelope-from anarcat@angela.anarcat.ath.cx) Received: from bureau.koumbit.net (homere.koumbit.net [209.44.112.81]) by mx1.freebsd.org (Postfix) with ESMTP id A71988FC12 for ; Mon, 15 Aug 2011 22:11:29 +0000 (UTC) Received: from localhost (f053032020.adsl.alicedsl.de [78.53.32.20]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by bureau.koumbit.net (Postfix) with ESMTPSA id 06F43E80E83; Mon, 15 Aug 2011 17:54:16 -0400 (EDT) Received: by localhost (Postfix, from userid 1000) id 96EB36399; Mon, 15 Aug 2011 23:54:14 +0200 (CEST) Message-Id: <201108152148.p7FLmdlm017036@rtr0.koumbit.net> Date: Mon, 15 Aug 2011 23:54:14 +0200 From: Antoine Beaupre To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dkg@fifthhorseman.net Subject: ports/159803: update monkeysphere port to 0.35G X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Antoine Beaupre List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2011 22:20:02 -0000 >Number: 159803 >Category: ports >Synopsis: update monkeysphere port to 0.35 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 15 22:20:01 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Antoine Beaupre >Release: FreeBSD 8.2-RELEASE amd64 >Organization: >Environment: System: FreeBSD rtr0.koumbit.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Aug 12 10:51:20 EDT 2011 anarcat@rtr0.koumbit.net:/usr/obj/usr/src/sys/KOUMBIT0 amd64 >Description: Monkeysphere is pretty outdated in FreeBSD. >How-To-Repeat: Install it. Notice how it's 0.24 instead of latest upstream (0.35). >Fix: diff -rN monkeysphere.orig/Makefile monkeysphere/Makefile 9c9 < PORTVERSION= 0.24 --- > PORTVERSION= 0.35 49,50c49 < ${WRKSRC}/src/monkeysphere-authentication \ < ${WRKSRC}/doc/getting-started-admin.mdwn --- > ${WRKSRC}/src/monkeysphere-authentication diff -rN monkeysphere.orig/distinfo monkeysphere/distinfo 1,2c1,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 diff -rN monkeysphere.orig/files/patch-Makefile monkeysphere/files/patch-Makefile 0a1,54 > --- Makefile.orig 2011-08-15 17:37:12.000000000 -0400 > +++ Makefile 2011-08-15 17:42:56.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 -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 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 -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 > 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 -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 > @@ -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 -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 -rN monkeysphere.orig/files/patch-src_monkeysphere-host monkeysphere/files/patch-src_monkeysphere-host 1,11d0 < --- 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 -rN monkeysphere.orig/files/patch-src_share_keytrans monkeysphere/files/patch-src_share_keytrans 1,11d0 < --- 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 >Release-Note: >Audit-Trail: >Unformatted: