*** empty log message ***import-1.1.1

6 files changed, 416 insertions, 21 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 82fd311fa01e..7909671a18c9 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,387 @@
 # ChangeLog for net-firewall/shorewall
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.1 2003/02/05 14:37:16 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
+
+*shorewall-2.4.6 (05 Nov 2005)
+
+  05 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> +shorewall-2.4.6.ebuild:
+  2.4.6 version bump for bug 111567. Thanks to Joakim <moonwalker at astro dot
+  nu>.
+
+  14 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -shorewall-2.4.1.ebuild:
+  remove vulnerable version
+
+  14 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> shorewall-2.4.2.ebuild:
+  stable on alpha, wrt bug #99398
+
+  13 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  shorewall-2.4.2.ebuild:
+  Stable on hppa.
+
+  13 Sep 2005; Simon Stelling <blubb@gentoo.org> shorewall-2.4.2.ebuild:
+  stable on amd64 wrt bug 99398
+
+  13 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -shorewall-2.0.17.ebuild, -shorewall-2.2.6.ebuild:
+  removed 2.0.17 and 2.2.6 - no major upgrade transition plans mentioned in
+  the comprehensive shorewall documentation. Thanks Gustavo for convincing me
+
+  13 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  shorewall-2.4.2.ebuild:
+  Stable on sparc wrt #99398
+
+*shorewall-2.4.4 (13 Sep 2005)
+*shorewall-2.4.2 (13 Sep 2005)
+*shorewall-2.2.6 (13 Sep 2005)
+*shorewall-2.0.17 (13 Sep 2005)
+
+  13 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -shorewall-2.0.7.ebuild, -shorewall-2.0.13.ebuild,
+  +shorewall-2.0.17.ebuild, -shorewall-2.2.0_rc5.ebuild,
+  -shorewall-2.2.0.ebuild, -shorewall-2.2.3.ebuild, -shorewall-2.2.4.ebuild,
+  -shorewall-2.2.5.ebuild, +shorewall-2.2.6.ebuild, -shorewall-2.4.0.ebuild,
+  +shorewall-2.4.2.ebuild, +shorewall-2.4.4.ebuild:
+  GLSA 200507-20 was not corrected properly. Fixes are included in 2.0.17,
+  2.2.6 and 2.4.2. 2.4.4 is just a version bump. Removed most vulnerable
+  versions (except 2.4.1 awaiting arch testing)
+
+  21 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> shorewall-2.4.1.ebuild:
+  Stable on alpha, bug 99398.
+
+  20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> files/shorewall:
+  We actually want to make sure it starts after ulogd since it can be used as
+  a logger
+
+  18 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  shorewall-2.4.1.ebuild:
+  Stable on hppa. bug #99398
+
+  18 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  shorewall-2.4.1.ebuild:
+  Stable on sparc wrt #99398
+
+  18 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> shorewall-2.4.1.ebuild:
+  Marked stable on amd64 wrt Security BUG #99398.
+
+*shorewall-2.2.5 (18 Jul 2005)
+
+  18 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  shorewall-2.0.13.ebuild, shorewall-2.2.0_rc5.ebuild,
+  shorewall-2.2.0.ebuild, shorewall-2.2.4.ebuild, +shorewall-2.2.5.ebuild,
+  shorewall-2.4.0.ebuild, shorewall-2.4.1.ebuild:
+  version bump and ppc/x86 stable for
+  http://seclists.org/lists/fulldisclosure/2005/Jul/0409.html
+
+*shorewall-2.4.1 (15 Jul 2005)
+
+  15 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> +shorewall-2.4.1.ebuild:
+  Version bump.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> shorewall-2.2.3.ebuild:
+  Stable on alpha.
+
+  22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  shorewall-2.2.3.ebuild:
+  Stable on sparc
+
+  20 Jun 2005; Jonathan Smith <smithj@gentoo.org> -shorewall-1.4.10f.ebuild,
+  -shorewall-2.0.4.ebuild, -shorewall-2.2.2.ebuild, shorewall-2.2.3.ebuild:
+  2.2.3 stable x86; cleanup
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  shorewall-2.0.7.ebuild:
+  Stable on ppc.
+
+*shorewall-2.4.0 (14 Jun 2005)
+
+  14 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +shorewall-2.4.0.ebuild:
+  Version bump for bug 95887.
+
+  14 May 2005; Guy Martin <gmsoft@gentoo.org> shorewall-2.2.4.ebuild:
+  Stable on hppa.
+
+*shorewall-2.2.4 (06 May 2005)
+
+  06 May 2005; Marcelo Goes <vanquirius@gentoo.org> +shorewall-2.2.4.ebuild:
+  Version bump, fixes bug 91662. Thanks to Costas Cavouracis <cca@freemail.gr>
+  and Joseph Booker <joe@neoturbine.net>.
+
+*shorewall-2.2.3 (20 Apr 2005)
+
+  20 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +shorewall-2.2.3.ebuild:
+  Version bump for bug 88947.
+
+*shorewall-2.2.2 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +shorewall-2.2.2.ebuild:
+  Version bump.
+
+  21 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  shorewall-2.2.0_rc5.ebuild:
+  stable on amd64. fixes #82640
+
+*shorewall-2.2.0 (02 Feb 2005)
+
+  02 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> +shorewall-2.2.0.ebuild:
+  Version bump for bug 79907.
+
+*shorewall-2.2.0_rc5 (25 Jan 2005)
+
+  25 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> -shorewall-2.0.10.ebuild,
+  +shorewall-2.2.0_rc5.ebuild:
+  Version bump for bug 78468. Removed 2.0.10.
+
+  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> shorewall-2.0.7.ebuild:
+  Stable on alpha.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*shorewall-2.0.13 (17 Dec 2004)
+
+  17 Dec 2004; Eldad Zack <eldad@gentoo.org> +shorewall-2.0.13.ebuild,
+  -shorewall-2.0.6.ebuild:
+  Version bump
+
+  11 Dec 2004; Jason Wever <weeve@gentoo.org> shorewall-2.0.7.ebuild:
+  Stable on sparc.
+
+  22 Nov 2004; Eldad Zack <eldad@gentoo.org> shorewall-2.0.6.ebuild,
+  shorewall-2.0.7.ebuild:
+  x86 stable
+
+*shorewall-2.0.10 (21 Nov 2004)
+
+  21 Nov 2004; Eldad Zack <eldad@gentoo.org> +shorewall-2.0.10.ebuild:
+  Version bump. Closes #63867.
+
+  21 Nov 2004; Eldad Zack <eldad@gentoo.org> files/shorewall:
+  initscript: added clear function to remove firewall rules, /dev/null'd restart
+  output. Closes #24882.
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> shorewall-2.0.4.ebuild:
+  Stable on alpha.
+
+  20 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> shorewall-2.0.4.ebuild:
+  Stable on sparc
+
+  17 Aug 2004; Eldad Zack <eldad@gentoo.org> shorewall-2.0.4.ebuild:
+  x86 stable
+
+*shorewall-2.0.7 (07 Aug 2004)
+
+  07 Aug 2004; Jon Hood <squinky86@gentoo.org> +shorewall-2.0.7.ebuild:
+  Version bump, closes #59682; thanks Andreas Simon <yuipx@gmx.net>!
+
+*shorewall-2.0.6 (21 Jul 2004)
+
+  21 Jul 2004; Martin Holzer <mholzer@gentoo.org> shorewall-2.0.6.ebuild:
+  Version bumped.
+
+  09 Jul 2004; Aron Griffis <agriffis@gentoo.org> files/shorewall:
+  Fix bug 55576: Mention svc_stop/svc_start in the init-script so that
+  runscript.sh doesn't complain
+
+*shorewall-2.0.4 (09 Jul 2004)
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> +shorewall-2.0.4.ebuild:
+  Version bump. Closes #56375
+
+  08 Jul 2004; Luca Barbato <lu_zero@gentoo.org> shorewall-1.4.10f.ebuild:
+  Marked ppc
+
+  07 Jul 2004; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.10f.ebuild:
+  x86 stable
+
+*shorewall-2.0.3c (07 Jul 2004)
+
+  07 Jul 2004; Martin Holzer <mholzer@gentoo.org> +shorewall-2.0.3c.ebuild:
+  Version bumped. Fixes 55816
+
+  03 Jul 2004; Jason Wever <weeve@gentoo.org> shorewall-1.4.10f.ebuild:
+  Stable on sparc.
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> shorewall-1.4.10f.ebuild:
+  Stable on alpha, bug #55675.
+
+  02 Jul 2004; Martin Holzer <mholzer@gentoo.org> shorewall-2.0.3a.ebuild:
+  minor fixes. see 51260
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  shorewall-1.4.10b.ebuild, shorewall-1.4.10c.ebuild,
+  shorewall-1.4.10f.ebuild, shorewall-1.4.5-r1.ebuild,
+  shorewall-2.0.3a.ebuild:
+  virtual/glibc -> virtual/libc
+
+*shorewall-2.0.3a (01 Jul 2004)
+*shorewall-1.4.10f (01 Jul 2004)
+
+  01 Jul 2004; Martin Holzer <mholzer@gentoo.org> +shorewall-2.0.3a.ebuild:
+  Version bumped. Closes  55675
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> shorewall-1.4.10b.ebuild,
+  shorewall-1.4.10c.ebuild, shorewall-1.4.5-r1.ebuild, shorewall-2.0.0.ebuild,
+  shorewall-2.0.1.ebuild:
+  Fix use invocation
+
+  24 May 2004; Bryan Østergaard <kloeri@gentoo.org> shorewall-1.4.10c.ebuild:
+  Keyworded alpha, requested in bug #51550.
+
+  21 Apr 2004; rob holland <tigger@gentoo.org> shorewall-1.4.10b.ebuild,
+  shorewall-1.4.10c.ebuild, shorewall-1.4.5-r1.ebuild, shorewall-2.0.0.ebuild,
+  shorewall-2.0.1.ebuild:
+  Fix iproute dep after spanky broke it ;P
+
+*shorewall-2.0.1 (20 Apr 2004)
+
+  20 Apr 2004; Martin Holzer <mholzer@gentoo.org> shorewall-2.0.1.ebuild:
+  Version bumped. Closes 41907 
+
+*shorewall-2.0.0 (19 Apr 2004)
+
+  19 Apr 2004; Martin Holzer <mholzer@gentoo.org> shorewall-2.0.0.ebuild:
+  Version bumped.
+
+  18 Apr 2004; Dylan Carlson <absinthe@gentoo.org> shorewall-1.4.10c.ebuild:
+  Added ~amd64 to KEYWORDS.
+
+  03 Mar 2004; Jason Wever <weeve@gentoo.org> shorewall-1.4.10b.ebuild:
+  Marked stable on sparc.
+
+  02 Mar 2004; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.10b.ebuild:
+  x86 stable.
+
+*shorewall-1.4.10c (02 Mar 2004)
+
+  02 Mar 2004; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.10c.ebuild:
+  Version bumpe.d
+
+*shorewall-1.4.10b (28 Feb 2004)
+
+  28 Feb 2004; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.10b.ebuild:
+  Version bumped.
+
+*shorewall-1.4.10a (11 Feb 2004)
+
+  11 Feb 2004; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.10a.ebuild:
+  Version bumped. Closes 41239.
+
+  06 Dec 2003; Jason Wever <weeve@gentoo.org> shorewall-1.4.7c.ebuild:
+  Marked stable on sparc.
+
+*shorewall-1.4.8 (19 Nov 2003)
+
+  19 Nov 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.8.ebuild:
+  Version bumped. Closes #33138.
+
+*shorewall-1.4.7c (02 Nov 2003)
+
+  02 Nov 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6-r3.ebuild,
+  shorewall-1.4.7c.ebuild:
+  Version bupmed. Closes #32294
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.5-r1.ebuild,
+  shorewall-1.4.6-r3.ebuild:
+  adding RESTRICT="nomirror"
+
+  25 Sep 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6-r3.ebuild:
+  Added more docs to install. Closes #29476.
+
+*shorewall-1.4.6-r3 (27 Aug 2003)
+
+  27 Aug 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6-r3.ebuild:
+  Version bumped.
+
+*shorewall-1.4.6-r2 (06 Aug 2003)
+
+  06 Aug 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6-r2.ebuild:
+  Version bumped.
+
+*shorewall-1.4.6-r1 (25 Jul 2003)
+
+  25 Jul 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6-r1.ebuild:
+  Subrelease of 1.4.6
+
+*shorewall-1.4.6 (22 Jul 2003)
+
+  22 Jul 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6.ebuild,
+  files/shorewall:
+  Version bumped.
+
+*shorewall-1.4.5-r1 (15 Jul 2003)
+
+  15 Jul 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.5-r1.ebuild:
+  Adding docs. Marked x86 stable. Closes #24518
+  
+*shorewall-1.4.5 (23 Jun 2003)
+
+  23 Jun 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.5.ebuild:
+  Version bumped.
+
+  19 Jun 2003; Seemant Kulleen <seemant@gentoo.org> shorewall-1.4.4b.ebuild:
+  stop /var/lib/shorewall from being removed on remerge, and /var/state is
+  provided by baselayout
+
+*shorewall-1.4.4a (12 Jun 2003)
+
+  12 Jun 2003; <msterret@gentoo.org> shorewall-1.4.4.ebuild,
+  shorewall-1.4.4a.ebuild, shorewall-1.4.4b.ebuild:
+  fix Header
+
+*shorewall-1.4.4b (29 May 2003)
+
+  29 May 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.4b.ebuild:
+  Version bumped & x86 stable
+
+*shorewall-1.4.4 (24 May 2003)
+
+  24 May 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.3.ebuild,
+  shorewall-1.4.3.ebuild, shorewall-1.4.3a.ebuild, shorewall-1.4.4.ebuild:
+  Version bumped & Marked stable & Cleanup.
+
+*shorewall-1.4.3a (20 May 2003)
+
+  20 May 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.3.ebuild,
+  shorewall-1.4.3a.ebuild:
+  Version bumped.
+
+*shorewall-1.4.3 (18 May 2003)
+
+  20 May 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.3.ebuild:
+  Fixing ebuild
+
+  18 May 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.3.ebuild:
+  Version bumped.
+
+*shorewall-1.4.2 (14 Apr 2003)
+
+  22 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  shorewall-1.4.1a.ebuild, shorewall-1.4.2.ebuild:
+  Remove to install a startup script through install.sh Closes #19208.
+
+  14 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  shorewall-1.4.2.ebuild:
+  Version bumped.
+
+*shorewall-1.4.1a (03 Apr 2003)
+
+  03 Apr 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.1a.ebuild:
+  Version bumped. Closes #18273.
+
+*shorewall-1.4.0 (19 Mar 2003)
+
+  19 Mar 2003; Zach Welch <zwelch@gentoo.org> shorewall-1.4.0.ebuild:
+  bump version; bug 17847
+
+*shorewall-1.3.14 (24 Feb 2003)
+
+  11 Mar 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.3.13.ebuild,
+  shorewall-1.3.14.ebuild, shorewall-1.3.9b.ebuild:
+  changed sys-apps/iptables to net-firewall/iptables
+
+  24 Feb 2003; Zach Welch <zwelch@gentoo.org> shorewall-1.3.14.ebuild files/digest-shorewall-1.3.14 :
+  Bump version; closes bug 15555
 
 *shorewall-1.3.13 (05 Feb 2003)
 
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 0e59892996d7..c0d8b16959ac 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,12 +1,9 @@
-MD5 ac483b545be736591d53d02dd219a446 shorewall-1.4.1a.ebuild 803
-MD5 aedc24bd7307b582454fc3d8153bb3be shorewall-1.3.14.ebuild 816
-MD5 80c1651447acb27b20879c062c24bf6d shorewall-1.3.9b.ebuild 902
-MD5 e5398da69415e4d14453bdfaf0022719 shorewall-1.3.13.ebuild 809
-MD5 ad0ef5143a419557ae8926165c5e3719 ChangeLog 1333
-MD5 aedc24bd7307b582454fc3d8153bb3be shorewall-1.4.0.ebuild 816
-MD5 92673ca0dbde666a62cb8bce314e1e76 files/digest-shorewall-1.4.0 65
-MD5 8504d85a79fc497d7af21b2ab7dc5b8a files/digest-shorewall-1.3.13 66
-MD5 68c19e365c9dd79ec6dee578593ab2e0 files/digest-shorewall-1.3.14 66
-MD5 3412d8c9a261ad9a8a5119feac82d5be files/digest-shorewall-1.3.9b 66
-MD5 84488f78e793227b3abb0c86543754dc files/digest-shorewall-1.4.1a 66
-MD5 2bb788dc55a65a1daee4a13ca9240fab files/shorewall 433
+MD5 561cf6684de229fe37921356b62bb6c1 shorewall-2.4.2.ebuild 1488
+MD5 58b85b4e4d95e42681ea8ce8cabcdc1d shorewall-2.4.4.ebuild 1499
+MD5 aa66e9cdc5deae5576646b86bf3984c8 shorewall-2.4.6.ebuild 1498
+MD5 aed5dd323d6f9ccb70a2663376122ed1 ChangeLog 12910
+MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
+MD5 e119bb212e45f53e1948e7a1ed93ef36 files/digest-shorewall-2.4.2 139
+MD5 40658e202a62d4ef2e1e973e1c949bac files/digest-shorewall-2.4.4 139
+MD5 05f9a37c3a717f3075ef08dbdff13ceb files/digest-shorewall-2.4.6 139
+MD5 874d62a846eefd6330b3bba8b8721cef files/shorewall 1057
diff --git a/net-firewall/shorewall/files/shorewall b/net-firewall/shorewall/files/shorewall
index 843cf279fa9b..c849780cddb4 100644
--- a/net-firewall/shorewall/files/shorewall
+++ b/net-firewall/shorewall/files/shorewall
@@ -1,10 +1,14 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/shorewall,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
+
+opts="start stop restart clear"
 
 depend() {
 	need net
 	provide firewall
+	after ulogd
 }
 
 start() {
@@ -20,7 +24,20 @@ stop() {
 }
 
 restart() {
+	# shorewall comes with its own control script that includes a
+	# restart function, so refrain from calling svc_stop/svc_start
+	# here.  Note that this comment is required to fix bug 55576;
+	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
 	ebegin "Restarting firewall"
-	/sbin/shorewall restart
+	/sbin/shorewall restart 1>/dev/null
+	eend $?
+}
+
+clear() {
+	# clear will remove all the rules and bring the system to an unfirewalled
+	# state. (21 Nov 2004 eldad)
+
+	ebegin "Clearing all firewall rules and setting policy to ACCEPT"
+	/sbin/shorewall clear
 	eend $?
 }
diff --git a/net-firewall/shorewall/shorewall-2.4.2.ebuild b/net-firewall/shorewall/shorewall-2.4.2.ebuild
index dd843126b9c0..392306f440cd 100644
--- a/net-firewall/shorewall/shorewall-2.4.2.ebuild
+++ b/net-firewall/shorewall/shorewall-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.2.ebuild,v 1.1 2005/09/13 09:11:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.2.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
@@ -11,7 +11,7 @@ SRC_URI="http://shorewall.net/pub/${PN}/2.4/${P}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~sparc x86"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
diff --git a/net-firewall/shorewall/shorewall-2.4.4.ebuild b/net-firewall/shorewall/shorewall-2.4.4.ebuild
index 1e4be152fa87..6b73df10a947 100644
--- a/net-firewall/shorewall/shorewall-2.4.4.ebuild
+++ b/net-firewall/shorewall/shorewall-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.4.ebuild,v 1.1 2005/09/13 09:11:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.4.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
diff --git a/net-firewall/shorewall/shorewall-2.4.6.ebuild b/net-firewall/shorewall/shorewall-2.4.6.ebuild
index 59689540cf25..61a1d63dda52 100644
--- a/net-firewall/shorewall/shorewall-2.4.6.ebuild
+++ b/net-firewall/shorewall/shorewall-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.6.ebuild,v 1.1 2005/11/05 17:46:27 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.6.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"