Fix for bug #428768 by Sławomir Nizio

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

3 files changed, 62 insertions, 19 deletions

diff --git a/net-firewall/ufw/ChangeLog b/net-firewall/ufw/ChangeLog
index 52d73526539e..37bdaa2559a1 100644
--- a/net-firewall/ufw/ChangeLog
+++ b/net-firewall/ufw/ChangeLog
@@ -1,6 +1,9 @@
 # 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.7 2012/06/18 19:39:03 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ChangeLog,v 1.8 2012/09/23 18:20:24 thev00d00 Exp $
+
+  23 Sep 2012; Ian Whyman <thev00d00@gentoo.org> ufw-0.31.1.ebuild:
+  Fix for bug #428768 by Sławomir Nizio
 
   18 Jun 2012; Ian Whyman <thev00d00@gentoo.org> ufw-0.30.1-r4.ebuild,
   ufw-0.31.1.ebuild:
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index ea58511b21ee..1092347d03f5 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -1,17 +1,17 @@
-AUX rsyslog/ufw.logrotate 178 RMD160 3797baf7ddf541e338b27ef3275bd28db03fa179 SHA1 aeedd795ed99ad20f03bc36056da07ca51838dd0 SHA256 02d1a00ca68446fbe056a4c3aede319f77b3262e26092cc04ea46de8923d03f8
-AUX syslog-ng/syslog-ng.example 381 RMD160 e8b26557f5c7985d52b27f5a0bb3a2d459727063 SHA1 dfe3b055396156d3111e3283bd6e3f5f25b78566 SHA256 70a795c1b20e2cdef38565d74b9de042c6666f860a2fd1b3bdc6f31dd451bc68
-AUX syslog-ng/ufw.logrotate 269 RMD160 589a17944e28df50ba2822b1025ed2124f689b04 SHA1 fb9eb8fc41029a08323da0ec0a708a946338c432 SHA256 cddd86613bde19b45f0f935c65bb43721f69aefc14e7d629612b23ea3b5c5c97
-AUX ufw-0.30.1-encoding.patch 363 RMD160 db8a6a061df59f64c4521202bd7b364c87aa5bfa SHA1 9271a58fc6f17c00f70c2ddacea1c33acd2c2751 SHA256 9f679761dd53a12f630c1331dbcf471ecd11b6334b6cee6765297af7c0eca803
-AUX ufw-0.30.1-python-abis.patch 921 RMD160 b3232aed2698d42054b4bd1cc852a325bfc5f489 SHA1 90d490e9c91e3cdc4a08b4f821bea9652655dd1f SHA256 bcb6d1846cac9677114fd18058c1acd92c912a92901dfc2f9f52cb11e3e23eaa
-AUX ufw-0.31.1-move-path.patch 7071 RMD160 ee22819f6cf766a0343fbbd53e4b181182db22b5 SHA1 0ae1508c94011a109d4f6bd58e72d6570754af46 SHA256 88a7b20696b731bac01b3c5d88b0353842b1228d3239cfebe1f2a47c1bdb6768
-AUX ufw-0.31.1-python-abis.patch 1872 RMD160 72434cc1f0f5f461b25585e492b5af20986c21b2 SHA1 cdf4e8018ad7181810c28e832f37b0ef54c266e9 SHA256 1e3094135d71e7e7129b2d268d79c73990f0a6f61f2bb6456d3f3654b4975463
-AUX ufw-2.initd 2722 RMD160 3f2fbe0dc1a94037ce66d22644689d38feeaafc9 SHA1 14020c2c710f546c5ba498931b76fa50de82dd8e SHA256 657b5305923b2a5de9eb96931aaaa28d6e997ace6c40793d905887798094258c
-AUX ufw-dont-check-iptables.patch 1572 RMD160 76245c0aa6adc3edbadd311c2482aa9cad5e7824 SHA1 268d86725e202b2c1a8243907d143085f92aff53 SHA256 2ea0f9525baa82386690577525631f468e56a0fbde0e7e5a65fba36c922ea96f
-AUX ufw-move-path.patch 7135 RMD160 c4dba2bbc70072d4ffe270ffb70176a4cabd696c SHA1 10a95973b4c6b9ea271691993157e1b9193d435d SHA256 f8036c343f52e12493d1019e83dfdda505fae68bbc4b46144ec73033a9d4a578
-AUX ufw.confd 219 RMD160 cce23a5af2c48845fde0bed837e0a2faaeb3f5c4 SHA1 b88ef87f18dbe154545a427fbf155c22c23ace1a SHA256 069aa7382b40aecebf26ef53f3f4c49890314e0357925c84b3c15f1d0b913be0
-DIST ufw-0.30.1.tar.gz 297322 RMD160 7e1fc1bb77495d9d24e058546edcb2ea3832f04b SHA1 a128685ea560f2de27d5d311b6dd07f590f1dafb SHA256 98da13fe3e9aa8ff29611f20ef6e8b15be42bcdc43c8ef3145755b220f3bae1a
-DIST ufw-0.31.1.tar.gz 322448 RMD160 d9295a35f39285be459110b638c5b62a1f79f5d5 SHA1 8f77a7c5615774f3607385dca27ced239f8dfb82 SHA256 ccf5e00aa76841b9467ad9506fbf96373fb24a4b26bffd858ea1eb2522491dcb
-EBUILD ufw-0.30.1-r4.ebuild 2968 RMD160 06cfcbdd4c5a6479847d8320511bf0542e52f260 SHA1 dfab869eb374da94db63679bd73db6242561587b SHA256 f686a433ea8e01b11ea393503db44f7cea3db35c56785fc35da0974278e9d3d6
-EBUILD ufw-0.31.1.ebuild 3351 RMD160 a0be4cdd70027f935b4bb15ba48e94fe71a3fc49 SHA1 b8c41f22ed1943ad550b09f68714de226b43b82f SHA256 1070f1952efca38b12993f3bc868603c85a3cb159839671a61b888791a33c342
-MISC ChangeLog 1937 RMD160 1fbd9e3d3115ec25ffbb552c3661dcdd11a42357 SHA1 bb4351d13c23fe3909844c72a26a23d9b8f363e1 SHA256 fd55760c84cf76bfc749f472b99d8a3872881ac64562cd230e9ab3b2fec90476
-MISC metadata.xml 622 RMD160 cc250e699c5508a3e5ea12a0dd185c831bec7bd1 SHA1 7eea3cc02842a8b3b8dc053fbeaa4ab4ae5b592e SHA256 e504f88d893e02ac0bf5aa71b5b153da69205bcc72463a24b551918686afdcc4
+AUX rsyslog/ufw.logrotate 178 SHA256 02d1a00ca68446fbe056a4c3aede319f77b3262e26092cc04ea46de8923d03f8 SHA512 d381a34b23d8656c316af69c07d49042d6c4def4cea3e51367210bce20681376fd0259a95b6b9403171c5d80732927a8880f3d401e13e6f76b505324eecb146b WHIRLPOOL 10b63f8966ad7ad0894a18216a0102fc8a102b14c8f9fb468a4a8d61ae13b1ec3176c7bb9ffb852f8aaa4ac7874584a8f8f5a2d6e98fa3fb56f5945e9bd99139
+AUX syslog-ng/syslog-ng.example 381 SHA256 70a795c1b20e2cdef38565d74b9de042c6666f860a2fd1b3bdc6f31dd451bc68 SHA512 f48d2487679fe179ea216bb4259affbf5ab4c86725b45942581ada8dac24dd0c978f755182805ff5350ab169972fcee7bb54a6d14df760d4b5f62c485af1e49e WHIRLPOOL 44874c68257b6f9a53e7fd1affc6ccf2492d9ec09a4700a17239fb3e413e2dcf2ede87eafb1e253d965c27a1c5ead36c413c8c84ec3ed55f5cf2191b927aacbe
+AUX syslog-ng/ufw.logrotate 269 SHA256 cddd86613bde19b45f0f935c65bb43721f69aefc14e7d629612b23ea3b5c5c97 SHA512 22d89f04b68a8b4deeb60aca263239255dd01b9c6e6d23a5d77514daf7bb9dc3910a28cfe9c606f70d2a50f0365bb19c3cf00c5859ee2630c00f0df451ee9c5d WHIRLPOOL 5da4f8c615667d829ea4eb318ec01b712adf69002dcf8c3df7deba8fa3e49e426b1c00e468805ba571ed2f2ce05fa81b7e2ac83e7231de3f3305d6ce190264e5
+AUX ufw-0.30.1-encoding.patch 363 SHA256 9f679761dd53a12f630c1331dbcf471ecd11b6334b6cee6765297af7c0eca803 SHA512 7662d4ae25503d187829618d5f0d3a72f1043211594695ecc867d4bb0a56f2f5d3c1577ca6092e769f0c39888433750b39141d189d8ace36c37e225fb5025f03 WHIRLPOOL aa469803a5bdcd1b8b3956ded32e24051b047b3ca55b37dcb7ac9b449e37432b2b9ecce08fefde381fe142ea9cf5464067caa235a1c2cc6cf4dc5d189261f94b
+AUX ufw-0.30.1-python-abis.patch 921 SHA256 bcb6d1846cac9677114fd18058c1acd92c912a92901dfc2f9f52cb11e3e23eaa SHA512 5530a5c9dc2cbd8bf78cb4c9ea97184b297e9998268f15bbb72d0e1e826ff653ed09a51df591b2f574a144afc65f0d95c991b23124bcd93fb4de2417f8385414 WHIRLPOOL 1f9b50ab745792101403333535f85bcc85e080c24f99c8b3cf7355502bf752d18578921c013e98a4eb7d54aa6fc064f4efe48f287182bdeab30edfa02e5dcfff
+AUX ufw-0.31.1-move-path.patch 7071 SHA256 88a7b20696b731bac01b3c5d88b0353842b1228d3239cfebe1f2a47c1bdb6768 SHA512 66382ded35437e563c874dc01417a2735a2aa136a1e670fd3707c3311516a6d9a0e62a20679a4f5dcaa2edc0225535cf2410d7f86676b1e10eb309ecc3e24bc2 WHIRLPOOL 89e3165900def8380cade3eb62fc351be9e43c8055f4b71c356f3aa5356b0c57154e18485d94e0ca86462da7c55b1b4755de379a88f1958d313b93c0ec723715
+AUX ufw-0.31.1-python-abis.patch 1872 SHA256 1e3094135d71e7e7129b2d268d79c73990f0a6f61f2bb6456d3f3654b4975463 SHA512 fbe65a6775426c66cd82382e62eea3a2179d68a0b6c617cc468e7076e2f58493baffde686b65e6bf3a89ea7fdda48a5a42d152b1be388c943408532f47d4402a WHIRLPOOL 62e68d1ef8aaa4963765599ca6701af18bcdef8f6a20607ce433b5294baa9c5ba75b3d41266d9a8bd82febe3a3ac75c6fcb2326fbc5cafa31634ec96a4407b10
+AUX ufw-2.initd 2722 SHA256 657b5305923b2a5de9eb96931aaaa28d6e997ace6c40793d905887798094258c SHA512 54cb84ae5ce2c327a7a7b03deeed3d7507a4716ce929aa563d4fb5baa9aa73d95575ec7d5db7165345310869bd5a60b1033c6691f02a85ab94baa6b4a550daa7 WHIRLPOOL c19a21c93f0c63165715e8da4ab9b16a4596ccc3730118c1bbd7eb4de9a94b2b1475904818a2786b2490a07dee7d761da28ca6dc087926c27598d691cb333ce6
+AUX ufw-dont-check-iptables.patch 1572 SHA256 2ea0f9525baa82386690577525631f468e56a0fbde0e7e5a65fba36c922ea96f SHA512 c072e924ed5c7df37d89dd9dc8ecb9a52f16fcd962a31d97f45cecefb971adcceabff183bec386be29f44942d12f8bce595ff4203e390ce464627458843b19cb WHIRLPOOL a1ee6799042353f32a1746b14017403994d60dc1ba7e67581ebdff3d93e37e72c7224708d2c0d1bef25ce311ad5c647cd5f0fa62ea4da60321e47f922f64c54d
+AUX ufw-move-path.patch 7135 SHA256 f8036c343f52e12493d1019e83dfdda505fae68bbc4b46144ec73033a9d4a578 SHA512 66555a260bfd1b7cb965fb40e21518117bb43f495c06b018d4dfb115e2c8671c62405aecbaffdb6eeb06d8b8d38582283b45ac20e1c5105463efeb9a89e58166 WHIRLPOOL fcaaf88874ee199e3f957e0f1e66f23331da7dd9dad5a774c9112211208fd18cfc41a4903d8687e7377e7e6b9a4c3381fcbb2e39dbb411e1721a7f3261339da6
+AUX ufw.confd 219 SHA256 069aa7382b40aecebf26ef53f3f4c49890314e0357925c84b3c15f1d0b913be0 SHA512 a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7 WHIRLPOOL e6c4537392921c63f8a57fab7ea269fbeea846468ef8968816d988556557495e8abb77aee9d60648a1483a599683613cf5ea832cbcf498a8828baa9abcd31752
+DIST ufw-0.30.1.tar.gz 297322 SHA256 98da13fe3e9aa8ff29611f20ef6e8b15be42bcdc43c8ef3145755b220f3bae1a SHA512 6f3f729603be91866844886b357c97fa3cdd1ca5c7e0f99b53d1344ace2aa8914af5a990eb7098c738fd65421a1494b2ae520ee3a6cbca9c58a2601705e26cd5 WHIRLPOOL 09a8ca2b2d5664569fe33b1872f74c06bb97c816da6179c27405177a6966a85a1e5df44fda75260fcd81d021f3652055f26d6861acccc90257ce8da3998cdbe0
+DIST ufw-0.31.1.tar.gz 322448 SHA256 ccf5e00aa76841b9467ad9506fbf96373fb24a4b26bffd858ea1eb2522491dcb SHA512 3c9e61be7ba18ccdbd8195517f0b74a418b460f91b6efcdf0d883fc1dca2bc376ee317836882b67d2fd4825c2e5374d9c6a5da3d77f98794b64c98071d3ac0dc WHIRLPOOL 35064e73f892d6a94413f3560f5f0af945c972b673da4980af0a60576cc641810a74d76ed196935abaf9c2b395c2cc7250b6d27e710e284cbf2df014a6f0820d
+EBUILD ufw-0.30.1-r4.ebuild 2968 SHA256 f686a433ea8e01b11ea393503db44f7cea3db35c56785fc35da0974278e9d3d6 SHA512 ce0e2550285e594a80e3dd35b3d58a77e37c14f90ba7aad403d3995c1a5fba7538184aa6e8192bafbe241ce0b64a0d33b4d11613628df179c255b3622b5ac574 WHIRLPOOL 926451bc938dcdd6bed2ff862f6f5db9a08c1ff97e8299aab21d8b1a4eb7ec05b47cfacd65816bdd329418a7f44feb997942697311705e3d17310d3ee9ff56fa
+EBUILD ufw-0.31.1.ebuild 4740 SHA256 1434d557129a07d1b2a5e13de8bdb4d33ba8bb88479b8b78ac3af95f48757127 SHA512 1a8d5d9b0d1cf8da35d8ba861d30cd57f4b285f76d6088c11ac341af35d49abe697eb046efb35ed027305bccf7a00298ee2ef76c9be90f46dbcf922c095ebd34 WHIRLPOOL 0dbf7abecbffa54c4b7d01640ca091c38c4498110149e19087dad9156ecebea2b16b32d246de4e8fc41e1c48319e2102e237db2a142b5b9521e9273c07584b16
+MISC ChangeLog 2047 SHA256 3ca6c193f6c70124f2abe1dbc4bb8d1679c190c6fd0db410e41387bed070ace6 SHA512 2ec510626ee7341b5ee3e893947c2becf1ab3249fe1b56c79073c2b223c0b9228f2229e389a9d60db9bbead48c2eb5e4ab063b59c4b89b36a3bde3018f9c914d WHIRLPOOL 2aaff2736460de091533548b0cf15a34c10252c460249ee03ce4e2480e19965f0effea870f87907159584771e70f97118519169c70c76f24a08f8efbcc1fa0f9
+MISC metadata.xml 622 SHA256 e504f88d893e02ac0bf5aa71b5b153da69205bcc72463a24b551918686afdcc4 SHA512 27a11c5b355ff6cbf5cccc6d852d0b8702cd73641cf0fbcc79cef7ced889cc7aa89ef1e56b3e8fc5a1e0b82c789f0b272ae75db83d32c8e3963bc08d69dc7e38 WHIRLPOOL cda0950c88207d057a8a952e5294e170216f1bef97b18fa29f15dc128a076761cc40a56ec1096a10450dda86585255c54f4eac699671fbe9a5bab049113feee1
diff --git a/net-firewall/ufw/ufw-0.31.1.ebuild b/net-firewall/ufw/ufw-0.31.1.ebuild
index 264b00b1983c..a76dfa8efe59 100644
--- a/net-firewall/ufw/ufw-0.31.1.ebuild
+++ b/net-firewall/ufw/ufw-0.31.1.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.ebuild,v 1.2 2012/06/18 19:39:03 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.31.1.ebuild,v 1.3 2012/09/23 18:20:24 thev00d00 Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.5"
@@ -41,6 +41,46 @@ pkg_pretend() {
 	fi
 
 	check_extra_config
+
+	# Check for default, useful optional features.
+	if ! linux_config_exists; then
+		ewarn "Cannot determine configuration of your kernel."
+		return
+	fi
+
+	local nf_nat_ftp_ok="yes"
+	local nf_conntrack_ftp_ok="yes"
+	local nf_conntrack_netbios_ns_ok="yes"
+
+	linux_chkconfig_present \
+		NF_NAT_FTP || nf_nat_ftp_ok="no"
+	linux_chkconfig_present \
+		NF_CONNTRACK_FTP || nf_conntrack_ftp_ok="no"
+	linux_chkconfig_present \
+		NF_CONNTRACK_NETBIOS_NS || nf_conntrack_netbios_ns_ok="no"
+
+	# This is better than an essay for each unset option...
+	if [[ ${nf_nat_ftp_ok} = no ]] || [[ ${nf_conntrack_ftp_ok} = no ]] \
+		|| [[ ${nf_conntrack_netbios_ns_ok} = no ]]
+	then
+		echo
+		local mod_msg="Kernel options listed below are not set. They are not"
+		mod_msg+=" mandatory, but they are often useful."
+		mod_msg+=" If you don't need some of them, please remove relevant"
+		mod_msg+=" module name(s) from IPT_MODULES in"
+		mod_msg+=" '${EROOT}etc/default/ufw' before (re)starting ufw."
+		mod_msg+=" Otherwise ufw may fail to start!"
+		ewarn "${mod_msg}"
+		if [[ ${nf_nat_ftp_ok} = no ]]; then
+			ewarn "NF_NAT_FTP: for better support for active mode FTP."
+		fi
+		if [[ ${nf_conntrack_ftp_ok} = no ]]; then
+			ewarn "NF_CONNTRACK_FTP: for better support for active mode FTP."
+		fi
+		if [[ ${nf_conntrack_netbios_ns_ok} = no ]]; then
+			ewarn "NF_CONNTRACK_NETBIOS_NS: for better Samba support."
+		fi
+	fi
 }
 
 src_prepare() {