gentoo resync : 30.09.2020

12 files changed, 0 insertions, 567 deletions

diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index 721ad0572f40..84b975c9ae82 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -4,26 +4,11 @@ AUX monkeysphere-0.36_non_default_port.patch 418 BLAKE2B 8abc99d21b539e1b11eab3c
 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.37_default_shell.patch 466 BLAKE2B be3f2818c3d31400235fe413fb55ea79cdad0cf441a3a841465d11c9467f948f790337dfc1c07bd1bead1f3c58a3b157800b64eb9bc98ada7f263fd7b1c221f4 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8
-AUX monkeysphere-0.37_hd_od.patch 528 BLAKE2B 9ba0ae67297716b2379fc7141f6e60f0af68f9290654641946ad94fb6e04d16ede747bd334639c96c6f241e98331cba1373bf5a1c012a15460b58cffe0227ce3 SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55
-AUX monkeysphere-0.38-asprintf.patch 1569 BLAKE2B 2acab74551104685ff7735ba732362be00fcaa4e83326b52a36fda5ad514a5f367f03889e05181013531b1f1a15a36dbd80085cac6271f4484e399fd6839b150 SHA512 d750a948a9149c6110ca513743403588b4d861fbbe5c661401f4e0406d4ecbf03d9ca02e4eaf4f469aaa23925f2bc8dde4c155d72fadf26c02291e76571a6c70
-AUX monkeysphere-0.38-revert-executable-patch.patch 4379 BLAKE2B e599a5e13454aa9748c57d02df67f902b9337b345347622fdbdda428b0340a8672baef2ee254a17526077cc56eb2563b248a4bf42db8f24f374f139ffddfed4f SHA512 21c38c63200de7250ce90724f3dd51ee39fc2110f52b0815a592d4c49e7c32e08b3aa56b17b5a680e77727793768bed04938e7d3e85a15308ef894fbe2593f8b
-AUX monkeysphere-0.38-syssharedir-whitespace.patch 2408 BLAKE2B 89fa5bafb1c450216bdbabb7c202f2ad472c4a06720c976798852c2f8c996328e0da2dfc4c7bfaff212cd689609658976d5afa5795ed8c9c99eedc82d8ff7ca6 SHA512 7287ddcead490b188265c7bd001072125e5abe25431303853ba7bd512330d8bef9197b563745211dbde358a4107880915bd8489164be1dce72e46d9d790d2620
-AUX monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch 1700 BLAKE2B 81e72232976d71d7b3570c0fbb4852862997fe7e38e5858826fb1772fb8dbb51b1790e9c99bb6fcd082a54f0d9556ca0e05aa1ea34a2e5410da4ea6f4e938399 SHA512 1a23a1f02e98c86f45701105819ea1ff78f87132d7195ac2aebb0fda8c867b360e12ab8701c9579625af6d54851db30a93647c351ecbb3d99c5963b039628cbb
 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.37.orig.tar.gz 99557 BLAKE2B d32d127927bcf3494933282fcc343ffd32841a8afe84c78b9b29ae30fa374328295d3610475aacd8e2cf0962130c2a73b338c702dff4f904b6fd23b33ad0331b SHA512 ebf636caaa0985a2495314375a9d78d131173ccedc116993e02b7bbc0ddc8c43c718dc65cb725619ecf7e72e0b7e11b941f3eb342d7c23d17ca0507b2ab28512
-DIST monkeysphere_0.38.orig.tar.gz 107546 BLAKE2B 627b0fbed52e651d57fd359e79b91689eeca47ea58335125061cba72f863a582d39536504124e18805c39b3c43e5096edb6db0e32c5c80570689bd55e2936a3b SHA512 fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f4155557a8354cf38d89159422dca390f
-DIST monkeysphere_0.39.orig.tar.gz 107735 BLAKE2B 5e4df72c8c78f6325f79c93b7de1407af2ceb1d2b6be43476d3e0dc5b2505ae97c589deec2bcb64a7dbb3a661221891b89e126086d08df09aef07b07452344f7 SHA512 069acbc3e4f1409a130d4efc95875c72b9e4c55af6ff211fb954a90ff26605ecf9cdbbe7d7f7849de479cafaab7957a33fccefd5f2d54a2317f18bc5454190c2
 DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949 SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
-DIST monkeysphere_0.42.orig.tar.gz 110415 BLAKE2B 281ce2841b9f088f632aa6f487dc6b669911dc343bd2cbbe3dddfcc2ace9a1f2f747bfbb6d831c071a5ebae9c34d4809b1b1f90277e7d3fe1e8f0d42f363f52f SHA512 82e3b0f5f5532c75c1ccf2bd6269f7f4292f38956236fdb7813117a85ef36852b7d7c000552555ab0e233df9a84d7f4e5e86edd007bfcebdd6cde2e808f489f5
 DIST monkeysphere_0.44.orig.tar.gz 110289 BLAKE2B 8a067035d3a40436fd5c27291ab25f15d475d9a0f17b51259c0431c77841807af93cb04d045b77c5f5dda3cd0061ab52561fdb62a704715d0d8cbbf96cb43259 SHA512 cb3c655a08b1c0a382502f8609f57d0c870fe4491b1b967e9931bdfd146b3926470496577949630452e073f04442b91a1ef679254c0f3091a834f3429e0f8e93
-EBUILD monkeysphere-0.36-r1.ebuild 1187 BLAKE2B 6b0f8b0e240a372e13b1aaf0dd4f7fdbfd08093d2e8f9e0a3dc71e7590643eb814978573a9098a134f402470162459832040252bcb19657a958e7ede5caada87 SHA512 380cd2eb925360506c6a3237d642131c9a6e257e219d19d5b6902034b056f6984296f9f1621d81c012f75456658eb57487fa609a0748df7aa11397fc0d5b89bc
 EBUILD monkeysphere-0.36-r2.ebuild 1781 BLAKE2B 76df9b0b9204bdc2b9250b00e30660ac613c34efa3a2bff2f7a01aa05bf838455c8fd0dda653594619e0255b42ddf7ebcd8f5d3dc3ee65e949948d7249424395 SHA512 f6da7b96ffce5bc0e6eb4fa83df65f47b12882b65fe44f3c8e45b2d38387cc82de9185262ad6fe93a9cddb61929ea3651c7a30979a572dc9ac5a1d24550255f8
-EBUILD monkeysphere-0.37.ebuild 1459 BLAKE2B e9196602c64910a1cc816993c36fce60926354958403c78753cd9eaf5b737ecc6194639614387fa8bd65c4cfb398d0eb548583a95f2b20649f8d7ec575e7355a SHA512 5181dc7b06a7a5910bafe37438c152f54d4c0f6949cc6fc8a8e203324d16c345e18475c7a854709c722ff3d4d72c66b121a653c6f86d3a33a24ad16b0097f0c3
-EBUILD monkeysphere-0.38.ebuild 1612 BLAKE2B 4591fa6e98486ebf67ebfad50f20e272086422221448933652a687b6c857d35c5f50d8698188d07454d422357cfe5cbbe1c67fb27fccbc501ec9161579884f41 SHA512 f24a5d308d28b4435c5e02b55f113ba4d5ca8c75d458c65573663c1dd97b03ac43a08d9cf5ff8ea198e00a27653f129276f89f70421da7de26e709aba5f3e5ea
-EBUILD monkeysphere-0.39.ebuild 1441 BLAKE2B 588283fd2a272a963781f0ee4a6a1e24b157642a987bd4a54d40e82a3d5cca3d3cb8d408250a369916041abe16ae722824ad863ba4cb374144a0388cd4b841a6 SHA512 1eac7528acd605c46e1b0c869afc43e6e603b4f191650568b5ca9c478f22efdd0b41c31d09daf341309d8a31cdac8f2bc1ac29408f48315709a9923589f46b1a
 EBUILD monkeysphere-0.41.ebuild 1372 BLAKE2B a290eb661701e8e2e930a25c584d54fc9c31b9373e0d181ffaa03074d04b8c39c7540c9e2a5bb4fc4558354103d34d9ebcdee29a5d941b32a7be673f2efb7f9f SHA512 5f044379bf2b0577bd322685eed5951c6271e8b55ee8338ccc517fc239f743ee43160c32b8293e8a8c345ef395fea7845e1cb4ddc33a705f75c5ef25f227b91f
-EBUILD monkeysphere-0.42.ebuild 1371 BLAKE2B a2c27a481725a6167955da764046e66e10f03897c448b2852dac1006b3471a32ffef480bb610e2c9c5f9c1269bd9390c6ec50cf85883a97346b17aae9833a759 SHA512 6cec984b7674b6a7b38cc65ac9e46d796292c9a17535b726c699836acee7f1694a3cb2f01dc8217263eaf0df1ed95eb82913962756f7bbf95a83f74e41dc9d4f
 EBUILD monkeysphere-0.44.ebuild 1081 BLAKE2B 9c99e3a87ab77e83f1bc8c42c24142f5fbc318c9726c344a79d11508f0d767253e9d118dfade187bc7ecf023c53b0dd2d9dbea9896be3ecba1da030845b25aa4 SHA512 7228951f276d62d01e302f5dcba2cdebcbf0bf4e4dab2986b8d6f9332d4f1e7fa20eaa6a049d7744c15bd5c2eabb9ddaf3bfacc41f38a3244841b0d26ae49b7a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch
deleted file mode 100644
index f979114181d1..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.37_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.37_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch
deleted file mode 100644
index 7cdaa74b5735..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.37_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.38-asprintf.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch
deleted file mode 100644
index dbf9d5f590ca..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b756fd2e58ab013b5c9bfc2658ed9ad48868067c Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Sun, 7 Aug 2016 18:24:47 -0400
-Subject: [PATCH] avoid warning about unused asprintf return value
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-some versions of gcc produce this warning, which is treated as an
-error due to our conservative defaults in Makefile:
-
-src/agent-transfer/main.c: In function ‘main’:
-src/agent-transfer/main.c:676:5: error: ignoring return value of ‘asprintf’, declared with attribute warn_unused_result [-Werror=unused-result]
-     asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
-     ^
-cc1: all warnings being treated as errors
-
-this patch avoids the warning.
----
- src/agent-transfer/main.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/agent-transfer/main.c b/src/agent-transfer/main.c
-index 406aaa3..3038f5c 100644
---- a/src/agent-transfer/main.c
-+++ b/src/agent-transfer/main.c
-@@ -672,8 +672,13 @@ int main (int argc, const char* argv[]) {
-     return 1;
-   }
- 
--  if (!args.comment)
--    asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
-+  if (!args.comment) {
-+    err = asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
-+    if (err < 0) {
-+      fprintf (stderr, "failed to generate key comment\n");
-+      return 1;
-+    }
-+  }
-   
-   err = send_to_ssh_agent (&e, ssh_sock_fd, args.seconds, args.confirm,
-                            args.comment ? args.comment : alt_comment);
--- 
-2.7.3
-
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch
deleted file mode 100644
index 4d98c0a7cf5b..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From c75c7553a88e387013e2b4310f4c4956adfd8a98 Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Mon, 8 Aug 2016 20:45:07 -0400
-Subject: [PATCH 1/2] avoid treating src/share/common as an executable
-
-having src/share/common treated as an executable (commit
-ed10318d3760b56e57d5e1bef04ab57761ab8bd1) was actually a terrible
-idea.
-
-In addition to causing "monkeysphere version" to print the version
-number twice, it meant that any invocation of a monkeysphere command
-that sourced src/share/common and had a first argument that happened
-to be a function name would accidentally invoke that function.
-
-This commit reverts that idea.
----
- Makefile                   | 2 +-
- src/share/common           | 5 -----
- src/share/ma/add_certifier | 2 +-
- src/share/ma/update_users  | 2 +-
- src/share/mh/add_revoker   | 2 +-
- 5 files changed, 4 insertions(+), 9 deletions(-)
- mode change 100755 => 100644 src/share/common
-
-diff --git a/Makefile b/Makefile
-index 608a317..768564a 100755
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,7 @@ install: all installman
- 	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
- 	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
- 	install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
--	install -m 0755 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
-+	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
- 	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
- 	sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
- 	sed -i 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
-diff --git a/src/share/common b/src/share/common
-old mode 100755
-new mode 100644
-index 66181a3..b10a040
---- a/src/share/common
-+++ b/src/share/common
-@@ -1,4 +1,3 @@
--#!/usr/bin/env bash
- # -*-shell-script-*-
- # This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
- 
-@@ -1022,7 +1021,3 @@ report_cruft() {
- 	printf "The directories above are backups left over from a monkeysphere transition.\nThey may contain copies of sensitive data (host keys, certifier lists), but\nthey are no longer needed by monkeysphere.\nYou may remove them at any time.\n\n" | log info
-     fi
- }
--
--if [ -n "$1" ] && [ "$(type -t "$1" || true)" = "function" ]; then
--    "$@"
--fi
-diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
-index 1d450e7..5416aa9 100644
---- a/src/share/ma/add_certifier
-+++ b/src/share/ma/add_certifier
-@@ -101,7 +101,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
-     # check the key is ok as monkeysphere user before loading
-     log debug "checking keys in file..."
-     fingerprint=$(su_monkeysphere_user \
--	"${SYSSHAREDIR}/common" list_primary_fingerprints < "$keyID")
-+	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$keyID")
- 
-     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
- 	failure "There was not exactly one gpg key in the file."
-diff --git a/src/share/ma/update_users b/src/share/ma/update_users
-index d23c125..4f83e0c 100644
---- a/src/share/ma/update_users
-+++ b/src/share/ma/update_users
-@@ -79,7 +79,7 @@ for uname in $unames ; do
- 
- 	    # process authorized_user_ids file, as monkeysphere user
- 	    su_monkeysphere_user \
--		/usr/bin/env "STRICT_MODES=$STRICT_MODES" "${SYSSHAREDIR}/common" process_authorized_user_ids - \
-+		/usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c ". ${SYSSHAREDIR}/common && process_authorized_user_ids -" \
- 		< "$authorizedUserIDs" \
- 		> "$tmpAuthorizedKeys"
- 
-diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
-index 28b11ac..e00ac4e 100644
---- a/src/share/mh/add_revoker
-+++ b/src/share/mh/add_revoker
-@@ -52,7 +52,7 @@ if [ -f "$revokerKeyID" -o "$revokerKeyID" = '-' ] ; then
-     # check the key is ok as monkeysphere user before loading
-     log debug "checking keys in file..."
-     fingerprint=$(su_monkeysphere_user \
--	"${SYSSHAREDIR}/common" list_primary_fingerprints < "$revokerKeyID")
-+	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$revokerKeyID")
- 
-     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
- 	failure "There was not exactly one gpg key in the file."
--- 
-2.7.3
-
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch
deleted file mode 100644
index 65d3ba6a95aa..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0e339de4772b6de1849dc55790821c3dd5943be3 Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 9 Aug 2016 09:39:45 -0400
-Subject: [PATCH 2/2] ensure that this works even if SYSSHAREDIR has whitespace
-
----
- src/share/ma/add_certifier | 2 +-
- src/share/ma/update_users  | 2 +-
- src/share/mh/add_revoker   | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
-index 5416aa9..9488806 100644
---- a/src/share/ma/add_certifier
-+++ b/src/share/ma/add_certifier
-@@ -101,7 +101,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
-     # check the key is ok as monkeysphere user before loading
-     log debug "checking keys in file..."
-     fingerprint=$(su_monkeysphere_user \
--	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$keyID")
-+	bash -c "$(printf ". %q && list_primary_fingerprints" "${SYSSHAREDIR}/common")" < "$keyID")
- 
-     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
- 	failure "There was not exactly one gpg key in the file."
-diff --git a/src/share/ma/update_users b/src/share/ma/update_users
-index 4f83e0c..a0ec21b 100644
---- a/src/share/ma/update_users
-+++ b/src/share/ma/update_users
-@@ -79,7 +79,7 @@ for uname in $unames ; do
- 
- 	    # process authorized_user_ids file, as monkeysphere user
- 	    su_monkeysphere_user \
--		/usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c ". ${SYSSHAREDIR}/common && process_authorized_user_ids -" \
-+		/usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c "$(printf ". %q && process_authorized_user_ids -" "${SYSSHAREDIR}/common")"\
- 		< "$authorizedUserIDs" \
- 		> "$tmpAuthorizedKeys"
- 
-diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
-index e00ac4e..de08961 100644
---- a/src/share/mh/add_revoker
-+++ b/src/share/mh/add_revoker
-@@ -52,7 +52,7 @@ if [ -f "$revokerKeyID" -o "$revokerKeyID" = '-' ] ; then
-     # check the key is ok as monkeysphere user before loading
-     log debug "checking keys in file..."
-     fingerprint=$(su_monkeysphere_user \
--	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$revokerKeyID")
-+	bash -c "$(printf ". %q && list_primary_fingerprints" "${SYSSHAREDIR}/common")" < "$revokerKeyID")
- 
-     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
- 	failure "There was not exactly one gpg key in the file."
--- 
-2.7.3
-
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch b/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch
deleted file mode 100644
index 776e633b3d73..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b1dd8fb1b84c6eea25523c3ea746852b3dce6034 Mon Sep 17 00:00:00 2001
-From: Valo <valo@autoproduzioni.net>
-Date: Wed, 31 Aug 2016 14:00:05 -0400
-Subject: [PATCH] Make tests pass with GnuPG 2.1.15
-
-2.1.15 appears to always emit the fingerprint lines in these cases,
-while 2.1.14 did not.
----
- tests/keytrans | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/keytrans b/tests/keytrans
-index 3076e3f..5c7d2c8 100755
---- a/tests/keytrans
-+++ b/tests/keytrans
-@@ -140,7 +140,7 @@ uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest
- sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8
- EOF
- 
--diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
-+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
- 
- echo "##################################################"
- echo "### sleeping to avoid test suite breakage on fast"
-@@ -170,7 +170,7 @@ rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8
- EOF
- 
- 
--diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
-+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
- 
- 
- echo "##################################################"
-@@ -206,7 +206,7 @@ sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8
- EOF
- 
- echo "test: diff expected gpg list output"
--diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
-+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
- 
- sort >"$TEMPDIR"/expectedout <<EOF
- $KEYFPR
--- 
-2.7.3
-
diff --git a/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
deleted file mode 100644
index 953836fdace6..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
+++ /dev/null
@@ -1,57 +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/"
-SRC_URI="http://archive.${PN}.info/debian/pool/${PN}/${PN::1}/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~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" \
-		"${FILESDIR}/${P}_non_default_port.patch" \
-		"${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
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
deleted file mode 100644
index 7276dff3dadb..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 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()
-{
-	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
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.38.ebuild b/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
deleted file mode 100644
index a919d40924de..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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()
-{
-	epatch \
-		"${FILESDIR}/${P}-asprintf.patch" \
-		"${FILESDIR}/${P}-revert-executable-patch.patch" \
-		"${FILESDIR}/${P}-syssharedir-whitespace.patch" \
-		"${FILESDIR}/${PN}-0.37_default_shell.patch" \
-		"${FILESDIR}/${PN}-0.37_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
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.39.ebuild b/app-crypt/monkeysphere/monkeysphere-0.39.ebuild
deleted file mode 100644
index a7f0efd409b1..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.39.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 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()
-{
-	epatch "${FILESDIR}/${P}-make-tests-work-with-gnupg-2.1.15.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
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.42.ebuild b/app-crypt/monkeysphere/monkeysphere-0.42.ebuild
deleted file mode 100644
index 4223ab8f9879..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.42.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-}