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 =================================================================== --- PKGBUILD 2016-06-16 21:49:13 UTC (rev 270100) +++ PKGBUILD 2016-06-16 23:39:24 UTC (rev 270101) @@ -5,8 +5,8 @@ # Contributor: Judd Vinet <jvi...@zeroflux.org> 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 &>/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 <gni...@fsij.org> -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 <gni...@fsij.org> ---- - 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, &ctx, PKT_PUBLIC_SUBKEY))) -+ /* See if one of the subkeys was the signer (although this -+ is extremely unlikely). */ -+ while ((n = walk_kbnode (kb, &ctx, 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 -