From 2c6172bbb530a47aaad06926983199df9ec3a208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Sat, 22 Oct 2022 15:54:29 +0200
Subject: groups/241.native_packages_inet.group: gnupg: bump to v2.3.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 patches/gnupg-2.3.8.local.patch     | 13 +++++++++++++
 patches/gnupg-2.3.8_pre.local.patch | 21 +++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 patches/gnupg-2.3.8.local.patch
 create mode 100644 patches/gnupg-2.3.8_pre.local.patch

(limited to 'patches')

diff --git a/patches/gnupg-2.3.8.local.patch b/patches/gnupg-2.3.8.local.patch
new file mode 100644
index 00000000..7e2d9617
--- /dev/null
+++ b/patches/gnupg-2.3.8.local.patch
@@ -0,0 +1,13 @@
+diff -ru gnupg-2.3.8.orig/dirmngr/server.c gnupg-2.3.8/dirmngr/server.c
+--- gnupg-2.3.8.orig/dirmngr/server.c	2022-10-07 15:23:50.000000000 +0200
++++ gnupg-2.3.8/dirmngr/server.c	2022-10-22 15:52:13.224088828 +0200
+@@ -3137,7 +3137,9 @@
+                ctrl->refcount);
+   else
+     {
++#if USE_LDAP
+       ks_ldap_free_state (ctrl->ks_get_state);
++#endif
+       ctrl->ks_get_state = NULL;
+       release_ctrl_ocsp_certs (ctrl);
+       xfree (ctrl->server_local);
diff --git a/patches/gnupg-2.3.8_pre.local.patch b/patches/gnupg-2.3.8_pre.local.patch
new file mode 100644
index 00000000..947bce1b
--- /dev/null
+++ b/patches/gnupg-2.3.8_pre.local.patch
@@ -0,0 +1,21 @@
+diff -ru gnupg-2.3.8.orig/configure gnupg-2.3.8/configure
+--- gnupg-2.3.8.orig/configure	2022-10-13 17:56:41.000000000 +0200
++++ gnupg-2.3.8/configure	2022-10-22 15:45:44.541933579 +0200
+@@ -9004,7 +9004,7 @@
+ 
+   if test $ok = yes; then
+     LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
+-    LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
++    LIBASSUAN_LIBS="-lassuan -lgpg-error"
+     have_libassuan=yes
+   else
+     LIBASSUAN_CFLAGS=""
+@@ -9183,7 +9183,7 @@
+   fi
+   if test $ok = yes; then
+     KSBA_CFLAGS=`$KSBA_CONFIG --cflags`
+-    KSBA_LIBS=`$KSBA_CONFIG --libs`
++    KSBA_LIBS="-lksba -lgpg-error -lnpth"
+     have_ksba=yes
+     if test -z "$use_gpgrt_config"; then
+       libksba_config_host=`$KSBA_CONFIG --host 2>/dev/null || echo none`
-- 
cgit v1.2.3