summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2005-03-28 17:23:05 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2005-03-28 17:23:05 +0000
commite6819546578b1ec6e5af51cbc9efa308000b3b9a (patch)
treeed1db1156cf9f135b0bf262a892d16649e13d563
parente8cd64bf9b445930620e7e99f03285733fbf1a94 (diff)
downloadptxdist-e6819546578b1ec6e5af51cbc9efa308000b3b9a.tar.gz
ptxdist-e6819546578b1ec6e5af51cbc9efa308000b3b9a.tar.xz
updated shorewall; patch by Rex Tsai
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@2412 33e552b5-05e3-0310-8538-816dae2090ed
-rw-r--r--CREDITS4
-rw-r--r--ChangeLog4
-rw-r--r--rules/shorewall.in17
-rw-r--r--rules/shorewall.make9
4 files changed, 30 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 7f2381336..1c2afb554 100644
--- a/CREDITS
+++ b/CREDITS
@@ -64,6 +64,10 @@ N: Jochen Striepe
E: jochen@tolot.escape.de
D: Developer
+N: Rex Tsai
+E: chihchun@debian.org.tw
+D: Developer
+
N: Thibaut Varene
E: varenet@parisc-linux.org
D: Developer
diff --git a/ChangeLog b/ChangeLog
index 04ccf48e5..6a35a2002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-28 Robert Schwebel <r.schwebel@pengutronix.de>
+
+ * shorewall: update to 2.2; patch by Rex Tsai
+
2005-03-22 Robert Schwebel <r.schwebel@pengutronix.de>
* 0.7.3 released
diff --git a/rules/shorewall.in b/rules/shorewall.in
index cdfd47f00..353a50ab4 100644
--- a/rules/shorewall.in
+++ b/rules/shorewall.in
@@ -3,5 +3,22 @@ menu "shorewall firewall "
config SHOREWALL
bool
prompt "shorewall firewall scripts"
+ help
+ The Shoreline Firewall (Shorewall) is an iptables based firewall that can be
+ used on a dedicated firewall system, a multi-function masquerade
+ gateway/server or on a standalone Linux system.
+ .
+ Shorewall supports these features:
+ * Customizable using configuration files.
+ * Supports status monitoring with an audible alarm when an "interesting"
+ packet is detected.
+ * Include a fallback script that backs out the installation of the most
+ recent version of Shoreline Firewall and an uninstall script for
+ completely uninstalling the firewall.
+ * Static NAT is supported.
+ * Proxy ARP is supported.
+ * Provides DMZ functionality.
+ * Support for IPSEC, GRE and IPIP Tunnels.
+ * Limited support for Traffic Control/Shaping
endmenu
diff --git a/rules/shorewall.make b/rules/shorewall.make
index 01e53732a..10c97d160 100644
--- a/rules/shorewall.make
+++ b/rules/shorewall.make
@@ -1,6 +1,7 @@
# -*-makefile-*-
# $Id$
#
+# Copyright (C) 2005 by Rex Tsai <chihchun@kalug.linux.org.tw>
# Copyright (C) 2003 by Dan Kegel, Ixia Communications (http://ixiacom.com)
#
# See CREDITS for details about who has contributed to this project.
@@ -19,12 +20,12 @@ endif
#
# Paths and names
#
-SHOREWALL_VERSION = 1.4.7-RC1
+SHOREWALL_VERSION = 2.2.2
SHOREWALL = shorewall-$(SHOREWALL_VERSION)
SHOREWALL_SUFFIX = tgz
-SHOREWALL_URL = http://www.shorewall.net/pub/shorewall/Beta/$(SHOREWALL).$(SHOREWALL_SUFFIX)
+SHOREWALL_URL = http://www.shorewall.net/pub/shorewall/2.2/$(SHOREWALL)/$(SHOREWALL).$(SHOREWALL_SUFFIX)
SHOREWALL_SOURCE = $(SRCDIR)/$(SHOREWALL).$(SHOREWALL_SUFFIX)
-SHOREWALL_DIR = $(BUILDDIR)/shorewall-1.4.7
+SHOREWALL_DIR = $(BUILDDIR)/$(SHOREWALL)
# ----------------------------------------------------------------------------
# Get
@@ -91,7 +92,7 @@ shorewall_targetinstall_deps = $(STATEDIR)/shorewall.extract
$(STATEDIR)/shorewall.targetinstall: $(shorewall_targetinstall_deps)
@$(call targetinfo, $@)
mkdir -p $(ROOTDIR)/etc/shorewall
- PREFIX=$(ROOTDIR) sh $(SHOREWALL_DIR)/install.sh /etc/init.d
+ PREFIX=$(ROOTDIR) $(FAKEROOT) $(SHOREWALL_DIR)/install.sh
touch $@
# ----------------------------------------------------------------------------