Merged with official ABS gnupg PKGBUILD

4 files changed, 114 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5a1c19c46cb..f98a06636854 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,37 @@
 pkgbase = gnupg-git
 	pkgdesc = Complete and free implementation of the OpenPGP standard
-	pkgver = 2.2.7+1227+gf9bbc7516
+	pkgver = 2.3.2_r9343.g25ae80b8e
 	pkgrel = 1
 	url = https://www.gnupg.org/
 	install = gnupg-git.install
 	arch = x86_64
 	license = GPL
-	checkdepends = openssh
+	makedepends = git
 	makedepends = libldap
 	makedepends = libusb-compat
 	makedepends = pcsclite
-	makedepends = git
-	makedepends = fig2dev
-	makedepends = imagemagick
-	makedepends = librsvg
 	depends = npth
 	depends = libgpg-error
 	depends = libgcrypt
 	depends = libksba
 	depends = libassuan
 	depends = pinentry
-	depends = bzip2
+	depends = libbz2.so
 	depends = readline
 	depends = libreadline.so
 	depends = gnutls
 	depends = sqlite
 	depends = zlib
-	depends = glibc
 	optdepends = libldap: gpg2keys_ldap
 	optdepends = libusb-compat: scdaemon
 	optdepends = pcsclite: scdaemon
-	provides = gnupg=2.2
+	provides = gnupg
 	conflicts = gnupg
-	source = git://git.gnupg.org/gnupg.git
+	source = git+https://github.com/gpg/gnupg.git
+	source = avoid-beta-warning.patch
 	source = drop-import-clean.patch
 	sha256sums = SKIP
-	sha256sums = 7ae777b0f4c6d3301768149f66f1d5b723841f3a4a2f0d4c601a0b2114bb7fe1
+	sha256sums = 22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d
+	sha256sums = 498d482532d0039e505fe5854a734fcac05110a93890cb0d8ffa67fd13d2b7bd
 
 pkgname = gnupg-git
-
diff --git a/PKGBUILD b/PKGBUILD
index c1c680985977..c67c61611a13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,8 @@
-# Maintainer: Stephanie Wilde-Hobbs <git@stephanie.is>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Lukas Fleischer <lfleischer@archlinux.org>
+# Merged with official ABS gnupg PKGBUILD by João, 2021/07/23 (all respective contributors apply herein)
+# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx>
+# Contributor: Stephanie Wilde-Hobbs <git@stephanie.is>
+# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Lukas Fleischer <lfleischer@archlinux.org>
 # Contributor: Lex Black <autumn-wind at web dot de>
 # Contributor: alphazo@gmail.com
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
@@ -9,67 +11,64 @@
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: @holos
 
-_pkgname=gnupg
-pkgname=${_pkgname}-git
-pkgver=2.2.7+1227+gf9bbc7516
+pkgname=gnupg-git
+pkgver=2.3.2_r9343.g25ae80b8e
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='https://www.gnupg.org/'
-license=('GPL')
-arch=('x86_64')
-conflicts=(${_pkgname})
-provides=(${_pkgname}=2.2)
-checkdepends=('openssh')
-makedepends=('libldap' 'libusb-compat' 'pcsclite' 'git' 'fig2dev' 'imagemagick' 'librsvg')
-depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
-         'pinentry' 'bzip2' 'readline' 'libreadline.so' 'gnutls'
-         'sqlite' 'zlib' 'glibc')
+license=(GPL)
+arch=($CARCH)
+# checkdepends=(openssh fig2dev)
+makedepends=(git libldap libusb-compat pcsclite)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+depends=(npth libgpg-error libgcrypt libksba libassuan pinentry libbz2.so readline libreadline.so gnutls sqlite zlib)
 optdepends=('libldap: gpg2keys_ldap'
             'libusb-compat: scdaemon'
             'pcsclite: scdaemon')
-source=("git://git.gnupg.org/gnupg.git"
-        'drop-import-clean.patch')
+source=("git+https://github.com/gpg/${pkgname%-git}.git"
+		avoid-beta-warning.patch
+		drop-import-clean.patch)
 sha256sums=('SKIP'
-            '7ae777b0f4c6d3301768149f66f1d5b723841f3a4a2f0d4c601a0b2114bb7fe1')
+            '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
+            '498d482532d0039e505fe5854a734fcac05110a93890cb0d8ffa67fd13d2b7bd')
 install=gnupg-git.install
 
 pkgver() {
-	cd "${srcdir}/${_pkgname}"
-	git describe --tags | sed 's/gnupg-//;s/-/+/g'
+  cd ${pkgname%-git}
+  echo "$(cat VERSION)_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-	cd "${srcdir}/${_pkgname}"
-	patch -p1 -i ../drop-import-clean.patch
+  cd ${pkgname%-git}
+  patch -p1 -i ../avoid-beta-warning.patch
+  patch -p1 -i ../drop-import-clean.patch
 
-	./autogen.sh
+  ./autogen.sh
 }
 
 build() {
-	cd "${srcdir}/${_pkgname}"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--sbindir=/usr/bin \
-		--libexecdir=/usr/lib/gnupg \
-		--enable-maintainer-mode \
-		--enable-symcryptrun \
+  cd ${pkgname%-git}
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --libexecdir=/usr/lib/gnupg \
+    --enable-maintainer-mode \
 
-	make
+  make
 }
 
 # check() {
-# 	cd "${srcdir}/${_pkgname}"
-# 	make check
+#   cd ${pkgname%-git}
+#   make check
 # }
 
 package() {
-	cd "${srcdir}/${_pkgname}"
-	make DESTDIR="${pkgdir}" install
-	ln -s gpg "${pkgdir}"/usr/bin/gpg2
-	ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
+  cd ${pkgname%-git}
+  make DESTDIR="${pkgdir}" install
+  ln -s gpg "${pkgdir}"/usr/bin/gpg2
+  ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
 
-	install -Dm 644 doc/examples/systemd-user/*.* -t "${pkgdir}/usr/lib/systemd/user"
+  install -Dm 644 doc/examples/systemd-user/*.* -t "${pkgdir}/usr/lib/systemd/user"
 }
-
-# vim: ts=2 sw=2 noet:
diff --git a/avoid-beta-warning.patch b/avoid-beta-warning.patch
new file mode 100644
index 000000000000..569fc0911c2e
--- /dev/null
+++ b/avoid-beta-warning.patch
@@ -0,0 +1,56 @@
+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 9c42fece93ad..628b5896d502 100644
--- a/drop-import-clean.patch
+++ b/drop-import-clean.patch
@@ -1,52 +1,27 @@
-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.
-
-GnuPG-Bug-Id: 4628
-Signed-off-by: Daniel Kahn Gillmor <dkg@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
+index 36d500d..a1c04fa 100644
 --- a/doc/gpg.texi
 +++ b/doc/gpg.texi
-@@ -1963,7 +1963,7 @@ are available for all keyserver types, some common options are:
+@@ -2018,7 +2018,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".
- 
+ repair-keys, repair-pks-subkey-bug, export-attributes". However, if
+ the actual used source is an LDAP server "no-self-sigs-only" is
+ assumed unless "self-sigs-only" has been explictly configured.
 diff --git a/g10/gpg.c b/g10/gpg.c
-index 68cc22041..fa2bcfa5e 100644
+index 733d444..8c95820 100644
 --- a/g10/gpg.c
 +++ b/g10/gpg.c
-@@ -2407,6 +2407,5 @@ main (int argc, char **argv)
+@@ -2446,8 +2446,7 @@ main (int argc, char **argv)
+ 					    | IMPORT_REPAIR_PKS_SUBKEY_BUG
                                              | IMPORT_SELF_SIGS_ONLY
                                              | IMPORT_COLLAPSE_UIDS
 -                                            | IMPORT_COLLAPSE_SUBKEYS
 -                                            | IMPORT_CLEAN);
 +                                            | IMPORT_COLLAPSE_SUBKEYS);
      opt.keyserver_options.export_options = EXPORT_ATTRIBUTES;
-     opt.keyserver_options.options = KEYSERVER_HONOR_PKA_RECORD;
---
-2.27.0
-
+     opt.keyserver_options.options = 0;
+     opt.verify_options = (LIST_SHOW_UID_VALIDITY