From 10c93db20acc9820e71394c5239608c352b1cbf9 Mon Sep 17 00:00:00 2001
From: EWouters <6179932+EWouters@users.noreply.github.com>
Date: Sat, 2 Sep 2023 16:18:14 +0200
Subject: [PATCH] Ports/gnupg: Update gnupg to version 2.4.3

The patch was upstreamed :^). Includes a fix to find libksba.
---
 Ports/AvailablePorts.md                       |  2 +-
 Ports/gnupg/package.sh                        |  5 +++--
 .../patches/0001-Link-against-libiconv.patch  | 22 -------------------
 Ports/gnupg/patches/ReadMe.md                 |  7 ------
 4 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 Ports/gnupg/patches/0001-Link-against-libiconv.patch
 delete mode 100644 Ports/gnupg/patches/ReadMe.md

diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 68f0db666a..7eaeb174d0 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -105,7 +105,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`gn`](gn/)                                         | GN Meta Build System                                            | 2023.07.12                | https://gn.googlesource.com/gn/                                                |
 | [`gnuapl`](gnuapl/)                                 | GNU APL                                                         | 1.8                       | https://www.gnu.org/software/apl/                                              |
 | [`gnucobol`](gnucobol/)                             | GnuCOBOL                                                        | 3.1.2                     | https://gnucobol.sourceforge.io/                                               |
-| [`gnupg`](gnupg/)                                   | GnuPG                                                           | 2.3.0                     | https://gnupg.org/software/index.html                                          |
+| [`gnupg`](gnupg/)                                   | GnuPG                                                           | 2.4.3                     | https://gnupg.org/software/index.html                                          |
 | [`gnuplot`](gnuplot/)                               | Gnuplot                                                         | 5.4.8                     | http://www.gnuplot.info/                                                       |
 | [`gperf`](gperf/)                                   | GNU gperf                                                       | 3.1                       | https://www.gnu.org/software/gperf/                                            |
 | [`grep`](grep/)                                     | GNU Grep                                                        | 3.10                      | https://www.gnu.org/software/grep/                                             |
diff --git a/Ports/gnupg/package.sh b/Ports/gnupg/package.sh
index 55fd8f687e..bcfdb9b873 100755
--- a/Ports/gnupg/package.sh
+++ b/Ports/gnupg/package.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port='gnupg'
-version='2.3.0'
+version='2.4.3'
 useconfigure='true'
 use_fresh_config_sub='true'
 config_sub_paths=(
     'build-aux/config.sub'
 )
 files=(
-    "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2#84c1ef39e8621cfb70f31463a5d1d8edeab44332bc1e0e1af9b78b6f9ed05bb4"
+    "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2#a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d"
 )
 depends=(
     'libassuan'
@@ -31,6 +31,7 @@ configure() {
         --build="$("${workdir}/build-aux/config.guess")" \
         --with-libgpg-error-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
         --with-libgcrypt-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
+        --with-ksba-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
         --with-libassuan-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
         --with-ntbtls-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
         --with-npth-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
diff --git a/Ports/gnupg/patches/0001-Link-against-libiconv.patch b/Ports/gnupg/patches/0001-Link-against-libiconv.patch
deleted file mode 100644
index f6183757c9..0000000000
--- a/Ports/gnupg/patches/0001-Link-against-libiconv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
-Date: Sun, 9 Apr 2023 11:48:19 +0200
-Subject: [PATCH] Link against libiconv
-
----
- sm/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sm/Makefile.in b/sm/Makefile.in
-index 06c15db5b91d89dba33168436e4e316533a012f5..c1b9f936aee31b4f515bc94ba2819a09180c74af 100644
---- a/sm/Makefile.in
-+++ b/sm/Makefile.in
-@@ -554,7 +554,7 @@ module_tests =
- module_maint_tests = t-minip12
- t_common_src = 
- t_common_ldadd = $(libcommon) $(LIBGCRYPT_LIBS) $(KSBA_LIBS) \
--                 $(GPG_ERROR_LIBS) $(LIBINTL)
-+                 $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
- 
- t_minip12_CFLAGS = -DWITHOUT_NPTH=1 \
- 	           $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
diff --git a/Ports/gnupg/patches/ReadMe.md b/Ports/gnupg/patches/ReadMe.md
deleted file mode 100644
index 3985f3692c..0000000000
--- a/Ports/gnupg/patches/ReadMe.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Patches for gnupg on SerenityOS
-
-## `0001-Link-against-libiconv.patch`
-
-Link against libiconv
-
-