miniupnpd: refresh patches 203/head
authorKevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Tue, 28 Jun 2016 14:57:36 +0000 (15:57 +0100)
committerKevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Tue, 28 Jun 2016 14:57:36 +0000 (15:57 +0100)
Refresh patches to clear patch fuzz

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
miniupnpd/patches/101-no-ssl-uuid.patch
miniupnpd/patches/102-ipv6-ext-port.patch
miniupnpd/patches/103-no-ipv6-autodetection.patch

index 03a49662a05c0acf95814f8421c64ca73620e892..81cea104694d2794e14291b3ddfabc2f78119311 100644 (file)
@@ -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)
  
index fdb2af47723b43fb7685c465bd815ee1c92f785a..806c7fd5ae95066edbc8f34ce511dc1c430dd4c0 100644 (file)
@@ -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;
index 61c023a24b5811528723d01e434a4bebe1dee04b..50d5a392b62cb53ae4bfbea34773077eba6d71bc 100644 (file)
@@ -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)