From 796b240d958f2c402f041f654541a67a6ef3c3dd Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Mar 03 2023 08:56:08 +0000 Subject: groups/241.native_packages_inet.group: whois: bump to v5.5.16 Signed-off-by: Ørjan Malde --- diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index d96fa2a..200e4c2 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -263,8 +263,8 @@ mutt_cv_regex_broken=no"}; : ${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:=dfe727fc69f60817caee55c620c2976de1559f3489ecd33faa823bf71052aeda}; -: ${PKG_WHOIS_VERSION:=5.5.15}; +: ${PKG_WHOIS_SHA256SUM:=3030a70a6f03acfb3dda86498bcfb1d6581201d64677c7da371267c5f3847afb}; +: ${PKG_WHOIS_VERSION:=5.5.16}; : ${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.15.local.patch b/patches/whois-5.5.15.local.patch deleted file mode 100644 index 432f7fa..0000000 --- a/patches/whois-5.5.15.local.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- 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: install-whois install-mkpasswd - - install-whois: whois - $(INSTALL) -d $(BASEDIR)$(prefix)/bin/ -@@ -137,9 +137,6 @@ - $(INSTALL) -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/ - $(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/ - --install-pos: -- cd po && $(MAKE) install -- - distclean: clean - rm -f po/whois.pot - -@@ -148,9 +145,6 @@ - new_gtlds.h tld_serv.h servers_charset.h *.o whois mkpasswd - rm -f po/*.mo - --pos: -- cd po && $(MAKE) -- - depend: Makefile.depend - Makefile.depend: - $(CC) $(CPPFLAGS) $(CFLAGS) -MM -MG *.c > $@ diff --git a/patches/whois-5.5.16.local.patch b/patches/whois-5.5.16.local.patch new file mode 100644 index 0000000..a1a6945 --- /dev/null +++ b/patches/whois-5.5.16.local.patch @@ -0,0 +1,39 @@ +--- 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/