This patch updates shorewall6-lite to current stable release 4.4.27.2

Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/120-LOGFILE.patch
===================================================================
--- patches/120-LOGFILE.patch	(Revision 29755)
+++ patches/120-LOGFILE.patch	(Arbeitskopie)
@@ -7,5 +7,4 @@
 -LOGFILE=
 +LOGFILE=/dev/null
  
- LOGFORMAT=
- 
+
Index: patches/130-portability.patch
===================================================================
--- patches/130-portability.patch	(Revision 29755)
+++ patches/130-portability.patch	(Arbeitskopie)
@@ -1,20 +0,0 @@
---- a/install.sh
-+++ b/install.sh
-@@ -294,13 +294,15 @@ cd manpages
- 
- for f in *.5; do
-     gzip -c $f > $f.gz
--    run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
-+    run_install -d ${PREFIX}/usr/share/man/man5
-+    run_install -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
-     echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man5/$f.gz"
- done
- 
- for f in *.8; do
-     gzip -c $f > $f.gz
--    run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
-+    run_install -d ${PREFIX}/usr/share/man/man8
-+    run_install -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
-     echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man8/$f.gz"
- done
- 
Index: patches/110-MODULESDIR.patch
===================================================================
--- patches/110-MODULESDIR.patch	(Revision 29755)
+++ patches/110-MODULESDIR.patch	(Arbeitskopie)
@@ -1,20 +1,21 @@
---- a/lib.base
-+++ b/lib.base
-@@ -260,7 +260,7 @@
+--- a/lib.common
++++ b/lib.common
+@@ -331,7 +331,7 @@ reload_kernel_modules() {
  
-     [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
+     [ -z "$MODULESDIR" ] && \
+ 	uname=$(uname -r) && \
+-	MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
++	MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname
  
--    [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched
-+    [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched:/lib/modules/$(uname -r)
-     MODULES=$(lsmod | cut -d ' ' -f1)
+     [ -d /sys/module/ ] || MODULES=$(lsmod | cut -d ' ' -f1)
  
-     for directory in $(split $MODULESDIR); do
-@@ -296,7 +296,7 @@
-     [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
+@@ -370,7 +370,7 @@ load_kernel_modules() # $1 = Yes, if we are to save moduleinfo in $VARDIR
  
      [ -z "$MODULESDIR" ] && \
--	MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched
-+	MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched:/lib/modules/$(uname -r)
+ 	uname=$(uname -r) && \
+-	MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
++	MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname
  
      for directory in $(split $MODULESDIR); do
  	[ -d $directory ] && moduledirectories="$moduledirectories $directory"
+ 
Index: patches/100-hostname.patch
===================================================================
--- patches/100-hostname.patch	(Revision 29755)
+++ patches/100-hostname.patch	(Arbeitskopie)
@@ -1,11 +0,0 @@
---- a/shorewall6-lite
-+++ b/shorewall6-lite
-@@ -153,7 +153,7 @@
- 
-     export VERBOSE
- 
--    [ -n "${HOSTNAME:=$(hostname)}" ]
-+    [ -n "${HOSTNAME:=$(${SHAREDIR}/hostname)}" ]
- 
- }
- 
Index: Makefile
===================================================================
--- Makefile	(Revision 29755)
+++ Makefile	(Arbeitskopie)
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall6-lite
-PKG_VERSION:=4.4.5.4
-PKG_DIRECTORY:=4.4.5
-PKG_RELEASE:=1
+PKG_VERSION:=4.4.27.2
+PKG_DIRECTORY:=4.4.27
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
 	http://www1.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
@@ -20,17 +20,17 @@
 	http://shorewall.infohiiway.com/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
 	http://www.shorewall.com.ar/pub/shorewall/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=498f622be657df38beec256876adabb6
+PKG_MD5SUM:=3c722b3d6c9e63c06ab86cba76db91d5
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/shorewall6-lite
   SECTION:=ipv6
   CATEGORY:=IPv6
-  DEPENDS:=+ip +ip6tables +ip6tables-utils
+  DEPENDS:=+ip +ip6tables
   TITLE:=Shorewall6 Lite
   URL:=http://www.shorewall.net/
-  SUBMENU:=firewall
+  SUBMENU:=Firewall
 endef
 
 define Package/shorewall6-lite/description
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to