Merge pull request #4245 from TDT-GmbH/mwan3-add-ubus

net/mwan3: add ubus interface

diff --git a/lang/perl-cgi/Makefile b/lang/perl-cgi/Makefile
index eaca4253c4762051afb50174ec941f55376cd9a2..2ee88759d0327875c6207f5f9f1f4cb2d64d4330 100644 (file)
--- a/lang/perl-cgi/Makefile
+++ b/lang/perl-cgi/Makefile
@@ -8,12 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=perl-cgi
-PKG_VERSION:=4.35
-PKG_RELEASE:=2
+PKG_VERSION:=4.36
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/L/LE/LEEJO
 PKG_SOURCE:=CGI-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=15e63942c02354426b25f056f2a4467c
+PKG_MD5SUM:=48566d81f430a7f755bb4d8f426ce35d
+PKG_HASH:=fefe84d4f2461e867f9be80f3f988e17bcbbcb4e306952cf2fd1dea7e4515490
 
 PKG_LICENSE:=GPL Artistic-2.0
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>, \

diff --git a/lang/php7/Makefile b/lang/php7/Makefile
index 73ced0673e18b938c684b133f9b1acf92a2030df..f9ef6a1664ba9a8811dd349d837574b4a8cf0528 100644 (file)
--- a/lang/php7/Makefile
+++ b/lang/php7/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
 PKG_VERSION:=7.1.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
 

diff --git a/lang/php7/patches/1006-fix-gettext.patch b/lang/php7/patches/1006-fix-gettext.patch
new file mode 100644 (file)
index 0000000..05d1ce9
--- /dev/null
+++ b/lang/php7/patches/1006-fix-gettext.patch
@@ -0,0 +1,11 @@
+--- a/ext/gettext/config.m4
++++ b/ext/gettext/config.m4
+@@ -32,3 +32,2 @@
+   )
+-  LDFLAGS=$O_LDFLAGS
+ 
+@@ -48,3 +48,4 @@
+   AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, bind_textdomain_codeset,  [AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET, 1, [ ])])
++  LDFLAGS=$O_LDFLAGS
+   
+ fi

diff --git a/net/bcp38/Makefile b/net/bcp38/Makefile
index 4677a29729eae125559fee19bfffbcaeef38a4fb..c62aed87e065ab29f682b6c46a2f4e3df1839e04 100644 (file)
--- a/net/bcp38/Makefile
+++ b/net/bcp38/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bcp38
 PKG_VERSION:=5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENCE:=GPL-3.0+
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/net/bcp38/files/run.sh b/net/bcp38/files/run.sh
index 00d50342e0e2e0d55a6a7090ac77cb76b566a179..736ea52c638c9f964ca5a166efa2c128b2e4710d 100755 (executable)
--- a/net/bcp38/files/run.sh
+++ b/net/bcp38/files/run.sh
@@ -72,9 +72,9 @@ setup_iptables()
        iptables -N "$IPTABLES_CHAIN" 2>/dev/null
        iptables -F "$IPTABLES_CHAIN" 2>/dev/null
 
-       iptables -I output_rule -m state --state NEW -j "$IPTABLES_CHAIN"
-       iptables -I input_rule -m state --state NEW -j "$IPTABLES_CHAIN"
-       iptables -I forwarding_rule -m state --state NEW -j "$IPTABLES_CHAIN"
+       iptables -I output_rule -m conntrack --ctstate NEW -j "$IPTABLES_CHAIN"
+       iptables -I input_rule -m conntrack --ctstate NEW -j "$IPTABLES_CHAIN"
+       iptables -I forwarding_rule -m conntrack --ctstate NEW -j "$IPTABLES_CHAIN"
 
        # always accept DHCP traffic
        iptables -A "$IPTABLES_CHAIN" -p udp --dport 67:68 --sport 67:68 -j RETURN
@@ -90,9 +90,9 @@ destroy_ipset()
 
 destroy_iptables()
 {
-       iptables -D output_rule -m state --state NEW -j "$IPTABLES_CHAIN" 2>/dev/null
-       iptables -D input_rule -m state --state NEW -j "$IPTABLES_CHAIN" 2>/dev/null
-       iptables -D forwarding_rule -m state --state NEW -j "$IPTABLES_CHAIN" 2>/dev/null
+       iptables -D output_rule -m conntrack --ctstate NEW -j "$IPTABLES_CHAIN" 2>/dev/null
+       iptables -D input_rule -m conntrack --ctstate NEW -j "$IPTABLES_CHAIN" 2>/dev/null
+       iptables -D forwarding_rule -m conntrack --ctstate NEW -j "$IPTABLES_CHAIN" 2>/dev/null
        iptables -F "$IPTABLES_CHAIN" 2>/dev/null
        iptables -X "$IPTABLES_CHAIN" 2>/dev/null
 }