Date: Monday, April 9, 2018 @ 01:29:17
Author: bisson
Revision: 321323
db-move: moved gnupg from [testing] to [core] (x86_64)
Added:
gnupg/repos/core-x86_64/PKGBUILD
(from rev 321322, gnupg/repos/testing-x86_64/PKGBUILD)
gnupg/repos/core-x86_64/install
(from rev 321322, gnupg/repos/testing-x86_64/install)
gnupg/repos/core-x86_64/req_usage.patch
(from rev 321322, gnupg/repos/testing-x86_64/req_usage.patch)
Deleted:
gnupg/repos/core-x86_64/PKGBUILD
gnupg/repos/core-x86_64/install
gnupg/repos/testing-x86_64/
-----------------------------+
/PKGBUILD | 73 ++++++++++++++++++++++++++++++++++++++++++
/install | 41 +++++++++++++++++++++++
core-x86_64/PKGBUILD | 68 ---------------------------------------
core-x86_64/install | 41 -----------------------
core-x86_64/req_usage.patch | 12 ++++++
5 files changed, 126 insertions(+), 109 deletions(-)
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2018-04-09 01:28:44 UTC (rev 321322)
+++ core-x86_64/PKGBUILD 2018-04-09 01:29:17 UTC (rev 321323)
@@ -1,68 +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.2.5
-pkgrel=1
-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'
- '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=('3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57'
- '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 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
-}
Copied: gnupg/repos/core-x86_64/PKGBUILD (from rev 321322,
gnupg/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2018-04-09 01:29:17 UTC (rev 321323)
@@ -0,0 +1,73 @@
+# $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.2.5
+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'
+ '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}
+ 'req_usage.patch')
+sha256sums=('3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57'
+ 'SKIP'
+ 'f8bef4891c1b9f81f305753dac7780ad4cfd56ec853502ba1d9d6400c69a518e')
+
+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
+
+ # See: https://dev.gnupg.org/rGa17d2d1f690ebe5d005b4589a5fe378b6487c657
+ patch -p1 -i ../req_usage.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
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ 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
+}
Deleted: core-x86_64/install
===================================================================
--- core-x86_64/install 2018-04-09 01:28:44 UTC (rev 321322)
+++ core-x86_64/install 2018-04-09 01:29:17 UTC (rev 321323)
@@ -1,41 +0,0 @@
-_global_units() {
- _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() {
- # See FS#42798 and FS#47371
- dirmngr </dev/null &>/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-3) < 0 )); then
- _global_units enable
- fi
-}
-
-pre_remove() {
- _global_units disable
-}
Copied: gnupg/repos/core-x86_64/install (from rev 321322,
gnupg/repos/testing-x86_64/install)
===================================================================
--- core-x86_64/install (rev 0)
+++ core-x86_64/install 2018-04-09 01:29:17 UTC (rev 321323)
@@ -0,0 +1,41 @@
+_global_units() {
+ _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() {
+ # See FS#42798 and FS#47371
+ dirmngr </dev/null &>/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-3) < 0 )); then
+ _global_units enable
+ fi
+}
+
+pre_remove() {
+ _global_units disable
+}
Copied: gnupg/repos/core-x86_64/req_usage.patch (from rev 321322,
gnupg/repos/testing-x86_64/req_usage.patch)
===================================================================
--- core-x86_64/req_usage.patch (rev 0)
+++ core-x86_64/req_usage.patch 2018-04-09 01:29:17 UTC (rev 321323)
@@ -0,0 +1,12 @@
+diff -Naur old/g10/getkey.c new/g10/getkey.c
+--- old/g10/getkey.c 2018-02-21 23:42:42.000000000 -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, &ctx, 0, &kb, &found_key);
+ if (!rc && pk)
+ pk_from_block (pk, kb, found_key);
