From d913b0355e515c7b5b3b8a419ac71cb7230c06f9 Mon Sep 17 00:00:00 2001
From: Tommaso Bailetti <tommaso.bailetti@nethesis.it>
Date: Fri, 15 May 2026 12:24:35 +0200
Subject: [PATCH 1/2] chore: updated package to 3.13

---
 Containerfile                 | 23 ++++++++++-------------
 setup.py                      |  2 +-
 src/nethsec/snort/__init__.py |  2 --
 src/nethsec/utils/__init__.py |  2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Containerfile b/Containerfile
index eb985b2b..bcc4f357 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,25 +1,22 @@
-FROM python:3.11.7
+FROM python:3.13.9
 RUN apt-get update \
     && apt-get install -y \
-      cmake \
-      liblua5.1-0-dev \
-      lua5.1 \
-      libjson-c-dev
+    cmake \
+    liblua5.1-0-dev \
+    lua5.1 \
+    libjson-c-dev
 
-RUN mkdir /tmp/requirements \
-    && git clone https://github.com/openwrt/libubox.git /tmp/requirements/libubox \
-    && cd /tmp/requirements/libubox \
-    && git checkout 49056d178f42da98048a5d4c23f83a6f6bc6dd80 \
+ADD https://github.com/openwrt/libubox.git#815633847cd32ffe6da28943cbeb37edc88265c8 /tmp/requirements/libubox
+ADD https://github.com/openwrt/ubus.git#3cc98db1a422dcf560f2d6347fd410f17565a89d /tmp/requirements/ubus
+ADD https://github.com/openwrt/uci.git#66127cd76c5d0bd46d5a90302cc6110f53a4e2f8 /tmp/requirements/uci
+
+RUN cd /tmp/requirements/libubox \
     && cmake CMakeLists.txt \
     && make install \
-    && git clone https://github.com/openwrt/ubus.git /tmp/requirements/ubus \
     && cd /tmp/requirements/ubus \
-    && git checkout 60e04048a0e2f3e33651c19e62861b41be4c290f \
     && cmake CMakeLists.txt \
     && make install \
-    && git clone https://github.com/openwrt/uci.git /tmp/requirements/uci \
     && cd /tmp/requirements/uci \
-    && git checkout 16ff0badbde7e17ec3bd1f827ffe45922956cf86 \
     && cmake CMakeLists.txt \
     && make install \
     && rm -rf /tmp/requirements \
diff --git a/setup.py b/setup.py
index f154bf3c..79414ac1 100644
--- a/setup.py
+++ b/setup.py
@@ -23,5 +23,5 @@
         "License v3 (LGPLv3)   License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)",
         "Operating System :: OS Independent",
     ],
-    python_requires = '>=3.7',
+    python_requires = '>=3.13',
 )
diff --git a/src/nethsec/snort/__init__.py b/src/nethsec/snort/__init__.py
index d0af8dae..dc03ea42 100644
--- a/src/nethsec/snort/__init__.py
+++ b/src/nethsec/snort/__init__.py
@@ -35,8 +35,6 @@
 duplicate signature IDs.
 """
 
-from __future__ import print_function
-
 import sys
 import re
 import logging
diff --git a/src/nethsec/utils/__init__.py b/src/nethsec/utils/__init__.py
index 1db7f5db..fc3a8580 100644
--- a/src/nethsec/utils/__init__.py
+++ b/src/nethsec/utils/__init__.py
@@ -435,7 +435,7 @@ def get_user_by_username(uci, username):
       - The user object id (UCI section) if the user has been found, None otherwise
     '''
     users = get_all_by_type(uci, 'objects', 'user')
-    for user in get_all_by_type("users", "user"):
+    for user in get_all_by_type(uci, "users", "user"):
         if users[user].get("username", "") == username:
             users[user]["id"] = user
             return users[user]

From 585d81aec9e4bc833e83525701a8a0d6ffd67a21 Mon Sep 17 00:00:00 2001
From: Tommaso Bailetti <tommaso.bailetti@nethesis.it>
Date: Fri, 15 May 2026 12:49:15 +0200
Subject: [PATCH 2/2] moving the depdendency, using ADD correctly for the repos

---
 Containerfile    | 17 ++++++++---------
 requirements.txt |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Containerfile b/Containerfile
index bcc4f357..4eb2d89c 100644
--- a/Containerfile
+++ b/Containerfile
@@ -7,19 +7,18 @@ RUN apt-get update \
     libjson-c-dev
 
 ADD https://github.com/openwrt/libubox.git#815633847cd32ffe6da28943cbeb37edc88265c8 /tmp/requirements/libubox
-ADD https://github.com/openwrt/ubus.git#3cc98db1a422dcf560f2d6347fd410f17565a89d /tmp/requirements/ubus
-ADD https://github.com/openwrt/uci.git#66127cd76c5d0bd46d5a90302cc6110f53a4e2f8 /tmp/requirements/uci
-
 RUN cd /tmp/requirements/libubox \
     && cmake CMakeLists.txt \
-    && make install \
-    && cd /tmp/requirements/ubus \
+    && make install
+ADD https://github.com/openwrt/ubus.git#3cc98db1a422dcf560f2d6347fd410f17565a89d /tmp/requirements/ubus
+RUN cd /tmp/requirements/ubus \
     && cmake CMakeLists.txt \
-    && make install \
-    && cd /tmp/requirements/uci \
+    && make install
+ADD https://github.com/openwrt/uci.git#66127cd76c5d0bd46d5a90302cc6110f53a4e2f8 /tmp/requirements/uci
+RUN cd /tmp/requirements/uci \
     && cmake CMakeLists.txt \
-    && make install \
-    && rm -rf /tmp/requirements \
+    && make install
+RUN rm -rf /tmp/requirements \
     && echo "/usr/local/lib" >> /etc/ld.so.conf.d/local.conf \
     && ldconfig
 
diff --git a/requirements.txt b/requirements.txt
index 0091e4d6..d4d4e9c5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,4 @@ pydoctor==24.11.2
 pytest==8.3.5
 pytest-mock==3.14.0
 pyuci==0.10.3
-passlib==1.7.4
+libpass==1.9.3