Version bump, bug #247669 and #247670, thank Vieri for maintenance.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

4 files changed, 209 insertions, 2 deletions

diff --git a/net-firewall/shorewall-common/ChangeLog b/net-firewall/shorewall-common/ChangeLog
index 19634f670b24..05977c207781 100644
--- a/net-firewall/shorewall-common/ChangeLog
+++ b/net-firewall/shorewall-common/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/shorewall-common
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/ChangeLog,v 1.19 2008/10/30 19:44:33 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/ChangeLog,v 1.20 2008/11/21 11:27:33 pva Exp $
+
+*shorewall-common-4.2.1 (21 Nov 2008)
+*shorewall-common-4.0.14.2 (21 Nov 2008)
+
+  21 Nov 2008; Peter Volkov <pva@gentoo.org>
+  +shorewall-common-4.0.14.2.ebuild, +shorewall-common-4.2.1.ebuild:
+  Version bump, bug #247669 and #247670, thank Vieri for maintenance.
 
 *shorewall-common-4.2.0 (30 Oct 2008)
 
diff --git a/net-firewall/shorewall-common/Manifest b/net-firewall/shorewall-common/Manifest
index 4d0f20049e87..ae6785b1a6fe 100644
--- a/net-firewall/shorewall-common/Manifest
+++ b/net-firewall/shorewall-common/Manifest
@@ -1,12 +1,18 @@
 AUX shorewall.initd 1912 RMD160 5766b04a72cea35869dc50d6a4652779e16b707b SHA1 f88025b4a9934dc938f6904df63c06da486bce34 SHA256 9678df49ead9a6a65f2f1dd002ff695b9e1bd88be145fe7c56e21738eab413b1
 DIST shorewall-common-4.0.12.tar.bz2 139465 RMD160 78ae22c813c1bd759d48be6a48f801205c716158 SHA1 a4e359ac99236ffe90cf9a9412805e017614e3a6 SHA256 7c4d66bf7ca693995518da7ec2e56286126c0f34afc08b8c3180877d01d15a4e
 DIST shorewall-common-4.0.13.tar.bz2 139571 RMD160 41c035b61906075d56445d4d2e71ca0decc7346d SHA1 b77061db989f56e7f482b5a616b47ff1e3f05547 SHA256 dffff6219cfe0ec03e66b77980613d45774caeede7348497a7a86dc3e3938c71
+DIST shorewall-common-4.0.14.2.tar.bz2 138951 RMD160 e8273d0f7cbc4fe2b1e5c93ecb308ba53c1a3d09 SHA1 c129ec99d12378037096e82d1d54b67c5496e33c SHA256 507d965875b9a5d5f7b64cd6ab3aab018871a944e2011168bda12b2163d17a0f
 DIST shorewall-common-4.2.0.tar.bz2 129019 RMD160 22bc39fb8ee8d25becc3ab34567b1071225a913d SHA1 da5a2af0f733e5077da738c6ff9fc35ed64815b9 SHA256 75deefcca8c6f379e3e6bac30b27ad6bbb2574d1c5331dd42914110757c150a4
+DIST shorewall-common-4.2.1.tar.bz2 131378 RMD160 dba2dc046e99d59147d7fe719bb5c8faab8b1326 SHA1 674a763e3f10df67db66c1daa00013ae1e0cf6f7 SHA256 3062057684a00fe15e84b2ec626250c7cff1126542c4d44119ba1313c694a9b1
 DIST shorewall-docs-html-4.0.12.tar.bz2 2500024 RMD160 0d1e490e06f103e71a78a27356837de981852ed1 SHA1 06d0405f4325d106124249a93bda2494c04d9867 SHA256 dd8b51e6eebb24703e08cc8367f6f6f68e20b8919009b7621bbe98e4eafd163c
 DIST shorewall-docs-html-4.0.13.tar.bz2 2478683 RMD160 7083e32b4501b862ae03a224e84d87b18655b130 SHA1 5d4083b16f4e838ae5cacfdd261bb5dd15355ae4 SHA256 b0da71d4906edfeade4ca357a5a5232b51a4c9dc380ec1bdcd954eaf6386bbfa
+DIST shorewall-docs-html-4.0.14.tar.bz2 2578112 RMD160 89073b5ead8fd42ccb001f5a7b8de6ded240ab59 SHA1 e350f5bd378afee26733611a0a1f29a37e764dd5 SHA256 53ab6ce21f467fcc51af2800ed396957e7e6b64115e51d8fd1c6987df2cb053a
 DIST shorewall-docs-html-4.2.0.tar.bz2 2580894 RMD160 c84b8344f5433fda0db690f4da8cd93bebab49e5 SHA1 a3d4abce8a61f92bd2a106c9bcb593fe89dfc62b SHA256 ae335b4cb2e7496e420dc5d5df059659311f5aaaca5ec648548767db78887497
+DIST shorewall-docs-html-4.2.1.tar.bz2 2582360 RMD160 bb5a49d7f70740ecb80206824c792981abfea45a SHA1 61bb7efa405fdfc582c9f68154ca2fe004b1dc56 SHA256 30e14e5847d914a9548f49e121c8d0f9782b4f0345e696fa3db71bf90dbd847c
 EBUILD shorewall-common-4.0.12.ebuild 3750 RMD160 3babf63a2acfe5f1048bb0510e7115d16dbe2ea9 SHA1 2a09ff8183d89bdc68ec54bc16d1a195cf072856 SHA256 6729d39b7337a00676161b8d01de860ff36d23fc489f0f16ab9c64653eba6420
 EBUILD shorewall-common-4.0.13.ebuild 3750 RMD160 1db209572b3f0b3e566d3ee4520cfeb197bebf8d SHA1 100a7a7a4ef7e9248b586e303f7df210ebb92b1d SHA256 b86bd5644602b4e132f691dc749ac8924802c8d12a14f9d6c61263d32131135d
+EBUILD shorewall-common-4.0.14.2.ebuild 3752 RMD160 7c4e24b0a19938db54316e66ac4fe5f94b108777 SHA1 a757b5ad9a9e1b661d6ab4b7615f53bd5ec0ba68 SHA256 5a7a29e6502d4ae549ed3340456e6812acd589e83de50c1bfd199e6b3eedeba2
 EBUILD shorewall-common-4.2.0.ebuild 3749 RMD160 0da53648e46c923c3974e5cc341066eb6ba4dc7b SHA1 9e2391124ffa3c5f2886dce9e65660a0c497f09b SHA256 52f2be62d53876e2811fe961c48c70be886d2b1dc1e06a5ef5062b6ce0df6269
-MISC ChangeLog 3313 RMD160 abd5d1a155efd947dfb0a47c8a956aab78b211e2 SHA1 86e2b06c7c5d8dc3c20edb7852599d50a91caf4f SHA256 8b3c2d6646f42976f192f0fca5a7b8707c89065bef323b3777eaacdd3648c1d9
+EBUILD shorewall-common-4.2.1.ebuild 3749 RMD160 797d0f1a2709c859fe6f16e9d747ca726bd057fc SHA1 7d91d14580115a463d4d7fb06afdadfedc1b8a71 SHA256 ffe8eca062bbc71a732b7ba45e161bffc69b2c3b83a9aadea7a4f201d135cf44
+MISC ChangeLog 3578 RMD160 d4a0808e42f437fa069ffdb429ed11137b5f5450 SHA1 22a9748837de8f01a86f675775103951dad344b5 SHA256 a3bff3ed2a0678d543d84dae1421926ac85ef38ad7da9bfdba36b648273b488a
 MISC metadata.xml 306 RMD160 90a3e8c5e062df3f9292505b62d82b831bcaa1bd SHA1 47b37ae73a7a7bbf2f99307edaa7fed6fe77a799 SHA256 7f2b854d54b12215f518f9d8101dbe766e69976639f42caa2bd16e95739ae0e9
diff --git a/net-firewall/shorewall-common/shorewall-common-4.0.14.2.ebuild b/net-firewall/shorewall-common/shorewall-common-4.0.14.2.ebuild
new file mode 100644
index 000000000000..54612d0eaaa8
--- /dev/null
+++ b/net-firewall/shorewall-common/shorewall-common-4.0.14.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/shorewall-common-4.0.14.2.ebuild,v 1.1 2008/11/21 11:27:33 pva Exp $
+
+inherit eutils versionator
+
+# Select version (stable, RC, Beta):
+MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_P_BETA=""                                    # stable or experimental (eg. "-RC1" or "-Beta4")
+MY_PV_BASE=$(get_version_component_range 1-3)
+
+MY_PN="${PN/-common/}"
+MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
+MY_P_DOCS="${MY_P/${MY_PN}/${MY_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/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
+	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+
+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
+	!<net-firewall/shorewall-4.0"
+
+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
+
+	cd "${WORKDIR}/${P}${MY_P_BETA}"
+	PREFIX="${D}" ./install.sh || die "install.sh failed"
+	newinitd "${FILESDIR}"/shorewall.initd 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}${MY_P_BETA}/Samples" "${D}/usr/share/doc/${PF}"
+	fi
+}
+
+pkg_postinst() {
+	elog
+	if use doc ; then
+		elog "Documentation is available at /usr/share/doc/${PF}/html."
+		elog "Please read the Release Notes in /usr/share/doc/${PF}."
+		elog "Samples are available at /usr/share/doc/${PF}/Samples."
+	else
+		elog "Documentation is available at http://www.shorewall.net"
+	fi
+	elog "There are man pages for shorewall(8) and for each configuration file."
+	elog
+	elog "Bridging configuration has changed with kernel 2.6.20+."
+	elog "Check the documentation."
+	elog
+	elog "Do not blindly start shorewall, edit the files in /etc/shorewall first"
+	elog "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
+	elog
+	elog "Be aware that version ${MY_PV_TREE} differs substantially from previous releases."
+	elog "Information on upgrading is available at:"
+	elog "http://www.shorewall.net/upgrade_issues.htm"
+	elog
+	elog "There is a 'shorewall compile' command to generate scripts to run"
+	elog "on systems with Shorewall Lite installed."
+	elog "Please refer to http://www.shorewall.net/CompiledPrograms.html"
+	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
+	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
+	elog "should check for changes in configfiles and manually update your exports."
+	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
+	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
+	elog "in /etc/make.conf (man make.conf)."
+	elog
+	elog "Known problems:"
+	elog "http://shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
+	elog
+	elog "Whether upgrading or installing you should run shorewall check,"
+	elog "correct any errors found and run shorewall restart|start."
+	elog
+	elog "${PN} requires a compiler."
+	elog "You can choose to emerge shorewall-shell and/or shorewall-perl."
+}
diff --git a/net-firewall/shorewall-common/shorewall-common-4.2.1.ebuild b/net-firewall/shorewall-common/shorewall-common-4.2.1.ebuild
new file mode 100644
index 000000000000..95aaba4bf151
--- /dev/null
+++ b/net-firewall/shorewall-common/shorewall-common-4.2.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/shorewall-common-4.2.1.ebuild,v 1.1 2008/11/21 11:27:33 pva Exp $
+
+inherit eutils versionator
+
+# Select version (stable, RC, Beta):
+MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_P_BETA=""                                    # stable or experimental (eg. "-RC1" or "-Beta4")
+MY_PV_BASE=$(get_version_component_range 1-3)
+
+MY_PN="${PN/-common/}"
+MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
+MY_P_DOCS="${MY_P/${MY_PN}/${MY_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/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
+	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+
+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
+	!<net-firewall/shorewall-4.0"
+
+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
+
+	cd "${WORKDIR}/${P}${MY_P_BETA}"
+	PREFIX="${D}" ./install.sh || die "install.sh failed"
+	newinitd "${FILESDIR}"/shorewall.initd 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}${MY_P_BETA}/Samples" "${D}/usr/share/doc/${PF}"
+	fi
+}
+
+pkg_postinst() {
+	elog
+	if use doc ; then
+		elog "Documentation is available at /usr/share/doc/${PF}/html."
+		elog "Please read the Release Notes in /usr/share/doc/${PF}."
+		elog "Samples are available at /usr/share/doc/${PF}/Samples."
+	else
+		elog "Documentation is available at http://www.shorewall.net"
+	fi
+	elog "There are man pages for shorewall(8) and for each configuration file."
+	elog
+	elog "Bridging configuration has changed with kernel 2.6.20+."
+	elog "Check the documentation."
+	elog
+	elog "Do not blindly start shorewall, edit the files in /etc/shorewall first"
+	elog "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
+	elog
+	elog "Be aware that version ${MY_PV_TREE} differs substantially from previous releases."
+	elog "Information on upgrading is available at:"
+	elog "http://www.shorewall.net/upgrade_issues.htm"
+	elog
+	elog "There is a 'shorewall compile' command to generate scripts to run"
+	elog "on systems with Shorewall Lite installed."
+	elog "Please refer to http://www.shorewall.net/CompiledPrograms.html"
+	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
+	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
+	elog "should check for changes in configfiles and manually update your exports."
+	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
+	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
+	elog "in /etc/make.conf (man make.conf)."
+	elog
+	elog "Known problems:"
+	elog "http://shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
+	elog
+	elog "Whether upgrading or installing you should run shorewall check,"
+	elog "correct any errors found and run shorewall restart|start."
+	elog
+	elog "${PN} requires a compiler."
+	elog "You can choose to emerge shorewall-shell and/or shorewall-perl."
+}