[PATCH] gnupg: Update to version 2.4.8

[Adolf Belka <adolf.belka@ipfire.org>]

- Update from version 1.4.23 (2018) to 2.4.8 (2025)
- The old 1.4 branch is left available for users that have old documents stored that
   required PGP-2.6 support for decryption. As PGP-2.6 has been obsolete for a long time
   it is not in gnupg-2.4 branch.
- IPFire is not using pgp-2.6 for the addon and update packages. Therefore version 1.4.23
   is not required.
- This patch updates gnupg to the current released branch. This branch requires
   libassuan, libksba and npth libraries to be available for both the build and run time
   stages. keyboxd is required for the key import stage. Additional patches are in this
   set for the above changes
- This update was tested out on my vm. I built the updated gnupg in a CU198 version.
   This was then installed and 11 addons successfully installed. Then the install was
   successfully updated to CU199 (unstable). Then a further 3 addons were successfully
   installed. In both versions the list updates also occurred successfully.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/gnupg | 106 +++++++++++++++++++++++++++++++---
 lfs/gnupg                     |  11 ++--
 2 files changed, 104 insertions(+), 13 deletions(-)

diff --git a/config/rootfiles/common/gnupg b/config/rootfiles/common/gnupg
index 5b16f0326..5deaadcf7 100644
--- a/config/rootfiles/common/gnupg
+++ b/config/rootfiles/common/gnupg
@@ -1,15 +1,103 @@
+#usr/bin/dirmngr
+#usr/bin/dirmngr-client
 usr/bin/gpg
-#usr/bin/gpg-zip
+#usr/bin/gpg-agent
+#usr/bin/gpg-card
+#usr/bin/gpg-connect-agent
+#usr/bin/gpg-mail-tube
+#usr/bin/gpg-wks-client
+#usr/bin/gpg-wks-server
+#usr/bin/gpgconf
+#usr/bin/gpgparsemail
+#usr/bin/gpgscm
+#usr/bin/gpgsm
 #usr/bin/gpgsplit
+#usr/bin/gpgtar
 #usr/bin/gpgv
-#usr/lib/gnupg
-usr/lib/gnupg/gpgkeys_curl
-usr/lib/gnupg/gpgkeys_finger
-usr/lib/gnupg/gpgkeys_hkp
+#usr/bin/kbxutil
+#usr/bin/watchgnupg
+#usr/lib/dirmngr_ldap
+#usr/lib/gpg-auth
+#usr/lib/gpg-check-pattern
+#usr/lib/gpg-pair-tool
+#usr/lib/gpg-preset-passphrase
+#usr/lib/gpg-protect-tool
+#usr/lib/gpg-wks-client
+usr/lib/keyboxd
+#usr/lib/scdaemon
+#usr/sbin/addgnupghome
+#usr/sbin/applygnupgdefaults
+#usr/share/doc/gnupg
+#usr/share/doc/gnupg/DCO
+#usr/share/doc/gnupg/DETAILS
+#usr/share/doc/gnupg/FAQ
+#usr/share/doc/gnupg/HACKING
+#usr/share/doc/gnupg/KEYSERVER
+#usr/share/doc/gnupg/OpenPGP
+#usr/share/doc/gnupg/README
+#usr/share/doc/gnupg/TRANSLATE
+#usr/share/doc/gnupg/examples
+#usr/share/doc/gnupg/examples/README
+#usr/share/doc/gnupg/examples/common.conf
+#usr/share/doc/gnupg/examples/gpgconf.conf
+#usr/share/doc/gnupg/examples/gpgconf.rnames
+#usr/share/doc/gnupg/examples/pwpattern.list
+#usr/share/doc/gnupg/examples/qualified.txt
+#usr/share/doc/gnupg/examples/scd-event
+#usr/share/doc/gnupg/examples/trustlist.txt
 #usr/share/gnupg
-#usr/share/gnupg/FAQ
-#usr/share/gnupg/options.skel
-#usr/share/info/gnupg1.info
-#usr/share/man/man1/gpg-zip.1
+#usr/share/gnupg/distsigkey.gpg
+#usr/share/gnupg/help.be.txt
+#usr/share/gnupg/help.ca.txt
+#usr/share/gnupg/help.cs.txt
+#usr/share/gnupg/help.da.txt
+#usr/share/gnupg/help.de.txt
+#usr/share/gnupg/help.el.txt
+#usr/share/gnupg/help.eo.txt
+#usr/share/gnupg/help.es.txt
+#usr/share/gnupg/help.et.txt
+#usr/share/gnupg/help.fi.txt
+#usr/share/gnupg/help.fr.txt
+#usr/share/gnupg/help.gl.txt
+#usr/share/gnupg/help.hu.txt
+#usr/share/gnupg/help.id.txt
+#usr/share/gnupg/help.it.txt
+#usr/share/gnupg/help.ja.txt
+#usr/share/gnupg/help.nb.txt
+#usr/share/gnupg/help.pl.txt
+#usr/share/gnupg/help.pt.txt
+#usr/share/gnupg/help.pt_BR.txt
+#usr/share/gnupg/help.ro.txt
+#usr/share/gnupg/help.ru.txt
+#usr/share/gnupg/help.sk.txt
+#usr/share/gnupg/help.sv.txt
+#usr/share/gnupg/help.tr.txt
+#usr/share/gnupg/help.txt
+#usr/share/gnupg/help.zh_CN.txt
+#usr/share/gnupg/help.zh_TW.txt
+#usr/share/gnupg/sks-keyservers.netCA.pem
+#usr/share/info/gnupg.info
+#usr/share/info/gnupg.info-1
+#usr/share/info/gnupg.info-2
+#usr/share/info/gnupg.info-3
+#usr/share/man/man1/dirmngr-client.1
+#usr/share/man/man1/gpg-agent.1
+#usr/share/man/man1/gpg-card.1
+#usr/share/man/man1/gpg-check-pattern.1
+#usr/share/man/man1/gpg-connect-agent.1
+#usr/share/man/man1/gpg-mail-tube.1
+#usr/share/man/man1/gpg-preset-passphrase.1
+#usr/share/man/man1/gpg-wks-client.1
+#usr/share/man/man1/gpg-wks-server.1
 #usr/share/man/man1/gpg.1
+#usr/share/man/man1/gpgconf.1
+#usr/share/man/man1/gpgparsemail.1
+#usr/share/man/man1/gpgsm.1
+#usr/share/man/man1/gpgtar.1
 #usr/share/man/man1/gpgv.1
+#usr/share/man/man1/scdaemon.1
+#usr/share/man/man1/watchgnupg.1
+#usr/share/man/man7/gnupg.7
+#usr/share/man/man8/addgnupghome.8
+#usr/share/man/man8/applygnupgdefaults.8
+#usr/share/man/man8/dirmngr.8
diff --git a/lfs/gnupg b/lfs/gnupg
index cf6a86b8b..653ff8bcb 100644
--- a/lfs/gnupg
+++ b/lfs/gnupg
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.23
+VER        = 2.4.8
 
 THISAPP    = gnupg-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e
+$(DL_FILE)_BLAKE2 = ab7126aac6c7bf323075c68084c963f75d93c729d8918b6ca10ef0a4466879636433c682a5437776d2ce9f5d432e1f66995dd94a4f44d7f184542f030087dbb2
 
 install : $(TARGET)
 
@@ -74,7 +74,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
 	rm -rf /home/nobody/.gnupg /root/.gnupg
-	cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib --disable-nls
+	cd $(DIR_APP) && ./configure \
+				--prefix=/usr \
+				--libexecdir=/usr/lib \
+				--disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	chmod -v 755 /usr/bin/gpg
-- 
2.51.2