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

[Levente Polyak]

    Date: Wednesday, July 6, 2022 @ 23:50:24
  Author: anthraxx
Revision: 449958

upgpkg: gnupg 2.2.36-1

1. remove obsolete signing keys according to g10/distsigkey.gpg

2. add new trusted signing key 02F38DFF731FF97CB039A1DA549E695E905BA208:
- cross signed by 6DAA6E64A76D2840571B4902528897B826403ADA Werner Koch (dist signing 2020)
- contained in g10/distsigkey.gpg

3. replace manual patch calls with auto patch block including a helper
   to print which patch is currently applied

Added:
  gnupg/trunk/keys/
  gnupg/trunk/keys/pgp/
  gnupg/trunk/keys/pgp/02F38DFF731FF97CB039A1DA549E695E905BA208.asc
  gnupg/trunk/keys/pgp/5B80C5754298F0CB55D8ED6ABCEF7E294B092E28.asc
  gnupg/trunk/keys/pgp/6DAA6E64A76D2840571B4902528897B826403ADA.asc
  gnupg/trunk/keys/pgp/AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD.asc
Modified:
  gnupg/trunk/PKGBUILD

-------------------------------------------------------+
 PKGBUILD                                              |   28 +++++++---------
 keys/pgp/02F38DFF731FF97CB039A1DA549E695E905BA208.asc |    1 
 keys/pgp/5B80C5754298F0CB55D8ED6ABCEF7E294B092E28.asc |    1 
 keys/pgp/6DAA6E64A76D2840571B4902528897B826403ADA.asc |    1 
 keys/pgp/AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD.asc |    1 
 5 files changed, 17 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-06 22:52:03 UTC (rev 449957)
+++ PKGBUILD	2022-07-06 23:50:24 UTC (rev 449958)
@@ -6,8 +6,8 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=gnupg
-pkgver=2.2.35
-pkgrel=2
+pkgver=2.2.36
+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)
@@ -24,23 +24,21 @@
 )
 options=('debug')
 validpgpkeys=(
-  'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
-  '031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release Key) <gniibe at fsij.org>
   '5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release Signing Key)
   '6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
   'AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD' # Niibe Yutaka (GnuPG Release Key)
+  '02F38DFF731FF97CB039A1DA549E695E905BA208' # GnuPG.com (Release Signing Key 2021)
 )
 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'
-  'gnupg-2.2.35-revert_14de7b1e5904e78fcbe413a82d0f19b750bd8830.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=3192939a10df17cb9666773ed8888627f6d16b8d'
   'drop-import-clean.patch'
   'avoid-beta-warning.patch'
 )
-sha256sums=('340bc255938971e6e729b3d9956fa2ef4db8215d77693bf300df2bb302498690'
+sha256sums=('bdfe783810fceca9703b9e811817acca63ee9ef0174e616598e8ea6590aa4c9c'
             'SKIP'
             '1b7611a24e813429e56a7d0855c59d33109cb1b59b3586a3dd35935909a493e5'
-            '00aa4897f11900f67e161f538c5322f2f9e65dc5675a760fd298d43d33a259d7'
             '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
             '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
 
@@ -48,15 +46,15 @@
 
 prepare() {
   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
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    msg2 "Applying patch $src..."
+    patch -Np1 < "../$src"
+  done
 
   # improve reproducibility
   rm doc/gnupg.info*

Added: keys/pgp/02F38DFF731FF97CB039A1DA549E695E905BA208.asc
===================================================================
(Binary files differ)

Index: gnupg/trunk/keys/pgp/02F38DFF731FF97CB039A1DA549E695E905BA208.asc
===================================================================
--- keys/pgp/02F38DFF731FF97CB039A1DA549E695E905BA208.asc	2022-07-06 22:52:03 UTC (rev 449957)
+++ keys/pgp/02F38DFF731FF97CB039A1DA549E695E905BA208.asc	2022-07-06 23:50:24 UTC (rev 449958)

Property changes on: gnupg/trunk/keys/pgp/02F38DFF731FF97CB039A1DA549E695E905BA208.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property
Added: keys/pgp/5B80C5754298F0CB55D8ED6ABCEF7E294B092E28.asc
===================================================================
(Binary files differ)

Index: gnupg/trunk/keys/pgp/5B80C5754298F0CB55D8ED6ABCEF7E294B092E28.asc
===================================================================
--- keys/pgp/5B80C5754298F0CB55D8ED6ABCEF7E294B092E28.asc	2022-07-06 22:52:03 UTC (rev 449957)
+++ keys/pgp/5B80C5754298F0CB55D8ED6ABCEF7E294B092E28.asc	2022-07-06 23:50:24 UTC (rev 449958)

Property changes on: gnupg/trunk/keys/pgp/5B80C5754298F0CB55D8ED6ABCEF7E294B092E28.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property
Added: keys/pgp/6DAA6E64A76D2840571B4902528897B826403ADA.asc
===================================================================
(Binary files differ)

Index: gnupg/trunk/keys/pgp/6DAA6E64A76D2840571B4902528897B826403ADA.asc
===================================================================
--- keys/pgp/6DAA6E64A76D2840571B4902528897B826403ADA.asc	2022-07-06 22:52:03 UTC (rev 449957)
+++ keys/pgp/6DAA6E64A76D2840571B4902528897B826403ADA.asc	2022-07-06 23:50:24 UTC (rev 449958)

Property changes on: gnupg/trunk/keys/pgp/6DAA6E64A76D2840571B4902528897B826403ADA.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property
Added: keys/pgp/AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD.asc
===================================================================
(Binary files differ)

Index: gnupg/trunk/keys/pgp/AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD.asc
===================================================================
--- keys/pgp/AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD.asc	2022-07-06 22:52:03 UTC (rev 449957)
+++ keys/pgp/AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD.asc	2022-07-06 23:50:24 UTC (rev 449958)

Property changes on: gnupg/trunk/keys/pgp/AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property