Actually, we do want that warning

4 files changed, 21 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f98a06636854..e6a8f3a0b4cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnupg-git
 	pkgdesc = Complete and free implementation of the OpenPGP standard
 	pkgver = 2.3.2_r9343.g25ae80b8e
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.gnupg.org/
 	install = gnupg-git.install
 	arch = x86_64
@@ -28,10 +28,8 @@ pkgbase = gnupg-git
 	provides = gnupg
 	conflicts = gnupg
 	source = git+https://github.com/gpg/gnupg.git
-	source = avoid-beta-warning.patch
 	source = drop-import-clean.patch
 	sha256sums = SKIP
-	sha256sums = 22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d
-	sha256sums = 498d482532d0039e505fe5854a734fcac05110a93890cb0d8ffa67fd13d2b7bd
+	sha256sums = 5b76faf39092fe6324d9fc058d9b3a22c2a47cc1964de2afe98093c6d86e7de0
 
 pkgname = gnupg-git
diff --git a/PKGBUILD b/PKGBUILD
index c67c61611a13..6dc91c5de8aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 
 pkgname=gnupg-git
 pkgver=2.3.2_r9343.g25ae80b8e
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
 license=(GPL)
@@ -27,11 +27,9 @@ optdepends=('libldap: gpg2keys_ldap'
             'libusb-compat: scdaemon'
             'pcsclite: scdaemon')
 source=("git+https://github.com/gpg/${pkgname%-git}.git"
-		avoid-beta-warning.patch
 		drop-import-clean.patch)
 sha256sums=('SKIP'
-            '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
-            '498d482532d0039e505fe5854a734fcac05110a93890cb0d8ffa67fd13d2b7bd')
+            '5b76faf39092fe6324d9fc058d9b3a22c2a47cc1964de2afe98093c6d86e7de0')
 install=gnupg-git.install
 
 pkgver() {
@@ -41,7 +39,6 @@ pkgver() {
 
 prepare() {
   cd ${pkgname%-git}
-  patch -p1 -i ../avoid-beta-warning.patch
   patch -p1 -i ../drop-import-clean.patch
 
   ./autogen.sh
diff --git a/avoid-beta-warning.patch b/avoid-beta-warning.patch
deleted file mode 100644
index 569fc0911c2e..000000000000
--- a/avoid-beta-warning.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 114ab3037de3b0f9b35cf023b64c8a9b76070065 Mon Sep 17 00:00:00 2001
-From: Debian GnuPG Maintainers <pkg-gnupg-maint@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
-
diff --git a/drop-import-clean.patch b/drop-import-clean.patch
index 628b5896d502..0a96799a1cb3 100644
--- a/drop-import-clean.patch
+++ b/drop-import-clean.patch
@@ -1,4 +1,20 @@
-diff --git a/doc/gpg.texi b/doc/gpg.texi
+From 1690a464b28fa24ce82189a9bf5d7ce9b44804b8 Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@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.diff --git a/doc/gpg.texi b/doc/gpg.texi
+
 index 36d500d..a1c04fa 100644
 --- a/doc/gpg.texi
 +++ b/doc/gpg.texi