Merge pull request #221 from NeoRaider/batman-adv-version

[lede-routing/.git] / miniupnpd / patches / 103-no-ipv6-autodetection.patch

diff --git a/miniupnpd/patches/103-no-ipv6-autodetection.patch b/miniupnpd/patches/103-no-ipv6-autodetection.patch
index acef536d542ac8f41c12811c640dfc9c616da0ae..50d5a392b62cb53ae4bfbea34773077eba6d71bc 100644 (file)
--- a/miniupnpd/patches/103-no-ipv6-autodetection.patch
+++ b/miniupnpd/patches/103-no-ipv6-autodetection.patch
@@ -4,10 +4,9 @@ This will incorrectly detect capabilities such as ipv6 support even though it is
 As the OpenWRT buildsystem already passes the right compile flags, we can skip the autodetection.
 
 
 As the OpenWRT buildsystem already passes the right compile flags, we can skip the autodetection.
 
 

-diff -up miniupnpd-1.8.20140906/netfilter/Makefile.orig miniupnpd-1.8.20140906/netfilter/Makefile
---- miniupnpd-1.8.20140906/netfilter/Makefile.orig     2014-09-28 16:39:56.652296642 +0200
-+++ miniupnpd-1.8.20140906/netfilter/Makefile  2013-12-13 14:12:11.000000000 +0100
-@@ -38,6 +38,4 @@ endif
+--- a/netfilter/Makefile
++++ b/netfilter/Makefile
+@@ -38,8 +38,6 @@ endif

  endif
  endif
  
  endif
  endif
  


@@ -16,10 +15,9 @@ diff -up miniupnpd-1.8.20140906/netfilter/Makefile.orig miniupnpd-1.8.20140906/n
  all:  iptcrdr.o testiptcrdr iptpinhole.o \
          testiptcrdr_peer testiptcrdr_dscp test_nfct_get
  #        testiptpinhole
  all:  iptcrdr.o testiptcrdr iptpinhole.o \
          testiptcrdr_peer testiptcrdr_dscp test_nfct_get
  #        testiptpinhole

-diff -up miniupnpd-1.8.20140906/Makefile.linux.orig miniupnpd-1.8.20140906/Makefile.linux
---- miniupnpd-1.8.20140906/Makefile.linux.orig 2014-09-28 16:46:06.781835136 +0200
-+++ miniupnpd-1.8.20140906/Makefile.linux      2014-09-28 16:46:14.388907413 +0200
-@@ -70,7 +70,6 @@ CPPFLAGS += -DIPTABLES_143
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -73,7 +73,6 @@ CPPFLAGS += -DIPTABLES_143

  endif
  
  CFLAGS  += $(shell $(PKG_CONFIG) --cflags libiptc)
  endif
  
  CFLAGS  += $(shell $(PKG_CONFIG) --cflags libiptc)