3.4 branch added wrt bug #170448

(Portage version: 2.1.2.3)

5 files changed, 113 insertions, 6 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 68addb3ced9d..3de3fe8ca951 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.125 2007/04/12 18:35:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.126 2007/04/12 18:45:42 jokey Exp $
+
+*shorewall-3.4.2 (12 Apr 2007)
+
+  12 Apr 2007; Markus Ullmann <jokey@gentoo.org> shorewall-3.2.9.ebuild,
+  shorewall-3.2.10.ebuild, +shorewall-3.4.2.ebuild:
+  3.4 branch added wrt bug #170448
 
   12 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   shorewall-3.2.9.ebuild:
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.4.2 b/net-firewall/shorewall/files/digest-shorewall-3.4.2
new file mode 100644
index 000000000000..3a404d58a3f4
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-3.4.2
@@ -0,0 +1,6 @@
+MD5 ca04cb57d2ff3995975e83155dd9944f shorewall-3.4.2.tgz 217461
+RMD160 d400248aa44c1b33e43992e639ca3d135361e0e7 shorewall-3.4.2.tgz 217461
+SHA256 46579e2172b7fc6c4616deb8f3b85869f6fa89637eb13153156380613530f350 shorewall-3.4.2.tgz 217461
+MD5 e9b26b2ac30611ee62ff30181cd05332 shorewall-docs-html-3.4.2.tgz 2090427
+RMD160 859a1a612744be13018877c09242ac1322ae7101 shorewall-docs-html-3.4.2.tgz 2090427
+SHA256 80726ed2031f328812d3cb515b875b64fac8579815352541f72845db28ba027b shorewall-docs-html-3.4.2.tgz 2090427
diff --git a/net-firewall/shorewall/shorewall-3.2.10.ebuild b/net-firewall/shorewall/shorewall-3.2.10.ebuild
index 2afc2585afcd..bc6161eb12a6 100644
--- a/net-firewall/shorewall/shorewall-3.2.10.ebuild
+++ b/net-firewall/shorewall/shorewall-3.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.2.10.ebuild,v 1.1 2007/04/12 18:24:09 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.2.10.ebuild,v 1.2 2007/04/12 18:45:42 jokey Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ DEPEND=">=net-firewall/iptables-1.2.4
 
 pkg_setup() {
 	if built_with_use sys-apps/iproute2 minimal; then
-	    die "Shorewall requires sys-apps/iproute2 to be built without the \"minimal\" USE flag."
+		die "Shorewall requires sys-apps/iproute2 to be built without the \"minimal\" USE flag."
 	fi
 }
 
diff --git a/net-firewall/shorewall/shorewall-3.2.9.ebuild b/net-firewall/shorewall/shorewall-3.2.9.ebuild
index 21ebd687054d..8f65f1d0a42e 100644
--- a/net-firewall/shorewall/shorewall-3.2.9.ebuild
+++ b/net-firewall/shorewall/shorewall-3.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.2.9.ebuild,v 1.2 2007/04/12 18:35:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.2.9.ebuild,v 1.3 2007/04/12 18:45:42 jokey Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://shorewall.net/pub/${PN}/3.2/${P}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 sparc x86"
 IUSE="doc"
 
 DEPEND=">=net-firewall/iptables-1.2.4
@@ -21,7 +21,7 @@ DEPEND=">=net-firewall/iptables-1.2.4
 
 pkg_setup() {
 	if built_with_use sys-apps/iproute2 minimal; then
-	    die "Shorewall requires sys-apps/iproute2 to be built without the \"minimal\" USE flag."
+		die "Shorewall requires sys-apps/iproute2 to be built without the \"minimal\" USE flag."
 	fi
 }
 
diff --git a/net-firewall/shorewall/shorewall-3.4.2.ebuild b/net-firewall/shorewall/shorewall-3.4.2.ebuild
new file mode 100644
index 000000000000..34c11c1b3e76
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-3.4.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.4.2.ebuild,v 1.1 2007/04/12 18:45:42 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://www1.shorewall.net/pub/${PN}/3.4/${P}/${P}.tgz
+	doc? ( http://www1.shorewall.net/pub/${PN}/3.4/${P}/${MY_P_DOCS}.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=net-firewall/iptables-1.2.4
+	sys-apps/iproute2"
+
+pkg_setup() {
+	if built_with_use sys-apps/iproute2 minimal; then
+		die "Shorewall requires sys-apps/iproute2 to be built without the \"minimal\" USE flag."
+	fi
+}
+
+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 "Please read the Release Notes in /usr/share/doc/${PF}."
+		einfo "Samples are available at /usr/share/doc/${PF}/Samples."
+	else
+		einfo "Documentation is available at http://www.shorewall.net"
+	fi
+	einfo "There are man pages for shorewall(8) and for each configuration file."
+	einfo
+	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.4 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.4 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 "* review IMAP LDAP NNTP POP3 SMTP and WEB macros as they have changed"
+	einfo "* move any policy's default action specifications"
+	einfo "  from /etc/shorewall/actions to /etc/shorewall/shorewall.conf"
+	einfo "* remove or rename custom version of Limit action (if any)"
+	einfo "* entries in /etc/shorewall/providers require specific procedure at startup"
+	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.4/${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."
+}