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.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

6 files changed, 113 insertions, 1 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/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
+}