From a1b4085de6becb7f15e4ec0b223ee2cf11887969 Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov Date: Tue, 3 Sep 2024 14:08:53 +0200 Subject: [PATCH] miniupnpd: Makefile: remove obsolete parts of libiptc detection If for some inexplicable reason there is no pkg-config in the system, we are able to detect libiptc 1.4.3+ in configure via testing for xtables.h, so the Gentoo-specific hack seems obsolete. --- miniupnpd/Makefile.linux | 14 -------------- miniupnpd/configure | 3 +-- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/miniupnpd/Makefile.linux b/miniupnpd/Makefile.linux index b291c48..f7648d2 100644 --- a/miniupnpd/Makefile.linux +++ b/miniupnpd/Makefile.linux @@ -72,20 +72,6 @@ NETFILTER_SCRIPTS = $(addprefix $(SRCDIR)/netfilter/, \ ip6tables_init.sh ip6tables_removeall.sh \ miniupnpd_functions.sh) -ifneq ($(IPTABLES_PCFILE_FOUND),1) - -ifeq "$(wildcard /etc/gentoo-release )" "" -LDLIBS ?= -liptc -else # gentoo -# the following is better, at least on gentoo with iptables 1.4.6 -# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1618 -# and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183 -LDLIBS ?= -lip4tc -CPPFLAGS := -DIPTABLES_143 $(CPPFLAGS) -endif - -endif # ifneq ($(IPTABLES_PCFILE_FOUND),1) - #LDLIBS += -lnfnetlink # OpenWrt packager disables https server for IGD v2 and hardcodes libuuid support diff --git a/miniupnpd/configure b/miniupnpd/configure index 5f5f093..320e7a0 100755 --- a/miniupnpd/configure +++ b/miniupnpd/configure @@ -609,10 +609,9 @@ case $FW in echo "#define USE_IPTABLES 1" >> ${CONFIGFILE} if [ "$PKG_CONFIG" ] ; then if pkg_detect --atleast-version=1.4.3 libiptc; then - echo "IPTABLES_PCFILE_FOUND = 1" >> ${CONFIG_MK} IPTABLES_143=1 elif pkg_detect libiptc; then - echo "IPTABLES_PCFILE_FOUND = 1" >> ${CONFIG_MK} + : else echo "Warning: no libiptc pkg-config found" fi