[OpenWrt-Devel] [PATCH] strongSwan 5.1.1 update for Ticket #14018
This patch updates the strongSwan package in Attitude Adjustment 12.09.1
to the Current Release 5.1.1
Ticket: https://dev.openwrt.org/ticket/14018
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/300-include-ipsec-user-script.patch
===
--- patches/300-include-ipsec-user-script.patch (Revision 0)
+++ patches/300-include-ipsec-user-script.patch (Revision 0)
@@ -0,0 +1,17 @@
+--- a/src/_updown/_updown.in
b/src/_updown/_updown.in
+@@ -16,11 +16,9 @@
+ # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ # for more details.
+
+-# CAUTION: Installing a new version of strongSwan will install a new
+-# copy of this script, wiping out any custom changes you make. If
+-# you need changes, make a copy of this under another name, and customize
+-# that, and use the (left/right)updown parameters in ipsec.conf to make
+-# strongSwan use yours instead of this default one.
++# Add your custom ip rules to the /etc/ipsec.user file if you need that functionality.
++
++[ -e /etc/ipsec.user ] . /etc/ipsec.user $1
+
+ # things that this script gets (from ipsec_pluto(8) man page)
+ #
Index: Makefile
===
--- Makefile (Revision 38701)
+++ Makefile (Arbeitskopie)
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2013 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=strongswan
-PKG_VERSION:=5.0.0
-PKG_RELEASE:=1
+PKG_VERSION:=5.1.1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://download.strongswan.org/
-PKG_MD5SUM:=c8b861305def7c0abae04f7bbefec212
+PKG_MD5SUM:=e3af3d493d22286be3cd794533a8966a
PKG_MOD_AVAILABLE:= \
addrblock \
@@ -36,6 +36,7 @@
eap-identity \
eap-md5 \
eap-mschapv2 \
+ eap-radius \
farp \
fips-prf \
gcm \
@@ -69,11 +70,11 @@
smp \
socket-default \
socket-dynamic \
- socket-raw \
sql \
sqlite \
stroke \
test-vectors \
+ unity \
uci \
updown \
whitelist \
@@ -150,6 +151,7 @@
+strongswan-mod-eap-identity \
+strongswan-mod-eap-md5 \
+strongswan-mod-eap-mschapv2 \
+ +strongswan-mod-eap-radius \
+strongswan-mod-farp \
+strongswan-mod-fips-prf \
+strongswan-mod-gcm \
@@ -185,6 +187,7 @@
+strongswan-mod-stroke \
+strongswan-mod-test-vectors \
+strongswan-mod-uci \
+ +strongswan-mod-unity \
+strongswan-mod-updown \
+strongswan-mod-whitelist \
+strongswan-mod-x509 \
@@ -198,7 +201,7 @@
define Package/strongswan-full/description
$(call Package/strongswan/description/Default)
This meta-package contains dependencies for all of the strongswan plugins
- except kernel-klips, kernel-pfkey, socket-dynamic and socket-raw which are
+ except kernel-klips, kernel-pfkey, socket-dynamic and which are
ommitted in favor of the kernel-netlink and socket-default plugins.
endef
@@ -343,6 +346,7 @@
define Package/strongswan/conffiles
/etc/ipsec.conf
/etc/ipsec.secrets
+/etc/ipsec.user
/etc/strongswan.conf
endef
@@ -352,6 +356,8 @@
$(INSTALL_DIR) $(1)/usr/lib/ipsec
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{libstrongswan.so.*,libhydra.so.*} $(1)/usr/lib/ipsec/
$(INSTALL_CONF) ./files/ipsec.secrets $(1)/etc/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) ./files/ipsec.init $(1)/etc/init.d/ipsec
endef
define Package/strongswan-default/install
@@ -378,10 +384,12 @@
endef
define Package/strongswan-utils/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pki $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ipsec $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/lib/ipsec
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{openac,pki,scepclient} $(1)/usr/lib/ipsec/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{openac,scepclient} $(1)/usr/lib/ipsec/
endef
define Plugin/duplicheck/install
@@ -390,6 +398,12 @@
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-duplicheck.so $(1)/usr/lib/ipsec/plugins/
endef
+define Plugin/eap-radius/install
+ $(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libradius.so.* $(1)/usr/lib/ipsec/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-eap-radius.so $(1)/usr/lib/ipsec/plugins/
+endef
+
define Plugin/attr-sql/install
$(INSTALL_DIR) $(1)/usr/lib/ipsec
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/pool $(1)/usr/lib/ipsec/
@@ -416,6 +430,8 @@
$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{_updown,_updown_espmark} $(1)/usr/lib/ipsec/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-updown.so $(1)/usr/lib/ipsec/plugins/
+ $(INSTALL_DIR) $(1)/etc
+ $(INSTALL_CONF) ./files/ipsec.user $(1)/etc/
endef
define Plugin/whitelist/install
@@ -451,6 +467,7 @@
$(eval $(call
Re: [OpenWrt-Devel] [PATCH] shorewall6-lite: update to 4.5.7
On So, Aug 26, 2012 11:57, John Crispin wrote: On 26/08/12 09:58, Edy Corak wrote: This patch updates shorewall6-lite to current stable release 4.5.7 Please note: The new package shorewall-core 4.5.7 is required by this shorewall-lite version and perlbase-digest. Signed-off-by: Edy Corak i...@loenshotel.de Hi, 2 things * please read the howto submit patches howto. the patch has the wrong format * please turn this into a build variant package i will mark both of these as rejected in patchwork. John ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel Hi John, thanks for your notice. I have read this documentation - Link: https://dev.openwrt.org/wiki/SubmittingPatches/Svn The patch has the same format like all other patches I have submitted before, e. g. shorewall6-lite 4.4.22.2 Applied in r28058 Why this patch is now wrong ? I have tested this patch and it works like expected. Kind regards Edy Corak -- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] shorewall-lite: update to 4.5.7
This patch updates shorewall-lite to current stable release 4.5.7
Please note:
The new package shorewall-core 4.5.7 is required by this shorewall-lite version
and perlbase-digest.
Signed-off-by: Edy Corak i...@loenshotel.de
Index: files/lsm_script
===
--- files/lsm_script (Revision 33213)
+++ files/lsm_script (Arbeitskopie)
@@ -7,37 +7,21 @@
#
STATE=${1}
-NAME=${2}
-CHECKIP=${3}
DEVICE=${4}
-WARN_EMAIL=${5}
-REPLIED=${6}
-WAITING=${7}
-TIMEOUT=${8}
-REPLY_LATE=${9}
-CONS_RCVD=${10}
-CONS_WAIT=${11}
-CONS_MISS=${12}
-AVG_RTT=${13}
if [ -f /usr/share/shorewall-lite/lib.base ]; then
- VARDIR=/var/lib/shorewall-lite
+ VARDIR=/etc/shorewall-lite/state
STATEDIR=/etc/shorewall-lite
-else
- VARDIR=/var/lib/shorewall
- STATEDIR=/etc/shorewall
fi
[ -f ${STATEDIR}/vardir ] . ${STATEDIR}/vardir
if [ ${STATE} = up ]; then
- echo 0 ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
${VARDIR}/firewall enable ${DEVICE}
else
- echo 1 ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
${VARDIR}/firewall disable ${DEVICE}
fi
-/sbin/shorewall-lite show routing /var/log/lsm
+/sbin/shorewall-lite show routing /var/log/lsm
exit 0
Index: patches/120-LOGFILE.patch
===
--- patches/120-LOGFILE.patch (Revision 33213)
+++ patches/120-LOGFILE.patch (Arbeitskopie)
@@ -1,5 +1,5 @@
a/shorewall-lite.conf 2012-01-20 16:30:06.0 +0100
-+++ b/shorewall-lite.conf 2012-06-03 11:46:48.389503776 +0200
+--- a/shorewall-lite.conf 2012-08-08 16:29:23.0 +0200
b/shorewall-lite.conf 2012-08-13 11:11:11.687938395 +0200
@@ -28,7 +28,7 @@
# L O G G I N G
###
Index: patches/110-MODULESDIR.patch
===
--- patches/110-MODULESDIR.patch (Revision 33213)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,20 +0,0 @@
a/lib.common 2012-01-21 14:21:50.0 +0100
-+++ b/lib.common 2012-06-03 11:52:35.115967105 +0200
-@@ -328,7 +328,7 @@
-
- [ -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
-
- [ -d /sys/module/ ] || MODULES=$(lsmod | cut -d ' ' -f1)
-
-@@ -367,7 +367,7 @@
-
- [ -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
-
- for directory in $(split $MODULESDIR); do
- [ -d $directory ] moduledirectories=$moduledirectories $directory
Index: patches/100-shorewallrc.default.patch
===
--- patches/100-shorewallrc.default.patch (Revision 0)
+++ patches/100-shorewallrc.default.patch (Revision 0)
@@ -0,0 +1,26 @@
+--- a/shorewallrc.default 2012-08-08 17:42:31.0 +0200
b/shorewallrc.default 2012-08-13 11:53:38.479048989 +0200
+@@ -2,7 +2,7 @@
+ # Default Shorewall 4.5 rc file
+ #
+ HOST=linux #Generic Linux
+-BUILD= #Default is to detect the build system
++BUILD=linux #Default is to detect the build system
+ PREFIX=/usr #Top-level directory for shared files, libraries, etc.
+ SHAREDIR=${PREFIX}/share#Directory for arch-neutral files.
+ LIBEXECDIR=${PREFIX}/share #Directory for executable scripts.
+@@ -10,7 +10,7 @@
+ CONFDIR=/etc#Directory where subsystem configurations are installed
+ SBINDIR=/sbin #Directory where system administration programs are installed
+ MANDIR=${PREFIX}/man#Directory where manpages are installed.
+-INITDIR=etc/init.d #Directory where SysV init scripts are installed.
++INITDIR=/etc/init.d #Directory where SysV init scripts are installed.
+ INITFILE=$PRODUCT #Name of the product's installed SysV init script
+ INITSOURCE=init.sh #Name of the distributed file to be installed
[OpenWrt-Devel] New package shorewall-core 4.5.7
New package shorewall-core, current stable release 4.5.7
The Shoreline Firewall, is high-level tool for configuring Netfilter.
This package provides the core Shorewall libraries installed in
/usr/share/shorewall/,
which are required for the rest of the Shorewall packages to work.
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/110-lib.common.patch
===
--- patches/110-lib.common.patch (Revision 0)
+++ patches/110-lib.common.patch (Revision 0)
@@ -0,0 +1,20 @@
+--- a/lib.common 2012-08-08 16:29:23.0 +0200
b/lib.common 2012-08-13 10:14:23.574529864 +0200
+@@ -372,7 +372,7 @@
+
+ [ -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
+
+ [ -d /sys/module/ ] || MODULES=$(lsmod | cut -d ' ' -f1)
+
+@@ -411,7 +411,7 @@
+
+ [ -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
+
+ for directory in $(split $MODULESDIR); do
+ [ -d $directory ] moduledirectories=$moduledirectories $directory
Index: patches/100-shorewallrc.default.patch
===
--- patches/100-shorewallrc.default.patch (Revision 0)
+++ patches/100-shorewallrc.default.patch (Revision 0)
@@ -0,0 +1,11 @@
+--- a/shorewallrc.default 2012-08-08 16:29:23.0 +0200
b/shorewallrc.default 2012-08-13 10:15:46.769381221 +0200
+@@ -2,7 +2,7 @@
+ # Default Shorewall 4.5 rc file
+ #
+ HOST=linux #Generic Linux
+-BUILD= #Default is to detect the build system
++BUILD=linux #Default is to detect the build system
+ PREFIX=/usr #Top-level directory for shared files, libraries, etc.
+ SHAREDIR=${PREFIX}/share#Directory for arch-neutral files.
+ LIBEXECDIR=${PREFIX}/share #Directory for executable scripts.
Index: Makefile
===
--- Makefile (Revision 0)
+++ Makefile (Revision 0)
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=shorewall-core
+PKG_VERSION:=4.5.7
+PKG_DIRECTORY:=4.5.7
+PKG_RELEASE:=1
+
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://www1.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://slovakia.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://shorewall.de/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://www.shorewall.com.au/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://shorewall.infohiiway.com/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://www.shorewall.com.ar/pub/shorewall/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=ed3880b96a22e16cafc68d2e0f976b3a
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/shorewall-core
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+ip +iptables +perlbase-digest
+ TITLE:=Shorewall Core
+ URL:=http://www.shorewall.net/
+ SUBMENU:=Firewall
+endef
+
+define Package/shorewall-core/description
+ The Shoreline Firewall, is high-level tool for configuring Netfilter.
+ This package provides the core Shorewall libraries installed in /usr/share/shorewall/,
+ which are required for the rest of the Shorewall packages to work.
+endef
+
+define Package/shorewall-core/conffiles
+ /usr/share/shorewall/shorewallrc
+endef
+
+CONFIGURE_ARGS += \
+ vendor=linux
+
+define Build/Compile
+ DESTDIR=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
+endef
+
+define Package/shorewall-core/install
+ $(INSTALL_DIR) $(1)/usr/share
+ $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall $(1)/usr/share
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall/wait4ifup $(1)/usr/share/shorewall
+endef
+
+$(eval $(call BuildPackage,shorewall-core))
signature.asc
Description: Digital signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https
[OpenWrt-Devel] [PATCH] shorewall-lite: update to 4.5.6.2, update lsm event script
This patch updates shorewall-lite to current stable release 4.5.6.2 and updates
the lsm event script
Please note:
The new package shorewall-core 4.5.6.2 is required by this shorewall-lite
version and perlbase-digest.
Signed-off-by: Edy Corak i...@loenshotel.de
Index: files/lsm_script
===
--- files/lsm_script (Revision 33201)
+++ files/lsm_script (Arbeitskopie)
@@ -7,37 +7,21 @@
#
STATE=${1}
-NAME=${2}
-CHECKIP=${3}
DEVICE=${4}
-WARN_EMAIL=${5}
-REPLIED=${6}
-WAITING=${7}
-TIMEOUT=${8}
-REPLY_LATE=${9}
-CONS_RCVD=${10}
-CONS_WAIT=${11}
-CONS_MISS=${12}
-AVG_RTT=${13}
if [ -f /usr/share/shorewall-lite/lib.base ]; then
- VARDIR=/var/lib/shorewall-lite
+ VARDIR=/etc/shorewall-lite/state
STATEDIR=/etc/shorewall-lite
-else
- VARDIR=/var/lib/shorewall
- STATEDIR=/etc/shorewall
fi
[ -f ${STATEDIR}/vardir ] . ${STATEDIR}/vardir
if [ ${STATE} = up ]; then
- echo 0 ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
${VARDIR}/firewall enable ${DEVICE}
else
- echo 1 ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
${VARDIR}/firewall disable ${DEVICE}
fi
-/sbin/shorewall-lite show routing /var/log/lsm
+/sbin/shorewall-lite show routing /var/log/lsm
exit 0
Index: patches/120-LOGFILE.patch
===
--- patches/120-LOGFILE.patch (Revision 33201)
+++ patches/120-LOGFILE.patch (Arbeitskopie)
@@ -1,5 +1,5 @@
a/shorewall-lite.conf 2012-01-20 16:30:06.0 +0100
-+++ b/shorewall-lite.conf 2012-06-03 11:46:48.389503776 +0200
+--- a/shorewall-lite.conf 2012-08-08 16:29:23.0 +0200
b/shorewall-lite.conf 2012-08-13 11:11:11.687938395 +0200
@@ -28,7 +28,7 @@
# L O G G I N G
###
Index: patches/110-MODULESDIR.patch
===
--- patches/110-MODULESDIR.patch (Revision 33201)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,20 +0,0 @@
a/lib.common 2012-01-21 14:21:50.0 +0100
-+++ b/lib.common 2012-06-03 11:52:35.115967105 +0200
-@@ -328,7 +328,7 @@
-
- [ -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
-
- [ -d /sys/module/ ] || MODULES=$(lsmod | cut -d ' ' -f1)
-
-@@ -367,7 +367,7 @@
-
- [ -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
-
- for directory in $(split $MODULESDIR); do
- [ -d $directory ] moduledirectories=$moduledirectories $directory
Index: patches/100-shorewallrc.default.patch
===
--- patches/100-shorewallrc.default.patch (Revision 0)
+++ patches/100-shorewallrc.default.patch (Revision 0)
@@ -0,0 +1,26 @@
+--- a/shorewallrc.default 2012-08-08 17:42:31.0 +0200
b/shorewallrc.default 2012-08-13 11:53:38.479048989 +0200
+@@ -2,7 +2,7 @@
+ # Default Shorewall 4.5 rc file
+ #
+ HOST=linux #Generic Linux
+-BUILD= #Default is to detect the build system
++BUILD=linux #Default is to detect the build system
+ PREFIX=/usr #Top-level directory for shared files, libraries, etc.
+ SHAREDIR=${PREFIX}/share#Directory for arch-neutral files.
+ LIBEXECDIR=${PREFIX}/share #Directory for executable scripts.
+@@ -10,7 +10,7 @@
+ CONFDIR=/etc#Directory where subsystem configurations are installed
+ SBINDIR=/sbin #Directory where system administration programs are installed
+ MANDIR=${PREFIX}/man#Directory where manpages are installed.
+-INITDIR=etc/init.d #Directory where SysV init scripts are installed.
++INITDIR=/etc/init.d #Directory where SysV init scripts are installed.
+ INITFILE=$PRODUCT #Name of the product's installed SysV init script
+ INITSOURCE=init.sh #Name
[OpenWrt-Devel] [PATCH] lsm-0.131 update event script
This patch updates the lsm event script, shorewall-lite part has been moved to
/etc/lsm/script.d/
The shorewall-lite part is included in the shorewall-lite-4.5.6.2 package.
Signed-off-by: Edy Corak i...@loenshotel.de
Index: files/lsm.conf
===
--- files/lsm.conf (Revision 33201)
+++ files/lsm.conf (Arbeitskopie)
@@ -8,10 +8,9 @@
# Debug level: 0 .. 8 are normal, 9 gives lots of stuff and 100 doesn't
# bother to detach
#
-#debug=10
-#debug=9
+# debug=10
+# debug=9
debug=8
-# reopen_on_enodev=1
#
# Defaults for the connection entries
@@ -38,5 +37,3 @@
}
include /etc/lsm/connections.conf
-
-#EOF
Index: files/lsm_script
===
--- files/lsm_script (Revision 33201)
+++ files/lsm_script (Arbeitskopie)
@@ -22,16 +22,6 @@
CONS_MISS=${12}
AVG_RTT=${13}
-if [ -f /usr/share/shorewall-lite/lib.base ]; then
-VARDIR=/etc/shorewall-lite/state
-STATEDIR=/etc/shorewall-lite
-else
-VARDIR=/var/lib/shorewall
-STATEDIR=/etc/shorewall
-fi
-
-[ -f ${STATEDIR}/vardir ] . ${STATEDIR}/vardir
-
cat EOM | ssmtp ${WARN_EMAIL}
Subject: LSM: ${NAME} ${STATE}, DEV ${DEVICE}
@@ -62,16 +52,12 @@
EOM
-if [ ${STATE} = up ]; then
-echo 0 ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
-${VARDIR}/firewall enable ${DEVICE}
-else
-echo 1 ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
-${VARDIR}/firewall disable ${DEVICE}
-fi
+cd /etc/lsm/script.d/
+for script in $(ls); do
+ if [ ! -x $script ]; then
+ continue
+ fi
+ ./$script $@
+done
-/sbin/shorewall-lite show routing /var/log/lsm
-
exit 0
-
-#EOF
signature.asc
Description: Digital signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] shorewall-lite: update to 4.5.6.2
This patch updates shorewall-lite to current stable release 4.5.6.2
Please note:
The new package shorewall-core 4.5.6.2 is required by this shorewall-lite
version and perlbase-digest.
Signed-off-by: Edy Corak i...@loenshotel.de
Index: Makefile
===
--- Makefile (Revision 33177)
+++ Makefile (Arbeitskopie)
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2008-2011 OpenWrt.org
+# Copyright (C) 2008-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,33 +8,39 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-lite
-PKG_VERSION:=4.4.27.3
-PKG_DIRECTORY:=4.4.27
-PKG_RELEASE:=4
+PKG_VERSION:=4.5.6.2
+PKG_DIRECTORY:=4.5.6
+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)/ \
- http://slovakia.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
- http://shorewall.de/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
- http://www.shorewall.com.au/4.4/shorewall-$(PKG_DIRECTORY)/ \
- 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_URL:=http://www.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://www1.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://slovakia.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://shorewall.de/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://www.shorewall.com.au/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://shorewall.infohiiway.com/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://www.shorewall.com.ar/pub/shorewall/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=40be496c0d512d885b7b0f64204bc235
+PKG_MD5SUM:=270b746494e42a09bbf95aaa53f029df
include $(INCLUDE_DIR)/package.mk
define Package/shorewall-lite
SECTION:=net
CATEGORY:=Network
- DEPENDS:=+ip +iptables
+ DEPENDS:=+ip +iptables +shorewall-core +perlbase-digest
TITLE:=Shorewall Lite
URL:=http://www.shorewall.net/
SUBMENU:=Firewall
endef
define Package/shorewall-lite/description
- Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
+ The Shoreline Firewall, is high-level tool for configuring Netfilter.
+
+ Shorewall allows for central administration of multiple IPv4 firewalls
+ through use of Shorewall lite. The full Shorewall product is installed
+ on a central administrative system where compiled Shorewall scripts are
+ generated. These scripts are copied to the firewall systems where they
+ run under the control of Shorewall-lite.
endef
define Package/shorewall-lite/conffiles
@@ -42,8 +48,11 @@
/etc/shorewall-lite/vardir
endef
+CONFIGURE_ARGS += \
+ vendor=linux
+
define Build/Compile
- PREFIX=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
+ DESTDIR=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
endef
define Package/shorewall-lite/install
@@ -51,12 +60,13 @@
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/etc/lsm/script.d
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
- $(INSTALL_DIR) $(1)/etc/shorewall-lite
+ $(INSTALL_DIR) $(1)/etc/shorewall-lite/state
$(INSTALL_DIR) $(1)/usr/share
$(INSTALL_BIN) ./files/shorewall-lite.init $(1)/etc/init.d/shorewall-lite
$(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall-lite
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/shorewall-lite $(1)/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/shorewall-lite $(1)/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall-lite $(1)/usr/share
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall-lite/shorecap $(1)/usr/share/shorewall-lite
$(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall-lite
$(INSTALL_BIN) ./files/lsm_script $(1)/etc/lsm/script.d/45_shorewall-lite
$(CP) $(PKG_INSTALL_DIR)/etc/shorewall-lite $(1)/etc
Index: files/lsm_script
===
--- files/lsm_script (Revision 33177)
+++ files/lsm_script (Arbeitskopie)
@@ -6,6 +6,8 @@
# License: GPLv2
#
+DATE=$(/bin/date)
+
STATE=${1}
NAME=${2}
CHECKIP=${3}
@@ -21,23 +23,55 @@
AVG_RTT=${13}
if [ -f /usr/share/shorewall-lite/lib.base ]; then
- VARDIR=/var/lib/shorewall-lite
- STATEDIR=/etc/shorewall-lite
+VARDIR=/etc/shorewall-lite/state
+STATEDIR=/etc/shorewall-lite
else
- VARDIR=/var/lib/shorewall
- STATEDIR=/etc/shorewall
+VARDIR=/var/lib/shorewall
+STATEDIR=/etc/shorewall
fi
[ -f ${STATEDIR}/vardir ] . ${STATEDIR}/vardir
+cat EOM | ssmtp ${WARN_EMAIL}
+Subject: LSM: ${NAME} ${STATE}, DEV ${DEVICE}
+
+Hi,
+
+Your connection ${NAME} has changed it's state to ${STATE} at ${DATE}.
+
+Following parameters were passed:
+
+newstate = ${STATE}
+name = ${NAME}
+checkip
[OpenWrt-Devel] New package shorewall-core 4.5.6.2
New package shorewall-core, current stable release 4.5.6.2
The Shoreline Firewall, is high-level tool for configuring Netfilter.
This package provides the core Shorewall libraries installed in
/usr/share/shorewall/,
which are required for the rest of the Shorewall packages to work.
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/110-lib.common.patch
===
--- patches/110-lib.common.patch (Revision 0)
+++ patches/110-lib.common.patch (Revision 0)
@@ -0,0 +1,20 @@
+--- a/lib.common 2012-08-08 16:29:23.0 +0200
b/lib.common 2012-08-13 10:14:23.574529864 +0200
+@@ -372,7 +372,7 @@
+
+ [ -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
+
+ [ -d /sys/module/ ] || MODULES=$(lsmod | cut -d ' ' -f1)
+
+@@ -411,7 +411,7 @@
+
+ [ -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
+
+ for directory in $(split $MODULESDIR); do
+ [ -d $directory ] moduledirectories=$moduledirectories $directory
Index: patches/100-shorewallrc.default.patch
===
--- patches/100-shorewallrc.default.patch (Revision 0)
+++ patches/100-shorewallrc.default.patch (Revision 0)
@@ -0,0 +1,11 @@
+--- a/shorewallrc.default 2012-08-08 16:29:23.0 +0200
b/shorewallrc.default 2012-08-13 10:15:46.769381221 +0200
+@@ -2,7 +2,7 @@
+ # Default Shorewall 4.5 rc file
+ #
+ HOST=linux #Generic Linux
+-BUILD= #Default is to detect the build system
++BUILD=linux #Default is to detect the build system
+ PREFIX=/usr #Top-level directory for shared files, libraries, etc.
+ SHAREDIR=${PREFIX}/share#Directory for arch-neutral files.
+ LIBEXECDIR=${PREFIX}/share #Directory for executable scripts.
Index: Makefile
===
--- Makefile (Revision 0)
+++ Makefile (Revision 0)
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=shorewall-core
+PKG_VERSION:=4.5.6.2
+PKG_DIRECTORY:=4.5.6
+PKG_RELEASE:=3
+
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://www1.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://slovakia.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://shorewall.de/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://www.shorewall.com.au/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://shorewall.infohiiway.com/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \
+ http://www.shorewall.com.ar/pub/shorewall/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=909f32fb6861886d7a9c74779d1ff04f
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/shorewall-core
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+ip +iptables +perlbase-digest
+ TITLE:=Shorewall Core
+ URL:=http://www.shorewall.net/
+ SUBMENU:=Firewall
+endef
+
+define Package/shorewall-core/description
+ The Shoreline Firewall, is high-level tool for configuring Netfilter.
+ This package provides the core Shorewall libraries installed in /usr/share/shorewall/,
+ which are required for the rest of the Shorewall packages to work.
+endef
+
+define Package/shorewall-core/conffiles
+ /usr/share/shorewall/shorewallrc
+endef
+
+CONFIGURE_ARGS += \
+ vendor=linux
+
+define Build/Compile
+ DESTDIR=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
+endef
+
+define Package/shorewall-core/install
+ $(INSTALL_DIR) $(1)/usr/share
+ $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall $(1)/usr/share
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall/wait4ifup $(1)/usr/share/shorewall
+endef
+
+$(eval $(call BuildPackage,shorewall-core))
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] link state monitor (lsm): update to 0.131
This patch updates link state monitor (lsm) to release 0.131,
add sample connections.conf and update lsm.conf and lsm_script
Signed-off-by: Edy Corak i...@loenshotel.de
Index: Makefile
===
--- Makefile (Revision 32449)
+++ Makefile (Arbeitskopie)
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=lsm
-PKG_VERSION:=0.60
-PKG_RELEASE:=3
+PKG_VERSION:=0.131
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://lsm.foobar.fi/download
-PKG_MD5SUM:=f4748308c0a1caa98d7e756778954116
+PKG_MD5SUM:=c3ff15f5e0d3988a1a45f35392639d40
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
@@ -48,12 +48,14 @@
$(INSTALL_DIR) $(1)/etc/lsm
$(INSTALL_DIR) $(1)/etc/lsm/script.d
$(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DATA) ./files/connections.conf $(1)/etc/lsm/connections.conf
$(INSTALL_DATA) ./files/lsm.conf $(1)/etc/lsm/lsm.conf
$(INSTALL_BIN) ./files/lsm_script $(1)/etc/lsm/script
$(INSTALL_BIN) ./files/lsm.init $(1)/etc/init.d/lsm
endef
define Package/lsm/conffiles
+/etc/lsm/connections.conf
/etc/lsm/lsm.conf
endef
Index: files/connections.conf
===
--- files/connections.conf (Revision 0)
+++ files/connections.conf (Revision 0)
@@ -0,0 +1,13 @@
+connection {
+ name=Provider1
+ checkip=1.1.1.1
+ device=pppoe-wan
+ ttl=2
+}
+
+connection {
+ name=Provider2
+ checkip=2.2.2.2
+ device=eth0.2
+ ttl=1
+}
Index: files/lsm.conf
===
--- files/lsm.conf (Revision 32449)
+++ files/lsm.conf (Arbeitskopie)
@@ -1,4 +1,3 @@
-
#
# (C) 2009 Mika Ilmaranta ilmis at nullnet.fi
#
@@ -12,7 +11,7 @@
#debug=10
#debug=9
debug=8
-reopen_on_enodev=1
+# reopen_on_enodev=1
#
# Defaults for the connection entries
@@ -21,7 +20,7 @@
name=defaults
checkip=127.0.0.1
eventscript=/etc/lsm/script
- max_packet_loss=15
+ max_packet_loss=20
max_successive_pkts_lost=7
min_packet_loss=5
min_successive_pkts_rcvd=10
Index: files/lsm_script
===
--- files/lsm_script (Revision 32449)
+++ files/lsm_script (Arbeitskopie)
@@ -1,14 +1,11 @@
#!/bin/sh
#
-# (C) 2009 Mika Ilmaranta ilmis at nullnet.fi
+# (C) 2009 Mika Ilmaranta il...@nullnet.fi
+# (C) 2009 Tom Eastep teas...@shorewall.net
#
# License: GPLv2
#
-#
-# default event handling script
-#
-
DATE=$(/bin/date)
STATE=${1}
@@ -25,42 +22,56 @@
CONS_MISS=${12}
AVG_RTT=${13}
-cat EOM | mail -s LSM: ${NAME} ${STATE}, IP ${CHECKIP} ${WARN_EMAIL}
+if [ -f /usr/share/shorewall-lite/lib.base ]; then
+VARDIR=/etc/shorewall-lite/state
+STATEDIR=/etc/shorewall-lite
+else
+VARDIR=/var/lib/shorewall
+STATEDIR=/etc/shorewall
+fi
+[ -f ${STATEDIR}/vardir ] . ${STATEDIR}/vardir
+
+cat EOM | ssmtp ${WARN_EMAIL}
+Subject: LSM: ${NAME} ${STATE}, DEV ${DEVICE}
+
Hi,
Your connection ${NAME} has changed it's state to ${STATE} at ${DATE}.
Following parameters were passed:
+
newstate = ${STATE}
name = ${NAME}
checkip = ${CHECKIP}
device = ${DEVICE}
warn_email = ${WARN_EMAIL}
-Packet statuses:
+Packet counters:
+
replied = ${REPLIED} packets replied
waiting = ${WAITING} packets waiting for reply
-timeout = ${TIMEOUT} packets that have timeout (= packet loss)
+timeout = ${TIMEOUT} packets that have timed out (= packet loss)
reply_late = ${REPLY_LATE} packets that received a reply after timeout
cons_rcvd= ${CONS_RCVD} consecutively received replies in sequence
cons_wait= ${CONS_WAIT} consecutive packets waiting for reply
cons_miss= ${CONS_MISS} consecutive packets that have timed out
-avg_rtt = ${AVG_RTT} average rtt [usec], calculated from received packets
+avg_rtt = ${AVG_RTT} average rtt, notice that waiting and timed out packets have rtt = 0 when calculating this
-BR,
-Your LSM installation
+Your LSM Daemon
EOM
-cd /etc/lsm/script.d/
-for script in $(ls); do
-if [ ! -x $script ]; then
-continue
-fi
-./$script $@
-done
+if [ ${STATE} = up ]; then
+echo 0 ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
+${VARDIR}/firewall enable ${DEVICE}
+else
+echo 1 ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
+${VARDIR}/firewall disable ${DEVICE}
+fi
-exit 0;
+/sbin/shorewall-lite show routing /var/log/lsm
+exit 0
+
#EOF
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] link state monitor (lsm): update to 0.131
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Am 19.06.2012 19:07, schrieb Brian J. Murrell: On 12-06-19 12:37 PM, Edy Corak wrote: This patch updates link state monitor (lsm) to release 0.131, add sample connections.conf and update lsm.conf and lsm_script Signed-off-by: Edy Corak i...@loenshotel.de Index: files/lsm.conf === --- files/lsm.conf (Revision 32449) +++ files/lsm.conf (Arbeitskopie) @@ -1,4 +1,3 @@ - # # (C) 2009 Mika Ilmaranta ilmis at nullnet.fi # @@ -12,7 +11,7 @@ #debug=10 #debug=9 debug=8 -reopen_on_enodev=1 +# reopen_on_enodev=1 # # Defaults for the connection entries Why change the default state of reopen_on_enodev? b. Hi Brian, thanks for your question. Here is the reason why: lsm[7093]: config.c: read_config: unrecognised global config option on line 2 reopen_on_enodev=1 Kind regards Edy Corak -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/gyHEACgkQO2b63zoFZqGaAwCfU6w4V5ZeeXxrouKt1LKgTadg tb0AoNKLrbCZXkfoIChv0AHsvDCNtoc8 =fqAc -END PGP SIGNATURE- smime.p7s Description: S/MIME Kryptografische Unterschrift ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] shorewall-lite: update to 4.4.27.3
This patch updates shorewall-lite to stable release 4.4.27.3 and the lsm_script
Signed-off-by: Edy Corak i...@loenshotel.de
Index: files/shorewall-lite.init
===
--- files/shorewall-lite.init (Revision 32030)
+++ files/shorewall-lite.init (Arbeitskopie)
@@ -4,7 +4,7 @@
start() {
touch /var/log/messages
mkdir -p /var/lock/subsys
- /sbin/shorewall-lite -qq start -f
+ /sbin/shorewall-lite -qq start
}
stop() {
Index: files/lsm_script
===
--- files/lsm_script (Revision 32030)
+++ files/lsm_script (Arbeitskopie)
@@ -1,4 +1,10 @@
#!/bin/sh
+#
+# (C) 2009 Mika Ilmaranta il...@nullnet.fi
+# (C) 2009 Tom Eastep teas...@shorewall.net
+#
+# License: GPLv2
+#
STATE=${1}
NAME=${2}
@@ -15,19 +21,23 @@
AVG_RTT=${13}
if [ -f /usr/share/shorewall-lite/lib.base ]; then
-VARDIR=/var/lib/shorewall-lite
-STATEDIR=/etc/shorewall-lite
+ VARDIR=/var/lib/shorewall-lite
+ STATEDIR=/etc/shorewall-lite
else
-VARDIR=/var/lib/shorewall
-STATEDIR=/etc/shorewall
+ VARDIR=/var/lib/shorewall
+ STATEDIR=/etc/shorewall
fi
[ -f ${STATEDIR}/vardir ] . ${STATEDIR}/vardir
-[ ${STATE} = up ] state=0 || state=1
+if [ ${STATE} = up ]; then
+ echo 0 ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
+ ${VARDIR}/firewall enable ${DEVICE}
+else
+ echo 1 ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
+ ${VARDIR}/firewall disable ${DEVICE}
+fi
-echo $state ${VARDIR}/${DEVICE}.status
+/sbin/shorewall-lite show routing /var/log/lsm
-/sbin/shorewall-lite restart -f /var/log/lsm 21
-
-/sbin/shorewall-lite show routing /var/log/lsm
+exit 0
Index: patches/120-LOGFILE.patch
===
--- patches/120-LOGFILE.patch (Revision 32030)
+++ patches/120-LOGFILE.patch (Arbeitskopie)
@@ -1,5 +1,5 @@
a/shorewall-lite.conf 2009-12-05 22:37:43.0 -0500
-+++ b/shorewall-lite.conf 2009-12-05 22:37:51.0 -0500
+--- a/shorewall-lite.conf 2012-01-20 16:30:06.0 +0100
b/shorewall-lite.conf 2012-06-03 11:46:48.389503776 +0200
@@ -28,7 +28,7 @@
# L O G G I N G
###
@@ -7,5 +7,5 @@
-LOGFILE=
+LOGFILE=/dev/null
- LOGFORMAT=
-
+ ###
+ # L O C A T I O N O F F I L E S A N D D I R E C T O R I E S
Index: patches/110-MODULESDIR.patch
===
--- patches/110-MODULESDIR.patch (Revision 32030)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,20 +1,20 @@
a/lib.common
-+++ b/lib.common
-@@ -273,7 +273,7 @@ reload_kernel_modules() {
+--- a/lib.common 2012-01-21 14:21:50.0 +0100
b/lib.common 2012-06-03 11:52:35.115967105 +0200
+@@ -328,7 +328,7 @@
[ -z $MODULESDIR ] \
uname=$(uname -r) \
-- MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/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/ipv4/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
+- 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
- MODULES=$(lsmod | cut -d ' ' -f1)
+ [ -d /sys/module/ ] || MODULES=$(lsmod | cut -d ' ' -f1)
-@@ -312,7 +312,7 @@ load_kernel_modules() # $1 = Yes, if we
+@@ -367,7 +367,7 @@
[ -z $MODULESDIR ] \
uname=$(uname -r) \
-- MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/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/ipv4/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
+- 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
[OpenWrt-Devel] [PATCH] shorewall6-lite: update to 4.4.27.2
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
[OpenWrt-Devel] [PATCH] shorewall-lite: update to 4.4.27.2
This patch updates shorewall-lite to current stable release 4.4.27.2
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/110-MODULESDIR.patch
===
--- patches/110-MODULESDIR.patch (Revision 29755)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,20 +1,21 @@
--- a/lib.common
+++ b/lib.common
-@@ -220,7 +220,7 @@ reload_kernel_modules() {
+@@ -331,7 +331,7 @@ reload_kernel_modules() {
[ -z $MODULESDIR ] \
uname=$(uname -r) \
-- MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/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/ipv4/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
+- 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
- MODULES=$(lsmod | cut -d ' ' -f1)
+ [ -d /sys/module/ ] || MODULES=$(lsmod | cut -d ' ' -f1)
-@@ -259,7 +259,7 @@ load_kernel_modules() # $1 = Yes, if we
+@@ -370,7 +370,7 @@ load_kernel_modules() # $1 = Yes, if we
[ -z $MODULESDIR ] \
uname=$(uname -r) \
-- MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/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/ipv4/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
+- 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: Makefile
===
--- Makefile (Revision 29755)
+++ Makefile (Arbeitskopie)
@@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-lite
-PKG_VERSION:=4.4.12.2
-PKG_DIRECTORY:=4.4.12
-PKG_RELEASE:=2
+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,7 +20,7 @@
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:=b030e988c36fc1ef8c0e27447faef2a6
+PKG_MD5SUM:=6d6fdcaec13802cfa932eda65b0009c3
include $(INCLUDE_DIR)/package.mk
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] shorewall-lite: update to 4.4.25.1
This patch updates shorewall-lite to current stable release 4.4.25.1
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/110-MODULESDIR.patch
===
--- patches/110-MODULESDIR.patch (Revision 28762)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,6 +1,6 @@
--- a/lib.common
+++ b/lib.common
-@@ -220,7 +220,7 @@ reload_kernel_modules() {
+@@ -273,7 +273,7 @@ reload_kernel_modules() {
[ -z $MODULESDIR ] \
uname=$(uname -r) \
@@ -9,7 +9,7 @@
MODULES=$(lsmod | cut -d ' ' -f1)
-@@ -259,7 +259,7 @@ load_kernel_modules() # $1 = Yes, if we
+@@ -312,7 +312,7 @@ load_kernel_modules() # $1 = Yes, if we
[ -z $MODULESDIR ] \
uname=$(uname -r) \
Index: Makefile
===
--- Makefile (Revision 28762)
+++ Makefile (Arbeitskopie)
@@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-lite
-PKG_VERSION:=4.4.12.2
-PKG_DIRECTORY:=4.4.12
+PKG_VERSION:=4.4.25.1
+PKG_DIRECTORY:=4.4.25
PKG_RELEASE:=2
PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
@@ -20,7 +20,7 @@
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:=b030e988c36fc1ef8c0e27447faef2a6
+PKG_MD5SUM:=fd1e777b37b9a8658fafa87b84732475
include $(INCLUDE_DIR)/package.mk
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] shorewall6-lite: update to 4.4.25.1
This patch updates shorewall6-lite to current stable release 4.4.25.1
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/120-LOGFILE.patch
===
--- patches/120-LOGFILE.patch (Revision 28762)
+++ patches/120-LOGFILE.patch (Arbeitskopie)
@@ -7,5 +7,4 @@
-LOGFILE=
+LOGFILE=/dev/null
- LOGFORMAT=
-
+
Index: patches/130-portability.patch
===
--- patches/130-portability.patch (Revision 28762)
+++ 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 28762)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,15 +1,15 @@
a/lib.base
-+++ b/lib.base
-@@ -260,7 +260,7 @@
+--- a/lib.common
b/lib.common
+@@ -316,7 +316,7 @@
[ -n ${MODULE_SUFFIX:=o gz ko o.gz ko.gz} ]
-[ -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 @@
+@@ -351,7 +351,7 @@
[ -n ${MODULE_SUFFIX:=o gz ko o.gz ko.gz} ]
[ -z $MODULESDIR ] \
Index: patches/100-hostname.patch
===
--- patches/100-hostname.patch (Revision 28762)
+++ 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 28762)
+++ 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.25.1
+PKG_DIRECTORY:=4.4.25
+PKG_RELEASE:=2
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:=1f69ad54b9f0bb1323b58f0212d0bf9f
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
[OpenWrt-Devel] [PATCH] shorewall-lite: update to 4.4.25
This patch updates shorewall-lite to current stable release 4.4.25
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/110-MODULESDIR.patch
===
--- patches/110-MODULESDIR.patch (Revision 28708)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,6 +1,6 @@
--- a/lib.common
+++ b/lib.common
-@@ -220,7 +220,7 @@ reload_kernel_modules() {
+@@ -273,7 +273,7 @@ reload_kernel_modules() {
[ -z $MODULESDIR ] \
uname=$(uname -r) \
@@ -9,7 +9,7 @@
MODULES=$(lsmod | cut -d ' ' -f1)
-@@ -259,7 +259,7 @@ load_kernel_modules() # $1 = Yes, if we
+@@ -312,7 +312,7 @@ load_kernel_modules() # $1 = Yes, if we
[ -z $MODULESDIR ] \
uname=$(uname -r) \
Index: Makefile
===
--- Makefile (Revision 28708)
+++ Makefile (Arbeitskopie)
@@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-lite
-PKG_VERSION:=4.4.12.2
-PKG_DIRECTORY:=4.4.12
-PKG_RELEASE:=2
+PKG_VERSION:=4.4.25
+PKG_DIRECTORY:=4.4.25
+PKG_RELEASE:=1
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,7 +20,7 @@
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:=b030e988c36fc1ef8c0e27447faef2a6
+PKG_MD5SUM:=0180beb2d6a2f090b3acf21bc321d160
include $(INCLUDE_DIR)/package.mk
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] shorewall6-lite: update to 4.4.25
This patch updates shorewall6-lite to current stable release 4.4.25
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/120-LOGFILE.patch
===
--- patches/120-LOGFILE.patch (Revision 28708)
+++ patches/120-LOGFILE.patch (Arbeitskopie)
@@ -7,5 +7,4 @@
-LOGFILE=
+LOGFILE=/dev/null
- LOGFORMAT=
-
+
Index: patches/130-portability.patch
===
--- patches/130-portability.patch (Revision 28708)
+++ 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 28708)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,15 +1,15 @@
a/lib.base
-+++ b/lib.base
-@@ -260,7 +260,7 @@
+--- a/lib.common
b/lib.common
+@@ -316,7 +316,7 @@
[ -n ${MODULE_SUFFIX:=o gz ko o.gz ko.gz} ]
-[ -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 @@
+@@ -351,7 +351,7 @@
[ -n ${MODULE_SUFFIX:=o gz ko o.gz ko.gz} ]
[ -z $MODULESDIR ] \
Index: patches/100-hostname.patch
===
--- patches/100-hostname.patch (Revision 28708)
+++ 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 28708)
+++ Makefile (Arbeitskopie)
@@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall6-lite
-PKG_VERSION:=4.4.5.4
-PKG_DIRECTORY:=4.4.5
+PKG_VERSION:=4.4.25
+PKG_DIRECTORY:=4.4.25
PKG_RELEASE:=1
PKG_SOURCE_URL:=http://www.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:=64ae6ba72db3930e8e464feb4a4d14df
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
[OpenWrt-Devel] [PATCH] shorewall6-lite: update to 4.4.24
This patch updates shorewall6-lite to current stable release 4.4.24
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/120-LOGFILE.patch
===
--- patches/120-LOGFILE.patch (Revision 28448)
+++ patches/120-LOGFILE.patch (Arbeitskopie)
@@ -7,5 +7,4 @@
-LOGFILE=
+LOGFILE=/dev/null
- LOGFORMAT=
-
+
Index: patches/130-portability.patch
===
--- patches/130-portability.patch (Revision 28448)
+++ 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 28448)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,15 +1,15 @@
a/lib.base
-+++ b/lib.base
-@@ -260,7 +260,7 @@
+--- a/lib.common
b/lib.common
+@@ -316,7 +316,7 @@
[ -n ${MODULE_SUFFIX:=o gz ko o.gz ko.gz} ]
-[ -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 @@
+@@ -351,7 +351,7 @@
[ -n ${MODULE_SUFFIX:=o gz ko o.gz ko.gz} ]
[ -z $MODULESDIR ] \
Index: patches/100-hostname.patch
===
--- patches/100-hostname.patch (Revision 28448)
+++ 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 28448)
+++ Makefile (Arbeitskopie)
@@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall6-lite
-PKG_VERSION:=4.4.5.4
-PKG_DIRECTORY:=4.4.5
+PKG_VERSION:=4.4.24
+PKG_DIRECTORY:=4.4.24
PKG_RELEASE:=1
PKG_SOURCE_URL:=http://www.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:=a52f186f778eb89eebf9b4e5e16c1b47
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
[OpenWrt-Devel] [PATCH] shorewall-lite: update to 4.4.24
This patch updates shorewall-lite to current stable release 4.4.24
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/110-MODULESDIR.patch
===
--- patches/110-MODULESDIR.patch (Revision 28448)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,6 +1,6 @@
--- a/lib.common
+++ b/lib.common
-@@ -220,7 +220,7 @@ reload_kernel_modules() {
+@@ -273,7 +273,7 @@ reload_kernel_modules() {
[ -z $MODULESDIR ] \
uname=$(uname -r) \
@@ -9,7 +9,7 @@
MODULES=$(lsmod | cut -d ' ' -f1)
-@@ -259,7 +259,7 @@ load_kernel_modules() # $1 = Yes, if we
+@@ -312,7 +312,7 @@ load_kernel_modules() # $1 = Yes, if we
[ -z $MODULESDIR ] \
uname=$(uname -r) \
Index: Makefile
===
--- Makefile (Revision 28448)
+++ Makefile (Arbeitskopie)
@@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-lite
-PKG_VERSION:=4.4.12.2
-PKG_DIRECTORY:=4.4.12
-PKG_RELEASE:=2
+PKG_VERSION:=4.4.24
+PKG_DIRECTORY:=4.4.24
+PKG_RELEASE:=1
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,7 +20,7 @@
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:=b030e988c36fc1ef8c0e27447faef2a6
+PKG_MD5SUM:=b2b8accd7b87b9d9d091d72c290813c3
include $(INCLUDE_DIR)/package.mk
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] shorewall6-lite: Makefile update to 4.4.22.3
This is a Makefile patch to update shorewall6-lite to 4.4.22.3 Signed-off-by: Edy Corak i...@loenshotel.de Index: Makefile === --- Makefile (Revision 28064) +++ 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.22.3 +PKG_DIRECTORY:=4.4.22 +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:=ad9039a5b47f7b6ca54a247352b057a5 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
[OpenWrt-Devel] [PATCH 2/2] shorewall6-lite: MODULESDIR and LOGFILE patch
This is a 110-MODULESDIR.patch and 120-LOGFILE.patch for shorewall6-lite
4.4.22.3
Delete 100-hostname.patch and 130-portability.patch
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/120-LOGFILE.patch
===
--- patches/120-LOGFILE.patch (Revision 28064)
+++ patches/120-LOGFILE.patch (Arbeitskopie)
@@ -7,5 +7,4 @@
-LOGFILE=
+LOGFILE=/dev/null
- LOGFORMAT=
-
+
Index: patches/130-portability.patch
===
--- patches/130-portability.patch (Revision 28064)
+++ 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 28064)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,6 +1,6 @@
a/lib.base
-+++ b/lib.base
-@@ -260,7 +260,7 @@
+--- a/lib.common
b/lib.common
+@@ -292,7 +292,7 @@
[ -n ${MODULE_SUFFIX:=o gz ko o.gz ko.gz} ]
@@ -9,7 +9,7 @@
MODULES=$(lsmod | cut -d ' ' -f1)
for directory in $(split $MODULESDIR); do
-@@ -296,7 +296,7 @@
+@@ -328,7 +328,7 @@
[ -n ${MODULE_SUFFIX:=o gz ko o.gz ko.gz} ]
[ -z $MODULESDIR ] \
Index: patches/100-hostname.patch
===
--- patches/100-hostname.patch (Revision 28064)
+++ 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)} ]
-
- }
-
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] shorewall-lite: Makefile update to 4.4.22.3
This is a Makefile patch to update shorewall-lite to 4.4.22.3 Signed-off-by: Edy Corak i...@loenshotel.de Index: Makefile === --- Makefile (Revision 28064) +++ Makefile (Arbeitskopie) @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shorewall-lite -PKG_VERSION:=4.4.12.2 -PKG_DIRECTORY:=4.4.12 -PKG_RELEASE:=2 +PKG_VERSION:=4.4.22.3 +PKG_DIRECTORY:=4.4.22 +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,7 +20,7 @@ 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:=b030e988c36fc1ef8c0e27447faef2a6 +PKG_MD5SUM:=8cdd6cdef0f2822d3ee9e649f9e69d77 include $(INCLUDE_DIR)/package.mk ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/2] shorewall-lite: 110-MODULESDIR.patch
This is a 110-MODULESDIR.patch for shorewall-lite 4.4.22.3
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/110-MODULESDIR.patch
===
--- patches/110-MODULESDIR.patch (Revision 28064)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,6 +1,6 @@
--- a/lib.common
+++ b/lib.common
-@@ -220,7 +220,7 @@ reload_kernel_modules() {
+@@ -273,7 +273,7 @@ reload_kernel_modules() {
[ -z $MODULESDIR ] \
uname=$(uname -r) \
@@ -9,7 +9,7 @@
MODULES=$(lsmod | cut -d ' ' -f1)
-@@ -259,7 +259,7 @@ load_kernel_modules() # $1 = Yes, if we
+@@ -312,7 +312,7 @@ load_kernel_modules() # $1 = Yes, if we
[ -z $MODULESDIR ] \
uname=$(uname -r) \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] shorewall-lite: Makefile update to 4.4.22.2
This is a Makefile patch to update shorewall-lite to 4.4.22.2 Signed-off-by: Edy Corak i...@loenshotel.de Index: Makefile === --- Makefile (Revision 28025) +++ Makefile (Arbeitskopie) @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shorewall-lite -PKG_VERSION:=4.4.12.2 -PKG_DIRECTORY:=4.4.12 -PKG_RELEASE:=2 +PKG_VERSION:=4.4.22.2 +PKG_DIRECTORY:=4.4.22 +PKG_RELEASE:=1 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,7 +20,7 @@ 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:=b030e988c36fc1ef8c0e27447faef2a6 +PKG_MD5SUM:=75fdb78cf1de06c6c25fddcad0a433ba include $(INCLUDE_DIR)/package.mk ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/2] shorewall-lite: 110-MODULESDIR.patch
This is a 110-MODULESDIR.patch for shorewall-lite 4.4.22.2
Signed-off-by: Edy Corak e...@loenshotel.de
Index: patches/110-MODULESDIR.patch
===
--- patches/110-MODULESDIR.patch (Revision 28025)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,6 +1,6 @@
--- a/lib.common
+++ b/lib.common
-@@ -220,7 +220,7 @@ reload_kernel_modules() {
+@@ -273,7 +273,7 @@ reload_kernel_modules() {
[ -z $MODULESDIR ] \
uname=$(uname -r) \
@@ -9,7 +9,7 @@
MODULES=$(lsmod | cut -d ' ' -f1)
-@@ -259,7 +259,7 @@ load_kernel_modules() # $1 = Yes, if we
+@@ -312,7 +312,7 @@ load_kernel_modules() # $1 = Yes, if we
[ -z $MODULESDIR ] \
uname=$(uname -r) \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] shorewall6-lite: Makefile update to 4.4.22.2
This is a Makefile patch to update shorewall6-lite to 4.4.22.2 Signed-off-by: Edy Corak i...@loenshotel.de Index: Makefile === --- Makefile (Revision 28025) +++ Makefile (Arbeitskopie) @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shorewall6-lite -PKG_VERSION:=4.4.5.4 -PKG_DIRECTORY:=4.4.5 +PKG_VERSION:=4.4.22.2 +PKG_DIRECTORY:=4.4.22 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ @@ -20,7 +20,7 @@ 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:=3ad7ba3790388bb562d3c937ba02fa31 include $(INCLUDE_DIR)/package.mk ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/2] shorewall6-lite: MODULESDIR and LOGFILE patch
This is a 110-MODULESDIR.patch and 120-LOGFILE.patch for shorewall6-lite
4.4.22.2
Signed-off-by: Edy Corak i...@loenshotel.de
Index: patches/110-MODULESDIR.patch
===
--- patches/110-MODULESDIR.patch (Revision 28025)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -1,6 +1,6 @@
a/lib.base
-+++ b/lib.base
-@@ -260,7 +260,7 @@
+--- a/lib.common
b/lib.common
+@@ -292,7 +292,7 @@
[ -n ${MODULE_SUFFIX:=o gz ko o.gz ko.gz} ]
@@ -9,7 +9,7 @@
MODULES=$(lsmod | cut -d ' ' -f1)
for directory in $(split $MODULESDIR); do
-@@ -296,7 +296,7 @@
+@@ -328,7 +328,7 @@
[ -n ${MODULE_SUFFIX:=o gz ko o.gz ko.gz} ]
[ -z $MODULESDIR ] \
Index: patches/120-LOGFILE.patch
===
--- patches/120-LOGFILE.patch (Revision 28025)
+++ patches/120-LOGFILE.patch (Arbeitskopie)
@@ -7,5 +7,4 @@
-LOGFILE=
+LOGFILE=/dev/null
- LOGFORMAT=
-
+
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
