|
|
e27db9 |
diff -ru whois-5.5.20.orig/utils.h whois-5.5.20/utils.h
|
|
|
e27db9 |
--- whois-5.5.20.orig/utils.h 2023-11-10 15:26:16.000000000 +0100
|
|
|
e27db9 |
+++ whois-5.5.20/utils.h 2023-11-15 21:34:41.481060178 +0100
|
|
|
e27db9 |
@@ -64,7 +64,7 @@
|
|
|
e27db9 |
#endif
|
|
|
e27db9 |
|
|
|
e27db9 |
/* Prototypes */
|
|
|
e27db9 |
-void *MALLOC_FREE NONNULL do_nofail(void *ptr, const char *file, const int line)
|
|
|
e27db9 |
+void * NONNULL do_nofail(void *ptr, const char *file, const int line)
|
|
|
e27db9 |
;
|
|
|
e27db9 |
char **merge_args(char *args, char *argv[], int *argc);
|
|
|
e27db9 |
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
--- whois-5.5.7/Makefile.orig 2020-10-03 16:43:15.000000000 +0100
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
+++ whois-5.5.7/Makefile 2021-01-23 07:55:24.889153830 +0000
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
@@ -42,12 +42,12 @@
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
$(error Please fix your build system to stop defining HAVE_LIBIDN!)
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
endif
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
-ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),)
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
-whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2)
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
-DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2)
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
-else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),)
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
-whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn)
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
-DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn)
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
+ifeq ($(shell ${PKG_CONFIG} --exists 'libidn2 >= 2.0.3' || echo NO),)
|
|
|
02565d |
+whois_LDADD += $(shell ${PKG_CONFIG} --libs-only-l libidn2)
|
|
|
02565d |
+DEFS += -DHAVE_LIBIDN2 $(shell ${PKG_CONFIG} --cflags-only-other libidn2)
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
+else ifeq ($(shell ${PKG_CONFIG} --exists 'libidn' || echo NO),)
|
|
|
02565d |
+whois_LDADD += $(shell ${PKG_CONFIG} --libs-only-l libidn)
|
|
|
02565d |
+DEFS += -DHAVE_LIBIDN $(shell ${PKG_CONFIG} --cflags-only-other libidn)
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
endif
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
ifdef HAVE_ICONV
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
@@ -72,7 +72,7 @@
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
CPPFLAGS += $(DEFS) $(INCLUDES)
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
##############################################################################
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
-all: Makefile.depend whois mkpasswd pos
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
+all: Makefile.depend whois mkpasswd
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
##############################################################################
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
%.o: %.c
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
@@ -121,7 +121,7 @@
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
##############################################################################
|
|
|
796b24 |
-install: install-whois install-mkpasswd install-pos install-bashcomp
|
|
|
796b24 |
+install: install-whois install-mkpasswd install-bashcomp
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
install-whois: whois
|
|
Lucio Andrés Illanes Albornoz |
7021b8 |
$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
|