mirror of
https://abf.rosa.ru/djam/miniupnpd.git
synced 2025-02-22 15:43:00 +00:00
38 lines
1.8 KiB
Diff
38 lines
1.8 KiB
Diff
diff -urN miniupnpd-1.8.20140523/Makefile miniupnpd-1.8.20140523-patched/Makefile
|
|
--- miniupnpd-1.8.20140523/Makefile 2014-05-07 01:42:49.000000000 +1100
|
|
+++ miniupnpd-1.8.20140523-patched/Makefile 2016-06-10 12:56:48.084484795 +1000
|
|
@@ -112,11 +112,11 @@
|
|
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
|
|
+LDLIBS = -lip4tc
|
|
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
|
|
+LDLIBS = -lip4tc /usr/lib$(ARCH)/libiptc.a
|
|
endif # ($(TEST_LIB), 1)
|
|
endif # ($(TARGET_OPENWRT),)
|
|
else # ifdef IPTABLESPATH
|
|
@@ -125,7 +125,7 @@
|
|
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
|
|
+LDLIBS = -lip4tc
|
|
TESTIP4TC := $(shell test -f /lib/libip4tc.so && echo 1)
|
|
ifeq ($(TESTIP4TC), 1)
|
|
LDLIBS := $(LDLIBS) -lip4tc
|
|
@@ -191,9 +191,9 @@
|
|
# 'cat /proc/sys/kernel/random/uuid' could be also used
|
|
genuuid:
|
|
ifeq ($(TARGET_OPENWRT),)
|
|
- sed -i -e "s/^uuid=[-0-9a-f]*/uuid=`(genuuid||uuidgen||uuid) 2>/dev/null`/" miniupnpd.conf
|
|
+ sed -i -e "s/^uuid=[-0-9a-f]*/uuid=`(uuidgen||uuid) 2>/dev/null`/" miniupnpd.conf
|
|
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
|
|
+ sed -i -e "s/^uuid=[-0-9a-f]*/uuid=`($(STAGING_DIR_HOST)/bin/$(STAGING_DIR_HOST)/bin/uuidgen||$(STAGING_DIR_HOST)/bin/uuid) 2>/dev/null`/" miniupnpd.conf
|
|
endif
|
|
|
|
miniupnpd: $(BASEOBJS) $(LNXOBJS) $(NETFILTEROBJS)
|