| 1 |
gurligebis 14/11/29 12:40:13 |
| 2 |
|
| 3 |
Added: miniupnpd-1.10-build.patch |
| 4 |
Removed: miniupnpd-1.9-build.patch |
| 5 |
Log: |
| 6 |
Bumping to 1.10_pre2014112 |
| 7 |
|
| 8 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 15AE484C) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-misc/miniupnpd/files/miniupnpd-1.10-build.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.10-build.patch?rev=1.1&view=markup |
| 14 |
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 |
| 15 |
|
| 16 |
Index: miniupnpd-1.10-build.patch |
| 17 |
=================================================================== |
| 18 |
--- a/Makefile.linux |
| 19 |
+++ b/Makefile.linux |
| 20 |
@@ -75,70 +75,10 @@ LDFLAGS += $(shell $(PKG_CONFIG) --libs- |
| 21 |
LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc) |
| 22 |
else |
| 23 |
|
| 24 |
-ifeq "$(wildcard /etc/gentoo-release )" "" |
| 25 |
-LDLIBS ?= -liptc |
| 26 |
-else # gentoo |
| 27 |
-# the following is better, at least on gentoo with iptables 1.4.6 |
| 28 |
-# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1618 |
| 29 |
-# and http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=2183 |
| 30 |
-LDLIBS ?= -lip4tc |
| 31 |
-CPPFLAGS := -DIPTABLES_143 $(CPPFLAGS) |
| 32 |
-endif |
| 33 |
- |
| 34 |
-ARCH ?= $(shell uname -m | grep -q "x86_64" && echo 64) |
| 35 |
-ifdef IPTABLESPATH |
| 36 |
-CPPFLAGS := $(CPPFLAGS) -I$(IPTABLESPATH)/include/ |
| 37 |
-LDFLAGS := $(LDFLAFGS) -L$(IPTABLESPATH)/libiptc/ |
| 38 |
-# get iptables version and set IPTABLES_143 macro if needed |
| 39 |
-ifeq ($(TARGET_OPENWRT),) |
| 40 |
-IPTABLESVERSION := $(shell grep "\#define VERSION" $(IPTABLESPATH)/config.h | tr -d \" |cut -d" " -f3 ) |
| 41 |
-IPTABLESVERSION1 := $(shell echo $(IPTABLESVERSION) | cut -d. -f1 ) |
| 42 |
-IPTABLESVERSION2 := $(shell echo $(IPTABLESVERSION) | cut -d. -f2 ) |
| 43 |
-IPTABLESVERSION3 := $(shell echo $(IPTABLESVERSION) | cut -d. -f3 ) |
| 44 |
-# test if iptables version >= 1.4.3 |
| 45 |
-TEST := $(shell [ \( \( $(IPTABLESVERSION1) -ge 1 \) -a \( $(IPTABLESVERSION2) -ge 4 \) \) -a \( $(IPTABLESVERSION3) -ge 3 \) ] && echo 1 ) |
| 46 |
-ifeq ($(TEST), 1) |
| 47 |
-CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 |
| 48 |
-# the following sucks, but works |
| 49 |
-LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o |
| 50 |
-#LDLIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a |
| 51 |
-else # ifeq ($(TEST), 1) |
| 52 |
-LDLIBS = $(IPTABLESPATH)/libiptc/libiptc.a |
| 53 |
-endif # ifeq ($(TEST), 1) |
| 54 |
-else # ($(TARGET_OPENWRT),) |
| 55 |
-# openWRT : |
| 56 |
-# check for system-wide iptables files. Test if iptables version >= 1.4.3 |
| 57 |
-# the following test has to be verified : |
| 58 |
-TEST := $(shell test -f /usr/include/iptables/internal.h && grep -q "\#define IPTABLES_VERSION" /usr/include/iptables/internal.h && echo 1) |
| 59 |
-ifeq ($(TEST), 1) |
| 60 |
-CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 |
| 61 |
-LDLIBS = -liptc |
| 62 |
-endif # ($(TEST), 1) |
| 63 |
-TEST_LIB := $(shell test -f /usr/lib$(ARCH)/libiptc.a && echo 1) |
| 64 |
-ifeq ($(TEST_LIB), 1) |
| 65 |
-LDLIBS = -liptc /usr/lib$(ARCH)/libiptc.a |
| 66 |
-endif # ($(TEST_LIB), 1) |
| 67 |
-endif # ($(TARGET_OPENWRT),) |
| 68 |
-else # ifdef IPTABLESPATH |
| 69 |
-# IPTABLESPATH not defined |
| 70 |
-# the following test has to be verified : |
| 71 |
-TEST := $(shell test -f /usr/include/xtables.h && grep -q "XTABLES_VERSION_CODE" /usr/include/xtables.h && echo 1) |
| 72 |
-ifeq ($(TEST), 1) |
| 73 |
-CPPFLAGS := $(CPPFLAGS) -DIPTABLES_143 |
| 74 |
-LDLIBS = -liptc |
| 75 |
-TESTIP4TC := $(shell test -f /lib/libip4tc.so && echo 1) |
| 76 |
-ifeq ($(TESTIP4TC), 1) |
| 77 |
-LDLIBS := $(LDLIBS) -lip4tc |
| 78 |
-endif # ($(TESTIP4TC), 1) |
| 79 |
-TESTIP6TC := $(shell test -f /lib/libip6tc.so && echo 1) |
| 80 |
-ifeq ($(TESTIP6TC), 1) |
| 81 |
-LDLIBS := $(LDLIBS) -lip6tc |
| 82 |
-endif # ($(TESTIP6TC), 1) |
| 83 |
-endif # ($(TEST), 1) |
| 84 |
-endif # ifdef IPTABLESPATH |
| 85 |
endif # ifdef PCFILE_FOUND |
| 86 |
|
| 87 |
-LDLIBS += -lnfnetlink |
| 88 |
+LDLIBS += -lip4tc -lnfnetlink |
| 89 |
+CPPFLAGS += -DIPTABLES_143 |
| 90 |
|
| 91 |
TEST := $(shell $(PKG_CONFIG) --atleast-version=1.0.2 libnetfilter_conntrack && $(PKG_CONFIG) --atleast-version=1.0.3 libmnl && echo 1) |
| 92 |
ifeq ($(TEST),1) |
| 93 |
@@ -184,7 +124,6 @@ install: miniupnpd miniupnpd.8 miniupnpd |
| 94 |
$(INSTALL) linux/miniupnpd.init.d.script $(DESTDIR)$(PREFIX)/etc/init.d/miniupnpd |
| 95 |
$(INSTALL) -d $(DESTDIR)$(MANINSTALLDIR) |
| 96 |
$(INSTALL) --mode=0644 miniupnpd.8 $(DESTDIR)$(MANINSTALLDIR) |
| 97 |
- gzip -f $(DESTDIR)$(MANINSTALLDIR)/miniupnpd.8 |
| 98 |
|
| 99 |
# genuuid is using the uuidgen CLI tool which is part of libuuid |
| 100 |
# from the e2fsprogs |
Archives