[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

[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

[Ian Whyman (thev00d00)]

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,