From cb8508c41bc1a8e5e6823d8d25b942ed944a572c Mon Sep 17 00:00:00 2001 From: Ivan Pavlov Date: Thu, 17 Aug 2023 22:33:09 +0300 Subject: [PATCH 01/32] openvpn: update to 2.6.6 Small bugfix release For details refer to https://github.com/OpenVPN/openvpn/blob/v2.6.6/Changes.rst Also, set depends on DCO kernel module when ENABLE_DCO flag is set. Signed-off-by: Ivan Pavlov --- net/openvpn/Makefile | 7 ++++--- .../101-Fix-EVP_PKEY_CTX_-compilation-with-wolfSSL.patch | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 752d38535..8f79f2b10 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn -PKG_VERSION:=2.6.5 +PKG_VERSION:=2.6.6 PKG_RELEASE:=1 PKG_SOURCE_URL:=\ https://build.openvpn.net/downloads/releases/ \ https://swupdate.openvpn.net/community/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=e34efdb9a3789a760cfc91d57349dfb1e31da169c98c06cb490c6a8a015638e2 +PKG_HASH:=3b074f392818b31aa529b84f76e8b5e4ad03fca764924f46d906bceaaf421034 PKG_MAINTAINER:=Magnus Kroken @@ -36,7 +36,8 @@ define Package/openvpn/Default URL:=http://openvpn.net SUBMENU:=VPN MENU:=1 - DEPENDS:=+kmod-tun +libcap-ng +OPENVPN_$(1)_ENABLE_LZO:liblzo +OPENVPN_$(1)_ENABLE_LZ4:liblz4 +OPENVPN_$(1)_ENABLE_IPROUTE2:ip +OPENVPN_$(1)_ENABLE_DCO:libnl-genl $(3) + DEPENDS:=+kmod-tun +libcap-ng +OPENVPN_$(1)_ENABLE_LZO:liblzo +OPENVPN_$(1)_ENABLE_LZ4:liblz4 +OPENVPN_$(1)_ENABLE_IPROUTE2:ip \ + +OPENVPN_$(1)_ENABLE_DCO:libnl-genl +OPENVPN_$(1)_ENABLE_DCO:kmod-ovpn-dco-v2 $(3) VARIANT:=$(1) PROVIDES:=openvpn openvpn-crypto endef diff --git a/net/openvpn/patches/101-Fix-EVP_PKEY_CTX_-compilation-with-wolfSSL.patch b/net/openvpn/patches/101-Fix-EVP_PKEY_CTX_-compilation-with-wolfSSL.patch index 81c09c1e8..0a45ea49e 100644 --- a/net/openvpn/patches/101-Fix-EVP_PKEY_CTX_-compilation-with-wolfSSL.patch +++ b/net/openvpn/patches/101-Fix-EVP_PKEY_CTX_-compilation-with-wolfSSL.patch @@ -9,7 +9,7 @@ #include #endif #if OPENSSL_VERSION_NUMBER >= 0x30000000L -@@ -1419,7 +1419,7 @@ engine_load_key(const char *file, SSL_CT +@@ -1436,7 +1436,7 @@ engine_load_key(const char *file, SSL_CT #endif /* if HAVE_OPENSSL_ENGINE */ } From b95e1c56e7cfb5368567b74febefe8ccbdc86c10 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Sun, 27 Aug 2023 12:15:06 +0200 Subject: [PATCH 02/32] libssh: compile against MbedTLS instead of OpenSSL Since 2017 libssh supports to be compiled against libmbedtls instead of libopessl, OpenWrt ships mbedtls by default, while depending on OpenSSL increase image size by almost 1.5MB unnecessarily. Signed-off-by: Gioacchino Mazzurco --- libs/libssh/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/libssh/Makefile b/libs/libssh/Makefile index d2b1e7d94..7cd1bd6b6 100644 --- a/libs/libssh/Makefile +++ b/libs/libssh/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libssh PKG_VERSION:=0.10.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.libssh.org/files/0.10/ @@ -32,7 +32,7 @@ define Package/libssh CATEGORY:=Libraries URL:=$(PKG_SOURCE_URL) TITLE:=SSH library - DEPENDS:=+libpthread +librt +zlib +libopenssl + DEPENDS:=+libpthread +librt +zlib +libmbedtls endef define Package/libssh/description @@ -46,6 +46,7 @@ CMAKE_OPTIONS += \ -DHAVE_TERMIOS_H=1 \ -DWITH_EXAMPLES:BOOL=OFF \ -DWITH_GCRYPT:BOOL=OFF \ + -DWITH_MBEDTLS:BOOL=ON \ -DWITH_GSSAPI:BOOL=OFF \ -DWITH_LIBZ:BOOL=ON \ -DWITH_NACL:BOOL=OFF \ From 02f416cb8c1a98c2e495d4e69f2206d53a1618b0 Mon Sep 17 00:00:00 2001 From: John Audia Date: Tue, 29 Aug 2023 12:45:27 -0400 Subject: [PATCH 03/32] ncdu: update to 1.18.1 Upstream bump Build system: x86_64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia --- utils/ncdu/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/ncdu/Makefile b/utils/ncdu/Makefile index c24566b51..539288671 100644 --- a/utils/ncdu/Makefile +++ b/utils/ncdu/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncdu -PKG_VERSION:=1.18 +PKG_VERSION:=1.18.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://dev.yorhel.nl/download -PKG_HASH:=3c37a1a96580c9c5d2cc352dc3c5eef0d909158c05f1cc29db4712544c8b9f95 +PKG_HASH:=7c0fa1eb29d85aaed4ba174164bdbb8f011b5c390d017c57d668fc7231332405 PKG_MAINTAINER:=Charles E. Lehner PKG_LICENSE:=MIT From 14bb23f930f1604a2b7ed48722835b5a20f96cdd Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Mon, 4 Sep 2023 11:08:43 +0200 Subject: [PATCH 04/32] treewide: take maintainership from Karel Both of us were working for Turris and using these devices on daily basis. A few of these packages are still required and used by Turris. It would be great if Turris people will take maintainership of these packages, but if they decide not to, I can step in and take them. Since Karel switched from using OpenWrt to NixOS and hopefully, I didn't reveal some secret here, let's take maintainership of his packages. Signed-off-by: Josef Schlehofer --- lang/python/python-appdirs/Makefile | 2 +- lang/python/python-click-log/Makefile | 2 +- lang/python/python-contextlib2/Makefile | 2 +- lang/python/python-decorator/Makefile | 2 +- lang/python/python-influxdb/Makefile | 2 +- lang/python/python-intelhex/Makefile | 2 +- lang/python/python-jsonpath-ng/Makefile | 2 +- lang/python/python-schema/Makefile | 2 +- utils/bigclown/bigclown-control-tool/Makefile | 2 +- utils/bigclown/bigclown-firmware-tool/Makefile | 2 +- utils/bigclown/bigclown-gateway/Makefile | 2 +- utils/bigclown/bigclown-mqtt2influxdb/Makefile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lang/python/python-appdirs/Makefile b/lang/python/python-appdirs/Makefile index cf8d67018..a17bb51ac 100644 --- a/lang/python/python-appdirs/Makefile +++ b/lang/python/python-appdirs/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-appdirs PKG_VERSION:=1.4.4 PKG_RELEASE:=1 -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PYPI_NAME:=appdirs PKG_HASH:=7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41 diff --git a/lang/python/python-click-log/Makefile b/lang/python/python-click-log/Makefile index 01f6c0e82..4ad7c125f 100644 --- a/lang/python/python-click-log/Makefile +++ b/lang/python/python-click-log/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-click-log PKG_VERSION:=0.4.0 PKG_RELEASE:=1 -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PYPI_NAME:=click-log PKG_HASH:=3970f8570ac54491237bcdb3d8ab5e3eef6c057df29f8c3d1151a51a9c23b975 diff --git a/lang/python/python-contextlib2/Makefile b/lang/python/python-contextlib2/Makefile index dcbed11c2..499ef00e8 100644 --- a/lang/python/python-contextlib2/Makefile +++ b/lang/python/python-contextlib2/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:=1 PYPI_NAME:=contextlib2 PKG_HASH:=ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869 -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PKG_LICENSE:=PSF-2.0 Apache-2.0 PKG_LICENSE_FILES:=LICENSE.txt diff --git a/lang/python/python-decorator/Makefile b/lang/python/python-decorator/Makefile index 27ae1a8c2..de2a49a18 100644 --- a/lang/python/python-decorator/Makefile +++ b/lang/python/python-decorator/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-decorator PKG_VERSION:=4.4.2 PKG_RELEASE:=1 -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PKG_CPE_ID:=cpe:/a:python:decorator PYPI_NAME:=decorator diff --git a/lang/python/python-influxdb/Makefile b/lang/python/python-influxdb/Makefile index 881ce77de..a71d9fd47 100644 --- a/lang/python/python-influxdb/Makefile +++ b/lang/python/python-influxdb/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-influxdb PKG_VERSION:=5.3.1 PKG_RELEASE:=1 -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PYPI_NAME:=influxdb PKG_HASH:=46f85e7b04ee4b3dee894672be6a295c94709003a7ddea8820deec2ac4d8b27a diff --git a/lang/python/python-intelhex/Makefile b/lang/python/python-intelhex/Makefile index 19fc2ac06..40c38426c 100644 --- a/lang/python/python-intelhex/Makefile +++ b/lang/python/python-intelhex/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:=1 PYPI_NAME:=intelhex PKG_HASH:=892b7361a719f4945237da8ccf754e9513db32f5628852785aea108dcd250093 -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.txt diff --git a/lang/python/python-jsonpath-ng/Makefile b/lang/python/python-jsonpath-ng/Makefile index 8214743e5..e3b0669bc 100644 --- a/lang/python/python-jsonpath-ng/Makefile +++ b/lang/python/python-jsonpath-ng/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-jsonpath-ng PKG_VERSION:=1.5.3 PKG_RELEASE:=1 -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PYPI_NAME:=jsonpath-ng PKG_HASH:=a273b182a82c1256daab86a313b937059261b5c5f8c4fa3fc38b882b344dd567 diff --git a/lang/python/python-schema/Makefile b/lang/python/python-schema/Makefile index fd1bb5860..537a32fbc 100644 --- a/lang/python/python-schema/Makefile +++ b/lang/python/python-schema/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-schema PKG_VERSION:=0.7.5 PKG_RELEASE:=1 -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PYPI_NAME:=schema PKG_HASH:=f06717112c61895cabc4707752b88716e8420a8819d71404501e114f91043197 diff --git a/utils/bigclown/bigclown-control-tool/Makefile b/utils/bigclown/bigclown-control-tool/Makefile index 84958d4a8..4aaa6febb 100644 --- a/utils/bigclown/bigclown-control-tool/Makefile +++ b/utils/bigclown/bigclown-control-tool/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:=3 PYPI_NAME:=bch PKG_HASH:=4cd73b92757fce7275a4744baed411c867af2e671c521b90d6690b2320851d58 -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/utils/bigclown/bigclown-firmware-tool/Makefile b/utils/bigclown/bigclown-firmware-tool/Makefile index 6aa5fff88..7c15901a8 100644 --- a/utils/bigclown/bigclown-firmware-tool/Makefile +++ b/utils/bigclown/bigclown-firmware-tool/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:=1 PYPI_NAME:=bcf PKG_HASH:=8ad897586d02433d01a58b4978516621bea388cd230640eb0b8f8f9e40f10e6c -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/utils/bigclown/bigclown-gateway/Makefile b/utils/bigclown/bigclown-gateway/Makefile index 5984162f3..6adc7c414 100644 --- a/utils/bigclown/bigclown-gateway/Makefile +++ b/utils/bigclown/bigclown-gateway/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:=3 PYPI_NAME:=bcg PKG_HASH:=ce7f27f372551c0beb3f8929af2d779417d9dcd0feaa2fa2dc49e87b1416c536 -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/utils/bigclown/bigclown-mqtt2influxdb/Makefile b/utils/bigclown/bigclown-mqtt2influxdb/Makefile index a8097e2cb..89b5dca65 100644 --- a/utils/bigclown/bigclown-mqtt2influxdb/Makefile +++ b/utils/bigclown/bigclown-mqtt2influxdb/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:=1 PYPI_NAME:=mqtt2influxdb PKG_HASH:=9fd98d2239c0b9a2482db8e55e3e5a310c5b644aa7d42c57d35ed775adb0101a -PKG_MAINTAINER:=Karel Kočí +PKG_MAINTAINER:=Josef Schlehofer   PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From ba17298db547fb0771241f9faacf785747b910fa Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 03:38:58 +0800 Subject: [PATCH 05/32] python-build: Update to 1.0.0 Signed-off-by: Jeffery To --- lang/python/python-build/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/python/python-build/Makefile b/lang/python/python-build/Makefile index e93025a63..39a35565a 100644 --- a/lang/python/python-build/Makefile +++ b/lang/python/python-build/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-build -PKG_VERSION:=0.10.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_RELEASE:=1 PYPI_NAME:=build -PKG_HASH:=d5b71264afdb5951d6704482aac78de887c80691c52b88a9ad195983ca2c9269 +PKG_HASH:=49a60f212df4d9925727c2118e1cbe3abf30b393eff7d0e7287d2170eb36844d PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE From cb1070612b6da4647b9f7646fbb4427ddc5c2fb0 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Mon, 4 Sep 2023 22:25:12 +0200 Subject: [PATCH 06/32] php8: update to 8.2.10 Signed-off-by: Michael Heimpold --- lang/php8/Makefile | 4 ++-- lang/php8/patches/0025-php-5.4.9-fixheader.patch | 2 +- lang/php8/patches/1004-disable-phar-command.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/php8/Makefile b/lang/php8/Makefile index 20df0265d..f1977ee48 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=8.2.9 +PKG_VERSION:=8.2.10 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_HASH:=1e6cb77f997613864ab3127fbfc6a8c7fdaa89a95e8ed6167617b913b4de4765 +PKG_HASH:=561dc4acd5386e47f25be76f2c8df6ae854756469159248313bcf276e282fbb3 PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 diff --git a/lang/php8/patches/0025-php-5.4.9-fixheader.patch b/lang/php8/patches/0025-php-5.4.9-fixheader.patch index a3fddd5e6..2929c2222 100644 --- a/lang/php8/patches/0025-php-5.4.9-fixheader.patch +++ b/lang/php8/patches/0025-php-5.4.9-fixheader.patch @@ -9,7 +9,7 @@ Make generated php_config.h constant across rebuilds. --- a/configure.ac +++ b/configure.ac -@@ -1453,7 +1453,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) +@@ -1455,7 +1455,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" diff --git a/lang/php8/patches/1004-disable-phar-command.patch b/lang/php8/patches/1004-disable-phar-command.patch index fede0b473..f6b3a10e3 100644 --- a/lang/php8/patches/1004-disable-phar-command.patch +++ b/lang/php8/patches/1004-disable-phar-command.patch @@ -11,7 +11,7 @@ --- a/configure.ac +++ b/configure.ac -@@ -1636,13 +1636,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" +@@ -1638,13 +1638,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" From 60315a663884b9cf76f787eca10714bfc085335e Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 05:29:19 +0800 Subject: [PATCH 07/32] python-yaml: Update to 6.0.1 Signed-off-by: Jeffery To --- lang/python/python-yaml/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/python/python-yaml/Makefile b/lang/python/python-yaml/Makefile index 26326d660..c7eafc98c 100644 --- a/lang/python/python-yaml/Makefile +++ b/lang/python/python-yaml/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-yaml -PKG_VERSION:=6.0 -PKG_RELEASE:=4 +PKG_VERSION:=6.0.1 +PKG_RELEASE:=1 PYPI_NAME:=PyYAML -PKG_HASH:=68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2 +PKG_HASH:=bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43 PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT @@ -29,7 +29,7 @@ define Package/python3-yaml SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=YAML parser and emitter for Python + TITLE:=YAML parser and emitter URL:=https://github.com/yaml/pyyaml DEPENDS:=+libyaml +python3-light endef From 8957d34d09eac268815ba8abc8ec5bcb1cd0f1f4 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 05:33:35 +0800 Subject: [PATCH 08/32] python-zeroconf: Update to 0.97.0, update list of dependencies The package changed to the poetry-core build backend (and also requiring python-cython/host). Signed-off-by: Jeffery To --- lang/python/python-zeroconf/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lang/python/python-zeroconf/Makefile b/lang/python/python-zeroconf/Makefile index 9b3e220c0..eaa7334c4 100644 --- a/lang/python/python-zeroconf/Makefile +++ b/lang/python/python-zeroconf/Makefile @@ -8,16 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-zeroconf -PKG_VERSION:=0.38.1 +PKG_VERSION:=0.97.0 PKG_RELEASE:=1 PYPI_NAME:=zeroconf -PKG_HASH:=10c501b25d8881b656e56c34674d98fe6bc752240a572e74f918bc849c93ba9c +PKG_HASH:=9a06cd21182250100df6c4f4e9de2a47a0ea927c7d5a0446035bb3dfcc17a647 PKG_MAINTAINER:=Josef Schlehofer -PKG_LICENSE:=Apache-2.0 +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING +PKG_BUILD_DEPENDS:=python-cython/host python-poetry-core/host + include ../pypi.mk include $(INCLUDE_DIR)/package.mk include ../python3-package.mk @@ -27,9 +29,10 @@ define Package/python3-zeroconf SECTION:=lang CATEGORY:=Languages TITLE:=Multicast DNS Service Discovery Library - URL:=https://github.com/jstasiak/python-zeroconf + URL:=https://github.com/python-zeroconf/python-zeroconf DEPENDS:= \ +python3-light \ + +python3-asyncio \ +python3-logging \ +python3-ifaddr endef From 202140aeff26f5f61ff8ae0016093e857a55b50d Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 05:42:13 +0800 Subject: [PATCH 09/32] python-zipp: Update to 3.16.2, update list of dependencies Signed-off-by: Jeffery To --- lang/python/python-zipp/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/python/python-zipp/Makefile b/lang/python/python-zipp/Makefile index 3d48b31c3..77a6d0d9c 100644 --- a/lang/python/python-zipp/Makefile +++ b/lang/python/python-zipp/Makefile @@ -1,11 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-zipp -PKG_VERSION:=3.4.1 -PKG_RELEASE:=2 +PKG_VERSION:=3.16.2 +PKG_RELEASE:=1 PYPI_NAME:=zipp -PKG_HASH:=3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76 +PKG_HASH:=ebc15946aa78bd63458992fc81ec3b6f7b1e92d51c35e6de1c3804e73b799147 PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=MIT @@ -23,7 +23,7 @@ define Package/python3-zipp SUBMENU:=Python TITLE:=Zipfile object wrapper URL:=https://github.com/jaraco/zipp - DEPENDS:=+python3-light + DEPENDS:=+python3-light +python3-urllib endef define Package/python3-zipp/description From fdff92f0855d40d65a77d47e0e0db8e23f75a1f3 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 05:48:07 +0800 Subject: [PATCH 10/32] ruamel-yaml: Update to 0.17.32, rename source package This renames the source package to python-ruamel-yaml to match other Python packages. Signed-off-by: Jeffery To --- .../{ruamel-yaml => python-ruamel-yaml}/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) rename lang/python/{ruamel-yaml => python-ruamel-yaml}/Makefile (69%) diff --git a/lang/python/ruamel-yaml/Makefile b/lang/python/python-ruamel-yaml/Makefile similarity index 69% rename from lang/python/ruamel-yaml/Makefile rename to lang/python/python-ruamel-yaml/Makefile index fd8f17a7f..a63b1642b 100644 --- a/lang/python/ruamel-yaml/Makefile +++ b/lang/python/python-ruamel-yaml/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=ruamel-yaml -PKG_VERSION:=0.17.17 +PKG_NAME:=python-ruamel-yaml +PKG_VERSION:=0.17.32 PKG_RELEASE:=1 PYPI_NAME:=ruamel.yaml -PKG_HASH:=9751de4cbb57d4bfbf8fc394e125ed4a2f170fbff3dc3d78abf50be85924f8be +PKG_HASH:=ec939063761914e14542972a5cba6d33c23b0859ab6342f61cf070cfc600efc2 PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT @@ -26,14 +26,15 @@ define Package/python3-ruamel-yaml SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=YAML 1.2 loader/dumper package for Python - URL:=https://bitbucket.org/ruamel/yaml + TITLE:=YAML 1.2 loader/dumper + URL:=https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree DEPENDS:= \ +python3-light endef define Package/python3-ruamel-yaml/description -ruamel-yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order +ruamel-yaml is a YAML parser/emitter that supports roundtrip +preservation of comments, seq/map flow style, and map key order endef $(eval $(call Py3Package,python3-ruamel-yaml)) From 4872c325808357c0cb81a4367d053cc5b5468028 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 05:56:22 +0800 Subject: [PATCH 11/32] xmltodict: Update to 0.13.0, rename source package This renames the source package to python-xmltodict to match other Python packages. This also updates the list of dependencies. Signed-off-by: Jeffery To --- .../{xmltodict => python-xmltodict}/Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) rename lang/python/{xmltodict => python-xmltodict}/Makefile (75%) diff --git a/lang/python/xmltodict/Makefile b/lang/python/python-xmltodict/Makefile similarity index 75% rename from lang/python/xmltodict/Makefile rename to lang/python/python-xmltodict/Makefile index 44cf4cd50..87b841f51 100644 --- a/lang/python/xmltodict/Makefile +++ b/lang/python/python-xmltodict/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-xmltodict -PKG_VERSION:=0.12.0 -PKG_RELEASE:=2 +PKG_VERSION:=0.13.0 +PKG_RELEASE:=1 PYPI_NAME:=xmltodict -PKG_HASH:=50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21 +PKG_HASH:=341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56 PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT @@ -28,14 +28,12 @@ define Package/python3-xmltodict SUBMENU:=Python TITLE:=Work with XML like JSON URL:=https://github.com/martinblech/xmltodict - DEPENDS:= \ - +python3-light \ - +python3-xml \ - +python3-urllib + DEPENDS:=+python3-light +python3-xml endef define Package/python3-xmltodict/description - xmltodict is a Python module that makes working with XML feel like you are working with JSON. +xmltodict is a Python module that makes working with XML feel like you +are working with JSON. endef $(eval $(call Py3Package,python3-xmltodict)) From 03f1f4b9bb426670ddf4b870ed4dfbe354e19fcf Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 06:02:25 +0800 Subject: [PATCH 12/32] python-cryptodome: Update to 3.18.0, refresh patches This also updates the list of dependencies. Signed-off-by: Jeffery To --- lang/python/python-cryptodome/Makefile | 14 +++++++------- .../patches/001-fix-libgmp-loading.patch | 6 +++--- .../python-cryptodome/patches/002-omit-tests.patch | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lang/python/python-cryptodome/Makefile b/lang/python/python-cryptodome/Makefile index 0f256628e..3ce76c2eb 100644 --- a/lang/python/python-cryptodome/Makefile +++ b/lang/python/python-cryptodome/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-cryptodome -PKG_VERSION:=3.9.7 -PKG_RELEASE:=4 +PKG_VERSION:=3.18.0 +PKG_RELEASE:=1 PYPI_NAME:=pycryptodome -PKG_HASH:=f1add21b6d179179b3c177c33d18a2186a09cc0d3af41ff5ed3f377360b869f2 +PKG_HASH:=c9adee653fc882d98956e33ca2c1fb582e23a8af7ac82fee75bd6113c55a0413 -PKG_LICENSE:=BSD-2-Clause +PKG_LICENSE:=Public-Domain BSD-2-Clause PKG_LICENSE_FILES:=LICENSE.rst PKG_MAINTAINER:=Richard Yu PKG_CPE_ID:=cpe:/a:pycryptodome:pycryptodome @@ -24,12 +24,12 @@ PYTHON3_PKG_BUILD_VARS:= \ CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)" define Package/python3-cryptodome - SECTION:=lang-python + SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=A self-contained cryptographic library for Python + TITLE:=Self-contained cryptographic library URL:=https://www.pycryptodome.org/ - DEPENDS:=+libgmp +python3 + DEPENDS:=+libgmp +python3-light +python3-cffi PROVIDES:=python3-crypto endef diff --git a/lang/python/python-cryptodome/patches/001-fix-libgmp-loading.patch b/lang/python/python-cryptodome/patches/001-fix-libgmp-loading.patch index d7591100c..a0d9674b3 100644 --- a/lang/python/python-cryptodome/patches/001-fix-libgmp-loading.patch +++ b/lang/python/python-cryptodome/patches/001-fix-libgmp-loading.patch @@ -1,8 +1,8 @@ --- a/lib/Crypto/Math/_IntegerGMP.py +++ b/lib/Crypto/Math/_IntegerGMP.py -@@ -92,7 +92,7 @@ gmp_defs = """typedef unsigned long UNIX - int __gmpz_divisible_ui_p (const mpz_t n, UNIX_ULONG d); - """ +@@ -97,7 +97,7 @@ gmp_defs = """typedef unsigned long UNIX + if sys.platform == "win32": + raise ImportError("Not using GMP on Windows") -lib = load_lib("gmp", gmp_defs) +lib = load_lib("libgmp.so.10", gmp_defs) diff --git a/lang/python/python-cryptodome/patches/002-omit-tests.patch b/lang/python/python-cryptodome/patches/002-omit-tests.patch index 37a922c54..43e2cc3d8 100644 --- a/lang/python/python-cryptodome/patches/002-omit-tests.patch +++ b/lang/python/python-cryptodome/patches/002-omit-tests.patch @@ -1,7 +1,7 @@ --- a/setup.py +++ b/setup.py -@@ -301,6 +301,9 @@ package_data = { - ], +@@ -276,6 +276,9 @@ package_data = { + "Crypto.Util" : [ "*.pyi" ], } +packages = [i for i in packages if not i.startswith('Crypto.SelfTest')] From a1b3595550ebc6db9f21bce7a1a958bf7accedbe Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 06:09:42 +0800 Subject: [PATCH 13/32] python-cryptodomex: Update to 3.18.0, refresh patches This also updates the list of dependencies. Signed-off-by: Jeffery To --- lang/python/python-cryptodomex/Makefile | 14 +++++++------- .../patches/001-fix-libgmp-loading.patch | 2 +- .../patches/002-omit-tests.patch | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lang/python/python-cryptodomex/Makefile b/lang/python/python-cryptodomex/Makefile index 9847db583..a9265950c 100644 --- a/lang/python/python-cryptodomex/Makefile +++ b/lang/python/python-cryptodomex/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-cryptodomex -PKG_VERSION:=3.10.1 -PKG_RELEASE:=2 +PKG_VERSION:=3.18.0 +PKG_RELEASE:=1 PYPI_NAME:=pycryptodomex -PKG_HASH:=541cd3e3e252fb19a7b48f420b798b53483302b7fe4d9954c947605d0a263d62 +PKG_HASH:=3e3ecb5fe979e7c1bb0027e518340acf7ee60415d79295e5251d13c68dde576e -PKG_LICENSE:=BSD-2-Clause +PKG_LICENSE:=Public-Domain BSD-2-Clause PKG_LICENSE_FILES:=LICENSE.rst PKG_MAINTAINER:=Richard Yu @@ -23,12 +23,12 @@ PYTHON3_PKG_BUILD_VARS:= \ CONFIG_BIG_ENDIAN="$(CONFIG_BIG_ENDIAN)" define Package/python3-cryptodomex - SECTION:=lang-python + SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=A self-contained cryptographic library for Python + TITLE:=Self-contained cryptographic library URL:=https://www.pycryptodome.org/ - DEPENDS:=+libgmp +python3 + DEPENDS:=+libgmp +python3-light +python3-cffi endef define Package/python3-cryptodomex/description diff --git a/lang/python/python-cryptodomex/patches/001-fix-libgmp-loading.patch b/lang/python/python-cryptodomex/patches/001-fix-libgmp-loading.patch index da4ca52b4..305ef6964 100644 --- a/lang/python/python-cryptodomex/patches/001-fix-libgmp-loading.patch +++ b/lang/python/python-cryptodomex/patches/001-fix-libgmp-loading.patch @@ -1,6 +1,6 @@ --- a/lib/Cryptodome/Math/_IntegerGMP.py +++ b/lib/Cryptodome/Math/_IntegerGMP.py -@@ -95,7 +95,7 @@ gmp_defs = """typedef unsigned long UNIX +@@ -97,7 +97,7 @@ gmp_defs = """typedef unsigned long UNIX if sys.platform == "win32": raise ImportError("Not using GMP on Windows") diff --git a/lang/python/python-cryptodomex/patches/002-omit-tests.patch b/lang/python/python-cryptodomex/patches/002-omit-tests.patch index 457e785ca..43e2cc3d8 100644 --- a/lang/python/python-cryptodomex/patches/002-omit-tests.patch +++ b/lang/python/python-cryptodomex/patches/002-omit-tests.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -275,6 +275,9 @@ package_data = { +@@ -276,6 +276,9 @@ package_data = { "Crypto.Util" : [ "*.pyi" ], } From 4f3a0fe6232f7746e80c68b5d5f51797c6984896 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 06:13:50 +0800 Subject: [PATCH 14/32] python-pyserial: Update to 3.5, update list of dependencies Signed-off-by: Jeffery To --- lang/python/python-pyserial/Makefile | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lang/python/python-pyserial/Makefile b/lang/python/python-pyserial/Makefile index e74cc880e..e6c6b401e 100644 --- a/lang/python/python-pyserial/Makefile +++ b/lang/python/python-pyserial/Makefile @@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pyserial -PKG_VERSION:=3.4 -PKG_RELEASE:=2 +PKG_VERSION:=3.5 +PKG_RELEASE:=1 PYPI_NAME:=pyserial -PKG_HASH:=6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627 +PKG_HASH:=3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb -PKG_LICENSE:=BSD +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=LICENSE.txt PKG_MAINTAINER:=Micke Prag include ../pypi.mk @@ -22,19 +23,19 @@ include $(INCLUDE_DIR)/package.mk include ../python3-package.mk define Package/python3-pyserial - SECTION:=lang-python + SECTION:=lang CATEGORY:=Languages SUBMENU:=Python - TITLE:=python3-pyserial + TITLE:=Serial Port Extension URL:=https://github.com/pyserial/pyserial - DEPENDS:=+python3-light + DEPENDS:=+python3-light +python3-logging +python3-urllib endef define Package/python3-pyserial/description -This module encapsulates the access for the serial port. It provides backends -for Python running on Windows, OSX, Linux, BSD (possibly any POSIX compliant -system) and IronPython. The module named "serial" automatically selects the -appropriate backend. +This module encapsulates the access for the serial port. It provides +backends for Python running on Windows, OSX, Linux, BSD (possibly any +POSIX compliant system) and IronPython. The module named "serial" +automatically selects the appropriate backend. endef $(eval $(call Py3Package,python3-pyserial)) From 8e5ca3fc3e78d92a2e9cfa1ac1696f5151351816 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 06:16:35 +0800 Subject: [PATCH 15/32] python-crcmod: Fix package section Signed-off-by: Jeffery To --- lang/python/python-crcmod/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/python/python-crcmod/Makefile b/lang/python/python-crcmod/Makefile index de59e612d..6d4ded9cf 100644 --- a/lang/python/python-crcmod/Makefile +++ b/lang/python/python-crcmod/Makefile @@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk include ../python3-package.mk define Package/python3-crcmod - SECTION:=lang-python + SECTION:=lang CATEGORY:=Languages SUBMENU:=Python TITLE:=python3-crcmod From 03ef02f0f45b2999625de08d0f1a274418076bd6 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 4 Sep 2023 15:02:14 +0800 Subject: [PATCH 16/32] slang2: Avoid building dependencies unless necessary This also hides the module packages in menuconfig unless the libslang2 package is selected. Signed-off-by: Jeffery To --- libs/slang2/Makefile | 67 ++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/libs/slang2/Makefile b/libs/slang2/Makefile index ab72eaf20..dcd5bd9eb 100644 --- a/libs/slang2/Makefile +++ b/libs/slang2/Makefile @@ -23,7 +23,12 @@ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Jeffery To PKG_BUILD_PARALLEL:=0 -PKG_CONFIG_DEPENDS:=CONFIG_BUILD_NLS +PKG_CONFIG_DEPENDS:= \ + CONFIG_BUILD_NLS \ + CONFIG_PACKAGE_libslang2-mod-onig \ + CONFIG_PACKAGE_libslang2-mod-pcre \ + CONFIG_PACKAGE_libslang2-mod-png \ + CONFIG_PACKAGE_libslang2-mod-zlib SLANG_MODULES:= base64 chksum csv fcntl fork histogram iconv json onig pcre \ png rand select slsmg socket stats sysconf termios varray zlib @@ -39,9 +44,10 @@ define Package/libslang2/Default endef define Package/libslang2/Default/description - Multi-platform programmer's library providing facilities for interactive - applications. Includes such things as display/screen management, - keyboard input, keymaps, etc. Includes the embeddable S-Lang interpreter. +Multi-platform programmer's library providing facilities for interactive +applications. Includes such things as display/screen management, +keyboard input, keymaps, etc. Includes the embeddable S-Lang +interpreter. endef define Package/libslang2 @@ -56,43 +62,48 @@ endef define Package/libslang2-modules $(call Package/libslang2/Default) TITLE+= (all modules) - DEPENDS:=$(foreach mod,$(SLANG_MODULES),+libslang2-mod-$(mod)) + DEPENDS:=@PACKAGE_libslang2 $(foreach mod,$(SLANG_MODULES),+libslang2-mod-$(mod)) endef define Package/libslang2-modules/description $(call Package/libslang2/Default/description) - This installs all of S-Lang's bundled modules. +This package installs all of S-Lang's bundled modules. +endef + +define Package/libslang2-mod/Default +$(call Package/libslang2/Default) + DEPENDS:=@PACKAGE_libslang2 endef define Package/libslang2-mod-iconv -$(call Package/libslang2/Default) +$(call Package/libslang2-mod/Default) TITLE+= (iconv module) - DEPENDS:=$(ICONV_DEPENDS) + DEPENDS+=$(ICONV_DEPENDS) endef define Package/libslang2-mod-onig -$(call Package/libslang2/Default) +$(call Package/libslang2-mod/Default) TITLE+= (onig module) - DEPENDS:=+oniguruma + DEPENDS+=+PACKAGE_libslang2-mod-onig:oniguruma endef define Package/libslang2-mod-pcre -$(call Package/libslang2/Default) +$(call Package/libslang2-mod/Default) TITLE+= (pcre module) - DEPENDS:=+libpcre + DEPENDS+=+PACKAGE_libslang2-mod-pcre:libpcre endef define Package/libslang2-mod-png -$(call Package/libslang2/Default) +$(call Package/libslang2-mod/Default) TITLE+= (png module) - DEPENDS:=+libpng + DEPENDS+=+PACKAGE_libslang2-mod-png:libpng endef define Package/libslang2-mod-zlib -$(call Package/libslang2/Default) +$(call Package/libslang2-mod/Default) TITLE+= (zlib module) - DEPENDS:=+zlib + DEPENDS+=+PACKAGE_libslang2-mod-zlib:zlib endef define Package/slsh @@ -104,8 +115,8 @@ define Package/slsh endef define Package/slsh/description - This is a shell which is mostly just a wrapper around the S-Lang Interpreter, - which is part of the S-Lang Library. +This is a shell which is mostly just a wrapper around the S-Lang +Interpreter, which is part of the S-Lang Library. endef TARGET_CFLAGS+= $(FPIC) @@ -113,14 +124,14 @@ TARGET_CFLAGS+= $(FPIC) CONFIGURE_ARGS+= \ --enable-largefile \ --enable-warnings \ - --with-terminfo=default \ --with-readline=slang \ - $(if $(CONFIG_BUILD_NLS),--with-iconv=$(ICONV_PREFIX)) \ - --with-onig="$(STAGING_DIR)/usr" \ - --with-pcre="$(STAGING_DIR)/usr" \ - --with-png="$(STAGING_DIR)/usr" \ - --with-z="$(STAGING_DIR)/usr" \ - --without-x + --with-terminfo=default \ + --without-x \ + $(if $(CONFIG_BUILD_NLS),--with-iconv="$(ICONV_PREFIX)",--without-iconv) \ + $(if $(CONFIG_PACKAGE_libslang2-mod-onig),--with-onig="$(STAGING_DIR)/usr",--without-onig) \ + $(if $(CONFIG_PACKAGE_libslang2-mod-pcre),--with-pcre="$(STAGING_DIR)/usr",--without-pcre) \ + $(if $(CONFIG_PACKAGE_libslang2-mod-png),--with-png="$(STAGING_DIR)/usr",--without-png) \ + $(if $(CONFIG_PACKAGE_libslang2-mod-zlib),--with-z="$(STAGING_DIR)/usr",--without-z) define Build/Compile $(call Build/Compile/Default,) @@ -165,15 +176,15 @@ endef define BuildModule ifndef Package/libslang2-mod-$(1) define Package/libslang2-mod-$(1) - $$(call Package/libslang2/Default) + $$(call Package/libslang2-mod/Default) TITLE+= ($(1) module) endef endif define Package/libslang2-mod-$(1)/description - $$(call Package/libslang2/Default/description) +$$(call Package/libslang2/Default/description) - This contains the $(1) module. +This package contains the $(1) module. endef define Package/libslang2-mod-$(1)/install From 106304c988fddf0b66220a7ca04bbf2902719616 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 4 Sep 2023 15:09:36 +0800 Subject: [PATCH 17/32] slang2: Remove pcre module pcre is obsolete and upstream has not yet migrated to pcre2. Signed-off-by: Jeffery To --- libs/slang2/Makefile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libs/slang2/Makefile b/libs/slang2/Makefile index dcd5bd9eb..48a909f16 100644 --- a/libs/slang2/Makefile +++ b/libs/slang2/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=slang PKG_VERSION:=2.3.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.jedsoft.org/releases/slang \ @@ -26,11 +26,10 @@ PKG_BUILD_PARALLEL:=0 PKG_CONFIG_DEPENDS:= \ CONFIG_BUILD_NLS \ CONFIG_PACKAGE_libslang2-mod-onig \ - CONFIG_PACKAGE_libslang2-mod-pcre \ CONFIG_PACKAGE_libslang2-mod-png \ CONFIG_PACKAGE_libslang2-mod-zlib -SLANG_MODULES:= base64 chksum csv fcntl fork histogram iconv json onig pcre \ +SLANG_MODULES:= base64 chksum csv fcntl fork histogram iconv json onig \ png rand select slsmg socket stats sysconf termios varray zlib include $(INCLUDE_DIR)/package.mk @@ -88,12 +87,6 @@ $(call Package/libslang2-mod/Default) DEPENDS+=+PACKAGE_libslang2-mod-onig:oniguruma endef -define Package/libslang2-mod-pcre -$(call Package/libslang2-mod/Default) - TITLE+= (pcre module) - DEPENDS+=+PACKAGE_libslang2-mod-pcre:libpcre -endef - define Package/libslang2-mod-png $(call Package/libslang2-mod/Default) TITLE+= (png module) @@ -126,10 +119,10 @@ CONFIGURE_ARGS+= \ --enable-warnings \ --with-readline=slang \ --with-terminfo=default \ + --without-pcre \ --without-x \ $(if $(CONFIG_BUILD_NLS),--with-iconv="$(ICONV_PREFIX)",--without-iconv) \ $(if $(CONFIG_PACKAGE_libslang2-mod-onig),--with-onig="$(STAGING_DIR)/usr",--without-onig) \ - $(if $(CONFIG_PACKAGE_libslang2-mod-pcre),--with-pcre="$(STAGING_DIR)/usr",--without-pcre) \ $(if $(CONFIG_PACKAGE_libslang2-mod-png),--with-png="$(STAGING_DIR)/usr",--without-png) \ $(if $(CONFIG_PACKAGE_libslang2-mod-zlib),--with-z="$(STAGING_DIR)/usr",--without-z) From e42c8450393a317ab6df39f6e01411722872fd6b Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 11:53:41 +0800 Subject: [PATCH 18/32] python3: Update to 3.11.5, refresh patches Includes fix for CVE-2023-40217 (Bypass TLS handshake on closed sockets). This also: * Remove 027-install-python3-symlink-after-stdlib.patch This was merged upstream in https://github.com/python/cpython/pull/104693. * Remove fix for unnecessary linking with libbsd (60bf01cb606344619e002901646171da1e69c0f9) This was fixed upstream in https://github.com/python/cpython/pull/105236. Signed-off-by: Jeffery To --- lang/python/python3-version.mk | 4 ++-- lang/python/python3/Makefile | 11 +++-------- .../python3/patches/003-do-not-run-compileall.patch | 4 ++-- .../patches/025-choose-python-config-version.patch | 2 +- .../python3/patches/026-openssl-feature-flags.patch | 2 +- .../027-install-python3-symlink-after-stdlib.patch | 11 ----------- lang/python/python3/test.sh | 7 +++++++ 7 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 lang/python/python3/patches/027-install-python3-symlink-after-stdlib.patch create mode 100644 lang/python/python3/test.sh diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk index 25185f44b..4e503fb6e 100644 --- a/lang/python/python3-version.mk +++ b/lang/python/python3-version.mk @@ -8,7 +8,7 @@ # Note: keep in sync with setuptools & pip PYTHON3_VERSION_MAJOR:=3 PYTHON3_VERSION_MINOR:=11 -PYTHON3_VERSION_MICRO:=4 +PYTHON3_VERSION_MICRO:=5 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) @@ -16,4 +16,4 @@ PYTHON3_SETUPTOOLS_PKG_RELEASE:=1 PYTHON3_PIP_PKG_RELEASE:=1 PYTHON3_SETUPTOOLS_VERSION:=65.5.0 -PYTHON3_PIP_VERSION:=23.1.2 +PYTHON3_PIP_VERSION:=23.2.1 diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 0b4eb3159..a54d02704 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -11,15 +11,15 @@ include $(TOPDIR)/rules.mk include ../python3-version.mk PKG_NAME:=python3 -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) -PKG_HASH:=2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6 +PKG_HASH:=85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f PKG_MAINTAINER:=Jeffery To -PKG_LICENSE:=PSF-2.0 +PKG_LICENSE:=Python-2.0.1 0BSD PKG_LICENSE_FILES:=LICENSE Doc/copyright.rst Doc/license.rst Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi_osx/LICENSE Modules/expat/COPYING PKG_CPE_ID:=cpe:/a:python:python @@ -162,11 +162,6 @@ CONFIGURE_VARS += \ ac_cv_file__dev_ptc=no \ ac_cv_file__dev_ptmx=yes -# Do not link with libbsd for flock -# https://github.com/openwrt/packages/issues/21161 -CONFIGURE_VARS += \ - ac_cv_lib_bsd_flock=no - # Disable stdlib modules # Check for a better way in the future: https://github.com/python/cpython/issues/98558 CONFIGURE_VARS += \ diff --git a/lang/python/python3/patches/003-do-not-run-compileall.patch b/lang/python/python3/patches/003-do-not-run-compileall.patch index 9b6bc45a3..9bb10fac7 100644 --- a/lang/python/python3/patches/003-do-not-run-compileall.patch +++ b/lang/python/python3/patches/003-do-not-run-compileall.patch @@ -1,6 +1,6 @@ --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2118,6 +2118,7 @@ libinstall: all $(srcdir)/Modules/xxmodu +@@ -2123,6 +2123,7 @@ libinstall: all $(srcdir)/Modules/xxmodu $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -8,7 +8,7 @@ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -2145,6 +2146,7 @@ libinstall: all $(srcdir)/Modules/xxmodu +@@ -2150,6 +2151,7 @@ libinstall: all $(srcdir)/Modules/xxmodu $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages diff --git a/lang/python/python3/patches/025-choose-python-config-version.patch b/lang/python/python3/patches/025-choose-python-config-version.patch index a8c06a726..aa56d8942 100644 --- a/lang/python/python3/patches/025-choose-python-config-version.patch +++ b/lang/python/python3/patches/025-choose-python-config-version.patch @@ -1,6 +1,6 @@ --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2163,7 +2163,7 @@ python-config: $(srcdir)/Misc/python-con +@@ -2168,7 +2168,7 @@ python-config: $(srcdir)/Misc/python-con @ # On Darwin, always use the python version of the script, the shell @ # version doesn't use the compiler customizations that are provided @ # in python (_osx_support.py). diff --git a/lang/python/python3/patches/026-openssl-feature-flags.patch b/lang/python/python3/patches/026-openssl-feature-flags.patch index 2546048b0..604f41d8e 100644 --- a/lang/python/python3/patches/026-openssl-feature-flags.patch +++ b/lang/python/python3/patches/026-openssl-feature-flags.patch @@ -47,7 +47,7 @@ PY_HASH_ENTRY(NULL, NULL, NULL, 0), }; -@@ -873,11 +889,15 @@ py_evp_fromname(PyObject *module, const +@@ -874,11 +890,15 @@ py_evp_fromname(PyObject *module, const goto exit; } diff --git a/lang/python/python3/patches/027-install-python3-symlink-after-stdlib.patch b/lang/python/python3/patches/027-install-python3-symlink-after-stdlib.patch deleted file mode 100644 index 26241d03e..000000000 --- a/lang/python/python3/patches/027-install-python3-symlink-after-stdlib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1839,7 +1839,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK - $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \ - fi - --bininstall: altbininstall -+bininstall: commoninstall altbininstall - if test ! -d $(DESTDIR)$(LIBPC); then \ - echo "Creating directory $(LIBPC)"; \ - $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \ diff --git a/lang/python/python3/test.sh b/lang/python/python3/test.sh new file mode 100644 index 000000000..b45e65414 --- /dev/null +++ b/lang/python/python3/test.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +case "$1" in +python3|python3-base|python3-light) + python3 --version | grep -Fx "Python $2" + ;; +esac From 1efcdb337434d77fd282f2ee0168145a39f7b9ef Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Thu, 7 Sep 2023 16:06:29 +0200 Subject: [PATCH 19/32] haproxy: update to v2.8.3 - Update haproxy PKG_VERSION and PKG_HASH - See changes: http://git.haproxy.org/?p=haproxy-2.8.git;a=shortlog Signed-off-by: Christian Lachner --- net/haproxy/Makefile | 4 ++-- net/haproxy/get-latest-patches.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index f790564ba..9f57f746b 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.8.2 +PKG_VERSION:=2.8.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.8/src -PKG_HASH:=698d6906d170946a869769964e57816ba3da3adf61ff75e89972b137f4658db0 +PKG_HASH:=9ecc6ffe67a977d1ed279107bbdab790d73ae2a626bc38eee23fa1f6786a759e PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh index b7d1748e9..8f4d9e0af 100755 --- a/net/haproxy/get-latest-patches.sh +++ b/net/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh CLONEURL=https://git.haproxy.org/git/haproxy-2.8.git -BASE_TAG=v2.8.2 +BASE_TAG=v2.8.3 TMP_REPODIR=tmprepo PATCHESDIR=patches From 86bc1fd4d34422edc2732d82fd0ad229a96716d8 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 7 Sep 2023 11:48:04 +0200 Subject: [PATCH 20/32] pdns: update to 4.8.2 Signed-off-by: Peter van Dijk --- net/pdns/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/pdns/Makefile b/net/pdns/Makefile index 110731352..39ac66747 100644 --- a/net/pdns/Makefile +++ b/net/pdns/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pdns -PKG_VERSION:=4.8.1 +PKG_VERSION:=4.8.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ -PKG_HASH:=66dd3ee2654f42b4eb80260f94ecb48e313a81817f58125ce48c14c2d26e309e +PKG_HASH:=3b173fda4c51bb07b5a51d8c599eedd7962a02056b410e3c9d9d69ed97be35b9 PKG_MAINTAINER:=Peter van Dijk PKG_LICENCE:=GPL-2.0-only From 25e4b88083e624abf5510cc266afdb1bc3895d40 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 8 Sep 2023 23:04:33 +0200 Subject: [PATCH 21/32] dbus: drop CMake patches CMake is not being used to build dbus as it does not respect endinaness under CMake and 1.14 branch. So, lets drop the patches as they will not apply to future 1.14 update. Signed-off-by: Robert Marko --- utils/dbus/Makefile | 2 +- utils/dbus/patches/010-cmake-paths.patch | 16 ----------- .../020-cmake-fix-tmp-session-search.patch | 27 ------------------- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 utils/dbus/patches/010-cmake-paths.patch delete mode 100644 utils/dbus/patches/020-cmake-fix-tmp-session-search.patch diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index e7db64deb..872dac582 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dbus PKG_VERSION:=1.13.18 -PKG_RELEASE:=12 +PKG_RELEASE:=13 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus diff --git a/utils/dbus/patches/010-cmake-paths.patch b/utils/dbus/patches/010-cmake-paths.patch deleted file mode 100644 index 36431eb0a..000000000 --- a/utils/dbus/patches/010-cmake-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -510,11 +510,11 @@ if(WIN32) - else(WIN32) - set(DBUS_SESSION_BUS_LISTEN_ADDRESS "unix:tmpdir=${DBUS_SESSION_SOCKET_DIR}" CACHE STRING "session bus default listening address") - set(DBUS_SESSION_BUS_CONNECT_ADDRESS "autolaunch:" CACHE STRING "session bus fallback address for clients") -- set(sysconfdir "") -+ set(sysconfdir "/usr/share") - set(configdir ${sysconfdir}/dbus-1 ) - set(DBUS_SYSTEM_CONFIG_FILE ${configdir}/system.conf) - set(DBUS_SESSION_CONFIG_FILE ${configdir}/session.conf) -- set(DBUS_USER "messagebus") -+ set(DBUS_USER "root") - set(DBUS_TEST_USER "nobody") - # For best security, assume that all non-Windows platforms can do - # credentials-passing. diff --git a/utils/dbus/patches/020-cmake-fix-tmp-session-search.patch b/utils/dbus/patches/020-cmake-fix-tmp-session-search.patch deleted file mode 100644 index 2847b628e..000000000 --- a/utils/dbus/patches/020-cmake-fix-tmp-session-search.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -471,14 +471,16 @@ endif() - - #### Find socket directories - if(UNIX) -- if(NOT $ENV{TMPDIR} STREQUAL "") -- set(DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR}) -- elseif(NOT $ENV{TEMP} STREQUAL "") -- set(DBUS_SESSION_SOCKET_DIR $ENV{TEMP}) -- elseif(NOT $ENV{TMP} STREQUAL "") -- set(DBUS_SESSION_SOCKET_DIR $ENV{TMP}) -- else() -- set(DBUS_SESSION_SOCKET_DIR /tmp) -+ if(NOT DEFINED DBUS_SESSION_SOCKET_DIR) -+ if(NOT $ENV{TMPDIR} STREQUAL "") -+ set(DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR}) -+ elseif(NOT $ENV{TEMP} STREQUAL "") -+ set(DBUS_SESSION_SOCKET_DIR $ENV{TEMP}) -+ elseif(NOT $ENV{TMP} STREQUAL "") -+ set(DBUS_SESSION_SOCKET_DIR $ENV{TMP}) -+ else() -+ set(DBUS_SESSION_SOCKET_DIR /tmp) -+ endif() - endif() - endif() - From ea3482504be76392382c5371b3624e9ddd1dafac Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 8 Sep 2023 23:28:46 +0200 Subject: [PATCH 22/32] dbus: update to 1.14.10 stable Current stable branch for dbus is 1.14 and that is recommended to be used. 1.13 was a development branch and not meant for production use. 1.14.10 is the latest stable, so lets move to it. Signed-off-by: Robert Marko --- utils/dbus/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 872dac582..464352ef9 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dbus -PKG_VERSION:=1.13.18 -PKG_RELEASE:=13 +PKG_VERSION:=1.14.10 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus -PKG_HASH:=8078f5c25e34ab907ce06905d969dc8ef0ccbec367e1e1707c7ecf8460f4254e +PKG_HASH:=ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f PKG_MAINTAINER:= PKG_LICENSE:=AFL-2.1 From 33627698a9af2fc56b1a6628248ec56d8655c4d1 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 8 Sep 2023 23:40:41 +0200 Subject: [PATCH 23/32] dbus: take maintainership of the package Since it seems that this nobody wants to be the maintainer of dbus, I can take the responsibility. I am no dbus expert, but can runtime test it and see if change seems sane. Signed-off-by: Robert Marko --- utils/dbus/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 464352ef9..727a10a4d 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus PKG_HASH:=ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f -PKG_MAINTAINER:= +PKG_MAINTAINER:=Robert Marko PKG_LICENSE:=AFL-2.1 PKG_CPE_ID:=cpe:/a:freedesktop:dbus From 03f70dcfd530560c088f05819a11715286ce45d9 Mon Sep 17 00:00:00 2001 From: Eric Luehrsen Date: Tue, 5 Sep 2023 23:49:41 -0400 Subject: [PATCH 24/32] unbound: update to 1.18.0 Signed-off-by: Eric Luehrsen --- net/unbound/Makefile | 6 +-- net/unbound/patches/010-configure-uname.patch | 2 +- ...0-remove-SSL-unexpected-eof-messages.patch | 37 ------------------- 3 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 net/unbound/patches/200-remove-SSL-unexpected-eof-messages.patch diff --git a/net/unbound/Makefile b/net/unbound/Makefile index 9626c4e29..d0cb41fac 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unbound -PKG_VERSION:=1.17.1 -PKG_RELEASE:=2 +PKG_VERSION:=1.18.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound -PKG_HASH:=ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 +PKG_HASH:=3da95490a85cff6420f26fae0b84a49f5112df1bf1b7fc34f8724f02082cb712 PKG_MAINTAINER:=Eric Luehrsen PKG_LICENSE:=BSD-3-Clause diff --git a/net/unbound/patches/010-configure-uname.patch b/net/unbound/patches/010-configure-uname.patch index aa1075738..f53962fcd 100644 --- a/net/unbound/patches/010-configure-uname.patch +++ b/net/unbound/patches/010-configure-uname.patch @@ -3,7 +3,7 @@ Fix cross compile errors by inserting an environment variable for the target. Use "uname" on host only if "UNAME" variable is empty. --- a/configure.ac +++ b/configure.ac -@@ -819,7 +819,7 @@ if test x_$ub_test_python != x_no; then +@@ -840,7 +840,7 @@ if test x_$ub_test_python != x_no; then fi fi diff --git a/net/unbound/patches/200-remove-SSL-unexpected-eof-messages.patch b/net/unbound/patches/200-remove-SSL-unexpected-eof-messages.patch deleted file mode 100644 index 3f7d62b40..000000000 --- a/net/unbound/patches/200-remove-SSL-unexpected-eof-messages.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/util/net_help.c -+++ b/util/net_help.c -@@ -1005,6 +1005,16 @@ listen_sslctx_setup(void* ctxt) - log_crypto_err("could not set cipher list with SSL_CTX_set_cipher_list"); - } - #endif -+#if defined(SSL_OP_IGNORE_UNEXPECTED_EOF) -+ /* ignore errors when peers do not send the mandatory close_notify -+ * alert on shutdown. -+ * Relevant for openssl >= 3 */ -+ if((SSL_CTX_set_options(ctx, SSL_OP_IGNORE_UNEXPECTED_EOF) & -+ SSL_OP_IGNORE_UNEXPECTED_EOF) != SSL_OP_IGNORE_UNEXPECTED_EOF) { -+ log_crypto_err("could not set SSL_OP_IGNORE_UNEXPECTED_EOF"); -+ return 0; -+ } -+#endif - - if((SSL_CTX_set_options(ctx, SSL_OP_CIPHER_SERVER_PREFERENCE) & - SSL_OP_CIPHER_SERVER_PREFERENCE) != -@@ -1233,6 +1243,17 @@ void* connect_sslctx_create(char* key, c - SSL_CTX_free(ctx); - return 0; - } -+#endif -+#if defined(SSL_OP_IGNORE_UNEXPECTED_EOF) -+ /* ignore errors when peers do not send the mandatory close_notify -+ * alert on shutdown. -+ * Relevant for openssl >= 3 */ -+ if((SSL_CTX_set_options(ctx, SSL_OP_IGNORE_UNEXPECTED_EOF) & -+ SSL_OP_IGNORE_UNEXPECTED_EOF) != SSL_OP_IGNORE_UNEXPECTED_EOF) { -+ log_crypto_err("could not set SSL_OP_IGNORE_UNEXPECTED_EOF"); -+ SSL_CTX_free(ctx); -+ return 0; -+ } - #endif - if(key && key[0]) { - if(!SSL_CTX_use_certificate_chain_file(ctx, pem)) { From a1edb560836c4710b6f536b34df042ee4549fdf2 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 4 Sep 2023 10:04:09 +0300 Subject: [PATCH 25/32] sudo: bump to verison 1.9.14p3 Signed-off-by: Alexandru Ardelean --- admin/sudo/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/sudo/Makefile b/admin/sudo/Makefile index b6a84a378..405792973 100644 --- a/admin/sudo/Makefile +++ b/admin/sudo/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sudo -PKG_VERSION:=1.9.14p1 +PKG_VERSION:=1.9.14p3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.sudo.ws/dist -PKG_HASH:=e91bf5ef2e09d857ee901c3465cf7ddb37e43c763b65d19fa0862d1dec128faf +PKG_HASH:=a08318b1c4bc8582c004d4cd9ae2903abc549e7e46ba815e41fe81d1c0782b62 PKG_MAINTAINER:=Alexandru Ardelean From 40a06febd2e29d17bca3345c8d4ab5dd1690ad88 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sat, 9 Sep 2023 11:27:37 +0300 Subject: [PATCH 26/32] python-chardet: bump to 5.2.0 Signed-off-by: Alexandru Ardelean --- lang/python/python-chardet/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/python/python-chardet/Makefile b/lang/python/python-chardet/Makefile index 83e1799bd..8f9703cd5 100644 --- a/lang/python/python-chardet/Makefile +++ b/lang/python/python-chardet/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-chardet -PKG_VERSION:=5.1.0 +PKG_VERSION:=5.2.0 PKG_RELEASE:=1 PKG_LICENSE:=LGPL-2.1 PYPI_NAME:=chardet -PKG_HASH:=0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5 +PKG_HASH:=1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 include ../pypi.mk include $(INCLUDE_DIR)/package.mk @@ -30,7 +30,7 @@ define Package/python3-chardet endef define Package/python3-chardet/description - Universal encoding detector for Python 2 and 3 + Universal encoding detector for Python endef define Py3Package/python3-chardet/install From 50e655df8b650430d075f39306580a72bfb3ae59 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sat, 9 Sep 2023 11:30:07 +0300 Subject: [PATCH 27/32] numpy: bump to version 1.25.2 Signed-off-by: Alexandru Ardelean --- lang/python/numpy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/numpy/Makefile b/lang/python/numpy/Makefile index 54bbc4255..4b319b59a 100644 --- a/lang/python/numpy/Makefile +++ b/lang/python/numpy/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=numpy -PKG_VERSION:=1.25.1 +PKG_VERSION:=1.25.2 PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=9a3a9f3a61480cc086117b426a8bd86869c213fc4072e606f01c4e4b66eb92bf +PKG_HASH:=fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760 PKG_MAINTAINER:=Alexandru Ardelean From 331b5f75f4b4d5b71c6db9bd6658b6eeef01d891 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Sat, 9 Sep 2023 11:30:55 +0300 Subject: [PATCH 28/32] django: bump to version 4.2.5 Signed-off-by: Alexandru Ardelean --- lang/python/django/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/django/Makefile b/lang/python/django/Makefile index b518cf12d..62c2a1c01 100644 --- a/lang/python/django/Makefile +++ b/lang/python/django/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django -PKG_VERSION:=4.2.3 +PKG_VERSION:=4.2.5 PKG_RELEASE:=1 PYPI_NAME:=Django -PKG_HASH:=45a747e1c5b3d6df1b141b1481e193b033fd1fdbda3ff52677dc81afdaacbaed +PKG_HASH:=5e5c1c9548ffb7796b4a8a4782e9a2e5a3df3615259fc1bfd3ebc73b646146c1 PKG_MAINTAINER:=Alexandru Ardelean , Peter Stadler PKG_LICENSE:=BSD-3-Clause From d9a999521ea3113f3c48b65d468917bf94f83821 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 11 Sep 2023 03:57:45 +0800 Subject: [PATCH 29/32] golang: Update to 1.21.1 Includes fixes for: * CVE-2023-39318: html/template: improper handling of HTML-like comments within script contexts * CVE-2023-39319: html/template: improper handling of special tags within script contexts * CVE-2023-39320: cmd/go: go.mod toolchain directive allows arbitrary execution * CVE-2023-39321 and CVE-2023-39322: crypto/tls: panic when processing partial post-handshake message in QUICConn.HandleData Signed-off-by: Jeffery To --- lang/golang/golang/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 1022a6456..e91f34654 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk GO_VERSION_MAJOR_MINOR:=1.21 -GO_VERSION_PATCH:=0 +GO_VERSION_PATCH:=1 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a +PKG_HASH:=bfa36bf75e9a1e9cbbdb9abcf9d1707e479bd3a07880a8ae3564caee5711cb99 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause From 6c5c99d206e62b44de1bbe60b66deba459396508 Mon Sep 17 00:00:00 2001 From: Carsten Schuette Date: Wed, 6 Sep 2023 09:09:02 +0200 Subject: [PATCH 30/32] dawn: Update to 2023-05-14 Signed-off-by: Carsten Schuette --- net/dawn/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/dawn/Makefile b/net/dawn/Makefile index da2affe82..bb3ee5566 100644 --- a/net/dawn/Makefile +++ b/net/dawn/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dawn -PKG_SOURCE_DATE:=2022-07-24 -PKG_RELEASE:=3 +PKG_SOURCE_DATE:=2023-05-14 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/berlin-open-wireless-lab/DAWN.git -PKG_SOURCE_VERSION:=9e8060ea0908a1092cb07efead1226f494884a71 -PKG_MIRROR_HASH:=305538c6a03d4680c709af7801436a7bae2a811ea4f2f1bd41e42e56e71f2cc7 +PKG_SOURCE_VERSION:=e036905ae3a5d079f899bbe46461fc78b4566349 +PKG_MIRROR_HASH:=6be8c0a1f9e46a347a583f88428bc3c0b1990c3e89bde836e5f3d2d96ffdf00a PKG_MAINTAINER:=Nick Hainke PKG_LICENSE:=GPL-2.0-only From d9acb54dc49b63ea3b473d72543c76c02e93eb2d Mon Sep 17 00:00:00 2001 From: Carsten Schuette Date: Wed, 6 Sep 2023 14:42:12 +0200 Subject: [PATCH 31/32] dawn: Add PKG_BUILD_FLAGS:=no-lto because lto causes strange SegFaults Signed-off-by: Carsten Schuette --- net/dawn/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/dawn/Makefile b/net/dawn/Makefile index bb3ee5566..4576dd994 100644 --- a/net/dawn/Makefile +++ b/net/dawn/Makefile @@ -17,6 +17,8 @@ PKG_MAINTAINER:=Nick Hainke PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_FLAGS:=no-lto + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk From a56e111c499f6d5896ffe9b1bdab0fb0072ee735 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 12 Sep 2023 16:03:16 +0200 Subject: [PATCH 32/32] mwan3: fix mwan3_connected ubus output During the renameing of mwan3_connected_v4 to mwan3_connected_ipv4 and mwan3_connected_v6 to mwan3_connected_ipv6 the adjustment in the ubus call was forgotten. This commit fixes this. Signed-off-by: Florian Eckert --- net/mwan3/Makefile | 2 +- net/mwan3/files/usr/libexec/rpcd/mwan3 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index 99c01712d..b31f4ce34 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwan3 -PKG_VERSION:=2.11.7 +PKG_VERSION:=2.11.8 PKG_RELEASE:=1 PKG_MAINTAINER:=Florian Eckert , \ Aaron Goodman diff --git a/net/mwan3/files/usr/libexec/rpcd/mwan3 b/net/mwan3/files/usr/libexec/rpcd/mwan3 index 8b336a450..3fce9b0d4 100755 --- a/net/mwan3/files/usr/libexec/rpcd/mwan3 +++ b/net/mwan3/files/usr/libexec/rpcd/mwan3 @@ -8,8 +8,8 @@ report_connected_v4() { local address - if [ -n "$($IPT4 -S mwan3_connected 2> /dev/null)" ]; then - for address in $($IPS -o save list mwan3_connected_v4 | grep add | cut -d " " -f 3); do + if [ -n "$($IPT4 -S mwan3_connected_ipv4 2> /dev/null)" ]; then + for address in $($IPS -o save list mwan3_connected_ipv4 | grep add | cut -d " " -f 3); do json_add_string "" "${address}" done fi @@ -19,8 +19,8 @@ report_connected_v6() { [ $NO_IPV6 -ne 0 ] && return local address - if [ -n "$($IPT6 -S mwan3_connected 2> /dev/null)" ]; then - for address in $($IPS -o save list mwan3_connected_v6 | grep add | cut -d " " -f 3); do + if [ -n "$($IPT6 -S mwan3_connected_ipv6 2> /dev/null)" ]; then + for address in $($IPS -o save list mwan3_connected_ipv6 | grep add | cut -d " " -f 3); do json_add_string "" "${address}" done fi