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

[Lukas Fleischer]

    Date: Sunday, May 9, 2021 @ 18:53:04
  Author: lfleischer
Revision: 414880

upgpkg: gnupg 2.3.1-1: remove unused patches

Modified:
  gnupg/trunk/PKGBUILD
Deleted:
  gnupg/trunk/avoid-beta-warning.patch
  gnupg/trunk/drop-import-clean.patch

--------------------------+
 PKGBUILD                 |    8 +-----
 avoid-beta-warning.patch |   56 ---------------------------------------------
 drop-import-clean.patch  |   54 -------------------------------------------
 3 files changed, 2 insertions(+), 116 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-09 18:49:27 UTC (rev 414879)
+++ PKGBUILD	2021-05-09 18:53:04 UTC (rev 414880)
@@ -26,13 +26,9 @@
 	'5B80C5754298F0CB55D8ED6ABCEF7E294B092E28' # Andre Heinecke (Release Signing Key)
 	'6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
 )
-source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-        'drop-import-clean.patch'
-        'avoid-beta-warning.patch')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
 sha256sums=('c498db346a9b9a4b399e514c8f56dfc0a888ce8f327f10376ff984452cd154ec'
-            'SKIP'
-            '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
-            '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d')
+            'SKIP')
 
 install=install
 

Deleted: avoid-beta-warning.patch
===================================================================
--- avoid-beta-warning.patch	2021-05-09 18:49:27 UTC (rev 414879)
+++ avoid-beta-warning.patch	2021-05-09 18:53:04 UTC (rev 414880)
@@ -1,56 +0,0 @@
-From 114ab3037de3b0f9b35cf023b64c8a9b76070065 Mon Sep 17 00:00:00 2001
-From: Debian GnuPG Maintainers <pkg-gnupg-maint at lists.alioth.debian.org>
-Date: Tue, 14 Apr 2015 10:02:31 -0400
-Subject: [PATCH 6/7] avoid beta warning
-
-avoid self-describing as a beta
-
-Using autoreconf against the source as distributed in tarball form
-invariably results in a package that thinks it's a "beta" package,
-which produces the "THIS IS A DEVELOPMENT VERSION" warning string.
-
-since we use dh_autoreconf, i need this patch to avoid producing
-builds that announce themselves as DEVELOPMENT VERSIONs.
-
-See discussion at:
-
- http://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029065.html
----
- autogen.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/autogen.sh b/autogen.sh
-index b23855061..9b86d3ff9 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -229,24 +229,24 @@ if [ "$myhost" = "find-version" ]; then
-     esac
- 
-     beta=no
--    if [ -e .git ]; then
-+    if false; then
-       ingit=yes
-       tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
-       tmp=$(echo "$tmp" | sed s/^"$package"//)
-       if [ -n "$tmp" ]; then
-           tmp=$(echo "$tmp" | sed s/^"$package"//  \
-                 | awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}')
-       else
-           tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \
-                 | awk -F- '$4!=0{print"-beta"$4}')
-       fi
-       [ -n "$tmp" ] && beta=yes
-       rev=$(git rev-parse --short HEAD | tr -d '\n\r')
-       rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
-     else
-       ingit=no
--      beta=yes
--      tmp="-unknown"
-+      beta=no
-+      tmp=""
-       rev="0000000"
-       rvd="0"
-     fi
--- 
-2.27.0
-

Deleted: drop-import-clean.patch
===================================================================
--- drop-import-clean.patch	2021-05-09 18:49:27 UTC (rev 414879)
+++ drop-import-clean.patch	2021-05-09 18:53:04 UTC (rev 414880)
@@ -1,54 +0,0 @@
-From 1690a464b28fa24ce82189a9bf5d7ce9b44804b8 Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Mon, 15 Jul 2019 16:24:35 -0400
-Subject: [PATCH 3/7] gpg: drop import-clean from default keyserver import
- options
-
-* g10/gpg.c (main): drop IMPORT_CLEAN from the
-default opt.keyserver_options.import_options
-* doc/gpg.texi: reflect this change in the documentation
-
-Given that SELF_SIGS_ONLY is already set, it's not clear what
-additional benefit IMPORT_CLEAN provides.  Furthermore, IMPORT_CLEAN
-means that receiving an OpenPGP certificate from a keyserver will
-potentially delete data that is otherwise held in the local keyring,
-which is surprising to users who expect retrieval from the keyservers
-to be purely additive.
-
-GnuPG-Bug-Id: 4628
-Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
----
- doc/gpg.texi | 2 +-
- g10/gpg.c    | 3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/doc/gpg.texi b/doc/gpg.texi
-index 4870441d4..551459a74 100644
---- a/doc/gpg.texi
-+++ b/doc/gpg.texi
-@@ -1963,7 +1963,7 @@ are available for all keyserver types, some common options are:
- 
- @end table
- 
--The default list of options is: "self-sigs-only, import-clean,
-+The default list of options is: "self-sigs-only,
- repair-keys, repair-pks-subkey-bug, export-attributes,
- honor-pka-record".
- 
-diff --git a/g10/gpg.c b/g10/gpg.c
-index 68cc22041..fa2bcfa5e 100644
---- a/g10/gpg.c
-+++ b/g10/gpg.c
-@@ -2397,8 +2397,7 @@ main (int argc, char **argv)
-     opt.export_options = EXPORT_ATTRIBUTES;
-     opt.keyserver_options.import_options = (IMPORT_REPAIR_KEYS
- 					    | IMPORT_REPAIR_PKS_SUBKEY_BUG
--                                            | IMPORT_SELF_SIGS_ONLY
--                                            | IMPORT_CLEAN);
-+                                            | IMPORT_SELF_SIGS_ONLY);
-     opt.keyserver_options.export_options = EXPORT_ATTRIBUTES;
-     opt.keyserver_options.options = KEYSERVER_HONOR_PKA_RECORD;
-     opt.verify_options = (LIST_SHOW_UID_VALIDITY
--- 
-2.27.0
-