From 273923d5d2d57bbab7821f53cfe540b975862652 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 31 Dec 2020 15:12:36 -0800 Subject: [PATCH] whois: fix compilation with glibc Just don't install mkpasswd at all. It's not used and causes problems. Signed-off-by: Rosen Penev --- utils/whois/Makefile | 2 +- utils/whois/patches/010-no-crypt.patch | 11 ----------- utils/whois/patches/010-no-mkpasswd.patch | 20 ++++++++++++++++++++ utils/whois/patches/030-no-mkpasswd.patch | 11 ----------- 4 files changed, 21 insertions(+), 23 deletions(-) delete mode 100644 utils/whois/patches/010-no-crypt.patch create mode 100644 utils/whois/patches/010-no-mkpasswd.patch delete mode 100644 utils/whois/patches/030-no-mkpasswd.patch diff --git a/utils/whois/Makefile b/utils/whois/Makefile index ae4a86395b..fb335f7d39 100644 --- 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 index 36e5835cb5..0000000000 --- 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 index 0000000000..93860a5814 --- /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 index aa03be6827..0000000000 --- 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 -- 2.30.2