[pull] master from openwrt:master

lang/node/Makefile

@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=node
-PKG_VERSION:=22.22.0
+PKG_VERSION:=22.22.2
 PKG_RELEASE:=1
 NODE_MODULE_VERSION:=127
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://nodejs.org/dist/v$(PKG_VERSION)
-PKG_HASH:=5a4585d7f26bfb283267194b299243efea5ee6edd2fbf887825469b4ac94aece
+PKG_HASH:=f4b9606f33aef725a77b6292460102b48b80902571a8bb94cd769837ee0577df
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
-NODEJS_BIN_SUM:=c33c39ed9c80deddde77c960d00119918b9e352426fd604ba41638d6526a4744
+NODEJS_BIN_SUM:=978978a635eef872fa68beae09f0aad0bbbae6757e444da80b570964a97e62a3
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-v$(PKG_VERSION)
 
 PKG_MAINTAINER:=Hirokazu MORIKAWA <morikw2@gmail.com>, Adrian Panella <ianchi74@outlook.com>

lang/python/python-click/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-click
-PKG_VERSION:=8.3.1
+PKG_VERSION:=8.3.2
 PKG_RELEASE:=1
 
 PYPI_NAME:=click
-PKG_HASH:=12ff4785d337a1bb490bb7e9c2b1ee5da3112e94a8622f26a6c77f5d2fc6842a
+PKG_HASH:=14162b8b3b3550a7d479eafa77dfd3c38d9dc8951f6f69c78913a8f9a7540fd5
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 PKG_LICENSE:=BSD-3-Clause

lang/python/python-cryptography/Makefile

@@ -8,18 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cryptography
-PKG_VERSION:=41.0.7
+PKG_VERSION:=46.0.6
 PKG_RELEASE:=1
 
 PYPI_NAME:=cryptography
-PKG_HASH:=13f93ce9bea8016c253b34afc6bd6a75993e5c40672ed5405a9c832f0d4a00bc
+PKG_HASH:=27550628a518c5c6c903d84f637fbecf287f6cb9ced3804838a1295dc1fd0759
 
 PKG_LICENSE:=Apache-2.0 BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE.APACHE LICENSE.BSD
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 PKG_CPE_ID:=cpe:/a:cryptography.io:cryptography
 
-PKG_BUILD_DEPENDS:=libffi/host python-cffi/host python-setuptools-rust/host
+PKG_BUILD_DEPENDS:=libffi/host python-cffi/host python-maturin/host python-setuptools/host
 
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk

lang/python/python-mako/Makefile

@@ -6,11 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-mako
-PKG_VERSION:=1.3.5
+PKG_VERSION:=1.3.10
 PKG_RELEASE:=1
 
 PYPI_NAME:=Mako
-PKG_HASH:=48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc
+PYPI_SOURCE_NAME:=mako
+PKG_HASH:=99579a6f39583fa7e5630a28c3c1f440e4e97a414b80372649c0ce338da2ea28
 
 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
 PKG_LICENSE:=MIT

lang/python/python-maturin/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-maturin
-PKG_VERSION:=1.9.6
+PKG_VERSION:=1.12.6
 PKG_RELEASE:=1
 
 PYPI_NAME:=maturin
-PKG_HASH:=2c2ae37144811d365509889ed7220b0598487f1278c2441829c3abf56cc6324a
+PKG_HASH:=d37be3a811a7f2ee28a0fa0964187efa50e90f21da0c6135c27787fa0b6a89db
 
 PKG_MAINTAINER:=Luca Barbato <lu_zero@luminem.org>
 PKG_LICENSE:=Apache-2.0 MIT

lang/python/python-poetry-core/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-poetry-core
-PKG_VERSION:=2.3.1
+PKG_VERSION:=2.3.2
 PKG_RELEASE:=1
 
 PYPI_NAME:=poetry-core
 PYPI_SOURCE_NAME:=poetry_core
-PKG_HASH:=96f791d5d7d4e040f3983d76779425cf9532690e2756a24fd5ca0f86af19ef82
+PKG_HASH:=20cb71be27b774628da9f384effd9183dfceb53bcef84063248a8672aa47031f
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

lang/python/python-poetry-core/test.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+[ "$1" = python3-poetry-core ] || exit 0
+python3 - << 'EOF'
+import poetry.core
+assert poetry.core.__version__, "poetry.core version is empty"
+
+from poetry.core.version.version import Version
+v = Version.parse("1.2.3")
+assert str(v) == "1.2.3", f"unexpected version string: {v}"
+assert v.major == 1
+assert v.minor == 2
+assert v.patch == 3
+
+v2 = Version.parse("2.0.0")
+assert v2 > v, "version comparison failed"
+
+from poetry.core.constraints.version import parse_constraint
+c = parse_constraint(">=1.0.0,<2.0.0")
+assert c.allows(Version.parse("1.5.0")), "constraint should allow 1.5.0"
+assert not c.allows(Version.parse("2.0.0")), "constraint should not allow 2.0.0"
+EOF

lang/python/python-setuptools-rust/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-setuptools-rust
-PKG_VERSION:=1.12.0
+PKG_VERSION:=1.12.1
 PKG_RELEASE:=1
 
 PYPI_NAME:=setuptools-rust
 PYPI_SOURCE_NAME:=setuptools_rust
-PKG_HASH:=d94a93f0c97751c17014565f07bdc324bee45d396cd1bba83d8e7af92b945f0c
+PKG_HASH:=85ae70989d96c9cfeb5ef79cf3bac2d5200bc5564f720a06edceedbdf6664640
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

lang/python/python-setuptools-rust/test.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+[ "$1" = python3-setuptools-rust ] || exit 0
+python3 - << 'EOF'
+import setuptools_rust
+assert setuptools_rust.__version__, "setuptools_rust version is empty"
+from setuptools_rust import RustExtension, RustBin, Binding
+ext = RustExtension("mymod", binding=Binding.PyO3)
+assert ext.name == "mymod"
+EOF

lang/python/python-setuptools-scm/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-setuptools-scm
-PKG_VERSION:=10.0.3
+PKG_VERSION:=10.0.5
 PKG_RELEASE:=1
 
 PYPI_NAME:=setuptools-scm
 PYPI_SOURCE_NAME:=setuptools_scm
-PKG_HASH:=742169fcd40326b4e7b7dc9cfd6c1804a95d4ffbb4184b4f4d4d008044cbc84d
+PKG_HASH:=bbba8fe754516cdefd017f4456721775e6ef9662bd7887fb52ae26813d4838c3
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

lang/python/python-setuptools/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-setuptools
 PKG_VERSION:=82.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=setuptools
 PKG_HASH:=7d872682c5d01cfde07da7bccc7b65469d3dca203318515ada1de5eda35efbf9

lang/python/python-setuptools/patches/0001-distutils-use-python-sysroot.patch

@@ -0,0 +1,60 @@
+From e359a7a3c4f9e70360a068bef19c95938fdacede Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 23 Dec 2015 11:33:14 +0100
+Subject: [PATCH] Adjust library/header paths for cross-compilation
+
+When cross-compiling third-party extensions, the get_python_inc() or
+get_python_lib() can be called, to return the path to headers or
+libraries. However, they use the sys.prefix of the host Python, which
+returns incorrect paths when cross-compiling (paths pointing to host
+headers and libraries).
+
+In order to fix this, we introduce the _python_sysroot, _python_prefix
+and _python_exec_prefix variables, that allow to override these
+values, and get correct header/library paths when cross-compiling
+third-party Python modules.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ setuptools/_distutils/command/build_ext.py |  5 ++++-
+ setuptools/_distutils/sysconfig.py         | 15 +++++++++++----
+ 2 files changed, 15 insertions(+), 5 deletions(-)
+
+--- a/setuptools/_distutils/command/build_ext.py
++++ b/setuptools/_distutils/command/build_ext.py
+@@ -156,7 +156,10 @@ class build_ext(Command):
+             yield os.path.join(installed_dir, lib_dir)
+         else:
+             # building third party extensions
+-            yield sysconfig.get_config_var('LIBDIR')
++            libdir = sysconfig.get_config_var('LIBDIR')
++            if "_python_sysroot" in os.environ:
++                libdir = os.environ.get("_python_sysroot") + libdir
++            yield libdir
+
+     def finalize_options(self) -> None:  # noqa: C901
+         from distutils import sysconfig
+--- a/setuptools/_distutils/sysconfig.py
++++ b/setuptools/_distutils/sysconfig.py
+@@ -37,10 +37,17 @@ else:
+ IS_PYPY = '__pypy__' in sys.builtin_module_names
+
+ # These are needed in a couple of spots, so just compute them once.
+-PREFIX = os.path.normpath(sys.prefix)
+-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
+-BASE_PREFIX = os.path.normpath(sys.base_prefix)
+-BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
++if "_python_sysroot" in os.environ:
++    _sysroot=os.environ.get('_python_sysroot')
++    PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix'))
++    EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix'))
++    BASE_PREFIX = PREFIX
++    BASE_EXEC_PREFIX = EXEC_PREFIX
++else:
++    PREFIX = os.path.normpath(sys.prefix)
++    EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
++    BASE_PREFIX = os.path.normpath(sys.base_prefix)
++    BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
+
+ # Path to the base directory of the project. On Windows the binary may
+ # live in project/PCbuild/win32 or project/PCbuild/amd64.

lang/python/python-sqlalchemy/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-sqlalchemy
-PKG_VERSION:=2.0.44
-PKG_RELEASE:=2
+PKG_VERSION:=2.0.49
+PKG_RELEASE:=1
 
 PYPI_NAME:=sqlalchemy
-PKG_HASH:=0ae7454e1ab1d780aee69fd2aae7d6b8670a581d8847f2d1e0f7ddfbf47e5a22
+PKG_HASH:=d15950a57a210e36dd4cec1aac22787e2a4d57ba9318233e2ef8b2daf9ff2d5f
 
 PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
 PKG_LICENSE:=MIT

lang/python/python-sqlalchemy/test.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+[ "$1" = python3-sqlalchemy ] || exit 0
+python3 - << 'EOF'
+import sqlalchemy
+assert sqlalchemy.__version__, "sqlalchemy version is empty"
+
+from sqlalchemy import create_engine, Column, Integer, String, text
+from sqlalchemy.orm import DeclarativeBase, Session
+
+engine = create_engine("sqlite:///:memory:")
+
+class Base(DeclarativeBase):
+    pass
+
+class User(Base):
+    __tablename__ = "users"
+    id = Column(Integer, primary_key=True)
+    name = Column(String)
+
+Base.metadata.create_all(engine)
+
+with Session(engine) as session:
+    session.add(User(name="Alice"))
+    session.add(User(name="Bob"))
+    session.commit()
+    users = session.query(User).order_by(User.name).all()
+    assert len(users) == 2
+    assert users[0].name == "Alice"
+    assert users[1].name == "Bob"
+
+with engine.connect() as conn:
+    result = conn.execute(text("SELECT count(*) FROM users"))
+    count = result.scalar()
+    assert count == 2, f"Expected 2, got {count}"
+EOF

utils/attendedsysupgrade-common/Makefile

@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=attendedsysupgrade-common
-PKG_VERSION:=9
+PKG_VERSION:=10
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
@@ -18,27 +18,8 @@ define Package/attendedsysupgrade-common
 endef
 
 define Package/attendedsysupgrade-common/description
-	Common needed files for attendedsysupgrade tool
-
-	Manages dependencies and brings settings used by clients.
-
-	UCI options:
-
-	* attendedsysupgrade.server.url
-	  URL of compatible upgrade server [1]
-
-	* attendedsysupgrade.client.upgrade_packages
-	  Client should request image also if no new release but new packages
-	  upgrade are available.
-
-	* attendedsysupgrade.client.advanced_mode
-	  Offer advanced options like editing packages before request and show
-	  additional information.
-
-	* attendedsysupgrade.client.auto_search
-	  Tells the client to automattically search for upgrades
-
-	[1]: https://github.com/aparcar/asu
+	Common files needed for the attendedsysupgrade tool. Manages dependencies and brings settings used by clients.
+	UCI options include defining the URL of a compatible upgrade server, requesting an image even if there’s no new release but new package upgrades are available, offering advanced options like editing packages before a request and displaying additional information, and instructing the client to automatically search for upgrades.
 endef
 
 define Build/Compile