diff options
Diffstat (limited to 'app-crypt/monkeysphere')
10 files changed, 3 insertions, 270 deletions
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest index 84b975c9ae82..e99f86e90380 100644 --- a/app-crypt/monkeysphere/Manifest +++ b/app-crypt/monkeysphere/Manifest @@ -1,14 +1,4 @@ -AUX monkeysphere-0.36_default_shell.patch 466 BLAKE2B be3f2818c3d31400235fe413fb55ea79cdad0cf441a3a841465d11c9467f948f790337dfc1c07bd1bead1f3c58a3b157800b64eb9bc98ada7f263fd7b1c221f4 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8 -AUX monkeysphere-0.36_hd_od.patch 528 BLAKE2B 9ba0ae67297716b2379fc7141f6e60f0af68f9290654641946ad94fb6e04d16ede747bd334639c96c6f241e98331cba1373bf5a1c012a15460b58cffe0227ce3 SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55 -AUX monkeysphere-0.36_non_default_port.patch 418 BLAKE2B 8abc99d21b539e1b11eab3c689783646c15337e3276c55baf8ef43577fc08c1cd68c85f6555a8685ba1741988e0f2ae31b757795a40ecd30411b00e05958799b SHA512 2a173500e0b659a79a7274e042e49a282f708cda0f6a78ce8fa126013e35c4f6f117e606b90ce31da5158e58ab52a236038a913cc98c5ae1fc8e04a5dcbf816e -AUX monkeysphere-0.36_openpgp2ssh_sanity_check.patch 1194 BLAKE2B af75804e5ea457c63e6e904e2f1ffde393e3ab06a8222527b825212f44b253ad7d418a1d10a6abd2204332065a2ba5bbbdff09a14181f0fc8bcac6808cdc64fd SHA512 b14c421e5880407b3acb845b235c89c5338a1fc1285b514679de09371db38e42aa3371ef2916c57d5ab10f08bc19f5c864762ff7eaf0a054d2817bc6bcaab488 -AUX monkeysphere-0.36_tests_gnupg2.patch 2272 BLAKE2B fd690dfe4fd357f7a6c551698c8cc897d2c5f34ae44fffd77f4a63de9a25173b3f84dfe7aa3877cd0c724650de250c72ee55f63e1aa658421188658691f02270 SHA512 e75f82793419dd2e99aa95765e9d954437d0e78294ed4188a9e7fa246b85ddbcd755eb566a1e9a9c20f2f2634150d65caa0715993863f59f9146f5cc95457975 -AUX monkeysphere-0.36_userid_empty_line.patch 292 BLAKE2B 5ce813bca6235a365d69f3c8d19b6f39dbb981af57e8171efeeb921f2e0b9c4e73c531838a87e3275809e427a3d7b7e75ad88341ab3dc05a5258f6a7fab6af6d SHA512 15b8e8ff71537e79d069d0f298326cc6705931c58ff1cf2f16c5486e587fe69f610dc1e0ebd0006e0bdef12f936685a0594dc3f9dbdadb928fba25a8e2982eb7 AUX monkeysphere-0.44-install-uncompressed-man-pages.patch 1580 BLAKE2B 54db4bdeb8d93406d6f9fa222118c98e0a1cfbbdaaf02f280024a41a9c4842aecbbcd6735cdc9ed9949e0e5463f8bf940b642b632c385d48d4dcf36a28a1cd69 SHA512 c4c677e08130ac01a3e98ba21f5e68e5bd7ce4765b44ed91ca5e0506d22937fc13f1a0dfdcd86f1e093e666882452b112a52b954d5f33ee73a47381a28d2e11c -DIST monkeysphere_0.36.orig.tar.gz 98876 BLAKE2B 5f8dcd5349cd038208fcc00dff19c7d001ca8b763f223e832c820bc4f09391ff78667f80af691c0234aed810f4d5aa77d26a378a88b41a4b115ab528e0cdd9ed SHA512 eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8 -DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949 SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962 DIST monkeysphere_0.44.orig.tar.gz 110289 BLAKE2B 8a067035d3a40436fd5c27291ab25f15d475d9a0f17b51259c0431c77841807af93cb04d045b77c5f5dda3cd0061ab52561fdb62a704715d0d8cbbf96cb43259 SHA512 cb3c655a08b1c0a382502f8609f57d0c870fe4491b1b967e9931bdfd146b3926470496577949630452e073f04442b91a1ef679254c0f3091a834f3429e0f8e93 -EBUILD monkeysphere-0.36-r2.ebuild 1781 BLAKE2B 76df9b0b9204bdc2b9250b00e30660ac613c34efa3a2bff2f7a01aa05bf838455c8fd0dda653594619e0255b42ddf7ebcd8f5d3dc3ee65e949948d7249424395 SHA512 f6da7b96ffce5bc0e6eb4fa83df65f47b12882b65fe44f3c8e45b2d38387cc82de9185262ad6fe93a9cddb61929ea3651c7a30979a572dc9ac5a1d24550255f8 -EBUILD monkeysphere-0.41.ebuild 1372 BLAKE2B a290eb661701e8e2e930a25c584d54fc9c31b9373e0d181ffaa03074d04b8c39c7540c9e2a5bb4fc4558354103d34d9ebcdee29a5d941b32a7be673f2efb7f9f SHA512 5f044379bf2b0577bd322685eed5951c6271e8b55ee8338ccc517fc239f743ee43160c32b8293e8a8c345ef395fea7845e1cb4ddc33a705f75c5ef25f227b91f -EBUILD monkeysphere-0.44.ebuild 1081 BLAKE2B 9c99e3a87ab77e83f1bc8c42c24142f5fbc318c9726c344a79d11508f0d767253e9d118dfade187bc7ecf023c53b0dd2d9dbea9896be3ecba1da030845b25aa4 SHA512 7228951f276d62d01e302f5dcba2cdebcbf0bf4e4dab2986b8d6f9332d4f1e7fa20eaa6a049d7744c15bd5c2eabb9ddaf3bfacc41f38a3244841b0d26ae49b7a +EBUILD monkeysphere-0.44.ebuild 1079 BLAKE2B d464af629e7a4c91046bb6ff72c275f2b1b4ae8bdf3b8693d92877d3aa76209917e28441be92d553f506cad07f22e7155fc37e64f193f4a3fcfdfc33c9aa2568 SHA512 be037180395aaaeed4e1de486309f21e3ed7a73c6107ad96cec25493e3b09b1465640bd6881cf1b323c907f2540c50ed2010178a02566951065f6b192cc78e0b MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch deleted file mode 100644 index f979114181d1..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch +++ /dev/null @@ -1,12 +0,0 @@ -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_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch deleted file mode 100644 index 7cdaa74b5735..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch +++ /dev/null @@ -1,14 +0,0 @@ -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_non_default_port.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch deleted file mode 100644 index f14550280fcf..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch +++ /dev/null @@ -1,14 +0,0 @@ -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_openpgp2ssh_sanity_check.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch deleted file mode 100644 index aec90eb07661..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 712734459054..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch +++ /dev/null @@ -1,50 +0,0 @@ -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/files/monkeysphere-0.36_userid_empty_line.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch deleted file mode 100644 index 70c7cffe7dc4..000000000000 --- a/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/monkeysphere-0.36-r2.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild deleted file mode 100644 index 63a671e3e588..000000000000 --- a/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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="~amd64 ~arm ~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 -} diff --git a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild deleted file mode 100644 index fc2a5255bbe5..000000000000 --- a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ~arm 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() -{ - sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die -} - -src_install() -{ - default - dodir /var/lib/monkeysphere -} - -pkg_postinst() -{ - monkeysphere-authentication setup || die -} diff --git a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild index 63b1bd885e78..c22ae2b8f88c 100644 --- a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild +++ b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ 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 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" DOCS=( README Changelog ) |