whois: fix compilation with glibc

Just don't install mkpasswd at all. It's not used and causes problems.

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

diff --git a/utils/whois/Makefile b/utils/whois/Makefile
index ae4a86395b4522b44e6afab779afb8d2ff5fb225..fb335f7d3993dddd35026863251fa85d2d3db95a 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:=2
+PKG_RELEASE:=3
 
 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
deleted file mode 100644 (file)
index 36e5835..0000000
--- a/utils/whois/patches/010-no-crypt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ 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)
- else ifdef HAVE_XCRYPT
- DEFS += -DHAVE_XCRYPT_H -DHAVE_LINUX_CRYPT_GENSALT
- mkpasswd_LDADD += -lxcrypt

diff --git a/utils/whois/patches/010-no-mkpasswd.patch b/utils/whois/patches/010-no-mkpasswd.patch
new file mode 100644 (file)
index 0000000..93860a5
--- /dev/null
+++ b/utils/whois/patches/010-no-mkpasswd.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -72,7 +72,7 @@ endif
+ CPPFLAGS += $(DEFS) $(INCLUDES)
+ 
+ ##############################################################################
+-all: Makefile.depend whois mkpasswd pos
++all: Makefile.depend whois
+ 
+ ##############################################################################
+ %.o: %.c
+@@ -121,7 +121,7 @@ afl-run:
+       nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois
+ 
+ ##############################################################################
+-install: install-whois install-mkpasswd install-pos
++install: install-whois
+ 
+ install-whois: whois
+       $(INSTALL) -d $(BASEDIR)$(prefix)/bin/

diff --git a/utils/whois/patches/030-no-mkpasswd.patch b/utils/whois/patches/030-no-mkpasswd.patch
deleted file mode 100644 (file)
index aa03be6..0000000
--- a/utils/whois/patches/030-no-mkpasswd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -62,7 +62,7 @@ endif
- CPPFLAGS += $(DEFS) $(INCLUDES)
- 
- ##############################################################################
--all: Makefile.depend whois mkpasswd pos
-+all: Makefile.depend whois pos
- 
- ##############################################################################
- %.o: %.c