[gentoo-commits] repo/gentoo:master commit in: app-crypt/monkeysphere/files/, app-crypt/monkeysphere/

[Kristian Fiskerstrand]

commit:     db19bc9eb421753009d8e9392c014b46f0c3da48
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 19:38:24 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 19:39:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db19bc9e

app-crypt/monkeysphere: New upstream version 0.39

Package-Manager: portage-2.3.0

 app-crypt/monkeysphere/Manifest                    |  1 +
 ...re-0.39-make-tests-work-with-gnupg-2.1.15.patch | 45 +++++++++++++++++
 app-crypt/monkeysphere/monkeysphere-0.39.ebuild    | 57 ++++++++++++++++++++++
 3 files changed, 103 insertions(+)

diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index 44a78ab..3077fd7 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -1,3 +1,4 @@
 DIST monkeysphere_0.36.orig.tar.gz 98876 SHA256 6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7 SHA512 eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8 WHIRLPOOL c163d0be77d3c6d838f752c8f53d967b17aeafd798e4fca694a31bf55628fb57d18b6a4664ca9552bd3daf3b89b6f86452d430529985ca0a31c3c4aa48470bc0
 DIST monkeysphere_0.37.orig.tar.gz 99557 SHA256 b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59 SHA512 ebf636caaa0985a2495314375a9d78d131173ccedc116993e02b7bbc0ddc8c43c718dc65cb725619ecf7e72e0b7e11b941f3eb342d7c23d17ca0507b2ab28512 WHIRLPOOL d27a3712ce4cd529986c4ac0af7398f8d69d66c1b5aed9842d3b21f417bab5d2b3afc7be9e069ce0e9f307b17ad33ef9e8d49d7624ec0d7d2aab60949982b9c1
 DIST monkeysphere_0.38.orig.tar.gz 107546 SHA256 6951821d11ad646e6e7651d677bfab8f800fbc52703a0ab9942d03cd13959073 SHA512 fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f4155557a8354cf38d89159422dca390f WHIRLPOOL 26f96f1d845ce1178337cc23e50140576a785536f656e73ceaba4d64192106b2462bb046328758c2771b48de64abe1a3d866cfc2fadc7ac0d0e2341778cd9105
+DIST monkeysphere_0.39.orig.tar.gz 107735 SHA256 73331e2df361b22e1dc6445a7d2b0b2c5a124daa4d850c2ecce721579592c29f SHA512 069acbc3e4f1409a130d4efc95875c72b9e4c55af6ff211fb954a90ff26605ecf9cdbbe7d7f7849de479cafaab7957a33fccefd5f2d54a2317f18bc5454190c2 WHIRLPOOL 3b0b260e002e5bbc4f894f468da77c9b3eb0c020316ceed920663f66e0db525c2baea4d9be7a36e82544c02bc3ece3bb0bbfa455c47d8f89896de08e4ff7211f

diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch b/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch
new file mode 100644
index 00000000..776e633
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch
@@ -0,0 +1,45 @@
+From b1dd8fb1b84c6eea25523c3ea746852b3dce6034 Mon Sep 17 00:00:00 2001
+From: Valo <valo@××××××××××××××.net>
+Date: Wed, 31 Aug 2016 14:00:05 -0400
+Subject: [PATCH] Make tests pass with GnuPG 2.1.15
+
+2.1.15 appears to always emit the fingerprint lines in these cases,
+while 2.1.14 did not.
+---
+ tests/keytrans | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/keytrans b/tests/keytrans
+index 3076e3f..5c7d2c8 100755
+--- a/tests/keytrans
++++ b/tests/keytrans
+@@ -140,7 +140,7 @@ uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest
+ sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8
+ EOF
+ 
+-diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
++diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
+ 
+ echo "##################################################"
+ echo "### sleeping to avoid test suite breakage on fast"
+@@ -170,7 +170,7 @@ rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8
+ EOF
+ 
+ 
+-diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
++diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
+ 
+ 
+ echo "##################################################"
+@@ -206,7 +206,7 @@ sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8
+ EOF
+ 
+ echo "test: diff expected gpg list output"
+-diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
++diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
+ 
+ sort >"$TEMPDIR"/expectedout <<EOF
+ $KEYFPR
+-- 
+2.7.3
+

diff --git a/app-crypt/monkeysphere/monkeysphere-0.39.ebuild b/app-crypt/monkeysphere/monkeysphere-0.39.ebuild
new file mode 100644
index 00000000..ef77d8a
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.39.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
+HOMEPAGE="http://web.monkeysphere.info/"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+IUSE=""
+SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DOCS=( README Changelog )
+
+# Tests fail upstream for SSH connection. Issue has been reported.
+RESTRICT="test"
+
+DEPEND="app-crypt/gnupg:0=
+	net-misc/socat:0=
+	dev-perl/Crypt-OpenSSL-RSA:0=
+	dev-perl/Digest-SHA1:0=
+	app-misc/lockfile-progs:0="
+
+RDEPEND="${DEPEND}"
+
+pkg_setup()
+{
+	einfo "Creating named group and user"
+	enewgroup monkeysphere
+	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
+	# Using fperms and fowner in src_install leave unusable config with error
+	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
+	chown root:monkeysphere /var/lib/monkeysphere
+	chmod 751 /var/lib/monkeysphere
+}
+
+src_prepare()
+{
+	epatch "${FILESDIR}/${P}-make-tests-work-with-gnupg-2.1.15.patch"
+
+	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+}
+
+src_install()
+{
+	default
+	dodir /var/lib/monkeysphere
+}
+
+pkg_postinst()
+{
+	monkeysphere-authentication setup || die
+}