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) - bug #99398

Package-Manager: portage-2.0.52-r1

22 files changed, 53 insertions, 348 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 1229673bc76e..e41ff0b127fd 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.81 2005/07/21 21:02:48 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.82 2005/09/13 09:11:25 dragonheart Exp $
+
+*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.
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index d3ab483ba8a4..457125de20b3 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,31 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6ecaa5d1bd95699318d03ac9d8fa710c shorewall-2.2.4.ebuild 2255
+MD5 a73ce3a40c395480fb83e726dc98ef8f ChangeLog 11918
 MD5 014c965112d700c0266f644fdcb98fe9 shorewall-2.4.1.ebuild 2245
-MD5 2f02ed9634a2518de2fe82324e2aae07 shorewall-2.4.0.ebuild 2255
-MD5 752b9cc397fb6ff0c4f4fd738dd2f4f6 ChangeLog 11221
-MD5 38113b6d993e240d19789d56bb3db567 shorewall-2.2.5.ebuild 2254
-MD5 ad0387886c40902b6858c8bf82210c16 shorewall-2.0.7.ebuild 1872
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
-MD5 aa5ff79a52066d13f664c2fc7e0c7f11 shorewall-2.2.0.ebuild 2250
-MD5 bfb451784c14bcb640cdd7fbcf986081 shorewall-2.2.3.ebuild 2242
-MD5 b377f46ebfdc2bf08baf6ffdf646e84d shorewall-2.0.13.ebuild 1880
-MD5 1a71c0565fb101e36094fe607a541675 shorewall-2.2.0_rc5.ebuild 2392
-MD5 3404020fab5d120975e1294e3554b470 files/digest-shorewall-2.2.4 139
+MD5 4a894694559e69ad54a46221ace5a209 shorewall-2.4.2.ebuild 1498
+MD5 58b85b4e4d95e42681ea8ce8cabcdc1d shorewall-2.4.4.ebuild 1499
+MD5 df2f0aa2e4a0204c34d186d283f64a0f shorewall-2.0.17.ebuild 1903
+MD5 5c32c80ddd205c602e51b3b1b09a4af7 shorewall-2.2.6.ebuild 2254
 MD5 52630f04914209881f04d2f52098af5d files/digest-shorewall-2.4.1 139
-MD5 cd869b336ad98b18bcbe4548ea1ce0c5 files/digest-shorewall-2.2.3 139
-MD5 42daac4688988d74bb62f390b6aa486a files/digest-shorewall-2.0.7 139
-MD5 b15cce3a5f327cdab34b959397060398 files/digest-shorewall-2.2.0 139
-MD5 89555a3093e081abbc3365b6e050cb74 files/digest-shorewall-2.0.13 141
-MD5 8b0f23d1beb0db77f2b2c29e9de1abd0 files/digest-shorewall-2.4.0 139
-MD5 a9813dc2dcca1cd42adef45926c8f266 files/digest-shorewall-2.2.5 139
 MD5 874d62a846eefd6330b3bba8b8721cef files/shorewall 1057
-MD5 e5bea352c75a6b0c56f36a29dec327a8 files/digest-shorewall-2.2.0_rc5 147
+MD5 40658e202a62d4ef2e1e973e1c949bac files/digest-shorewall-2.4.4 139
+MD5 2439218a1fcde6a4a33d6b290d44eaa6 files/digest-shorewall-2.2.6 139
+MD5 e119bb212e45f53e1948e7a1ed93ef36 files/digest-shorewall-2.4.2 139
+MD5 71922429d5b7ea13d3fe5e5b8e396313 files/digest-shorewall-2.0.17 141
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC4A2UKf2g/qXtneoRAlOoAJ9tvfK6+QAa+AFgJX842KhymGEcbgCfaPOg
-3ms7b2FbHVj1gKdZCXJObn8=
-=oBaW
+iD8DBQFDJpfTmdTrptrqvGERAqYrAKCawQ72rflB9ZFFK6PQRBhd1pEbHgCgnaQJ
+3xFdckEjpTzCM9OlYqSLvZ0=
+=7rI+
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.0.13 b/net-firewall/shorewall/files/digest-shorewall-2.0.13
deleted file mode 100644
index 754c517805e3..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.0.13
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b3656ec857d55878b739d8f903de957d shorewall-2.0.13.tgz 104276
-MD5 fd076d5229d699ffc8214927b2a12418 shorewall-docs-html-2.0.13.tgz 2508479
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.0.17 b/net-firewall/shorewall/files/digest-shorewall-2.0.17
new file mode 100644
index 000000000000..12c5efdb9b2c
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-2.0.17
@@ -0,0 +1,2 @@
+MD5 59dace1bda3980595d131aba412cb08c shorewall-2.0.17.tgz 105611
+MD5 4e119c0f247f7fbc63d8404a07063068 shorewall-docs-html-2.0.17.tgz 2257409
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.0.7 b/net-firewall/shorewall/files/digest-shorewall-2.0.7
deleted file mode 100644
index a2114ac12670..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.0.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 95587aa6936fd8f242db914bad4adf12 shorewall-2.0.7.tgz 101873
-MD5 0c4f0466492312de68150d092fba5f62 shorewall-docs-html-2.0.7.tgz 2407301
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.2.0 b/net-firewall/shorewall/files/digest-shorewall-2.2.0
deleted file mode 100644
index d6979e9acfb9..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.2.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 40a85583dc71665f823f402e7890ecee shorewall-2.2.0.tgz 122161
-MD5 09f4b7d141fa0d2caf20b2d896ddf9dd shorewall-docs-html-2.2.0.tgz 2534077
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.2.0_rc5 b/net-firewall/shorewall/files/digest-shorewall-2.2.0_rc5
deleted file mode 100644
index 9705a3e6fc54..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.2.0_rc5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ce97657e732fb729f240ab06936b5517 shorewall-2.2.0-RC5.tgz 124727
-MD5 657b08cbe33ca741752ffca43d6eae16 shorewall-docs-html-2.2.0-RC5.tgz 2531021
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.2.3 b/net-firewall/shorewall/files/digest-shorewall-2.2.3
deleted file mode 100644
index dfbb38eb8c6a..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.2.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 df114b25a419d77915598de5844b423e shorewall-2.2.3.tgz 126841
-MD5 b07bf7ad6525ce1eaf96fdfbfa92a038 shorewall-docs-html-2.2.3.tgz 2550802
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.2.4 b/net-firewall/shorewall/files/digest-shorewall-2.2.4
deleted file mode 100644
index 35152f5c81e5..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.2.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a8010f4a7dcb01689f7768945aac88a5 shorewall-2.2.4.tgz 131326
-MD5 61dee40095743a8cd39091ff2da431ac shorewall-docs-html-2.2.4.tgz 2552166
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.2.5 b/net-firewall/shorewall/files/digest-shorewall-2.2.5
deleted file mode 100644
index f8df95056624..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.2.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e454f4af193b8546d3c75fb82647051a shorewall-2.2.5.tgz 131675
-MD5 5c5259545df7c225d9e6b35fb6e83df2 shorewall-docs-html-2.2.5.tgz 2604498
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.2.6 b/net-firewall/shorewall/files/digest-shorewall-2.2.6
new file mode 100644
index 000000000000..32aa4e2ac7ef
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-2.2.6
@@ -0,0 +1,2 @@
+MD5 cb40623ed61d59cf6c821d34a25ee4b3 shorewall-2.2.6.tgz 131732
+MD5 f382651fb571a26a1bc339b50c72d858 shorewall-docs-html-2.2.6.tgz 2610222
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.4.0 b/net-firewall/shorewall/files/digest-shorewall-2.4.0
deleted file mode 100644
index 4c0b0036e68f..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.4.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9101fc930b77261da25488f4af9b0263 shorewall-2.4.0.tgz 130141
-MD5 7343dd2a98ba5887799bba6bfbe21415 shorewall-docs-html-2.4.0.tgz 2607542
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.4.2 b/net-firewall/shorewall/files/digest-shorewall-2.4.2
new file mode 100644
index 000000000000..af4c0fd99f9c
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-2.4.2
@@ -0,0 +1,2 @@
+MD5 ff6adb5b81633684fbf2c44da53f847e shorewall-2.4.2.tgz 132141
+MD5 e27c9f2ffaf5860e56e24088a0e4c351 shorewall-docs-html-2.4.2.tgz 2609552
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.4.4 b/net-firewall/shorewall/files/digest-shorewall-2.4.4
new file mode 100644
index 000000000000..8dff02011fbd
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-2.4.4
@@ -0,0 +1,2 @@
+MD5 de12be9692723cd4badaed983f0a4694 shorewall-2.4.4.tgz 133282
+MD5 d0d67fd5cb6645ed21bb000074bf9c7f shorewall-docs-html-2.4.4.tgz 2618840
diff --git a/net-firewall/shorewall/shorewall-2.0.13.ebuild b/net-firewall/shorewall/shorewall-2.0.17.ebuild
index c1300c9122b2..83313199b683 100644
--- a/net-firewall/shorewall/shorewall-2.0.13.ebuild
+++ b/net-firewall/shorewall/shorewall-2.0.17.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.0.13.ebuild,v 1.3 2005/07/18 12:55:17 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.0.17.ebuild,v 1.1 2005/09/13 09:11:25 dragonheart Exp $
 
 IUSE="doc"
 
@@ -40,7 +40,10 @@ src_install() {
 pkg_postinst() {
 	einfo
 	einfo "Read the documentation from http://www.shorewall.net"
-	einfo "available at /usr/share/doc/${PF}/html/index.htm"
+	if use doc
+	then
+		einfo "available at /usr/share/doc/${PF}/html/index.htm"
+	fi
 	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
 	einfo
 	einfo "If you have just upgraded from shorewall-2.0.1 mark the following issues:"
diff --git a/net-firewall/shorewall/shorewall-2.0.7.ebuild b/net-firewall/shorewall/shorewall-2.0.7.ebuild
deleted file mode 100644
index ac1110499846..000000000000
--- a/net-firewall/shorewall/shorewall-2.0.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.0.7.ebuild,v 1.5 2005/06/17 20:46:31 hansmi Exp $
-
-IUSE="doc"
-
-MY_P_DOCS=${P/${PN}/${PN}-docs-html}
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/2.0/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/2.0/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ppc sparc x86"
-
-DEPEND="virtual/libc
-	>=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	cd ${WORKDIR}/${P}
-	PREFIX=${D} ./install.sh || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/shorewall shorewall
-	dodoc COPYING INSTALL changelog.txt releasenotes.txt
-	if use doc; then
-		cd ${WORKDIR}/${MY_P_DOCS}
-		dohtml -r *
-		dosym Documentation_Index.html /usr/share/doc/${PF}/html/index.htm
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Read the documentation from http://www.shorewall.net"
-	einfo "available at /usr/share/doc/${PF}/html/index.htm"
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo
-	einfo "If you have just upgraded from shorewall-2.0.1 mark the following issues:"
-	einfo
-	einfo "1. Extension Scripts -- In order for extension scripts to work properly"
-	einfo "   with the new iptables-save/restore integration, some change may be"
-	einfo "   required to your extension scripts if they are executing commands"
-	einfo "   other than iptables."
-	einfo
-	einfo "2. Dynamic Zone support -- If you don't need to use the 'shorewall add'"
-	einfo "   and 'shorewall delete' commands, you should set DYNAMIC_ZONES=No"
-	einfo "   in /etc/shorewall/shorewall.conf"
-	einfo
-	einfo "See the shorewall documentation for more details."
-	einfo
-}
diff --git a/net-firewall/shorewall/shorewall-2.2.0.ebuild b/net-firewall/shorewall/shorewall-2.2.0.ebuild
deleted file mode 100644
index b6a422aa4866..000000000000
--- a/net-firewall/shorewall/shorewall-2.2.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.2.0.ebuild,v 1.2 2005/07/18 12:55:17 dragonheart Exp $
-
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/2.2/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/2.2/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	doinitd ${FILESDIR}/shorewall || die "doinitd failed"
-
-	dodoc COPYING INSTALL changelog.txt releasenotes.txt
-	if use doc; then
-		cd ${WORKDIR}/${MY_P_DOCS}
-		dohtml -r *
-		dosym Documentation_Index.html /usr/share/doc/${PF}/html/index.htm
-	fi
-}
-
-pkg_postinst() {
-	echo
-
-	if use doc ; then
-		einfo "Documentation is available at /usr/share/doc/${PF}/html"
-	else
-		einfo "Documentation is available at http://www.shorewall.net"
-	fi
-
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
-	einfo
-	einfo "Information on upgrading is available at:"
-	einfo "  http://www.shorewall.net/errata.htm#Upgrade"
-	einfo
-	einfo "If you have just upgraded from shorewall-2.0.1 mark the following issues:"
-	einfo
-	einfo "1. Extension Scripts -- In order for extension scripts to work properly"
-	einfo "   with the new iptables-save/restore integration, some change may be"
-	einfo "   required to your extension scripts if they are executing commands"
-	einfo "   other than iptables."
-	einfo
-	einfo "2. Dynamic Zone support -- If you don't need to use the 'shorewall add'"
-	einfo "   and 'shorewall delete' commands, you should set DYNAMIC_ZONES=No"
-	einfo "   in /etc/shorewall/shorewall.conf"
-	einfo
-	einfo "See the shorewall documentation for more details."
-	einfo
-	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
-	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	echo
-}
diff --git a/net-firewall/shorewall/shorewall-2.2.0_rc5.ebuild b/net-firewall/shorewall/shorewall-2.2.0_rc5.ebuild
deleted file mode 100644
index 3293a0cdfd14..000000000000
--- a/net-firewall/shorewall/shorewall-2.2.0_rc5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.2.0_rc5.ebuild,v 1.3 2005/07/18 12:55:17 dragonheart Exp $
-
-inherit versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-' ${PV/rc/RC})"
-MY_P_DOCS="${MY_P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/2.2-Beta/${MY_P}/${MY_P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/2.2-Beta/${MY_P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd ${FILESDIR}/shorewall shorewall || die "newinitd failed"
-
-	dodoc COPYING INSTALL changelog.txt releasenotes.txt
-	if use doc; then
-		cd ${WORKDIR}/${MY_P_DOCS}
-		dohtml -r *
-		dosym Documentation_Index.html /usr/share/doc/${PF}/html/index.htm
-	fi
-}
-
-pkg_postinst() {
-	echo
-
-	if use doc ; then
-		einfo "Documentation is available at /usr/share/doc/${PF}/html"
-	else
-		einfo "Documentation is available at http://www.shorewall.net"
-	fi
-
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
-	einfo
-	einfo "Information on upgrading is available at:"
-	einfo "  http://www.shorewall.net/errata.htm#Upgrade"
-	einfo
-	einfo "If you have just upgraded from shorewall-2.0.1 mark the following issues:"
-	einfo
-	einfo "1. Extension Scripts -- In order for extension scripts to work properly"
-	einfo "   with the new iptables-save/restore integration, some change may be"
-	einfo "   required to your extension scripts if they are executing commands"
-	einfo "   other than iptables."
-	einfo
-	einfo "2. Dynamic Zone support -- If you don't need to use the 'shorewall add'"
-	einfo "   and 'shorewall delete' commands, you should set DYNAMIC_ZONES=No"
-	einfo "   in /etc/shorewall/shorewall.conf"
-	einfo
-	einfo "See the shorewall documentation for more details."
-	einfo
-	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
-	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	echo
-}
diff --git a/net-firewall/shorewall/shorewall-2.2.4.ebuild b/net-firewall/shorewall/shorewall-2.2.4.ebuild
deleted file mode 100644
index 1f415f82dd98..000000000000
--- a/net-firewall/shorewall/shorewall-2.2.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.2.4.ebuild,v 1.3 2005/07/18 12:55:17 dragonheart Exp $
-
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/2.2/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/2.2/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	doinitd ${FILESDIR}/shorewall || die "doinitd failed"
-
-	dodoc COPYING INSTALL changelog.txt releasenotes.txt
-	if use doc; then
-		cd ${WORKDIR}/${MY_P_DOCS}
-		dohtml -r *
-		dosym Documentation_Index.html /usr/share/doc/${PF}/html/index.htm
-	fi
-}
-
-pkg_postinst() {
-	echo
-
-	if use doc ; then
-		einfo "Documentation is available at /usr/share/doc/${PF}/html"
-	else
-		einfo "Documentation is available at http://www.shorewall.net"
-	fi
-
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
-	einfo
-	einfo "Information on upgrading is available at:"
-	einfo "  http://www.shorewall.net/errata.htm#Upgrade"
-	einfo
-	einfo "If you have just upgraded from shorewall-2.0.1 mark the following issues:"
-	einfo
-	einfo "1. Extension Scripts -- In order for extension scripts to work properly"
-	einfo "   with the new iptables-save/restore integration, some change may be"
-	einfo "   required to your extension scripts if they are executing commands"
-	einfo "   other than iptables."
-	einfo
-	einfo "2. Dynamic Zone support -- If you don't need to use the 'shorewall add'"
-	einfo "   and 'shorewall delete' commands, you should set DYNAMIC_ZONES=No"
-	einfo "   in /etc/shorewall/shorewall.conf"
-	einfo
-	einfo "See the shorewall documentation for more details."
-	einfo
-	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
-	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	echo
-}
diff --git a/net-firewall/shorewall/shorewall-2.2.5.ebuild b/net-firewall/shorewall/shorewall-2.2.6.ebuild
index 0cefb4fbfe7a..d5bc1fb0f9ba 100644
--- a/net-firewall/shorewall/shorewall-2.2.5.ebuild
+++ b/net-firewall/shorewall/shorewall-2.2.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.2.5.ebuild,v 1.1 2005/07/18 12:55:17 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.2.6.ebuild,v 1.1 2005/09/13 09:11:25 dragonheart Exp $
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
diff --git a/net-firewall/shorewall/shorewall-2.4.0.ebuild b/net-firewall/shorewall/shorewall-2.4.2.ebuild
index c380a458c0fc..dd843126b9c0 100644
--- a/net-firewall/shorewall/shorewall-2.4.0.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.0.ebuild,v 1.2 2005/07/18 12:55:17 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.2.ebuild,v 1.1 2005/09/13 09:11:25 dragonheart 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
@@ -33,8 +33,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
-
+	einfo
 	if use doc ; then
 		einfo "Documentation is available at /usr/share/doc/${PF}/html"
 	else
@@ -44,23 +43,7 @@ pkg_postinst() {
 	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
 	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
 	einfo
-	einfo "Information on upgrading is available at:"
-	einfo "  http://www.shorewall.net/errata.htm#Upgrade"
-	einfo
-	einfo "If you have just upgraded from shorewall-2.0.1 mark the following issues:"
-	einfo
-	einfo "1. Extension Scripts -- In order for extension scripts to work properly"
-	einfo "   with the new iptables-save/restore integration, some change may be"
-	einfo "   required to your extension scripts if they are executing commands"
-	einfo "   other than iptables."
-	einfo
-	einfo "2. Dynamic Zone support -- If you don't need to use the 'shorewall add'"
-	einfo "   and 'shorewall delete' commands, you should set DYNAMIC_ZONES=No"
-	einfo "   in /etc/shorewall/shorewall.conf"
-	einfo
-	einfo "See the shorewall documentation for more details."
-	einfo
 	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
 	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	echo
+	einfo
 }
diff --git a/net-firewall/shorewall/shorewall-2.2.3.ebuild b/net-firewall/shorewall/shorewall-2.4.4.ebuild
index f241168c4e14..1e4be152fa87 100644
--- a/net-firewall/shorewall/shorewall-2.2.3.ebuild
+++ b/net-firewall/shorewall/shorewall-2.4.4.ebuild
@@ -1,17 +1,17 @@
 # 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.2.3.ebuild,v 1.4 2005/07/02 18:39:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.4.ebuild,v 1.1 2005/09/13 09:11:25 dragonheart Exp $
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
 DESCRIPTION="Full state iptables firewall"
 HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/2.2/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/2.2/${P}/${MY_P_DOCS}.tgz )"
+SRC_URI="http://shorewall.net/pub/${PN}/2.4/${P}/${P}.tgz
+	doc? ( http://shorewall.net/pub/${PN}/2.4/${P}/${MY_P_DOCS}.tgz )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
@@ -33,34 +33,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
-
+	einfo
 	if use doc ; then
 		einfo "Documentation is available at /usr/share/doc/${PF}/html"
 	else
 		einfo "Documentation is available at http://www.shorewall.net"
 	fi
-
 	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
 	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
 	einfo
-	einfo "Information on upgrading is available at:"
-	einfo "  http://www.shorewall.net/errata.htm#Upgrade"
-	einfo
-	einfo "If you have just upgraded from shorewall-2.0.1 mark the following issues:"
-	einfo
-	einfo "1. Extension Scripts -- In order for extension scripts to work properly"
-	einfo "   with the new iptables-save/restore integration, some change may be"
-	einfo "   required to your extension scripts if they are executing commands"
-	einfo "   other than iptables."
-	einfo
-	einfo "2. Dynamic Zone support -- If you don't need to use the 'shorewall add'"
-	einfo "   and 'shorewall delete' commands, you should set DYNAMIC_ZONES=No"
-	einfo "   in /etc/shorewall/shorewall.conf"
-	einfo
-	einfo "See the shorewall documentation for more details."
-	einfo
 	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
 	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	echo
+	einfo
 }