From: Daniel Golle <redacted>
Date: Sat, 26 Apr 2025 03:01:28 +0000 (+0100)
Subject: gnupg2: update to version 2.4.7
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a52e843d83d86c078cb130f907d6c75caef7f507;p=openwrt-packages.git

gnupg2: update to version 2.4.7

A very long list of changes, see
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=NEWS;hb=7bdaf56479918806ea4013df0ba2dd24bbbb35d6

dirmngr now requires either GnuTLS or NTBTLS. Build against GnuTLS.
Add missing PACKAGE_MAINTAINER while at it.

Signed-off-by: Daniel Golle <redacted>
---

diff --git a/utils/gnupg2/Makefile b/utils/gnupg2/Makefile
index 5982d3d1d..00267c4d0 100644
--- a/utils/gnupg2/Makefile
+++ b/utils/gnupg2/Makefile
@@ -8,13 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnupg
-PKG_VERSION:=2.2.39
+PKG_VERSION:=2.4.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/gnupg
-PKG_HASH:=ab74db6685f026d7c0a10b527ecddecd608606a1691d15fda5d0a7f7d27e4c2f
+PKG_HASH:=7b24706e4da7e0e3b06ca068231027401f238102c41c909631349dcc3b85eb46
 
+PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING COPYING.CC0 COPYING.GPL2 COPYING.LGPL21 COPYING.LGPL3 COPYING.other
 PKG_CPE_ID:=cpe:/a:gnupg:gnupg
@@ -25,6 +26,8 @@ PKG_BUILD_PARALLEL:=1
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
+CONFIGURE_VARS += ac_cv_path_GPGRT_CONFIG="$(STAGING_DIR)/usr/bin/gpgrt-config"
+
 define Package/gnupg2/Default
   SECTION:=utils
   CATEGORY:=Utilities
@@ -49,6 +52,7 @@ endef
 define Package/gnupg2-dirmngr
   $(call Package/gnupg2/Default)
   TITLE:=Keyserver, CRL, and OCSP access for GnuPG (version 2)
+  DEPENDS+=+libgnutls
 endef
 
 define Package/gnupg2-utils
@@ -92,11 +96,10 @@ CONFIGURE_ARGS += \
 	--with-libassuan-prefix="$(STAGING_DIR)/usr/" \
 	--with-ksba-prefix="$(STAGING_DIR)/usr/" \
 	--with-npth-prefix="$(STAGING_DIR)/usr/" \
-	--enable-dirmngr \
+	--disable-doc \
 	--disable-bzip2 \
 	--disable-card-support \
 	--disable-ccid-driver \
-	--disable-gnutls \
 	--disable-ldap \
 	--disable-ntbtls \
 	--disable-rpath \