[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2022-09-02 Thread David Runge via arch-commits 
Date: Friday, September 2, 2022 @ 17:02:25
  Author: dvzrv
Revision: 454910

upgpkg: gnupg 2.2.39-1: Upgrade to 2.2.39.

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-09-02 16:50:27 UTC (rev 454909)
+++ PKGBUILD2022-09-02 17:02:25 UTC (rev 454910)
@@ -7,7 +7,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.38
+pkgver=2.2.39
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -35,11 +35,11 @@
   'drop-import-clean.patch'
   'avoid-beta-warning.patch'
 )
-sha256sums=('f02bd9853ea25d7bc3051a5725fb8b455f2481cffb498c707b78cf4380fe97ea'
+sha256sums=('ab74db6685f026d7c0a10b527ecddecd608606a1691d15fda5d0a7f7d27e4c2f'
 'SKIP'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
-b2sums=('249fd6502a1607d1881fd97e4a97a1a3557da26929b67424bafcf29b5ef1588c9295347c5be497a8485dd61755bfe40b4f0232e0f1f67d2517c69613c6080da1'
+b2sums=('a9e31830f3ef9ec6d8d461a85fcbe4b91bcac9607d3b5f13f5edc0c54505afb6c6c119cd397023b1378d96c7d0f15c0d60da1d15721e9a18eb3ea8c7b69fba83'
 'SKIP'
 
'd598015e7f27b27840667d1656c083b4ad85d6acdd312e9929854067313a5f28415ee7eecf4d84a4b8da0385b667aaa01a9743461f5c785402a56c238274e376'
 
'7ea069e81e2d91a3154bcb62516b4b599f34596de277f95ad1ccaba73869c4f84f94f063b65026ba0bc8a72c0fd8e8e182b82346964f67ea78166b6399c923c5')

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2022-09-02 Thread David Runge via arch-commits 
Date: Friday, September 2, 2022 @ 10:49:16
  Author: dvzrv
Revision: 454905

upgpkg: gnupg 2.2.38-1: Upgrade to 2.2.38.

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-09-02 09:02:56 UTC (rev 454904)
+++ PKGBUILD2022-09-02 10:49:16 UTC (rev 454905)
@@ -7,7 +7,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.37
+pkgver=2.2.38
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -35,10 +35,14 @@
   'drop-import-clean.patch'
   'avoid-beta-warning.patch'
 )
-sha256sums=('95f8928b4a21890658660c2c10db63a765286864612e7581932b5c3d16aca871'
+sha256sums=('f02bd9853ea25d7bc3051a5725fb8b455f2481cffb498c707b78cf4380fe97ea'
 'SKIP'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
+b2sums=('249fd6502a1607d1881fd97e4a97a1a3557da26929b67424bafcf29b5ef1588c9295347c5be497a8485dd61755bfe40b4f0232e0f1f67d2517c69613c6080da1'
+'SKIP'
+
'd598015e7f27b27840667d1656c083b4ad85d6acdd312e9929854067313a5f28415ee7eecf4d84a4b8da0385b667aaa01a9743461f5c785402a56c238274e376'
+
'7ea069e81e2d91a3154bcb62516b4b599f34596de277f95ad1ccaba73869c4f84f94f063b65026ba0bc8a72c0fd8e8e182b82346964f67ea78166b6399c923c5')
 
 install=$pkgname.install

[arch-commits] Commit in gnupg/trunk (PKGBUILD gnupg.install)

2022-08-24 Thread David Runge via arch-commits 
Date: Wednesday, August 24, 2022 @ 17:15:18
  Author: dvzrv
Revision: 454485

upgpkg: gnupg 2.2.37-1: Upgrade to 2.2.37.

Remove patch which is already included in the release.
Modify .install file to check against 2.2.37-1 as 2.2.36-2 has never been 
released.

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/gnupg.install

---+
 PKGBUILD  |7 ++-
 gnupg.install |2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-08-24 17:02:57 UTC (rev 454484)
+++ PKGBUILD2022-08-24 17:15:18 UTC (rev 454485)
@@ -7,7 +7,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.36
+pkgver=2.2.37
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -32,14 +32,11 @@
 )
 source=(
   "https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-  # https://bugs.archlinux.org/task/74423 https://dev.gnupg.org/T5935
-  
'gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=e8fb8e2b3e66d5ea8a3dc90afdc14611abf2c3da'
   'drop-import-clean.patch'
   'avoid-beta-warning.patch'
 )
-sha256sums=('bdfe783810fceca9703b9e811817acca63ee9ef0174e616598e8ea6590aa4c9c'
+sha256sums=('95f8928b4a21890658660c2c10db63a765286864612e7581932b5c3d16aca871'
 'SKIP'
-'1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
 

Modified: gnupg.install
===
--- gnupg.install   2022-08-24 17:02:57 UTC (rev 454484)
+++ gnupg.install   2022-08-24 17:15:18 UTC (rev 454485)
@@ -8,7 +8,7 @@
 post_upgrade() {
   local unit
 
-  if (( $(vercmp "$2" '2.2.36-2') < 0)); then
+  if (( $(vercmp "$2" '2.2.37-1') < 0)); then
 for unit in {dirmngr,gpg-agent{,-{browser,extra,ssh}}}.socket; do
   rm -f "/etc/systemd/user/sockets.target.wants/$unit"
 done

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2022-08-24 Thread David Runge via arch-commits 
Date: Wednesday, August 24, 2022 @ 17:02:57
  Author: dvzrv
Revision: 454484

Declare CC0 as custom license: https://bugs.archlinux.org/task/74709

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-08-24 16:02:01 UTC (rev 454483)
+++ PKGBUILD2022-08-24 17:02:57 UTC (rev 454484)
@@ -11,7 +11,7 @@
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
-license=(BSD custom CC0 GPL2 GPL3 LGPL3 LGPL2.1 MIT)
+license=(BSD custom custom:CC0 GPL2 GPL3 LGPL3 LGPL2.1 MIT)
 arch=('x86_64')
 checkdepends=('openssh')
 makedepends=('libldap' 'libusb-compat' 'pcsclite')

[arch-commits] Commit in gnupg/trunk (PKGBUILD gnupg.install)

2022-08-07 Thread David Runge via arch-commits 
Date: Sunday, August 7, 2022 @ 21:34:25
  Author: dvzrv
Revision: 452400

Vendor enable the gnupg systemd sockets instead of manually symlinking them to 
/etc/systemd/system/ in the .install file.

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/gnupg.install

---+
 PKGBUILD  |   10 ++
 gnupg.install |   38 --
 2 files changed, 22 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-08-07 21:30:10 UTC (rev 452399)
+++ PKGBUILD2022-08-07 21:34:25 UTC (rev 452400)
@@ -1,3 +1,4 @@
+# Maintainer: David Runge 
 # Maintainer: Levente Polyak 
 # Maintainer: Lukas Fleischer 
 # Contributor: Gaetan Bisson 
@@ -80,6 +81,10 @@
 }
 
 package() {
+  local units=({dirmngr,gpg-agent{,-{browser,extra,ssh}}}.socket)
+  local socket_target_dir="$pkgdir/usr/lib/systemd/user/sockets.target.wants/"
+  local unit
+
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   ln -s gpg "${pkgdir}"/usr/bin/gpg2
@@ -87,6 +92,11 @@
 
   install -Dm 644 doc/examples/systemd-user/*.* -t 
"${pkgdir}/usr/lib/systemd/user"
   install -Dm 644 COPYING.{CC0,other} -t 
"${pkgdir}/usr/share/licenses/$pkgname/"
+
+  install -vdm 755 "$socket_target_dir"
+  for unit in "${units[@]}"; do
+ln -sv "../$unit" "$socket_target_dir$unit"
+  done
 }
 
 # vim: ts=2 sw=2 et:

Modified: gnupg.install
===
--- gnupg.install   2022-08-07 21:30:10 UTC (rev 452399)
+++ gnupg.install   2022-08-07 21:34:25 UTC (rev 452400)
@@ -1,31 +1,17 @@
-_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
+  # run dirmngr once to create /root/.gnupg
+  # https://bugs.archlinux.org/task/47371
+  # https://bugs.archlinux.org/task/42798
   dirmngr /dev/null
-
-  # Let systemd supervise daemons by default
-  _global_units enable
 }
 
-pre_remove() {
-  _global_units disable
+post_upgrade() {
+  local unit
+
+  if (( $(vercmp "$2" '2.2.36-2') < 0)); then
+for unit in {dirmngr,gpg-agent{,-{browser,extra,ssh}}}.socket; do
+  rm -f "/etc/systemd/user/sockets.target.wants/$unit"
+done
+printf "NOTE: GnuPG's systemd sockets are now enabled in the vendor 
location /usr/lib/systemd/user/!\n"
+  fi
 }

[arch-commits] Commit in gnupg/trunk (PKGBUILD gnupg.install install)

2022-06-09 Thread David Runge via arch-commits 
Date: Thursday, June 9, 2022 @ 12:54:05
  Author: dvzrv
Revision: 448045

Rename install to gnupg.install.

Added:
  gnupg/trunk/gnupg.install
(from rev 448044, gnupg/trunk/install)
Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/install

---+
 PKGBUILD  |2 +-
 gnupg.install |   31 +++
 install   |   31 ---
 3 files changed, 32 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-06-09 12:52:47 UTC (rev 448044)
+++ PKGBUILD2022-06-09 12:54:05 UTC (rev 448045)
@@ -44,7 +44,7 @@
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
 
-install=install
+install=$pkgname.install
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Copied: gnupg/trunk/gnupg.install (from rev 448044, gnupg/trunk/install)
===
--- gnupg.install   (rev 0)
+++ gnupg.install   2022-06-09 12:54:05 UTC (rev 448045)
@@ -0,0 +1,31 @@
+_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
+
+  # Let systemd supervise daemons by default
+  _global_units enable
+}
+
+pre_remove() {
+  _global_units disable
+}

Deleted: install
===
--- install 2022-06-09 12:52:47 UTC (rev 448044)
+++ install 2022-06-09 12:54:05 UTC (rev 448045)
@@ -1,31 +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
-
-  # Let systemd supervise daemons by default
-  _global_units enable
-}
-
-pre_remove() {
-  _global_units disable
-}

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2022-06-09 Thread David Runge via arch-commits 
Date: Thursday, June 9, 2022 @ 09:28:23
  Author: dvzrv
Revision: 447807

Replace tabs with spaces.

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |   88 +++--
 1 file changed, 46 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-06-09 09:28:13 UTC (rev 447806)
+++ PKGBUILD2022-06-09 09:28:23 UTC (rev 447807)
@@ -17,22 +17,26 @@
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan' 'pinentry'
  'bzip2' 'libbz2.so' 'readline' 'libreadline.so' 'gnutls' 'sqlite'
  'zlib' 'glibc')
-optdepends=('libldap: gpg2keys_ldap'
-'libusb-compat: scdaemon'
-'pcsclite: scdaemon')
+optdepends=(
+  'libldap: gpg2keys_ldap'
+  'libusb-compat: scdaemon'
+  'pcsclite: scdaemon'
+)
 options=('debug')
 validpgpkeys=(
-   'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
-   '031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG 
Release Key) 
-   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release 
Signing Key)
-   '6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 
2020)
-   'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD' # Niibe Yutaka (GnuPG 
Release Key)
+  'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release 
Key) 
+  '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release Signing 
Key)
+  '6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
+  'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD' # Niibe Yutaka (GnuPG Release Key)
 )
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-   
'gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=e8fb8e2b3e66d5ea8a3dc90afdc14611abf2c3da'
-   
'gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=3192939a10df17cb9666773ed627f6d16b8d'
-   'drop-import-clean.patch'
-   'avoid-beta-warning.patch')
+source=(
+  "https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+  
'gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=e8fb8e2b3e66d5ea8a3dc90afdc14611abf2c3da'
+  
'gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=3192939a10df17cb9666773ed627f6d16b8d'
+  'drop-import-clean.patch'
+  'avoid-beta-warning.patch'
+)
 sha256sums=('340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690'
 'SKIP'
 '1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5'
@@ -43,48 +47,48 @@
 install=install
 
 prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -p1 -i ../avoid-beta-warning.patch
-   patch -p1 -i ../drop-import-clean.patch
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ../avoid-beta-warning.patch
+  patch -p1 -i ../drop-import-clean.patch
 
-   # https://bugs.archlinux.org/task/74423
-   # https://dev.gnupg.org/T5935
-   patch -p1 -i ../gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch
-   # fix issues with signatures in an automated environment (e.g. 
archlinux-keyring):
-   # https://dev.gnupg.org/T5953
-   patch -Np1 -i 
../gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch
+  # https://bugs.archlinux.org/task/74423
+  # https://dev.gnupg.org/T5935
+  patch -p1 -i ../gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch
+  # fix issues with signatures in an automated environment (e.g. 
archlinux-keyring):
+  # https://dev.gnupg.org/T5953
+  patch -Np1 -i 
../gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch
 
-   # improve reproducibility
-   rm doc/gnupg.info*
+  # improve reproducibility
+  rm doc/gnupg.info*
 
-   ./autogen.sh
+  ./autogen.sh
 }
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   ./configure \
-   --prefix=/usr \
-   --sysconfdir=/etc \
-   --sbindir=/usr/bin \
-   --libexecdir=/usr/lib/gnupg \
-   --enable-maintainer-mode \
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure \
+--prefix=/usr \
+--sysconfdir=/etc \
+--sbindir=/usr/bin \
+--libexecdir=/usr/lib/gnupg \
+--enable-maintainer-mode \
 
-   make
+  make
 }
 
 check() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make check
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
-   ln -s g

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2022-05-09 Thread David Runge via arch-commits 
Date: Monday, May 9, 2022 @ 10:06:16
  Author: dvzrv
Revision: 444882

upgpkg: gnupg 2.2.35-2: Rebuild to add fix for the use of keys in an automated 
environment.

The use-case of automated signatures has been broken (see
https://dev.gnupg.org/T5953).
Apply (upstream merged) patch to revert the broken feature addition.
Add AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD as additional valid signing key.
The 2.2.35 tarball is signed by both the new key and Werner Koch's
6DAA6E64A76D2840571B4902528897B826403ADA.
Extend the license array to state all used licenses and install any non-common
license files.

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-09 10:04:14 UTC (rev 444881)
+++ PKGBUILD2022-05-09 10:06:16 UTC (rev 444882)
@@ -7,10 +7,10 @@
 
 pkgname=gnupg
 pkgver=2.2.35
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
-license=('GPL')
+license=(BSD custom CC0 GPL2 GPL3 LGPL3 LGPL2.1 MIT)
 arch=('x86_64')
 checkdepends=('openssh')
 makedepends=('libldap' 'libusb-compat' 'pcsclite')
@@ -26,14 +26,17 @@
'031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG 
Release Key) 
'5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release 
Signing Key)
'6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 
2020)
+   'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD' # Niibe Yutaka (GnuPG 
Release Key)
 )
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}

'gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=e8fb8e2b3e66d5ea8a3dc90afdc14611abf2c3da'
-'drop-import-clean.patch'
+   
'gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=3192939a10df17cb9666773ed627f6d16b8d'
+   'drop-import-clean.patch'
'avoid-beta-warning.patch')
 sha256sums=('340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690'
 'SKIP'
 '1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5'
+'00aa4897f11900f67e161f538c5322f2f9e65dc5675a760fd298d43d33a259d7'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
 
@@ -47,6 +50,9 @@
# https://bugs.archlinux.org/task/74423
# https://dev.gnupg.org/T5935
patch -p1 -i ../gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch
+   # fix issues with signatures in an automated environment (e.g. 
archlinux-keyring):
+   # https://dev.gnupg.org/T5953
+   patch -Np1 -i 
../gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch
 
# improve reproducibility
rm doc/gnupg.info*
@@ -78,6 +84,7 @@
ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
 
install -Dm 644 doc/examples/systemd-user/*.* -t 
"${pkgdir}/usr/lib/systemd/user"
+   install -Dm 644 COPYING.{CC0,other} -t 
"${pkgdir}/usr/share/licenses/$pkgname/"
 }
 
 # vim: ts=2 sw=2 noet:

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2022-04-26 Thread Levente Polyak via arch-commits 
Date: Tuesday, April 26, 2022 @ 18:20:32
  Author: anthraxx
Revision: 444042

upgpkg: gnupg 2.2.35-1

- backport patch for FS#74423

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-04-26 18:18:59 UTC (rev 444041)
+++ PKGBUILD2022-04-26 18:20:32 UTC (rev 444042)
@@ -6,8 +6,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.32
-pkgrel=2
+pkgver=2.2.35
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -20,6 +20,7 @@
 optdepends=('libldap: gpg2keys_ldap'
 'libusb-compat: scdaemon'
 'pcsclite: scdaemon')
+options=('debug')
 validpgpkeys=(
'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
'031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG 
Release Key) 
@@ -27,10 +28,12 @@
'6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 
2020)
 )
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+   
'gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=e8fb8e2b3e66d5ea8a3dc90afdc14611abf2c3da'
 'drop-import-clean.patch'
'avoid-beta-warning.patch')
-sha256sums=('b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614'
+sha256sums=('340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690'
 'SKIP'
+'1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
 
@@ -41,6 +44,10 @@
patch -p1 -i ../avoid-beta-warning.patch
patch -p1 -i ../drop-import-clean.patch
 
+   # https://bugs.archlinux.org/task/74423
+   # https://dev.gnupg.org/T5935
+   patch -p1 -i ../gnupg-2.2.35-scd-dont-inhibit-ssh-authentication.patch
+
# improve reproducibility
rm doc/gnupg.info*

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2021-11-13 Thread Evangelos Foutras via arch-commits 
Date: Saturday, November 13, 2021 @ 19:30:45
  Author: foutrelis
Revision: 428320

upgpkg: gnupg 2.2.32-2: openldap 2.6 rebuild

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-11-13 19:29:12 UTC (rev 428319)
+++ PKGBUILD2021-11-13 19:30:45 UTC (rev 428320)
@@ -7,7 +7,7 @@
 
 pkgname=gnupg
 pkgver=2.2.32
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2021-10-26 Thread Levente Polyak via arch-commits 
Date: Tuesday, October 26, 2021 @ 20:57:51
  Author: anthraxx
Revision: 426667

upgpkg: gnupg 2.2.32-1

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-10-26 16:21:45 UTC (rev 42)
+++ PKGBUILD2021-10-26 20:57:51 UTC (rev 426667)
@@ -6,7 +6,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.29
+pkgver=2.2.32
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -29,7 +29,7 @@
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 'drop-import-clean.patch'
'avoid-beta-warning.patch')
-sha256sums=('39d07cdb4524818f9ebce49294931974af504519e6a7476c52e9d38fc0bd0cc9'
+sha256sums=('b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614'
 'SKIP'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2021-07-05 Thread Levente Polyak via arch-commits 
Date: Monday, July 5, 2021 @ 19:26:55
  Author: anthraxx
Revision: 418950

upgpkg: gnupg 2.2.29-1

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-07-05 17:16:02 UTC (rev 418949)
+++ PKGBUILD2021-07-05 19:26:55 UTC (rev 418950)
@@ -6,8 +6,8 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.28
-pkgrel=2
+pkgver=2.2.29
+pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -28,13 +28,11 @@
 )
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 'drop-import-clean.patch'
-'avoid-beta-warning.patch'
- 
'scd-Error-code-map-fix-for-older-Yubikey.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=01a413d5235f1bbd00f83fb86d0e183d8f0b1a57')
-sha256sums=('6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec'
+   'avoid-beta-warning.patch')
+sha256sums=('39d07cdb4524818f9ebce49294931974af504519e6a7476c52e9d38fc0bd0cc9'
 'SKIP'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
-'22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
-'3d01999fcde60851898a06ef4a0b7497f44f65fe0655522bc7aef52c83960b3c')
+'22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
 
 install=install
 
@@ -42,7 +40,6 @@
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ../avoid-beta-warning.patch
patch -p1 -i ../drop-import-clean.patch
-   patch -p1 -i ../scd-Error-code-map-fix-for-older-Yubikey.patch
 
# improve reproducibility
rm doc/gnupg.info*

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2021-06-17 Thread Levente Polyak via arch-commits 
Date: Thursday, June 17, 2021 @ 21:17:44
  Author: anthraxx
Revision: 418406

upgpkg: gnupg 2.2.28-2: backport fix for old Yubikey devices

Yubikey NEO does not support the YK4_GET_CAPA command (001D00),
and it will be screwed up with the command.

Fixes FS#71279

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-06-17 18:32:11 UTC (rev 418405)
+++ PKGBUILD2021-06-17 21:17:44 UTC (rev 418406)
@@ -7,7 +7,7 @@
 
 pkgname=gnupg
 pkgver=2.2.28
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=('GPL')
@@ -28,11 +28,13 @@
 )
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 'drop-import-clean.patch'
-'avoid-beta-warning.patch')
+'avoid-beta-warning.patch'
+ 
'scd-Error-code-map-fix-for-older-Yubikey.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=01a413d5235f1bbd00f83fb86d0e183d8f0b1a57')
 sha256sums=('6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec'
 'SKIP'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
-'22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
+'22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
+'3d01999fcde60851898a06ef4a0b7497f44f65fe0655522bc7aef52c83960b3c')
 
 install=install
 
@@ -40,6 +42,7 @@
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ../avoid-beta-warning.patch
patch -p1 -i ../drop-import-clean.patch
+   patch -p1 -i ../scd-Error-code-map-fix-for-older-Yubikey.patch
 
# improve reproducibility
rm doc/gnupg.info*

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2021-05-09 Thread Lukas Fleischer via arch-commits 
Date: Sunday, May 9, 2021 @ 18:49:27
  Author: lfleischer
Revision: 414879

upgpkg: gnupg 2.3.1-1: upsteam update

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-05-09 18:42:14 UTC (rev 414878)
+++ PKGBUILD2021-05-09 18:49:27 UTC (rev 414879)
@@ -6,7 +6,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.27
+pkgver=2.3.1
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -29,7 +29,7 @@
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 'drop-import-clean.patch'
 'avoid-beta-warning.patch')
-sha256sums=('34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399'
+sha256sums=('c498db346a9b9a4b399e514c8f56dfc0a888ce8f327f10376ff984452cd154ec'
 'SKIP'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
@@ -38,8 +38,6 @@
 
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -p1 -i ../avoid-beta-warning.patch
-   patch -p1 -i ../drop-import-clean.patch
 
# improve reproducibility
rm doc/gnupg.info*

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2021-01-12 Thread Levente Polyak via arch-commits 
Date: Tuesday, January 12, 2021 @ 20:39:43
  Author: anthraxx
Revision: 406138

upgpkg: gnupg 2.2.27-1

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-01-12 20:26:45 UTC (rev 406137)
+++ PKGBUILD2021-01-12 20:39:43 UTC (rev 406138)
@@ -6,7 +6,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.26
+pkgver=2.2.27
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -29,7 +29,7 @@
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 'drop-import-clean.patch'
 'avoid-beta-warning.patch')
-sha256sums=('517569e6c9fad22175df16be5900f94c991c41e53612db63c14493e814cfff6d'
+sha256sums=('34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399'
 'SKIP'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')

[arch-commits] Commit in gnupg/trunk (PKGBUILD)

2021-01-10 Thread Levente Polyak via arch-commits 
Date: Sunday, January 10, 2021 @ 12:39:40
  Author: anthraxx
Revision: 406025

upgpkg: gnupg 2.2.26-1

Modified:
  gnupg/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-01-10 11:36:44 UTC (rev 406024)
+++ PKGBUILD2021-01-10 12:39:40 UTC (rev 406025)
@@ -6,7 +6,7 @@
 # Contributor: Judd Vinet 
 
 pkgname=gnupg
-pkgver=2.2.25
+pkgver=2.2.26
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
@@ -29,7 +29,7 @@
 
source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
 'drop-import-clean.patch'
 'avoid-beta-warning.patch')
-sha256sums=('c55307b247af4b6f44d2916a25ffd1fb64ce2e509c3c3d028dbe7fbf309dc30a'
+sha256sums=('517569e6c9fad22175df16be5900f94c991c41e53612db63c14493e814cfff6d'
 'SKIP'
 '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
 '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
@@ -55,7 +55,6 @@
--sbindir=/usr/bin \
--libexecdir=/usr/lib/gnupg \
--enable-maintainer-mode \
-   --enable-symcryptrun \
 
make
 }