Date: Thursday, January 26, 2017 @ 08:54:20 Author: bisson Revision: 287499
db-move: moved gnupg from [testing] to [core] (i686, x86_64) Added: gnupg/repos/core-i686/PKGBUILD (from rev 287498, gnupg/repos/testing-i686/PKGBUILD) gnupg/repos/core-i686/install (from rev 287498, gnupg/repos/testing-i686/install) gnupg/repos/core-x86_64/PKGBUILD (from rev 287498, gnupg/repos/testing-x86_64/PKGBUILD) gnupg/repos/core-x86_64/install (from rev 287498, gnupg/repos/testing-x86_64/install) Deleted: gnupg/repos/core-i686/PKGBUILD gnupg/repos/core-i686/install gnupg/repos/core-i686/negation.patch gnupg/repos/core-i686/suffix.patch gnupg/repos/core-x86_64/PKGBUILD gnupg/repos/core-x86_64/install gnupg/repos/core-x86_64/negation.patch gnupg/repos/core-x86_64/suffix.patch gnupg/repos/testing-i686/ gnupg/repos/testing-x86_64/ ----------------------------+ /PKGBUILD | 134 +++++++++++++++++++++++++++++++++++++++++++ /install | 20 ++++++ core-i686/PKGBUILD | 73 ----------------------- core-i686/install | 10 --- core-i686/negation.patch | 29 --------- core-i686/suffix.patch | 46 -------------- core-x86_64/PKGBUILD | 73 ----------------------- core-x86_64/install | 10 --- core-x86_64/negation.patch | 29 --------- core-x86_64/suffix.patch | 46 -------------- 10 files changed, 154 insertions(+), 316 deletions(-) Deleted: core-i686/PKGBUILD =================================================================== --- core-i686/PKGBUILD 2017-01-26 06:49:46 UTC (rev 287498) +++ core-i686/PKGBUILD 2017-01-26 08:54:20 UTC (rev 287499) @@ -1,73 +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.17 -pkgrel=4 -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} - 'negation.patch' - 'suffix.patch') -sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP' - '0ad1a4cb440f84427f19c7016070d04b2faeae89' - '477569b1bb0bb9b1d839970bd143f3cbaa47b376') - -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 ../negation.patch - patch -p1 -i ../suffix.patch -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/gnupg \ - --enable-maintainer-mode \ - --enable-symcryptrun \ - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check || [[ $CARCH = i686 ]] - # https://lists.gnupg.org/pipermail/gnupg-devel/2016-December/032364.html -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - ln -s gpg2 "${pkgdir}"/usr/bin/gpg - ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv - ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz - - cd doc/examples/systemd-user - for i in *.*; do - install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i" - done -} Copied: gnupg/repos/core-i686/PKGBUILD (from rev 287498, gnupg/repos/testing-i686/PKGBUILD) =================================================================== --- core-i686/PKGBUILD (rev 0) +++ core-i686/PKGBUILD 2017-01-26 08:54:20 UTC (rev 287499) @@ -0,0 +1,67 @@ +# $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.18 +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=('b698012cc2d77c2652afd168a15e679d1394fa89' '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 || [[ $CARCH = i686 ]] + # https://lists.gnupg.org/pipermail/gnupg-devel/2016-December/032364.html +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s gpg2 "${pkgdir}"/usr/bin/gpg + ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv + ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz + + cd doc/examples/systemd-user + for i in *.*; do + install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i" + done +} Deleted: core-i686/install =================================================================== --- core-i686/install 2017-01-26 06:49:46 UTC (rev 287498) +++ core-i686/install 2017-01-26 08:54:20 UTC (rev 287499) @@ -1,10 +0,0 @@ -post_install() { - # See FS#42798 and FS#47371 - dirmngr </dev/null &>/dev/null || true -} - -post_upgrade() { - if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then - echo "==> Please kill running gpg-agent and dirmngr processes before using this release." - fi -} Copied: gnupg/repos/core-i686/install (from rev 287498, gnupg/repos/testing-i686/install) =================================================================== --- core-i686/install (rev 0) +++ core-i686/install 2017-01-26 08:54:20 UTC (rev 287499) @@ -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/negation.patch =================================================================== --- core-i686/negation.patch 2017-01-26 06:49:46 UTC (rev 287498) +++ core-i686/negation.patch 2017-01-26 08:54:20 UTC (rev 287499) @@ -1,29 +0,0 @@ -diff -Naur old/dirmngr/dns.c new/dirmngr/dns.c ---- old/dirmngr/dns.c 2016-12-20 00:19:05.000000000 -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(&cf); -@@ -6054,7 +6054,15 @@ - if ('[' == dns_anyconf_peek(fp)) { - dns_anyconf_skip("[ \t", fp); - -- while (dns_anyconf_scan(&cf, "%w_", fp, &error)) { -+ 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(&cf, "%w_", fp, &error)) break; - dns_anyconf_skip("= \t", fp); - if (!dns_anyconf_scan(&cf, "%w_", fp, &error)) { - dns_anyconf_pop(&cf); /* discard status */ Deleted: core-i686/suffix.patch =================================================================== --- core-i686/suffix.patch 2017-01-26 06:49:46 UTC (rev 287498) +++ core-i686/suffix.patch 2017-01-26 08:54:20 UTC (rev 287499) @@ -1,46 +0,0 @@ -From b200e636ab20d2aa93d9f71f3789db5a04af0a56 Mon Sep 17 00:00:00 2001 -From: Werner Koch <w...@gnupg.org> -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 <w...@gnupg.org> ---- - 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] == '.') -+ (*r_cname)[strlen (*r_cname)-1] = 0; -+ } - - leave: - dns_free (ans); --- -2.8.0.rc3 - Deleted: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2017-01-26 06:49:46 UTC (rev 287498) +++ core-x86_64/PKGBUILD 2017-01-26 08:54:20 UTC (rev 287499) @@ -1,73 +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.17 -pkgrel=4 -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} - 'negation.patch' - 'suffix.patch') -sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP' - '0ad1a4cb440f84427f19c7016070d04b2faeae89' - '477569b1bb0bb9b1d839970bd143f3cbaa47b376') - -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 ../negation.patch - patch -p1 -i ../suffix.patch -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib/gnupg \ - --enable-maintainer-mode \ - --enable-symcryptrun \ - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check || [[ $CARCH = i686 ]] - # https://lists.gnupg.org/pipermail/gnupg-devel/2016-December/032364.html -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - ln -s gpg2 "${pkgdir}"/usr/bin/gpg - ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv - ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz - - cd doc/examples/systemd-user - for i in *.*; do - install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i" - done -} Copied: gnupg/repos/core-x86_64/PKGBUILD (from rev 287498, gnupg/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/PKGBUILD 2017-01-26 08:54:20 UTC (rev 287499) @@ -0,0 +1,67 @@ +# $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.18 +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=('b698012cc2d77c2652afd168a15e679d1394fa89' '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 || [[ $CARCH = i686 ]] + # https://lists.gnupg.org/pipermail/gnupg-devel/2016-December/032364.html +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s gpg2 "${pkgdir}"/usr/bin/gpg + ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv + ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz + + cd doc/examples/systemd-user + for i in *.*; do + install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i" + done +} Deleted: core-x86_64/install =================================================================== --- core-x86_64/install 2017-01-26 06:49:46 UTC (rev 287498) +++ core-x86_64/install 2017-01-26 08:54:20 UTC (rev 287499) @@ -1,10 +0,0 @@ -post_install() { - # See FS#42798 and FS#47371 - dirmngr </dev/null &>/dev/null || true -} - -post_upgrade() { - if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then - echo "==> Please kill running gpg-agent and dirmngr processes before using this release." - fi -} Copied: gnupg/repos/core-x86_64/install (from rev 287498, gnupg/repos/testing-x86_64/install) =================================================================== --- core-x86_64/install (rev 0) +++ core-x86_64/install 2017-01-26 08:54:20 UTC (rev 287499) @@ -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/negation.patch =================================================================== --- core-x86_64/negation.patch 2017-01-26 06:49:46 UTC (rev 287498) +++ core-x86_64/negation.patch 2017-01-26 08:54:20 UTC (rev 287499) @@ -1,29 +0,0 @@ -diff -Naur old/dirmngr/dns.c new/dirmngr/dns.c ---- old/dirmngr/dns.c 2016-12-20 00:19:05.000000000 -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(&cf); -@@ -6054,7 +6054,15 @@ - if ('[' == dns_anyconf_peek(fp)) { - dns_anyconf_skip("[ \t", fp); - -- while (dns_anyconf_scan(&cf, "%w_", fp, &error)) { -+ 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(&cf, "%w_", fp, &error)) break; - dns_anyconf_skip("= \t", fp); - if (!dns_anyconf_scan(&cf, "%w_", fp, &error)) { - dns_anyconf_pop(&cf); /* discard status */ Deleted: core-x86_64/suffix.patch =================================================================== --- core-x86_64/suffix.patch 2017-01-26 06:49:46 UTC (rev 287498) +++ core-x86_64/suffix.patch 2017-01-26 08:54:20 UTC (rev 287499) @@ -1,46 +0,0 @@ -From b200e636ab20d2aa93d9f71f3789db5a04af0a56 Mon Sep 17 00:00:00 2001 -From: Werner Koch <w...@gnupg.org> -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 <w...@gnupg.org> ---- - 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] == '.') -+ (*r_cname)[strlen (*r_cname)-1] = 0; -+ } - - leave: - dns_free (ans); --- -2.8.0.rc3 -