diff options
| -rw-r--r-- | network/shorewall6/patch-6-4.4.8.1 | 177 | ||||
| -rw-r--r-- | network/shorewall6/shorewall6.SlackBuild | 9 | ||||
| -rw-r--r-- | network/shorewall6/shorewall6.info | 10 |
3 files changed, 7 insertions, 189 deletions
diff --git a/network/shorewall6/patch-6-4.4.8.1 b/network/shorewall6/patch-6-4.4.8.1 deleted file mode 100644 index f7df6e6310..0000000000 --- a/network/shorewall6/patch-6-4.4.8.1 +++ /dev/null @@ -1,177 +0,0 @@ -diff -Naur -X /home/teastep/bin/exclude.txt shorewall6-4.4.8/changelog.txt shorewall6-4.4.8.1/changelog.txt ---- shorewall6-4.4.8/changelog.txt 2010-03-24 11:12:49.000000000 -0700 -+++ shorewall6-4.4.8.1/changelog.txt 2010-04-07 14:49:43.000000000 -0700 -@@ -1,3 +1,12 @@ -+Changes in Shorewall 4.4.8.1 -+ -+1) Correct handling of a logical interface name in the EXTERNAL column -+ of proxyarp. -+ -+2) Fix find_first_interface_address() error reporting. -+ -+3) Fix propagation of zero-valued config variables. -+ - Changes in Shorewall 4.4.8 - - 1) Correct handling of RATE LIMIT on NAT rules. -diff -Naur -X /home/teastep/bin/exclude.txt shorewall6-4.4.8/fallback.sh shorewall6-4.4.8.1/fallback.sh ---- shorewall6-4.4.8/fallback.sh 2010-03-23 08:47:56.000000000 -0700 -+++ shorewall6-4.4.8.1/fallback.sh 2010-04-07 14:49:33.000000000 -0700 -@@ -28,7 +28,7 @@ - # shown below. Simply run this script to revert to your prior version of - # Shoreline Firewall. - --VERSION=4.4.8 -+VERSION=4.4.8.1 - - usage() # $1 = exit status - { -diff -Naur -X /home/teastep/bin/exclude.txt shorewall6-4.4.8/install.sh shorewall6-4.4.8.1/install.sh ---- shorewall6-4.4.8/install.sh 2010-03-23 08:47:56.000000000 -0700 -+++ shorewall6-4.4.8.1/install.sh 2010-04-07 14:49:33.000000000 -0700 -@@ -22,7 +22,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - # - --VERSION=4.4.8 -+VERSION=4.4.8.1 - - usage() # $1 = exit status - { -diff -Naur -X /home/teastep/bin/exclude.txt shorewall6-4.4.8/releasenotes.txt shorewall6-4.4.8.1/releasenotes.txt ---- shorewall6-4.4.8/releasenotes.txt 2010-03-24 11:12:49.000000000 -0700 -+++ shorewall6-4.4.8.1/releasenotes.txt 2010-04-07 14:49:43.000000000 -0700 -@@ -1,5 +1,5 @@ - ---------------------------------------------------------------------------- -- S H O R E W A L L 4 . 4 . 8 -+ S H O R E W A L L 4 . 4 . 8 . 1 - ---------------------------------------------------------------------------- - - I. RELEASE 4.4 HIGHLIGHTS -@@ -218,6 +218,27 @@ - I I I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E - ---------------------------------------------------------------------------- - -+4.4.8.1 -+ -+1) Logical interface names in the EXTERNAL column of -+ /etc/shorewall/proxyarp were previously not mapped to their -+ corresponding physical interface names. This could cause 'start' or -+ 'restart' to fail. -+ -+2) If find_first_interface_address() cannot determine the address of -+ the passed interface, the following message is issued and the -+ process continues: -+ -+ /usr/share/shorewall/lib.common: line 438: -+ startup_error: command not found -+ -+3) If LOG_VERBOSITY=0 in shorewall.conf, then when the compiled script -+ was executed, messages such as the following would be issued: -+ -+ /var/lib/shorewall6/.restart: line 65: [: -gt: unary operator -+ expected -+4.4.8 -+ - 1) A CONTINUE rule specifying a log level would cause the compiler to - generate an incorrect rule sequence. The packet would be logged - but the CONTINUE action would not occur. -@@ -286,6 +307,11 @@ - 'shorewall refresh' executed, those new changes would not be included - in the active ruleset. - -+12) In 4.4.7, it was documented that setting the 'bridge' option in an -+ interfaces file entry also set 'routeback'. That feature was -+ incomplete with the result that 'routeback' still needed to be -+ specified. -+ - ---------------------------------------------------------------------------- - I V. K N O W N P R O B L E M S R E M A I N I N G - ---------------------------------------------------------------------------- -diff -Naur -X /home/teastep/bin/exclude.txt shorewall6-4.4.8/shorewall6 shorewall6-4.4.8.1/shorewall6 ---- shorewall6-4.4.8/shorewall6 2010-03-23 08:47:56.000000000 -0700 -+++ shorewall6-4.4.8.1/shorewall6 2010-04-07 14:49:33.000000000 -0700 -@@ -227,16 +227,20 @@ - } - - # -+# Issue an error message and die -+# -+startup_error() { -+ echo " ERROR: $@" >&2 -+ kill $$ -+ exit 1 -+} -+ -+# - # Run the appropriate compiler - # - compiler() { - pc=${PERLSHAREDIR}/compiler.pl - -- startup_error() { -- echo " ERROR: $@" >&2 -- exit 1 -- } -- - local command - command=$1 - -diff -Naur -X /home/teastep/bin/exclude.txt shorewall6-4.4.8/shorewall6.conf shorewall6-4.4.8.1/shorewall6.conf ---- shorewall6-4.4.8/shorewall6.conf 2010-03-23 08:47:56.000000000 -0700 -+++ shorewall6-4.4.8.1/shorewall6.conf 2010-04-07 14:49:33.000000000 -0700 -@@ -1,19 +1,11 @@ - ############################################################################### --# /etc/shorewalls/shorewall6.conf Version 4 - Change the following variables to --# match your setup - # --# This program is under GPL --# [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] --# --# This file should be placed in /etc/shorewall --# --# (c) 1999,2000,2001,2002,2003,2004,2005, --# 2006,2007,2008 - Tom Eastep (teastep@shorewall.net) -+# Shorewall Version 4 -- /etc/shorewall6/shorewall6.conf - # - # For information about the settings in this file, type "man shorewall6.conf" - # --# Additional information is available at --# http://www.shorewall.net/Documentation.htm#Conf -+# Manpage also online at -+# http://www.shorewall.net/manpages6/shorewall6.conf.html - ############################################################################### - # S T A R T U P E N A B L E D - ############################################################################### -diff -Naur -X /home/teastep/bin/exclude.txt shorewall6-4.4.8/shorewall6.spec shorewall6-4.4.8.1/shorewall6.spec ---- shorewall6-4.4.8/shorewall6.spec 2010-03-23 08:47:56.000000000 -0700 -+++ shorewall6-4.4.8.1/shorewall6.spec 2010-04-07 14:49:33.000000000 -0700 -@@ -1,6 +1,6 @@ - %define name shorewall6 - %define version 4.4.8 --%define release 0base -+%define release 1 - - Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. - Name: %{name} -@@ -97,6 +97,8 @@ - %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 - - %changelog -+* Thu Mar 25 2010 Tom Eastep tom@shorewall.net -+- Updated to 4.4.8-1 - * Fri Mar 19 2010 Tom Eastep tom@shorewall.net - - Updated to 4.4.8-0base - * Tue Mar 16 2010 Tom Eastep tom@shorewall.net -diff -Naur -X /home/teastep/bin/exclude.txt shorewall6-4.4.8/uninstall.sh shorewall6-4.4.8.1/uninstall.sh ---- shorewall6-4.4.8/uninstall.sh 2010-03-23 08:47:56.000000000 -0700 -+++ shorewall6-4.4.8.1/uninstall.sh 2010-04-07 14:49:33.000000000 -0700 -@@ -26,7 +26,7 @@ - # You may only use this script to uninstall the version - # shown below. Simply run this script to remove Shorewall Firewall - --VERSION=4.4.8 -+VERSION=4.4.8.1 - - usage() # $1 = exit status - { diff --git a/network/shorewall6/shorewall6.SlackBuild b/network/shorewall6/shorewall6.SlackBuild index fc3782b782..1f490237e3 100644 --- a/network/shorewall6/shorewall6.SlackBuild +++ b/network/shorewall6/shorewall6.SlackBuild @@ -24,12 +24,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=shorewall6 -VERSION=${VERSION:-4.4.8.1} +VERSION=${VERSION:-4.4.10} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -BASEVERS=4.4.8 +BASEVERS=4.4.10 CWD=$(pwd) TMP=${TMP:-/tmp/SBo} @@ -62,16 +62,13 @@ PREFIX=$PKG \ ./install.sh # Don't clobber config files +mv $PKG/etc/rc.d/rc.shorewall6 $PKG/etc/rc.d/rc.shorewall6.new ( cd $PKG/etc/shorewall6 for i in $(ls|grep -v Makefile) ; do mv $i $i.new; done ) -( cd $PKG/etc/rc.d - mv rc.shorewall6 rc.shorewall6.new -) - mkdir -p $PKG/var/lock/subsys chmod 0755 $PKG/{etc,usr/share,var/lib}/shorewall6 $PKG/var/lock/subsys chmod 0644 $PKG/etc/shorewall6/* diff --git a/network/shorewall6/shorewall6.info b/network/shorewall6/shorewall6.info index b26895076b..a77a70c4e0 100644 --- a/network/shorewall6/shorewall6.info +++ b/network/shorewall6/shorewall6.info @@ -1,12 +1,10 @@ PRGNAM="shorewall6" -VERSION="4.4.8.1" +VERSION="4.4.10" HOMEPAGE="http://www.shorewall.net" -DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.8/base/shorewall6-4.4.8.tar.bz2 \ - http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.8/patch-6-4.4.8.1" -MD5SUM="aff3cd2d714530870ca5de30e817ff46 \ - a03d51476e7844eca04cb793716c8dcf" +DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.10/base/shorewall6-4.4.10.tar.bz2" +MD5SUM="17f010c3e620ac5298f0b357ed4f9339" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="ArTourter" EMAIL="artourter@gmail.com" -APPROVED="dsomero" +APPROVED="rworkman" |