app-crypt/monkeysphere: Do not depend on default login shell
authorkristianf <devnull@localhost>
Sun, 6 Oct 2013 18:08:27 +0000 (20:08 +0200)
committerkristianf <devnull@localhost>
Sun, 6 Oct 2013 18:08:27 +0000 (20:08 +0200)
app-crypt/monkeysphere/Manifest
app-crypt/monkeysphere/files/01_default_shell.patch [new file with mode: 0644]
app-crypt/monkeysphere/monkeysphere-0.36.ebuild

index 384a285..1feeb8a 100644 (file)
@@ -1,2 +1,3 @@
+AUX 01_default_shell.patch 612 SHA256 7727f561af4bc46d1c780c448f8d29005d83c20792b6a26e884ef2403253ec91 SHA512 dc80ff4f8f94cc7ae07e16d2e4f2327d939a8c610831bb71364be41e5dfb9fe629e256c17e7c9ef6cb833a5f08524183114b38fdae589481940aefd0a7dbb31b WHIRLPOOL f64cf2afa1d6995a7f937900740cecc435a8efc3a3e9b3324fab711441366b12af9d9ec51fa7c7f02e60c9b3ba284650b5be591dfd6d4cffb1c356825fb1eabb
 DIST monkeysphere_0.36.orig.tar.gz 98876 SHA256 6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7 SHA512 eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8 WHIRLPOOL c163d0be77d3c6d838f752c8f53d967b17aeafd798e4fca694a31bf55628fb57d18b6a4664ca9552bd3daf3b89b6f86452d430529985ca0a31c3c4aa48470bc0
-EBUILD monkeysphere-0.36.ebuild 1007 SHA256 3cf026fca8f22f2b058fc494f293c090e48f58426492aba8d1813d4c7270d2e7 SHA512 d5ca7d28b435590b0ef33c566cb7314f708b07b75b3f8da847bc4acca8b99582bb4f5bc1f5e2bc58907d1714972bffcfc1299ae54082ce0d04e01188bf91a73d WHIRLPOOL e90d19a108563b0675ed2c35a2a11b8b029164244375883bf8697ee14f86e6c88811fac7304b6763903390c0c7b986324d8ec09a023bc3bca08b0e50e0222c49
+EBUILD monkeysphere-0.36.ebuild 1153 SHA256 167028aed7fc39ee806b86b1b7e245f7e0a7dc89f5f574d9d38d30dab7229892 SHA512 ea2fc77b849ffaeac6a2727e7e93b8af51e40c77a5b60bd10bfa34bea8c685951a442d73b0118998c3d6f5acdde26350a7c51b401cf4741d65b145f473f070cd WHIRLPOOL aefe0b00de9999e94786785ad9a2ddcab0c26f91ab83c0c6732ed264a7483b0d29690d5d07f8fce9b4120f16440adb61e5fbebacd536dc9a7f5d847c788eafd0
diff --git a/app-crypt/monkeysphere/files/01_default_shell.patch b/app-crypt/monkeysphere/files/01_default_shell.patch
new file mode 100644 (file)
index 0000000..a04fc0c
--- /dev/null
@@ -0,0 +1,19 @@
+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
+@@ -104,13 +104,13 @@
+     case $(id -un) in
+       # if monkeysphere user, run the command as a subshell
+       "$MONKEYSPHERE_USER")
+-          ( "$@" )
++          ( "$@" )
+           ;;
+          # 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
index 80d7c8d..3ae1acd 100644 (file)
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-inherit user
+inherit eutils user
 
 DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
 HOMEPAGE="http://web.monkeysphere.info/"
@@ -24,15 +24,18 @@ pkg_setup()
 {
        ebegin "Creating named group and user"
        enewgroup monkeysphere
-       enewuser monkeysphere -1 /bin/sh /var/lib/monkeysphere monkeysphere
+       enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
        mkdir -p /var/lib/monkeysphere || die
        chown root:monkeysphere /var/lib/monkeysphere || die
        chmod 755 /var/lib/monkeysphere || die
+       mkdir /var/lib/monkeysphere/.gnupg
+       chown monkeysphere:monkeysphere /var/lib/monkeysphere/.gnupg 
        eend ${?}
 }
 
 src_prepare()
 {
+       epatch "${FILESDIR}/01_default_shell.patch"
        sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
 }