From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7BAF9138010 for ; Mon, 24 Sep 2012 12:18:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F038921C17F; Mon, 24 Sep 2012 12:18:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C475E21C17F for ; Mon, 24 Sep 2012 12:18:06 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B83033CEF2 for ; Mon, 24 Sep 2012 12:18:06 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2303) id C981B21601; Mon, 24 Sep 2012 12:18:04 +0000 (UTC) From: "Ian Whyman (thev00d00)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, thev00d00@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-firewall/ufw/files: ufw-0.33-dont-check-iptables.patch ufw-0.30.1-encoding.patch ufw-0.30.1-python-abis.patch ufw-move-path.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: ufw-0.33-dont-check-iptables.patch ufw-0.30.1-encoding.patch ufw-0.30.1-python-abis.patch ufw-move-path.patch X-VCS-Directories: net-firewall/ufw/files X-VCS-Committer: thev00d00 X-VCS-Committer-Name: Ian Whyman Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20120924121804.C981B21601@flycatcher.gentoo.org> Date: Mon, 24 Sep 2012 12:18:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e76bc56b-45e5-4103-873a-6d71b6b0b325 X-Archives-Hash: f42c70206592438bbcfd533f9e8e6039 thev00d00 12/09/24 12:18:04 Added: ufw-0.33-dont-check-iptables.patch Removed: ufw-0.30.1-encoding.patch ufw-0.30.1-python-abis.patch ufw-move-path.patch Log: Bump to 0.33 (with python 3 support), drop old (Portage version: 2.2.0_alpha130/cvs/Linux x86_64) Revision Changes Path 1.1 net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch?rev=1.1&content-type=text/plain Index: ufw-0.33-dont-check-iptables.patch =================================================================== diff -ur ufw-0.32/setup.py ufw-0.32.new/setup.py --- ufw-0.32/setup.py 2012-07-06 17:46:29.000000000 +0200 +++ ufw-0.32.new/setup.py 2012-07-30 15:28:31.874547818 +0200 @@ -225,41 +225,7 @@ os.unlink(os.path.join('staging', 'ufw-init')) os.unlink(os.path.join('staging', 'ufw-init-functions')) -iptables_exe = '' -iptables_dir = '' - -for e in ['iptables']: - for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ - '/usr/local/bin']: - if e == "iptables": - if os.path.exists(os.path.join(dir, e)): - iptables_dir = dir - iptables_exe = os.path.join(iptables_dir, "iptables") - print("Found '%s'" % iptables_exe) - else: - continue - - if iptables_exe != "": - break - - -if iptables_exe == '': - print("ERROR: could not find required binary 'iptables'", file=sys.stderr) - sys.exit(1) - -for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: - if not os.path.exists(os.path.join(iptables_dir, e)): - print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) - sys.exit(1) - -(rc, out) = cmd([iptables_exe, '-V']) -if rc != 0: - raise OSError(errno.ENOENT, "Could not find version for '%s'" % \ - (iptables_exe)) -version = re.sub('^v', '', re.split('\s', str(out))[1]) -print("Found '%s' version '%s'" % (iptables_exe, version)) -if version < "1.4": - print("WARN: version '%s' has limited IPv6 support. See README for details." % (version), file=sys.stderr) +iptables_dir = '/sbin' setup (name='ufw', version=ufw_version,