Version bump, for bug #298301 by Magnus Kessler.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 135 insertions, 3 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 536cbee2c9fc..a3a149ba4e40 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/shorewall
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.170 2009/10/09 12:22:43 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.171 2010/06/16 14:44:05 chainsaw Exp $
+
+*shorewall-4.4.10 (16 Jun 2010)
+
+  16 Jun 2010; <chainsaw@gentoo.org>
+  +files/4.4.10-underscore-not-dash.patch, +shorewall-4.4.10.ebuild:
+  Version bump, for bug #298301 by Magnus Kessler.
 
 *shorewall-4.4.2.1 (09 Oct 2009)
 
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 2105a8be5e98..67595e44797f 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,12 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 4.4.10-underscore-not-dash.patch 535 RMD160 47cd0698fd87876089338b7b5022466b7caa7f42 SHA1 58563370ee4a083b2c970530f739fe8c424802a6 SHA256 39c0f8b82f3a40b14f005d1cea3f77d5a7cef9c1bdf6107fd97dadb3aebffedc
 AUX shorewall-r1 1147 RMD160 897f5f7630755747cc751f51661f9f8495e44a79 SHA1 064982a33904df1280522332e937b388b599a9f7 SHA256 3669df99e1d9dee5633195befa423e32415a5c893cac80a3ca749e97b57dfcc3
 AUX shorewall-r2 1812 RMD160 73672d6c34a14277b68e882f86158d09daa4a282 SHA1 929b2b6256a9776a6a88b613b50ea9879f98e938 SHA256 2936b7fcf96c5411d7cd5c0aa951664b840dfecd1bb8d369e10621a0d89a320e
 AUX shorewall.initd 1905 RMD160 a448df26dc5c5417b4247f6aa90b1211ce74aa6c SHA1 6f439e8155bc29f61c0788645f28f75050d12bc4 SHA256 64c35fbdae3e6dc9bfbbecbaa68841d9ba2f924b042ef27a1c04633db46e80d8
 DIST shorewall-3.4.8.tgz 233145 RMD160 e4909d0c212b2f2ea0afad32c0e7443e12162f42 SHA1 988a9894c9bda6f6ade8970ec6a0c8143109e9c5 SHA256 1ee8b828ae1fb128fe45042feea82f6075bafbec926c3594e40bd0973e6a803a
+DIST shorewall-4.4.10.tar.bz2 251868 RMD160 8a8a96acbb3c846740d24400e3d1ca16361d6cc3 SHA1 c0429880f31edd2995e243cbad7d02cd1a4c2b0e SHA256 8e8f1dffbc971516312cca7d31e2caa756db34199909d5db0df7410d7aead30f
 DIST shorewall-4.4.2.1.tar.bz2 221593 RMD160 2c1ba3ea0cf1e4c8f6f5d2e5c850a1c98646b253 SHA1 21ce5ef37f114ad72fd44964284dc5536ed73a0f SHA256 2b6dc7fe21f4cd1c158d06d0058a73468f5bef85bebc86a79082bd8ee62eb6fe
 DIST shorewall-docs-html-3.4.8.tgz 2329594 RMD160 d76528bad1e6d5b3d90d323a48eaa966040d4712 SHA1 520ed50705d28d11048e070fe692727effc793d1 SHA256 df4a704e10948a004e5c9a0a456935c746dbf992aadae0f16ebb7044170668d5
+DIST shorewall-docs-html-4.4.10.tar.bz2 3276738 RMD160 ba9e6b86fade14cb8ec566facad20acc83e376be SHA1 5f67ce421dca3fa7c647649e24743ab718e60cea SHA256 9647cdd92965dd5cc18d2276b38d117e2b02dfcc3361476f65b1d966c180976f
 DIST shorewall-docs-html-4.4.2.tar.bz2 3132068 RMD160 0d3d91fb7a731c0b734986676d0343946e3ec3fb SHA1 420beb7b109ac7d7bfb8e4e43d9eb99530d8b226 SHA256 612a4fcdbe13e7eb644b4e33d8dc643038232233f1f9a6dc17e084f2ecaeb40b
 EBUILD shorewall-3.4.8.ebuild 4114 RMD160 9622ecea73ba99f1570df523f49278ddd2f0eda2 SHA1 2a2324e22b5131135b8aabce36e52d665dfc8195 SHA256 183b3c617774e169ef7a92619715098433ca22753af0bd6dcfb44eac1eeaa6a3
 EBUILD shorewall-4.0-r1.ebuild 1131 RMD160 62c212c2ac9c3f156dcbed812c88bf77bcd111cf SHA1 be9971b39ed79603e6504a8dc3a672230fbdc947 SHA256 4623eee8425cc6f80814a97930023ea01d8943e875cbb5622408504c7d2de1fe
+EBUILD shorewall-4.4.10.ebuild 3697 RMD160 192f83e3ce3363b77df24c5ed3028782f5f092d0 SHA1 9414decad61be2902700a9404d6008af5335b835 SHA256 da1f79e121133c0cba925f9fdffae5217dfef9bba8b4091ba209a9dca4a025e4
 EBUILD shorewall-4.4.2.1.ebuild 3620 RMD160 435e5dec97b03c819b0b45bd2d82988c306cc0cf SHA1 d55fb40373875dc2efe5735b3c7a4db15f18666b SHA256 a73ecf6ff66ea7c608b13e00988fb9599dba7dbc41ad6bc5810402365cdf7e35
-MISC ChangeLog 23563 RMD160 99c2ad0d32a478f320ab63ea43d17cbf411a94c8 SHA1 9ed46e7008c351e42c89f2503a32138ef3a99b06 SHA256 5a27e94e491e89c6a994ba3b7aa9e12377dedf35817cd3a051abeb2d27ff1247
+MISC ChangeLog 23759 RMD160 b812ced438e9375a26b696bf6c7ec8d05956536c SHA1 8d6adb2a82279ebc70a9bfc7398b8ddc029fd734 SHA256 e39418841c921d1a342e3133bd9deb6037ed4748b305c29854649672a003fbfa
 MISC metadata.xml 306 RMD160 90a3e8c5e062df3f9292505b62d82b831bcaa1bd SHA1 47b37ae73a7a7bbf2f99307edaa7fed6fe77a799 SHA256 7f2b854d54b12215f518f9d8101dbe766e69976639f42caa2bd16e95739ae0e9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwY40AACgkQp5vW4rUFj5rF6QCguVaQ7awGT/xMOQvgAI6xL+aW
+3CMAnR0vtC2uoAAvSQRWx0W48/UwM1cj
+=K3Io
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/shorewall/files/4.4.10-underscore-not-dash.patch b/net-firewall/shorewall/files/4.4.10-underscore-not-dash.patch
new file mode 100644
index 000000000000..15e3671aa59a
--- /dev/null
+++ b/net-firewall/shorewall/files/4.4.10-underscore-not-dash.patch
@@ -0,0 +1,12 @@
+diff -uNr shorewall-4.4.10.ORIG//install.sh shorewall-4.4.10/install.sh
+--- shorewall-4.4.10.ORIG//install.sh	2010-06-16 15:32:46.000000000 +0100
++++ shorewall-4.4.10/install.sh	2010-06-16 15:33:29.000000000 +0100
+@@ -745,7 +745,7 @@
+ #
+ # Install the  Makefiles
+ #
+-install-file Makefile-lite ${DESTDIR}/usr/share/shorewall/configfiles/Makefile 0644
++install_file Makefile-lite ${DESTDIR}/usr/share/shorewall/configfiles/Makefile 0644
+ 
+ if [ -z "$SPARSE" ]; then
+     run_install $OWNERSHIP -m 0600 Makefile ${DESTDIR}/etc/shorewall
diff --git a/net-firewall/shorewall/shorewall-4.4.10.ebuild b/net-firewall/shorewall/shorewall-4.4.10.ebuild
new file mode 100644
index 000000000000..dd2e7a7b1e85
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-4.4.10.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.4.10.ebuild,v 1.1 2010/06/16 14:44:05 chainsaw Exp $
+
+EAPI="2"
+
+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_P="${PN}-${MY_PV_BASE}${MY_P_BETA}"
+MY_P_DOCS="${MY_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}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
+	doc? ( http://www1.shorewall.net/pub/${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[-minimal]
+	dev-lang/perl
+	!net-firewall/shorewall-common
+	!net-firewall/shorewall-shell
+	!net-firewall/shorewall-perl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-underscore-not-dash.patch"
+}
+
+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 || die
+
+	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
+	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/${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} now uses Perl only. The shell compiler is obsolete."
+	elog "shorewall-common, shorewall-shell and shorewall-perl have been removed."
+}