whois: update to 5.5.20

- Refresh patches

Signed-off-by: krant <redacted>

diff --git a/utils/whois/Makefile b/utils/whois/Makefile
index 0fa689fbc9cafb7944ab69d7e3407fd205696152..daa3669067e09e32568865a73397b71fac5a3ffe 100644 (file)
--- a/utils/whois/Makefile
+++ b/utils/whois/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=whois
-PKG_VERSION:=5.5.10
+PKG_VERSION:=5.5.20
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/w/whois
-PKG_HASH:=2391037b079695d0e9fd3c85ab021809a539cf093d25b6c51ca65019a54158dd
+PKG_HASH:=42085102dfad82067abe2d5d1cfca59586573dee528718559b022e762bb85cf1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 PKG_BUILD_DEPENDS:=perl/host

diff --git a/utils/whois/patches/010-no-mkpasswd.patch b/utils/whois/patches/010-no-mkpasswd.patch
index 93860a5814528501992ef34124c2980e98bb8f64..74bce39d85370180376f176befd9c943f6479b81 100644 (file)
--- a/utils/whois/patches/010-no-mkpasswd.patch
+++ b/utils/whois/patches/010-no-mkpasswd.patch
@@ -1,7 +1,7 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -72,7 +72,7 @@ endif
- CPPFLAGS += $(DEFS) $(INCLUDES)
+@@ -75,7 +75,7 @@ CPPFLAGS += $(DEFS) $(INCLUDES)
+ BASHCOMPDIR ?= $(shell $(PKG_CONFIG) --variable=completionsdir bash-completion 2>/dev/null || echo /etc/bash_completion.d)
  
  ##############################################################################
 -all: Makefile.depend whois mkpasswd pos
@@ -13,7 +13,7 @@
        nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois
  
  ##############################################################################
--install: install-whois install-mkpasswd install-pos
+-install: install-whois install-mkpasswd install-pos install-bashcomp
 +install: install-whois
  
  install-whois: whois

diff --git a/utils/whois/patches/020-no-idn2.patch b/utils/whois/patches/020-no-idn2.patch
index 096650c80726e24ebc75edde071a4277b9c37288..feefa4d4e80b5561a263f08b212717b130403c29 100644 (file)
--- a/utils/whois/patches/020-no-idn2.patch
+++ b/utils/whois/patches/020-no-idn2.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -42,14 +42,6 @@ ifdef HAVE_LIBIDN
+@@ -43,14 +43,6 @@ ifdef HAVE_LIBIDN
  $(error Please fix your build system to stop defining HAVE_LIBIDN!)
  endif