1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
diff -ru whois-5.5.20.orig/utils.h whois-5.5.20/utils.h
--- whois-5.5.20.orig/utils.h 2023-11-10 15:26:16.000000000 +0100
+++ whois-5.5.20/utils.h 2023-11-15 21:34:41.481060178 +0100
@@ -64,7 +64,7 @@
#endif
/* Prototypes */
-void *MALLOC_FREE NONNULL do_nofail(void *ptr, const char *file, const int line)
+void * NONNULL do_nofail(void *ptr, const char *file, const int line)
;
char **merge_args(char *args, char *argv[], int *argc);
--- whois-5.5.7/Makefile.orig 2020-10-03 16:43:15.000000000 +0100
+++ whois-5.5.7/Makefile 2021-01-23 07:55:24.889153830 +0000
@@ -42,12 +42,12 @@
$(error Please fix your build system to stop defining HAVE_LIBIDN!)
endif
-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)
+ifeq ($(shell ${PKG_CONFIG} --exists 'libidn2 >= 2.0.3' || echo NO),)
+whois_LDADD += $(shell ${PKG_CONFIG} --libs-only-l libidn2)
+DEFS += -DHAVE_LIBIDN2 $(shell ${PKG_CONFIG} --cflags-only-other libidn2)
+else ifeq ($(shell ${PKG_CONFIG} --exists 'libidn' || echo NO),)
+whois_LDADD += $(shell ${PKG_CONFIG} --libs-only-l libidn)
+DEFS += -DHAVE_LIBIDN $(shell ${PKG_CONFIG} --cflags-only-other libidn)
endif
ifdef HAVE_ICONV
@@ -72,7 +72,7 @@
CPPFLAGS += $(DEFS) $(INCLUDES)
##############################################################################
-all: Makefile.depend whois mkpasswd pos
+all: Makefile.depend whois mkpasswd
##############################################################################
%.o: %.c
@@ -121,7 +121,7 @@
nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois
##############################################################################
-install: install-whois install-mkpasswd install-pos install-bashcomp
+install: install-whois install-mkpasswd install-bashcomp
install-whois: whois
$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
|
