Revision bump, added patches from bug #313253; fixes default shell, non default port, empty userid line, user, group and permissions. Added Kristian Fiskerstrand (K_F) to metadata.xml as proxied maintainer.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

7 files changed, 133 insertions, 3 deletions

diff --git a/app-crypt/monkeysphere/ChangeLog b/app-crypt/monkeysphere/ChangeLog
index 5ec274cf2daa..f1c8ccd615e3 100644
--- a/app-crypt/monkeysphere/ChangeLog
+++ b/app-crypt/monkeysphere/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-crypt/monkeysphere
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysphere/ChangeLog,v 1.1 2013/11/12 07:17:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysphere/ChangeLog,v 1.2 2013/12/16 11:26:32 tomwij Exp $
+
+*monkeysphere-0.36-r1 (16 Dec 2013)
+
+  16 Dec 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/monkeysphere-0.36_default_shell.patch,
+  +files/monkeysphere-0.36_non_default_port.patch,
+  +files/monkeysphere-0.36_userid_empty_line.patch,
+  +monkeysphere-0.36-r1.ebuild, metadata.xml:
+  Revision bump, added patches from bug #313253; fixes default shell, non
+  default port, empty userid line, user, group and permissions. Added Kristian
+  Fiskerstrand (K_F) to metadata.xml as proxied maintainer.
 
 *monkeysphere-0.36 (12 Nov 2013)
 
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index 8486ecdaca71..6529457ad469 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -1,4 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX monkeysphere-0.36_default_shell.patch 466 SHA256 637f4cf6e83ea01e5a981f940618127512ca1171498b0d03a7779d2b50e80124 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8 WHIRLPOOL 295bc1d61f26f214020f1ac753a002911e2d775a6d7e46e847b091980d385245be12961b79949d77826ead3852e5058c45b512f28a44a36f20afd3a8f98538d0
+AUX monkeysphere-0.36_non_default_port.patch 418 SHA256 7d20a74a0ec3d49b93d1d881d22d5d13316b4c16c709cfab23782cd0ed03b41c SHA512 2a173500e0b659a79a7274e042e49a282f708cda0f6a78ce8fa126013e35c4f6f117e606b90ce31da5158e58ab52a236038a913cc98c5ae1fc8e04a5dcbf816e WHIRLPOOL 825bfa045f03444bdd301cac503a6932d0f75c52bfa72fa8f07e79a1ba359600c8f15e7a930d349bb8c2afa4aedc5f3a6e4f22436fccbf4f60a22060a66c8c4c
+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 1317 SHA256 939aee6c2ed5a015458737e40812e1cfc3053452d8a4bbfc9f89eb53d3352206 SHA512 c72f36522881569c3f1273b46aaaf354bc8505ed3a9c0200d594adb0bd34ba51f981e319c9548c3edc04698e006a37f358d7fb48d3b7a96edff3a3280dc6ee39 WHIRLPOOL 6e374fecfd2628de3c486e20e009d28a797c416380fb366a53058738b97be5ee854367a59f4edcb75c35f63f15364d44fd2dac99912e432edc9d8547732104a7
 EBUILD monkeysphere-0.36.ebuild 824 SHA256 75080ce71dfcb41b18f1f61accabe05ee442fb05330821a194f795967cf6dedd SHA512 d04e2e62367282972ba836815e17743a3137efc03650770ac3750485262ce9dac6e83c44b62613987c0ddb3cd9d19757a247ecd8196bc193efc9083c033ac510 WHIRLPOOL 5901edfc98e3f1f3db9651b04183d483bff949756f30a8af9e4dab0440eb3f0d3ac468179aa81e16a2fa04b9a83dcde0c72b9efa359e369083bd8844f08e388b
-MISC ChangeLog 417 SHA256 b06bee10f8a6df60d7dc0777b55f723f4422462630bca46b4897ae781e05d759 SHA512 ab1e56586ea489becb38a8ddc7825240f27759d4bf722040bd54693c4fa73fd60cccd82c78e6339d4ba6d972c833e6dc2e5333c30ff2b1a1a22bbba11dfffcaf WHIRLPOOL ab95811b722f1a2c064f69583fb6389177198d48420611301fa4254836b50e6434f53bd178dc4c0b0fd104763d452d55b2b287a9238277bb0e9874c11071c33c
-MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
+MISC ChangeLog 911 SHA256 9915224bb627d75ab4e322785fd636e243b733e8eac14d44b20c3c5c501e8179 SHA512 134bb0672f867d444b6e082f18659984214fd266acdb979d2faaab45c03210d22791289e66c519dc265721dfd7fe8137bbb689fbe76dd3b04c538a9af1eed179 WHIRLPOOL a0659b52b21ee6f0e5b6985bed128c1cc5d696b21ea1cc1a3bf9ab6fd0f64c9e1bc11325d9c73500157c7709b238941c702c6e4e29cefd3a903f75765436ac6b
+MISC metadata.xml 372 SHA256 a22f35b8412d466d0f1d7c607dec39436b243ae1940055be0addddcf580fd1ae SHA512 ccdf649a5f90791f0e562af09c5cd17c4c659883750bcf227beb9ac4d0cd54ed9c64979105583319c814b97a3caa3f60b89218897182d6a1c9b99637531fe954 WHIRLPOOL 2544789c91f961ee61fcc8b384c6e86b93881377934ac46b8292cfaba5300be7b7b9c07af905496cfb60c7be2c22d54a8d1ec14e2b817106a92488503f241e5f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSruNuAAoJEJWyH81tNOV9F2QH/2tUuRN0hERsuS58OVeTfG+J
+9fuNftkiH9VA4SG/heelkcuY1fm2M12M5clhslLlo1yqMMJHTAKtkE3jDO+XJdbW
+U2DrOK9pe/kNNNdFGiHxI1QegZT9yvnmfLGYde9yvhTGFTazZtdaFO/JXoPqE0kL
+XuGait3enmZwl82I3izkVu6JCCxDVAz6l+fYAndt9yJ/TRkCpU6N4RxfOgV4BkWK
+W1iZ8s1XHZ67oDPXdtBmsWZlO34J6RObePo7Nume5rd6bkZjwDMleZJAL6PfWx5C
+xC/YVkN2X53amjXmhiU1diVYa6g1qRBF7Re2vY6BGzjz2pF1JA8SNRb7Ts+IT90=
+=wHwn
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
new file mode 100644
index 000000000000..f979114181d1
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
@@ -0,0 +1,12 @@
+diff -r d0c02fe6a949 src/share/common
+--- a/src/share/common	Sun Oct 06 19:21:18 2013 +0200
++++ b/src/share/common	Sun Oct 06 19:21:49 2013 +0200
+@@ -108,7 +108,7 @@
+          # if root, su command as monkeysphere user
+ 	'root')
+             # requote arguments using bash builtin feature (see "help printf"):
+-	    su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
++	    su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
+ 	    ;;
+ 
+ 	# otherwise, fail
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
new file mode 100644
index 000000000000..f14550280fcf
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
@@ -0,0 +1,14 @@
+diff -r 5f7ee764ec1f src/share/common
+--- a/src/share/common	Mon Oct 07 19:22:36 2013 +0200
++++ b/src/share/common	Mon Oct 07 19:22:58 2013 +0200
+@@ -863,6 +863,10 @@
+ 		    ;;
+ 		('known_hosts')
+ 		    host=${userID#ssh://}
++	    	    if [[ "${host}" == *:* ]]; then
++			IFS=':' read -a ARR <<< "${host}"
++			host="[${ARR[0]}]:${ARR[1]}"
++		    fi
+ 		    remove_line "$keyFile" "$host" "$sshKey"
+ 		    ;;
+ 	    esac
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch
new file mode 100644
index 000000000000..70c7cffe7dc4
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch
@@ -0,0 +1,12 @@
+diff -r 2315bb7781c6 src/share/common
+--- a/src/share/common	Thu Oct 10 19:25:10 2013 +0200
++++ b/src/share/common	Thu Oct 10 19:25:50 2013 +0200
+@@ -917,7 +917,7 @@
+     IFS=$'\n'
+     while read line ; do
+ 	case "$line" in
+-	    ("#"*)
++	    ("#"*|"")
+ 		continue
+ 		;;
+ 	    (" "*|$'\t'*)
diff --git a/app-crypt/monkeysphere/metadata.xml b/app-crypt/monkeysphere/metadata.xml
index 24cbb90cf0c4..7536b43bcb29 100644
--- a/app-crypt/monkeysphere/metadata.xml
+++ b/app-crypt/monkeysphere/metadata.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<maintainer>
+		<email>kf@sumptuouscapital.com</email>
+		<name>Kristian Fiskerstrand</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
new file mode 100644
index 000000000000..2d5331202eab
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild,v 1.1 2013/12/16 11:26:32 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils user
+
+DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
+HOMEPAGE="http://web.monkeysphere.info/"
+SRC_URI="http://archive.${PN}.info/debian/pool/${PN}/${PN::1}/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Tests do weird things with network and fail OOTB.
+RESTRICT="test"
+
+RDEPEND="
+	app-crypt/gnupg
+	app-misc/lockfile-progs
+	dev-perl/Crypt-OpenSSL-RSA
+	dev-perl/Digest-SHA1
+	|| ( net-analyzer/netcat net-misc/socat )"
+DEPEND="${RDEPEND}
+	test? ( net-misc/socat )"
+
+pkg_setup()
+{
+	einfo "Creating named group and user"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare()
+{
+	epatch "${FILESDIR}/${P}_default_shell.patch"
+	epatch "${FILESDIR}/${P}_non_default_port.patch"
+	epatch "${FILESDIR}/${P}_userid_empty_line.patch"
+
+	sed -i "s#share/doc/${PN}#share/doc/${PF}#" Makefile || die
+}
+
+src_install()
+{
+	default
+
+	dodir /var/lib/${PN}
+	fowners root:${PN} /var/lib/${PN}
+	fperms 751 /var/lib/${PN}
+}
+
+pkg_postinst()
+{
+	${PN}-authentication setup || die
+}