diff --git a/groups.d/241.native_packages_inet.d/whois.package b/groups.d/241.native_packages_inet.d/whois.package index ba34195..ba0a067 100644 --- a/groups.d/241.native_packages_inet.d/whois.package +++ b/groups.d/241.native_packages_inet.d/whois.package @@ -1,6 +1,6 @@ : ${PKG_WHOIS_DEPENDS:="libidn2"}; -: ${PKG_WHOIS_SHA256SUM:=b7de4288700951b141420e2b4408f0906eaf4e97409cf5043aee80ef4d31e2b4}; -: ${PKG_WHOIS_VERSION:=5.5.22}; +: ${PKG_WHOIS_SHA256SUM:=dcfc08f3362c74ec8ae30691941909ebccf0cb3d27da04236f7e2790dbc7757c}; +: ${PKG_WHOIS_VERSION:=5.5.23}; : ${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.22.local.patch b/patches/whois-5.5.22.local.patch deleted file mode 100644 index 6fb35b1..0000000 --- a/patches/whois-5.5.22.local.patch +++ /dev/null @@ -1,39 +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-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/ diff --git a/patches/whois-5.5.23.local.patch b/patches/whois-5.5.23.local.patch new file mode 100644 index 0000000..6fb35b1 --- /dev/null +++ b/patches/whois-5.5.23.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-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/