Version bump and cleanup

(Portage version: 2.1.2_pre2-r6)

6 files changed, 173 insertions, 1 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 8f51d276f3b9..1c00c6a50365 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.113 2006/09/29 20:01:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.114 2006/10/08 19:58:52 jokey Exp $
+
+*shorewall-3.2.4 (08 Oct 2006)
+*shorewall-3.0.9 (08 Oct 2006)
+
+  08 Oct 2006; Markus Ullmann <jokey@gentoo.org> -shorewall-3.0.5-r1.ebuild,
+  -shorewall-3.0.7.ebuild, +shorewall-3.0.9.ebuild, +shorewall-3.2.4.ebuild:
+  Version bump and cleanup
 
   29 Sep 2006; Markus Rothe <corsair@gentoo.org> shorewall-3.0.8.ebuild:
   Stable on ppc64
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.4.2 b/net-firewall/shorewall/files/digest-shorewall-2.4.2
index af4c0fd99f9c..b1a06250f6aa 100644
--- a/net-firewall/shorewall/files/digest-shorewall-2.4.2
+++ b/net-firewall/shorewall/files/digest-shorewall-2.4.2
@@ -1,2 +1,6 @@
 MD5 ff6adb5b81633684fbf2c44da53f847e shorewall-2.4.2.tgz 132141
+RMD160 450a5e35cba936b9985a7d688f59016f178a3a8e shorewall-2.4.2.tgz 132141
+SHA256 baf89f7a2d92f2131034dcb77e5e7f094347d774d13a4755fe4eec0955f3ca10 shorewall-2.4.2.tgz 132141
 MD5 e27c9f2ffaf5860e56e24088a0e4c351 shorewall-docs-html-2.4.2.tgz 2609552
+RMD160 b7fad02a801079a6c10162ad8676378ebc4833ec shorewall-docs-html-2.4.2.tgz 2609552
+SHA256 41451957862e97ee89c6d6a6f85273845b235c1d03aed1de7d7acd6f2be4e725 shorewall-docs-html-2.4.2.tgz 2609552
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.0.9 b/net-firewall/shorewall/files/digest-shorewall-3.0.9
new file mode 100644
index 000000000000..21e39f851bf4
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-3.0.9
@@ -0,0 +1,6 @@
+MD5 d669260ca54df6b377dac3e489191424 shorewall-3.0.9.tgz 205895
+RMD160 ee02d23bd20a8a3f7af9c1cc05a07ed41e44c042 shorewall-3.0.9.tgz 205895
+SHA256 054823fea6f1796ea63ae3c4cb11062bd153f40f1a6333df9b248f05d8b50a0a shorewall-3.0.9.tgz 205895
+MD5 01b40462f0c7e14c79fea0aeb97769ac shorewall-docs-html-3.0.9.tgz 3706962
+RMD160 bfbf718425296807da00c8f2191cfba0179c702d shorewall-docs-html-3.0.9.tgz 3706962
+SHA256 442864d3cf79cafcea4a52ef18495cc47b5badd6ed0ce936fb417a7a12b61370 shorewall-docs-html-3.0.9.tgz 3706962
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.2.4 b/net-firewall/shorewall/files/digest-shorewall-3.2.4
new file mode 100644
index 000000000000..174c339bd712
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-3.2.4
@@ -0,0 +1,6 @@
+MD5 bd32ceda6f2152a27bc781a7aa9ec0a0 shorewall-3.2.4.tgz 231147
+RMD160 a188f134ca287738bc6ddac31ebe7cfe59273def shorewall-3.2.4.tgz 231147
+SHA256 060d87791cdf2e44e421c3d5d0de7673f7a7e1d958e0c46d842331319fe75e22 shorewall-3.2.4.tgz 231147
+MD5 e9de823c8b7ecae92d31ed7d4466637d shorewall-docs-html-3.2.4.tgz 3701744
+RMD160 fbc4adb4b0d19c63901d79a2ff41593d0fc3ed86 shorewall-docs-html-3.2.4.tgz 3701744
+SHA256 74fe92892689864b2cff2fa674a84794028eb931054dfb22873c99e20e73a556 shorewall-docs-html-3.2.4.tgz 3701744
diff --git a/net-firewall/shorewall/shorewall-3.0.9.ebuild b/net-firewall/shorewall/shorewall-3.0.9.ebuild
new file mode 100644
index 000000000000..2f098a4a10bb
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-3.0.9.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.0.9.ebuild,v 1.1 2006/10/08 19:58:52 jokey 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}/3.0/${P}/${P}.tgz
+	doc? ( http://shorewall.net/pub/${PN}/3.0/${P}/${MY_P_DOCS}.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=net-firewall/iptables-1.2.4
+	sys-apps/iproute2"
+
+src_compile() {
+	einfo "Nothing to compile."
+}
+
+src_install() {
+	keepdir /var/lib/shorewall
+
+	PREFIX="${D}" ./install.sh || die "install.sh failed"
+	newinitd "${FILESDIR}"/shorewall-r1 shorewall || die "doinitd failed"
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		cd "${WORKDIR}/${MY_P_DOCS}"
+		# install documentation
+		dohtml -r *
+		dosym Documentation_Index.html "/usr/share/doc/${PF}/html/index.htm"
+		# install samples
+		cp -pR "${S}/Samples" "${D}/usr/share/doc/${PF}"
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	if use doc ; then
+		einfo "Documentation is available at /usr/share/doc/${PF}/html."
+		einfo "Samples are available at /usr/share/doc/${PF}/Samples."
+	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 "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/"
+	einfo "or install kernel 2.6.16+ and compile it with support for policy match."
+	einfo
+	einfo "Be aware that version 3 differs substantially from previous releases."
+	einfo "Information on upgrading is available at:"
+	einfo "http://www.shorewall.net/upgrade_issues.htm"
+	einfo
+	einfo "Known problems:"
+	einfo "http://shorewall.net/pub/${PN}/3.0/${P}/known_problems.txt"
+	einfo
+	einfo "Whether upgrading or installing you should run shorewall check,"
+	einfo "correct any errors found and run shorewall restart|start"
+}
diff --git a/net-firewall/shorewall/shorewall-3.2.4.ebuild b/net-firewall/shorewall/shorewall-3.2.4.ebuild
new file mode 100644
index 000000000000..394652536fee
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-3.2.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.2.4.ebuild,v 1.1 2006/10/08 19:58:52 jokey Exp $
+
+MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
+
+DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://shorewall.net/pub/${PN}/3.2/${P}/${P}.tgz
+	doc? ( http://shorewall.net/pub/${PN}/3.2/${P}/${MY_P_DOCS}.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=net-firewall/iptables-1.2.4
+	sys-apps/iproute2"
+
+src_compile() {
+	einfo "Nothing to compile."
+}
+
+src_install() {
+	keepdir /var/lib/shorewall
+
+	PREFIX="${D}" ./install.sh || die "install.sh failed"
+	newinitd "${FILESDIR}"/shorewall-r2 shorewall || die "doinitd failed"
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		cd "${WORKDIR}/${MY_P_DOCS}"
+		# install documentation
+		dohtml -r *
+		## dosym Documentation_Index.html "/usr/share/doc/${PF}/html/index.htm"
+		# install samples
+		cp -pR "${S}/Samples" "${D}/usr/share/doc/${PF}"
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	if use doc ; then
+		einfo "Documentation is available at /usr/share/doc/${PF}/html."
+		einfo "Samples are available at /usr/share/doc/${PF}/Samples."
+	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 "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/"
+	einfo "or install kernel 2.6.16+ as well as a recent Netfilter iptables"
+	einfo "and compile it with support for policy match."
+	einfo
+	einfo "Be aware that version 3.2 differs substantially from previous releases."
+	einfo "Information on upgrading is available at:"
+	einfo "http://www.shorewall.net/upgrade_issues.htm"
+	einfo
+	einfo "If you are upgrading to 3.2 you should at least:"
+	einfo "* check that /etc/shorewall/rfc1918 does not contain non-RFC1918 private"
+	einfo "  addresses. If it does, rename it to rfc1918.old"
+	einfo "* remove /etc/shorewall/modules and use the one in /usr/share/shorewall/"
+	einfo "* if you want to use xtables (kernel 2.6.16+) then"
+	einfo "  cp -f /usr/share/shorewall/xmodules /etc/shorewall/modules"
+	einfo "* review IMAP LDAP NNTP POP3 SMTP and WEB macros as they have changed"
+	einfo
+	einfo "There is a new 'shorewall compile' command to generate scripts to run"
+	einfo "on systems with Shorewall Lite installed."
+	einfo "Please refer to http://www.shorewall.net/CompiledPrograms.html"
+	einfo "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
+	einfo "own 'export directories'. However, whenever you upgrade Shorewall you"
+	einfo "should check for changes in configfiles and manually update your exports."
+	einfo "Alternatively, if you only have one Shorewall-Lite system in your network"
+	einfo "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
+	einfo "in /etc/make.conf (man make.conf)."
+	einfo
+	einfo "Known problems:"
+	einfo "http://shorewall.net/pub/${PN}/3.2/${P}/known_problems.txt"
+	einfo
+	einfo "Whether upgrading or installing you should run shorewall check,"
+	einfo "correct any errors found and run shorewall restart|start."
+}