app-crypt/monkeysphere: version bump to 0.37
authorkristianf <devnull@localhost>
Fri, 8 Aug 2014 08:42:56 +0000 (10:42 +0200)
committerkristianf <devnull@localhost>
Fri, 8 Aug 2014 08:42:56 +0000 (10:42 +0200)
app-crypt/gpgme/Manifest
app-crypt/gpgme/gpgme-1.3.2-r1.ebuild
app-crypt/monkeysphere/Manifest
app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch [new file with mode: 0644]
app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch [new file with mode: 0644]
app-crypt/monkeysphere/monkeysphere-0.37.ebuild [new file with mode: 0644]

index 1f15977..8ba4085 100644 (file)
@@ -5,6 +5,6 @@ AUX gpgme-1.3.2-CVE-2014-3564.patch 713 SHA256 185bf050e119e12f76250b9ff0c312668
 DIST gpgme-1.3.2.tar.bz2 867738 SHA256 cfd235663f1d1adc97abb38dd5e6d093bb7e155580f171f9ba0158feab69f875 SHA512 5452aa663a85f7853f8194746ee3f7a70f46af719490df240401b0b9d97b0e2d3656d73dd469f136dc4ba0f878f5ef445f43e682a049a3a99c3ac22de29d79c5 WHIRLPOOL 19761dbc7430065d83884cb371bdfb39a114414447c8503e4ee77b72ee5dd007b373aaba4d8f6414250fcdf6eb6a219316135c73d2addb058fc09825ab943dc4
 DIST gpgme-1.4.4.tar.bz2 958379 SHA256 3d594ed4040e11f66be2f48e8bbfc0a831f68321b5d8940d9fdafb1b30542948 SHA512 a54d95e76419acd5c0535f88e55e8c85cd661663d2a65a03d6e03bda5e6e745f45e2f0c891a6c65eeebbf5d7a0c8ee9085ce51aab98445c9cbcc393ec6ddbeb5 WHIRLPOOL 0e63c64b2ea6a089585da57ff50a0c60933569f3e94b2e46a546738f709c464bfc198e88ce954790a179aabd431ebe0166031f9d687d712abdb4b8b30f6b61bc
 DIST gpgme-1.5.1.tar.bz2 964623 SHA256 6c2f3af8ceeb303277d44ec0216d9a1271701f65b91d5942264cf7cefb4a11e3 SHA512 66162d8baf8ce3d7eeaba5aa9cd4efb2704a7a00ce3e0e08a78bdf29ce812e00240a373e7e134825326117fab5495fe42cdf3944eb76f89048e045bcc6e114ff WHIRLPOOL 8179c510758357aea5d3e8fe92871e66c92e448c49b7df1f386741607a9e0a2caf4e770d7daa15f9312d3aa9969cdb4b772be98a9d5f41ab492b109556c41103
-EBUILD gpgme-1.3.2-r1.ebuild 1256 SHA256 19815f1a8e57f2c09bb5e11bf8fc0d3f669160454cdd922577cdd859ac988efb SHA512 cfeb09555984d1329caa61f537be2dfb7998c8e4e6ebda07f84ce31d9a101afb14d43f151988fe73198ccf6357e2e7d24f1f31c97a014427cdb5cd067b8f397d WHIRLPOOL 85a4035a891521cf92918a8edc7fcede71b8f10341688bd848c7c5275b375f530853154328673b871b65a2bbeaf0c77feec37e7782eb36bbf65497fe7af638fd
+EBUILD gpgme-1.3.2-r1.ebuild 1255 SHA256 545e3c0fceb0b541ca6e803af74ef88b10080db11319853607015ea62b0467dc SHA512 5b085bcdee503e01dd09698452d74d76574b07b5399b7315c604062300ad3f3430c1d5f8aac91faf00fc7946055eac2e7ae73591cf9dff619900a0f6f6c374f5 WHIRLPOOL 07c1165de2e3db08f5dc184abfa98117f79774a43f38451104ecd417c760a2317c611e238f7c3c2ddc944f33bd9ed38268f3d4f0aeee95bd12948aa808d7dcf6
 EBUILD gpgme-1.4.4.ebuild 1236 SHA256 add432ca10390e9986e91ee4c4dfb5737c4d99e438b273a11bb8c736adb086a0 SHA512 ff9966a8f53ee94ab64c281f0ebdac4c831fadac3e6b20aad572eb8559e65edc7e8c778ecdb9ed04f6b670ef67f2a45b94197bed73e546483d4ff4a91f293aee WHIRLPOOL 9a47b8611963679c6b614bf73547b5a1ae17f184332e5d94279baeaf116705bb96e7365293d078fc41c3a4f6e7b9f4b0c35712a8d520642225bf62dfda76342e
 EBUILD gpgme-1.5.1.ebuild 1138 SHA256 8a78ccea61247ad585b2edd2ba26ef257df641c33d167267aee2121e0f482250 SHA512 b7b526637fba15a1ee466b722d866a985ad0c1ef6d38d5ebf9e0d0fc25a4356abc9ad05ae126502f1c48e452c6d6ea67f720460d66da5308b6d4f000e8c854f1 WHIRLPOOL 0f77256f3686debf1619ebb98fa0037e35ace04e344ff4f4b27af6b495250b287613bbe7b5fb25b0940ef84fab184543b7fa9246209a179e5db0989857e7e271
index 9220e37..fc33a17 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.2.ebuild,v 1.9 2013/01/16 21:02:30 grobian Exp $
 
@@ -21,8 +21,8 @@ DEPEND="app-crypt/gnupg
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-       epatch "${FILESDIR}/${PN}-1.1.8-et_EE.patch"\
-              "${FILESDIR}/${P}-CVE-2014-3564.patch"
+       epatch "${FILESDIR}/${PN}-1.1.8-et_EE.patch"
+       epatch "${FILESDIR}/${P}-CVE-2014-3564.patch"
 
        eautoreconf
        elibtoolize
index 5bddb61..e6bb144 100644 (file)
@@ -4,6 +4,10 @@ AUX monkeysphere-0.36_non_default_port.patch 418 SHA256 7d20a74a0ec3d49b93d1d881
 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
+AUX monkeysphere-0.37_default_shell.patch 466 SHA256 637f4cf6e83ea01e5a981f940618127512ca1171498b0d03a7779d2b50e80124 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8 WHIRLPOOL 295bc1d61f26f214020f1ac753a002911e2d775a6d7e46e847b091980d385245be12961b79949d77826ead3852e5058c45b512f28a44a36f20afd3a8f98538d0
+AUX monkeysphere-0.37_hd_od.patch 528 SHA256 f09320e4e69b12e8756e927f5965a59a7b437be6aa22f7ab22a3d6dc449313ab SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55 WHIRLPOOL 6fe6a702b8e21b05f6fc1aa8e0b46ea0c90ab66dc488c0792815750d85958dbbd31d2a1994e92b89e827bc562b0450594a3553d15466d4141e56b15e2894ddfe
 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
 EBUILD monkeysphere-0.36-r2.ebuild 1747 SHA256 d52412909e031b21d5d559766ac6ff238767b995d558c1800f1a44d74b071968 SHA512 e6b89f01b1cfc9f0b17530dda9f83ff6263615ddb4096fe9b5fc0cccdcf00e6465d623f49be8d158743c9c654ce45b7004ce6f924d7f7d8904adbfa2299be1d4 WHIRLPOOL d8348fcfdcf6cefc8ebc1facb697d15e556b5d95284fa47e130615273108272d66464c4a13ec5a0348f05de2df65b3be047d6c3250d383e873d266be96f61c19
+EBUILD monkeysphere-0.37.ebuild 1476 SHA256 eabb78ff40a87448bff68a4fc918c82836974788c85004e685470d1f62f2db83 SHA512 628c3e6543252ff1c9b97e8dad7af6ca559e6e5cd76ed91e3a08375fe2825402ab23701d4e1d6fca2630376864a1a92e536dd0a63ec8bbcf299d130a34bcfdd3 WHIRLPOOL 1f09149c78d768a57e74236d7e46942f7f41f1d1860bf1e9df113683d8130a755d89c38a410851eecb7b5039f1387952a29265f3eccaed2bccc0da1a0cedf9e9
 MISC metadata.xml 209 SHA256 1395b5c18e78e85c534a39796fdd1d97be9e17d1800cca5e9a8b1341743f847c SHA512 ba9a5a751095aa33d737e0a6647b78f067497aad54ab0193a5aa2ec01c92a30f613ed85015f2ffda846acea85e892ea498b300f7ebae2e8f31c9cf3e4839db98 WHIRLPOOL b1d84fa003d98e38b81d14580a881417aac75958e924fcbad16cb8803b0b1e6831dc8fbfcb758d5b96e38c6f5f27bdc290bade36adb0a8d67121e169b7cbf2ff
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch
new file mode 100644 (file)
index 0000000..f979114
--- /dev/null
@@ -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.37_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch
new file mode 100644 (file)
index 0000000..7cdaa74
--- /dev/null
@@ -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/monkeysphere-0.37.ebuild b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
new file mode 100644 (file)
index 0000000..e943045
--- /dev/null
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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 ~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}_default_shell.patch"\
+              "${FILESDIR}/${P}_hd_od.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
+}