From 02565daa2679a520ec7124786104bec1a61a99bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Mon, 11 Mar 2024 12:03:09 +0100
Subject: groups.d/241.native_packages_inet.group: whois: bump to v5.5.21
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 groups.d/241.native_packages_inet.group |  4 +--
 patches/whois-5.5.20.local.patch        | 51 ---------------------------------
 patches/whois-5.5.21.local.patch        | 51 +++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 patches/whois-5.5.20.local.patch
 create mode 100644 patches/whois-5.5.21.local.patch

diff --git a/groups.d/241.native_packages_inet.group b/groups.d/241.native_packages_inet.group
index 7e141818..35ce6d28 100644
--- a/groups.d/241.native_packages_inet.group
+++ b/groups.d/241.native_packages_inet.group
@@ -272,8 +272,8 @@ ac_cv_path_GPGRT_CONFIG=${PREFIX_NATIVE}/bin/gpgrt-config"};
 : ${PKG_WGET2_VERSION:=2.0.1};
 : ${PKG_WGET2_URL:=https://ftp.gnu.org/gnu/wget/wget2-${PKG_WGET2_VERSION}.tar.gz};
 : ${PKG_WHOIS_DEPENDS:="libidn2"};
-: ${PKG_WHOIS_SHA256SUM:=e7674972682d805488198c3345be3f1faddf94656cd0d24876826cd802ddd86c};
-: ${PKG_WHOIS_VERSION:=5.5.20};
+: ${PKG_WHOIS_SHA256SUM:=4366a1c5e0e3e3e696de833bfa2620f8107d8fec9fc044c4a616eb805b08cc77};
+: ${PKG_WHOIS_VERSION:=5.5.21};
 : ${PKG_WHOIS_URL:=https://github.com/rfc1036/whois/archive/v${PKG_WHOIS_VERSION}.tar.gz};
 : ${PKG_WHOIS_IN_TREE:=1};
 : ${PKG_WHOIS_CFLAGS_BUILD:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}};
diff --git a/patches/whois-5.5.20.local.patch b/patches/whois-5.5.20.local.patch
deleted file mode 100644
index 0536845c..00000000
--- a/patches/whois-5.5.20.local.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ru whois-5.5.20.orig/utils.h whois-5.5.20/utils.h
---- whois-5.5.20.orig/utils.h   2023-11-10 15:26:16.000000000 +0100
-+++ whois-5.5.20/utils.h        2023-11-15 21:34:41.481060178 +0100
-@@ -64,7 +64,7 @@
- #endif
-
- /* Prototypes */
--void *MALLOC_FREE NONNULL do_nofail(void *ptr, const char *file, const int line)
-+void * NONNULL do_nofail(void *ptr, const char *file, const int line)
- ;
- char **merge_args(char *args, char *argv[], int *argc);
-
---- whois-5.5.7/Makefile.orig	2020-10-03 16:43:15.000000000 +0100
-+++ whois-5.5.7/Makefile	2021-01-23 07:55:24.889153830 +0000
-@@ -42,12 +42,12 @@
- $(error Please fix your build system to stop defining HAVE_LIBIDN!)
- endif
- 
--ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),)
--whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2)
--DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2)
--else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),)
--whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn)
--DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn)
-+ifeq ($(shell ${PKG_CONFIG} --exists 'libidn2 >= 2.0.3' || echo NO),)
-+whois_LDADD += $(shell ${PKG_CONFIG} --libs libidn2)
-+DEFS += -DHAVE_LIBIDN2 $(shell ${PKG_CONFIG} --cflags libidn2)
-+else ifeq ($(shell ${PKG_CONFIG} --exists 'libidn' || echo NO),)
-+whois_LDADD += $(shell ${PKG_CONFIG} --libs libidn)
-+DEFS += -DHAVE_LIBIDN $(shell ${PKG_CONFIG} --cflags libidn)
- endif
- 
- ifdef HAVE_ICONV
-@@ -72,7 +72,7 @@
- CPPFLAGS += $(DEFS) $(INCLUDES)
- 
- ##############################################################################
--all: Makefile.depend whois mkpasswd pos
-+all: Makefile.depend whois mkpasswd
- 
- ##############################################################################
- %.o: %.c
-@@ -121,7 +121,7 @@
- 	nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois
- 
- ##############################################################################
--install: install-whois install-mkpasswd install-pos install-bashcomp
-+install: install-whois install-mkpasswd install-bashcomp
- 
- install-whois: whois
- 	$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
diff --git a/patches/whois-5.5.21.local.patch b/patches/whois-5.5.21.local.patch
new file mode 100644
index 00000000..09cde92c
--- /dev/null
+++ b/patches/whois-5.5.21.local.patch
@@ -0,0 +1,51 @@
+diff -ru whois-5.5.20.orig/utils.h whois-5.5.20/utils.h
+--- whois-5.5.20.orig/utils.h   2023-11-10 15:26:16.000000000 +0100
++++ whois-5.5.20/utils.h        2023-11-15 21:34:41.481060178 +0100
+@@ -64,7 +64,7 @@
+ #endif
+
+ /* Prototypes */
+-void *MALLOC_FREE NONNULL do_nofail(void *ptr, const char *file, const int line)
++void * NONNULL do_nofail(void *ptr, const char *file, const int line)
+ ;
+ char **merge_args(char *args, char *argv[], int *argc);
+
+--- whois-5.5.7/Makefile.orig	2020-10-03 16:43:15.000000000 +0100
++++ whois-5.5.7/Makefile	2021-01-23 07:55:24.889153830 +0000
+@@ -42,12 +42,12 @@
+ $(error Please fix your build system to stop defining HAVE_LIBIDN!)
+ endif
+ 
+-ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),)
+-whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2)
+-DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2)
+-else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),)
+-whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn)
+-DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn)
++ifeq ($(shell ${PKG_CONFIG} --exists 'libidn2 >= 2.0.3' || echo NO),)
++whois_LDADD += $(shell ${PKG_CONFIG} --libs-only-l libidn2)
++DEFS += -DHAVE_LIBIDN2 $(shell ${PKG_CONFIG} --cflags-only-other libidn2)
++else ifeq ($(shell ${PKG_CONFIG} --exists 'libidn' || echo NO),)
++whois_LDADD += $(shell ${PKG_CONFIG} --libs-only-l libidn)
++DEFS += -DHAVE_LIBIDN $(shell ${PKG_CONFIG} --cflags-only-other libidn)
+ endif
+ 
+ ifdef HAVE_ICONV
+@@ -72,7 +72,7 @@
+ CPPFLAGS += $(DEFS) $(INCLUDES)
+ 
+ ##############################################################################
+-all: Makefile.depend whois mkpasswd pos
++all: Makefile.depend whois mkpasswd
+ 
+ ##############################################################################
+ %.o: %.c
+@@ -121,7 +121,7 @@
+ 	nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois
+ 
+ ##############################################################################
+-install: install-whois install-mkpasswd install-pos install-bashcomp
++install: install-whois install-mkpasswd install-bashcomp
+ 
+ install-whois: whois
+ 	$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
-- 
cgit v1.2.3