diff options
| author | Markus Stenberg | 2016-07-13 05:58:15 +0000 |
|---|---|---|
| committer | GitHub | 2016-07-13 05:58:15 +0000 |
| commit | fe8fa0ba86e35b1ec6b83fb1eaf123849a69afc9 (patch) | |
| tree | c530c78a9849239953ccf948905d8df79581adde | |
| parent | 0f44bfce53e7cb19e78be5413b97338b479abc98 (diff) | |
| parent | c5426a2ad41a66503daeca63159da7ab73264f0b (diff) | |
| download | routing-fe8fa0ba86e35b1ec6b83fb1eaf123849a69afc9.tar.gz | |
Merge pull request #203 from kdarbyshirebryant/miniupnpdfuzz
miniupnpd: refresh patches
| -rw-r--r-- | miniupnpd/patches/101-no-ssl-uuid.patch | 4 | ||||
| -rw-r--r-- | miniupnpd/patches/102-ipv6-ext-port.patch | 2 | ||||
| -rw-r--r-- | miniupnpd/patches/103-no-ipv6-autodetection.patch | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/miniupnpd/patches/101-no-ssl-uuid.patch b/miniupnpd/patches/101-no-ssl-uuid.patch index 03a4966..81cea10 100644 --- a/miniupnpd/patches/101-no-ssl-uuid.patch +++ b/miniupnpd/patches/101-no-ssl-uuid.patch @@ -1,10 +1,8 @@ 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 +++ 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) endif # ($(TEST),1) diff --git a/miniupnpd/patches/102-ipv6-ext-port.patch b/miniupnpd/patches/102-ipv6-ext-port.patch index fdb2af4..806c7fd 100644 --- a/miniupnpd/patches/102-ipv6-ext-port.patch +++ b/miniupnpd/patches/102-ipv6-ext-port.patch @@ -1,6 +1,6 @@ --- a/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); if (r < 0) return PCP_ERR_NO_RESOURCES; diff --git a/miniupnpd/patches/103-no-ipv6-autodetection.patch b/miniupnpd/patches/103-no-ipv6-autodetection.patch index 61c023a..50d5a39 100644 --- a/miniupnpd/patches/103-no-ipv6-autodetection.patch +++ b/miniupnpd/patches/103-no-ipv6-autodetection.patch @@ -17,7 +17,7 @@ As the OpenWRT buildsystem already passes the right compile flags, we can skip t # testiptpinhole --- a/Makefile.linux +++ b/Makefile.linux -@@ -70,7 +70,6 @@ CPPFLAGS += -DIPTABLES_143 +@@ -73,7 +73,6 @@ CPPFLAGS += -DIPTABLES_143 endif CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc) |