Merge pull request #203 from kdarbyshirebryant/miniupnpdfuzz
miniupnpd: refresh patches
This commit is contained in:
commit
fe8fa0ba86
3 changed files with 3 additions and 5 deletions
|
@ -1,10 +1,8 @@
|
||||||
We do not need to autodetect SSL/UUID; SSL we do not support, UUID we always do.
|
We do not need to autodetect SSL/UUID; SSL we do not support, UUID we always do.
|
||||||
|
|
||||||
diff --git a/miniupnpd/Makefile.linux b/miniupnpd/Makefile.linux
|
|
||||||
index 2d28126..01daeea 100644
|
|
||||||
--- a/Makefile.linux
|
--- a/Makefile.linux
|
||||||
+++ b/Makefile.linux
|
+++ b/Makefile.linux
|
||||||
@@ -153,14 +153,18 @@ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libmnl)
|
@@ -153,14 +153,18 @@ LDLIBS += $(shell $(PKG_CONFIG) --static
|
||||||
LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack)
|
LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack)
|
||||||
endif # ($(TEST),1)
|
endif # ($(TEST),1)
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/pcpserver.c
|
--- a/pcpserver.c
|
||||||
+++ b/pcpserver.c
|
+++ b/pcpserver.c
|
||||||
@@ -1004,6 +1004,7 @@ static int CreatePCPMap_NAT(pcp_info_t *
|
@@ -982,6 +982,7 @@ static int CreatePCPMap_NAT(pcp_info_t *
|
||||||
timestamp);
|
timestamp);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return PCP_ERR_NO_RESOURCES;
|
return PCP_ERR_NO_RESOURCES;
|
||||||
|
|
|
@ -17,7 +17,7 @@ As the OpenWRT buildsystem already passes the right compile flags, we can skip t
|
||||||
# testiptpinhole
|
# testiptpinhole
|
||||||
--- a/Makefile.linux
|
--- a/Makefile.linux
|
||||||
+++ b/Makefile.linux
|
+++ b/Makefile.linux
|
||||||
@@ -70,7 +70,6 @@ CPPFLAGS += -DIPTABLES_143
|
@@ -73,7 +73,6 @@ CPPFLAGS += -DIPTABLES_143
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc)
|
CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc)
|
||||||
|
|
Loading…
Reference in a new issue