whois: fix noidn patch

If no idn2 but idn is present, it picks it up. Just remove the whole
thing.

Refreshed patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/utils/whois/Makefile b/utils/whois/Makefile
index 60d5e389e9073d76b49a2e5000b7477bdfd70fb1..ae4a86395b4522b44e6afab779afb8d2ff5fb225 100644 (file)
--- a/utils/whois/Makefile
+++ b/utils/whois/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=whois
 PKG_VERSION:=5.5.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/w/whois

diff --git a/utils/whois/patches/010-no-crypt.patch b/utils/whois/patches/010-no-crypt.patch
index ba6a40f6acede525f50aaae8fee22d32d682067b..36e5835cb58406fc70349eb0fff828bbc99c660d 100644 (file)
--- a/utils/whois/patches/010-no-crypt.patch
+++ b/utils/whois/patches/010-no-crypt.patch
@@ -2,7 +2,7 @@
 +++ b/Makefile
 @@ -56,8 +56,6 @@ DEFS += -DHAVE_ICONV
  endif
-
+ 
  ifeq ($(shell $(PKG_CONFIG) --exists 'libxcrypt >= 4.1' || echo NO),)
 -DEFS += -DHAVE_CRYPT_H -DHAVE_LINUX_CRYPT_GENSALT $(shell $(PKG_CONFIG) --cflags libcrypt)
 -mkpasswd_LDADD += $(shell $(PKG_CONFIG) --libs libcrypt)

diff --git a/utils/whois/patches/020-no-idn2.patch b/utils/whois/patches/020-no-idn2.patch
index e65ba6c00249a8d2273cd4edb39a5cb6a21a8438..096650c80726e24ebc75edde071a4277b9c37288 100644 (file)
--- a/utils/whois/patches/020-no-idn2.patch
+++ b/utils/whois/patches/020-no-idn2.patch
@@ -1,11 +1,17 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -43,8 +43,6 @@ $(error Please fix your build system to stop defining HAVE_LIBIDN!)
+@@ -42,14 +42,6 @@ ifdef HAVE_LIBIDN
+ $(error Please fix your build system to stop defining HAVE_LIBIDN!)
  endif
-
- ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),)
+ 
+-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)
+-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
+ whois_OBJECTS += simple_recode.o
+ DEFS += -DHAVE_ICONV

diff --git a/utils/whois/patches/030-no-mkpasswd.patch b/utils/whois/patches/030-no-mkpasswd.patch
index bdaa41a04d2ad0b029671bc7cfcabb2066a5ed58..aa03be682763185c9ebdb06f8e49e5bb716482fa 100644 (file)
--- a/utils/whois/patches/030-no-mkpasswd.patch
+++ b/utils/whois/patches/030-no-mkpasswd.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -72,7 +72,7 @@ endif
+@@ -62,7 +62,7 @@ endif
  CPPFLAGS += $(DEFS) $(INCLUDES)
  
  ##############################################################################