3.4 branch added wrt bug #170448

Package-Manager: portage-2.1.2.3

6 files changed, 134 insertions, 28 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/Manifest b/net-firewall/shorewall/Manifest
index 1383db7d1bd0..26f306ade234 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX shorewall-r1 1147 RMD160 897f5f7630755747cc751f51661f9f8495e44a79 SHA1 064982a33904df1280522332e937b388b599a9f7 SHA256 3669df99e1d9dee5633195befa423e32415a5c893cac80a3ca749e97b57dfcc3
 MD5 faebfe0a2045ed8e1e996332df1823c4 files/shorewall-r1 1147
 RMD160 897f5f7630755747cc751f51661f9f8495e44a79 files/shorewall-r1 1147
@@ -12,25 +9,31 @@ SHA256 2936b7fcf96c5411d7cd5c0aa951664b840dfecd1bb8d369e10621a0d89a320e files/sh
 DIST shorewall-3.0.8.tgz 205265 RMD160 0da7fce8a09fb4d8a420f456488fc2789b9d9e57 SHA1 ba5ebca6be6a115d1c7eafd7126a046198c7291b SHA256 5750f7e972b2633809dd4d999a9964fd3d50e5ec8a9116e45d0b017be2ca2b1b
 DIST shorewall-3.2.10.tgz 235997 RMD160 10b85a518dca25def0136efb8a78fde7c600ac88 SHA1 ce0de2270e06ad52c3d7bdcebcca6ea53c03ab03 SHA256 c59bd64893225088301ab321475d0206093e186164ffacabed3e3c31c37c1e06
 DIST shorewall-3.2.9.tgz 238364 RMD160 86dedcf04fc2fa7939932de14e4b1bb9e7c216e0 SHA1 91fbce71da77a2898ddf99be20abc6e88868a05e SHA256 13b5a6b88c0bf8e995d5ea8faef010921b40d36f339e7e192e14746db8428d3a
+DIST shorewall-3.4.2.tgz 217461 RMD160 d400248aa44c1b33e43992e639ca3d135361e0e7 SHA1 a391e9a998c4450528384c4e1951b7727b3882ab SHA256 46579e2172b7fc6c4616deb8f3b85869f6fa89637eb13153156380613530f350
 DIST shorewall-docs-html-3.0.8.tgz 3695934 RMD160 fbe28701867e890fb0cfc516657da90b12ec26f6 SHA1 558ea13243bd91db26c75df277c26f47d3fb80f6 SHA256 a6520eb2ae61baf80dfe98cade90de11f90525c76c0e63baa6ec5644499fd3df
 DIST shorewall-docs-html-3.2.10.tgz 2093386 RMD160 d11cd7f91c4059ac225b260d892ecf8f07cd7202 SHA1 15b7175006898c57760773c05a14589f2911c53c SHA256 d8131b4560591fb58c83ef840f948c57b40ae83d0ecee003f45558d4277c5800
 DIST shorewall-docs-html-3.2.9.tgz 2102819 RMD160 43aeb4503a82bd3e7d5dc383fd4fd6ae37307a44 SHA1 8634390084d9aba6cc56c29edec2f2af4a18e818 SHA256 e68fe721b018b73091fd3a9eab8d14088461164929105b39476015853feac054
+DIST shorewall-docs-html-3.4.2.tgz 2090427 RMD160 859a1a612744be13018877c09242ac1322ae7101 SHA1 2ecff37f6bf34d9af0e394041ed5392305e81ccf SHA256 80726ed2031f328812d3cb515b875b64fac8579815352541f72845db28ba027b
 EBUILD shorewall-3.0.8.ebuild 2206 RMD160 41c46a3dd10a3852d8c28101f037bcaf8d460da4 SHA1 d063f76cf0d86186baebbe2579a2808b4d92e6d1 SHA256 bc7cc68b2b49a7fcaf56ef484cbfd01bd0c5113ba585d6747ce97207c833dfd6
 MD5 121c91d7aa0e0636bfee8e062775d783 shorewall-3.0.8.ebuild 2206
 RMD160 41c46a3dd10a3852d8c28101f037bcaf8d460da4 shorewall-3.0.8.ebuild 2206
 SHA256 bc7cc68b2b49a7fcaf56ef484cbfd01bd0c5113ba585d6747ce97207c833dfd6 shorewall-3.0.8.ebuild 2206
-EBUILD shorewall-3.2.10.ebuild 3567 RMD160 da563ef19752280628b743db29cb861d98d49abc SHA1 0fbcbc594ea2d58d02338950fb28839f205ac368 SHA256 4fb4f72f0bfebc7834e4615b89553ebc572d2203f6b689e4c7853fccc74fce7a
-MD5 b9c31d566dd65e4258d235644cc1aeb3 shorewall-3.2.10.ebuild 3567
-RMD160 da563ef19752280628b743db29cb861d98d49abc shorewall-3.2.10.ebuild 3567
-SHA256 4fb4f72f0bfebc7834e4615b89553ebc572d2203f6b689e4c7853fccc74fce7a shorewall-3.2.10.ebuild 3567
-EBUILD shorewall-3.2.9.ebuild 3568 RMD160 c1158cba8a0e4c3e7aaebaef766665e9347181d8 SHA1 f59e9fcc76a24b5e59be562ed2542588ef3e658d SHA256 c2486bc284369a4ddcfe667fa7089ec084076f4e2c9f492bf4c80b797823cef1
-MD5 761f97b6ba795ba63b1ee25b2495caa4 shorewall-3.2.9.ebuild 3568
-RMD160 c1158cba8a0e4c3e7aaebaef766665e9347181d8 shorewall-3.2.9.ebuild 3568
-SHA256 c2486bc284369a4ddcfe667fa7089ec084076f4e2c9f492bf4c80b797823cef1 shorewall-3.2.9.ebuild 3568
-MISC ChangeLog 18096 RMD160 8a82724cfdab6803abe6804d649134a4b8bb4c74 SHA1 f4b033033da403c2b2e5fec99ce5e76f70210633 SHA256 c23f72ee911c84e2f5f086b77d2138f29d2d82a887f1aa0be3d0a56cfa5d1b50
-MD5 bee2b17e0b53398d955e62e789dbb6fd ChangeLog 18096
-RMD160 8a82724cfdab6803abe6804d649134a4b8bb4c74 ChangeLog 18096
-SHA256 c23f72ee911c84e2f5f086b77d2138f29d2d82a887f1aa0be3d0a56cfa5d1b50 ChangeLog 18096
+EBUILD shorewall-3.2.10.ebuild 3564 RMD160 33f4e92d1419a9ea61f6f30a6a0e6f5dc4d01f0e SHA1 836308f8f400c13de14e4e1143b28149e0df09b2 SHA256 266365d25ea3d8d88603e03c761290f1502a7e88b7ab0a49da1b0b7eb2541db9
+MD5 3d4c1fdb0585eb0689f4a69b34f9fee3 shorewall-3.2.10.ebuild 3564
+RMD160 33f4e92d1419a9ea61f6f30a6a0e6f5dc4d01f0e shorewall-3.2.10.ebuild 3564
+SHA256 266365d25ea3d8d88603e03c761290f1502a7e88b7ab0a49da1b0b7eb2541db9 shorewall-3.2.10.ebuild 3564
+EBUILD shorewall-3.2.9.ebuild 3561 RMD160 83b1e14425087c72c31c23ae97de8509fe3dcc42 SHA1 c236b9e8126b632d008fac7799bf5c7048a45c06 SHA256 d946c557e0e5187ee988dac48b4b3bc6e3c17c1b2eb70a63a90f06b719e7237a
+MD5 8998fda251f45d372d2f64bc9f21a496 shorewall-3.2.9.ebuild 3561
+RMD160 83b1e14425087c72c31c23ae97de8509fe3dcc42 shorewall-3.2.9.ebuild 3561
+SHA256 d946c557e0e5187ee988dac48b4b3bc6e3c17c1b2eb70a63a90f06b719e7237a shorewall-3.2.9.ebuild 3561
+EBUILD shorewall-3.4.2.ebuild 3927 RMD160 8941d9147ad263537deac114a94ce5b0d797d91a SHA1 c6031143a99e13c881bcc99e5b9136ed2e0caa57 SHA256 ebb1ecfa8c877afdec22d9e5c331475d7c1689e8e47b68d3629f9e8039cd6382
+MD5 8a42a45402814f8dce74325c4b2b7f56 shorewall-3.4.2.ebuild 3927
+RMD160 8941d9147ad263537deac114a94ce5b0d797d91a shorewall-3.4.2.ebuild 3927
+SHA256 ebb1ecfa8c877afdec22d9e5c331475d7c1689e8e47b68d3629f9e8039cd6382 shorewall-3.4.2.ebuild 3927
+MISC ChangeLog 18286 RMD160 0713e5caa314ed1c431a6bc8ba0bcad5f00244d5 SHA1 523c74f39df889640f59e12b6a893e901289754a SHA256 3a833a91c6c7527a0b603a2bb6f29e39d978feaada76e433d3b396d1a500ff78
+MD5 1a1a955108df30c4cee59641b5c93f03 ChangeLog 18286
+RMD160 0713e5caa314ed1c431a6bc8ba0bcad5f00244d5 ChangeLog 18286
+SHA256 3a833a91c6c7527a0b603a2bb6f29e39d978feaada76e433d3b396d1a500ff78 ChangeLog 18286
 MISC metadata.xml 221 RMD160 6a612dbdb85b7cbc15a4f4924fc62b435900bee4 SHA1 59ce39c64900516f7d583951daacb16fc01f0ea1 SHA256 80bafe9d61de4580c061d796ca9c244633349b7a6da85aeae6e11bbaad597110
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
 RMD160 6a612dbdb85b7cbc15a4f4924fc62b435900bee4 metadata.xml 221
@@ -44,10 +47,6 @@ SHA256 0aa747809c85cf5080636beaf3d019aec722aac217508de65d3b4d54036a204c files/di
 MD5 12388f214beedbca4471737f67883b69 files/digest-shorewall-3.2.9 509
 RMD160 cf9165ebf34b9c7e8a575d33e7da0c2800fce56b files/digest-shorewall-3.2.9 509
 SHA256 af55368032e2ffbd21039b8081472bb0abdf7465528880d79ff388c1c3b2ba6d files/digest-shorewall-3.2.9 509
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFGHnwSKRy60XGEcJIRAp9+AJ9mVstSOi3o+Mzvc7zYS7e0NtTTHACfdsT4
-8RaO5wNbceeTwRr3Uqeg+Hs=
-=5ibT
------END PGP SIGNATURE-----
+MD5 da2d5f98731fded7a4cc52f224dc059b files/digest-shorewall-3.4.2 509
+RMD160 5f73461f4806b8408480953fba31b12e03ca4f16 files/digest-shorewall-3.4.2 509
+SHA256 d40320bab98dbad038cb68e6c1ada8ab1ffdaf06d4aef237ebd77368254157dc files/digest-shorewall-3.4.2 509
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."
+}