Version bump. Fixes bug #437266. Thanks to slawomir.nizio@sabayon.org

Package-Manager: portage-2.1.11.37/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

4 files changed, 212 insertions, 8 deletions

diff --git a/net-firewall/ufw/ChangeLog b/net-firewall/ufw/ChangeLog
index 79bdf9097552..a0e5e652233c 100644
--- a/net-firewall/ufw/ChangeLog
+++ b/net-firewall/ufw/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2012/12/06 09:00:53 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ChangeLog,v 1.12 2012/12/17 19:20:54 hwoarang Exp $
+
+*ufw-0.34_pre805 (17 Dec 2012)
+
+  17 Dec 2012; Markos Chandras <hwoarang@gentoo.org> +ufw-0.34_pre805.ebuild,
+  metadata.xml:
+  Version bump. Fixes bug #437266. Thanks to slawomir.nizio@sabayon.org
 
 *ufw-0.33-r2 (06 Dec 2012)
 *ufw-0.31.1-r2 (06 Dec 2012)
@@ -70,4 +76,3 @@
   +files/ufw-2.initd, +files/ufw.confd, +files/ufw-dont-check-iptables.patch,
   +files/ufw-move-path.patch, +metadata.xml:
   Initial import, bug #264912, thank Sławomir Nizio for this job.
-
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index 5ae92b5404dd..b174b5370e9a 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
@@ -11,7 +14,26 @@ 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
+DIST ufw-0.34_pre805.tar.gz 335875 SHA256 a78693da04720f9f7eb463447b940eed18c3e2c20d3de336ebf9bf821dfdac2f SHA512 b8bba3bb8c423070d6434d1df7274423edf3a356415f54c6448fa0ff2d13a4b2ac21c4bb627cba01d6955b04f793eeaf2fc535c6221e7de48f11bef745035263 WHIRLPOOL 5e5238925d928e883c9869b3b72a7a04ad18352ebbcb5fead9b14c7bb5225f1bbae613d9117ceb5e9d435e1ca1f1d0d033bbdf673896990eda5efcb7a7d04829
 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
+EBUILD ufw-0.34_pre805.ebuild 5368 SHA256 a3ac86219ae10a23f534d48452b85281f72d89017ec0ae36600d95628176a839 SHA512 59665868bf52f21c90180c3971c559da9480fd9d2b742ecbeb513d0b6f8631eaa17eca4aac02d52057d2379fdf702fed48eb15b08af3b9d3340eee71198f5969 WHIRLPOOL 8aa13f482f66d57747d44f3afbc309ccc6e9618caab46cbf9e45688a814c674e9765a84f4e83560e66a8251617f9b62ad94b8fa3993125e91b04cf39ba149586
+MISC ChangeLog 3210 SHA256 10a0b6ee9212d955b668eecfd9b2ff28393758a842481e2c9771182590f9aeb9 SHA512 ba60ae00c4f1e40a5aa346bd54a586eab0b5ed949ff704c12d8c1196ec967b65ba0b9524054ac88caf08759fe82fdd7b8ed63fbf20f68a518113be3438348c8e WHIRLPOOL 9bebdb19e785365c78a3e6454159744bd7667b5ca4d7638c69d92a6954123744bb0ea32734c7dd97fe19bd8a92ec2eb0bb7c2a9b8a578be284548c71d5621d49
+MISC metadata.xml 568 SHA256 0fea99101adbd93b9a644642cf668a7cb5d6392c840b66b4c8aca504985c4033 SHA512 5ac4c205a5df4c0bf11f22d442457c5a50535ebf007fb01bb07e9480f9d854eb053bdd220519e37e0602e1d3ec0043bab7e1865bf9c2e8339b76538719285e96 WHIRLPOOL 122348f9b736392521b10685d03ce3105abec78c8a1378ed1e1b86f9bf6097b1b6be66ce172e1cc92e813c21c8722a4f44e52ee63bfd2c327c9e2c844faf1d13
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQz3CSAAoJEPqDWhW0r/LCiOwP/3BLtcLnNuqSwII+sJBwFw61
+33hO1TATb3vjysfKHFOHfve1tZgs7ZyiftjdWxMZwU5yWBJ4XnkeOHYN3+jjzpeH
+f4Bk9S8y1/fr9MkbzfGofyqz1sE+MxrzugS7ZBKzQz+1NXzP0EZBw+tj7KTWsDAV
+89WRA0fnAL1Y0TA37vqfI4CcWOI+kZUfp+CW8cv+00vballK0AtGV2WcBYelPs5A
+PPJssFNXNzBDsHrzFkdAz4ed710TMlYPXXJ4tSZY/ghX5tLKvZrUt7jKDkE5rqzg
+U7ijQfiUEC0yjeetJP2zCb5E/0qNQPdA9YYaSeCQdpWh0XdB8T0nqln5yyaw3N/C
+k60YSB643sXK+y8f1fubl0KrkP72k7pwwdrxAfBXgu74vtAYUw5wN1mlnLa+r6CV
+UKNym0jBd67C/x/sLjRg1pSb6pCQPk3JcEpyLVJVd1vyHvpQdmy3thWOmPLhKFnc
+xPtAvRmQqhYBBUkCzlbFN33kaEfVvaptIL20SHXGkVROS+Mc3Dz0dRbY1IjWzLB4
+iP3D2B3+Sl81++a4PFhjXNRcrfZjueqFwwzJbghH9nYdf9Ita2zvkS9x3RnMoX96
+3cl4HhD+af/IDsmU8JgBTkj2C80iSZ8LZLYmHP0JuVFQL85s4Hl2GRf/MS1L5OdZ
+jlodG+CvvxIhr8cwUNE/
+=2ie2
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/ufw/metadata.xml b/net-firewall/ufw/metadata.xml
index e6ee386430af..ba895f72e300 100644
--- a/net-firewall/ufw/metadata.xml
+++ b/net-firewall/ufw/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>slawomir.nizio@sabayon.org</email>
 	<name>Sławomir Nizio</name>
 </maintainer>
-<maintainer>
-	<email>pva@gentoo.org</email>
-	<name>Peter Volkov</name>
-</maintainer>
 <longdescription lang="en">
 	The Uncomplicated Firewall (ufw) is a frontend for iptables and is
 	particularly well-suited for host-based firewalls. It provides a framework
diff --git a/net-firewall/ufw/ufw-0.34_pre805.ebuild b/net-firewall/ufw/ufw-0.34_pre805.ebuild
new file mode 100644
index 000000000000..d60d6b67af3b
--- /dev/null
+++ b/net-firewall/ufw/ufw-0.34_pre805.ebuild
@@ -0,0 +1,180 @@
+# 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.34_pre805.ebuild,v 1.1 2012/12/17 19:20:54 hwoarang Exp $
+
+EAPI=4
+PYTHON_DEPEND="2:2.6 3:3.1"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 *-jython"
+
+inherit bash-completion-r1 eutils linux-info distutils
+
+DESCRIPTION="A program used to manage a netfilter firewall"
+HOMEPAGE="http://launchpad.net/ufw"
+SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples ipv6"
+
+DEPEND="sys-devel/gettext"
+RDEPEND=">=net-firewall/iptables-1.4[ipv6?]
+	!<kde-misc/kcm-ufw-0.4.2
+	!<net-firewall/ufw-frontends-0.3.2
+"
+
+# tests fail; upstream bug: https://bugs.launchpad.net/ufw/+bug/815982
+RESTRICT="test"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~PROC_FS
+		~NETFILTER_XT_MATCH_COMMENT ~NETFILTER_XT_MATCH_HL
+		~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_MULTIPORT
+		~NETFILTER_XT_MATCH_RECENT ~NETFILTER_XT_MATCH_STATE"
+
+	if kernel_is -ge 2 6 39; then
+		CONFIG_CHECK+=" ~NETFILTER_XT_MATCH_ADDRTYPE"
+	else
+		CONFIG_CHECK+=" ~IP_NF_MATCH_ADDRTYPE"
+	fi
+
+	# https://bugs.launchpad.net/ufw/+bug/1076050
+	if kernel_is -ge 3 4; then
+		CONFIG_CHECK+=" ~NETFILTER_XT_TARGET_LOG"
+	else
+		CONFIG_CHECK+=" ~IP_NF_TARGET_LOG"
+		use ipv6 && CONFIG_CHECK+=" ~IP6_NF_TARGET_LOG"
+	fi
+
+	CONFIG_CHECK+=" ~IP_NF_TARGET_REJECT"
+	use ipv6 && CONFIG_CHECK+=" ~IP6_NF_TARGET_REJECT"
+
+	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() {
+	# Allow to remove unnecessary build time dependency
+	# on net-firewall/iptables.
+	epatch "${FILESDIR}"/${PN}-0.33-dont-check-iptables.patch
+	# Move files away from /lib/ufw.
+	epatch "${FILESDIR}"/${PN}-0.31.1-move-path.patch
+	# Contains fixes related to SUPPORT_PYTHON_ABIS="1" (see comment in the
+	# file).
+	epatch "${FILESDIR}"/${PN}-0.31.1-python-abis.patch
+
+	# Set as enabled by default. User can enable or disable
+	# the service by adding or removing it to/from a runlevel.
+	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
+
+	# If LINGUAS is set install selected translations only.
+	if [[ -n ${LINGUAS+set} ]]; then
+		_EMPTY_LOCALE_LIST="yes"
+		pushd locales/po > /dev/null || die
+
+		local lang
+		for lang in *.po; do
+			if ! has "${lang%.po}" ${LINGUAS}; then
+				rm "${lang}" || die
+			else
+				_EMPTY_LOCALE_LIST="no"
+			fi
+		done
+
+		popd > /dev/null || die
+	else
+		_EMPTY_LOCALE_LIST="no"
+	fi
+}
+
+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/*
+
+	insinto /usr/share/doc/${PF}/logging/rsyslog
+	doins "${FILESDIR}"/rsyslog/*
+	doins doc/rsyslog.example
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+	distutils_src_install
+	[[ $_EMPTY_LOCALE_LIST != yes ]] && domo locales/mo/*.mo
+	newbashcomp shell-completion/bash ${PN}
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	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.34 ]];
+	then
+		echo
+		elog "/usr/share/ufw/check-requirements script is installed."
+		elog "It is useful for debugging problems with ufw. However one"
+		elog "should keep in mind that the script assumes IPv6 is enabled"
+		elog "on kernel and net-firewall/iptables, and fails when it's not."
+	fi
+	echo
+	ewarn "Note: once enabled, ufw blocks also incoming SSH connections by"
+	ewarn "default. See README, Remote Management section for more information."
+}