Version bump wrt bug #182544

Package-Manager: portage-2.1.3_rc8

8 files changed, 50 insertions, 24 deletions

diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 090168376abc..f948d23c6cf0 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/shorewall-lite
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.13 2007/05/20 23:06:34 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.14 2007/07/16 18:15:10 jokey Exp $
+
+*shorewall-lite-3.4.5 (16 Jul 2007)
+
+  16 Jul 2007; Markus Ullmann <jokey@gentoo.org>
+  -shorewall-lite-3.4.2.ebuild, +shorewall-lite-3.4.5.ebuild:
+  Version bump wrt bug #182544
 
 *shorewall-lite-3.4.3 (20 May 2007)
 
diff --git a/net-firewall/shorewall-lite/files/digest-shorewall-lite-3.4.2 b/net-firewall/shorewall-lite/files/digest-shorewall-lite-3.4.2
deleted file mode 100644
index cc9e52a18b7b..000000000000
--- a/net-firewall/shorewall-lite/files/digest-shorewall-lite-3.4.2
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-MD5 4c362e7dd2a1105dc8faae12b41a62fa shorewall-lite-3.4.2.tgz 53444
-RMD160 5fecf51fb0703ec70a18297f9dceb18353c8a816 shorewall-lite-3.4.2.tgz 53444
-SHA256 799ccc505eef4e43a067c100c730caef32bec97f624082cd48e3dd605bef1706 shorewall-lite-3.4.2.tgz 53444
diff --git a/net-firewall/shorewall-lite/files/digest-shorewall-lite-3.4.5 b/net-firewall/shorewall-lite/files/digest-shorewall-lite-3.4.5
new file mode 100644
index 000000000000..c108d91017d5
--- /dev/null
+++ b/net-firewall/shorewall-lite/files/digest-shorewall-lite-3.4.5
@@ -0,0 +1,6 @@
+MD5 71ff0920c7bcf440dba787d38bce7375 shorewall-docs-html-3.4.5.tgz 2328327
+RMD160 f201c73412d656f31d24aff247bb6a545d63cbe9 shorewall-docs-html-3.4.5.tgz 2328327
+SHA256 67802f175198ebce0a67480c5d6a5f777dc04ae215fbb32959a774953ce7928f shorewall-docs-html-3.4.5.tgz 2328327
+MD5 c2a13fb0af75812665ba6a334106cf95 shorewall-lite-3.4.5.tgz 56282
+RMD160 18e19b20435f151267eb2b4bc6c14a69733d072d shorewall-lite-3.4.5.tgz 56282
+SHA256 4624fd7aa29f54591148556ecc59a77fb4b4264f4b6e3e85584b68e12f501cb9 shorewall-lite-3.4.5.tgz 56282
diff --git a/net-firewall/shorewall-lite/shorewall-lite-3.4.2.ebuild b/net-firewall/shorewall-lite/shorewall-lite-3.4.5.ebuild
index 3791de61588b..d65b985de1c4 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-3.4.2.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-lite-3.4.5.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-3.4.2.ebuild,v 1.3 2007/04/13 14:20:23 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-3.4.5.ebuild,v 1.1 2007/07/16 18:15:10 jokey Exp $
 
+#MY_P_TREE="development/3.9"
+MY_P_TREE="3.4"
 MY_P="shorewall-${PV}"
 MY_P_DOCS="${P/${PN}/shorewall-docs-html}"
 
 DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall."
 HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/shorewall/3.4/${MY_P}/${P}.tgz
-	doc? ( http://www1.shorewall.net/pub/shorewall/3.4/${MY_P}/${MY_P_DOCS}.tgz )"
+SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_P_TREE}/${MY_P}/${P}.tgz
+	doc? ( http://www1.shorewall.net/pub/shorewall/${MY_P_TREE}/${MY_P}/${MY_P_DOCS}.tgz )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -51,5 +53,5 @@ pkg_postinst() {
 	einfo "to /etc/shorewall-lite/shorewall-lite.conf"
 	einfo
 	einfo "Known problems:"
-	einfo "http://shorewall.net/pub/shorewall/3.4/${MY_P}/known_problems.txt"
+	einfo "http://shorewall.net/pub/shorewall/${MY_P_TREE}/${MY_P}/known_problems.txt"
 }
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index f37a72887890..e43dc82f4598 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.137 2007/05/22 02:39:11 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.138 2007/07/16 18:12:30 jokey Exp $
+
+*shorewall-3.4.5 (16 Jul 2007)
+
+  16 Jul 2007; Markus Ullmann <jokey@gentoo.org> -shorewall-3.4.2.ebuild,
+  +shorewall-3.4.5.ebuild:
+  Version bump wrt bug #182544
 
   22 May 2007; Martin Jackson <mjolnir@gentoo.org> shorewall-3.4.3.ebuild:
   Remove notice to install shorewall-perl or shorewall-shell
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.4.2 b/net-firewall/shorewall/files/digest-shorewall-3.4.2
deleted file mode 100644
index 3a404d58a3f4..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-3.4.2
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/digest-shorewall-3.4.5 b/net-firewall/shorewall/files/digest-shorewall-3.4.5
new file mode 100644
index 000000000000..04ed4d0760d9
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-3.4.5
@@ -0,0 +1,6 @@
+MD5 5209d3812472e043761bee84cd46a5a4 shorewall-3.4.5.tgz 227413
+RMD160 f23db1d6fcc3624bc2cbe07be722952fbdbf95ae shorewall-3.4.5.tgz 227413
+SHA256 61c09eeff5b6acba70abe6c35ddcaaf5377e6651e84992f7e25083b9a2a17e06 shorewall-3.4.5.tgz 227413
+MD5 71ff0920c7bcf440dba787d38bce7375 shorewall-docs-html-3.4.5.tgz 2328327
+RMD160 f201c73412d656f31d24aff247bb6a545d63cbe9 shorewall-docs-html-3.4.5.tgz 2328327
+SHA256 67802f175198ebce0a67480c5d6a5f777dc04ae215fbb32959a774953ce7928f shorewall-docs-html-3.4.5.tgz 2328327
diff --git a/net-firewall/shorewall/shorewall-3.4.2.ebuild b/net-firewall/shorewall/shorewall-3.4.5.ebuild
index 0ea26298dba5..156341a713af 100644
--- a/net-firewall/shorewall/shorewall-3.4.2.ebuild
+++ b/net-firewall/shorewall/shorewall-3.4.5.ebuild
@@ -1,15 +1,17 @@
 # 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.3 2007/05/21 23:27:38 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.4.5.ebuild,v 1.1 2007/07/16 18:12:30 jokey Exp $
 
 inherit eutils
 
+#MY_P_TREE="development/3.9"
+MY_P_TREE="3.4"
 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 )"
+SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_P_TREE}/${P}/${P}.tgz
+	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_P_TREE}/${P}/${MY_P_DOCS}.tgz )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,6 +21,12 @@ IUSE="doc"
 DEPEND=">=net-firewall/iptables-1.2.4
 	sys-apps/iproute2"
 
+# When we're ready for 3.9.x...
+#RDEPEND="|| (
+#	>=net-firewall/shorewall-shell-3.9.1
+#	>=net-firewall/shorewall-perl-3.9.1
+#	)"
+
 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."
@@ -57,6 +65,8 @@ pkg_postinst() {
 	fi
 	einfo "There are man pages for shorewall(8) and for each configuration file."
 	einfo
+	einfo "Bridging configuration has changed with kernel 2.6.20+. Check the documentation."
+	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
@@ -65,11 +75,11 @@ pkg_postinst() {
 	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 "Be aware that version ${MY_P_TREE} 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 "If you are upgrading to ${MY_P_TREE} 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/"
@@ -90,8 +100,10 @@ pkg_postinst() {
 	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 "http://shorewall.net/pub/${PN}/${MY_P_TREE}/${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."
+	einfo
+	#ewarn "You should now emerge shorewall-shell and/or shorewall-perl."
 }