Date: Wednesday, June 22, 2016 @ 00:25:16 Author: bisson Revision: 270468
db-move: moved gnupg from [testing] to [core] (i686, x86_64) Added: gnupg/repos/core-i686/PKGBUILD (from rev 270467, gnupg/repos/testing-i686/PKGBUILD) gnupg/repos/core-i686/install (from rev 270467, gnupg/repos/testing-i686/install) gnupg/repos/core-x86_64/PKGBUILD (from rev 270467, gnupg/repos/testing-x86_64/PKGBUILD) gnupg/repos/core-x86_64/install (from rev 270467, gnupg/repos/testing-x86_64/install) Deleted: gnupg/repos/core-i686/PKGBUILD gnupg/repos/core-i686/install gnupg/repos/core-i686/sig-check-correction.diff gnupg/repos/core-x86_64/PKGBUILD gnupg/repos/core-x86_64/install gnupg/repos/core-x86_64/sig-check-correction.diff gnupg/repos/testing-i686/ gnupg/repos/testing-x86_64/ ---------------------------------------+ /PKGBUILD | 124 ++++++++++++++++++++++++++++++++ /install | 20 +++++ core-i686/PKGBUILD | 65 ---------------- core-i686/install | 4 - core-i686/sig-check-correction.diff | 50 ------------ core-x86_64/PKGBUILD | 65 ---------------- core-x86_64/install | 4 - core-x86_64/sig-check-correction.diff | 50 ------------ 8 files changed, 144 insertions(+), 238 deletions(-) Deleted: core-i686/PKGBUILD =================================================================== --- core-i686/PKGBUILD 2016-06-21 20:26:23 UTC (rev 270467) +++ core-i686/PKGBUILD 2016-06-22 00:25:16 UTC (rev 270468) @@ -1,65 +0,0 @@ -# $Id$ -# 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.12 -pkgrel=2 -pkgdesc='Complete and free implementation of the OpenPGP standard' -url='http://www.gnupg.org/' -license=('GPL') -arch=('i686' 'x86_64') -optdepends=('libldap: gpg2keys_ldap' - 'libusb-compat: scdaemon') -makedepends=('libldap' 'libusb-compat') -depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' - 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite') -validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' - '46CC730865BB5C78EBABADCF04376F3EE0856959' - '031EC2536E580D8EA286A9F22071B08A33BD3F06' - 'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9') -source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - 'sig-check-correction.diff') -sha1sums=('3b01a35ac04277ea31cc01b4ac4e230e54b5480c' 'SKIP' - '3b9e42ff60a3ec28f507e3da9401a7201e3cff14') - -install=install - -conflicts=('dirmngr' 'gnupg2') -provides=('dirmngr' "gnupg2=${pkgver}") -replaces=('dirmngr' 'gnupg2') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in - patch -p1 -i ../sig-check-correction.diff -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/gnupg \ - --enable-maintainer-mode \ - --enable-symcryptrun \ - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - ln -s gpg2 "${pkgdir}"/usr/bin/gpg - ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv - ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz - rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059 -} Copied: gnupg/repos/core-i686/PKGBUILD (from rev 270467, gnupg/repos/testing-i686/PKGBUILD) =================================================================== --- core-i686/PKGBUILD (rev 0) +++ core-i686/PKGBUILD 2016-06-22 00:25:16 UTC (rev 270468) @@ -0,0 +1,62 @@ +# $Id$ +# 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.13 +pkgrel=1 +pkgdesc='Complete and free implementation of the OpenPGP standard' +url='http://www.gnupg.org/' +license=('GPL') +arch=('i686' 'x86_64') +optdepends=('libldap: gpg2keys_ldap' + 'libusb-compat: scdaemon') +makedepends=('libldap' 'libusb-compat') +depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' + 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite') +validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' + '46CC730865BB5C78EBABADCF04376F3EE0856959' + '031EC2536E580D8EA286A9F22071B08A33BD3F06' + 'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9') +source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}) +sha1sums=('6ec1ae6db7815fdbd4151fb6b0b7197b65b05d1f' 'SKIP') + +install=install + +conflicts=('dirmngr' 'gnupg2') +provides=('dirmngr' "gnupg2=${pkgver}") +replaces=('dirmngr' 'gnupg2') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/gnupg \ + --enable-maintainer-mode \ + --enable-symcryptrun \ + + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s gpg2 "${pkgdir}"/usr/bin/gpg + ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv + ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz + rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059 +} Deleted: core-i686/install =================================================================== --- core-i686/install 2016-06-21 20:26:23 UTC (rev 270467) +++ core-i686/install 2016-06-22 00:25:16 UTC (rev 270468) @@ -1,4 +0,0 @@ -post_install() { - # See FS#42798 and FS#47371 - dirmngr </dev/null &>/dev/null || true -} Copied: gnupg/repos/core-i686/install (from rev 270467, gnupg/repos/testing-i686/install) =================================================================== --- core-i686/install (rev 0) +++ core-i686/install 2016-06-22 00:25:16 UTC (rev 270468) @@ -0,0 +1,10 @@ +post_install() { + # See FS#42798 and FS#47371 + dirmngr </dev/null &>/dev/null || true +} + +post_upgrade() { + if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then + echo "==> Please kill running gpg-agent and dirmngr processes before using this release." + fi +} Deleted: core-i686/sig-check-correction.diff =================================================================== --- core-i686/sig-check-correction.diff 2016-06-21 20:26:23 UTC (rev 270467) +++ core-i686/sig-check-correction.diff 2016-06-22 00:25:16 UTC (rev 270468) @@ -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 - Deleted: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2016-06-21 20:26:23 UTC (rev 270467) +++ core-x86_64/PKGBUILD 2016-06-22 00:25:16 UTC (rev 270468) @@ -1,65 +0,0 @@ -# $Id$ -# 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.12 -pkgrel=2 -pkgdesc='Complete and free implementation of the OpenPGP standard' -url='http://www.gnupg.org/' -license=('GPL') -arch=('i686' 'x86_64') -optdepends=('libldap: gpg2keys_ldap' - 'libusb-compat: scdaemon') -makedepends=('libldap' 'libusb-compat') -depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' - 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite') -validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' - '46CC730865BB5C78EBABADCF04376F3EE0856959' - '031EC2536E580D8EA286A9F22071B08A33BD3F06' - 'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9') -source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - 'sig-check-correction.diff') -sha1sums=('3b01a35ac04277ea31cc01b4ac4e230e54b5480c' 'SKIP' - '3b9e42ff60a3ec28f507e3da9401a7201e3cff14') - -install=install - -conflicts=('dirmngr' 'gnupg2') -provides=('dirmngr' "gnupg2=${pkgver}") -replaces=('dirmngr' 'gnupg2') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in - patch -p1 -i ../sig-check-correction.diff -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/gnupg \ - --enable-maintainer-mode \ - --enable-symcryptrun \ - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - ln -s gpg2 "${pkgdir}"/usr/bin/gpg - ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv - ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz - rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059 -} Copied: gnupg/repos/core-x86_64/PKGBUILD (from rev 270467, gnupg/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/PKGBUILD 2016-06-22 00:25:16 UTC (rev 270468) @@ -0,0 +1,62 @@ +# $Id$ +# 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.13 +pkgrel=1 +pkgdesc='Complete and free implementation of the OpenPGP standard' +url='http://www.gnupg.org/' +license=('GPL') +arch=('i686' 'x86_64') +optdepends=('libldap: gpg2keys_ldap' + 'libusb-compat: scdaemon') +makedepends=('libldap' 'libusb-compat') +depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' + 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite') +validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' + '46CC730865BB5C78EBABADCF04376F3EE0856959' + '031EC2536E580D8EA286A9F22071B08A33BD3F06' + 'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9') +source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}) +sha1sums=('6ec1ae6db7815fdbd4151fb6b0b7197b65b05d1f' 'SKIP') + +install=install + +conflicts=('dirmngr' 'gnupg2') +provides=('dirmngr' "gnupg2=${pkgver}") +replaces=('dirmngr' 'gnupg2') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/gnupg \ + --enable-maintainer-mode \ + --enable-symcryptrun \ + + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s gpg2 "${pkgdir}"/usr/bin/gpg + ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv + ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz + rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059 +} Deleted: core-x86_64/install =================================================================== --- core-x86_64/install 2016-06-21 20:26:23 UTC (rev 270467) +++ core-x86_64/install 2016-06-22 00:25:16 UTC (rev 270468) @@ -1,4 +0,0 @@ -post_install() { - # See FS#42798 and FS#47371 - dirmngr </dev/null &>/dev/null || true -} Copied: gnupg/repos/core-x86_64/install (from rev 270467, gnupg/repos/testing-x86_64/install) =================================================================== --- core-x86_64/install (rev 0) +++ core-x86_64/install 2016-06-22 00:25:16 UTC (rev 270468) @@ -0,0 +1,10 @@ +post_install() { + # See FS#42798 and FS#47371 + dirmngr </dev/null &>/dev/null || true +} + +post_upgrade() { + if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then + echo "==> Please kill running gpg-agent and dirmngr processes before using this release." + fi +} Deleted: core-x86_64/sig-check-correction.diff =================================================================== --- core-x86_64/sig-check-correction.diff 2016-06-21 20:26:23 UTC (rev 270467) +++ core-x86_64/sig-check-correction.diff 2016-06-22 00:25:16 UTC (rev 270468) @@ -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 -