[arch-commits] Commit in gnupg/trunk (PKGBUILD keyring.patch)

[Gaëtan Bisson]

    Date: Thursday, April 27, 2017 @ 09:02:06
  Author: bisson
Revision: 294899

fix FS#53642

Added:
  gnupg/trunk/keyring.patch
Modified:
  gnupg/trunk/PKGBUILD

---------------+
 PKGBUILD      |    9 ++++++---
 keyring.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-27 08:24:17 UTC (rev 294898)
+++ PKGBUILD	2017-04-27 09:02:06 UTC (rev 294899)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.20
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,9 +20,11 @@
               '46CC730865BB5C78EBABADCF04376F3EE0856959'
               '031EC2536E580D8EA286A9F22071B08A33BD3F06'
               'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+        'keyring.patch')
 sha256sums=('24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d'
-            'SKIP')
+            'SKIP'
+            '23070daefc97bc7cca7e7a69539425135a9324a56bfadf54da2766ef6789d566')
 
 install=install
 
@@ -33,6 +35,7 @@
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in
+	patch -p1 -i ../keyring.patch
 }
 
 build() {

Added: keyring.patch
===================================================================
--- keyring.patch	                        (rev 0)
+++ keyring.patch	2017-04-27 09:02:06 UTC (rev 294899)
@@ -0,0 +1,44 @@
+From 116cfd60779fbb3540da629db54dc2e148f4a3a2 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe at fsij.org>
+Date: Tue, 25 Apr 2017 07:48:51 +0900
+Subject: [PATCH] g10: invalidate the fd cache for keyring.
+
+* g10/keyring.c (keyring_search_reset): Don't keep the FD cache.
+
+--
+
+GnuPG-bug-id: 3096
+Fixes-commit: 5556eca5acd46983bff0b38a1ffbc2f07fbaba9f
+Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
+---
+ g10/keyring.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/g10/keyring.c b/g10/keyring.c
+index 51b7687..e223f0f 100644
+--- a/g10/keyring.c
++++ b/g10/keyring.c
+@@ -663,7 +663,6 @@ keyring_search_reset (KEYRING_HANDLE hd)
+ {
+     log_assert (hd);
+ 
+-    hd->current.kr = NULL;
+     iobuf_close (hd->current.iobuf);
+     hd->current.iobuf = NULL;
+     hd->current.eof = 0;
+@@ -671,6 +670,12 @@ keyring_search_reset (KEYRING_HANDLE hd)
+ 
+     hd->found.kr = NULL;
+     hd->found.offset = 0;
++
++    if (hd->current.kr)
++      iobuf_ioctl (NULL, IOBUF_IOCTL_INVALIDATE_CACHE, 0,
++                   (char*)hd->current.kr->fname);
++    hd->current.kr = NULL;
++
+     return 0;
+ }
+ 
+-- 
+2.8.0.rc3
+