[arch-commits] Commit in gnupg/repos (12 files)

Gaëtan Bisson bisson at archlinux.org
Sun May 7 20:41:54 UTC 2017


    Date: Sunday, May 7, 2017 @ 20:41:53
  Author: bisson
Revision: 295442

db-move: moved gnupg from [testing] to [core] (i686, x86_64)

Added:
  gnupg/repos/core-i686/PKGBUILD
    (from rev 295441, gnupg/repos/testing-i686/PKGBUILD)
  gnupg/repos/core-i686/install
    (from rev 295441, gnupg/repos/testing-i686/install)
  gnupg/repos/core-i686/keyring.patch
    (from rev 295441, gnupg/repos/testing-i686/keyring.patch)
  gnupg/repos/core-x86_64/PKGBUILD
    (from rev 295441, gnupg/repos/testing-x86_64/PKGBUILD)
  gnupg/repos/core-x86_64/install
    (from rev 295441, gnupg/repos/testing-x86_64/install)
  gnupg/repos/core-x86_64/keyring.patch
    (from rev 295441, gnupg/repos/testing-x86_64/keyring.patch)
Deleted:
  gnupg/repos/core-i686/PKGBUILD
  gnupg/repos/core-i686/install
  gnupg/repos/core-x86_64/PKGBUILD
  gnupg/repos/core-x86_64/install
  gnupg/repos/testing-i686/
  gnupg/repos/testing-x86_64/

---------------------------+
 /PKGBUILD                 |  140 ++++++++++++++++++++++++++++++++++++++++++++
 /install                  |   20 ++++++
 core-i686/PKGBUILD        |   67 ---------------------
 core-i686/install         |   10 ---
 core-i686/keyring.patch   |   44 +++++++++++++
 core-x86_64/PKGBUILD      |   67 ---------------------
 core-x86_64/install       |   10 ---
 core-x86_64/keyring.patch |   44 +++++++++++++
 8 files changed, 248 insertions(+), 154 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2017-05-07 20:41:43 UTC (rev 295441)
+++ core-i686/PKGBUILD	2017-05-07 20:41:53 UTC (rev 295442)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Judd Vinet <jvinet at zeroflux.org>
-
-pkgname=gnupg
-pkgver=2.1.20
-pkgrel=1
-pkgdesc='Complete and free implementation of the OpenPGP standard'
-url='http://www.gnupg.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-optdepends=('libldap: gpg2keys_ldap'
-            'libusb-compat: scdaemon')
-makedepends=('libldap' 'libusb-compat')
-depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
-         'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
-              '46CC730865BB5C78EBABADCF04376F3EE0856959'
-              '031EC2536E580D8EA286A9F22071B08A33BD3F06'
-              'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d'
-            'SKIP')
-
-install=install
-
-conflicts=('dirmngr' 'gnupg2')
-provides=('dirmngr' "gnupg2=${pkgver}")
-replaces=('dirmngr' 'gnupg2')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--sbindir=/usr/bin \
-		--libexecdir=/usr/lib/gnupg \
-		--enable-maintainer-mode \
-		--enable-symcryptrun \
-
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make check
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	ln -s gpg2 "${pkgdir}"/usr/bin/gpg
-	ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
-	ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
-
-	cd doc/examples/systemd-user
-	for i in *.*; do
-		install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
-	done
-}

Copied: gnupg/repos/core-i686/PKGBUILD (from rev 295441, gnupg/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2017-05-07 20:41:53 UTC (rev 295442)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=gnupg
+pkgver=2.1.20
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+            'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+         'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+              '46CC730865BB5C78EBABADCF04376F3EE0856959'
+              '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+              'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+        'keyring.patch')
+sha256sums=('24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d'
+            'SKIP'
+            '23070daefc97bc7cca7e7a69539425135a9324a56bfadf54da2766ef6789d566')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+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() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--sbindir=/usr/bin \
+		--libexecdir=/usr/lib/gnupg \
+		--enable-maintainer-mode \
+		--enable-symcryptrun \
+
+	make
+}
+
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make check
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+	ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+	ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+
+	cd doc/examples/systemd-user
+	for i in *.*; do
+		install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
+	done
+}

Deleted: core-i686/install
===================================================================
--- core-i686/install	2017-05-07 20:41:43 UTC (rev 295441)
+++ core-i686/install	2017-05-07 20:41:53 UTC (rev 295442)
@@ -1,10 +0,0 @@
-post_install() {
-	# See FS#42798 and FS#47371
-	dirmngr </dev/null &>/dev/null || true
-}
-
-post_upgrade() {
-	if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
-		echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
-	fi
-}

Copied: gnupg/repos/core-i686/install (from rev 295441, gnupg/repos/testing-i686/install)
===================================================================
--- core-i686/install	                        (rev 0)
+++ core-i686/install	2017-05-07 20:41:53 UTC (rev 295442)
@@ -0,0 +1,10 @@
+post_install() {
+	# See FS#42798 and FS#47371
+	dirmngr </dev/null &>/dev/null || true
+}
+
+post_upgrade() {
+	if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
+		echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
+	fi
+}

Copied: gnupg/repos/core-i686/keyring.patch (from rev 295441, gnupg/repos/testing-i686/keyring.patch)
===================================================================
--- core-i686/keyring.patch	                        (rev 0)
+++ core-i686/keyring.patch	2017-05-07 20:41:53 UTC (rev 295442)
@@ -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
+

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2017-05-07 20:41:43 UTC (rev 295441)
+++ core-x86_64/PKGBUILD	2017-05-07 20:41:53 UTC (rev 295442)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Judd Vinet <jvinet at zeroflux.org>
-
-pkgname=gnupg
-pkgver=2.1.20
-pkgrel=1
-pkgdesc='Complete and free implementation of the OpenPGP standard'
-url='http://www.gnupg.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-optdepends=('libldap: gpg2keys_ldap'
-            'libusb-compat: scdaemon')
-makedepends=('libldap' 'libusb-compat')
-depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
-         'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
-              '46CC730865BB5C78EBABADCF04376F3EE0856959'
-              '031EC2536E580D8EA286A9F22071B08A33BD3F06'
-              'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d'
-            'SKIP')
-
-install=install
-
-conflicts=('dirmngr' 'gnupg2')
-provides=('dirmngr' "gnupg2=${pkgver}")
-replaces=('dirmngr' 'gnupg2')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--sbindir=/usr/bin \
-		--libexecdir=/usr/lib/gnupg \
-		--enable-maintainer-mode \
-		--enable-symcryptrun \
-
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make check
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	ln -s gpg2 "${pkgdir}"/usr/bin/gpg
-	ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
-	ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
-
-	cd doc/examples/systemd-user
-	for i in *.*; do
-		install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
-	done
-}

Copied: gnupg/repos/core-x86_64/PKGBUILD (from rev 295441, gnupg/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2017-05-07 20:41:53 UTC (rev 295442)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=gnupg
+pkgver=2.1.20
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+            'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+         'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+              '46CC730865BB5C78EBABADCF04376F3EE0856959'
+              '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+              'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+        'keyring.patch')
+sha256sums=('24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d'
+            'SKIP'
+            '23070daefc97bc7cca7e7a69539425135a9324a56bfadf54da2766ef6789d566')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+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() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--sbindir=/usr/bin \
+		--libexecdir=/usr/lib/gnupg \
+		--enable-maintainer-mode \
+		--enable-symcryptrun \
+
+	make
+}
+
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make check
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+	ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+	ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+
+	cd doc/examples/systemd-user
+	for i in *.*; do
+		install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
+	done
+}

Deleted: core-x86_64/install
===================================================================
--- core-x86_64/install	2017-05-07 20:41:43 UTC (rev 295441)
+++ core-x86_64/install	2017-05-07 20:41:53 UTC (rev 295442)
@@ -1,10 +0,0 @@
-post_install() {
-	# See FS#42798 and FS#47371
-	dirmngr </dev/null &>/dev/null || true
-}
-
-post_upgrade() {
-	if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
-		echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
-	fi
-}

Copied: gnupg/repos/core-x86_64/install (from rev 295441, gnupg/repos/testing-x86_64/install)
===================================================================
--- core-x86_64/install	                        (rev 0)
+++ core-x86_64/install	2017-05-07 20:41:53 UTC (rev 295442)
@@ -0,0 +1,10 @@
+post_install() {
+	# See FS#42798 and FS#47371
+	dirmngr </dev/null &>/dev/null || true
+}
+
+post_upgrade() {
+	if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
+		echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
+	fi
+}

Copied: gnupg/repos/core-x86_64/keyring.patch (from rev 295441, gnupg/repos/testing-x86_64/keyring.patch)
===================================================================
--- core-x86_64/keyring.patch	                        (rev 0)
+++ core-x86_64/keyring.patch	2017-05-07 20:41:53 UTC (rev 295442)
@@ -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
+



More information about the arch-commits mailing list