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

[Levente Polyak via arch-commits]

Date: Wednesday, December 2, 2020 @ 10:33:14
  Author: anthraxx
Revision: 402772

upgpkg: gnupg 2.2.25-1

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-02 10:23:01 UTC (rev 402771)
+++ PKGBUILD2020-12-02 10:33:14 UTC (rev 402772)
@@ -6,7 +6,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.24
+pkgver=2.2.25
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -29,7 +29,7 @@
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 'drop-import-clean.patch'
 'avoid-beta-warning.patch')
-sha256sums=('9090b400faae34f08469d78000cfec1cee5b9c553ce11347cc96ef16eab98c46'
+sha256sums=('c55307b247af4b6f44d2916a25ffd1fb64ce2e509c3c3d028dbe7fbf309dc30a'
 'SKIP'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')

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

[Levente Polyak via arch-commits]

Date: Thursday, November 19, 2020 @ 21:02:15
  Author: anthraxx
Revision: 401452

upgpkg: gnupg 2.2.24-1

New signing key authenticated by old (root) signing key:
D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 # Werner Koch (dist sig)
and additionally on their website (which of cause is itself not a
proof).

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-19 20:57:35 UTC (rev 401451)
+++ PKGBUILD2020-11-19 21:02:15 UTC (rev 401452)
@@ -6,7 +6,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.23
+pkgver=2.2.24
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -14,25 +14,25 @@
 arch=('x86_64')
 checkdepends=('openssh')
 makedepends=('libldap' 'libusb-compat' 'pcsclite')
-depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
- 'pinentry' 'bzip2' 'readline' 'libreadline.so' 'gnutls'
- 'sqlite' 'zlib' 'glibc')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' 'pinentry'
+ 'bzip2' 'libbz2.so' 'readline' 'libreadline.so' 'gnutls' 'sqlite'
+ 'zlib' 'glibc')
 optdepends=('libldap: gpg2keys_ldap'
 'libusb-compat: scdaemon'
 'pcsclite: scdaemon')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
-  '46CC730865BB5C78EBABADCF04376F3EE0856959'
-  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
-  '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
+validpgpkeys=(
+   'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
+   '031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG 
Release Key) 
+   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release 
Signing Key)
+   '6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 
2020)
+)
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 'drop-import-clean.patch'
-'avoid-beta-warning.patch'
-'do-not-rebuild-defsincdate.patch')
-sha256sums=('10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c'
+'avoid-beta-warning.patch')
+sha256sums=('9090b400faae34f08469d78000cfec1cee5b9c553ce11347cc96ef16eab98c46'
 'SKIP'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
-'22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
-'bb4dcba0328af6271ccfe992a64d8daa9f0a691ba52978491647f1dea05675ee')
+'22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
 
 install=install
 
@@ -42,7 +42,6 @@
patch -p1 -i ../drop-import-clean.patch
 
# improve reproducibility
-   patch -p1 -i ../do-not-rebuild-defsincdate.patch
rm doc/gnupg.info*
 
./autogen.sh

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

[Levente Polyak via arch-commits]

Date: Thursday, September 3, 2020 @ 17:43:32
  Author: anthraxx
Revision: 395394

upgpkg: gnupg 2.2.23-1

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |   20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-03 17:42:19 UTC (rev 395393)
+++ PKGBUILD2020-09-03 17:43:32 UTC (rev 395394)
@@ -1,11 +1,13 @@
-# Maintainer: Gaetan Bisson 
+# Maintainer: Levente Polyak 
+# Maintainer: Lukas Fleischer 
+# Contributor: Gaetan Bisson 
 # Contributor: Tobias Powalowski 
 # Contributor: Andreas Radke 
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.21
-pkgrel=2
+pkgver=2.2.23
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -13,7 +15,8 @@
 checkdepends=('openssh')
 makedepends=('libldap' 'libusb-compat' 'pcsclite')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
- 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+ 'pinentry' 'bzip2' 'readline' 'libreadline.so' 'gnutls'
+ 'sqlite' 'zlib' 'glibc')
 optdepends=('libldap: gpg2keys_ldap'
 'libusb-compat: scdaemon'
 'pcsclite: scdaemon')
@@ -25,7 +28,7 @@
 'drop-import-clean.patch'
 'avoid-beta-warning.patch'
 'do-not-rebuild-defsincdate.patch')
-sha256sums=('61e83278fb5fa7336658a8b73ab26f379d41275bb1c7c6e694dd9f9a6e8e76ec'
+sha256sums=('10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c'
 'SKIP'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
@@ -69,8 +72,7 @@
ln -s gpg "${pkgdir}"/usr/bin/gpg2
ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
 
-   cd doc/examples/systemd-user
-   for i in *.*; do
-   install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
-   done
+   install -Dm 644 doc/examples/systemd-user/*.* -t 
"${pkgdir}/usr/lib/systemd/user"
 }
+
+# vim: ts=2 sw=2 noet:

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

[Evangelos Foutras via arch-commits]

Date: Sunday, August 30, 2020 @ 11:02:07
  Author: foutrelis
Revision: 394967

upgpkg: gnupg 2.2.21-2: rebuild bisson's pkgs

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-30 10:56:51 UTC (rev 394966)
+++ PKGBUILD2020-08-30 11:02:07 UTC (rev 394967)
@@ -5,7 +5,7 @@
 
 pkgname=gnupg
 pkgver=2.2.21
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')

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

[Gaëtan Bisson via arch-commits]

Date: Wednesday, June 3, 2020 @ 23:48:22
  Author: bisson
Revision: 388240

implement FS#66884

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/gpg-zip.patch

---+
 PKGBUILD  |5 +
 gpg-zip.patch |   27 ---
 2 files changed, 1 insertion(+), 31 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-03 23:29:01 UTC (rev 388239)
+++ PKGBUILD2020-06-03 23:48:22 UTC (rev 388240)
@@ -5,7 +5,7 @@
 
 pkgname=gnupg
 pkgver=2.2.20
-pkgrel=3
+pkgrel=4
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -22,13 +22,11 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-'gpg-zip.patch'
 'drop-import-clean.patch'
 'avoid-beta-warning.patch'
 'do-not-rebuild-defsincdate.patch')
 sha256sums=('04a7c9d48b74c399168ee8270e548588ddbe52218c337703d7f06373d326ca30'
 'SKIP'
-'ddcd1f125cb2efda187ef8374a7440b491eb9f338db1772af497e50fdd367eb5'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
 '01fee1b04358e5dce76894214bb263e9a75cf408eb1277fad5b751ab3d45b87a')
@@ -39,7 +37,6 @@
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ../avoid-beta-warning.patch
patch -p1 -i ../drop-import-clean.patch
-   patch -p1 -i ../gpg-zip.patch
 
# improve reproducibility
patch -p1 -i ../do-not-rebuild-defsincdate.patch

Deleted: gpg-zip.patch
===
--- gpg-zip.patch   2020-06-03 23:29:01 UTC (rev 388239)
+++ gpg-zip.patch   2020-06-03 23:48:22 UTC (rev 388240)
@@ -1,27 +0,0 @@
-From 4d07d80b662913de3935829cd783b5b6f38dccd4 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" 
-Date: Wed, 3 Jun 2020 23:53:04 +0200
-Subject: [PATCH 1/7] install gpg-zip
-

- tools/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 0c828a7bd..d9aa7d010 100644
 a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -35,8 +35,8 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) 
$(LIBASSUAN_CFLAGS)
- sbin_SCRIPTS = addgnupghome applygnupgdefaults
- 
- if HAVE_USTAR
--# bin_SCRIPTS += gpg-zip
--noinst_SCRIPTS = gpg-zip
-+bin_SCRIPTS = gpg-zip
-+# noinst_SCRIPTS = gpg-zip
- endif
- 
- if BUILD_SYMCRYPTRUN
--- 
-2.27.0
-

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

[Allan McRae via arch-commits]

Date: Sunday, May 24, 2020 @ 06:05:19
  Author: allan
Revision: 387476

upgpkg: gnupg 2.2.20-2: fix for reproducibility

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-24 00:21:22 UTC (rev 387475)
+++ PKGBUILD2020-05-24 06:05:19 UTC (rev 387476)
@@ -5,7 +5,7 @@
 
 pkgname=gnupg
 pkgver=2.2.20
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -33,6 +33,9 @@
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
patch -R -p1 -i ../self-sigs-only.patch
+
+   # remove to ensure this is built for reproducibility
+   rm doc/gnupg.info*
 }
 
 build() {

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

[Gaëtan Bisson via arch-commits]

Date: Friday, March 20, 2020 @ 21:51:36
  Author: bisson
Revision: 378017

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-20 17:59:24 UTC (rev 378016)
+++ PKGBUILD2020-03-20 21:51:36 UTC (rev 378017)
@@ -4,7 +4,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.19
+pkgver=2.2.20
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -23,7 +23,7 @@
   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 'self-sigs-only.patch')
-sha256sums=('242554c0e06f3a83c420b052f750b65ead711cc3fb5e7274fcdbb4e9dec0'
+sha256sums=('04a7c9d48b74c399168ee8270e548588ddbe52218c337703d7f06373d326ca30'
 'SKIP'
 '0130c43321c16f53ab2290833007212f8a26b1b73bd4edc2b2b1c9db2b2d0218')
 

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

[Gaëtan Bisson via arch-commits]

Date: Monday, November 25, 2019 @ 22:39:58
  Author: bisson
Revision: 369777

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-25 22:16:06 UTC (rev 369776)
+++ PKGBUILD2019-11-25 22:39:58 UTC (rev 369777)
@@ -4,8 +4,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.17
-pkgrel=3
+pkgver=2.2.18
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -23,7 +23,7 @@
   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 'self-sigs-only.patch')
-sha256sums=('afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514'
+sha256sums=('30d37ce2ca55b2b9b61480b2a175a3b22066ab41cd3f84688448919b566dec0a'
 'SKIP'
 '0130c43321c16f53ab2290833007212f8a26b1b73bd4edc2b2b1c9db2b2d0218')
 

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

[Felix Yan via arch-commits]

Date: Wednesday, November 13, 2019 @ 17:16:37
  Author: felixonmars
Revision: 368315

[core] mass rebuild

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 17:16:19 UTC (rev 368314)
+++ PKGBUILD2019-11-13 17:16:37 UTC (rev 368315)
@@ -5,7 +5,7 @@
 
 pkgname=gnupg
 pkgver=2.2.17
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')

[arch-commits] Commit in gnupg/trunk (PKGBUILD self-sigs-only.patch)

[Gaëtan Bisson via arch-commits]

Date: Thursday, July 11, 2019 @ 16:55:22
  Author: bisson
Revision: 357760

revert import-self-sigs-only, breaks WOT, see FS#63147

Added:
  gnupg/trunk/self-sigs-only.patch
Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |9 +--
 self-sigs-only.patch |   56 +
 2 files changed, 62 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-11 16:18:45 UTC (rev 357759)
+++ PKGBUILD2019-07-11 16:55:22 UTC (rev 357760)
@@ -5,7 +5,7 @@
 
 pkgname=gnupg
 pkgver=2.2.17
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -21,9 +21,11 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'self-sigs-only.patch')
 sha256sums=('afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514'
-'SKIP')
+'SKIP'
+'0130c43321c16f53ab2290833007212f8a26b1b73bd4edc2b2b1c9db2b2d0218')
 
 install=install
 
@@ -30,6 +32,7 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -R -p1 -i ../self-sigs-only.patch
 }
 
 build() {

Added: self-sigs-only.patch
===
--- self-sigs-only.patch(rev 0)
+++ self-sigs-only.patch2019-07-11 16:55:22 UTC (rev 357760)
@@ -0,0 +1,56 @@
+From: Werner Koch 
+Date: Thu, 4 Jul 2019 13:45:39 + (+0200)
+Subject: gpg: Add "self-sigs-only" and "import-clean" to the keyserver options.
+X-Git-Url: 
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=23c978640812d123eaffd4108744bdfcf48f7c93
+
+gpg: Add "self-sigs-only" and "import-clean" to the keyserver options.
+
+* g10/gpg.c (main): Change default.
+--
+
+Due to the DoS attack on the keyeservers we do not anymore default to
+import key signatures.  That makes the keyserver unsuable for getting
+keys for the WoT but it still allows to retriev keys - even if that
+takes long to download the large keyblocks.
+
+To revert to the old behavior add
+
+  keyserver-optiions  no-self-sigs-only,no-import-clean
+
+to gpg.conf.
+
+GnuPG-bug-id: 4607
+Signed-off-by: Werner Koch 
+---
+
+diff --git a/doc/gpg.texi b/doc/gpg.texi
+index 8feab8218..9513a4e0f 100644
+--- a/doc/gpg.texi
 b/doc/gpg.texi
+@@ -1917,6 +1917,11 @@ are available for all keyserver types, some common 
options are:
+ 
+ @end table
+ 
++The default list of options is: "self-sigs-only, import-clean,
++repair-keys, repair-pks-subkey-bug, export-attributes,
++honor-pka-record".
++
++
+ @item --completes-needed @var{n}
+ @opindex compliant-needed
+ Number of completely trusted users to introduce a new
+diff --git a/g10/gpg.c b/g10/gpg.c
+index 66e47dde5..0bbe72394 100644
+--- a/g10/gpg.c
 b/g10/gpg.c
+@@ -2424,7 +2424,9 @@ main (int argc, char **argv)
+ opt.import_options = IMPORT_REPAIR_KEYS;
+ opt.export_options = EXPORT_ATTRIBUTES;
+ opt.keyserver_options.import_options = (IMPORT_REPAIR_KEYS
+-  | IMPORT_REPAIR_PKS_SUBKEY_BUG);
++  | IMPORT_REPAIR_PKS_SUBKEY_BUG
++| IMPORT_SELF_SIGS_ONLY
++| IMPORT_CLEAN);
+ opt.keyserver_options.export_options = EXPORT_ATTRIBUTES;
+ opt.keyserver_options.options = KEYSERVER_HONOR_PKA_RECORD;
+ opt.verify_options = (LIST_SHOW_UID_VALIDITY

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

[Gaëtan Bisson via arch-commits]

Date: Wednesday, July 10, 2019 @ 12:35:26
  Author: bisson
Revision: 357507

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-10 11:43:35 UTC (rev 357506)
+++ PKGBUILD2019-07-10 12:35:26 UTC (rev 357507)
@@ -4,7 +4,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.16
+pkgver=2.2.17
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('6cbe8d454bf5dc204621eed3016d721b66298fa95363395bb8eeceb1d2fd14cb'
+sha256sums=('afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson via arch-commits]

Date: Tuesday, May 28, 2019 @ 19:33:40
  Author: bisson
Revision: 354459

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-28 19:05:56 UTC (rev 354458)
+++ PKGBUILD2019-05-28 19:33:40 UTC (rev 354459)
@@ -4,7 +4,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.15
+pkgver=2.2.16
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('cb8ce298d7b36558ffc48aec961b14c830ff1783eef7a623411188b5e0f5d454'
+sha256sums=('6cbe8d454bf5dc204621eed3016d721b66298fa95363395bb8eeceb1d2fd14cb'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson via arch-commits]

Date: Tuesday, March 26, 2019 @ 20:06:24
  Author: bisson
Revision: 349241

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-26 19:55:23 UTC (rev 349240)
+++ PKGBUILD2019-03-26 20:06:24 UTC (rev 349241)
@@ -4,7 +4,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.14
+pkgver=2.2.15
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('1bf9ed46dc1ec5d8cfa13ba1ad47f94981f3b6a7ec16ad9123cc2549c4cbf87b'
+sha256sums=('cb8ce298d7b36558ffc48aec961b14c830ff1783eef7a623411188b5e0f5d454'
 'SKIP')
 
 install=install

[arch-commits] Commit in gnupg/trunk (PKGBUILD install)

[Gaëtan Bisson via arch-commits]

Date: Tuesday, March 19, 2019 @ 17:34:42
  Author: bisson
Revision: 348713

drop old stuff

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/install

--+
 PKGBUILD |4 
 install  |   10 --
 2 files changed, 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-19 17:19:41 UTC (rev 348712)
+++ PKGBUILD2019-03-19 17:34:42 UTC (rev 348713)
@@ -27,10 +27,6 @@
 
 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

Modified: install
===
--- install 2019-03-19 17:19:41 UTC (rev 348712)
+++ install 2019-03-19 17:34:42 UTC (rev 348713)
@@ -26,16 +26,6 @@
_global_units enable
 }
 
-post_upgrade() {
-   if (( $(vercmp $2 2.1.13-1) < 0 )); then
-   echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
-   fi
-
-   if (( $(vercmp $2 2.1.21-3) < 0 )); then
-   _global_units enable
-   fi
-}
-
 pre_remove() {
_global_units disable
 }

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

[Gaëtan Bisson via arch-commits]

Date: Tuesday, March 19, 2019 @ 17:19:23
  Author: bisson
Revision: 348711

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-19 16:45:49 UTC (rev 348710)
+++ PKGBUILD2019-03-19 17:19:23 UTC (rev 348711)
@@ -4,7 +4,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.13
+pkgver=2.2.14
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('76c787a955f9e6e0ead47c9be700bfb9d454f955a7b7c7e697aa719bac7b11d8'
+sha256sums=('1bf9ed46dc1ec5d8cfa13ba1ad47f94981f3b6a7ec16ad9123cc2549c4cbf87b'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson via arch-commits]

Date: Tuesday, February 12, 2019 @ 19:47:04
  Author: bisson
Revision: 346136

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-12 17:22:50 UTC (rev 346135)
+++ PKGBUILD2019-02-12 19:47:04 UTC (rev 346136)
@@ -4,8 +4,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.12
-pkgrel=2
+pkgver=2.2.13
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('db030f8b4c98640e91300d36d516f1f4f8fe09514a94ea9fc7411ee1a34082cb'
+sha256sums=('76c787a955f9e6e0ead47c9be700bfb9d454f955a7b7c7e697aa719bac7b11d8'
 'SKIP')
 
 install=install

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

[Bartłomiej Piotrowski via arch-commits]

Date: Thursday, January 10, 2019 @ 15:15:21
  Author: bpiotrowski
Revision: 343476

2.2.12-2: readline 8.0 rebuild

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-10 15:14:39 UTC (rev 343475)
+++ PKGBUILD2019-01-10 15:15:21 UTC (rev 343476)
@@ -5,7 +5,7 @@
 
 pkgname=gnupg
 pkgver=2.2.12
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')

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

[Gaëtan Bisson via arch-commits]

Date: Friday, December 14, 2018 @ 21:09:05
  Author: bisson
Revision: 342353

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-14 21:08:37 UTC (rev 342352)
+++ PKGBUILD2018-12-14 21:09:05 UTC (rev 342353)
@@ -4,7 +4,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.11
+pkgver=2.2.12
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('496c3e123ef53f35436ddccca58e82acaa901ca4e21174e77386c0cea0c49cd9'
+sha256sums=('db030f8b4c98640e91300d36d516f1f4f8fe09514a94ea9fc7411ee1a34082cb'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson via arch-commits]

Date: Tuesday, November 6, 2018 @ 19:24:05
  Author: bisson
Revision: 337994

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-06 18:33:06 UTC (rev 337993)
+++ PKGBUILD2018-11-06 19:24:05 UTC (rev 337994)
@@ -4,7 +4,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.10
+pkgver=2.2.11
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -20,9 +20,9 @@
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
-  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+  '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('799dd37a86a1448732e339bd20440f4f5ee6e69755f6fd7a73ee8af30840c915'
+sha256sums=('496c3e123ef53f35436ddccca58e82acaa901ca4e21174e77386c0cea0c49cd9'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson via arch-commits]

Date: Friday, August 31, 2018 @ 06:51:28
  Author: bisson
Revision: 333153

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-31 06:19:39 UTC (rev 333152)
+++ PKGBUILD2018-08-31 06:51:28 UTC (rev 333153)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.9
+pkgver=2.2.10
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -23,7 +23,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('6278eaabffa1ebc9fa2ceb3dc53eea9a1505ab02a668a86dd6fec06951af2164'
+sha256sums=('799dd37a86a1448732e339bd20440f4f5ee6e69755f6fd7a73ee8af30840c915'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson via arch-commits]

Date: Thursday, July 12, 2018 @ 22:08:45
  Author: bisson
Revision: 328531

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-12 20:49:46 UTC (rev 328530)
+++ PKGBUILD2018-07-12 22:08:45 UTC (rev 328531)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.8
+pkgver=2.2.9
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -23,7 +23,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('777b4cb8ced21965a5053d4fa20fe11484f0a478f3d011cef508a1a49db50dcd'
+sha256sums=('6278eaabffa1ebc9fa2ceb3dc53eea9a1505ab02a668a86dd6fec06951af2164'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson via arch-commits]

Date: Friday, June 8, 2018 @ 17:38:10
  Author: bisson
Revision: 326491

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-08 17:35:35 UTC (rev 326490)
+++ PKGBUILD2018-06-08 17:38:10 UTC (rev 326491)
@@ -5,25 +5,25 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.7
+pkgver=2.2.8
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
-url='http://www.gnupg.org/'
+url='https://www.gnupg.org/'
 license=('GPL')
 arch=('x86_64')
+checkdepends=('openssh')
+makedepends=('libldap' 'libusb-compat' 'pcsclite')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
 optdepends=('libldap: gpg2keys_ldap'
 'libusb-compat: scdaemon'
 'pcsclite: scdaemon')
-makedepends=('libldap' 'libusb-compat' 'pcsclite')
-checkdepends=('openssh')
-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=('d95b361ee6ef7eff86af40c8c72bf9313736ac9f7010d6604d78bf83818e976e'
+sha256sums=('777b4cb8ced21965a5053d4fa20fe11484f0a478f3d011cef508a1a49db50dcd'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson via arch-commits]

Date: Wednesday, May 2, 2018 @ 23:48:39
  Author: bisson
Revision: 323332

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-02 23:24:21 UTC (rev 323331)
+++ PKGBUILD2018-05-02 23:48:39 UTC (rev 323332)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.6
+pkgver=2.2.7
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -23,7 +23,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('e64d8c5fa2d05938a5080cb784a98ac21be0812f2a26f844b18f0d6a0e711984'
+sha256sums=('d95b361ee6ef7eff86af40c8c72bf9313736ac9f7010d6604d78bf83818e976e'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson via arch-commits]

Date: Tuesday, April 10, 2018 @ 17:28:21
  Author: bisson
Revision: 321491

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/req_usage.patch

-+
 PKGBUILD|   15 +--
 req_usage.patch |   12 
 2 files changed, 5 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-10 17:22:09 UTC (rev 321490)
+++ PKGBUILD2018-04-10 17:28:21 UTC (rev 321491)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.5
-pkgrel=2
+pkgver=2.2.6
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -22,11 +22,9 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-'req_usage.patch')
-sha256sums=('3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57'
-'SKIP'
-'f8bef4891c1b9f81f305753dac7780ad4cfd56ec853502ba1d9d6400c69a518e')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha256sums=('e64d8c5fa2d05938a5080cb784a98ac21be0812f2a26f844b18f0d6a0e711984'
+'SKIP')
 
 install=install
 
@@ -37,9 +35,6 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
-
-   # See: https://dev.gnupg.org/rGa17d2d1f690ebe5d005b4589a5fe378b6487c657
-   patch -p1 -i ../req_usage.patch
 }
 
 build() {

Deleted: req_usage.patch
===
--- req_usage.patch 2018-04-10 17:22:09 UTC (rev 321490)
+++ req_usage.patch 2018-04-10 17:28:21 UTC (rev 321491)
@@ -1,12 +0,0 @@
-diff -Naur old/g10/getkey.c new/g10/getkey.c
 old/g10/getkey.c   2018-02-21 23:42:42.0 -1000
-+++ new/g10/getkey.c   2018-04-05 10:15:14.642119429 -1000
-@@ -1810,6 +1810,8 @@
-   ctx.items[0].mode = fprint_len == 16 ? KEYDB_SEARCH_MODE_FPR16
-   : KEYDB_SEARCH_MODE_FPR20;
-   memcpy (ctx.items[0].u.fpr, fprint, fprint_len);
-+  if (pk)
-+ctx.req_usage = pk->req_usage;
-   rc = lookup (ctrl, , 0, , _key);
-   if (!rc && pk)
-   pk_from_block (pk, kb, found_key);

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

[Gaëtan Bisson via arch-commits]

Date: Thursday, April 5, 2018 @ 20:34:03
  Author: bisson
Revision: 320986

fix FS#58120

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

-+
 PKGBUILD|   11 ---
 req_usage.patch |   12 
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-05 19:14:35 UTC (rev 320985)
+++ PKGBUILD2018-04-05 20:34:03 UTC (rev 320986)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -22,9 +22,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}
+'req_usage.patch')
 sha256sums=('3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57'
-'SKIP')
+'SKIP'
+'f8bef4891c1b9f81f305753dac7780ad4cfd56ec853502ba1d9d6400c69a518e')
 
 install=install
 
@@ -35,6 +37,9 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+
+   # See: https://dev.gnupg.org/rGa17d2d1f690ebe5d005b4589a5fe378b6487c657
+   patch -p1 -i ../req_usage.patch
 }
 
 build() {

Added: req_usage.patch
===
--- req_usage.patch (rev 0)
+++ req_usage.patch 2018-04-05 20:34:03 UTC (rev 320986)
@@ -0,0 +1,12 @@
+diff -Naur old/g10/getkey.c new/g10/getkey.c
+--- old/g10/getkey.c   2018-02-21 23:42:42.0 -1000
 new/g10/getkey.c   2018-04-05 10:15:14.642119429 -1000
+@@ -1810,6 +1810,8 @@
+   ctx.items[0].mode = fprint_len == 16 ? KEYDB_SEARCH_MODE_FPR16
+   : KEYDB_SEARCH_MODE_FPR20;
+   memcpy (ctx.items[0].u.fpr, fprint, fprint_len);
++  if (pk)
++ctx.req_usage = pk->req_usage;
+   rc = lookup (ctrl, , 0, , _key);
+   if (!rc && pk)
+   pk_from_block (pk, kb, found_key);

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

[Gaëtan Bisson via arch-commits]

Date: Thursday, February 22, 2018 @ 20:55:04
  Author: bisson
Revision: 317399

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-22 20:29:27 UTC (rev 317398)
+++ PKGBUILD2018-02-22 20:55:04 UTC (rev 317399)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.4
-pkgrel=2
+pkgver=2.2.5
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -23,7 +23,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec'
+sha256sums=('3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson via arch-commits]

Date: Monday, January 29, 2018 @ 18:17:20
  Author: bisson
Revision: 315589

fix FS#57257

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-29 18:01:53 UTC (rev 315588)
+++ PKGBUILD2018-01-29 18:17:20 UTC (rev 315589)
@@ -6,14 +6,15 @@
 
 pkgname=gnupg
 pkgver=2.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
 arch=('x86_64')
 optdepends=('libldap: gpg2keys_ldap'
-'libusb-compat: scdaemon')
-makedepends=('libldap' 'libusb-compat')
+'libusb-compat: scdaemon'
+'pcsclite: scdaemon')
+makedepends=('libldap' 'libusb-compat' 'pcsclite')
 checkdepends=('openssh')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
  'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')

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

[Gaëtan Bisson via arch-commits]

Date: Wednesday, December 20, 2017 @ 20:13:44
  Author: bisson
Revision: 313418

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-20 19:17:39 UTC (rev 313417)
+++ PKGBUILD2017-12-20 20:13:44 UTC (rev 313418)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.3
+pkgver=2.2.4
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('cbd37105d139f7aa74f92b6f65d136658682094b0e308666b820ae4b984084b4'
+sha256sums=('401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson]

Date: Monday, November 20, 2017 @ 17:39:10
  Author: bisson
Revision: 310476

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-20 16:42:07 UTC (rev 310475)
+++ PKGBUILD2017-11-20 17:39:10 UTC (rev 310476)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.2
+pkgver=2.2.3
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('bfb62c7412ceb3b9422c6c7134a34ff01a560f98eb981c2d96829c1517c08197'
+sha256sums=('cbd37105d139f7aa74f92b6f65d136658682094b0e308666b820ae4b984084b4'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson]

Date: Tuesday, November 7, 2017 @ 20:59:20
  Author: bisson
Revision: 309021

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-07 20:05:11 UTC (rev 309020)
+++ PKGBUILD2017-11-07 20:59:20 UTC (rev 309021)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.1
+pkgver=2.2.2
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('34d70cd65b9c95f3f2f90a9f5c1e0b6a0fe039a8d685e2d66d69c33d1cbf62fb'
+sha256sums=('bfb62c7412ceb3b9422c6c7134a34ff01a560f98eb981c2d96829c1517c08197'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson]

Date: Tuesday, September 19, 2017 @ 17:31:16
  Author: bisson
Revision: 305859

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-19 14:26:42 UTC (rev 305858)
+++ PKGBUILD2017-09-19 17:31:16 UTC (rev 305859)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('d4514a0be0f7a1ff263193330019eb4b53c82f0f5e230af3c14df371271a45e6'
+sha256sums=('34d70cd65b9c95f3f2f90a9f5c1e0b6a0fe039a8d685e2d66d69c33d1cbf62fb'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson]

Date: Monday, August 28, 2017 @ 18:34:19
  Author: bisson
Revision: 304299

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-28 14:35:52 UTC (rev 304298)
+++ PKGBUILD2017-08-28 18:34:19 UTC (rev 304299)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.23
+pkgver=2.2.0
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('a94476391595e9351f219188767a9d6ea128e83be5ed3226a7890f49aa2d0d77'
+sha256sums=('d4514a0be0f7a1ff263193330019eb4b53c82f0f5e230af3c14df371271a45e6'
 'SKIP')
 
 install=install

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

[Gaëtan Bisson]

Date: Thursday, August 10, 2017 @ 03:32:14
  Author: bisson
Revision: 301833

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-10 03:13:40 UTC (rev 301832)
+++ PKGBUILD2017-08-10 03:32:14 UTC (rev 301833)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.22
+pkgver=2.1.23
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -22,7 +22,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('46716faf9e1b92cfca86609f3bfffbf5bb4b6804df90dc853ff7061cfcfb4ad7'
+sha256sums=('a94476391595e9351f219188767a9d6ea128e83be5ed3226a7890f49aa2d0d77'
 'SKIP')
 
 install=install
@@ -57,9 +57,8 @@
 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
+   ln -s gpg "${pkgdir}"/usr/bin/gpg2
+   ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
 
cd doc/examples/systemd-user
for i in *.*; do

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

[Gaëtan Bisson]

Date: Saturday, July 29, 2017 @ 05:07:51
  Author: bisson
Revision: 301352

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/scdaemon.patch

+
 PKGBUILD   |   13 +++-
 scdaemon.patch |   87 ---
 2 files changed, 5 insertions(+), 95 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-29 04:31:44 UTC (rev 301351)
+++ PKGBUILD2017-07-29 05:07:51 UTC (rev 301352)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.21
-pkgrel=3
+pkgver=2.1.22
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -21,11 +21,9 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-'scdaemon.patch')
-sha256sums=('7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd'
-'SKIP'
-'b4972dc221c7b76ed15b4cc9d15e2d80b399d76307cf046d1ac617b2b5750278')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha256sums=('46716faf9e1b92cfca86609f3bfffbf5bb4b6804df90dc853ff7061cfcfb4ad7'
+'SKIP')
 
 install=install
 
@@ -36,7 +34,6 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
-   patch -p1 -i ../scdaemon.patch # FS#54271
 }
 
 build() {

Deleted: scdaemon.patch
===
--- scdaemon.patch  2017-07-29 04:31:44 UTC (rev 301351)
+++ scdaemon.patch  2017-07-29 05:07:51 UTC (rev 301352)
@@ -1,87 +0,0 @@
-From a8dd96826f8484c0ae93c954035b95c2a75c80f2 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka 
-Date: Wed, 17 May 2017 09:46:06 +0900
-Subject: [PATCH] g10: Suppress error for card availability check.
-
-* g10/call-agent.c (start_agent): Add semantics for card; Suppress
-error for card check.
-(warn_version_mismatch): Ignore an error for scdaemon.
-(agent_scd_serialno): Call start_agent with
-FLAG_FOR_CARD_SUPPRESS_ERRORS.
-
---
-
-GnuPG-bug-id: 3165
-Fixes-commit: 97a2394ecafaa6f58e4a1f70ecfd04408dc15606
-Signed-off-by: NIIBE Yutaka 

- g10/call-agent.c | 15 +--
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/g10/call-agent.c b/g10/call-agent.c
-index be8c33d..4698a25 100644
 a/g10/call-agent.c
-+++ b/g10/call-agent.c
-@@ -184,7 +184,8 @@ default_inq_cb (void *opaque, const char *line)
- 
- 
- /* Print a warning if the server's version number is less than our
--   version number.  Returns an error code on a connection problem.  */
-+   version number.  Returns an error code on a connection problem.
-+   Ignore an error for scdaemon (MODE==2).  */
- static gpg_error_t
- warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode)
- {
-@@ -193,7 +194,7 @@ warn_version_mismatch (assuan_context_t ctx, const char 
*servername, int mode)
-   const char *myversion = strusage (13);
- 
-   err = get_assuan_server_version (ctx, mode, );
--  if (err)
-+  if (err && mode != 2)
- log_error (_("error getting version from '%s': %s\n"),
-servername, gpg_strerror (err));
-   else if (compare_version_strings (serverversion, myversion) < 0)
-@@ -217,10 +218,12 @@ warn_version_mismatch (assuan_context_t ctx, const char 
*servername, int mode)
- }
- 
- 
-+#define FLAG_FOR_CARD_SUPPRESS_ERRORS 2
-+
- /* Try to connect to the agent via socket or fork it off and work by
-pipes.  Handle the server's initial greeting */
- static int
--start_agent (ctrl_t ctrl, int for_card)
-+start_agent (ctrl_t ctrl, int flag_for_card)
- {
-   int rc;
- 
-@@ -280,7 +283,7 @@ start_agent (ctrl_t ctrl, int for_card)
- }
- }
- 
--  if (!rc && for_card && !did_early_card_test)
-+  if (!rc && flag_for_card && !did_early_card_test)
- {
-   /* Request the serial number of the card for an early test.  */
-   struct agent_card_info_s info;
-@@ -292,7 +295,7 @@ start_agent (ctrl_t ctrl, int for_card)
- rc = assuan_transact (agent_ctx, "SCD SERIALNO openpgp",
-   NULL, NULL, NULL, NULL,
-   learn_status_cb, );
--  if (rc)
-+  if (rc && !(flag_for_card & FLAG_FOR_CARD_SUPPRESS_ERRORS))
- {
-   switch (gpg_err_code (rc))
- {
-@@ -1023,7 +1026,7 @@ agent_scd_serialno (char **r_serialno, const char 
*demand)
-   char *serialno = NULL;
-   char line[ASSUAN_LINELENGTH];
- 
--  err = start_agent (NULL, 1);
-+  err = start_agent (NULL, 1 | FLAG_FOR_CARD_SUPPRESS_ERRORS);
-   if (err)
- return err;
- 
--- 
-2.8.0.rc3
-

[arch-commits] Commit in gnupg/trunk (PKGBUILD install)

[Jan Steffens]

Date: Friday, June 9, 2017 @ 08:54:33
  Author: heftig
Revision: 298461

2.1.21-3: Fix install w/o systemd; add openssh to avoid a test skip

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/install

--+
 PKGBUILD |3 ++-
 install  |   20 ++--
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-09 08:01:06 UTC (rev 298460)
+++ PKGBUILD2017-06-09 08:54:33 UTC (rev 298461)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.21
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -14,6 +14,7 @@
 optdepends=('libldap: gpg2keys_ldap'
 'libusb-compat: scdaemon')
 makedepends=('libldap' 'libusb-compat')
+checkdepends=('openssh')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
  'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'

Modified: install
===
--- install 2017-06-09 08:01:06 UTC (rev 298460)
+++ install 2017-06-09 08:54:33 UTC (rev 298461)
@@ -1,5 +1,21 @@
 _global_units() {
-   systemctl --global $1 dirmngr.socket gpg-agent.socket 
gpg-agent-{browser,extra,ssh}.socket
+   _units=(dirmngr.socket gpg-agent.socket 
gpg-agent-{browser,extra,ssh}.socket)
+   _dir=/etc/systemd/user/sockets.target.wants
+
+   case $1 in
+   enable)
+   mkdir -p $_dir
+   for _u in "${_units[@]}"; do
+   ln -sf /usr/lib/systemd/user/$_u $_dir/$_u
+   done
+   ;;
+   disable)
+   for _u in "${_units[@]}"; do
+   rm -f $_dir/$_u
+   done
+   rmdir -p --ignore-fail-on-non-empty $_dir
+   ;;
+   esac
 }
 
 post_install() {
@@ -15,7 +31,7 @@
echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
fi
 
-   if (( $(vercmp $2 2.1.21-2) < 0 )); then
+   if (( $(vercmp $2 2.1.21-3) < 0 )); then
_global_units enable
fi
 }

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

[Gaëtan Bisson]

Date: Tuesday, June 6, 2017 @ 22:06:06
  Author: bisson
Revision: 298114

i like it all cozy like this

Added:
  gnupg/trunk/install
(from rev 298113, gnupg/trunk/gnupg.install)
Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/gnupg.install

---+
 PKGBUILD  |2 +-
 gnupg.install |   25 -
 install   |   25 +
 3 files changed, 26 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-06 22:04:22 UTC (rev 298113)
+++ PKGBUILD2017-06-06 22:06:06 UTC (rev 298114)
@@ -26,7 +26,7 @@
 'SKIP'
 'b4972dc221c7b76ed15b4cc9d15e2d80b399d76307cf046d1ac617b2b5750278')
 
-install=gnupg.install
+install=install
 
 conflicts=('dirmngr' 'gnupg2')
 provides=('dirmngr' "gnupg2=${pkgver}")

Deleted: gnupg.install
===
--- gnupg.install   2017-06-06 22:04:22 UTC (rev 298113)
+++ gnupg.install   2017-06-06 22:06:06 UTC (rev 298114)
@@ -1,25 +0,0 @@
-_global_units() {
-   systemctl --global $1 dirmngr.socket gpg-agent.socket 
gpg-agent-{browser,extra,ssh}.socket
-}
-
-post_install() {
-   # See FS#42798 and FS#47371
-   dirmngr /dev/null
-
-   # Let systemd supervise daemons by default
-   _global_units enable
-}
-
-post_upgrade() {
-   if (( $(vercmp $2 2.1.13-1) < 0 )); then
-   echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
-   fi
-
-   if (( $(vercmp $2 2.1.21-2) < 0 )); then
-   _global_units enable
-   fi
-}
-
-pre_remove() {
-   _global_units disable
-}

Copied: gnupg/trunk/install (from rev 298113, gnupg/trunk/gnupg.install)
===
--- install (rev 0)
+++ install 2017-06-06 22:06:06 UTC (rev 298114)
@@ -0,0 +1,25 @@
+_global_units() {
+   systemctl --global $1 dirmngr.socket gpg-agent.socket 
gpg-agent-{browser,extra,ssh}.socket
+}
+
+post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null
+
+   # Let systemd supervise daemons by default
+   _global_units enable
+}
+
+post_upgrade() {
+   if (( $(vercmp $2 2.1.13-1) < 0 )); then
+   echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
+   fi
+
+   if (( $(vercmp $2 2.1.21-2) < 0 )); then
+   _global_units enable
+   fi
+}
+
+pre_remove() {
+   _global_units disable
+}

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

[Gaëtan Bisson]

Date: Tuesday, June 6, 2017 @ 22:03:43
  Author: bisson
Revision: 298112

fix FS#54271

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

+
 PKGBUILD   |9 +++--
 scdaemon.patch |   87 +++
 2 files changed, 93 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-06 20:04:35 UTC (rev 298111)
+++ PKGBUILD2017-06-06 22:03:43 UTC (rev 298112)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.21
-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}
+'scdaemon.patch')
 sha256sums=('7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd'
-'SKIP')
+'SKIP'
+'b4972dc221c7b76ed15b4cc9d15e2d80b399d76307cf046d1ac617b2b5750278')
 
 install=gnupg.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 ../scdaemon.patch # FS#54271
 }
 
 build() {

Added: scdaemon.patch
===
--- scdaemon.patch  (rev 0)
+++ scdaemon.patch  2017-06-06 22:03:43 UTC (rev 298112)
@@ -0,0 +1,87 @@
+From a8dd96826f8484c0ae93c954035b95c2a75c80f2 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka 
+Date: Wed, 17 May 2017 09:46:06 +0900
+Subject: [PATCH] g10: Suppress error for card availability check.
+
+* g10/call-agent.c (start_agent): Add semantics for card; Suppress
+error for card check.
+(warn_version_mismatch): Ignore an error for scdaemon.
+(agent_scd_serialno): Call start_agent with
+FLAG_FOR_CARD_SUPPRESS_ERRORS.
+
+--
+
+GnuPG-bug-id: 3165
+Fixes-commit: 97a2394ecafaa6f58e4a1f70ecfd04408dc15606
+Signed-off-by: NIIBE Yutaka 
+---
+ g10/call-agent.c | 15 +--
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/g10/call-agent.c b/g10/call-agent.c
+index be8c33d..4698a25 100644
+--- a/g10/call-agent.c
 b/g10/call-agent.c
+@@ -184,7 +184,8 @@ default_inq_cb (void *opaque, const char *line)
+ 
+ 
+ /* Print a warning if the server's version number is less than our
+-   version number.  Returns an error code on a connection problem.  */
++   version number.  Returns an error code on a connection problem.
++   Ignore an error for scdaemon (MODE==2).  */
+ static gpg_error_t
+ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode)
+ {
+@@ -193,7 +194,7 @@ warn_version_mismatch (assuan_context_t ctx, const char 
*servername, int mode)
+   const char *myversion = strusage (13);
+ 
+   err = get_assuan_server_version (ctx, mode, );
+-  if (err)
++  if (err && mode != 2)
+ log_error (_("error getting version from '%s': %s\n"),
+servername, gpg_strerror (err));
+   else if (compare_version_strings (serverversion, myversion) < 0)
+@@ -217,10 +218,12 @@ warn_version_mismatch (assuan_context_t ctx, const char 
*servername, int mode)
+ }
+ 
+ 
++#define FLAG_FOR_CARD_SUPPRESS_ERRORS 2
++
+ /* Try to connect to the agent via socket or fork it off and work by
+pipes.  Handle the server's initial greeting */
+ static int
+-start_agent (ctrl_t ctrl, int for_card)
++start_agent (ctrl_t ctrl, int flag_for_card)
+ {
+   int rc;
+ 
+@@ -280,7 +283,7 @@ start_agent (ctrl_t ctrl, int for_card)
+ }
+ }
+ 
+-  if (!rc && for_card && !did_early_card_test)
++  if (!rc && flag_for_card && !did_early_card_test)
+ {
+   /* Request the serial number of the card for an early test.  */
+   struct agent_card_info_s info;
+@@ -292,7 +295,7 @@ start_agent (ctrl_t ctrl, int for_card)
+ rc = assuan_transact (agent_ctx, "SCD SERIALNO openpgp",
+   NULL, NULL, NULL, NULL,
+   learn_status_cb, );
+-  if (rc)
++  if (rc && !(flag_for_card & FLAG_FOR_CARD_SUPPRESS_ERRORS))
+ {
+   switch (gpg_err_code (rc))
+ {
+@@ -1023,7 +1026,7 @@ agent_scd_serialno (char **r_serialno, const char 
*demand)
+   char *serialno = NULL;
+   char line[ASSUAN_LINELENGTH];
+ 
+-  err = start_agent (NULL, 1);
++  err = start_agent (NULL, 1 | FLAG_FOR_CARD_SUPPRESS_ERRORS);
+   if (err)
+ return err;
+ 
+-- 
+2.8.0.rc3
+

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

[Jan Steffens]

Date: Tuesday, May 30, 2017 @ 08:45:40
  Author: heftig
Revision: 296744

Enable sockets by default

Added:
  gnupg/trunk/gnupg.install
(from rev 296743, gnupg/trunk/install)
Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/install

---+
 PKGBUILD  |2 +-
 gnupg.install |   25 +
 install   |   10 --
 3 files changed, 26 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-30 08:19:18 UTC (rev 296743)
+++ PKGBUILD2017-05-30 08:45:40 UTC (rev 296744)
@@ -24,7 +24,7 @@
 sha256sums=('7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd'
 'SKIP')
 
-install=install
+install=gnupg.install
 
 conflicts=('dirmngr' 'gnupg2')
 provides=('dirmngr' "gnupg2=${pkgver}")

Copied: gnupg/trunk/gnupg.install (from rev 296743, gnupg/trunk/install)
===
--- gnupg.install   (rev 0)
+++ gnupg.install   2017-05-30 08:45:40 UTC (rev 296744)
@@ -0,0 +1,25 @@
+_global_units() {
+   systemctl --global $1 dirmngr.socket gpg-agent.socket 
gpg-agent-{browser,extra,ssh}.socket
+}
+
+post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null
+
+   # Let systemd supervise daemons by default
+   _global_units enable
+}
+
+post_upgrade() {
+   if (( $(vercmp $2 2.1.13-1) < 0 )); then
+   echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
+   fi
+
+   if (( $(vercmp $2 2.1.21-2) < 0 )); then
+   _global_units enable
+   fi
+}
+
+pre_remove() {
+   _global_units disable
+}

Deleted: install
===
--- install 2017-05-30 08:19:18 UTC (rev 296743)
+++ install 2017-05-30 08:45:40 UTC (rev 296744)
@@ -1,10 +0,0 @@
-post_install() {
-   # See FS#42798 and FS#47371
-   dirmngr /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
-}

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

[Gaëtan Bisson]

Date: Monday, May 15, 2017 @ 20:48:52
  Author: bisson
Revision: 296143

upstream update

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

---+
 PKGBUILD  |   13 +
 keyring.patch |   44 
 2 files changed, 5 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-15 20:44:07 UTC (rev 296142)
+++ PKGBUILD2017-05-15 20:48:52 UTC (rev 296143)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.20
-pkgrel=2
+pkgver=2.1.21
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,11 +20,9 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-'keyring.patch')
-sha256sums=('24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d'
-'SKIP'
-'23070daefc97bc7cca7e7a69539425135a9324a56bfadf54da2766ef6789d566')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha256sums=('7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd'
+'SKIP')
 
 install=install
 
@@ -35,7 +33,6 @@
 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() {

Deleted: keyring.patch
===
--- keyring.patch   2017-05-15 20:44:07 UTC (rev 296142)
+++ keyring.patch   2017-05-15 20:48:52 UTC (rev 296143)
@@ -1,44 +0,0 @@
-From 116cfd60779fbb3540da629db54dc2e148f4a3a2 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka 
-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 

- 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
-

[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
===
--- PKGBUILD2017-04-27 08:24:17 UTC (rev 294898)
+++ PKGBUILD2017-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 
+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 
+---
+ 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
+

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

[Gaëtan Bisson]

Date: Monday, April 3, 2017 @ 21:29:07
  Author: bisson
Revision: 292060

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-03 20:44:26 UTC (rev 292059)
+++ PKGBUILD2017-04-03 21:29:07 UTC (rev 292060)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.19
+pkgver=2.1.20
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha256sums=('46cced1f5641ce29cc28250f52fadf6e417e649b3bfdec49a5a0d0b22a639bf0'
+sha256sums=('24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d'
 'SKIP')
 
 install=install
@@ -50,8 +50,7 @@
 
 check() {
cd "${srcdir}/${pkgname}-${pkgver}"
-   make check || true
-   # 
https://lists.gnupg.org/pipermail/gnupg-devel/2016-December/032364.html
+   make check
 }
 
 package() {

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

[Gaëtan Bisson]

Date: Thursday, March 2, 2017 @ 01:31:35
  Author: bisson
Revision: 289792

switch to sha256sum

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-02 01:31:30 UTC (rev 289791)
+++ PKGBUILD2017-03-02 01:31:35 UTC (rev 289792)
@@ -21,7 +21,8 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('10a088a6716789ac5c5cce2776952d8f4a5c57fc' 'SKIP')
+sha256sums=('46cced1f5641ce29cc28250f52fadf6e417e649b3bfdec49a5a0d0b22a639bf0'
+'SKIP')
 
 install=install
 

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

[Gaëtan Bisson]

Date: Wednesday, March 1, 2017 @ 20:32:29
  Author: bisson
Revision: 289764

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/scd.patch

---+
 PKGBUILD  |   13 +++-
 scd.patch |   97 
 2 files changed, 5 insertions(+), 105 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-01 20:20:59 UTC (rev 289763)
+++ PKGBUILD2017-03-01 20:32:29 UTC (rev 289764)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.18
-pkgrel=2
+pkgver=2.1.19
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,10 +20,8 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-'scd.patch')
-sha1sums=('b698012cc2d77c2652afd168a15e679d1394fa89' 'SKIP'
-  '568f48e1048f1dac721dd4055447a93485f6b2b1')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('10a088a6716789ac5c5cce2776952d8f4a5c57fc' 'SKIP')
 
 install=install
 
@@ -34,7 +32,6 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
-   patch -p1 -i ../scd.patch
 }
 
 build() {
@@ -52,7 +49,7 @@
 
 check() {
cd "${srcdir}/${pkgname}-${pkgver}"
-   make check || [[ $CARCH = i686 ]]
+   make check || true
# 
https://lists.gnupg.org/pipermail/gnupg-devel/2016-December/032364.html
 }
 

Deleted: scd.patch
===
--- scd.patch   2017-03-01 20:20:59 UTC (rev 289763)
+++ scd.patch   2017-03-01 20:32:29 UTC (rev 289764)
@@ -1,97 +0,0 @@
-From da4c132cca2c6df81243c9660b7348268a848f88 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka 
-Date: Mon, 13 Feb 2017 11:09:13 +0900
-Subject: [PATCH 1/1] scd: Fix use case of PC/SC.
-
-* scd/apdu.c (apdu_open_reader): Add an argument APP_EMPTY.
-When CCID driver fails to open, try PC/SC if APP is nothing.
-* scd/app.c (select_application): Supply arg if APP is nothing.
-
---
-
-After scanning available card readers by CCID driver, scdaemon should
-try PC/SC service if no APP is registered yet.  Also, when the slot
-is allocated for PC/SC (ccid.handle==NULL), it should not call
-ccid_compare_BAI, otherwise scdaemon crashes.
-
-Debian-bug-id: 852702, 854005, 854595, 854616
-
-Signed-off-by: NIIBE Yutaka 

- scd/apdu.c | 14 +++---
- scd/apdu.h |  2 +-
- scd/app.c  |  2 +-
- 3 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/scd/apdu.c b/scd/apdu.c
-index 6fc62aa..82d53b1 100644
 a/scd/apdu.c
-+++ b/scd/apdu.c
-@@ -3127,7 +3127,7 @@ apdu_open_one_reader (const char *portstr)
- }
- 
- int
--apdu_open_reader (struct dev_list *dl)
-+apdu_open_reader (struct dev_list *dl, int app_empty)
- {
-   int slot;
- 
-@@ -3177,6 +3177,7 @@ apdu_open_reader (struct dev_list *dl)
-   /* Check identity by BAI against already opened HANDLEs.  */
-   for (slot = 0; slot < MAX_READER; slot++)
- if (reader_table[slot].used
-+&& reader_table[slot].ccid.handle
- && ccid_compare_BAI (reader_table[slot].ccid.handle, bai))
-   break;
- 
-@@ -3201,12 +3202,19 @@ apdu_open_reader (struct dev_list *dl)
- dl->idx++;
- }
- 
--  slot = -1;
-+  /* Not found.  Try one for PC/SC, only when it's the initial scan.  */
-+  if (app_empty && dl->idx == dl->idx_max)
-+{
-+  dl->idx++;
-+  slot = apdu_open_one_reader (dl->portstr);
-+}
-+  else
-+slot = -1;
- }
-   else
- #endif
- { /* PC/SC readers.  */
--  if (dl->idx == 0)
-+  if (app_empty && dl->idx == 0)
- {
-   dl->idx++;
-   slot = apdu_open_one_reader (dl->portstr);
-diff --git a/scd/apdu.h b/scd/apdu.h
-index 473def5..6751e8c 100644
 a/scd/apdu.h
-+++ b/scd/apdu.h
-@@ -91,7 +91,7 @@ gpg_error_t apdu_dev_list_start (const char *portstr, struct 
dev_list **l_p);
- void apdu_dev_list_finish (struct dev_list *l);
- 
- /* Note, that apdu_open_reader returns no status word but -1 on error. */
--int apdu_open_reader (struct dev_list *l);
-+int apdu_open_reader (struct dev_list *l, int app_empty);
- int apdu_open_remote_reader (const char *portstr,
-  const unsigned char *cookie, size_t length,
-  int (*readfnc) (void *opaque,
-diff --git a/scd/app.c b/scd/app.c
-index 5b8da1c..7e72870 100644
 a/scd/app.c
-+++ b/scd/app.c
-@@ -343,7 +343,7 @@ select_application (ctrl_t ctrl, const char *name, app_t 

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

[Gaëtan Bisson]

Date: Saturday, February 18, 2017 @ 17:19:30
  Author: bisson
Revision: 289207

fix FS#52732

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

---+
 PKGBUILD  |9 +++--
 scd.patch |   97 
 2 files changed, 103 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-18 17:17:02 UTC (rev 289206)
+++ PKGBUILD2017-02-18 17:19:30 UTC (rev 289207)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.18
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,8 +20,10 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('b698012cc2d77c2652afd168a15e679d1394fa89' 'SKIP')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'scd.patch')
+sha1sums=('b698012cc2d77c2652afd168a15e679d1394fa89' 'SKIP'
+  '568f48e1048f1dac721dd4055447a93485f6b2b1')
 
 install=install
 
@@ -32,6 +34,7 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -p1 -i ../scd.patch
 }
 
 build() {

Added: scd.patch
===
--- scd.patch   (rev 0)
+++ scd.patch   2017-02-18 17:19:30 UTC (rev 289207)
@@ -0,0 +1,97 @@
+From da4c132cca2c6df81243c9660b7348268a848f88 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka 
+Date: Mon, 13 Feb 2017 11:09:13 +0900
+Subject: [PATCH 1/1] scd: Fix use case of PC/SC.
+
+* scd/apdu.c (apdu_open_reader): Add an argument APP_EMPTY.
+When CCID driver fails to open, try PC/SC if APP is nothing.
+* scd/app.c (select_application): Supply arg if APP is nothing.
+
+--
+
+After scanning available card readers by CCID driver, scdaemon should
+try PC/SC service if no APP is registered yet.  Also, when the slot
+is allocated for PC/SC (ccid.handle==NULL), it should not call
+ccid_compare_BAI, otherwise scdaemon crashes.
+
+Debian-bug-id: 852702, 854005, 854595, 854616
+
+Signed-off-by: NIIBE Yutaka 
+---
+ scd/apdu.c | 14 +++---
+ scd/apdu.h |  2 +-
+ scd/app.c  |  2 +-
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/scd/apdu.c b/scd/apdu.c
+index 6fc62aa..82d53b1 100644
+--- a/scd/apdu.c
 b/scd/apdu.c
+@@ -3127,7 +3127,7 @@ apdu_open_one_reader (const char *portstr)
+ }
+ 
+ int
+-apdu_open_reader (struct dev_list *dl)
++apdu_open_reader (struct dev_list *dl, int app_empty)
+ {
+   int slot;
+ 
+@@ -3177,6 +3177,7 @@ apdu_open_reader (struct dev_list *dl)
+   /* Check identity by BAI against already opened HANDLEs.  */
+   for (slot = 0; slot < MAX_READER; slot++)
+ if (reader_table[slot].used
++&& reader_table[slot].ccid.handle
+ && ccid_compare_BAI (reader_table[slot].ccid.handle, bai))
+   break;
+ 
+@@ -3201,12 +3202,19 @@ apdu_open_reader (struct dev_list *dl)
+ dl->idx++;
+ }
+ 
+-  slot = -1;
++  /* Not found.  Try one for PC/SC, only when it's the initial scan.  */
++  if (app_empty && dl->idx == dl->idx_max)
++{
++  dl->idx++;
++  slot = apdu_open_one_reader (dl->portstr);
++}
++  else
++slot = -1;
+ }
+   else
+ #endif
+ { /* PC/SC readers.  */
+-  if (dl->idx == 0)
++  if (app_empty && dl->idx == 0)
+ {
+   dl->idx++;
+   slot = apdu_open_one_reader (dl->portstr);
+diff --git a/scd/apdu.h b/scd/apdu.h
+index 473def5..6751e8c 100644
+--- a/scd/apdu.h
 b/scd/apdu.h
+@@ -91,7 +91,7 @@ gpg_error_t apdu_dev_list_start (const char *portstr, struct 
dev_list **l_p);
+ void apdu_dev_list_finish (struct dev_list *l);
+ 
+ /* Note, that apdu_open_reader returns no status word but -1 on error. */
+-int apdu_open_reader (struct dev_list *l);
++int apdu_open_reader (struct dev_list *l, int app_empty);
+ int apdu_open_remote_reader (const char *portstr,
+  const unsigned char *cookie, size_t length,
+  int (*readfnc) (void *opaque,
+diff --git a/scd/app.c b/scd/app.c
+index 5b8da1c..7e72870 100644
+--- a/scd/app.c
 b/scd/app.c
+@@ -343,7 +343,7 @@ select_application (ctrl_t ctrl, const char *name, app_t 
*r_app,
+   int slot;
+   int periodical_check_needed_this;
+ 
+-  slot = apdu_open_reader (l);
++  slot = apdu_open_reader (l, !app_top);
+   if (slot < 0)
+ break;
+ 
+-- 
+2.8.0.rc3
+

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

[Gaëtan Bisson]

Date: Tuesday, January 24, 2017 @ 00:13:57
  Author: bisson
Revision: 287243

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/negation.patch
  gnupg/trunk/suffix.patch

+
 PKGBUILD   |   14 --
 negation.patch |   20 
 suffix.patch   |   46 --
 3 files changed, 4 insertions(+), 76 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-23 20:30:56 UTC (rev 287242)
+++ PKGBUILD2017-01-24 00:13:57 UTC (rev 287243)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.17
-pkgrel=4
+pkgver=2.1.18
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,12 +20,8 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-'negation.patch'
-'suffix.patch')
-sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP'
-  '92cb257c500e207a6b34406127192f5f9c5f5c0d'
-  '477569b1bb0bb9b1d839970bd143f3cbaa47b376')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('b698012cc2d77c2652afd168a15e679d1394fa89' 'SKIP')
 
 install=install
 
@@ -36,8 +32,6 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
-   patch -p1 -i ../negation.patch
-   patch -p1 -i ../suffix.patch
 }
 
 build() {

Deleted: negation.patch
===
--- negation.patch  2017-01-23 20:30:56 UTC (rev 287242)
+++ negation.patch  2017-01-24 00:13:57 UTC (rev 287243)
@@ -1,20 +0,0 @@
-diff -Naur old/dirmngr/dns.c new/dirmngr/dns.c
 old/dirmngr/dns.c  2016-12-20 00:19:05.0 -1000
-+++ new/dirmngr/dns.c  2017-01-18 23:02:50.209471082 -1000
-@@ -6054,7 +6054,15 @@
-   if ('[' == dns_anyconf_peek(fp)) {
-   dns_anyconf_skip("[ \t", fp);
- 
--  while (dns_anyconf_scan(, "%w_", fp, 
)) {
-+  for (;;) {
-+  if ('!' == dns_anyconf_peek(fp)) {
-+  dns_anyconf_skip("! \t", fp);
-+  /* FIXME: negating statuses; 
currently not implemented */
-+  dns_anyconf_skip("^#;]\n", fp); 
/* skip to end of criteria */
-+  break;
-+  }
-+
-+  if (!dns_anyconf_scan(, "%w_", fp, 
)) break;
-   dns_anyconf_skip("= \t", fp);
-   if (!dns_anyconf_scan(, "%w_", fp, 
)) {
-   dns_anyconf_pop(); /* 
discard status */

Deleted: suffix.patch
===
--- suffix.patch2017-01-23 20:30:56 UTC (rev 287242)
+++ suffix.patch2017-01-24 00:13:57 UTC (rev 287243)
@@ -1,46 +0,0 @@
-From b200e636ab20d2aa93d9f71f3789db5a04af0a56 Mon Sep 17 00:00:00 2001
-From: Werner Koch 
-Date: Mon, 2 Jan 2017 10:00:33 +0100
-Subject: [PATCH] dirmngr: Strip root zone suffix from libdns cname results.
-
-* dirmngr/dns-stuff.c (resolve_name_libdns): Strip trailing dot.
-(get_dns_cname_libdns): Ditto.
---
-
-Signed-off-by: Werner Koch 

- dirmngr/dns-stuff.c | 11 +++
- 1 file changed, 11 insertions(+)
-
-diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
-index a31b073..f2e1df9 100644
 a/dirmngr/dns-stuff.c
-+++ b/dirmngr/dns-stuff.c
-@@ -732,6 +732,10 @@ resolve_name_libdns (const char *name, unsigned short 
port,
-   err = gpg_error_from_syserror ();
-   goto leave;
- }
-+  /* Libdns appends the root zone part which is problematic
-+   * for most other functions - strip it.  */
-+  if (**r_canonname && (*r_canonname)[strlen (*r_canonname)-1] == '.')
-+(*r_canonname)[strlen (*r_canonname)-1] = 0;
- }
- 
-   dai = xtrymalloc (sizeof *dai + ent->ai_addrlen -1);
-@@ -1899,6 +1903,13 @@ get_dns_cname_libdns (const char *name, char **r_cname)
-   *r_cname = xtrystrdup (cname.host);
-   if (!*r_cname)
- err = gpg_error_from_syserror ();
-+  else
-+{
-+  /* Libdns appends the root zone part which is problematic
-+   * for most other functions - strip it.  */
-+  if (**r_cname && (*r_cname)[strlen (*r_cname)-1] == '.')
-+

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

[Gaëtan Bisson]

Date: Thursday, January 19, 2017 @ 09:35:45
  Author: bisson
Revision: 286969

remove leftover variable from patch

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/negation.patch

+
 PKGBUILD   |2 +-
 negation.patch |9 -
 2 files changed, 1 insertion(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-19 09:18:25 UTC (rev 286968)
+++ PKGBUILD2017-01-19 09:35:45 UTC (rev 286969)
@@ -24,7 +24,7 @@
 'negation.patch'
 'suffix.patch')
 sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP'
-  '0ad1a4cb440f84427f19c7016070d04b2faeae89'
+  '92cb257c500e207a6b34406127192f5f9c5f5c0d'
   '477569b1bb0bb9b1d839970bd143f3cbaa47b376')
 
 install=install

Modified: negation.patch
===
--- negation.patch  2017-01-19 09:18:25 UTC (rev 286968)
+++ negation.patch  2017-01-19 09:35:45 UTC (rev 286969)
@@ -1,15 +1,6 @@
 diff -Naur old/dirmngr/dns.c new/dirmngr/dns.c
 --- old/dirmngr/dns.c  2016-12-20 00:19:05.0 -1000
 +++ new/dirmngr/dns.c  2017-01-18 23:02:50.209471082 -1000
-@@ -6028,7 +6028,7 @@
-   char lookup[sizeof resconf->lookup] = "", *lp;
-   struct dns_anyconf cf;
-   size_t i;
--  int error;
-+  int error, ret;
- 
-   while (!feof(fp) && !ferror(fp)) {
-   dns_anyconf_reset();
 @@ -6054,7 +6054,15 @@
if ('[' == dns_anyconf_peek(fp)) {
dns_anyconf_skip("[ \t", fp);

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

[Gaëtan Bisson]

Date: Friday, December 23, 2016 @ 21:29:02
  Author: bisson
Revision: 284534

update patch to upstream version

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/libdns.patch

--+
 PKGBUILD |4 +--
 libdns.patch |   58 -
 2 files changed, 43 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-23 16:11:38 UTC (rev 284533)
+++ PKGBUILD2016-12-23 21:29:02 UTC (rev 284534)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.17
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -23,7 +23,7 @@
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 'libdns.patch')
 sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP'
-  '704c9dd4b88c5ba6a613b2e2ad4aef4fd3a52412')
+  '4217441481d2f89783d39f50eeda7d6984a01e6d')
 
 install=install
 

Modified: libdns.patch
===
--- libdns.patch2016-12-23 16:11:38 UTC (rev 284533)
+++ libdns.patch2016-12-23 21:29:02 UTC (rev 284534)
@@ -1,17 +1,38 @@
-diff -Naur old/dirmngr/dns-stuff.c new/dirmngr/dns-stuff.c
 old/dirmngr/dns-stuff.c2016-12-20 00:19:05.0 -1000
-+++ new/dirmngr/dns-stuff.c2016-12-22 21:14:41.123388787 -1000
-@@ -181,7 +181,9 @@
+From: NIIBE Yutaka 
+Date: Fri, 23 Dec 2016 07:05:01 + (+0900)
+Subject: dirmngr: Fix for --disable-libdns usage.
+X-Git-Url: 
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=d26c51825e2255fe58305cbc1cd74fa43f80d93e
+
+dirmngr: Fix for --disable-libdns usage.
+
+* dirmngr/dns-stuff.c (enable_recursive_resolver, set_dns_nameserver)
+(reload_dns_stuff): Conditionalize with USE_LIBDNS.
+(get_h_errno_as_gpg_error): Map HOST_NOT_FOUND to GPG_ERR_NO_NAME.
+
+--
+
+get_dns_srv assumes error code of GPG_ERR_NO_NAME when no SRV record
+available.
+
+Signed-off-by: NIIBE Yutaka 
+GnuPG-bug-id: 2889
+---
+
+diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
+index 491fcce..a31b073 100644
+--- a/dirmngr/dns-stuff.c
 b/dirmngr/dns-stuff.c
+@@ -181,7 +181,9 @@ void
  enable_recursive_resolver (int yes)
  {
recursive_resolver = yes;
 +#ifdef USE_LIBDNS
libdns_reinit_pending = 1;
-+#endif /*USE_LIBDNS*/
++#endif
  }
  
  
-@@ -251,8 +253,10 @@
+@@ -251,8 +253,10 @@ set_dns_nameserver (const char *ipaddr)
strncpy (tor_nameserver, ipaddr? ipaddr : DEFAULT_NAMESERVER,
 sizeof tor_nameserver -1);
tor_nameserver[sizeof tor_nameserver -1] = 0;
@@ -18,11 +39,20 @@
 +#ifdef USE_LIBDNS
libdns_reinit_pending = 1;
libdns_tor_port = 0;  /* Start again with the default port.  */
-+#endif /*USE_LIBDNS*/
++#endif
  }
  
  
-@@ -534,15 +538,15 @@
+@@ -278,7 +282,7 @@ get_h_errno_as_gpg_error (void)
+ 
+   switch (h_errno)
+ {
+-case HOST_NOT_FOUND: ec = GPG_ERR_UNKNOWN_HOST; break;
++case HOST_NOT_FOUND: ec = GPG_ERR_NO_NAME; break;
+ case TRY_AGAIN:  ec = GPG_ERR_TRY_LATER; break;
+ case NO_RECOVERY:ec = GPG_ERR_SERVER_FAILED; break;
+ case NO_DATA:ec = GPG_ERR_NO_DATA; break;
+@@ -534,15 +538,17 @@ libdns_deinit (void)
  void
  reload_dns_stuff (int force)
  {
@@ -36,15 +66,9 @@
  }
else
  libdns_reinit_pending = 1;
-+#endif /*USE_LIBDNS*/
++#else
++  (void)force;
++#endif
  }
  
  
-@@ -1745,7 +1749,6 @@
- 
-   if (err)
- {
--  if (gpg_err_code (err) == GPG_ERR_NO_NAME)
- err = 0;
-   goto leave;
- }

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

[Gaëtan Bisson]

Date: Friday, December 23, 2016 @ 07:20:38
  Author: bisson
Revision: 284518

fix FS#52234

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

--+
 PKGBUILD |   10 +++---
 libdns.patch |   50 ++
 2 files changed, 57 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-23 07:19:01 UTC (rev 284517)
+++ PKGBUILD2016-12-23 07:20:38 UTC (rev 284518)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.17
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,8 +20,10 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'libdns.patch')
+sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP'
+  '704c9dd4b88c5ba6a613b2e2ad4aef4fd3a52412')
 
 install=install
 
@@ -32,6 +34,7 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -p1 -i ../libdns.patch
 }
 
 build() {
@@ -43,6 +46,7 @@
--libexecdir=/usr/lib/gnupg \
--enable-maintainer-mode \
--enable-symcryptrun \
+   --disable-libdns # FS#52234
 
make
 }

Added: libdns.patch
===
--- libdns.patch(rev 0)
+++ libdns.patch2016-12-23 07:20:38 UTC (rev 284518)
@@ -0,0 +1,50 @@
+diff -Naur old/dirmngr/dns-stuff.c new/dirmngr/dns-stuff.c
+--- old/dirmngr/dns-stuff.c2016-12-20 00:19:05.0 -1000
 new/dirmngr/dns-stuff.c2016-12-22 21:14:41.123388787 -1000
+@@ -181,7 +181,9 @@
+ enable_recursive_resolver (int yes)
+ {
+   recursive_resolver = yes;
++#ifdef USE_LIBDNS
+   libdns_reinit_pending = 1;
++#endif /*USE_LIBDNS*/
+ }
+ 
+ 
+@@ -251,8 +253,10 @@
+   strncpy (tor_nameserver, ipaddr? ipaddr : DEFAULT_NAMESERVER,
+sizeof tor_nameserver -1);
+   tor_nameserver[sizeof tor_nameserver -1] = 0;
++#ifdef USE_LIBDNS
+   libdns_reinit_pending = 1;
+   libdns_tor_port = 0;  /* Start again with the default port.  */
++#endif /*USE_LIBDNS*/
+ }
+ 
+ 
+@@ -534,15 +538,15 @@
+ void
+ reload_dns_stuff (int force)
+ {
++#ifdef USE_LIBDNS
+   if (force)
+ {
+-#ifdef USE_LIBDNS
+   libdns_deinit ();
+-#endif
+   libdns_reinit_pending = 0;
+ }
+   else
+ libdns_reinit_pending = 1;
++#endif /*USE_LIBDNS*/
+ }
+ 
+ 
+@@ -1745,7 +1749,6 @@
+ 
+   if (err)
+ {
+-  if (gpg_err_code (err) == GPG_ERR_NO_NAME)
+ err = 0;
+   goto leave;
+ }

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

[Gaëtan Bisson]

Date: Wednesday, December 21, 2016 @ 07:27:31
  Author: bisson
Revision: 284363

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-21 05:44:03 UTC (rev 284362)
+++ PKGBUILD2016-12-21 07:27:31 UTC (rev 284363)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.16
-pkgrel=2
+pkgver=2.1.17
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('67540161c9fe289153c4a5ea60f7cdce0ef48897' 'SKIP')
+sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP')
 
 install=install
 
@@ -49,7 +49,8 @@
 
 check() {
cd "${srcdir}/${pkgname}-${pkgver}"
-   make check
+   make check || [[ $CARCH = i686 ]]
+   # 
https://lists.gnupg.org/pipermail/gnupg-devel/2016-December/032364.html
 }
 
 package() {

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

[Gaëtan Bisson]

Date: Saturday, December 10, 2016 @ 07:02:47
  Author: bisson
Revision: 282992

implement FS#52096

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-10 00:21:52 UTC (rev 282991)
+++ PKGBUILD2016-12-10 07:02:47 UTC (rev 282992)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.16
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -58,4 +58,9 @@
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
 }

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

[Gaëtan Bisson]

Date: Monday, November 21, 2016 @ 03:03:03
  Author: bisson
Revision: 281682

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-20 12:43:40 UTC (rev 281681)
+++ PKGBUILD2016-11-21 03:03:03 UTC (rev 281682)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.15
-pkgrel=2
+pkgver=2.1.16
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('908c86dac8e9a1fbf47e1605e570b11391b04ece' 'SKIP')
+sha1sums=('67540161c9fe289153c4a5ea60f7cdce0ef48897' 'SKIP')
 
 install=install
 

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

[Bartłomiej Piotrowski]

Date: Sunday, November 6, 2016 @ 18:17:19
  Author: bpiotrowski
Revision: 279934

upgpkg: gnupg 2.1.15-2

rebuild against readline 7.0

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-06 18:07:37 UTC (rev 279933)
+++ PKGBUILD2016-11-06 18:17:19 UTC (rev 279934)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.15
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')

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

[Gaëtan Bisson]

Date: Friday, August 19, 2016 @ 00:48:45
  Author: bisson
Revision: 273930

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-19 00:35:28 UTC (rev 273929)
+++ PKGBUILD2016-08-19 00:48:45 UTC (rev 273930)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.14
+pkgver=2.1.15
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('bc7609a3a0daf0ed0efb22f77b43e82f28e20e34' 'SKIP')
+sha1sums=('908c86dac8e9a1fbf47e1605e570b11391b04ece' 'SKIP')
 
 install=install
 

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

[Gaëtan Bisson]

Date: Friday, July 15, 2016 @ 00:28:46
  Author: bisson
Revision: 271876

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-15 00:19:13 UTC (rev 271875)
+++ PKGBUILD2016-07-15 00:28:46 UTC (rev 271876)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.13
+pkgver=2.1.14
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('6ec1ae6db7815fdbd4151fb6b0b7197b65b05d1f' 'SKIP')
+sha1sums=('bc7609a3a0daf0ed0efb22f77b43e82f28e20e34' 'SKIP')
 
 install=install
 
@@ -58,5 +58,4 @@
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
-   rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059
 }

[arch-commits] Commit in gnupg/trunk (PKGBUILD install sig-check-correction.diff)

[Gaëtan Bisson]

Date: Thursday, June 16, 2016 @ 23:39:24
  Author: bisson
Revision: 270101

upstream update

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/install
Deleted:
  gnupg/trunk/sig-check-correction.diff

---+
 PKGBUILD  |   11 +++--
 install   |6 +
 sig-check-correction.diff |   50 
 3 files changed, 10 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-16 21:49:13 UTC (rev 270100)
+++ PKGBUILD2016-06-16 23:39:24 UTC (rev 270101)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.12
-pkgrel=2
+pkgver=2.1.13
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,10 +20,8 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-'sig-check-correction.diff')
-sha1sums=('3b01a35ac04277ea31cc01b4ac4e230e54b5480c' 'SKIP'
-  '3b9e42ff60a3ec28f507e3da9401a7201e3cff14')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('6ec1ae6db7815fdbd4151fb6b0b7197b65b05d1f' 'SKIP')
 
 install=install
 
@@ -34,7 +32,6 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
-   patch -p1 -i ../sig-check-correction.diff
 }
 
 build() {

Modified: install
===
--- install 2016-06-16 21:49:13 UTC (rev 270100)
+++ install 2016-06-16 23:39:24 UTC (rev 270101)
@@ -2,3 +2,9 @@
# See FS#42798 and FS#47371
dirmngr /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
+}

Deleted: sig-check-correction.diff
===
--- sig-check-correction.diff   2016-06-16 21:49:13 UTC (rev 270100)
+++ sig-check-correction.diff   2016-06-16 23:39:24 UTC (rev 270101)
@@ -1,50 +0,0 @@
-From 83a90a916e8e2f8e44c3b11d11e1dd75f65a87fb Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka 
-Date: Wed, 11 May 2016 19:27:03 +0900
-Subject: [PATCH 1/1] g10: Fix signature checking.
-
-* g10/sig-check.c (check_signature_over_key_or_uid): Fix call to
-walk_kbnode.
-
---
-
-Thanks to Vincent Brillault (Feandil).
-
-GnuPG-bug-id: 2351
-Signed-off-by: NIIBE Yutaka 

- g10/sig-check.c | 13 +
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/g10/sig-check.c b/g10/sig-check.c
-index 290f19a..7000b48 100644
 a/g10/sig-check.c
-+++ b/g10/sig-check.c
-@@ -797,15 +797,20 @@ check_signature_over_key_or_uid (PKT_public_key *signer,
- *is_selfsig = 1;
- }
-   else
--/* See if one of the subkeys was the signer (although this is
--   extremely unlikely).  */
- {
-   kbnode_t ctx = NULL;
-   kbnode_t n;
- 
--  while ((n = walk_kbnode (kb, , PKT_PUBLIC_SUBKEY)))
-+  /* See if one of the subkeys was the signer (although this
-+ is extremely unlikely).  */
-+  while ((n = walk_kbnode (kb, , 0)))
- {
--  PKT_public_key *subk = n->pkt->pkt.public_key;
-+  PKT_public_key *subk;
-+
-+  if (n->pkt->pkttype != PKT_PUBLIC_SUBKEY)
-+continue;
-+
-+  subk = n->pkt->pkt.public_key;
-   if (sig->keyid[0] == subk->keyid[0]
-   && sig->keyid[1] == subk->keyid[1])
- /* Issued by a subkey.  */
--- 
-2.8.0.rc3
-

[arch-commits] Commit in gnupg/trunk (PKGBUILD sig-check-correction.diff)

[Gaetan Bisson]

Date: Wednesday, May 11, 2016 @ 21:57:40
  Author: bisson
Revision: 267821

fix FS#49280

Added:
  gnupg/trunk/sig-check-correction.diff
Modified:
  gnupg/trunk/PKGBUILD

---+
 PKGBUILD  |9 +--
 sig-check-correction.diff |   50 
 2 files changed, 56 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-11 19:42:07 UTC (rev 267820)
+++ PKGBUILD2016-05-11 19:57:40 UTC (rev 267821)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.12
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,8 +20,10 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('3b01a35ac04277ea31cc01b4ac4e230e54b5480c' 'SKIP')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'sig-check-correction.diff')
+sha1sums=('3b01a35ac04277ea31cc01b4ac4e230e54b5480c' 'SKIP'
+  '3b9e42ff60a3ec28f507e3da9401a7201e3cff14')
 
 install=install
 
@@ -32,6 +34,7 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -p1 -i ../sig-check-correction.diff
 }
 
 build() {

Added: sig-check-correction.diff
===
--- sig-check-correction.diff   (rev 0)
+++ sig-check-correction.diff   2016-05-11 19:57:40 UTC (rev 267821)
@@ -0,0 +1,50 @@
+From 83a90a916e8e2f8e44c3b11d11e1dd75f65a87fb Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka 
+Date: Wed, 11 May 2016 19:27:03 +0900
+Subject: [PATCH 1/1] g10: Fix signature checking.
+
+* g10/sig-check.c (check_signature_over_key_or_uid): Fix call to
+walk_kbnode.
+
+--
+
+Thanks to Vincent Brillault (Feandil).
+
+GnuPG-bug-id: 2351
+Signed-off-by: NIIBE Yutaka 
+---
+ g10/sig-check.c | 13 +
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/g10/sig-check.c b/g10/sig-check.c
+index 290f19a..7000b48 100644
+--- a/g10/sig-check.c
 b/g10/sig-check.c
+@@ -797,15 +797,20 @@ check_signature_over_key_or_uid (PKT_public_key *signer,
+ *is_selfsig = 1;
+ }
+   else
+-/* See if one of the subkeys was the signer (although this is
+-   extremely unlikely).  */
+ {
+   kbnode_t ctx = NULL;
+   kbnode_t n;
+ 
+-  while ((n = walk_kbnode (kb, , PKT_PUBLIC_SUBKEY)))
++  /* See if one of the subkeys was the signer (although this
++ is extremely unlikely).  */
++  while ((n = walk_kbnode (kb, , 0)))
+ {
+-  PKT_public_key *subk = n->pkt->pkt.public_key;
++  PKT_public_key *subk;
++
++  if (n->pkt->pkttype != PKT_PUBLIC_SUBKEY)
++continue;
++
++  subk = n->pkt->pkt.public_key;
+   if (sig->keyid[0] == subk->keyid[0]
+   && sig->keyid[1] == subk->keyid[1])
+ /* Issued by a subkey.  */
+-- 
+2.8.0.rc3
+

[arch-commits] Commit in gnupg/trunk (PKGBUILD install)

[Gaetan Bisson]

Date: Thursday, May 5, 2016 @ 01:48:22
  Author: bisson
Revision: 266903

upstream update, remove deprecated install file

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/install

--+
 PKGBUILD |4 ++--
 install  |   21 +
 2 files changed, 3 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-04 21:59:04 UTC (rev 266902)
+++ PKGBUILD2016-05-04 23:48:22 UTC (rev 266903)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.11
+pkgver=2.1.12
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('4af2032a60ff22e322b1c5b270d6d2228f59a3a3' 'SKIP')
+sha1sums=('3b01a35ac04277ea31cc01b4ac4e230e54b5480c' 'SKIP')
 
 install=install
 

Modified: install
===
--- install 2016-05-04 21:59:04 UTC (rev 266902)
+++ install 2016-05-04 23:48:22 UTC (rev 266903)
@@ -1,23 +1,4 @@
-info_dir=/usr/share/info
-info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
-
 post_install() {
# See FS#42798 and FS#47371
-   dirmngr /dev/null
-
-   [ -x usr/bin/install-info ] || return 0
-   for f in ${info_files[@]}; do
-   usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
-   done
+   dirmngr /dev/null || true
 }
-
-pre_remove() {
-   [ -x usr/bin/install-info ] || return 0
-   for f in ${info_files[@]}; do
-   usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> 
/dev/null
-   done
-}
-
-post_upgrade() {
-   post_install
-}

[arch-commits] Commit in gnupg/trunk (PKGBUILD install)

[Gaetan Bisson]

Date: Thursday, December 24, 2015 @ 05:01:30
  Author: bisson
Revision: 257237

fix FS#47371

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/install

--+
 PKGBUILD |2 +-
 install  |8 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-23 19:28:07 UTC (rev 257236)
+++ PKGBUILD2015-12-24 04:01:30 UTC (rev 257237)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.10
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')

Modified: install
===
--- install 2015-12-23 19:28:07 UTC (rev 257236)
+++ install 2015-12-24 04:01:30 UTC (rev 257237)
@@ -2,6 +2,9 @@
 info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
 
 post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null
+
[ -x usr/bin/install-info ] || return 0
for f in ${info_files[@]}; do
usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
@@ -17,9 +20,4 @@
 
 post_upgrade() {
post_install
-
-   # Fix upgrade to 2.1; see FS#42798
-   [ $(vercmp $2 2.1.0-4) = -1 ] &&
-   dirmngr /dev/null ||
-   return 0
 }

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

[Gaetan Bisson]

Date: Monday, December 21, 2015 @ 05:48:52
  Author: bisson
Revision: 257056

implement FS#47407

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-21 01:44:09 UTC (rev 257055)
+++ PKGBUILD2015-12-21 04:48:52 UTC (rev 257056)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.10
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -15,7 +15,7 @@
 'libusb-compat: scdaemon')
 makedepends=('libldap' 'libusb-compat')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
- 'pinentry' 'bzip2' 'readline' 'gnutls')
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'

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

[Gaetan Bisson]

Date: Thursday, December 17, 2015 @ 08:08:28
  Author: bisson
Revision: 256688

remove unneeded option

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-17 05:35:48 UTC (rev 256687)
+++ PKGBUILD2015-12-17 07:08:28 UTC (rev 256688)
@@ -43,7 +43,6 @@
--libexecdir=/usr/lib/gnupg \
--enable-maintainer-mode \
--enable-symcryptrun \
-   --enable-gpgtar \
 
make
 }

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

[Gaetan Bisson]

Date: Friday, December 4, 2015 @ 22:48:38
  Author: bisson
Revision: 252357

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-04 21:28:33 UTC (rev 252356)
+++ PKGBUILD2015-12-04 21:48:38 UTC (rev 252357)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.9
+pkgver=2.1.10
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('119bab38d2ff3a849be62914be9bf7333da68883' 'SKIP')
+sha1sums=('4aa2594d2d364fe7708a9739ae7cebd251e536c4' 'SKIP')
 
 install=install
 

[arch-commits] Commit in gnupg/trunk (PKGBUILD ssh-agent.patch ssh-ed25519.patch)

[Gaetan Bisson]

Date: Saturday, October 10, 2015 @ 18:34:09
  Author: bisson
Revision: 248865

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/ssh-agent.patch
  gnupg/trunk/ssh-ed25519.patch

---+
 PKGBUILD  |   14 +++-
 ssh-agent.patch   |   42 
 ssh-ed25519.patch |   60 
 3 files changed, 4 insertions(+), 112 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-10 13:02:01 UTC (rev 248864)
+++ PKGBUILD2015-10-10 16:34:09 UTC (rev 248865)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.8
-pkgrel=4
+pkgver=2.1.9
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,12 +20,8 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-'ssh-ed25519.patch'
-'ssh-agent.patch')
-sha1sums=('61f5bc656dd7fddd4ab67b720d47ef0651bfb727' 'SKIP'
-  'fd77cf366f6bd70c1d33e910044612aebe6bbe63'
-  '605f9a1ca5bbb1791c86452d113cb0617ec437e8')
+source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('119bab38d2ff3a849be62914be9bf7333da68883' 'SKIP')
 
 install=install
 
@@ -36,8 +32,6 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
-   patch -p1 -i ../ssh-ed25519.patch
-   patch -p1 -i ../ssh-agent.patch
 }
 
 build() {

Deleted: ssh-agent.patch
===
--- ssh-agent.patch 2015-10-10 13:02:01 UTC (rev 248864)
+++ ssh-agent.patch 2015-10-10 16:34:09 UTC (rev 248865)
@@ -1,42 +0,0 @@
-diff --git a/agent/agent.h b/agent/agent.h
-index b3e8470..9e066c9 100644
 a/agent/agent.h
-+++ b/agent/agent.h
-@@ -50,7 +50,8 @@
- /* The maximum length of a passphrase (in bytes).  Note: this is
-further contrained by the Assuan line length (and any other text on
-the same line).  However, the Assuan line length is 1k bytes so
--   this shouldn't be a problem in practice.  */
-+   this shouldn't be a problem in practice.
-+   (MAX_PASSPHRASE_LEN + 1) should be multiple of alignment size.  */
- #define MAX_PASSPHRASE_LEN 255
- 
- 
-diff --git a/agent/command-ssh.c b/agent/command-ssh.c
-index 8be1255..3f63f76 100644
 a/agent/command-ssh.c
-+++ b/agent/command-ssh.c
-@@ -3107,7 +3107,8 @@ ssh_identity_register (ctrl_t ctrl, ssh_key_type_spec_t 
*spec,
-   err = gpg_error_from_syserror ();
-   goto out;
- }
--  pi2 = pi + (sizeof *pi + MAX_PASSPHRASE_LEN + 1);
-+  pi2 = (struct pin_entry_info_s *)((char *)pi + (sizeof (*pi)
-+  + MAX_PASSPHRASE_LEN + 1));
-   pi->max_length = MAX_PASSPHRASE_LEN + 1;
-   pi->max_tries = 1;
-   pi->with_repeat = 1;
-diff --git a/agent/genkey.c b/agent/genkey.c
-index 13858ca..54b7149 100644
 a/agent/genkey.c
-+++ b/agent/genkey.c
-@@ -375,7 +375,8 @@ agent_ask_new_passphrase (ctrl_t ctrl, const char *prompt,
- }
- 
-   pi = gcry_calloc_secure (2, sizeof (*pi) + MAX_PASSPHRASE_LEN + 1);
--  pi2 = pi + (sizeof *pi + MAX_PASSPHRASE_LEN + 1);
-+  pi2 = (struct pin_entry_info_s *)((char *)pi + (sizeof (*pi)
-+  + MAX_PASSPHRASE_LEN + 1));
-   pi->max_length = MAX_PASSPHRASE_LEN + 1;
-   pi->max_tries = 3;
-   pi->with_qualitybar = 1;

Deleted: ssh-ed25519.patch
===
--- ssh-ed25519.patch   2015-10-10 13:02:01 UTC (rev 248864)
+++ ssh-ed25519.patch   2015-10-10 16:34:09 UTC (rev 248865)
@@ -1,60 +0,0 @@
-From 7d5999f0964c9412c0e18eb1adefdb729be68cd4 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka 
-Date: Wed, 16 Sep 2015 10:37:38 +0900
-Subject: [PATCH] agent: Fix registering SSH Key of Ed25519.
-
-* agent/command-ssh.c (stream_read_string): Add the prefix of 0x40.
-
---
-
-GnuPG-bug-id: 2096

- agent/command-ssh.c | 14 --
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/agent/command-ssh.c b/agent/command-ssh.c
-index 8868620..8be1255 100644
 a/agent/command-ssh.c
-+++ b/agent/command-ssh.c
-@@ -580,8 +580,9 @@ stream_read_string (estream_t stream, unsigned int secure,
- 
- 
- /* Read a binary string from STREAM and store it as an opaque MPI at
--   R_MPI.  Depending on SECURE use secure memory.  If the string is
--   too large for key material return an error.  */
-+   R_MPI, adding 0x40 (this is the prefix for EdDSA key in OpenPGP).
-+   Depending on SECURE use secure memory.  If the string is too large
-+   

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

[Gaetan Bisson]

Date: Wednesday, September 30, 2015 @ 02:47:23
  Author: bisson
Revision: 247904

fix FS#46471

Added:
  gnupg/trunk/ssh-agent.patch
Modified:
  gnupg/trunk/PKGBUILD

-+
 PKGBUILD|9 ++---
 ssh-agent.patch |   42 ++
 2 files changed, 48 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-29 22:19:26 UTC (rev 247903)
+++ PKGBUILD2015-09-30 00:47:23 UTC (rev 247904)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.8
-pkgrel=3
+pkgrel=4
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -21,9 +21,11 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-'ssh-ed25519.patch')
+'ssh-ed25519.patch'
+'ssh-agent.patch')
 sha1sums=('61f5bc656dd7fddd4ab67b720d47ef0651bfb727' 'SKIP'
-  'fd77cf366f6bd70c1d33e910044612aebe6bbe63')
+  'fd77cf366f6bd70c1d33e910044612aebe6bbe63'
+  '605f9a1ca5bbb1791c86452d113cb0617ec437e8')
 
 install=install
 
@@ -35,6 +37,7 @@
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
patch -p1 -i ../ssh-ed25519.patch
+   patch -p1 -i ../ssh-agent.patch
 }
 
 build() {

Added: ssh-agent.patch
===
--- ssh-agent.patch (rev 0)
+++ ssh-agent.patch 2015-09-30 00:47:23 UTC (rev 247904)
@@ -0,0 +1,42 @@
+diff --git a/agent/agent.h b/agent/agent.h
+index b3e8470..9e066c9 100644
+--- a/agent/agent.h
 b/agent/agent.h
+@@ -50,7 +50,8 @@
+ /* The maximum length of a passphrase (in bytes).  Note: this is
+further contrained by the Assuan line length (and any other text on
+the same line).  However, the Assuan line length is 1k bytes so
+-   this shouldn't be a problem in practice.  */
++   this shouldn't be a problem in practice.
++   (MAX_PASSPHRASE_LEN + 1) should be multiple of alignment size.  */
+ #define MAX_PASSPHRASE_LEN 255
+ 
+ 
+diff --git a/agent/command-ssh.c b/agent/command-ssh.c
+index 8be1255..3f63f76 100644
+--- a/agent/command-ssh.c
 b/agent/command-ssh.c
+@@ -3107,7 +3107,8 @@ ssh_identity_register (ctrl_t ctrl, ssh_key_type_spec_t 
*spec,
+   err = gpg_error_from_syserror ();
+   goto out;
+ }
+-  pi2 = pi + (sizeof *pi + MAX_PASSPHRASE_LEN + 1);
++  pi2 = (struct pin_entry_info_s *)((char *)pi + (sizeof (*pi)
++  + MAX_PASSPHRASE_LEN + 1));
+   pi->max_length = MAX_PASSPHRASE_LEN + 1;
+   pi->max_tries = 1;
+   pi->with_repeat = 1;
+diff --git a/agent/genkey.c b/agent/genkey.c
+index 13858ca..54b7149 100644
+--- a/agent/genkey.c
 b/agent/genkey.c
+@@ -375,7 +375,8 @@ agent_ask_new_passphrase (ctrl_t ctrl, const char *prompt,
+ }
+ 
+   pi = gcry_calloc_secure (2, sizeof (*pi) + MAX_PASSPHRASE_LEN + 1);
+-  pi2 = pi + (sizeof *pi + MAX_PASSPHRASE_LEN + 1);
++  pi2 = (struct pin_entry_info_s *)((char *)pi + (sizeof (*pi)
++  + MAX_PASSPHRASE_LEN + 1));
+   pi->max_length = MAX_PASSPHRASE_LEN + 1;
+   pi->max_tries = 3;
+   pi->with_qualitybar = 1;

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

[Gaetan Bisson]

Date: Tuesday, September 22, 2015 @ 06:12:35
  Author: bisson
Revision: 247052

fix FS#46378

Added:
  gnupg/trunk/ssh-ed25519.patch
Modified:
  gnupg/trunk/PKGBUILD

---+
 PKGBUILD  |9 +--
 ssh-ed25519.patch |   60 
 2 files changed, 66 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-22 04:05:59 UTC (rev 247051)
+++ PKGBUILD2015-09-22 04:12:35 UTC (rev 247052)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.8
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,8 +20,10 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('61f5bc656dd7fddd4ab67b720d47ef0651bfb727' 'SKIP')
+source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'ssh-ed25519.patch')
+sha1sums=('61f5bc656dd7fddd4ab67b720d47ef0651bfb727' 'SKIP'
+  'fd77cf366f6bd70c1d33e910044612aebe6bbe63')
 
 install=install
 
@@ -32,6 +34,7 @@
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -p1 -i ../ssh-ed25519.patch
 }
 
 build() {

Added: ssh-ed25519.patch
===
--- ssh-ed25519.patch   (rev 0)
+++ ssh-ed25519.patch   2015-09-22 04:12:35 UTC (rev 247052)
@@ -0,0 +1,60 @@
+From 7d5999f0964c9412c0e18eb1adefdb729be68cd4 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka 
+Date: Wed, 16 Sep 2015 10:37:38 +0900
+Subject: [PATCH] agent: Fix registering SSH Key of Ed25519.
+
+* agent/command-ssh.c (stream_read_string): Add the prefix of 0x40.
+
+--
+
+GnuPG-bug-id: 2096
+---
+ agent/command-ssh.c | 14 --
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/agent/command-ssh.c b/agent/command-ssh.c
+index 8868620..8be1255 100644
+--- a/agent/command-ssh.c
 b/agent/command-ssh.c
+@@ -580,8 +580,9 @@ stream_read_string (estream_t stream, unsigned int secure,
+ 
+ 
+ /* Read a binary string from STREAM and store it as an opaque MPI at
+-   R_MPI.  Depending on SECURE use secure memory.  If the string is
+-   too large for key material return an error.  */
++   R_MPI, adding 0x40 (this is the prefix for EdDSA key in OpenPGP).
++   Depending on SECURE use secure memory.  If the string is too large
++   for key material return an error.  */
+ static gpg_error_t
+ stream_read_blob (estream_t stream, unsigned int secure, gcry_mpi_t *r_mpi)
+ {
+@@ -607,9 +608,9 @@ stream_read_blob (estream_t stream, unsigned int secure, 
gcry_mpi_t *r_mpi)
+ 
+   /* Allocate space.  */
+   if (secure)
+-buffer = xtrymalloc_secure (length? length:1);
++buffer = xtrymalloc_secure (length+1);
+   else
+-buffer = xtrymalloc (length?length:1);
++buffer = xtrymalloc (length+1);
+   if (!buffer)
+ {
+   err = gpg_error_from_syserror ();
+@@ -617,11 +618,12 @@ stream_read_blob (estream_t stream, unsigned int secure, 
gcry_mpi_t *r_mpi)
+ }
+ 
+   /* Read data.  */
+-  err = stream_read_data (stream, buffer, length);
++  err = stream_read_data (stream, buffer + 1, length);
+   if (err)
+ goto leave;
+ 
+-  *r_mpi = gcry_mpi_set_opaque (NULL, buffer, 8*length);
++  buffer[0] = 0x40;
++  *r_mpi = gcry_mpi_set_opaque (NULL, buffer, 8*(length+1));
+   buffer = NULL;
+ 
+  leave:
+-- 
+2.1.4
+

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

[Gaetan Bisson]

Date: Monday, September 14, 2015 @ 17:56:17
  Author: bisson
Revision: 246032

libksba still needed for dirmngr

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-14 12:35:24 UTC (rev 246031)
+++ PKGBUILD2015-09-14 15:56:17 UTC (rev 246032)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -14,7 +14,7 @@
 optdepends=('libldap: gpg2keys_ldap'
 'libusb-compat: scdaemon')
 makedepends=('libldap' 'libusb-compat')
-depends=('npth' 'libgpg-error' 'libgcrypt' 'libassuan'
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
  'pinentry' 'bzip2' 'readline' 'gnutls')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
   '46CC730865BB5C78EBABADCF04376F3EE0856959'

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

[Gaetan Bisson]

Date: Thursday, September 10, 2015 @ 23:43:54
  Author: bisson
Revision: 245757

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-10 20:12:12 UTC (rev 245756)
+++ PKGBUILD2015-09-10 21:43:54 UTC (rev 245757)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.1.7
+pkgver=2.1.8
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -14,7 +14,7 @@
 optdepends=('libldap: gpg2keys_ldap'
 'libusb-compat: scdaemon')
 makedepends=('libldap' 'libusb-compat')
-depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libassuan'
  'pinentry' 'bzip2' 'readline' 'gnutls')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('1a345804f34a2acd05c1555e40ddfa297f38438b' 'SKIP')
+sha1sums=('61f5bc656dd7fddd4ab67b720d47ef0651bfb727' 'SKIP')
 
 install=install
 

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

[Gaetan Bisson]

Date: Tuesday, August 11, 2015 @ 17:05:19
  Author: bisson
Revision: 243159

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-11 14:21:42 UTC (rev 243158)
+++ PKGBUILD2015-08-11 15:05:19 UTC (rev 243159)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.1.6
+pkgver=2.1.7
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('9e8157b3386da04760657ce3117fc4dc570c57c5' 'SKIP')
+sha1sums=('1a345804f34a2acd05c1555e40ddfa297f38438b' 'SKIP')
 
 install=install
 
@@ -31,7 +31,7 @@
 
 prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
-   sed '/noinst_SCRIPTS = gpg-zip/c bin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
 }
 
 build() {

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

[Gaetan Bisson]

Date: Wednesday, July 1, 2015 @ 19:13:11
  Author: bisson
Revision: 241668

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-01 16:06:06 UTC (rev 241667)
+++ PKGBUILD2015-07-01 17:13:11 UTC (rev 241668)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.1.5
+pkgver=2.1.6
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('02bbe32e1ef3b06b3ae3c60c955fb767a1aa0f2f' 'SKIP')
+sha1sums=('9e8157b3386da04760657ce3117fc4dc570c57c5' 'SKIP')
 
 install=install
 

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

[Gaetan Bisson]

Date: Thursday, June 11, 2015 @ 18:31:13
  Author: bisson
Revision: 240601

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-11 16:27:46 UTC (rev 240600)
+++ PKGBUILD2015-06-11 16:31:13 UTC (rev 240601)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.1.4
+pkgver=2.1.5
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('ad68d65c54698e3c781e17864ab5918442df155a' 'SKIP')
+sha1sums=('02bbe32e1ef3b06b3ae3c60c955fb767a1aa0f2f' 'SKIP')
 
 install=install
 

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

[Gaetan Bisson]

Date: Tuesday, May 12, 2015 @ 16:14:18
  Author: bisson
Revision: 239149

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-12 13:14:10 UTC (rev 239148)
+++ PKGBUILD2015-05-12 14:14:18 UTC (rev 239149)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.1.3
-pkgrel=3
+pkgver=2.1.4
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('091e69ec1ce3f0032e6b135e4da561e8d46d20a7' 'SKIP')
+sha1sums=('ad68d65c54698e3c781e17864ab5918442df155a' 'SKIP')
 
 install=install
 

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

[Tobias Powalowski]

Date: Tuesday, April 28, 2015 @ 16:46:16
  Author: tpowa
Revision: 238220

upgpkg: gnupg 2.1.3-3

rebuild against new libgpg-error, libksba and libassuan+

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-28 14:40:38 UTC (rev 238219)
+++ PKGBUILD2015-04-28 14:46:16 UTC (rev 238220)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')

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

[Gaetan Bisson]

Date: Saturday, April 11, 2015 @ 23:23:04
  Author: bisson
Revision: 236278

rebuild for gnutls-3.4.0

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-11 21:14:43 UTC (rev 236277)
+++ PKGBUILD2015-04-11 21:23:04 UTC (rev 236278)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')

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

[Gaetan Bisson]

Date: Saturday, April 11, 2015 @ 23:14:22
  Author: bisson
Revision: 236276

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/hkps-hostname.patch

-+
 PKGBUILD|   11 ++---
 hkps-hostname.patch |  100 --
 2 files changed, 4 insertions(+), 107 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-11 20:47:18 UTC (rev 236275)
+++ PKGBUILD2015-04-11 21:14:22 UTC (rev 236276)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.1.2
-pkgrel=4
+pkgver=2.1.3
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -20,10 +20,8 @@
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-'hkps-hostname.patch')
-sha1sums=('7e972cb9af47d9b8ce164dcf37fc4f32634d6cd6' 'SKIP'
-  '11d96926f92c3303bf8443d55863fdf12c76f43a')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha1sums=('091e69ec1ce3f0032e6b135e4da561e8d46d20a7' 'SKIP')
 
 install=install
 
@@ -33,7 +31,6 @@
 
 prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
-   patch -p1 -i ../hkps-hostname.patch # FS#43364
sed '/noinst_SCRIPTS = gpg-zip/c bin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
 }
 

Deleted: hkps-hostname.patch
===
--- hkps-hostname.patch 2015-04-11 20:47:18 UTC (rev 236275)
+++ hkps-hostname.patch 2015-04-11 21:14:22 UTC (rev 236276)
@@ -1,100 +0,0 @@
-From: Werner Koch w...@gnupg.org
-Date: Thu, 19 Mar 2015 14:37:05 + (+0100)
-Subject: hkps: Fix host name verification when using pools.
-X-Git-Url: 
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=dc10d466bff53821f23d2cb4814c259d40c5d9c5;hp=28bb3ab686c1c994f67a92b6846b3726c58a0bc3
-
-hkps: Fix host name verification when using pools.
-
-* common/http.c (send_request): Set the requested for SNI.
-* dirmngr/ks-engine-hkp.c (map_host): Return the poolname and not
-the selecting a host.
---
-
-GnuPG-bug-id: 1792
-
-Thanks to davidw for figuring out the problem.
-
-Signed-off-by: Werner Koch w...@gnupg.org

-
-diff --git a/common/http.c b/common/http.c
-index 50c0692..12e3fcb 100644
 a/common/http.c
-+++ b/common/http.c
-@@ -1443,7 +1443,8 @@ send_request (http_t hd, const char *httphost, const 
char *auth,
- }
- 
- # if HTTP_USE_NTBTLS
--  err = ntbtls_set_hostname (hd-session-tls_session, server);
-+  err = ntbtls_set_hostname (hd-session-tls_session,
-+ hd-session-servername);
-   if (err)
- {
-   log_info (ntbtls_set_hostname failed: %s\n, gpg_strerror (err));
-@@ -1452,7 +1453,8 @@ send_request (http_t hd, const char *httphost, const 
char *auth,
- # elif HTTP_USE_GNUTLS
-   rc = gnutls_server_name_set (hd-session-tls_session,
-GNUTLS_NAME_DNS,
--   server, strlen (server));
-+   hd-session-servername,
-+   strlen (hd-session-servername));
-   if (rc  0)
- log_info (gnutls_server_name_set failed: %s\n, gnutls_strerror 
(rc));
- # endif /*HTTP_USE_GNUTLS*/
-diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index ea607cb..0568094 100644
 a/dirmngr/ks-engine-hkp.c
-+++ b/dirmngr/ks-engine-hkp.c
-@@ -521,6 +521,14 @@ map_host (ctrl_t ctrl, const char *name, int 
force_reselect,
-   hi = hosttable[idx];
-   if (hi-pool)
- {
-+  /* Deal with the pool name before selecting a host. */
-+  if (r_poolname  hi-cname)
-+{
-+  *r_poolname = xtrystrdup (hi-cname);
-+  if (!*r_poolname)
-+return gpg_error_from_syserror ();
-+}
-+
-   /* If the currently selected host is now marked dead, force a
-  re-selection .  */
-   if (force_reselect)
-@@ -536,6 +544,11 @@ map_host (ctrl_t ctrl, const char *name, int 
force_reselect,
-   if (hi-poolidx == -1)
- {
-   log_error (no alive host found in pool '%s'\n, name);
-+  if (r_poolname)
-+{
-+  xfree (*r_poolname);
-+  *r_poolname = NULL;
-+}
-   return gpg_error (GPG_ERR_NO_KEYSERVER);
- }
- }
-@@ -548,6 +561,11 @@ map_host (ctrl_t ctrl, const char *name, int 
force_reselect,
-   if (hi-dead)
- {
-   log_error (host '%s' marked as dead\n, hi-name);
-+  if (r_poolname)
-+{
-+  xfree (*r_poolname);
-+  *r_poolname = NULL;
-+}
-   return 

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

[Gaetan Bisson]

Date: Thursday, April 9, 2015 @ 22:44:40
  Author: bisson
Revision: 235993

rebuild for gnutls-3.4.0

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-09 20:24:42 UTC (rev 235992)
+++ PKGBUILD2015-04-09 20:44:40 UTC (rev 235993)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')

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

[Gaetan Bisson]

Date: Thursday, March 26, 2015 @ 18:50:44
  Author: bisson
Revision: 234979

fix FS#44342

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-26 16:48:12 UTC (rev 234978)
+++ PKGBUILD2015-03-26 17:50:44 UTC (rev 234979)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -34,6 +34,7 @@
 prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ../hkps-hostname.patch # FS#43364
+   sed '/noinst_SCRIPTS = gpg-zip/c bin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
 }
 
 build() {

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

[Gaetan Bisson]

Date: Thursday, March 19, 2015 @ 22:15:02
  Author: bisson
Revision: 234175

fix FS#43364

Added:
  gnupg/trunk/hkps-hostname.patch
Modified:
  gnupg/trunk/PKGBUILD

-+
 PKGBUILD|   17 +---
 hkps-hostname.patch |  100 ++
 2 files changed, 110 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-19 21:01:21 UTC (rev 234174)
+++ PKGBUILD2015-03-19 21:15:02 UTC (rev 234175)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -16,12 +16,10 @@
 makedepends=('libldap' 'libusb-compat')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
  'pinentry' 'bzip2' 'readline' 'gnutls')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
-  '46CC730865BB5C78EBABADCF04376F3EE0856959'
-  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
-  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('7e972cb9af47d9b8ce164dcf37fc4f32634d6cd6' 'SKIP')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
+'hkps-hostname.patch')
+sha1sums=('7e972cb9af47d9b8ce164dcf37fc4f32634d6cd6'
+  '11d96926f92c3303bf8443d55863fdf12c76f43a')
 
 install=install
 
@@ -29,6 +27,11 @@
 provides=('dirmngr' gnupg2=${pkgver})
 replaces=('dirmngr' 'gnupg2')
 
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../hkps-hostname.patch # FS#43364
+}
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure \

Added: hkps-hostname.patch
===
--- hkps-hostname.patch (rev 0)
+++ hkps-hostname.patch 2015-03-19 21:15:02 UTC (rev 234175)
@@ -0,0 +1,100 @@
+From: Werner Koch w...@gnupg.org
+Date: Thu, 19 Mar 2015 14:37:05 + (+0100)
+Subject: hkps: Fix host name verification when using pools.
+X-Git-Url: 
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=dc10d466bff53821f23d2cb4814c259d40c5d9c5;hp=28bb3ab686c1c994f67a92b6846b3726c58a0bc3
+
+hkps: Fix host name verification when using pools.
+
+* common/http.c (send_request): Set the requested for SNI.
+* dirmngr/ks-engine-hkp.c (map_host): Return the poolname and not
+the selecting a host.
+--
+
+GnuPG-bug-id: 1792
+
+Thanks to davidw for figuring out the problem.
+
+Signed-off-by: Werner Koch w...@gnupg.org
+---
+
+diff --git a/common/http.c b/common/http.c
+index 50c0692..12e3fcb 100644
+--- a/common/http.c
 b/common/http.c
+@@ -1443,7 +1443,8 @@ send_request (http_t hd, const char *httphost, const 
char *auth,
+ }
+ 
+ # if HTTP_USE_NTBTLS
+-  err = ntbtls_set_hostname (hd-session-tls_session, server);
++  err = ntbtls_set_hostname (hd-session-tls_session,
++ hd-session-servername);
+   if (err)
+ {
+   log_info (ntbtls_set_hostname failed: %s\n, gpg_strerror (err));
+@@ -1452,7 +1453,8 @@ send_request (http_t hd, const char *httphost, const 
char *auth,
+ # elif HTTP_USE_GNUTLS
+   rc = gnutls_server_name_set (hd-session-tls_session,
+GNUTLS_NAME_DNS,
+-   server, strlen (server));
++   hd-session-servername,
++   strlen (hd-session-servername));
+   if (rc  0)
+ log_info (gnutls_server_name_set failed: %s\n, gnutls_strerror 
(rc));
+ # endif /*HTTP_USE_GNUTLS*/
+diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
+index ea607cb..0568094 100644
+--- a/dirmngr/ks-engine-hkp.c
 b/dirmngr/ks-engine-hkp.c
+@@ -521,6 +521,14 @@ map_host (ctrl_t ctrl, const char *name, int 
force_reselect,
+   hi = hosttable[idx];
+   if (hi-pool)
+ {
++  /* Deal with the pool name before selecting a host. */
++  if (r_poolname  hi-cname)
++{
++  *r_poolname = xtrystrdup (hi-cname);
++  if (!*r_poolname)
++return gpg_error_from_syserror ();
++}
++
+   /* If the currently selected host is now marked dead, force a
+  re-selection .  */
+   if (force_reselect)
+@@ -536,6 +544,11 @@ map_host (ctrl_t ctrl, const char *name, int 
force_reselect,
+   if (hi-poolidx == -1)
+ {
+   log_error (no alive host found in pool '%s'\n, name);
++  if (r_poolname)
++{
++  xfree (*r_poolname);
++  *r_poolname = NULL;
++}
+   return gpg_error (GPG_ERR_NO_KEYSERVER);
+ }
+ }
+@@ -548,6 +561,11 @@ map_host (ctrl_t ctrl, const char *name, int 
force_reselect,
+   if (hi-dead)
+ 

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

[Gaetan Bisson]

Date: Thursday, March 19, 2015 @ 22:47:23
  Author: bisson
Revision: 234179

oops

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-19 21:46:59 UTC (rev 234178)
+++ PKGBUILD2015-03-19 21:47:23 UTC (rev 234179)
@@ -16,9 +16,13 @@
 makedepends=('libldap' 'libusb-compat')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
  'pinentry' 'bzip2' 'readline' 'gnutls')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
 'hkps-hostname.patch')
-sha1sums=('7e972cb9af47d9b8ce164dcf37fc4f32634d6cd6'
+sha1sums=('7e972cb9af47d9b8ce164dcf37fc4f32634d6cd6' 'SKIP'
   '11d96926f92c3303bf8443d55863fdf12c76f43a')
 
 install=install

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

[Gaetan Bisson]

Date: Thursday, February 12, 2015 @ 00:26:15
  Author: bisson
Revision: 231306

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-11 22:28:02 UTC (rev 231305)
+++ PKGBUILD2015-02-11 23:26:15 UTC (rev 231306)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.1.1
+pkgver=2.1.2
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -21,7 +21,7 @@
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('3d11fd150cf86f842d077437edb119a775c7325d' 'SKIP')
+sha1sums=('7e972cb9af47d9b8ce164dcf37fc4f32634d6cd6' 'SKIP')
 
 install=install
 

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

[Gaetan Bisson]

Date: Thursday, December 25, 2014 @ 07:58:14
  Author: bisson
Revision: 228026

add validpgpkeys

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 
 1 file changed, 4 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-25 02:17:58 UTC (rev 228025)
+++ PKGBUILD2014-12-25 06:58:14 UTC (rev 228026)
@@ -18,6 +18,10 @@
  'pinentry' 'bzip2' 'readline' 'gnutls')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
 sha1sums=('3d11fd150cf86f842d077437edb119a775c7325d' 'SKIP')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
 
 install=install
 

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

[Gaetan Bisson]

Date: Thursday, December 25, 2014 @ 08:04:54
  Author: bisson
Revision: 228029

style

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-25 07:04:33 UTC (rev 228028)
+++ PKGBUILD2014-12-25 07:04:54 UTC (rev 228029)
@@ -16,12 +16,12 @@
 makedepends=('libldap' 'libusb-compat')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
  'pinentry' 'bzip2' 'readline' 'gnutls')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('3d11fd150cf86f842d077437edb119a775c7325d' 'SKIP')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
   '46CC730865BB5C78EBABADCF04376F3EE0856959'
   '031EC2536E580D8EA286A9F22071B08A33BD3F06'
   'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha1sums=('3d11fd150cf86f842d077437edb119a775c7325d' 'SKIP')
 
 install=install
 

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

[Gaetan Bisson]

Date: Thursday, December 11, 2014 @ 21:08:56
  Author: bisson
Revision: 227549

implement FS#42739

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-11 19:38:13 UTC (rev 227548)
+++ PKGBUILD2014-12-11 20:08:56 UTC (rev 227549)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -15,7 +15,7 @@
 'libusb-compat: scdaemon')
 makedepends=('libldap' 'libusb-compat')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
- 'pinentry' 'bzip2' 'readline')
+ 'pinentry' 'bzip2' 'readline' 'gnutls')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
 'oid2str-overflow.patch'
 'subpacket-off.patch'

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

[Gaetan Bisson]

Date: Friday, November 28, 2014 @ 04:28:30
  Author: bisson
Revision: 227162

fix FS#42933

Added:
  gnupg/trunk/hash-ecdsa.patch
Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 hash-ecdsa.patch |   48 
 2 files changed, 54 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-28 01:53:36 UTC (rev 227161)
+++ PKGBUILD2014-11-28 03:28:30 UTC (rev 227162)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -17,9 +17,11 @@
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
  'pinentry' 'bzip2' 'readline')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-'refresh-keys.patch')
+'refresh-keys.patch'
+'hash-ecdsa.patch')
 sha1sums=('2fcd0ca6889ef6cb59e3275e8411f8b7778c2f33' 'SKIP'
-  '246bea8776882f4c0293685482558f6ead1cf902')
+  '246bea8776882f4c0293685482558f6ead1cf902'
+  'b9bd644276aa1c1a3fcaed82e65eecccfd1f36ed')
 
 install=install
 
@@ -30,6 +32,7 @@
 prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ../refresh-keys.patch
+   patch -p1 -i ../hash-ecdsa.patch
 }
 
 build() {

Added: hash-ecdsa.patch
===
--- hash-ecdsa.patch(rev 0)
+++ hash-ecdsa.patch2014-11-28 03:28:30 UTC (rev 227162)
@@ -0,0 +1,48 @@
+From: Werner Koch w...@gnupg.org
+Date: Wed, 19 Nov 2014 09:34:32 + (+0100)
+Subject: gpg: Fix hash detection for ECDSA.
+X-Git-Url: 
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=f80c2dd78d522f12b2c7afbd5c0763a97d87d2bd;hp=cd2c6f36fe5d1d1d45546f5168aead5cbe6487e0
+
+gpg: Fix hash detection for ECDSA.
+
+* g10/sign.c (sign_file): Use DSA or ECDSA and not DSA|EdDSA.
+--
+
+This error was introduced with
+commit b7f8dec6325f1c80640f878ed3080bbc194fbc78
+while separating EdDSA from ECDSA.
+
+Found due to a related bug report from Brian Minton.
+
+Signed-off-by: Werner Koch w...@gnupg.org
+---
+
+diff --git a/g10/sign.c b/g10/sign.c
+index e7d4a68..2e62f04 100644
+--- a/g10/sign.c
 b/g10/sign.c
+@@ -899,13 +899,12 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int 
detached, strlist_t locusr,
+   for (sk_rover = sk_list; sk_rover; sk_rover = sk_rover-next )
+ {
+   if (sk_rover-pk-pubkey_algo == PUBKEY_ALGO_DSA
+-|| (sk_rover-pk-pubkey_algo == PUBKEY_ALGO_EDDSA
+- !openpgp_oid_is_ed25519 (sk_rover-pk-pkey[1])))
++|| sk_rover-pk-pubkey_algo == PUBKEY_ALGO_ECDSA)
+ {
+   int temp_hashlen = (gcry_mpi_get_nbits
+ (sk_rover-pk-pkey[1]));
+ 
+-  if (sk_rover-pk-pubkey_algo == PUBKEY_ALGO_EDDSA)
++  if (sk_rover-pk-pubkey_algo == PUBKEY_ALGO_ECDSA)
+ temp_hashlen = ecdsa_qbits_from_Q (temp_hashlen);
+   temp_hashlen = (temp_hashlen+7)/8;
+ 
+@@ -915,7 +914,7 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, 
strlist_t locusr,
+   if (hint.digest_lengthtemp_hashlen)
+ hint.digest_length=temp_hashlen;
+ }
+-/* FIXME: need toall gpg-agent */
++/* FIXME: need to check gpg-agent for this. */
+   /* else if (sk_rover-pk-is_protected */
+ /*   sk_rover-pk-protect.s2k.mode == 1002) */
+   /*   smartcard = 1;  */

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

[Gaetan Bisson]

Date: Tuesday, November 25, 2014 @ 17:53:00
  Author: bisson
Revision: 227093

remove unneeded dep, see FS#42897

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-25 16:14:45 UTC (rev 227092)
+++ PKGBUILD2014-11-25 16:53:00 UTC (rev 227093)
@@ -11,10 +11,9 @@
 url='http://www.gnupg.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
-optdepends=('curl: gpg2keys_curl'
-'libldap: gpg2keys_ldap'
+optdepends=('libldap: gpg2keys_ldap'
 'libusb-compat: scdaemon')
-makedepends=('curl' 'libldap' 'libusb-compat')
+makedepends=('libldap' 'libusb-compat')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
  'pinentry' 'bzip2' 'readline')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}

[arch-commits] Commit in gnupg/trunk (PKGBUILD install)

[Gaetan Bisson]

Date: Wednesday, November 19, 2014 @ 23:42:34
  Author: bisson
Revision: 226741

fix FS#42798

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/install

--+
 PKGBUILD |3 +--
 install  |   27 ---
 2 files changed, 17 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-19 21:38:32 UTC (rev 226740)
+++ PKGBUILD2014-11-19 22:42:34 UTC (rev 226741)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -41,7 +41,6 @@
--sbindir=/usr/bin \
--libexecdir=/usr/lib/gnupg \
--enable-maintainer-mode \
-   --enable-standard-socket \
--enable-symcryptrun \
--enable-gpgtar \
 

Modified: install
===
--- install 2014-11-19 21:38:32 UTC (rev 226740)
+++ install 2014-11-19 22:42:34 UTC (rev 226741)
@@ -2,19 +2,24 @@
 info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
 
 post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2 /dev/null
-  done
+   [ -x usr/bin/install-info ] || return 0
+   for f in ${info_files[@]}; do
+   usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+   done
 }
 
-post_upgrade() {
-  post_install $1
+pre_remove() {
+   [ -x usr/bin/install-info ] || return 0
+   for f in ${info_files[@]}; do
+   usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2 
/dev/null
+   done
 }
 
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2 /dev/null
-  done
+post_upgrade() {
+   post_install
+
+   # Fix upgrade to 2.1; see FS#42798
+   [ $(vercmp $2 2.1.0-4) = -1 ] 
+   dirmngr /dev/null /dev/null ||
+   return 0
 }

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

[Gaetan Bisson]

Date: Thursday, November 13, 2014 @ 06:48:09
  Author: bisson
Revision: 226168

fix refresh-keys failure

Added:
  gnupg/trunk/refresh-keys.patch
Modified:
  gnupg/trunk/PKGBUILD

+
 PKGBUILD   |   13 ++
 refresh-keys.patch |  238 +++
 2 files changed, 248 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-13 04:32:38 UTC (rev 226167)
+++ PKGBUILD2014-11-13 05:48:09 UTC (rev 226168)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -17,8 +17,10 @@
 makedepends=('curl' 'libldap' 'libusb-compat')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
  'pinentry' 'bzip2' 'readline')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('2fcd0ca6889ef6cb59e3275e8411f8b7778c2f33' 'SKIP')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+'refresh-keys.patch')
+sha1sums=('2fcd0ca6889ef6cb59e3275e8411f8b7778c2f33' 'SKIP'
+  '246bea8776882f4c0293685482558f6ead1cf902')
 
 install=install
 
@@ -26,6 +28,11 @@
 provides=('dirmngr' gnupg2=${pkgver})
 replaces=('dirmngr' 'gnupg2')
 
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../refresh-keys.patch
+}
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure \

Added: refresh-keys.patch
===
--- refresh-keys.patch  (rev 0)
+++ refresh-keys.patch  2014-11-13 05:48:09 UTC (rev 226168)
@@ -0,0 +1,238 @@
+From eecbed004ca1e9ca23c3892c3a5e6dd174ddf93b Mon Sep 17 00:00:00 2001
+From: Werner Koch w...@gnupg.org
+Date: Wed, 12 Nov 2014 12:14:32 +0100
+Subject: [PATCH] gpg: Fix regression in --refresh-keys
+
+* g10/keyserver.c (keyserver_get): Factor all code out to ...
+(keyserver_get_chunk): new.  Extimate line length.
+(keyserver_get): Split up requests into chunks.
+--
+
+Note that refreshing all keys still requires way to much memory
+because we build an in-memory list of all keys first.  It is required
+to first get a list of all keys to avoid conflicts while updating the
+key store in the process of receiving keys.  A better strategy would
+be a background process and tracking the last update in the key store.
+
+GnuPG-bug-id: 1755
+Signed-off-by: Werner Koch w...@gnupg.org
+---
+ g10/call-dirmngr.c |2 +-
+ g10/keyserver.c|  107 ++--
+ 2 files changed, 89 insertions(+), 20 deletions(-)
+
+diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c
+index 5bddbbe..71f5324 100644
+--- a/g10/call-dirmngr.c
 b/g10/call-dirmngr.c
+@@ -429,7 +429,7 @@ ks_get_data_cb (void *opaque, const void *data, size_t 
datalen)
+error an error code is returned and NULL stored at R_FP.
+ 
+The pattern may only use search specification which a keyserver can
+-   use to retriev keys.  Because we know the format of the pattern we
++   use to retrieve keys.  Because we know the format of the pattern we
+don't need to escape the patterns before sending them to the
+server.
+ 
+diff --git a/g10/keyserver.c b/g10/keyserver.c
+index 1b2e128..5bc1eba 100644
+--- a/g10/keyserver.c
 b/g10/keyserver.c
+@@ -1567,17 +1567,16 @@ keyserver_search (ctrl_t ctrl, strlist_t tokens)
+   return err;
+ }
+ 
+-
+-
+-/* Retrieve a key from a keyserver.  The search pattern are in
+-   (DESC,NDESC).  Allowed search modes are keyid, fingerprint, and
+-   exact searches.  KEYSERVER gives an optional override keyserver. If
+-   (R_FPR,R_FPRLEN) are not NULL, the may retrun the fingerprint of
+-   one imported key.  */
++/* Helper for keyserver_get.  Here we only receive a chunk of the
++   description to be processed in one batch.  This is required due to
++   the limited number of patterns the dirmngr interface (KS_GET) can
++   grok and to limit the amount of temporary required memory.  */
+ static gpg_error_t
+-keyserver_get (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int ndesc,
+-   struct keyserver_spec *keyserver,
+-   unsigned char **r_fpr, size_t *r_fprlen)
++keyserver_get_chunk (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int ndesc,
++ int *r_ndesc_used,
++ void *stats_handle,
++ struct keyserver_spec *keyserver,
++ unsigned char **r_fpr, size_t *r_fprlen)
+ 
+ {
+   gpg_error_t err = 0;
+@@ -1585,12 +1584,26 @@ keyserver_get (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, 
int ndesc,
+   int idx, npat;
+   estream_t datastream;
+   char *source = NULL;
++  size_t linelen;  /* Estimated linelen for KS_GET.  */
++  size_t n;
++
++#define MAX_KS_GET_LINELEN 950  /* Somewhat lower than the real limit.  */
++
++  

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

[Gaetan Bisson]

Date: Tuesday, November 11, 2014 @ 19:53:23
  Author: bisson
Revision: 226069

fix FS#42745

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-11 18:20:24 UTC (rev 226068)
+++ PKGBUILD2014-11-11 18:53:23 UTC (rev 226069)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -24,7 +24,7 @@
 
 conflicts=('dirmngr' 'gnupg2')
 provides=('dirmngr' gnupg2=${pkgver})
-replaces=('dirmngr' 'dirmngr')
+replaces=('dirmngr' 'gnupg2')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}

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

[Gaetan Bisson]

Date: Tuesday, August 12, 2014 @ 23:36:13
  Author: bisson
Revision: 219630

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-12 19:12:35 UTC (rev 219629)
+++ PKGBUILD2014-08-12 21:36:13 UTC (rev 219630)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.0.25
+pkgver=2.0.26
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -17,7 +17,7 @@
 makedepends=('curl' 'libldap' 'libusb-compat')
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('890d77d89f2d187382f95e83e386f2f7ba789436' 'SKIP')
+sha1sums=('3ff5b38152c919724fd09cf2f17df704272ba192' 'SKIP')
 
 install=install
 

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

[Gaetan Bisson]

Date: Thursday, July 3, 2014 @ 19:10:05
  Author: bisson
Revision: 216418

prepare gnupg-2.1 release

Added:
  gnupg/trunk/PKGBUILD.21

-+
 PKGBUILD.21 |   57 +
 1 file changed, 57 insertions(+)

Added: PKGBUILD.21
===
--- PKGBUILD.21 (rev 0)
+++ PKGBUILD.21 2014-07-03 17:10:05 UTC (rev 216418)
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 215944 2014-07-01 06:16:40Z bisson $
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+_pkgver=2.1.0-beta751
+pkgver=${_pkgver/-/.}
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/unstable/${pkgname}-${_pkgver}.tar.bz2{,.sig})
+sha1sums=('3d6dd8a35780626428d98dba80dbbc5c27ac' 'SKIP')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' gnupg2=${pkgver})
+replaces=('dirmngr' 'dirmngr')
+
+build() {
+   cd ${srcdir}/${pkgname}-${_pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-standard-socket \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   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
+   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
+}

[arch-commits] Commit in gnupg/trunk (PKGBUILD filter.patch protect-tool-env.patch)

[Gaetan Bisson]

Date: Tuesday, July 1, 2014 @ 08:16:40
  Author: bisson
Revision: 215944

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/filter.patch
  gnupg/trunk/protect-tool-env.patch

+
 PKGBUILD   |   18 +
 filter.patch   |  153 ---
 protect-tool-env.patch |   28 
 3 files changed, 4 insertions(+), 195 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-01 05:55:49 UTC (rev 215943)
+++ PKGBUILD2014-07-01 06:16:40 UTC (rev 215944)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.0.24
-pkgrel=2
+pkgver=2.0.25
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -16,12 +16,8 @@
 'libusb-compat: scdaemon')
 makedepends=('curl' 'libldap' 'libusb-compat')
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-'protect-tool-env.patch'
-'filter.patch')
-sha1sums=('010e027d5f622778cadc4c124013fe515ed705cf' 'SKIP'
-  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db'
-  'e99aa2b725342aee188d706b42d392efb2389cf4')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha1sums=('890d77d89f2d187382f95e83e386f2f7ba789436' 'SKIP')
 
 install=install
 
@@ -29,12 +25,6 @@
 provides=(gnupg2=${pkgver})
 replaces=('gnupg2')
 
-prepare() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   patch -p1 -i ../protect-tool-env.patch # FS#31900
-   patch -p1 -i ../filter.patch
-}
-
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure \

Deleted: filter.patch
===
--- filter.patch2014-07-01 05:55:49 UTC (rev 215943)
+++ filter.patch2014-07-01 06:16:40 UTC (rev 215944)
@@ -1,153 +0,0 @@
-Hi,
-
-please give the batch below a try.  It works for me but before I do
-another release, I would like a second test.
-
-
-Shalom-Salam,
-
-   Werner
-
-From 044847a0e2013a2833605c1a9f80cfa6ef353309 Mon Sep 17 00:00:00 2001
-From: Werner Koch w...@gnupg.org
-Date: Wed, 25 Jun 2014 14:33:34 +0200
-Subject: [PATCH] gpg: Make screening of keyserver result work with multi-key
- commands.
-
-* g10/keyserver.c (ks_retrieval_filter_arg_s): new.
-(keyserver_retrieval_filter): Use new struct and check all
-descriptions.
-(keyserver_spawn): Pass filter arg suing the new struct.
---
-
-This is a fix for commit 5e933008.
-
-The old code did only work for a single key.  It failed as soon as
-several keys are specified (gpg --refresh-keys or gpg --recv-key A
-B C).

- g10/keyserver.c | 68 ++---
- 1 file changed, 45 insertions(+), 23 deletions(-)
-
-diff --git a/g10/keyserver.c b/g10/keyserver.c
-index 83a4b95..aa41536 100644
 a/g10/keyserver.c
-+++ b/g10/keyserver.c
-@@ -982,13 +982,25 @@ direct_uri_map(const char *scheme,unsigned int is_direct)
- #define KEYSERVER_ARGS_NOKEEP  -o \%o\ \%i\
- 
- 
-+/* Structure to convey the arg to keyserver_retrieval_filter.  */
-+struct ks_retrieval_filter_arg_s
-+{
-+  KEYDB_SEARCH_DESC *desc;
-+  int ndesc;
-+};
-+
-+
- /* Check whether a key matches the search description.  The filter
-returns 0 if the key shall be imported.  Note that this kind of
-filter is not related to the iobuf filters. */
- static int
--keyserver_retrieval_filter (PKT_public_key *pk, PKT_secret_key *sk, void *arg)
-+keyserver_retrieval_filter (PKT_public_key *pk, PKT_secret_key *sk,
-+void *opaque)
- {
--  KEYDB_SEARCH_DESC *desc = arg;
-+  struct ks_retrieval_filter_arg_s *arg = opaque;
-+  KEYDB_SEARCH_DESC *desc = arg-desc;
-+  int ndesc = arg-ndesc;
-+  int n;
-   u32 keyid[2];
-   byte fpr[MAX_FINGERPRINT_LEN];
-   size_t fpr_len = 0;
-@@ -997,32 +1009,40 @@ keyserver_retrieval_filter (PKT_public_key *pk, 
PKT_secret_key *sk, void *arg)
-   if (sk)
- return G10ERR_GENERAL;
- 
-+  if (!ndesc)
-+return 0; /* Okay if no description given.  */
-+
-   fingerprint_from_pk (pk, fpr, fpr_len);
-   keyid_from_pk (pk, keyid);
- 
-   /* Compare requested and returned fingerprints if available. */
--  if (desc-mode == KEYDB_SEARCH_MODE_FPR20)
--{
--  if (fpr_len != 20 || memcmp (fpr, desc-u.fpr, 20))
--return G10ERR_GENERAL;
--}
--  else if (desc-mode == KEYDB_SEARCH_MODE_FPR16)
--{
--  if (fpr_len != 16 || memcmp (fpr, desc-u.fpr, 16))
--return G10ERR_GENERAL;
--}
--  else if (desc-mode == KEYDB_SEARCH_MODE_LONG_KID)
--{
--  if (keyid[0] != desc-u.kid[0] || keyid[1] != desc-u.kid[1])
--return G10ERR_GENERAL;
--}
--  else if (desc-mode == KEYDB_SEARCH_MODE_SHORT_KID)
-+  for (n = 0; n  ndesc; n++)
- {

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

[Gaetan Bisson]

Date: Friday, June 27, 2014 @ 00:48:02
  Author: bisson
Revision: 215497

enable standard socket

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-26 21:33:44 UTC (rev 215496)
+++ PKGBUILD2014-06-26 22:48:02 UTC (rev 215497)
@@ -43,6 +43,7 @@
--sbindir=/usr/bin \
--libexecdir=/usr/lib/gnupg \
--enable-maintainer-mode \
+   --enable-standard-socket \
--enable-symcryptrun \
--enable-gpgtar \
 

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

[Gaetan Bisson]

Date: Wednesday, June 25, 2014 @ 15:31:31
  Author: bisson
Revision: 215437

fix FS#40968

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

--+
 PKGBUILD |9 ++-
 filter.patch |  153 +
 2 files changed, 159 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-25 12:58:23 UTC (rev 215436)
+++ PKGBUILD2014-06-25 13:31:31 UTC (rev 215437)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.0.24
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -17,9 +17,11 @@
 makedepends=('curl' 'libldap' 'libusb-compat')
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-'protect-tool-env.patch')
+'protect-tool-env.patch'
+'filter.patch')
 sha1sums=('010e027d5f622778cadc4c124013fe515ed705cf' 'SKIP'
-  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
+  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db'
+  'e99aa2b725342aee188d706b42d392efb2389cf4')
 
 install=install
 
@@ -30,6 +32,7 @@
 prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ../protect-tool-env.patch # FS#31900
+   patch -p1 -i ../filter.patch
 }
 
 build() {

Added: filter.patch
===
--- filter.patch(rev 0)
+++ filter.patch2014-06-25 13:31:31 UTC (rev 215437)
@@ -0,0 +1,153 @@
+Hi,
+
+please give the batch below a try.  It works for me but before I do
+another release, I would like a second test.
+
+
+Shalom-Salam,
+
+   Werner
+
+From 044847a0e2013a2833605c1a9f80cfa6ef353309 Mon Sep 17 00:00:00 2001
+From: Werner Koch w...@gnupg.org
+Date: Wed, 25 Jun 2014 14:33:34 +0200
+Subject: [PATCH] gpg: Make screening of keyserver result work with multi-key
+ commands.
+
+* g10/keyserver.c (ks_retrieval_filter_arg_s): new.
+(keyserver_retrieval_filter): Use new struct and check all
+descriptions.
+(keyserver_spawn): Pass filter arg suing the new struct.
+--
+
+This is a fix for commit 5e933008.
+
+The old code did only work for a single key.  It failed as soon as
+several keys are specified (gpg --refresh-keys or gpg --recv-key A
+B C).
+---
+ g10/keyserver.c | 68 ++---
+ 1 file changed, 45 insertions(+), 23 deletions(-)
+
+diff --git a/g10/keyserver.c b/g10/keyserver.c
+index 83a4b95..aa41536 100644
+--- a/g10/keyserver.c
 b/g10/keyserver.c
+@@ -982,13 +982,25 @@ direct_uri_map(const char *scheme,unsigned int is_direct)
+ #define KEYSERVER_ARGS_NOKEEP  -o \%o\ \%i\
+ 
+ 
++/* Structure to convey the arg to keyserver_retrieval_filter.  */
++struct ks_retrieval_filter_arg_s
++{
++  KEYDB_SEARCH_DESC *desc;
++  int ndesc;
++};
++
++
+ /* Check whether a key matches the search description.  The filter
+returns 0 if the key shall be imported.  Note that this kind of
+filter is not related to the iobuf filters. */
+ static int
+-keyserver_retrieval_filter (PKT_public_key *pk, PKT_secret_key *sk, void *arg)
++keyserver_retrieval_filter (PKT_public_key *pk, PKT_secret_key *sk,
++void *opaque)
+ {
+-  KEYDB_SEARCH_DESC *desc = arg;
++  struct ks_retrieval_filter_arg_s *arg = opaque;
++  KEYDB_SEARCH_DESC *desc = arg-desc;
++  int ndesc = arg-ndesc;
++  int n;
+   u32 keyid[2];
+   byte fpr[MAX_FINGERPRINT_LEN];
+   size_t fpr_len = 0;
+@@ -997,32 +1009,40 @@ keyserver_retrieval_filter (PKT_public_key *pk, 
PKT_secret_key *sk, void *arg)
+   if (sk)
+ return G10ERR_GENERAL;
+ 
++  if (!ndesc)
++return 0; /* Okay if no description given.  */
++
+   fingerprint_from_pk (pk, fpr, fpr_len);
+   keyid_from_pk (pk, keyid);
+ 
+   /* Compare requested and returned fingerprints if available. */
+-  if (desc-mode == KEYDB_SEARCH_MODE_FPR20)
+-{
+-  if (fpr_len != 20 || memcmp (fpr, desc-u.fpr, 20))
+-return G10ERR_GENERAL;
+-}
+-  else if (desc-mode == KEYDB_SEARCH_MODE_FPR16)
+-{
+-  if (fpr_len != 16 || memcmp (fpr, desc-u.fpr, 16))
+-return G10ERR_GENERAL;
+-}
+-  else if (desc-mode == KEYDB_SEARCH_MODE_LONG_KID)
+-{
+-  if (keyid[0] != desc-u.kid[0] || keyid[1] != desc-u.kid[1])
+-return G10ERR_GENERAL;
+-}
+-  else if (desc-mode == KEYDB_SEARCH_MODE_SHORT_KID)
++  for (n = 0; n  ndesc; n++)
+ {
+-  if (keyid[1] != desc-u.kid[1])
+-return G10ERR_GENERAL;
++  if (desc[n].mode == KEYDB_SEARCH_MODE_FPR20)
++{
++  if (fpr_len == 20  !memcmp (fpr, desc[n].u.fpr, 20))
++return 0;
++}
++  else if (desc[n].mode == KEYDB_SEARCH_MODE_FPR16)
++{
++  if (fpr_len == 16  !memcmp (fpr, desc[n].u.fpr, 16))
++

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

[Gaetan Bisson]

Date: Tuesday, June 24, 2014 @ 18:13:52
  Author: bisson
Revision: 215418

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/libgcrypt.patch

-+
 PKGBUILD|   13 +
 libgcrypt.patch |   28 
 2 files changed, 5 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-24 15:10:27 UTC (rev 215417)
+++ PKGBUILD2014-06-24 16:13:52 UTC (rev 215418)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.0.23
-pkgrel=2
+pkgver=2.0.24
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -17,11 +17,9 @@
 makedepends=('curl' 'libldap' 'libusb-compat')
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-'protect-tool-env.patch'
-'libgcrypt.patch')
-sha1sums=('c90e47ab95a40dd070fd75faef0a05c7b679553b' 'SKIP'
-  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db'
-  '700c462d7d106b845b655165b127e2b66cad3e30')
+'protect-tool-env.patch')
+sha1sums=('010e027d5f622778cadc4c124013fe515ed705cf' 'SKIP'
+  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
 
 install=install
 
@@ -32,7 +30,6 @@
 prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ../protect-tool-env.patch # FS#31900
-   patch -p1 -i ../libgcrypt.patch # FS#40552
 }
 
 build() {

Deleted: libgcrypt.patch
===
--- libgcrypt.patch 2014-06-24 15:10:27 UTC (rev 215417)
+++ libgcrypt.patch 2014-06-24 16:13:52 UTC (rev 215418)
@@ -1,28 +0,0 @@
-From ceef5568d53b286efe639c6fd1d37f154be133ef Mon Sep 17 00:00:00 2001
-From: Werner Koch w...@gnupg.org
-Date: Mon, 23 Jun 2014 13:16:44 +0200
-Subject: [PATCH] ssh: Fix for newer Libgcrypt versions.
-
-* common/ssh-utils.c (get_fingerprint): Add GCRY_PK_ECC case.
---
-
-Reported-by: Anatol Pomozov

- common/ssh-utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/common/ssh-utils.c b/common/ssh-utils.c
-index d8f057d..11ff0fb 100644
 a/common/ssh-utils.c
-+++ b/common/ssh-utils.c
-@@ -89,6 +89,7 @@ get_fingerprint (gcry_sexp_t key, void **r_fpr, size_t 
*r_len,
-   elems = pqgy;
-   gcry_md_write (md, \0\0\0\x07ssh-dss, 11);
-   break;
-+case GCRY_PK_ECC:
- case GCRY_PK_ECDSA:
-   /* We only support the 3 standard curves for now.  It is just a
-  quick hack.  */
--- 
-2.0.0
-

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

[Gaetan Bisson]

Date: Monday, June 23, 2014 @ 19:13:27
  Author: bisson
Revision: 215363

fix FS#40552

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

-+
 PKGBUILD|9 ++---
 libgcrypt.patch |   28 
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-23 17:04:03 UTC (rev 215362)
+++ PKGBUILD2014-06-23 17:13:27 UTC (rev 215363)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.0.23
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -17,9 +17,11 @@
 makedepends=('curl' 'libldap' 'libusb-compat')
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-'protect-tool-env.patch')
+'protect-tool-env.patch'
+'libgcrypt.patch')
 sha1sums=('c90e47ab95a40dd070fd75faef0a05c7b679553b' 'SKIP'
-  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
+  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db'
+  '700c462d7d106b845b655165b127e2b66cad3e30')
 
 install=install
 
@@ -30,6 +32,7 @@
 prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ../protect-tool-env.patch # FS#31900
+   patch -p1 -i ../libgcrypt.patch # FS#40552
 }
 
 build() {

Added: libgcrypt.patch
===
--- libgcrypt.patch (rev 0)
+++ libgcrypt.patch 2014-06-23 17:13:27 UTC (rev 215363)
@@ -0,0 +1,28 @@
+From ceef5568d53b286efe639c6fd1d37f154be133ef Mon Sep 17 00:00:00 2001
+From: Werner Koch w...@gnupg.org
+Date: Mon, 23 Jun 2014 13:16:44 +0200
+Subject: [PATCH] ssh: Fix for newer Libgcrypt versions.
+
+* common/ssh-utils.c (get_fingerprint): Add GCRY_PK_ECC case.
+--
+
+Reported-by: Anatol Pomozov
+---
+ common/ssh-utils.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/common/ssh-utils.c b/common/ssh-utils.c
+index d8f057d..11ff0fb 100644
+--- a/common/ssh-utils.c
 b/common/ssh-utils.c
+@@ -89,6 +89,7 @@ get_fingerprint (gcry_sexp_t key, void **r_fpr, size_t 
*r_len,
+   elems = pqgy;
+   gcry_md_write (md, \0\0\0\x07ssh-dss, 11);
+   break;
++case GCRY_PK_ECC:
+ case GCRY_PK_ECDSA:
+   /* We only support the 3 standard curves for now.  It is just a
+  quick hack.  */
+-- 
+2.0.0
+

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

[Gaetan Bisson]

Date: Tuesday, June 3, 2014 @ 13:16:04
  Author: bisson
Revision: 214080

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-03 11:03:40 UTC (rev 214079)
+++ PKGBUILD2014-06-03 11:16:04 UTC (rev 214080)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.0.22
-pkgrel=2
+pkgver=2.0.23
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -18,7 +18,7 @@
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
 'protect-tool-env.patch')
-sha1sums=('9ba9ee288e9bf813e0f1e25cbe06b58d3072d8b8' 'SKIP'
+sha1sums=('c90e47ab95a40dd070fd75faef0a05c7b679553b' 'SKIP'
   '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
 
 install=install

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

[Thomas Bächler]

Date: Tuesday, December 17, 2013 @ 00:08:59
  Author: thomas
Revision: 201607

upgpkg: gnupg 2.0.22-2: rebuild for libgcrypt 1.6.0

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-16 23:01:55 UTC (rev 201606)
+++ PKGBUILD2013-12-16 23:08:59 UTC (rev 201607)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.0.22
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')

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

[Gaetan Bisson]

Date: Saturday, October 5, 2013 @ 16:12:22
  Author: bisson
Revision: 195924

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-05 12:23:27 UTC (rev 195923)
+++ PKGBUILD2013-10-05 14:12:22 UTC (rev 195924)
@@ -5,7 +5,7 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.0.21
+pkgver=2.0.22
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
@@ -18,7 +18,7 @@
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
 'protect-tool-env.patch')
-sha1sums=('5ba8cce72eb4fd1a3ac1a282d25d7c7b90d3bf26' 'SKIP'
+sha1sums=('9ba9ee288e9bf813e0f1e25cbe06b58d3072d8b8' 'SKIP'
   '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
 
 install=install

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

[Gaetan Bisson]

Date: Monday, August 19, 2013 @ 16:13:46
  Author: bisson
Revision: 193390

upstream update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-19 13:58:17 UTC (rev 193389)
+++ PKGBUILD2013-08-19 14:13:46 UTC (rev 193390)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.0.20
-pkgrel=2
+pkgver=2.0.21
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -18,7 +18,7 @@
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
 'protect-tool-env.patch')
-sha1sums=('7ddfefa37ee9da89a8aaa8f9059d251b4cd02562' 'SKIP'
+sha1sums=('5ba8cce72eb4fd1a3ac1a282d25d7c7b90d3bf26' 'SKIP'
   '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
 
 install=install

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

[Gaetan Bisson]

Date: Wednesday, May 15, 2013 @ 18:37:21
  Author: bisson
Revision: 185600

move binaries to /usr/bin

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-15 16:14:15 UTC (rev 185599)
+++ PKGBUILD2013-05-15 16:37:21 UTC (rev 185600)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.0.20
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -37,6 +37,7 @@
./configure \
--prefix=/usr \
--sysconfdir=/etc \
+   --sbindir=/usr/bin \
--libexecdir=/usr/lib/gnupg \
--enable-maintainer-mode \
--enable-symcryptrun \

[arch-commits] Commit in gnupg/trunk (PKGBUILD valid-keyblock-packet.patch)

[Gaetan Bisson]

Date: Friday, May 10, 2013 @ 21:07:59
  Author: bisson
Revision: 185064

upstream update

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/valid-keyblock-packet.patch

-+
 PKGBUILD|   16 ---
 valid-keyblock-packet.patch |   61 --
 2 files changed, 7 insertions(+), 70 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-10 18:52:41 UTC (rev 185063)
+++ PKGBUILD2013-05-10 19:07:59 UTC (rev 185064)
@@ -5,8 +5,8 @@
 # Contributor: Judd Vinet jvi...@zeroflux.org
 
 pkgname=gnupg
-pkgver=2.0.19
-pkgrel=7
+pkgver=2.0.20
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -17,11 +17,8 @@
 makedepends=('curl' 'libldap' 'libusb-compat')
 depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
 
source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-'valid-keyblock-packet.patch'
 'protect-tool-env.patch')
-sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f'
-  'f6e6830610a8629b0aad69d789373bf8ca481733'
-  '474d827f1c2976bb107985047f61ac9096ae0953'
+sha1sums=('7ddfefa37ee9da89a8aaa8f9059d251b4cd02562' 'SKIP'
   '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
 
 install=install
@@ -30,12 +27,13 @@
 provides=(gnupg2=${pkgver})
 replaces=('gnupg2')
 
-build() {
+prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
-
patch -p1 -i ../protect-tool-env.patch # FS#31900
-   patch -p1 -i ../valid-keyblock-packet.patch
+}
 
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
./configure \
--prefix=/usr \
--sysconfdir=/etc \

Deleted: valid-keyblock-packet.patch
===
--- valid-keyblock-packet.patch 2013-05-10 18:52:41 UTC (rev 185063)
+++ valid-keyblock-packet.patch 2013-05-10 19:07:59 UTC (rev 185064)
@@ -1,61 +0,0 @@
-From: Werner Koch w...@gnupg.org
-Date: Thu, 20 Dec 2012 08:43:41 + (+0100)
-Subject: gpg: Import only packets which are allowed in a keyblock.
-X-Git-Url: 
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=498882296ffac7987c644aaf2a0aa108a2925471;hp=20c95ef258f8520283406239f7c6f4729341d463
-
-gpg: Import only packets which are allowed in a keyblock.
-
-* g10/import.c (valid_keyblock_packet): New.
-(read_block): Store only valid packets.
---
-
-A corrupted key, which for example included a mangled public key
-encrypted packet, used to corrupt the keyring.  This change skips all
-packets which are not allowed in a keyblock.
-
-GnuPG-bug-id: 1455
-
-(cherry-picked from commit 3a4b96e665fa639772854058737ee3d54ba0694e)

-
-diff --git a/g10/import.c b/g10/import.c
-index ba2439d..ad112d6 100644
 a/g10/import.c
-+++ b/g10/import.c
-@@ -347,6 +347,27 @@ import_print_stats (void *hd)
- }
- 
- 
-+/* Return true if PKTTYPE is valid in a keyblock.  */
-+static int
-+valid_keyblock_packet (int pkttype)
-+{
-+  switch (pkttype)
-+{
-+case PKT_PUBLIC_KEY:
-+case PKT_PUBLIC_SUBKEY:
-+case PKT_SECRET_KEY:
-+case PKT_SECRET_SUBKEY:
-+case PKT_SIGNATURE:
-+case PKT_USER_ID:
-+case PKT_ATTRIBUTE:
-+case PKT_RING_TRUST:
-+  return 1;
-+default:
-+  return 0;
-+}
-+}
-+
-+
- /
-  * Read the next keyblock from stream A.
-  * PENDING_PKT should be initialzed to NULL
-@@ -424,7 +445,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE 
*ret_root )
-   }
-   in_cert = 1;
- default:
--  if( in_cert ) {
-+  if (in_cert  valid_keyblock_packet (pkt-pkttype)) {
-   if( !root )
-   root = new_kbnode( pkt );
-   else

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

[Tobias Powalowski]

Date: Tuesday, April 16, 2013 @ 11:38:33
  Author: tpowa
Revision: 182944

upgpkg: gnupg 2.0.19-7

rebuild against libksba 1.3.0

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-16 09:37:41 UTC (rev 182943)
+++ PKGBUILD2013-04-16 09:38:33 UTC (rev 182944)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.0.19
-pkgrel=6
+pkgrel=7
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')