gurligebis 14/05/10 09:25:27
Added: miniupnpd-1.9-build.patch
miniupnpd-1.9-cleanup.patch
Removed: miniupnpd-1.8-build.patch
Log:
Bumping to 1.9_pre20140422 and seperating patch into upstream and
non-upstream part.
(Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key
15AE484C)
Revision Changes Path
1.1 net-misc/miniupnpd/files/miniupnpd-1.9-build.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.9-build.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.9-build.patch?rev=1.1&content-type=text/plain
Index: miniupnpd-1.9-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 $(DESTDIR)$(MANINSTALLDIR)/miniupnpd.8
# genuuid is using the uuidgen CLI tool which is part of libuuid
# from the e2fsprogs
1.1 net-misc/miniupnpd/files/miniupnpd-1.9-cleanup.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.9-cleanup.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.9-cleanup.patch?rev=1.1&content-type=text/plain
Index: miniupnpd-1.9-cleanup.patch
===================================================================
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -25,7 +25,7 @@
CFLAGS ?= -Os
CFLAGS += -fno-strict-aliasing
CFLAGS += -fno-common
-CFLAGS += -D_GNU_SOURCE
+CPPFLAGS += -D_GNU_SOURCE
CFLAGS += -Wall
CFLAGS += -Wextra -Wstrict-prototypes -Wdeclaration-after-statement
#CFLAGS += -Wno-missing-field-initializers
@@ -34,6 +34,7 @@ CC ?= gcc
RM = rm -f
INSTALL = install
STRIP ?= strip
+PKG_CONFIG ?= pkg-config
CP = cp
@@ -54,39 +55,39 @@ NETFILTEROBJS = netfilter/iptcrdr.o netf
ALLOBJS = $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
-PCFILE_FOUND := $(shell pkg-config --exists libiptc; echo $$?)
+PCFILE_FOUND := $(shell $(PKG_CONFIG) --exists libiptc; echo $$?)
ifeq (${PCFILE_FOUND},0)
-IPTABLESVERSION := $(shell pkg-config --modversion libiptc)
+IPTABLESVERSION := $(shell $(PKG_CONFIG) --modversion libiptc)
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)
-CFLAGS += -DIPTABLES_143
+CPPFLAGS += -DIPTABLES_143
endif
-CFLAGS += $(shell pkg-config --cflags libiptc)
-LIBS += $(shell pkg-config --static --libs-only-l libiptc)
-LDFLAGS += $(shell pkg-config --libs-only-L libiptc)
-LDFLAGS += $(shell pkg-config --libs-only-other libiptc)
+CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc)
+LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libiptc)
+LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libiptc)
+LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc)
else
ifeq "$(wildcard /etc/gentoo-release )" ""
-LIBS ?= -liptc
+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
-LIBS ?= -lip4tc
-CFLAGS := -DIPTABLES_143 $(CFLAGS)
+LDLIBS ?= -lip4tc
+CPPFLAGS := -DIPTABLES_143 $(CPPFLAGS)
endif
ARCH ?= $(shell uname -m | grep -q "x86_64" && echo 64)
ifdef IPTABLESPATH
-CFLAGS := $(CFLAGS) -I$(IPTABLESPATH)/include/
+CPPFLAGS := $(CPPFLAGS) -I$(IPTABLESPATH)/include/
LDFLAGS := $(LDFLAFGS) -L$(IPTABLESPATH)/libiptc/
# get iptables version and set IPTABLES_143 macro if needed
ifeq ($(TARGET_OPENWRT),)
@@ -97,12 +98,12 @@ IPTABLESVERSION3 := $(shell echo $(IPTAB
# 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)
-CFLAGS := $(CFLAGS) -DIPTABLES_143
+CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143
# the following sucks, but works
-LIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o
-#LIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a
+LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o
+#LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a
else # ifeq ($(TEST), 1)
-LIBS = $(IPTABLESPATH)/libiptc/libiptc.a
+LDLIBS = $(IPTABLESPATH)/libiptc/libiptc.a
endif # ifeq ($(TEST), 1)
else # ($(TARGET_OPENWRT),)
# openWRT :
@@ -110,12 +111,12 @@ else # ($(TARGET_OPENWRT),)
# 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)
-CFLAGS := $(CFLAGS) -DIPTABLES_143
-LIBS = -liptc
+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)
-LIBS = -liptc /usr/lib$(ARCH)/libiptc.a
+LDLIBS = -liptc /usr/lib$(ARCH)/libiptc.a
endif # ($(TEST_LIB), 1)
endif # ($(TARGET_OPENWRT),)
else # ifdef IPTABLESPATH
@@ -123,30 +124,30 @@ else # ifdef IPTABLESPATH
# 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)
-CFLAGS := $(CFLAGS) -DIPTABLES_143
-LIBS = -liptc
+CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143
+LDLIBS = -liptc
TESTIP4TC := $(shell test -f /lib/libip4tc.so && echo 1)
ifeq ($(TESTIP4TC), 1)
-LIBS := $(LIBS) -lip4tc
+LDLIBS := $(LDLIBS) -lip4tc
endif # ($(TESTIP4TC), 1)
TESTIP6TC := $(shell test -f /lib/libip6tc.so && echo 1)
ifeq ($(TESTIP6TC), 1)
-LIBS := $(LIBS) -lip6tc
+LDLIBS := $(LDLIBS) -lip6tc
endif # ($(TESTIP6TC), 1)
endif # ($(TEST), 1)
endif # ifdef IPTABLESPATH
endif # ifdef PCFILE_FOUND
-LIBS += -lnfnetlink
+LDLIBS += -lnfnetlink
-TEST := $(shell pkg-config --atleast-version=1.0.2 libnetfilter_conntrack &&
pkg-config --atleast-version=1.0.3 libmnl && echo 1)
+TEST := $(shell $(PKG_CONFIG) --atleast-version=1.0.2 libnetfilter_conntrack
&& $(PKG_CONFIG) --atleast-version=1.0.3 libmnl && echo 1)
ifeq ($(TEST),1)
-CFLAGS += -DUSE_NFCT
-LIBS += $(shell pkg-config --static --libs-only-l libmnl)
-LIBS += $(shell pkg-config --static --libs-only-l libnetfilter_conntrack)
+CPPFLAGS += -DUSE_NFCT
+LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libmnl)
+LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack)
endif # ($(TEST),1)
-LIBS += $(shell pkg-config --static --libs-only-l libssl)
+LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl)
TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
@@ -195,7 +196,7 @@ else
sed -i -e
"s/^uuid=[-0-9a-f]*/uuid=`($(STAGING_DIR_HOST)/bin/genuuid||$(STAGING_DIR_HOST)/bin/uuidgen||$(STAGING_DIR_HOST)/bin/uuid)
2>/dev/null`/" miniupnpd.conf
endif
-miniupnpd: $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS) $(LIBS)
+miniupnpd: $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
testupnpdescgen: $(TESTUPNPDESCGENOBJS)
@@ -205,13 +206,13 @@ testupnppermissions: testupnppermissions
testgetifaddr: testgetifaddr.o getifaddr.o
-testgetroute: testgetroute.o linux/getroute.o upnputils.o -lnfnetlink
+testgetroute: testgetroute.o linux/getroute.o upnputils.o
testasyncsendto: testasyncsendto.o asyncsendto.o upnputils.o \
- linux/getroute.o -lnfnetlink
+ linux/getroute.o
testportinuse: testportinuse.o portinuse.o getifaddr.o \
- netfilter/iptcrdr.o $(LIBS)
+ netfilter/iptcrdr.o
miniupnpdctl: miniupnpdctl.o
