Revision bump to include serveral additional patches from my development overlay

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xFC3B17DE05E136A0!

6 files changed, 194 insertions, 15 deletions

diff --git a/app-crypt/monkeysphere/ChangeLog b/app-crypt/monkeysphere/ChangeLog
index 5e575cb44b46..4680dd16edd6 100644
--- a/app-crypt/monkeysphere/ChangeLog
+++ b/app-crypt/monkeysphere/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/monkeysphere
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysphere/ChangeLog,v 1.5 2014/07/28 19:03:09 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysphere/ChangeLog,v 1.6 2014/07/29 12:34:22 k_f Exp $
+
+*monkeysphere-0.36-r2 (29 Jul 2014)
+
+  29 Jul 2014; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/monkeysphere-0.36_hd_od.patch,
+  +files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch,
+  +files/monkeysphere-0.36_tests_gnupg2.patch, +monkeysphere-0.36-r2.ebuild:
+  Revision bump to include serveral additional patches from my development
+  overlay
 
   28 Jul 2014; Kristian Fiskerstrand <k_f@gentoo.org> metadata.xml:
   Taking over full maintainership instead of through proxy-maint
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index 5c4412dc7f04..89a88b1d463b 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -2,25 +2,29 @@
 Hash: SHA256
 
 AUX monkeysphere-0.36_default_shell.patch 466 SHA256 637f4cf6e83ea01e5a981f940618127512ca1171498b0d03a7779d2b50e80124 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8 WHIRLPOOL 295bc1d61f26f214020f1ac753a002911e2d775a6d7e46e847b091980d385245be12961b79949d77826ead3852e5058c45b512f28a44a36f20afd3a8f98538d0
+AUX monkeysphere-0.36_hd_od.patch 528 SHA256 f09320e4e69b12e8756e927f5965a59a7b437be6aa22f7ab22a3d6dc449313ab SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55 WHIRLPOOL 6fe6a702b8e21b05f6fc1aa8e0b46ea0c90ab66dc488c0792815750d85958dbbd31d2a1994e92b89e827bc562b0450594a3553d15466d4141e56b15e2894ddfe
 AUX monkeysphere-0.36_non_default_port.patch 418 SHA256 7d20a74a0ec3d49b93d1d881d22d5d13316b4c16c709cfab23782cd0ed03b41c SHA512 2a173500e0b659a79a7274e042e49a282f708cda0f6a78ce8fa126013e35c4f6f117e606b90ce31da5158e58ab52a236038a913cc98c5ae1fc8e04a5dcbf816e WHIRLPOOL 825bfa045f03444bdd301cac503a6932d0f75c52bfa72fa8f07e79a1ba359600c8f15e7a930d349bb8c2afa4aedc5f3a6e4f22436fccbf4f60a22060a66c8c4c
+AUX monkeysphere-0.36_openpgp2ssh_sanity_check.patch 1194 SHA256 e179ae2226f04f87bb0f64c3722a299ae628a0cce4eecb3e8a6fedb82ce2ddb6 SHA512 b14c421e5880407b3acb845b235c89c5338a1fc1285b514679de09371db38e42aa3371ef2916c57d5ab10f08bc19f5c864762ff7eaf0a054d2817bc6bcaab488 WHIRLPOOL f5e7b7ce0f8c8a10786d61563763113c6d8d6a67b662a23a5911a1e8f036bbcd578510217f17b2b531098881d5682dac0dbb432785f9072b8a7597b9059f7036
+AUX monkeysphere-0.36_tests_gnupg2.patch 2272 SHA256 381c351000d940e8b1e1a429265276266e590b5dc02c865e30780f723fa9fb9c SHA512 e75f82793419dd2e99aa95765e9d954437d0e78294ed4188a9e7fa246b85ddbcd755eb566a1e9a9c20f2f2634150d65caa0715993863f59f9146f5cc95457975 WHIRLPOOL 36ffb05c4362fb3b193187b3637263b95aef95b85ed70d6bb51a36bf8e8dba392b2363b401b8902b0a9ef7f91ddba304c8982d32815d273c9b009652d482e334
 AUX monkeysphere-0.36_userid_empty_line.patch 292 SHA256 bf3eefe21edd72ad813888bcd91a9c6cef8a90d0e5f8272f847cb278750ab787 SHA512 15b8e8ff71537e79d069d0f298326cc6705931c58ff1cf2f16c5486e587fe69f610dc1e0ebd0006e0bdef12f936685a0594dc3f9dbdadb928fba25a8e2982eb7 WHIRLPOOL bf27a00f18407a616e22340d10d15837fca21b659ab57fbd603718c49fb15533734d660ee061bc544cb281c6d4bb073aabff6c85d3f4b232b0872da512ae8964
 DIST monkeysphere_0.36.orig.tar.gz 98876 SHA256 6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7 SHA512 eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8 WHIRLPOOL c163d0be77d3c6d838f752c8f53d967b17aeafd798e4fca694a31bf55628fb57d18b6a4664ca9552bd3daf3b89b6f86452d430529985ca0a31c3c4aa48470bc0
 EBUILD monkeysphere-0.36-r1.ebuild 1311 SHA256 8e75148228f28fd456c02e1934b345514911e11e6fbdaf5bdeb6ccdd5ff15dbd SHA512 900ef0a52fa5e9c74a45abd48a29b643664fbd18a84d4a1ab75c24c42302703caa6abae963f961e832ff56539ad9318dd391f0cb873a0829f551847dcf032d2d WHIRLPOOL 2f359928201bfd5054f18acc3f5f16120018d7e0ee7c9c51b6cfe5f73767a25329615b493aa61ce38a96a8ec714cec5326396440f8fea322a0ae5dc889ef8171
-MISC ChangeLog 1272 SHA256 80f0e953921cc2faf6f13e9c5808af35dc7d0de0f8c0e2abe9824112412b1c96 SHA512 490a01660f1cb7721ce9f8fd7b567cf8b583f5dbb62844d957575630ee5d05b052ad30195ace73d19621fd754adde22fa679332103880393a21c25d670449d8b WHIRLPOOL a50d3572aa6b409f64872543f7bd4b886731dcaea8d87dd147c88356375187f23308c3e2605e44b11595b5c4b316b59ac45a82a7959cff69e04009913d37eb40
+EBUILD monkeysphere-0.36-r2.ebuild 1903 SHA256 cd78c9bf941941d4f91b8eac09fbe8938d1ad2974240f1196a6f3e8de58c5b70 SHA512 c54671426dac89dfb66a803264bcc81545dcc3e0709f718644621bb5b82ddda3e9fd4b5e95011645752797ec6c0c3531dd217a86980cc4dacda01542b4391e96 WHIRLPOOL df48051560e4c538c72d29ef301d3253c0b40e69beb7a136bc9e5c66c787b4db791bbb6d8b37e52b89ea0f97cacf75d3aec928e017e95883d37af20b30b95dc3
+MISC ChangeLog 1625 SHA256 f658ec06c983ae6cc9301d38fff21672723143adb772275e6b90b9f133a6814b SHA512 4593aa5d18be354523004ca5a7c042d87ebb41403ebc5a2884ab23230211f4095ca4c2c7523b571b53eb8820bb33da0f21ac0be04f7c19c815cde06580215e78 WHIRLPOOL 4eb4a99f4e3e9bc6b47840730c4e7757306233ddc312d988d67e8c90ecf1109583161e9a93e4d3c0aff7426fe20ff9c903c38e8bfa44bf767358ddf463ed2c3f
 MISC metadata.xml 237 SHA256 5c58f0c8f9a9d5f50383f6cb306cf688924be830a0be08ede1ae7866c3566c2c SHA512 cd2f27119bff3427ab44b55caf2fc21ed3f56ab1251747a8213ad9914aa284e23e922c73018307a22ccd359906e4b82222a4dab35ef9469129dbc79b4b403b4f WHIRLPOOL 3f039cb8a9e18e11bf4dbd398f81a1b47f4e0a17bf53cb8f642f6cdeeaa13731307111e2f6d34689046a545de8c988a5bf0121473aac548affcb7352ebb1f590
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJT1p4gAAoJEPw7F94F4TagO1AQAI0Lg8tkwN1pMFroDuA+qERH
-FldDMUQOdB+oPiM7+DpYXZVeAK0/VRHxaKeNb6NZUlfER1Fl+VMoS+m/8vfBIMlT
-rBIeT4nhZ0Yfm+CHqEQnBQk6X7y4u4isXJzl1urBA/czNx0DrlTf3cm7P7wENrA2
-WyseVLg+kLmKP+EpTV4DMpMj7CW08cdc8gU73Yu6Wg/ZBsf/g2orB4qz2UOC7foK
-yDf9NZ0lmRKAn/VCrMolAEyg9E2yd3T2yI844Nvpo3XL1xAZphyGEwGVggJzln27
-Wh2QVS3hn+dBfkFddM7Q4n/y5DJXy8xw+SRv8htOrYRtoeOxfKYG176yRE9ZfkSl
-XL7TXoTo/GTfgLs7+CgEj45u2I3dNCPCZf8DYDlbr+Ba//Uo6aWYb1t3dBw04JNi
-bCXWfaO85Z+rbrcyptsZDQ69MM6Q8ba6KAYo13nbXLVrxiQrqfWfgCpCl7UTnM8U
-PBVQSZ1jcQGIgdWvmLjhMa0+FIZUdb6fZDPg7sJ8JFK0seaW3C5qh39Pg/c4D9Ra
-qoJNn6QyY2brS4Yc+Q9dGqQd+hQi0NbRJ/MNNfnZMWz2KUzDTU53RU29lJuCO302
-1McX/g7jNMa5hYxg5/Xwj0+S3upITD2JYGUoIRyNItRgozF9CA29oR3zvX+/hOsU
-5qJ6NGv4nlI2fQ9Kvp8j
-=Cleo
+iQIcBAEBCAAGBQJT15SEAAoJEPw7F94F4TagyNcP/0+ElROLOd6zmcQHweqvjX1r
+SehdhuNlXpS4pASTQrd2ZmvoNzCUcUG89Z/roKGwOVjY6e1hHai2iHH6KUeAC/VA
+aIPwVgJ5n2qxH1EFRTuMLcKtpvWOAn50C6xpUSNJxTElTzWHExZtw980DSgsrLGs
+VCiA//3CndnpFiUdBiowPl0glTPnP3ocYQsVBjlWkIry2HhvW5S/2F/9894pRw7L
+jJP4cZ+CA3zZrkiX7zxlaOGZRuN59+7vgLAhaBVLMfwtez96uiiMjhN67Q6JO9Xc
+jJjuAjv5vb7bhdGjhuVcq9sbZtNFzQDxW1fPXwH+PX3GJ2TDgueHkJyrOWqgWy+p
+GqTjcHn7DFNjIYrJIm1cKugVsTzzQ2lNRzLm5GdjoR7mW5EhyNhskRgOjrAC0cdX
+vCnPiqQXJAJupznsTnL3bTE8wLBXDJIlYwN1VWro+vx3YsSFxITLqQ39lZnVDReJ
+n2GijWJ3hMECmmYkwLOxHRUkViMqGrk8fWHg2v2e9nh00aSPzCesconQEnWVXSXm
+j+SZIDMbkclOy14/NYU+TXP+NKI3IbXrFX986jlOA5tOOJQofL3EgoJBc4SMIoVk
+bBH+l2IABY+tW6bph/pSd0114ar52IZnjo3eZ1EdChmbguMC68kAt9CtasPtz5BA
+0lFLqEhjFlyKPzC3wERD
+=p++0
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
new file mode 100644
index 000000000000..7cdaa74b5735
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
@@ -0,0 +1,14 @@
+diff -r 6150774ec7f4 tests/keytrans
+--- a/tests/keytrans	Sun Feb 16 20:11:02 2014 +0100
++++ b/tests/keytrans	Sun Feb 16 20:11:40 2014 +0100
+@@ -104,8 +104,8 @@
+     <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
+ 
+ diff -u \
+-    <(hd "$TEMPDIR"/secret.key) \
+-    <(hd "$TEMPDIR"/converted.secret.key)
++    <(od -xc "$TEMPDIR"/secret.key) \
++    <(od -xc "$TEMPDIR"/converted.secret.key)
+ 
+ KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 -d:)
+ KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40)
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
new file mode 100644
index 000000000000..aec90eb07661
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
@@ -0,0 +1,34 @@
+diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
+index edc7995..2711ff2 100755
+--- a/src/monkeysphere-authentication
++++ b/src/monkeysphere-authentication
+@@ -84,6 +84,13 @@ gpg_sphere() {
+     su_monkeysphere_user gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
+ }
+ 
++check_openpgp2ssh_sanity() {
++    if [[ `su_monkeysphere_user openpgp2ssh ABC &>/dev/null || echo $?` != "255" ]]; then
++    echo "openpgp2ssh command gives unexpected return code. This can lead to a scenario where no authorized keys are populated, even though they are otherwise valid. Aborting!"
++    exit 1
++    fi; 
++}
++
+ # output to stdout the core fingerprint from the gpg core secret
+ # keyring
+ core_fingerprint() {
+@@ -163,6 +170,7 @@ case $COMMAND in
+     'update-users'|'update-user'|'update'|'u')
+ 	source "${MASHAREDIR}/setup"
+ 	setup
++	check_openpgp2ssh_sanity
+ 	source "${MASHAREDIR}/update_users"
+ 	OUTPUT_STDOUT= update_users "$@"
+ 	;;
+@@ -171,6 +179,7 @@ case $COMMAND in
+ 	(( $# > 0 )) || failure "Must specify user."
+ 	source "${MASHAREDIR}/setup"
+ 	setup
++	check_openpgp2ssh_sanity
+ 	source "${MASHAREDIR}/update_users"
+ 	OUTPUT_STDOUT=true update_users "$1"
+ 	;;
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch
new file mode 100644
index 000000000000..712734459054
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch
@@ -0,0 +1,50 @@
+diff -r c13f4b11061e tests/keytrans
+--- a/tests/keytrans	Sun Feb 16 19:24:08 2014 +0100
++++ b/tests/keytrans	Sun Feb 16 19:27:42 2014 +0100
+@@ -131,9 +131,9 @@
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ EOF
+ 
+ diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru)
+@@ -159,10 +159,10 @@
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
+-rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
++rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
+ EOF
+ 
+ 
+@@ -190,15 +190,15 @@
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
+-rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
++rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
+ uid:u::::$timestamp::EDDC32D783E7F4C7B6982D9AE5DC4A61000648BA::baz:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ pub:-:1024:1:$NEWKEYID:$(($timestamp + 1)):::-:::caCA:
+ uid:-::::$(($timestamp + 1))::A0D708F51CC257DEFC01AEDE1E0A5F329DFD8F16::fubar:
+-sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:
++sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8:
+ EOF
+ 
+ echo "test: diff expected gpg list output"
diff --git a/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild
new file mode 100644
index 000000000000..94345a8bb7ec
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild,v 1.1 2014/07/29 12:34:22 k_f Exp $
+
+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"
+IUSE=""
+SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
+KEYWORDS="~arm ~amd64 ~x86"
+
+DOCS=( README Changelog )
+
+# Tests fail upstream for SSH connection. Issue has been reported.
+RESTRICT="test"
+
+DEPEND="app-crypt/gnupg
+	net-misc/socat
+	dev-perl/Crypt-OpenSSL-RSA
+	dev-perl/Digest-SHA1
+	app-misc/lockfile-progs"
+
+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}_default_shell.patch"\
+	       "${FILESDIR}/${P}_non_default_port.patch"\
+	       "${FILESDIR}/${P}_userid_empty_line.patch"\
+	       "${FILESDIR}/${P}_openpgp2ssh_sanity_check.patch"\
+	       "${FILESDIR}/${P}_hd_od.patch"
+
+	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+
+	# Output format of gpg --check-sigs differ between 1.4 and 2.0 so test
+	# needs to be updated if 2.0 is used
+	if has_version '>=app-crypt/gnupg-2.0.0:0'; then
+		epatch "${FILESDIR}/${P}_tests_gnupg2.patch"
+	fi;
+}
+
+src_install()
+{
+	default
+	dodir /var/lib/monkeysphere
+}
+
+pkg_postinst()
+{
+	#This function is idempotent, make sure it is run at least once.
+	monkeysphere-authentication setup || die
+}