[packages/ufw] Up to 0.36.2
arekm
arekm at pld-linux.org
Sat Mar 14 02:56:01 CET 2026
commit a0d60da5b3081ee5a22aa6290a5d77afca4f9fa4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Mar 14 02:55:52 2026 +0100
Up to 0.36.2
dont-check-iptables.patch | 15 +++++++++------
sysconfig.patch | 18 +++++++++---------
ufw.spec | 26 +++++++++++++-------------
3 files changed, 31 insertions(+), 28 deletions(-)
---
diff --git a/ufw.spec b/ufw.spec
index 47c06fa..cee9b29 100644
--- a/ufw.spec
+++ b/ufw.spec
@@ -1,21 +1,21 @@
Summary: Uncomplicated Firewall
Name: ufw
-Version: 0.35
+Version: 0.36.2
Release: 1
License: GPL v3+
Group: Networking/Admin
-Source0: http://launchpad.net/ufw/%{version}/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5: b7cd2dd4e4e98e46df125fee06edff92
+Source0: https://launchpad.net/ufw/0.36/%{version}/+download/%{name}-%{version}.tar.gz
+# Source0-md5: 4a1c52b7da2b25e66e91b5f16a7d032d
Patch0: sysconfig.patch
Patch1: dont-check-iptables.patch
-URL: http://launchpad.net/ufw
-BuildRequires: python-devel >= 1:2.6
+URL: https://launchpad.net/ufw
+BuildRequires: python3-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.714
BuildRequires: sed >= 4.0
Requires: iptables >= 1.4.16
Requires: iptables-init
-Requires: python-modules
+Requires: python3-modules
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,13 +40,12 @@ grep -rl /etc/default/ufw . | xargs %{__sed} -i -e 's,/etc/default/ufw,/etc/sysc
%build
# We skip 'build' and run 'install' directly
-# http://bugs.launchpad.net/ufw/+bug/819600
-#%{__python} setup.py build
+# https://bugs.launchpad.net/ufw/+bug/819600
+#%{__python3} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
-%py_install
-%py_postclean
+%py3_install
%clean
rm -rf $RPM_BUILD_ROOT
@@ -70,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
%dir /lib/ufw
%attr(755,root,root) /lib/ufw/ufw-init
/lib/ufw/ufw-init-functions
-%dir %{py_sitescriptdir}/ufw
-%{py_sitescriptdir}/ufw/*.py[co]
-%{py_sitescriptdir}/ufw-%{version}-py*.egg-info
+%dir %{py3_sitescriptdir}/ufw
+%{py3_sitescriptdir}/ufw/*.py
+%{py3_sitescriptdir}/ufw/__pycache__
+%{py3_sitescriptdir}/ufw-%{version}-py*.egg-info
diff --git a/dont-check-iptables.patch b/dont-check-iptables.patch
index b7eae35..f000dca 100644
--- a/dont-check-iptables.patch
+++ b/dont-check-iptables.patch
@@ -1,7 +1,6 @@
-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 @@
+--- ufw-0.36.2.orig/setup.py 2023-05-18 15:07:39.000000000 +0200
++++ ufw-0.36.2/setup.py 2023-05-18 15:07:39.000000000 +0200
+@@ -245,45 +245,7 @@
os.unlink(os.path.join('staging', 'ufw-init'))
os.unlink(os.path.join('staging', 'ufw-init-functions'))
@@ -9,7 +8,11 @@ diff -ur ufw-0.32/setup.py ufw-0.32.new/setup.py
-iptables_dir = ''
-
-for e in ['iptables']:
-- for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \
+- # Historically iptables was in /sbin, then later also symlinked from
+- # /usr/sbin/iptables to /sbin/iptables. Debian bullseye moves iptables
+- # to /usr/sbin with no symlink in /sbin except on upgrades. To accomodate
+- # buildds that may still have the old iptables, search /usr/sbin first
+- for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \
- '/usr/local/bin']:
- if e == "iptables":
- if os.path.exists(os.path.join(dir, e)):
@@ -40,7 +43,7 @@ diff -ur ufw-0.32/setup.py ufw-0.32.new/setup.py
-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'
++iptables_dir = '/usr/sbin'
setup (name='ufw',
version=ufw_version,
diff --git a/sysconfig.patch b/sysconfig.patch
index 40bbc76..5d3d37f 100644
--- a/sysconfig.patch
+++ b/sysconfig.patch
@@ -1,6 +1,6 @@
---- ufw-0.33.n/setup.py 2012-08-18 00:12:49.000000000 +0300
-+++ ufw-0.33/setup.py 2013-09-16 11:29:34.815967366 +0300
-@@ -148,7 +148,7 @@
+--- ufw-0.36.2.orig/setup.py 2023-05-18 15:07:39.000000000 +0200
++++ ufw-0.36.2/setup.py 2026-03-14 02:50:18.583254082 +0100
+@@ -157,7 +157,7 @@
if self.root != None:
confdir = self.root + real_confdir
@@ -9,9 +9,9 @@
ufwconf = os.path.join(confdir, 'ufw', 'ufw.conf')
sysctl = os.path.join(confdir, 'ufw', 'sysctl.conf')
before_rules = os.path.join(confdir, 'ufw', 'before.rules')
---- ufw-0.35/src/backend.py~ 2016-02-18 07:26:44.000000000 +0200
-+++ ufw-0.35/src/backend.py 2016-06-17 12:53:04.165668850 +0300
-@@ -37,7 +37,7 @@
+--- ufw-0.36.2.orig/src/backend.py 2023-05-18 15:07:39.000000000 +0200
++++ ufw-0.36.2/src/backend.py 2026-03-14 02:50:27.779920747 +0100
+@@ -38,7 +38,7 @@
self.rules6 = []
p = _findpath(ufw.common.config_dir, datadir)
@@ -19,9 +19,9 @@
+ self.files = {'defaults': os.path.join(p, 'sysconfig/ufw'),
'conf': os.path.join(p, 'ufw/ufw.conf'),
'apps': os.path.join(p, 'ufw/applications.d') }
- if extra_files != None:
---- ufw-0.35/src/ufw-init-functions~ 2016-02-18 07:26:44.000000000 +0200
-+++ ufw-0.35/src/ufw-init-functions 2016-06-17 12:53:34.520564916 +0300
+ if extra_files is not None:
+--- ufw-0.36.2.orig/src/ufw-init-functions 2023-05-16 16:51:25.000000000 +0200
++++ ufw-0.36.2/src/ufw-init-functions 2026-03-14 02:50:28.866587413 +0100
@@ -20,7 +20,7 @@
PATH="/sbin:/bin:/usr/sbin:/usr/bin"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ufw.git/commitdiff/a0d60da5b3081ee5a22aa6290a5d77afca4f9fa4
More information about the pld-cvs-commit
mailing list