On Thu, 05 Dec 2024 17:42:34 +0100,
"Jonathan Armani" <jonathan@armani.tech> wrote:
> 
> 
> 
> On Thu, Dec 5, 2024, at 16:52, Kirill A. Korinsky wrote:
> > On Thu, 05 Dec 2024 11:49:39 +0100,
> > Benoit Lecocq <blq@arcane-labs.net> wrote:
> >> 
> >> 
> >> Le 05/12/2024 à 11:39, Kirill A. Korinsky a écrit :
> >> > ports@,
> >> > 
> >> > Here a trivial update of security/wapiti to 3.2.2. Realli trivial:
> >> > https://github.com/wapiti-scanner/wapiti/compare/3.2.1...3.2.2
> >> > 
> >> > I also would like to take formal maintainership on that port.
> >> > 
> >> > Ok?
> >> 
> >> ok benoit@
> >> 
> >>
> >
> > Seems that updae isn't so trivial. They had switched to use of their own
> > arsenic which hasn't got any changes, only renaming:
> > https://github.com/fabaff/arsenic/compare/main...wapiti-scanner:arsenic:main
> 
> You compare between a fork and wapiti.
> 
> What about these changes between the fork and HENNGE/arsenic ?
> https://github.com/HENNGE/arsenic/compare/main...fabaff:arsenic:main
>

Thanks, now it makes sense.

Changes are related to compatibility with python-3.12
https://github.com/HENNGE/arsenic/pull/166

I think this should be backported to arsenic in our tree like this:

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/www/py-arsenic/Makefile,v
diff -u -p -r1.1.1.1 Makefile
--- Makefile	30 Oct 2024 15:40:31 -0000	1.1.1.1
+++ Makefile	5 Dec 2024 17:10:55 -0000
@@ -1,6 +1,7 @@
 COMMENT =		asynchronous WebDriver client
 
 MODPY_EGG_VERSION =	21.8
+REVISION =		0
 
 DISTNAME =		arsenic-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
Index: patches/patch-src_arsenic_services_py
===================================================================
RCS file: patches/patch-src_arsenic_services_py
diff -N patches/patch-src_arsenic_services_py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_arsenic_services_py	5 Dec 2024 17:12:30 -0000
@@ -0,0 +1,32 @@
+Backport compatibility with Python 3.12
+
+https://github.com/HENNGE/arsenic/pull/166
+
+Index: src/arsenic/services.py
+--- src/arsenic/services.py.orig
++++ src/arsenic/services.py
+@@ -2,7 +2,7 @@ import abc
+ import asyncio
+ import re
+ import sys
+-from distutils.version import StrictVersion
++from packaging import version
+ from functools import partial
+ from typing import List, TextIO, Optional
+ 
+@@ -91,11 +91,11 @@ class Geckodriver(Service):
+                     "disable version checking, set `version_check` to "
+                     "`False`."
+                 )
+-            version_str = match.group(1)
+-            version = StrictVersion(version_str)
+-            if version < StrictVersion("0.16.1"):
++            binary_version_str = match.group(1)
++            binary_version = version.parse(binary_version_str)
++            if binary_version < version.parse("0.16.1"):
+                 raise ValueError(
+-                    f"Geckodriver version {version_str} is too old. 0.16.1 or "
++                    f"Geckodriver version {binary_version_str} is too old. 0.16.1 or "
+                     f"higher is required. To disable version checking, set "
+                     f"`version_check` to `False`."
+                 )


-- 
wbr, Kirill