version bump for security bug http://seclists.org/lists/fulldisclosure/2005/Jul/0409.html

(Portage version: 2.0.51.22-r1)

10 files changed, 105 insertions, 36 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 6552c2ce75b1..f7a01fa1b16b 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,15 @@
 # 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.75 2005/07/15 02:56:15 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.76 2005/07/18 12:55:17 dragonheart Exp $
+
+*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)
 
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 834ef1b33fa2..fd72cbe273b2 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,29 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f0fd2bf75f451107ad8e34202e06061a shorewall-2.2.0_rc5.ebuild 2390
-MD5 ad0387886c40902b6858c8bf82210c16 shorewall-2.0.7.ebuild 1872
-MD5 bfb451784c14bcb640cdd7fbcf986081 shorewall-2.2.3.ebuild 2242
-MD5 64e09120a596516712c34342a1420bb4 shorewall-2.2.0.ebuild 2246
-MD5 177a4a1f893a5abf9c252ac6bab80062 shorewall-2.4.1.ebuild 2252
-MD5 fd7a8869be5c3b7315f5334409377c6e shorewall-2.0.13.ebuild 1877
 MD5 8010fd484ffe30192dcdd7c458e00a82 ChangeLog 10240
-MD5 e86ce27deb7eabac5c4cb909cde5b138 shorewall-2.2.4.ebuild 2250
+MD5 81d0b36f68fd61e1e534d8a48a1435e9 shorewall-2.2.0.ebuild 2246
+MD5 217dbadb0c0c0d86ec209cc060367457 shorewall-2.4.1.ebuild 2250
+MD5 ad0387886c40902b6858c8bf82210c16 shorewall-2.0.7.ebuild 1872
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
-MD5 3401b07d1684b5b093207fda8b3fa488 shorewall-2.4.0.ebuild 2251
-MD5 42daac4688988d74bb62f390b6aa486a files/digest-shorewall-2.0.7 139
+MD5 bf5ac82a3c30242bb0c71ab7774f7628 shorewall-2.2.5.ebuild 2249
+MD5 abfd346c751ea224ab3ca91b0113ef01 shorewall-2.0.13.ebuild 1875
+MD5 1a2aafd728e52da9a841c2a2639772bd shorewall-2.2.0_rc5.ebuild 2390
+MD5 bfb451784c14bcb640cdd7fbcf986081 shorewall-2.2.3.ebuild 2242
+MD5 c7c6dea8f36ac2f6bb844d1bc4e0242c shorewall-2.2.4.ebuild 2250
+MD5 2262e09be4edca0a6352cd1f801fc224 shorewall-2.4.0.ebuild 2251
 MD5 b15cce3a5f327cdab34b959397060398 files/digest-shorewall-2.2.0 139
+MD5 52630f04914209881f04d2f52098af5d files/digest-shorewall-2.4.1 139
+MD5 42daac4688988d74bb62f390b6aa486a files/digest-shorewall-2.0.7 139
+MD5 a9813dc2dcca1cd42adef45926c8f266 files/digest-shorewall-2.2.5 139
+MD5 886a46dd1ca55990686be5bf42b776de files/shorewall 1041
+MD5 89555a3093e081abbc3365b6e050cb74 files/digest-shorewall-2.0.13 141
+MD5 e5bea352c75a6b0c56f36a29dec327a8 files/digest-shorewall-2.2.0_rc5 147
 MD5 cd869b336ad98b18bcbe4548ea1ce0c5 files/digest-shorewall-2.2.3 139
 MD5 3404020fab5d120975e1294e3554b470 files/digest-shorewall-2.2.4 139
 MD5 8b0f23d1beb0db77f2b2c29e9de1abd0 files/digest-shorewall-2.4.0 139
-MD5 52630f04914209881f04d2f52098af5d files/digest-shorewall-2.4.1 139
-MD5 e5bea352c75a6b0c56f36a29dec327a8 files/digest-shorewall-2.2.0_rc5 147
-MD5 89555a3093e081abbc3365b6e050cb74 files/digest-shorewall-2.0.13 141
-MD5 886a46dd1ca55990686be5bf42b776de files/shorewall 1041
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1yYYEZCkKN40op4RAq2hAKCxeWc2sNUPxZxQx7T23XrqlidJQgCfYueq
-je3Evdb47cIhPZwAECQJATw=
-=j00P
------END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.2.5 b/net-firewall/shorewall/files/digest-shorewall-2.2.5
new file mode 100644
index 000000000000..f8df95056624
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-2.2.5
@@ -0,0 +1,2 @@
+MD5 e454f4af193b8546d3c75fb82647051a shorewall-2.2.5.tgz 131675
+MD5 5c5259545df7c225d9e6b35fb6e83df2 shorewall-docs-html-2.2.5.tgz 2604498
diff --git a/net-firewall/shorewall/shorewall-2.0.13.ebuild b/net-firewall/shorewall/shorewall-2.0.13.ebuild
index e0e7598ca54f..c1300c9122b2 100644
--- a/net-firewall/shorewall/shorewall-2.0.13.ebuild
+++ b/net-firewall/shorewall/shorewall-2.0.13.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.2 2005/01/22 15:18:01 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.0.13.ebuild,v 1.3 2005/07/18 12:55:17 dragonheart Exp $
 
 IUSE="doc"
 
@@ -13,7 +13,7 @@ SRC_URI="http://shorewall.net/pub/${PN}/2.0/${P}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ppc ~sparc x86"
 
 DEPEND="virtual/libc
 	>=net-firewall/iptables-1.2.4
diff --git a/net-firewall/shorewall/shorewall-2.2.0.ebuild b/net-firewall/shorewall/shorewall-2.2.0.ebuild
index 16cabec372a0..b6a422aa4866 100644
--- a/net-firewall/shorewall/shorewall-2.2.0.ebuild
+++ b/net-firewall/shorewall/shorewall-2.2.0.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.0.ebuild,v 1.1 2005/02/02 11:37:23 ka0ttic Exp $
+# $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}"
 
@@ -11,7 +11,7 @@ SRC_URI="http://shorewall.net/pub/${PN}/2.2/${P}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
diff --git a/net-firewall/shorewall/shorewall-2.2.0_rc5.ebuild b/net-firewall/shorewall/shorewall-2.2.0_rc5.ebuild
index 2bf3bc7c72c6..3293a0cdfd14 100644
--- a/net-firewall/shorewall/shorewall-2.2.0_rc5.ebuild
+++ b/net-firewall/shorewall/shorewall-2.2.0_rc5.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.0_rc5.ebuild,v 1.2 2005/02/21 20:38:39 luckyduck Exp $
+# $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
 
@@ -14,7 +14,7 @@ SRC_URI="http://shorewall.net/pub/${PN}/2.2-Beta/${MY_P}/${MY_P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha amd64"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
diff --git a/net-firewall/shorewall/shorewall-2.2.4.ebuild b/net-firewall/shorewall/shorewall-2.2.4.ebuild
index 71c03a611289..1f415f82dd98 100644
--- a/net-firewall/shorewall/shorewall-2.2.4.ebuild
+++ b/net-firewall/shorewall/shorewall-2.2.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.2.4.ebuild,v 1.2 2005/05/14 13:53:20 gmsoft Exp $
+# $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}"
 
@@ -11,7 +11,7 @@ SRC_URI="http://shorewall.net/pub/${PN}/2.2/${P}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 hppa"
+KEYWORDS="~alpha ~amd64 hppa ~ppc ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
diff --git a/net-firewall/shorewall/shorewall-2.2.5.ebuild b/net-firewall/shorewall/shorewall-2.2.5.ebuild
new file mode 100644
index 000000000000..0cefb4fbfe7a
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-2.2.5.ebuild
@@ -0,0 +1,66 @@
+# 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 $
+
+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.4.0.ebuild b/net-firewall/shorewall/shorewall-2.4.0.ebuild
index 0b62ca5ec122..c380a458c0fc 100644
--- a/net-firewall/shorewall/shorewall-2.4.0.ebuild
+++ b/net-firewall/shorewall/shorewall-2.4.0.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.1 2005/06/14 14:17:51 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.0.ebuild,v 1.2 2005/07/18 12:55:17 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="~x86 ~ppc ~sparc ~alpha ~amd64 hppa"
+KEYWORDS="~alpha ~amd64 hppa ~ppc ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
diff --git a/net-firewall/shorewall/shorewall-2.4.1.ebuild b/net-firewall/shorewall/shorewall-2.4.1.ebuild
index 5018a237fe69..b399779cb9bf 100644
--- a/net-firewall/shorewall/shorewall-2.4.1.ebuild
+++ b/net-firewall/shorewall/shorewall-2.4.1.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.1.ebuild,v 1.2 2005/07/15 02:57:15 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.1.ebuild,v 1.3 2005/07/18 12:55:17 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