[PR PATCH] gnupg: update to 2.4.0.

[PR PATCH] gnupg: update to 2.4.0.

[jcgruenhage]

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

There is a new 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, 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. I'd like to keep this open as a draft for now, but I'm using it
for now.

<!--
#### 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: 4363 bytes --]

From c0be3ea7bd8c31c9c3e85e91a57d3e33a12be95d 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 3f4c71d1f78ad29c75d9c9bb89779cac4e875786 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: update to 1.6.3.

---
 srcpkgs/libksba/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index adc6202164c1..974c8ca392dc 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -1,15 +1,15 @@
 # Template file for 'libksba'
 pkgname=libksba
-version=1.6.0
+version=1.6.3
 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"
-checksum=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b
+checksum=3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c
 
 libksba-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"

From f4d49aa28a943ddf62ee53f013c87e49f810b165 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 | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 08751d2bea31..b17a50744560 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,6 +1,6 @@
 # Template file for 'gnupg'
 pkgname=gnupg
-version=2.3.8
+version=2.4.0
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable ldap)
@@ -18,9 +18,23 @@ 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
 build_options="ldap"
 build_options_default="ldap"
+# New release (2.4.0) has tests for gpgme failing.
+#
+# Making check in gpgme
+# make[2]: Entering directory '/builddir/gnupg-2.4.0/tests/gpgme'
+# /usr/bin/mkdir: cannot create directory ‘setup.scm’: Not a directory
+# make[2]: *** [Makefile:617: xcheck] Error 1
+# make[2]: Leaving directory '/builddir/gnupg-2.4.0/tests/gpgme'
+# make[1]: *** [Makefile:517: check-recursive] Error 1
+# make[1]: Leaving directory '/builddir/gnupg-2.4.0/tests'
+# make: *** [Makefile:631: check-recursive] Error 1
+#
+# Other distros are running into this as well, see
+# https://github.com/KaOSx/core/blob/d9806d4642491ddf7a7ab96aafbfc8f657f768c9/gnupg/PKGBUILD#L32
+make_check=no
 
 post_install() {
 	vmkdir usr/share/examples

Re: gnupg: update to 2.4.0.

[kruceter]

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

New comment by kruceter on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#issuecomment-1364720628

Comment:
Will the upstream patch do for you, Jan?

[0001-fixup-gnupg-update-to-2.4.0.txt](https://github.com/void-linux/void-packages/files/10300462/0001-fixup-gnupg-update-to-2.4.0.txt)

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

[jcgruenhage]

[-- Attachment #1: Type: text/plain, Size: 1550 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, 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. I'd like to keep this open as a draft for now, but I'm using it
for now.

<!--
#### 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: 7851 bytes --]

From 5274110ba5d6e52d95a1975f2c62d4b10e3dbb21 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 36e65e0910971465b5d16112be281d9485bd9d1b 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: update to 1.6.3.

---
 srcpkgs/libksba/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index adc6202164c1..974c8ca392dc 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -1,15 +1,15 @@
 # Template file for 'libksba'
 pkgname=libksba
-version=1.6.0
+version=1.6.3
 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"
-checksum=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b
+checksum=3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c
 
 libksba-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"

From 856e7cf7d3a47c64d8c53bf49f9445cd6150218f 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.

---
 ...csclite-library-on-musl-libc-as-well.patch |  6 +-
 ...ests-gpgme-for-in-source-tree-builds.patch | 63 +++++++++++++++++++
 srcpkgs/gnupg/template                        | 10 ++-
 3 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch

diff --git a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
index f677cb0d8ea7..aa2e924c3356 100644
--- a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
+++ b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
@@ -1,8 +1,8 @@
-From 5242588814474653bb0de15ebda3b0c6bb539ff6 Mon Sep 17 00:00:00 2001
+From 7f672f6281b0b27be8279cc5e422aeb55ffcf0fb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
  <congdanhqx@gmail.com>
 Date: Sun, 29 Sep 2019 12:32:46 +0700
-Subject: [PATCH] use versioned pcsclite library on musl-libc as well
+Subject: [PATCH 1/2] use versioned pcsclite library on musl-libc as well
 
 ---
  scd/scdaemon.c | 2 +-
@@ -22,5 +22,5 @@ index e43769f85..97449eff2 100644
  #else
  #define DEFAULT_PCSC_DRIVER "libpcsclite.so"
 -- 
-2.38.0
+2.39.0
 
diff --git a/srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch b/srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch
new file mode 100644
index 000000000000..cd0f695043a6
--- /dev/null
+++ b/srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch
@@ -0,0 +1,63 @@
+From a4ec37b589a0646f2e756921f7abbb578cb5464d Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Wed, 21 Dec 2022 10:52:24 +0900
+Subject: [PATCH 2/2] tests: Fix tests/gpgme for in-source-tree builds.
+
+* tests/gpgme/Makefile.am: Don't use setup.scm/ dir.
+* tests/gpgme/all-tests.scm: Fix the name of the environment.
+
+--
+
+GnuPG-bug-id: 6313
+Fixes-commit: c19ea75f10d6278569619f90977ce7c820e9319d
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ tests/gpgme/Makefile.am   | 5 ++---
+ tests/gpgme/all-tests.scm | 4 ++--
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/tests/gpgme/Makefile.am b/tests/gpgme/Makefile.am
+index ca7be13df..ae98db4a0 100644
+--- a/tests/gpgme/Makefile.am
++++ b/tests/gpgme/Makefile.am
+@@ -47,8 +47,7 @@ check: xcheck
+ 
+ .PHONY: xcheck
+ xcheck:
+-	@$(MKDIR_P) setup.scm/tests \
+-	  tests/gpg lang/qt/tests lang/python/tests
++	@$(MKDIR_P) tests/gpg lang/qt/tests lang/python/tests
+ 	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
+ 	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
+ 
+@@ -61,4 +60,4 @@ CLEANFILES = *.log report.xml
+ all-local: $(required_pgms)
+ 
+ clean-local:
+-	-rm -rf setup.scm/tests tests/gpg lang/qt/tests lang/python/tests
++	-rm -rf tests lang
+diff --git a/tests/gpgme/all-tests.scm b/tests/gpgme/all-tests.scm
+index 1746c4ee1..aef7d6a21 100644
+--- a/tests/gpgme/all-tests.scm
++++ b/tests/gpgme/all-tests.scm
+@@ -41,7 +41,7 @@
+     (test::scm
+      #f
+      #f
+-     (path-join "tests" "gpgme" "setup.scm" "tests" "gpg")
++     (path-join "tests" "gpgme" "tests" "gpg")
+      (in-srcdir "tests" "gpgme" "setup.scm")
+      "--" "tests" "gpg")))
+  (define setup-py
+@@ -49,7 +49,7 @@
+     (test::scm
+      #f
+      #f
+-     (path-join "tests" "gpgme" "setup.scm" "lang" "python" "tests")
++     (path-join "tests" "gpgme" "lang" "python" "tests")
+      (in-srcdir "tests" "gpgme" "setup.scm")
+      "--" "lang" "python" "tests")))
+ 
+-- 
+2.39.0
+
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 08751d2bea31..d1f9607c4a99 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,6 +1,6 @@
 # Template file for 'gnupg'
 pkgname=gnupg
-version=2.3.8
+version=2.4.0
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable ldap)
@@ -8,7 +8,7 @@ configure_args="$(vopt_enable ldap)
  --with-libassuan-prefix=${XBPS_CROSS_BASE}/usr
  --with-ksba-prefix=${XBPS_CROSS_BASE}/usr
  --with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext gettext-devel-tools automake"
 makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
  libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
  libgcrypt-devel"
@@ -18,10 +18,14 @@ 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
 build_options="ldap"
 build_options_default="ldap"
 
+pre_configure() {
+       autoreconf -fi
+}
+
 post_install() {
 	vmkdir usr/share/examples
 	rm -r $DESTDIR/usr/share/doc/gnupg/examples/systemd-user

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

[jcgruenhage]

[-- 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: 7845 bytes --]

From 5274110ba5d6e52d95a1975f2c62d4b10e3dbb21 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 36e65e0910971465b5d16112be281d9485bd9d1b 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: update to 1.6.3.

---
 srcpkgs/libksba/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index adc6202164c1..974c8ca392dc 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -1,15 +1,15 @@
 # Template file for 'libksba'
 pkgname=libksba
-version=1.6.0
+version=1.6.3
 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"
-checksum=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b
+checksum=3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c
 
 libksba-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"

From d2e84b1b19002bf8647fcd8eaa6dbf7f6a7fe9ac 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.

---
 ...csclite-library-on-musl-libc-as-well.patch |  6 +-
 ...ests-gpgme-for-in-source-tree-builds.patch | 63 +++++++++++++++++++
 srcpkgs/gnupg/template                        | 10 ++-
 3 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch

diff --git a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
index f677cb0d8ea7..aa2e924c3356 100644
--- a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
+++ b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
@@ -1,8 +1,8 @@
-From 5242588814474653bb0de15ebda3b0c6bb539ff6 Mon Sep 17 00:00:00 2001
+From 7f672f6281b0b27be8279cc5e422aeb55ffcf0fb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
  <congdanhqx@gmail.com>
 Date: Sun, 29 Sep 2019 12:32:46 +0700
-Subject: [PATCH] use versioned pcsclite library on musl-libc as well
+Subject: [PATCH 1/2] use versioned pcsclite library on musl-libc as well
 
 ---
  scd/scdaemon.c | 2 +-
@@ -22,5 +22,5 @@ index e43769f85..97449eff2 100644
  #else
  #define DEFAULT_PCSC_DRIVER "libpcsclite.so"
 -- 
-2.38.0
+2.39.0
 
diff --git a/srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch b/srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch
new file mode 100644
index 000000000000..cd0f695043a6
--- /dev/null
+++ b/srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch
@@ -0,0 +1,63 @@
+From a4ec37b589a0646f2e756921f7abbb578cb5464d Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Wed, 21 Dec 2022 10:52:24 +0900
+Subject: [PATCH 2/2] tests: Fix tests/gpgme for in-source-tree builds.
+
+* tests/gpgme/Makefile.am: Don't use setup.scm/ dir.
+* tests/gpgme/all-tests.scm: Fix the name of the environment.
+
+--
+
+GnuPG-bug-id: 6313
+Fixes-commit: c19ea75f10d6278569619f90977ce7c820e9319d
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ tests/gpgme/Makefile.am   | 5 ++---
+ tests/gpgme/all-tests.scm | 4 ++--
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/tests/gpgme/Makefile.am b/tests/gpgme/Makefile.am
+index ca7be13df..ae98db4a0 100644
+--- a/tests/gpgme/Makefile.am
++++ b/tests/gpgme/Makefile.am
+@@ -47,8 +47,7 @@ check: xcheck
+ 
+ .PHONY: xcheck
+ xcheck:
+-	@$(MKDIR_P) setup.scm/tests \
+-	  tests/gpg lang/qt/tests lang/python/tests
++	@$(MKDIR_P) tests/gpg lang/qt/tests lang/python/tests
+ 	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
+ 	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
+ 
+@@ -61,4 +60,4 @@ CLEANFILES = *.log report.xml
+ all-local: $(required_pgms)
+ 
+ clean-local:
+-	-rm -rf setup.scm/tests tests/gpg lang/qt/tests lang/python/tests
++	-rm -rf tests lang
+diff --git a/tests/gpgme/all-tests.scm b/tests/gpgme/all-tests.scm
+index 1746c4ee1..aef7d6a21 100644
+--- a/tests/gpgme/all-tests.scm
++++ b/tests/gpgme/all-tests.scm
+@@ -41,7 +41,7 @@
+     (test::scm
+      #f
+      #f
+-     (path-join "tests" "gpgme" "setup.scm" "tests" "gpg")
++     (path-join "tests" "gpgme" "tests" "gpg")
+      (in-srcdir "tests" "gpgme" "setup.scm")
+      "--" "tests" "gpg")))
+  (define setup-py
+@@ -49,7 +49,7 @@
+     (test::scm
+      #f
+      #f
+-     (path-join "tests" "gpgme" "setup.scm" "lang" "python" "tests")
++     (path-join "tests" "gpgme" "lang" "python" "tests")
+      (in-srcdir "tests" "gpgme" "setup.scm")
+      "--" "lang" "python" "tests")))
+ 
+-- 
+2.39.0
+
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 08751d2bea31..d5f94502a869 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,6 +1,6 @@
 # Template file for 'gnupg'
 pkgname=gnupg
-version=2.3.8
+version=2.4.0
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable ldap)
@@ -8,7 +8,7 @@ configure_args="$(vopt_enable ldap)
  --with-libassuan-prefix=${XBPS_CROSS_BASE}/usr
  --with-ksba-prefix=${XBPS_CROSS_BASE}/usr
  --with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext gettext-devel-tools automake"
 makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
  libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
  libgcrypt-devel"
@@ -18,10 +18,14 @@ 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
 build_options="ldap"
 build_options_default="ldap"
 
+pre_configure() {
+	autoreconf -fi
+}
+
 post_install() {
 	vmkdir usr/share/examples
 	rm -r $DESTDIR/usr/share/doc/gnupg/examples/systemd-user

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

[jcgruenhage]

[-- 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: 7924 bytes --]

From 5274110ba5d6e52d95a1975f2c62d4b10e3dbb21 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 9160209029f823351a726e913231de3bc75193c0 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: update to 1.6.3.

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

diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index adc6202164c1..e5a59cba024e 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -1,15 +1,15 @@
 # Template file for 'libksba'
 pkgname=libksba
-version=1.6.0
+version=1.6.3
 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"
-checksum=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b
+distfiles="https://gnupg.org/ftp/gcrypt/libksba/libksba-${version}.tar.bz2"
+checksum=3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c
 
 libksba-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"

From 94cb90146ed859b4e926bd91169b56736adb2a08 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.

---
 ...csclite-library-on-musl-libc-as-well.patch |  6 +-
 ...ests-gpgme-for-in-source-tree-builds.patch | 63 +++++++++++++++++++
 srcpkgs/gnupg/template                        | 10 ++-
 3 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch

diff --git a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
index f677cb0d8ea7..aa2e924c3356 100644
--- a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
+++ b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
@@ -1,8 +1,8 @@
-From 5242588814474653bb0de15ebda3b0c6bb539ff6 Mon Sep 17 00:00:00 2001
+From 7f672f6281b0b27be8279cc5e422aeb55ffcf0fb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
  <congdanhqx@gmail.com>
 Date: Sun, 29 Sep 2019 12:32:46 +0700
-Subject: [PATCH] use versioned pcsclite library on musl-libc as well
+Subject: [PATCH 1/2] use versioned pcsclite library on musl-libc as well
 
 ---
  scd/scdaemon.c | 2 +-
@@ -22,5 +22,5 @@ index e43769f85..97449eff2 100644
  #else
  #define DEFAULT_PCSC_DRIVER "libpcsclite.so"
 -- 
-2.38.0
+2.39.0
 
diff --git a/srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch b/srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch
new file mode 100644
index 000000000000..cd0f695043a6
--- /dev/null
+++ b/srcpkgs/gnupg/patches/0002-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch
@@ -0,0 +1,63 @@
+From a4ec37b589a0646f2e756921f7abbb578cb5464d Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Wed, 21 Dec 2022 10:52:24 +0900
+Subject: [PATCH 2/2] tests: Fix tests/gpgme for in-source-tree builds.
+
+* tests/gpgme/Makefile.am: Don't use setup.scm/ dir.
+* tests/gpgme/all-tests.scm: Fix the name of the environment.
+
+--
+
+GnuPG-bug-id: 6313
+Fixes-commit: c19ea75f10d6278569619f90977ce7c820e9319d
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ tests/gpgme/Makefile.am   | 5 ++---
+ tests/gpgme/all-tests.scm | 4 ++--
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/tests/gpgme/Makefile.am b/tests/gpgme/Makefile.am
+index ca7be13df..ae98db4a0 100644
+--- a/tests/gpgme/Makefile.am
++++ b/tests/gpgme/Makefile.am
+@@ -47,8 +47,7 @@ check: xcheck
+ 
+ .PHONY: xcheck
+ xcheck:
+-	@$(MKDIR_P) setup.scm/tests \
+-	  tests/gpg lang/qt/tests lang/python/tests
++	@$(MKDIR_P) tests/gpg lang/qt/tests lang/python/tests
+ 	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
+ 	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
+ 
+@@ -61,4 +60,4 @@ CLEANFILES = *.log report.xml
+ all-local: $(required_pgms)
+ 
+ clean-local:
+-	-rm -rf setup.scm/tests tests/gpg lang/qt/tests lang/python/tests
++	-rm -rf tests lang
+diff --git a/tests/gpgme/all-tests.scm b/tests/gpgme/all-tests.scm
+index 1746c4ee1..aef7d6a21 100644
+--- a/tests/gpgme/all-tests.scm
++++ b/tests/gpgme/all-tests.scm
+@@ -41,7 +41,7 @@
+     (test::scm
+      #f
+      #f
+-     (path-join "tests" "gpgme" "setup.scm" "tests" "gpg")
++     (path-join "tests" "gpgme" "tests" "gpg")
+      (in-srcdir "tests" "gpgme" "setup.scm")
+      "--" "tests" "gpg")))
+  (define setup-py
+@@ -49,7 +49,7 @@
+     (test::scm
+      #f
+      #f
+-     (path-join "tests" "gpgme" "setup.scm" "lang" "python" "tests")
++     (path-join "tests" "gpgme" "lang" "python" "tests")
+      (in-srcdir "tests" "gpgme" "setup.scm")
+      "--" "lang" "python" "tests")))
+ 
+-- 
+2.39.0
+
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 08751d2bea31..d5f94502a869 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,6 +1,6 @@
 # Template file for 'gnupg'
 pkgname=gnupg
-version=2.3.8
+version=2.4.0
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable ldap)
@@ -8,7 +8,7 @@ configure_args="$(vopt_enable ldap)
  --with-libassuan-prefix=${XBPS_CROSS_BASE}/usr
  --with-ksba-prefix=${XBPS_CROSS_BASE}/usr
  --with-npth-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext gettext-devel-tools automake"
 makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
  libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
  libgcrypt-devel"
@@ -18,10 +18,14 @@ 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
 build_options="ldap"
 build_options_default="ldap"
 
+pre_configure() {
+	autoreconf -fi
+}
+
 post_install() {
 	vmkdir usr/share/examples
 	rm -r $DESTDIR/usr/share/doc/gnupg/examples/systemd-user

Re: [PR REVIEW] gnupg: update to 2.4.0.

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#discussion_r1057393506

Comment:
If the failure because of in-source-tree build, you can simulated by force gnupg build out-of-tree. I don't think adding a patch and autotools is worth it.

Re: [PR REVIEW] gnupg: update to 2.4.0.

[jcgruenhage]

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

New review comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#discussion_r1057507307

Comment:
Feel free to work on building it out-of-tree, I think adding a patch that has been merged upstream and temporarily depend on autotools is worth it.

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

[jcgruenhage]

[-- 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: 5705 bytes --]

From 5274110ba5d6e52d95a1975f2c62d4b10e3dbb21 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 9160209029f823351a726e913231de3bc75193c0 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: update to 1.6.3.

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

diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index adc6202164c1..e5a59cba024e 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -1,15 +1,15 @@
 # Template file for 'libksba'
 pkgname=libksba
-version=1.6.0
+version=1.6.3
 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"
-checksum=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b
+distfiles="https://gnupg.org/ftp/gcrypt/libksba/libksba-${version}.tar.bz2"
+checksum=3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c
 
 libksba-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"

From 0afa9164c003d4c460dc123bc8f55aa059ccfdd6 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.

---
 ...pcsclite-library-on-musl-libc-as-well.patch |  6 +++---
 srcpkgs/gnupg/template                         | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
index f677cb0d8ea7..aa2e924c3356 100644
--- a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
+++ b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
@@ -1,8 +1,8 @@
-From 5242588814474653bb0de15ebda3b0c6bb539ff6 Mon Sep 17 00:00:00 2001
+From 7f672f6281b0b27be8279cc5e422aeb55ffcf0fb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
  <congdanhqx@gmail.com>
 Date: Sun, 29 Sep 2019 12:32:46 +0700
-Subject: [PATCH] use versioned pcsclite library on musl-libc as well
+Subject: [PATCH 1/2] use versioned pcsclite library on musl-libc as well
 
 ---
  scd/scdaemon.c | 2 +-
@@ -22,5 +22,5 @@ index e43769f85..97449eff2 100644
  #else
  #define DEFAULT_PCSC_DRIVER "libpcsclite.so"
 -- 
-2.38.0
+2.39.0
 
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 08751d2bea31..458c0885c558 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,14 +1,19 @@
 # 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"
-hostmakedepends="pkg-config gettext"
+ --with-npth-prefix=${XBPS_CROSS_BASE}/usr
+ --enable-all-tests"
+configure_script="../configure"
+hostmakedepends="pkg-config gettext gettext-devel-tools automake"
 makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
  libksba-devel libldap-devel libusb-compat-devel npth-devel sqlite-devel
  libgcrypt-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

Re: [PR REVIEW] gnupg: update to 2.4.0.

[jcgruenhage]

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

New review comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#discussion_r1057562166

Comment:
@kruceter came in to save the day, and has provided a working patch for building out of tree. Not sure what I did wrong last night, but I couldn't get it to work then.

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

[jcgruenhage]

[-- 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: 5621 bytes --]

From 5274110ba5d6e52d95a1975f2c62d4b10e3dbb21 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 9160209029f823351a726e913231de3bc75193c0 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: update to 1.6.3.

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

diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index adc6202164c1..e5a59cba024e 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -1,15 +1,15 @@
 # Template file for 'libksba'
 pkgname=libksba
-version=1.6.0
+version=1.6.3
 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"
-checksum=dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b
+distfiles="https://gnupg.org/ftp/gcrypt/libksba/libksba-${version}.tar.bz2"
+checksum=3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c
 
 libksba-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"

From f79f9c27c1414f8f19852c3f93ddf76c45eedb03 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.

---
 ...d-pcsclite-library-on-musl-libc-as-well.patch |  6 +++---
 srcpkgs/gnupg/template                           | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
index f677cb0d8ea7..aa2e924c3356 100644
--- a/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
+++ b/srcpkgs/gnupg/patches/0001-use-versioned-pcsclite-library-on-musl-libc-as-well.patch
@@ -1,8 +1,8 @@
-From 5242588814474653bb0de15ebda3b0c6bb539ff6 Mon Sep 17 00:00:00 2001
+From 7f672f6281b0b27be8279cc5e422aeb55ffcf0fb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
  <congdanhqx@gmail.com>
 Date: Sun, 29 Sep 2019 12:32:46 +0700
-Subject: [PATCH] use versioned pcsclite library on musl-libc as well
+Subject: [PATCH 1/2] use versioned pcsclite library on musl-libc as well
 
 ---
  scd/scdaemon.c | 2 +-
@@ -22,5 +22,5 @@ index e43769f85..97449eff2 100644
  #else
  #define DEFAULT_PCSC_DRIVER "libpcsclite.so"
 -- 
-2.38.0
+2.39.0
 
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

Re: [PR REVIEW] gnupg: update to 2.4.0.

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#discussion_r1059661471

Comment:
this patch rebase doesn't seem necessary, not even line numbers changed

Re: [PR REVIEW] gnupg: update to 2.4.0.

[jcgruenhage]

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

New review comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#discussion_r1059776662

Comment:
Well, I have a checkout of the `gnupg` source locally, and I generate the patchset with `git format-patch v${version}` after doing `git rebase v${version}`, so all of those are rebased.  Manually checking in which of those the context lines might have changed is additional churn that doesn't really add any value IMO, because having those updated patches in the repo doesn't really hurt anyway.. Is there a good reason to against this?

Re: [PR REVIEW] gnupg: update to 2.4.0.

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#discussion_r1059781877

Comment:
I don't see any reason to rebase the patches even if the line numbers changed if they all still apply, it only makes the commit diffs bigger.

Re: [PR REVIEW] gnupg: update to 2.4.0.

[jcgruenhage]

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

New review comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#discussion_r1059782477

Comment:
I added a new patch, that's why I rebased the patchset. If there is no changes to the patchset at all, sure, I wouldn't rebase it.

Re: [PR REVIEW] gnupg: update to 2.4.0.

[jcgruenhage]

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

New review comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#discussion_r1059782477

Comment:
I added a new patch, that's why I rebased the patchset. If there is no changes to the patchset at all, sure, I wouldn't rebase it. But that's the point: I don't look at each patch individually, I treat it as a set, I rebase the set, and I replace the previous set with the new set.

Re: [PR REVIEW] gnupg: update to 2.4.0.

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#discussion_r1059827093

Comment:
Please use `quilt` instead. Changing patches like this won't add anything but more objects into git storage.

Re: [PR REVIEW] gnupg: update to 2.4.0.

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#discussion_r1059827154

Comment:
or you can check if nothing was changed in patches, please remove from changeset.

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

[jcgruenhage]

[-- 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

Re: [PR REVIEW] gnupg: update to 2.4.0.

[jcgruenhage]

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

New review comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/41270#discussion_r1070395269

Comment:
I've removed the rebase of that patch from the changeset.

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

[paper42]

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

There's a merged pull request on the void-packages repository

gnupg: update to 2.4.0.
https://github.com/void-linux/void-packages/pull/41270

Description:
<!-- 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
-->