Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #14084 from neheb/who

Browse source 
whois: fix noidn patch
This commit is contained in:
Rosen Penev 2020-11-30 00:48:12 -08:00 committed by GitHub
commit ac7973dc48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/whois/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=whois PKG_NAME:=whois
PKG_VERSION:=5.5.7 PKG_VERSION:=5.5.7
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/w/whois PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/w/whois

2
utils/whois/patches/010-no-crypt.patch
View file

@ -2,7 +2,7 @@
+++ b/Makefile +++ b/Makefile
@@ -56,8 +56,6 @@ DEFS += -DHAVE_ICONV @@ -56,8 +56,6 @@ DEFS += -DHAVE_ICONV
endif endif
ifeq ($(shell $(PKG_CONFIG) --exists 'libxcrypt >= 4.1' || echo NO),) ifeq ($(shell $(PKG_CONFIG) --exists 'libxcrypt >= 4.1' || echo NO),)
-DEFS += -DHAVE_CRYPT_H -DHAVE_LINUX_CRYPT_GENSALT $(shell $(PKG_CONFIG) --cflags libcrypt) -DEFS += -DHAVE_CRYPT_H -DHAVE_LINUX_CRYPT_GENSALT $(shell $(PKG_CONFIG) --cflags libcrypt)
-mkpasswd_LDADD += $(shell $(PKG_CONFIG) --libs libcrypt) -mkpasswd_LDADD += $(shell $(PKG_CONFIG) --libs libcrypt)

18
utils/whois/patches/020-no-idn2.patch
View file

@ -1,11 +1,17 @@
--- a/Makefile --- a/Makefile
+++ b/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 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) -whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2)
-DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2) -DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2)
else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),) -else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),)
whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn) -whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn)
DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn) -DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn)
-endif
-
ifdef HAVE_ICONV
whois_OBJECTS += simple_recode.o
DEFS += -DHAVE_ICONV

2
utils/whois/patches/030-no-mkpasswd.patch
View file

@ -1,6 +1,6 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -72,7 +72,7 @@ endif @@ -62,7 +62,7 @@ endif
CPPFLAGS += $(DEFS) $(INCLUDES) CPPFLAGS += $(DEFS) $(INCLUDES)
############################################################################## ##############################################################################