Install check-requirements script. 0.33 now requires iptables w/ ipv6 support

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64

4 files changed, 77 insertions, 27 deletions

diff --git a/net-firewall/ufw/ChangeLog b/net-firewall/ufw/ChangeLog
index c6da0a691488..79bdf9097552 100644
--- a/net-firewall/ufw/ChangeLog
+++ b/net-firewall/ufw/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/ufw
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ChangeLog,v 1.10 2012/10/14 19:06:35 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ChangeLog,v 1.11 2012/12/06 09:00:53 thev00d00 Exp $
+
+*ufw-0.33-r2 (06 Dec 2012)
+*ufw-0.31.1-r2 (06 Dec 2012)
+
+  06 Dec 2012; Ian Whyman <thev00d00@gentoo.org> -ufw-0.31.1-r1.ebuild,
+  +ufw-0.31.1-r2.ebuild, -ufw-0.33-r1.ebuild, +ufw-0.33-r2.ebuild:
+  Install check-requirements script. 0.33 now requires iptables w/ ipv6 support
+  (bug #437266). Thanks to Sławomir Nizio
 
 *ufw-0.33-r1 (14 Oct 2012)
 *ufw-0.31.1-r1 (14 Oct 2012)
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index 427d51efbfe7..5ae92b5404dd 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -11,7 +11,7 @@ AUX ufw-dont-check-iptables.patch 1572 SHA256 2ea0f9525baa82386690577525631f468e
 AUX ufw.confd 219 SHA256 069aa7382b40aecebf26ef53f3f4c49890314e0357925c84b3c15f1d0b913be0 SHA512 a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7 WHIRLPOOL e6c4537392921c63f8a57fab7ea269fbeea846468ef8968816d988556557495e8abb77aee9d60648a1483a599683613cf5ea832cbcf498a8828baa9abcd31752
 DIST ufw-0.31.1.tar.gz 322448 SHA256 ccf5e00aa76841b9467ad9506fbf96373fb24a4b26bffd858ea1eb2522491dcb SHA512 3c9e61be7ba18ccdbd8195517f0b74a418b460f91b6efcdf0d883fc1dca2bc376ee317836882b67d2fd4825c2e5374d9c6a5da3d77f98794b64c98071d3ac0dc WHIRLPOOL 35064e73f892d6a94413f3560f5f0af945c972b673da4980af0a60576cc641810a74d76ed196935abaf9c2b395c2cc7250b6d27e710e284cbf2df014a6f0820d
 DIST ufw-0.33.tar.gz 332893 SHA256 5f85a8084ad3539b547bec097286948233188c971f498890316dec170bdd1da8 SHA512 a908d0a2c74bedef418b28f1701048bc9281f314ff747fb1e9497ddee341dbf86402215c470b605523b03a12b2dec812cd7342c310c04231dbed5b6f8e783309 WHIRLPOOL bdd09fbdc2514061b6971e06fa05d6fee04e29c2cecf0c12b237349071e88d188aa8a7bd5c54f5cf3cccd4ddf8d2e3d2bb6ed0db92538b7d76cea471d74848c1
-EBUILD ufw-0.31.1-r1.ebuild 4855 SHA256 8a71e86df6d1ca949359d8eabba6e40f414303eb3d400f4c6df24c3477b0ea72 SHA512 207d2191b73062495eca92b7ac622ec5c920adcc41101d888597bc141b8e64c26869f1a8f5471b090164ef4b4a53617cc889b6fcbebb8f1b6c0a6560bda2f048 WHIRLPOOL 0d90c5b27c60e1e581a656880057d6d7ced57fce314cb3fa4e4650466d53ec2142fc0e898fc2bf4d62e65c28ccb4fcf450e0d8ebcda43ee84e35ff1b8f101597
-EBUILD ufw-0.33-r1.ebuild 4751 SHA256 4e55224d8c8207948d966d01a28e2f211920db5dd46a741dd5f50c8ceb2a1981 SHA512 09b8acd90ce593c2f347b3c3fef1e737b640482a6e493ac601c5d444192e33c26c8d5c9f9e3bd8f450dfb8f352e9081a1b8cfd7fbab1cee8e14e554741764d91 WHIRLPOOL 64818bd7e668454ee3a9c4126295b1792d66977bfa044edcf2ee7858eb75f1dfcff4907505d62cdd48c40eb38308b3f0387aacbb6e7b11d87eef98bde22dfece
-MISC ChangeLog 2693 SHA256 1cf149f3f69c56ded6244cae0bea7355bc810901506e37d742ccc3d0937ca7a4 SHA512 d012f77e198ea28502061509b71e21a59cbf857ea1f91f091209a106609346a43dd1c8026b126d072e82a9e9c16ea506981ec68aa2e0483d30b2ea35376a1a4b WHIRLPOOL 27a8aafe9a7f1387f1885559ca88e626e45e550f15b1856e0c8b5fecc5ca2ff8d5bd40d757b7c3208c1758bdf51e31da8f67a7793a6a4fb9c1a1b0589b2da3cc
+EBUILD ufw-0.31.1-r2.ebuild 5541 SHA256 0286e38a3b1c8e556f366c75fe9a19a07e8a3bec32c40a65ddc15f8f4b86f88a SHA512 2eefc47a996403b469ed6e51b46dc9b4085bb54f19fa66f27c83bfc2d4b2fc915ab2b958e19e4cd2ccbdcb6eccf6626f78dec0fcde8eef738fbf4966527fb046 WHIRLPOOL 3342b84709029b8cb19c2c3ac332c21722027586e7b267a8ecb4876d39b4572454b5d6b1ceee0641b8fb8ef294b6b22ce31c393cf1e03d912522b3f7e7caa25e
+EBUILD ufw-0.33-r2.ebuild 5619 SHA256 2c493fb41c24915e8a3b7cc2055272f56ee53afa341eeb7d3ce825dff681369f SHA512 f64cad986c9a7a586b88b1418e69234caabf5de03cf55c8e9988a55beee51153221c715e13b13c61349b3936b609db8ab90d211b270beb1189d2002a91d32b4d WHIRLPOOL 867439b9d36ac946343c850650c98d3d5f0d0d3951a91ef7cd8e3a1f4ac9ac7c8a6d80a211a0d4d75a12c725f68bef8325a5a9baf91b8b0c4c49638d0731760f
+MISC ChangeLog 3013 SHA256 d378681c6bc7e806ef75b4e76d16c3ad915a0d26e80890e0233d4258be9144a6 SHA512 517d94bff716136ebe2fa278019f8e46de95bcd5e00f74591d8506002271931dae99b01908214e8adf2fd219501d9aae2559d1ea5070a7abb92c9c7344e27f9e WHIRLPOOL b0b68da3ce870b0c3e6b34055d6e9b6be84b9b3d52debb5405d22d24f3436ec71d98e98395791e9c9136dc1f9536a5cd7d4a125b4d04334630746fe6c9cbb23a
 MISC metadata.xml 622 SHA256 e504f88d893e02ac0bf5aa71b5b153da69205bcc72463a24b551918686afdcc4 SHA512 27a11c5b355ff6cbf5cccc6d852d0b8702cd73641cf0fbcc79cef7ced889cc7aa89ef1e56b3e8fc5a1e0b82c789f0b272ae75db83d32c8e3963bc08d69dc7e38 WHIRLPOOL cda0950c88207d057a8a952e5294e170216f1bef97b18fa29f15dc128a076761cc40a56ec1096a10450dda86585255c54f4eac699671fbe9a5bab049113feee1
diff --git a/net-firewall/ufw/ufw-0.31.1-r1.ebuild b/net-firewall/ufw/ufw-0.31.1-r2.ebuild
index 0cb68c48c72d..06001a1d4233 100644
--- a/net-firewall/ufw/ufw-0.31.1-r1.ebuild
+++ b/net-firewall/ufw/ufw-0.31.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.31.1-r1.ebuild,v 1.1 2012/10/14 19:06:35 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.31.1-r2.ebuild,v 1.1 2012/12/06 09:00:53 thev00d00 Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.5"
@@ -126,6 +126,9 @@ src_install() {
 	newconfd "${FILESDIR}"/ufw.confd ufw
 	newinitd "${FILESDIR}"/ufw-2.initd ufw
 
+	exeinto /usr/share/${PN}
+	doexe tests/check-requirements
+
 	# users normally would want it
 	insinto /usr/share/doc/${PF}/logging/syslog-ng
 	doins "${FILESDIR}"/syslog-ng/*
@@ -145,17 +148,31 @@ src_install() {
 
 pkg_postinst() {
 	distutils_pkg_postinst
-	if path_exists -o "${EROOT}"lib/ufw/user{,6}.rules; then
-		ewarn "Attention!"
-		ewarn "User configuration from /lib/ufw is now placed in /etc/ufw/user."
-		ewarn "Please stop ufw, copy .rules files from ${EROOT}lib/ufw"
-		ewarn "to ${EROOT}etc/ufw/user/ and start ufw again."
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "To enable ufw, add it to boot sequence and activate it:"
+		elog "-- # rc-update add ufw boot"
+		elog "-- # /etc/init.d/ufw start"
+		echo
+		elog "If you want to keep ufw logs in a separate file, take a look at"
+		elog "/usr/share/doc/${PF}/logging."
+	fi
+	# Make sure it gets displayed also when one downgrades from >= 0.33*,
+	# because this message isn't displayed for 0.33* (and possibly newer
+	# ones in the future) as it's not relevant there.
+	if [[ -z ${REPLACING_VERSIONS} ]] \
+		|| [[ ${REPLACING_VERSIONS} = 0.33 ]] \
+		|| [[ ${REPLACING_VERSIONS} > 0.33 ]] \
+		|| [[ ${REPLACING_VERSIONS} < 0.31.1-r2 ]]
+	then
+		echo
+		elog "Starting from ufw-0.31.1-r2, /usr/share/ufw/check-requirements"
+		elog "script is installed. It is useful for debugging problems with"
+		elog "ufw. However one should keep in mind that the script assumes"
+		elog "IPv6 is enabled on kernel and net-firewall/iptables,"
+		elog "and fails when it's not."
 	fi
 	echo
-	elog "Remember to enable ufw add it to your boot sequence:"
-	elog "-- # ufw enable"
-	elog "-- # rc-update add ufw boot"
-	echo
-	elog "If you want to keep ufw logs in a separate file, take a look at"
-	elog "/usr/share/doc/${PF}/logging."
+	ewarn "Note: once enabled, ufw blocks also incoming SSH connections by"
+	ewarn "default. See README, Remote Management section for more information."
 }
diff --git a/net-firewall/ufw/ufw-0.33-r1.ebuild b/net-firewall/ufw/ufw-0.33-r2.ebuild
index d0cfdc296f3c..74b187cf3f56 100644
--- a/net-firewall/ufw/ufw-0.33-r1.ebuild
+++ b/net-firewall/ufw/ufw-0.33-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.33-r1.ebuild,v 1.1 2012/10/14 19:06:35 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.33-r2.ebuild,v 1.1 2012/12/06 09:00:53 thev00d00 Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.6 3:3.1"
@@ -17,10 +17,11 @@ SRC_URI="http://launchpad.net/ufw/${MY_PV_12}/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples ipv6"
+IUSE="examples"
 
 DEPEND="sys-devel/gettext"
-RDEPEND=">=net-firewall/iptables-1.4[ipv6?]
+# ipv6 forced: bug 437266
+RDEPEND=">=net-firewall/iptables-1.4[ipv6]
 	!<kde-misc/kcm-ufw-0.4.2
 	!<net-firewall/ufw-frontends-0.3.2
 "
@@ -48,6 +49,13 @@ pkg_pretend() {
 		return
 	fi
 
+	if ! linux_chkconfig_present IPV6; then
+		echo
+		ewarn "This version of ufw requires that IPv6 is enabled."
+		ewarn "If you don't want it, install ${CATEGORY}/${PN}-0.31.1."
+		ewarn "More information can be found in bug 437266."
+	fi
+
 	local nf_nat_ftp_ok="yes"
 	local nf_conntrack_ftp_ok="yes"
 	local nf_conntrack_netbios_ns_ok="yes"
@@ -100,7 +108,7 @@ src_prepare() {
 	sed -i 's/^ENABLED=no/ENABLED=yes/' conf/ufw.conf \
 		|| die "sed failed (ufw.conf)"
 
-	sed -i "s/^IPV6=yes/IPV6=$(usex ipv6)/" conf/ufw.defaults || die
+	#sed -i "s/^IPV6=yes/IPV6=$(usex ipv6)/" conf/ufw.defaults || die
 
 	# If LINGUAS is set install selected translations only.
 	if [[ -n ${LINGUAS+set} ]]; then
@@ -126,6 +134,9 @@ src_install() {
 	newconfd "${FILESDIR}"/ufw.confd ufw
 	newinitd "${FILESDIR}"/ufw-2.initd ufw
 
+	exeinto /usr/share/${PN}
+	doexe tests/check-requirements
+
 	# users normally would want it
 	insinto /usr/share/doc/${PF}/logging/syslog-ng
 	doins "${FILESDIR}"/syslog-ng/*
@@ -145,13 +156,27 @@ src_install() {
 
 pkg_postinst() {
 	distutils_pkg_postinst
-	echo
-	elog "Remember to enable ufw add it to your boot sequence:"
-	elog "-- # ufw enable"
-	elog "-- # rc-update add ufw boot"
-	echo
-	elog "If you want to keep ufw logs in a separate file, take a look at"
-	elog "/usr/share/doc/${PF}/logging."
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "To enable ufw, add it to boot sequence and activate it:"
+		elog "-- # rc-update add ufw boot"
+		elog "-- # /etc/init.d/ufw start"
+		echo
+		elog "If you want to keep ufw logs in a separate file, take a look at"
+		elog "/usr/share/doc/${PF}/logging."
+	fi
+	if [[ -z ${REPLACING_VERSIONS} ]] \
+		|| [[ ${REPLACING_VERSIONS} < 0.33-r2 ]];
+	then
+		# etc-update etc. should show when the file needs updating
+		# but let's inform about the change
+		echo
+		elog "Because of bug 437266 this version doesn't have ipv6 USE"
+		elog "flag, so in case it's needed, please adjust 'IPV6' setting"
+		elog "in /etc/default/ufw manually. (IPv6 is enabled there by default.)"
+		# TODO: add message about check-requirements script when this
+		# bug is fixed
+	fi
 	echo
 	ewarn "Note: once enabled, ufw blocks also incoming SSH connections by"
 	ewarn "default. See README, Remote Management section for more information."