Re: [PR PATCH] [Updated] gnupg: update to 2.4.0.

[jcgruenhage <jcgruenhage@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1722 bytes --]

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages gnupg-2.4.0_1
https://github.com/void-linux/void-packages/pull/41270

gnupg: update to 2.4.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

I'd like others to test this as well. Last time, we've had problems with people
running into issues. <del>And we've got an additional problem this time, because
their test suite isn't passing, which at least some other distros are also
running into.</del> I'd like to keep this open as a draft for now, but I'm using it
for now.

EDIT: The problem with the test suite has been fixed by applying an upstream patch, thanks for the help with automake @kruceter 

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41270.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg-2.4.0_1-41270.patch --]
[-- Type: text/x-diff, Size: 4291 bytes --]

From dbb0a43d9b47d903c8171c87a629eecc48d51235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 24 Dec 2022 16:24:32 +0100
Subject: [PATCH 1/3] libgpg-error: update to 1.46.

---
 srcpkgs/libgpg-error/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index 0bcf2a42e221..32fc7f573718 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -1,14 +1,15 @@
 # Template file for 'libgpg-error'
 pkgname=libgpg-error
-version=1.45
+version=1.46
 revision=1
 build_style=gnu-configure
+configure_args="--enable-install-gpg-error-config"
 short_desc="Library for error values used by GnuPG component"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://www.gnupg.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26
+checksum=b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="qemu-user-static"

From 899a14217da0ec0f8194d9d3178d42563b2fecc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 24 Dec 2022 16:24:37 +0100
Subject: [PATCH 2/3] libksba: adopt

---
 srcpkgs/libksba/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index 33af6e3ca032..e5a59cba024e 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -5,10 +5,10 @@ revision=1
 build_style=gnu-configure
 makedepends="libgpg-error-devel"
 short_desc="CMS and X.509 access library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-2.0-or-later,LGPL-3.0-or-later"
 homepage="https://www.gnupg.org/related_software/libksba/index.html"
-distfiles="https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
+distfiles="https://gnupg.org/ftp/gcrypt/libksba/libksba-${version}.tar.bz2"
 checksum=3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c
 
 libksba-devel_package() {

From 748e21f34e3c54b6d37fde118982a6b3632a6aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 24 Dec 2022 16:24:21 +0100
Subject: [PATCH 3/3] gnupg: update to 2.4.0.

---
 srcpkgs/gnupg/template | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 08751d2bea31..753b17e1f033 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,13 +1,18 @@
 # Template file for 'gnupg'
 pkgname=gnupg
-version=2.3.8
+version=2.4.0
 revision=1
+# We're building outside of the source tree, because upstream told us to:
+# https://dev.gnupg.org/T6313#166339
+build_wrksrc=build
 build_style=gnu-configure
 configure_args="$(vopt_enable ldap)
  --with-libgcrypt-prefix=${XBPS_CROSS_BASE}/usr
  --with-libassuan-prefix=${XBPS_CROSS_BASE}/usr
  --with-ksba-prefix=${XBPS_CROSS_BASE}/usr
- --with-npth-prefix=${XBPS_CROSS_BASE}/usr"
+ --with-npth-prefix=${XBPS_CROSS_BASE}/usr
+ --enable-all-tests"
+configure_script="../configure"
 hostmakedepends="pkg-config gettext"
 makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
  libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
@@ -18,10 +23,15 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/"
 distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
-checksum=540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed
+checksum=1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483
+make_check_pre='env TESTFLAGS="--parallel=${XBPS_MAKEJOBS}"'
 build_options="ldap"
 build_options_default="ldap"
 
+post_extract() {
+	mkdir build
+}
+
 post_install() {
 	vmkdir usr/share/examples
 	rm -r $DESTDIR/usr/share/doc/gnupg/examples/systemd-user