gurligebis 14/11/29 12:40:13 Added: miniupnpd-1.10-build.patch Removed: miniupnpd-1.9-build.patch Log: Bumping to 1.10_pre2014112 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 15AE484C)
Revision Changes Path 1.1 net-misc/miniupnpd/files/miniupnpd-1.10-build.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.10-build.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.10-build.patch?rev=1.1&content-type=text/plain Index: miniupnpd-1.10-build.patch =================================================================== --- a/Makefile.linux +++ b/Makefile.linux @@ -75,70 +75,10 @@ LDFLAGS += $(shell $(PKG_CONFIG) --libs- LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc) else -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 - -ARCH ?= $(shell uname -m | grep -q "x86_64" && echo 64) -ifdef IPTABLESPATH -CPPFLAGS := $(CPPFLAGS) -I$(IPTABLESPATH)/include/ -LDFLAGS := $(LDFLAFGS) -L$(IPTABLESPATH)/libiptc/ -# get iptables version and set IPTABLES_143 macro if needed -ifeq ($(TARGET_OPENWRT),) -IPTABLESVERSION := $(shell grep "\#define VERSION" $(IPTABLESPATH)/config.h | tr -d \" |cut -d" " -f3 ) -IPTABLESVERSION1 := $(shell echo $(IPTABLESVERSION) | cut -d. -f1 ) -IPTABLESVERSION2 := $(shell echo $(IPTABLESVERSION) | cut -d. -f2 ) -IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 ) -# test if iptables version >= 1.4.3 -TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 ) -ifeq ($(TEST), 1) -CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 -# the following sucks, but works -LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o -#LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a -else # ifeq ($(TEST), 1) -LDLIBS = $(IPTABLESPATH)/libiptc/libiptc.a -endif # ifeq ($(TEST), 1) -else # ($(TARGET_OPENWRT),) -# openWRT : -# check for system-wide iptables files. Test if iptables version >= 1.4.3 -# the following test has to be verified : -TEST := $(shell test -f /usr/include/iptables/internal.h && grep -q "\#define IPTABLES_VERSION" /usr/include/iptables/internal.h && echo 1) -ifeq ($(TEST), 1) -CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 -LDLIBS = -liptc -endif # ($(TEST), 1) -TEST_LIB := $(shell test -f /usr/lib$(ARCH)/libiptc.a && echo 1) -ifeq ($(TEST_LIB), 1) -LDLIBS = -liptc /usr/lib$(ARCH)/libiptc.a -endif # ($(TEST_LIB), 1) -endif # ($(TARGET_OPENWRT),) -else # ifdef IPTABLESPATH -# IPTABLESPATH not defined -# the following test has to be verified : -TEST := $(shell test -f /usr/include/xtables.h && grep -q "XTABLES_VERSION_CODE" /usr/include/xtables.h && echo 1) -ifeq ($(TEST), 1) -CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 -LDLIBS = -liptc -TESTIP4TC := $(shell test -f /lib/libip4tc.so && echo 1) -ifeq ($(TESTIP4TC), 1) -LDLIBS := $(LDLIBS) -lip4tc -endif # ($(TESTIP4TC), 1) -TESTIP6TC := $(shell test -f /lib/libip6tc.so && echo 1) -ifeq ($(TESTIP6TC), 1) -LDLIBS := $(LDLIBS) -lip6tc -endif # ($(TESTIP6TC), 1) -endif # ($(TEST), 1) -endif # ifdef IPTABLESPATH endif # ifdef PCFILE_FOUND -LDLIBS += -lnfnetlink +LDLIBS += -lip4tc -lnfnetlink +CPPFLAGS += -DIPTABLES_143 TEST := $(shell $(PKG_CONFIG) --atleast-version=1.0.2 libnetfilter_conntrack && $(PKG_CONFIG) --atleast-version=1.0.3 libmnl && echo 1) ifeq ($(TEST),1) @@ -184,7 +124,6 @@ install: miniupnpd miniupnpd.8 miniupnpd $(INSTALL) linux/miniupnpd.init.d.script $(DESTDIR)$(PREFIX)/etc/init.d/miniupnpd $(INSTALL) -d $(DESTDIR)$(MANINSTALLDIR) $(INSTALL) --mode=0644 miniupnpd.8 $(DESTDIR)$(MANINSTALLDIR) - gzip -f $(DESTDIR)$(MANINSTALLDIR)/miniupnpd.8 # genuuid is using the uuidgen CLI tool which is part of libuuid # from the e2fsprogs
