gentoo resync : 13.05.2018

2 files changed, 0 insertions, 86 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index a937ab8177ff..888bf9332ed1 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,7 +1,6 @@
 AUX gnupg-2.1.20-gpg-Fix-typo.patch 843 BLAKE2B 6e7c56d54ef0b0a1e14030a7636bd35dedca8d22a49b6feb5616a474b150b90d703d9b928204946cc71016a84bea1183bba9ddd3323acb83a1d41027650fb61d SHA512 eb451eedb3e0282f3b7d10d0b12753a55b6bd92b2cdfc1dce5a9ffe1f0015cc598193193a8c8292371fb285517016d69ec70b7820f9dc0047e33b2e3f16214ed
 AUX gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch 2987 BLAKE2B eff568f4988b147a9d1aba77965222fcbfc2e9c3efef8eed9ce58f1c7058214ece62046435c90227d8fce1829f3131387f59598676d1359320f61b441018eb85 SHA512 2cf3147638c69f49b4d792a01321b5892f882fc67a1aee8f51f9b35761e6961e9c46d9abc92b0e5250a85b7145e69ba9583b3ce2323943587feb52a029e95deb
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
-AUX gnupg-2.2.1-fix-gnupg-wait.patch 2881 BLAKE2B 054c3de81a2ae70c7dea439cd66b9d5642510920af9ba48e4dab28c3457dad95f7ffd3ddb106dd4a5dacebfbedf225e88ad57934ee03a6b80da00ac03f7f944d SHA512 3622c1667c3f0b0acb28fd3ac440af76c0f2757e1d654fbd85344a1193a088db087861f7410e249ece5c99fd7afd7d7a24c43f58e88f5c21949195714be4cbf6
 AUX gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch 1342 BLAKE2B d494d544e9bbfd4115b58cc0117171d7792b44158e48032ddfdbacaff38cc5aebae4e1f1d46fa814ea40504441c8288937a5cfa7d475246cd301061176969e7c SHA512 171ae5092b9cab26446a2c4fe12137f5f1e92ba1d3c542a52900c14c488d902dfad84594473063f7eacb65ff7cefadb88239534498245f79f16ce8c58005f99c
 DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984
 DIST gnupg-2.1.15.tar.bz2 5723689 BLAKE2B 48889c0a5445b5b76b027debd6a4711930694e7440b76c06a7da1db5e7989eeae791e4c7a29e60a9d0b862c167374016d908aaa54165a44268f072075cdd9690 SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1
diff --git a/app-crypt/gnupg/files/gnupg-2.2.1-fix-gnupg-wait.patch b/app-crypt/gnupg/files/gnupg-2.2.1-fix-gnupg-wait.patch
deleted file mode 100644
index 6a2c18e9b63f..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.2.1-fix-gnupg-wait.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From eeb3da6eb717ed6a1a1069a7611eb37503e8672d Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Tue, 19 Sep 2017 12:28:43 +0900
-Subject: [PATCH 2/3] common: Fix gnupg_wait_processes.
-
-* common/exechelp-posix.c (gnupg_wait_processes): Loop for r_exitcodes
-even if we already see an error.
-
---
-
-The value stored by waitpid for exit code is encoded;  It requires
-decoded by WEXITSTATUS macro, regardless of an error.
-
-For example, when one of processes is already exited and another is
-still running, it resulted wrong value of in r_exitcodes[n].
-
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
----
- common/exechelp-posix.c | 50 +++++++++++++++++++++++++------------------------
- 1 file changed, 26 insertions(+), 24 deletions(-)
-
-diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
-index 7237993a2..3acf74ad6 100644
---- a/common/exechelp-posix.c
-+++ b/common/exechelp-posix.c
-@@ -784,30 +784,32 @@ gnupg_wait_processes (const char **pgmnames, pid_t *pids, size_t count,
-         }
-     }
- 
--  if (ec == 0)
--    for (i = 0; i < count; i++)
--      {
--        if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]) == 127)
--          {
--            log_error (_("error running '%s': probably not installed\n"),
--                       pgmnames[i]);
--            ec = GPG_ERR_CONFIGURATION;
--          }
--        else if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]))
--          {
--            if (dummy)
--              log_error (_("error running '%s': exit status %d\n"),
--                         pgmnames[i], WEXITSTATUS (r_exitcodes[i]));
--            else
--              r_exitcodes[i] = WEXITSTATUS (r_exitcodes[i]);
--            ec = GPG_ERR_GENERAL;
--          }
--        else if (!WIFEXITED (r_exitcodes[i]))
--          {
--            log_error (_("error running '%s': terminated\n"), pgmnames[i]);
--            ec = GPG_ERR_GENERAL;
--          }
--      }
-+  for (i = 0; i < count; i++)
-+    {
-+      if (r_exitcodes[i] == -1)
-+        continue;
-+
-+      if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]) == 127)
-+        {
-+          log_error (_("error running '%s': probably not installed\n"),
-+                     pgmnames[i]);
-+          ec = GPG_ERR_CONFIGURATION;
-+        }
-+      else if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]))
-+        {
-+          if (dummy)
-+            log_error (_("error running '%s': exit status %d\n"),
-+                       pgmnames[i], WEXITSTATUS (r_exitcodes[i]));
-+          else
-+            r_exitcodes[i] = WEXITSTATUS (r_exitcodes[i]);
-+          ec = GPG_ERR_GENERAL;
-+        }
-+      else if (!WIFEXITED (r_exitcodes[i]))
-+        {
-+          log_error (_("error running '%s': terminated\n"), pgmnames[i]);
-+          ec = GPG_ERR_GENERAL;
-+        }
-+    }
- 
-   xfree (dummy);
-   return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec);
--- 
-2.13.5
-