[gentoo-commits] repo/gentoo:master commit in: net-firewall/ufw/files/, net-firewall/ufw/

2022-07-01 Thread Florian Schmaus
commit: 4047ed24fa5760811d57809d634524a96e6bd8d3
Author: Florian Schmaus  gentoo  org>
AuthorDate: Fri Jul  1 08:54:09 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Fri Jul  1 09:02:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4047ed24

net-firewall/ufw: remove duplicate bash completion patch

Signed-off-by: Florian Schmaus  gentoo.org>

 net-firewall/ufw/files/ufw-0.36.1-bash-completion.patch | 16 
 net-firewall/ufw/ufw-0.36.1.ebuild  |  2 +-
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/net-firewall/ufw/files/ufw-0.36.1-bash-completion.patch 
b/net-firewall/ufw/files/ufw-0.36.1-bash-completion.patch
deleted file mode 100644
index 927af244eef1..
--- a/net-firewall/ufw/files/ufw-0.36.1-bash-completion.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 a/shell-completion/bash2018-12-14 21:25:55.0 +0300
-+++ b/shell-completion/bash2019-03-21 01:26:46.152181981 +0300
-@@ -57,7 +57,6 @@
- echo "numbered verbose"
- }
- 
--_have ufw &&
- _ufw()
- {
- cur=${COMP_WORDS[COMP_CWORD]}
-@@ -91,4 +90,4 @@
- fi
- }
- 
--_have ufw && complete -F _ufw ufw
-+complete -F _ufw ufw

diff --git a/net-firewall/ufw/ufw-0.36.1.ebuild 
b/net-firewall/ufw/ufw-0.36.1.ebuild
index 8eca27c146a6..e2c1d375da38 100644
--- a/net-firewall/ufw/ufw-0.36.1.ebuild
+++ b/net-firewall/ufw/ufw-0.36.1.ebuild
@@ -29,7 +29,7 @@ PATCHES=(
# Remove shebang modification.
"${FILESDIR}/${P}-shebang.patch"
# Fix bash completions, bug #526300
-   "${FILESDIR}/${P}-bash-completion.patch"
+   "${FILESDIR}/${PN}-0.36-bash-completion.patch"
 )
 
 pkg_pretend() {



[gentoo-commits] repo/gentoo:master commit in: net-firewall/ufw/files/, net-firewall/ufw/

2020-06-20 Thread Thomas Deutschmann
commit: d4449ea33a16a14e2636b83502af5e41387dd29f
Author: Hasan ÇALIŞIR  psauxit  com>
AuthorDate: Wed Jun 17 22:44:28 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Jun 20 20:30:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4449ea3

net-firewall/ufw: drop old 0.35.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Hasan ÇALIŞIR  psauxit.com>
Closes: https://github.com/gentoo/gentoo/pull/16304
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ufw/Manifest  |   1 -
 .../ufw/files/ufw-0.33-dont-check-iptables.patch   |  46 -
 .../ufw/files/ufw-0.34_pre805-shebang.patch|  15 --
 .../ufw/files/ufw-0.35-bash-completion.patch   |  17 --
 net-firewall/ufw/files/ufw-0.35-move-path.patch| 179 ---
 net-firewall/ufw/ufw-0.35-r1.ebuild| 195 -
 6 files changed, 453 deletions(-)

diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index 4a7bb64fd25..ab0de6087c3 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -1,2 +1 @@
-DIST ufw-0.35.tar.gz 375310 BLAKE2B 
3babf22e860ead6970c1386b0ab9fc3de364ba3f5c8bc0237be4a9446358fe058d216e7928d16eed8a148fbee5b82fc1d9e3b358f357c2fac236ae6f6b942a01
 SHA512 
b36c82559910634505648f717d19eb5a0cb1ce739a804359087e74c966869d0375c4ed5811954b32d2b5b51866f6ae1bec62a4a464f226b2eecc56b096f303fc
 DIST ufw-0.36.tar.gz 580338 BLAKE2B 
a7e07ac11539061a69bb83d45c0affc54793503b31c9e9f9f8b34fa890a3fe97682f9133102e74e5f6e1eb372a929cfc8619baa2cc9efc1dc289d9f4a1766efd
 SHA512 
b32d7f79f43c203149c48b090ee0d063df78fcf654344ee11066a7363e799a62b046758ffe02b8bd15121545ac2a6b61df21fe56f8b810319fe4dd562cbdadb3

diff --git a/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch 
b/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch
deleted file mode 100644
index b7eae3595cb..000
--- a/net-firewall/ufw/files/ufw-0.33-dont-check-iptables.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur ufw-0.32/setup.py ufw-0.32.new/setup.py
 ufw-0.32/setup.py  2012-07-06 17:46:29.0 +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,

diff --git a/net-firewall/ufw/files/ufw-0.34_pre805-shebang.patch 
b/net-firewall/ufw/files/ufw-0.34_pre805-shebang.patch
deleted file mode 100644
index 991f4c826ec..000
--- a/net-firewall/ufw/files/ufw-0.34_pre805-shebang.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 a/setup.py
-+++ b/setup.py
-@@ -107,12 +107,6 @@ class Install(_install, object):
- for f in [ script, manpage, manpage_f ]:
- self.mkpath(os.path.dirname(f))
- 
--# update the interpreter to that of the one the user specified for 
setup
--print("Updating staging/ufw to use %s" % (sys.executable))
--subprocess.call(["sed",
-- "-i",
-- "1s%^#.*python.*%#! /usr/bin/env " + sys.executable 
+ "%g",
-- 'staging/ufw'])
- self.copy_file('staging/ufw', script)
- self.copy_file('doc/ufw.8', manpage)
- self.copy_file('doc/ufw-framework.8', manpage_f)

diff --git a/net-firewall/ufw/files/ufw-0.35-bash-completion.patch 
b/net-firewall/ufw/files/ufw-0.35-bash-completion.patch
deleted file mode 100644
index fde635ddc33..000
--- a/net-firewall/ufw/files/ufw-0.35-bash-completion.patch
+++ /dev/null
@@ -1,17 +0,0 @@