[arch-commits] Commit in gnupg/repos (8 files)
Gaëtan Bisson
bisson at archlinux.org
Fri Dec 23 07:21:24 UTC 2016
Date: Friday, December 23, 2016 @ 07:21:24
Author: bisson
Revision: 284519
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gnupg/repos/testing-i686/
gnupg/repos/testing-i686/PKGBUILD
(from rev 284518, gnupg/trunk/PKGBUILD)
gnupg/repos/testing-i686/install
(from rev 284518, gnupg/trunk/install)
gnupg/repos/testing-i686/libdns.patch
(from rev 284518, gnupg/trunk/libdns.patch)
gnupg/repos/testing-x86_64/
gnupg/repos/testing-x86_64/PKGBUILD
(from rev 284518, gnupg/trunk/PKGBUILD)
gnupg/repos/testing-x86_64/install
(from rev 284518, gnupg/trunk/install)
gnupg/repos/testing-x86_64/libdns.patch
(from rev 284518, gnupg/trunk/libdns.patch)
-----------------------------+
testing-i686/PKGBUILD | 71 ++++++++++++++++++++++++++++++++++++++++++
testing-i686/install | 10 +++++
testing-i686/libdns.patch | 50 +++++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 71 ++++++++++++++++++++++++++++++++++++++++++
testing-x86_64/install | 10 +++++
testing-x86_64/libdns.patch | 50 +++++++++++++++++++++++++++++
6 files changed, 262 insertions(+)
Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 284518, gnupg/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-12-23 07:21:24 UTC (rev 284519)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=gnupg
+pkgver=2.1.17
+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}
+ 'libdns.patch')
+sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP'
+ '704c9dd4b88c5ba6a613b2e2ad4aef4fd3a52412')
+
+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 ../libdns.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib/gnupg \
+ --enable-maintainer-mode \
+ --enable-symcryptrun \
+ --disable-libdns # FS#52234
+
+ 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/testing-i686/install (from rev 284518, gnupg/trunk/install)
===================================================================
--- testing-i686/install (rev 0)
+++ testing-i686/install 2016-12-23 07:21:24 UTC (rev 284519)
@@ -0,0 +1,10 @@
+post_install() {
+ # See FS#42798 and FS#47371
+ dirmngr </dev/null &>/dev/null || true
+}
+
+post_upgrade() {
+ if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
+ echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
+ fi
+}
Copied: gnupg/repos/testing-i686/libdns.patch (from rev 284518, gnupg/trunk/libdns.patch)
===================================================================
--- testing-i686/libdns.patch (rev 0)
+++ testing-i686/libdns.patch 2016-12-23 07:21:24 UTC (rev 284519)
@@ -0,0 +1,50 @@
+diff -Naur old/dirmngr/dns-stuff.c new/dirmngr/dns-stuff.c
+--- old/dirmngr/dns-stuff.c 2016-12-20 00:19:05.000000000 -1000
++++ new/dirmngr/dns-stuff.c 2016-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;
+ }
Copied: gnupg/repos/testing-x86_64/PKGBUILD (from rev 284518, gnupg/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-12-23 07:21:24 UTC (rev 284519)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=gnupg
+pkgver=2.1.17
+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}
+ 'libdns.patch')
+sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP'
+ '704c9dd4b88c5ba6a613b2e2ad4aef4fd3a52412')
+
+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 ../libdns.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib/gnupg \
+ --enable-maintainer-mode \
+ --enable-symcryptrun \
+ --disable-libdns # FS#52234
+
+ 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/testing-x86_64/install (from rev 284518, gnupg/trunk/install)
===================================================================
--- testing-x86_64/install (rev 0)
+++ testing-x86_64/install 2016-12-23 07:21:24 UTC (rev 284519)
@@ -0,0 +1,10 @@
+post_install() {
+ # See FS#42798 and FS#47371
+ dirmngr </dev/null &>/dev/null || true
+}
+
+post_upgrade() {
+ if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
+ echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
+ fi
+}
Copied: gnupg/repos/testing-x86_64/libdns.patch (from rev 284518, gnupg/trunk/libdns.patch)
===================================================================
--- testing-x86_64/libdns.patch (rev 0)
+++ testing-x86_64/libdns.patch 2016-12-23 07:21:24 UTC (rev 284519)
@@ -0,0 +1,50 @@
+diff -Naur old/dirmngr/dns-stuff.c new/dirmngr/dns-stuff.c
+--- old/dirmngr/dns-stuff.c 2016-12-20 00:19:05.000000000 -1000
++++ new/dirmngr/dns-stuff.c 2016-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;
+ }
More information about the arch-commits
mailing list