[PR PATCH] ufw: update to 0.36.2.

[PR PATCH] ufw: update to 0.36.2.

[yoshiyoshyosh]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

There is a new pull request by yoshiyoshyosh against master on the void-packages repository

https://github.com/yoshiyoshyosh/void-packages ufw
https://github.com/void-linux/void-packages/pull/45559

ufw: update to 0.36.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64`

A patch file from https://github.com/void-linux/void-packages/pull/45559.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ufw-45559.patch --]
[-- Type: text/x-diff, Size: 1183 bytes --]

From 5df087ef309121073f856056eabb71c85e8cfffc Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Sat, 12 Aug 2023 00:19:40 -0500
Subject: [PATCH] ufw: update to 0.36.2.

---
 srcpkgs/ufw/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template
index 03b0b7b3a2ffe..6a92f11c170b2 100644
--- a/srcpkgs/ufw/template
+++ b/srcpkgs/ufw/template
@@ -1,7 +1,7 @@
 # Template file for 'ufw'
 pkgname=ufw
-version=0.36.1
-revision=3
+version=0.36.2
+revision=1
 _major_minor="${version%.*}"
 build_style=python3-module
 conf_files="
@@ -15,11 +15,11 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://launchpad.net/ufw"
 distfiles="https://launchpad.net/ufw/${_major_minor}/${version}/+download/ufw-${version}.tar.gz"
-checksum=1c57e78fbf2970f0cc9c56ea87a231e6d83d825e55b9e31e2c88b91b0ea03c8c
+checksum=2a57a99eecef6b44db3537ed2520b30bae3759f8465456e22e404cd643838bf5
 
 pre_configure() {
-	sed -i -e 's|/lib|/usr/lib|' setup.py
-	sed -i -e 's|sbin|bin|' setup.py
+	vsed -i setup.py -e 's|/lib|/usr/lib|'
+	vsed -i setup.py -e 's|sbin|bin|'
 }
 
 post_install() {

Re: ufw: update to 0.36.2.

[yoshiyoshyosh]

[-- Attachment #1: Type: text/plain, Size: 1315 bytes --]

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45559#issuecomment-1675728394

Comment:
apologies for forgetting testing before PRing. fixed the current failing build by adding `./run-tests.sh` as `do_check`, but more test failures arise from doing that:
```
======================================================================
ERROR: test__get_defaults (tests.unit.test_backend_iptables.BackendIptablesTestCase.test__get_defaults)
Test _get_defaults()
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/ufw-0.36.2/tests/unit/test_backend_iptables.py", line 39, in setUp
    shutil.copytree(d, d + ".bak")
  File "/usr/lib/python3.11/shutil.py", line 559, in copytree
    with os.scandir(src) as itr:
         ^^^^^^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: '/builddir/ufw-0.36.2/tests/unit/tmp/ufw/lib/ufw'
... (for a lot more tests)
```
not sure what to do about this--`ufw.common.state_dir` & `ufw.common.config_dir` rely on `real_{state,config}_dir` from `setup.py`, which gets changed by `vsed`. even if this were fixed, there's other failing tests because some rely on `sysctl`'s existence. probably might be best to disable `do_check`

Re: ufw: update to 0.36.2.

[yoshiyoshyosh]

[-- Attachment #1: Type: text/plain, Size: 1344 bytes --]

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45559#issuecomment-1675728394

Comment:
apologies for forgetting testing before PRing. fixed the current failing build by adding `./run-tests.sh` as `do_check`, but more test failures arise from doing that:
```
======================================================================
ERROR: test__get_defaults (tests.unit.test_backend_iptables.BackendIptablesTestCase.test__get_defaults)
Test _get_defaults()
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/ufw-0.36.2/tests/unit/test_backend_iptables.py", line 39, in setUp
    shutil.copytree(d, d + ".bak")
  File "/usr/lib/python3.11/shutil.py", line 559, in copytree
    with os.scandir(src) as itr:
         ^^^^^^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: '/builddir/ufw-0.36.2/tests/unit/tmp/ufw/lib/ufw'
... (for a lot more tests)
```
not sure what to do about this--`ufw.common.state_dir` & `ufw.common.config_dir` rely on `real_{state,config}_dir` from `setup.py`, which gets changed by `vsed`. even if this were fixed, there's other failing tests because some rely on `sysctl`'s existence. probably might be best to disable `do_check` entirely if this is the case

Re: ufw: update to 0.36.2.

[yoshiyoshyosh]

[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45559#issuecomment-1675728394

Comment:
apologies for forgetting testing before PRing. fixed the current failing build by adding `./run-tests.sh` as `do_check`, but more test failures arise from doing that:
```
======================================================================
ERROR: test__get_defaults (tests.unit.test_backend_iptables.BackendIptablesTestCase.test__get_defaults)
Test _get_defaults()
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/ufw-0.36.2/tests/unit/test_backend_iptables.py", line 39, in setUp
    shutil.copytree(d, d + ".bak")
  File "/usr/lib/python3.11/shutil.py", line 559, in copytree
    with os.scandir(src) as itr:
         ^^^^^^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: '/builddir/ufw-0.36.2/tests/unit/tmp/ufw/lib/ufw'
... (for a lot more tests)
```
not sure what to do about this--`ufw.common.state_dir` & `ufw.common.config_dir` rely on `real_{state,config}_dir` from `setup.py`, which gets changed by `vsed`.

Re: ufw: update to 0.36.2.

[yoshiyoshyosh]

[-- Attachment #1: Type: text/plain, Size: 1289 bytes --]

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45559#issuecomment-1675728394

Comment:
apologies for forgetting testing before PRing. fixed the current failing build by adding `./run-tests.sh` as `do_check`, but more test failures arise from doing that:
```
======================================================================
ERROR: test__get_defaults (tests.unit.test_backend_iptables.BackendIptablesTestCase.test__get_defaults)
Test _get_defaults()
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/ufw-0.36.2/tests/unit/test_backend_iptables.py", line 39, in setUp
    shutil.copytree(d, d + ".bak")
  File "/usr/lib/python3.11/shutil.py", line 559, in copytree
    with os.scandir(src) as itr:
         ^^^^^^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: '/builddir/ufw-0.36.2/tests/unit/tmp/ufw/lib/ufw'
... (for a lot more tests)
```
not sure what to do about this--`ufw.common.state_dir` & `ufw.common.config_dir` rely on `real_{state,config}_dir` from `setup.py`, which gets changed by `vsed`. there's also failing tests due to simply "problem running sysctl". might it be best to disable tests all together?

Re: ufw: update to 0.36.2.

[yoshiyoshyosh]

[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45559#issuecomment-1675728394

Comment:
apologies for forgetting to use the checks flag before PRing. fixed the current failing build by adding `./run-tests.sh` as `do_check`, but more test failures arise from doing that:
```
======================================================================
ERROR: test__get_defaults (tests.unit.test_backend_iptables.BackendIptablesTestCase.test__get_defaults)
Test _get_defaults()
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/ufw-0.36.2/tests/unit/test_backend_iptables.py", line 39, in setUp
    shutil.copytree(d, d + ".bak")
  File "/usr/lib/python3.11/shutil.py", line 559, in copytree
    with os.scandir(src) as itr:
         ^^^^^^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: '/builddir/ufw-0.36.2/tests/unit/tmp/ufw/lib/ufw'
... (for a lot more tests)
```
not sure what to do about this--`ufw.common.state_dir` & `ufw.common.config_dir` rely on `real_{state,config}_dir` from `setup.py`, which gets changed by `vsed`. there's also failing tests due to simply "problem running sysctl". might it be best to disable tests all together?

Re: ufw: update to 0.36.2.

[yoshiyoshyosh]

[-- Attachment #1: Type: text/plain, Size: 1339 bytes --]

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45559#issuecomment-1675728394

Comment:
apologies for forgetting to use the checks flag before PRing. fixed the current failing build by adding `./run-tests.sh` as `do_check`, but more test failures arise from doing that:
```
======================================================================
ERROR: test__get_defaults (tests.unit.test_backend_iptables.BackendIptablesTestCase.test__get_defaults)
Test _get_defaults()
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/ufw-0.36.2/tests/unit/test_backend_iptables.py", line 39, in setUp
    shutil.copytree(d, d + ".bak")
  File "/usr/lib/python3.11/shutil.py", line 559, in copytree
    with os.scandir(src) as itr:
         ^^^^^^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: '/builddir/ufw-0.36.2/tests/unit/tmp/ufw/lib/ufw'
... (for a lot more tests)
```
not sure what to do about this--this function call uses `ufw.common.state_dir` & `ufw.common.config_dir`, and those rely on `real_{state,config}_dir` from `setup.py`, which gets changed by `vsed`. there's also failing tests due to simply "problem running sysctl". might it be best to disable tests all together?

Re: [PR PATCH] [Updated] ufw: update to 0.36.2.

[yoshiyoshyosh]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

There is an updated pull request by yoshiyoshyosh against master on the void-packages repository

https://github.com/yoshiyoshyosh/void-packages ufw
https://github.com/void-linux/void-packages/pull/45559

ufw: update to 0.36.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64`

A patch file from https://github.com/void-linux/void-packages/pull/45559.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ufw-45559.patch --]
[-- Type: text/x-diff, Size: 2750 bytes --]

From d1d815fcadddb3742608cf5b47158e84f5873549 Mon Sep 17 00:00:00 2001
From: yosh <yosh-git@riseup.net>
Date: Sat, 12 Aug 2023 00:19:40 -0500
Subject: [PATCH] ufw: update to 0.36.2.

---
 srcpkgs/ufw/patches/fix_build_paths.patch | 22 ++++++++++++++++++++++
 srcpkgs/ufw/template                      | 15 +++++++--------
 2 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/ufw/patches/fix_build_paths.patch

diff --git a/srcpkgs/ufw/patches/fix_build_paths.patch b/srcpkgs/ufw/patches/fix_build_paths.patch
new file mode 100644
index 0000000000000..14980dbc2661e
--- /dev/null
+++ b/srcpkgs/ufw/patches/fix_build_paths.patch
@@ -0,0 +1,22 @@
+diff --git a/setup.py b/setup.py
+index 1c0e620..6367695 100644
+--- a/setup.py
++++ b/setup.py
+@@ -54,7 +54,7 @@ class Install(_install, object):
+             return
+ 
+         real_confdir = os.path.join('/etc')
+-        real_statedir = os.path.join('/lib', 'ufw')
++        real_statedir = os.path.join('/usr/lib', 'ufw')
+         real_prefix = self.prefix
+         if self.home != None:
+             real_confdir = self.home + real_confdir
+@@ -113,7 +113,7 @@ class Install(_install, object):
+         if self.root != None:
+             prefix = self.root + real_prefix
+ 
+-        script = os.path.join(prefix, 'sbin', 'ufw')
++        script = os.path.join(prefix, 'bin', 'ufw')
+         manpage = os.path.join(prefix, 'share', 'man', 'man8', 'ufw.8')
+         manpage_f = os.path.join(prefix, 'share', 'man', 'man8', \
+                                  'ufw-framework.8')
diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template
index 03b0b7b3a2ffe..4d88a828f42d7 100644
--- a/srcpkgs/ufw/template
+++ b/srcpkgs/ufw/template
@@ -1,27 +1,26 @@
 # Template file for 'ufw'
 pkgname=ufw
-version=0.36.1
-revision=3
+version=0.36.2
+revision=1
 _major_minor="${version%.*}"
 build_style=python3-module
 conf_files="
  /etc/ufw/*.conf
  /etc/ufw/*.rules
  /etc/ufw/applications.d/*"
-hostmakedepends="python3-setuptools iptables"
+hostmakedepends="python3-wheel iptables"
 depends="iptables python3"
 short_desc="Uncomplicated Firewall"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://launchpad.net/ufw"
 distfiles="https://launchpad.net/ufw/${_major_minor}/${version}/+download/ufw-${version}.tar.gz"
-checksum=1c57e78fbf2970f0cc9c56ea87a231e6d83d825e55b9e31e2c88b91b0ea03c8c
+checksum=2a57a99eecef6b44db3537ed2520b30bae3759f8465456e22e404cd643838bf5
 
-pre_configure() {
-	sed -i -e 's|/lib|/usr/lib|' setup.py
-	sed -i -e 's|sbin|bin|' setup.py
-}
+# tests fail with void build paths as well as vague errors on finding profiles
+make_check=no
 
 post_install() {
 	vsv ufw
+	vcompletion ./shell-completion/bash bash
 }

Re: ufw: update to 0.36.2.

[yoshiyoshyosh]

[-- Attachment #1: Type: text/plain, Size: 539 bytes --]

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45559#issuecomment-1676164047

Comment:
at my wit's end trying to make the tests work. they seem to still rely on the old `common.state_dir` path despite it already being patched. even then, there's more errors on it not being able to find the profile.
I have tested ufw myself with my setup and some profiles and it works.
I changed the `vsed`s for changing the `sbin` and `lib` directories to a more resilient-to-updates patch.

Re: ufw: update to 0.36.2.

[yoshiyoshyosh]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

New comment by yoshiyoshyosh on void-packages repository

https://github.com/void-linux/void-packages/pull/45559#issuecomment-1676164047

Comment:
at my wit's end trying to make the tests work. they seem to still rely on the old `common.state_dir` path despite it already being patched. even then, there's more errors on it not being able to find the profile.
I have tested ufw myself with my setup and some profiles and it works.
I changed the `sed`s for changing the `sbin` and `lib` directories to a more resilient-to-updates patch.

Re: [PR PATCH] [Merged]: ufw: update to 0.36.2.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

There's a merged pull request on the void-packages repository

ufw: update to 0.36.2.
https://github.com/void-linux/void-packages/pull/45559

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64`