From cb8508c41bc1a8e5e6823d8d25b942ed944a572c Mon Sep 17 00:00:00 2001 From: Ivan Pavlov Date: Thu, 17 Aug 2023 22:33:09 +0300 Subject: [PATCH 01/38] 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 752d385351..8f79f2b10b 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 81c09c1e89..0a45ea49e5 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/38] 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 d2b1e7d94e..7cd1bd6b67 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/38] 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 c24566b517..539288671f 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 ac806e99212e43358816ccd733a5fdb7013ef234 Mon Sep 17 00:00:00 2001 From: Oliver Sedlbauer Date: Wed, 16 Aug 2023 17:24:56 +0200 Subject: [PATCH 04/38] modemmanager: Fix Permission Denied error The proto_send_update function is sending a notification to netifd during the teardown section. However, netifd filters link update notifications executed during teardown, as indicated here: https://git.openwrt.org/?p=project/netifd.git;a=blob;f=proto-shell.c#l515 This was leading to a Permission Denied error due to its behavior, making proto_send_update ineffective during teardown. To address the issue, the proto_send_update function has been removed from the teardown section. This prevents the Permission Denied error while ensuring proper operation during teardown. Additionally, in the 10-report-down helper script, a check has been implemented to determine if the interface is already down. This check is crucial to avoid triggering a Permission Denied error, especially in cases where netifd is already aware of a controlled ifdown operation. Signed-off-by: Oliver Sedlbauer --- net/modemmanager/Makefile | 2 +- net/modemmanager/files/10-report-down | 11 ++++++++--- net/modemmanager/files/modemmanager.proto | 13 ------------- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index 5017d3e259..5616cb6769 100644 --- a/net/modemmanager/Makefile +++ b/net/modemmanager/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager PKG_SOURCE_VERSION:=1.20.6 -PKG_RELEASE:=12 +PKG_RELEASE:=13 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git diff --git a/net/modemmanager/files/10-report-down b/net/modemmanager/files/10-report-down index a3e5fb4ba7..88b010cf06 100755 --- a/net/modemmanager/files/10-report-down +++ b/net/modemmanager/files/10-report-down @@ -29,7 +29,12 @@ MODEM_DEVICE=$(modemmanager_get_field "${MODEM_STATUS}" "modem.generic.device") CFG=$(mm_get_modem_config "${MODEM_DEVICE}") [ -n "${CFG}" ] || exit 3 -logger -t "modemmanager" "interface ${CFG} (network device ${INTERFACE}) ${STATE}" -proto_init_update $INTERFACE 0 -proto_send_update $CFG +IFUP=$(ifstatus "${CFG}" | jsonfilter -e "@.up") + +[ "${IFUP}" = "true" ] && { + logger -t "modemmanager" "interface ${CFG} (network device ${INTERFACE}) ${STATE}" + proto_init_update $INTERFACE 0 + proto_send_update $CFG +} + exit 0 diff --git a/net/modemmanager/files/modemmanager.proto b/net/modemmanager/files/modemmanager.proto index e97b768d0b..a4d837c1e5 100755 --- a/net/modemmanager/files/modemmanager.proto +++ b/net/modemmanager/files/modemmanager.proto @@ -323,15 +323,6 @@ modemmanager_connected_method_static_ipv6() { proto_send_update "${interface}" } -modemmanager_disconnected_method_common() { - local interface="$1" - - echo "running disconnection (common)" - - proto_init_update "*" 0 - proto_send_update "${interface}" -} - proto_modemmanager_init_config() { available=1 no_device=1 @@ -628,7 +619,6 @@ proto_modemmanager_teardown() { # disconnection handling only requires special treatment in IPv4/PPP [ "${bearermethod_ipv4}" = "ppp" ] && modemmanager_disconnected_method_ppp_ipv4 "${interface}" - modemmanager_disconnected_method_common "${interface}" # disconnect mmcli --modem="${device}" --simple-disconnect || @@ -640,9 +630,6 @@ proto_modemmanager_teardown() { # low power, only if requested [ "${lowpower:-0}" -lt 1 ] || mmcli --modem="${device}" --set-power-state-low - - proto_init_update "*" 0 - proto_send_update "$interface" } [ -n "$INCLUDE_ONLY" ] || { From 14bb23f930f1604a2b7ed48722835b5a20f96cdd Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Mon, 4 Sep 2023 11:08:43 +0200 Subject: [PATCH 05/38] 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 cf8d67018f..a17bb51ac7 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 01f6c0e820..4ad7c125f6 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 dcbed11c20..499ef00e83 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 27ae1a8c26..de2a49a189 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 881ce77dee..a71d9fd476 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 19fc2ac069..40c38426c0 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 8214743e58..e3b0669bcf 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 fd1bb58600..537a32fbc1 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 84958d4a87..4aaa6febb1 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 6aa5fff886..7c15901a88 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 5984162f31..6adc7c4142 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 a8097e2cb0..89b5dca654 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 1e1b2051db47a82513f4eb4e9da892207785b7e2 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Mon, 4 Sep 2023 11:00:32 +0200 Subject: [PATCH 06/38] treewide: change my no longer used email Since February 2023, I decided to no longer work with Turris, I mean CZ.NIC company due to some reasons how the development goes and since that day my work address is not available and not sure if there is some redirect to someone else, but if anyone wants to reach me, use my email address, where they can find me. Signed-off-by: Josef Schlehofer --- admin/syslog-ng/Makefile | 2 +- lang/python/python-astral/Makefile | 2 +- lang/python/python-awesomeversion/Makefile | 2 +- lang/python/python-babel/Makefile | 2 +- lang/python/python-cachetools/Makefile | 2 +- lang/python/python-flask-babel/Makefile | 2 +- lang/python/python-flask-seasurf/Makefile | 2 +- lang/python/python-flask-session/Makefile | 2 +- lang/python/python-markdown/Makefile | 2 +- lang/python/python-paho-mqtt/Makefile | 2 +- lang/python/python-pyotp/Makefile | 2 +- lang/python/python-pyrsistent/Makefile | 2 +- lang/python/python-requests/Makefile | 2 +- lang/python/python-schedule/Makefile | 2 +- lang/python/python-sentry-sdk/Makefile | 2 +- lang/python/python-slugify/Makefile | 2 +- lang/python/python-sqlalchemy/Makefile | 2 +- lang/python/python-tornado/Makefile | 2 +- lang/python/python-uci/Makefile | 2 +- lang/python/python-unidecode/Makefile | 2 +- lang/python/python-voluptuous-serialize/Makefile | 2 +- lang/python/python-voluptuous/Makefile | 2 +- lang/python/python-yaml/Makefile | 2 +- lang/python/python3-bottle/Makefile | 2 +- lang/python/ruamel-yaml/Makefile | 2 +- lang/python/text-unidecode/Makefile | 2 +- net/dnscrypt-proxy2/Makefile | 2 +- utils/reptyr/Makefile | 2 +- utils/sshpass/Makefile | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile index 2f2cdc663d..a6edb205e3 100644 --- a/admin/syslog-ng/Makefile +++ b/admin/syslog-ng/Makefile @@ -4,7 +4,7 @@ PKG_NAME:=syslog-ng PKG_VERSION:=4.2.0 PKG_RELEASE:=1 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING LGPL.txt GPL.txt PKG_CPE_ID:=cpe:/a:balabit:syslog-ng diff --git a/lang/python/python-astral/Makefile b/lang/python/python-astral/Makefile index 9d24576ccb..cbabdea89c 100644 --- a/lang/python/python-astral/Makefile +++ b/lang/python/python-astral/Makefile @@ -16,7 +16,7 @@ PKG_HASH:=9b7c3b412e9e69d172cfb24be0e6addcc9f1bd01a28db8bebe66d75ccc533d88 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_BUILD_DEPENDS:=python-poetry-core/host diff --git a/lang/python/python-awesomeversion/Makefile b/lang/python/python-awesomeversion/Makefile index ef60418e44..8b09ce6fa0 100644 --- a/lang/python/python-awesomeversion/Makefile +++ b/lang/python/python-awesomeversion/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=awesomeversion PKG_HASH:=a505558316010d2d10d487226f79c1157204af00fa462fdcf948e347011dd491 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENCE.md diff --git a/lang/python/python-babel/Makefile b/lang/python/python-babel/Makefile index 084ee491d8..8968abb75e 100644 --- a/lang/python/python-babel/Makefile +++ b/lang/python/python-babel/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=Babel PKG_HASH:=cc2d99999cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-cachetools/Makefile b/lang/python/python-cachetools/Makefile index 62bd760cfd..fbe2dff94d 100644 --- a/lang/python/python-cachetools/Makefile +++ b/lang/python/python-cachetools/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=cachetools PKG_HASH:=dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-flask-babel/Makefile b/lang/python/python-flask-babel/Makefile index f381cfcfa9..c23fb47646 100644 --- a/lang/python/python-flask-babel/Makefile +++ b/lang/python/python-flask-babel/Makefile @@ -15,7 +15,7 @@ PYPI_NAME:=flask-babel PYPI_SOURCE_NAME:=flask_babel PKG_HASH:=be015772c5d7f046f3b99c508dcf618636eb93d21b713b356db79f3e79f69f39 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-flask-seasurf/Makefile b/lang/python/python-flask-seasurf/Makefile index dd10c8e0de..2451826936 100644 --- a/lang/python/python-flask-seasurf/Makefile +++ b/lang/python/python-flask-seasurf/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=Flask-SeaSurf PKG_HASH:=54537008c769ac0ada8237877327c3e7ed74dcd8b01e74a9120ee0232c5951a9 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-flask-session/Makefile b/lang/python/python-flask-session/Makefile index a27e95bffe..c5f7800f29 100644 --- a/lang/python/python-flask-session/Makefile +++ b/lang/python/python-flask-session/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=Flask-Session PKG_HASH:=0768e2bbf06f963ec1aa711bde7aa32dc39ff70f89b495d6db687d899eae4423 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-markdown/Makefile b/lang/python/python-markdown/Makefile index c8eba90441..1ab6bda3e3 100644 --- a/lang/python/python-markdown/Makefile +++ b/lang/python/python-markdown/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=Markdown PKG_HASH:=225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.md diff --git a/lang/python/python-paho-mqtt/Makefile b/lang/python/python-paho-mqtt/Makefile index c8aea07de7..20554631bc 100644 --- a/lang/python/python-paho-mqtt/Makefile +++ b/lang/python/python-paho-mqtt/Makefile @@ -8,7 +8,7 @@ PKG_NAME:=python-paho-mqtt PKG_VERSION:=1.6.1 PKG_RELEASE:=2 -PKG_MAINTAINER:=Josef Schlehofer , Alexandru Ardelean +PKG_MAINTAINER:=Josef Schlehofer , Alexandru Ardelean PKG_LICENSE:=EPL-1.0 Eclipse Distribution License v1.0 PKG_LICENSE_FILES:=epl-v10 edl-v10 diff --git a/lang/python/python-pyotp/Makefile b/lang/python/python-pyotp/Makefile index 7fbda1c0fb..468d747974 100644 --- a/lang/python/python-pyotp/Makefile +++ b/lang/python/python-pyotp/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=pyotp PKG_HASH:=346b6642e0dbdde3b4ff5a930b664ca82abfa116356ed48cc42c7d6590d36f63 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-pyrsistent/Makefile b/lang/python/python-pyrsistent/Makefile index 64d687399c..5f8294e698 100644 --- a/lang/python/python-pyrsistent/Makefile +++ b/lang/python/python-pyrsistent/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=pyrsistent PKG_HASH:=1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.mit diff --git a/lang/python/python-requests/Makefile b/lang/python/python-requests/Makefile index c6b156f160..e16cd201b0 100644 --- a/lang/python/python-requests/Makefile +++ b/lang/python/python-requests/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=python-requests PKG_VERSION:=2.31.0 PKG_RELEASE:=1 -PKG_MAINTAINER:=Josef Schlehofer , Alexandru Ardelean +PKG_MAINTAINER:=Josef Schlehofer , Alexandru Ardelean PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:python-requests:requests diff --git a/lang/python/python-schedule/Makefile b/lang/python/python-schedule/Makefile index fad04bd0c0..134a2c5763 100644 --- a/lang/python/python-schedule/Makefile +++ b/lang/python/python-schedule/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=schedule PKG_HASH:=b4ad697aafba7184c9eb6a1e2ebc41f781547242acde8ceae9a0a25b04c0922d -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.txt diff --git a/lang/python/python-sentry-sdk/Makefile b/lang/python/python-sentry-sdk/Makefile index 748d734327..c65bda308f 100644 --- a/lang/python/python-sentry-sdk/Makefile +++ b/lang/python/python-sentry-sdk/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=sentry-sdk PKG_HASH:=a99ee105384788c3f228726a88baf515fe7b5f1d2d0f215a03d194369f158df7 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-slugify/Makefile b/lang/python/python-slugify/Makefile index 239ec6ad1c..2c7b82e709 100644 --- a/lang/python/python-slugify/Makefile +++ b/lang/python/python-slugify/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) PKG_HASH:=ce0d46ddb668b3be82f4ed5e503dbc33dd815d83e2eb6824211310d3fb172a27 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-sqlalchemy/Makefile b/lang/python/python-sqlalchemy/Makefile index 403151ed2d..39279f2589 100644 --- a/lang/python/python-sqlalchemy/Makefile +++ b/lang/python/python-sqlalchemy/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=SQLAlchemy PKG_HASH:=ca8a5ff2aa7f3ade6c498aaafce25b1eaeabe4e42b73e25519183e4566a16fc6 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:sqlalchemy:sqlalchemy diff --git a/lang/python/python-tornado/Makefile b/lang/python/python-tornado/Makefile index 36007a844d..ade9302bf4 100644 --- a/lang/python/python-tornado/Makefile +++ b/lang/python/python-tornado/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=tornado PKG_HASH:=e7d8db41c0181c80d76c982aacc442c0783a2c54d6400fe028954201a2e032fe -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-uci/Makefile b/lang/python/python-uci/Makefile index 46fbd79a96..5d834d0d73 100644 --- a/lang/python/python-uci/Makefile +++ b/lang/python/python-uci/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=pyuci PKG_HASH:=865a45d48fb5d363f1230e94fa2c5b01ae6487f02f2180b0a6f78193a70166e2 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-unidecode/Makefile b/lang/python/python-unidecode/Makefile index d8c150ac2b..424f361a15 100644 --- a/lang/python/python-unidecode/Makefile +++ b/lang/python/python-unidecode/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=Unidecode PKG_HASH:=fed09cf0be8cf415b391642c2a5addfc72194407caee4f98719e40ec2a72b830 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-voluptuous-serialize/Makefile b/lang/python/python-voluptuous-serialize/Makefile index 07f9dff0b0..28204ede9a 100644 --- a/lang/python/python-voluptuous-serialize/Makefile +++ b/lang/python/python-voluptuous-serialize/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=voluptuous-serialize PKG_HASH:=79acdc58239582a393144402d827fa8efd6df0f5350cdc606d9242f6f9bca7c4 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-voluptuous/Makefile b/lang/python/python-voluptuous/Makefile index 75e58e6a5f..ceb6a85f72 100644 --- a/lang/python/python-voluptuous/Makefile +++ b/lang/python/python-voluptuous/Makefile @@ -16,7 +16,7 @@ PKG_HASH:=e8d31c20601d6773cb14d4c0f42aee29c6821bbd1018039aac7ac5605b489723 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer include ../pypi.mk include $(INCLUDE_DIR)/package.mk diff --git a/lang/python/python-yaml/Makefile b/lang/python/python-yaml/Makefile index 1731b33fc0..26326d660c 100644 --- a/lang/python/python-yaml/Makefile +++ b/lang/python/python-yaml/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=4 PYPI_NAME:=PyYAML PKG_HASH:=68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:pyyaml_project:pyyaml diff --git a/lang/python/python3-bottle/Makefile b/lang/python/python3-bottle/Makefile index f094d81b6a..1a6913d2b5 100644 --- a/lang/python/python3-bottle/Makefile +++ b/lang/python/python3-bottle/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=bottle PKG_HASH:=e1a9c94970ae6d710b3fb4526294dfeb86f2cb4a81eff3a4b98dc40fb0e5e021 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:bottlepy:bottle diff --git a/lang/python/ruamel-yaml/Makefile b/lang/python/ruamel-yaml/Makefile index 5863f4ab15..fd8f17a7fc 100644 --- a/lang/python/ruamel-yaml/Makefile +++ b/lang/python/ruamel-yaml/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PYPI_NAME:=ruamel.yaml PKG_HASH:=9751de4cbb57d4bfbf8fc394e125ed4a2f170fbff3dc3d78abf50be85924f8be -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/text-unidecode/Makefile b/lang/python/text-unidecode/Makefile index e77108f456..89f7ef7cd6 100644 --- a/lang/python/text-unidecode/Makefile +++ b/lang/python/text-unidecode/Makefile @@ -16,7 +16,7 @@ PKG_HASH:=bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93 PKG_LICENSE:=Artistic-1.0-cl8 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer include ../pypi.mk include $(INCLUDE_DIR)/package.mk diff --git a/net/dnscrypt-proxy2/Makefile b/net/dnscrypt-proxy2/Makefile index 5e12268929..7a5d82b159 100644 --- a/net/dnscrypt-proxy2/Makefile +++ b/net/dnscrypt-proxy2/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://codeload.github.com/DNSCrypt/dnscrypt-proxy/tar.gz/$(PKG PKG_HASH:=05f0a3e8c8f489caf95919e2a75a1ec4598edd3428d2b9dd357caba6adb2607d PKG_BUILD_DIR:=$(BUILD_DIR)/dnscrypt-proxy-$(PKG_VERSION) -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=ISC PKG_LICENSE_FILES:=LICENSE diff --git a/utils/reptyr/Makefile b/utils/reptyr/Makefile index 6bf94b5355..e94c9bc008 100644 --- a/utils/reptyr/Makefile +++ b/utils/reptyr/Makefile @@ -9,7 +9,7 @@ PKG_SOURCE_URL:=https://github.com/nelhage/reptyr/archive/ PKG_HASH:=c6ffbc34a511ac00d072219bda30699e51f2f4eb483cbae9e32e981d49e8b380 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING diff --git a/utils/sshpass/Makefile b/utils/sshpass/Makefile index 0643314551..052c70599c 100644 --- a/utils/sshpass/Makefile +++ b/utils/sshpass/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/sshpass PKG_HASH:=71746e5e057ffe9b00b44ac40453bf47091930cba96bbea8dc48717dedc49fb7 -PKG_MAINTAINER:=Josef Schlehofer +PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING From ba17298db547fb0771241f9faacf785747b910fa Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 5 Sep 2023 03:38:58 +0800 Subject: [PATCH 07/38] 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 e93025a631..39a35565a6 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 08/38] 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 20df0265d7..f1977ee488 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 a3fddd5e6f..2929c22220 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 fede0b4735..f6b3a10e39 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 09/38] 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 26326d660c..c7eafc98c8 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 10/38] 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 9b3e220c03..eaa7334c47 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 11/38] 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 3d48b31c31..77a6d0d9cb 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 12/38] 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 fd8f17a7fc..a63b1642b9 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 13/38] 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 44cf4cd502..87b841f51c 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 14/38] 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 0f256628eb..3ce76c2eb6 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 d7591100c9..a0d9674b3b 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 37a922c54d..43e2cc3d88 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 15/38] 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 9847db5832..a9265950c4 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 da4ca52b46..305ef69645 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 457e785ca6..43e2cc3d88 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 16/38] 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 e74cc880e4..e6c6b401ee 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 17/38] 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 de59e612d1..6d4ded9cf4 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 f425e37fb04cd5d0d83e713dbb994a859cf9663d Mon Sep 17 00:00:00 2001 From: danielpinto8zz6 Date: Fri, 1 Sep 2023 13:19:42 +0100 Subject: [PATCH 18/38] ddns-scripts: desec.io - update url to https Signed-off-by: Daniel Pinto desec.io ddns update is not working, after testing the endpoint I got a 301, after a bit of search I found out we are supposed to use https instead of http more info here: https://talk.desec.io/t/301-from-update-dedyn-io/644/2 bump PKG_RELEASE --- net/ddns-scripts/Makefile | 2 +- net/ddns-scripts/files/usr/share/ddns/default/desec.io.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 1512fa31b5..a4c79b06b5 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts PKG_VERSION:=2.8.2 -PKG_RELEASE:=38 +PKG_RELEASE:=39 PKG_LICENSE:=GPL-2.0 diff --git a/net/ddns-scripts/files/usr/share/ddns/default/desec.io.json b/net/ddns-scripts/files/usr/share/ddns/default/desec.io.json index 4d3d217205..c28458fee6 100644 --- a/net/ddns-scripts/files/usr/share/ddns/default/desec.io.json +++ b/net/ddns-scripts/files/usr/share/ddns/default/desec.io.json @@ -1,11 +1,11 @@ { "name": "desec.io", "ipv4": { - "url": "http://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv4=[IP]&myipv6=preserve", + "url": "https://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv4=[IP]&myipv6=preserve", "answer": "good|nochg" }, "ipv6": { - "url": "http://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv6=[IP]&myipv4=preserve", + "url": "https://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv6=[IP]&myipv4=preserve", "answer": "good|nochg" } } From 4af428ec71af88470903d3459b720727714cde16 Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Mon, 4 Sep 2023 13:06:50 +0800 Subject: [PATCH 19/38] lua-eco: update to 2.5.1 Signed-off-by: Jianhui Zhao --- lang/lua-eco/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/lua-eco/Makefile b/lang/lua-eco/Makefile index 02e382137f..e4f3ab188f 100644 --- a/lang/lua-eco/Makefile +++ b/lang/lua-eco/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua-eco -PKG_VERSION:=2.5.0 +PKG_VERSION:=2.5.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL=https://github.com/zhaojh329/lua-eco/releases/download/v$(PKG_VERSION) -PKG_HASH:=d41668d137780f2655ebfec88276249bb9cd5c53f758c3e2103eb001ed9b5d02 +PKG_HASH:=436c09dd7dbc88ab651ae7696f2102b5635628ab420cc550bc237ecb04cade5d PKG_MAINTAINER:=Jianhui Zhao PKG_LICENSE:=MIT From 104bfa71a9e44a4214291fadfb8078e47d60c28c Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Wed, 12 Apr 2023 21:53:45 +1000 Subject: [PATCH 20/38] cache-domains: Fixed config files being outside of jail This fix dnsmasq failing to startup once configured since the cache-domains config files are not included in the jail that dnsmasq runs inside. Signed-off-by: Gerard Ryan --- utils/cache-domains/Makefile | 7 +++- utils/cache-domains/files/cache-domains | 31 +++++++++------ utils/cache-domains/files/test.sh | 51 +++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 13 deletions(-) create mode 100644 utils/cache-domains/files/test.sh diff --git a/utils/cache-domains/Makefile b/utils/cache-domains/Makefile index 0e12ec32c8..21e712fd3a 100644 --- a/utils/cache-domains/Makefile +++ b/utils/cache-domains/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cache-domains -PKG_VERSION:=2.3.1 -PKG_RELEASE:=2 +PKG_VERSION:=2.4.0 +PKG_RELEASE:=1 PKG_MAINTAINER:=Gerard Ryan @@ -27,6 +27,9 @@ define Package/cache-domains/install/default $(INSTALL_DIR) $(1)/etc/hotplug.d/iface/ $(INSTALL_BIN) ./files/30-cache-domains $(1)/etc/hotplug.d/iface/ + + $(INSTALL_DIR) $(1)/usr/share/cache-domains/ + $(INSTALL_BIN) ./files/test.sh $(1)/usr/share/cache-domains/ endef Build/Compile=# Nothing to compile, just install the scripts diff --git a/utils/cache-domains/files/cache-domains b/utils/cache-domains/files/cache-domains index 585aef7e97..9ac5d67165 100644 --- a/utils/cache-domains/files/cache-domains +++ b/utils/cache-domains/files/cache-domains @@ -6,31 +6,42 @@ set -e CACHE_DOMAINS_SRC="https://api.github.com/repos/uklans/cache-domains/tarball/master" CACHE_DOMAINS_DIR="/var/cache-domains" -CACHE_DOMAINS_CONF_FILE="${CACHE_DOMAINS_DIR}/lancache.conf" CONFIG_FILE="/etc/cache-domains.json" dnsmasq_conf() { + local ACTION="${1}" + local ADDN_CONF_DIR="${2}" local I=0 local DNSMASQ_CONF_DIR local DNSMASQ_CONF_FILE while uci_get "dhcp" "@dnsmasq[${I}]" > /dev/null; do DNSMASQ_CONF_DIR="$(uci_get "dhcp" "@dnsmasq[${I}]" "confdir" "/tmp/dnsmasq.d" || :)" - DNSMASQ_CONF_FILE="${DNSMASQ_CONF_DIR}/$(basename "${CACHE_DOMAINS_CONF_FILE}")" + uci_remove_list "dhcp" "@dnsmasq[${I}]" "addnmount" "${ADDN_CONF_DIR}" - case ${1} in + mkdir -p "${DNSMASQ_CONF_DIR}" + case "${ACTION}" in add) - ln -sf "${CACHE_DOMAINS_CONF_FILE}" "${DNSMASQ_CONF_FILE}" + ln -s "${ADDN_CONF_DIR}/"* "${DNSMASQ_CONF_DIR}" 2> /dev/null || : + uci_add_list "dhcp" "@dnsmasq[${I}]" "addnmount" "${ADDN_CONF_DIR}" ;; remove) - rm -f "${DNSMASQ_CONF_FILE}" + for DNSMASQ_CONF_FILE in "${DNSMASQ_CONF_DIR}/"*; do + case "$(readlink "${DNSMASQ_CONF_FILE}" || echo "${DNSMASQ_CONF_FILE}")" in + "${ADDN_CONF_DIR}"*) + rm -f "${DNSMASQ_CONF_FILE}" + ;; + esac + done ;; *) - echo "ERROR: Invalid action '${1}' for dnsmasq_conf()" + echo "ERROR: Invalid action '${ACTION}' for dnsmasq_conf()" return 1 ;; esac + uci_commit "dhcp" + I=$((${I} + 1)) done @@ -59,18 +70,16 @@ configure() { cd "${SOURCE_DIR}/scripts/" cp "${CONFIG_FILE}" "config.json" ./create-dnsmasq.sh > /dev/null - cat "./output/dnsmasq/"*".conf" > "${CACHE_DOMAINS_CONF_FILE}" cd "${INITIAL_DIR}" - rm -fr "${SOURCE_DIR}" - dnsmasq_conf add + dnsmasq_conf add "${SOURCE_DIR}/scripts/output/dnsmasq" } cleanup() { - dnsmasq_conf remove + dnsmasq_conf remove "${CACHE_DOMAINS_DIR}/$(ls "${CACHE_DOMAINS_DIR}")/scripts/output/dnsmasq" } -case ${1} in +case "${1}" in config*) configure ;; diff --git a/utils/cache-domains/files/test.sh b/utils/cache-domains/files/test.sh new file mode 100644 index 0000000000..7963fc0dea --- /dev/null +++ b/utils/cache-domains/files/test.sh @@ -0,0 +1,51 @@ +#! /bin/sh + +set -o errexit + +test_url() { + echo "INFO: Testing '${2}' has ${1} addresses" >&2 + + case "${1}" in + IPv4) + nslookup -type=a "${2}" + ;; + IPv6) + nslookup -type=aaaa "${2}" + ;; + *) + echo "ERROR: Unknown IP version: ${1}" >&2 + exit 1 + ;; + esac +} + +cache_domains() { + echo "INFO: cache-domains ${1}" >&2 + cache-domains "${1}" + sleep 5 +} + +cache_domains cleanup + +test_url IPv4 lancache.steamcontent.com | grep -q 'canonical name =' +test_url IPv6 lancache.steamcontent.com | grep -q 'canonical name =' + +test_url IPv4 dist.blizzard.com | grep -q 'canonical name =' +test_url IPv6 dist.blizzard.com | grep -q 'canonical name =' + +cache_domains configure + +test_url IPv4 lancache.steamcontent.com | grep -q '10.10.3.10' +test_url IPv4 lancache.steamcontent.com | grep -q '10.10.3.11' +test_url IPv6 lancache.steamcontent.com > /dev/null # None configured + +test_url IPv4 dist.blizzard.com | grep -q '10.10.3.13' +test_url IPv6 dist.blizzard.com > /dev/null # None configured + +cache_domains cleanup + +test_url IPv4 lancache.steamcontent.com | grep -q 'canonical name =' +test_url IPv6 lancache.steamcontent.com | grep -q 'canonical name =' + +test_url IPv4 dist.blizzard.com | grep -q 'canonical name =' +test_url IPv6 dist.blizzard.com | grep -q 'canonical name =' From 6efd4d1e8801ba29a857d38432db10a0bc335a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=A1k?= Date: Mon, 4 Sep 2023 10:44:29 +0200 Subject: [PATCH 21/38] libedit: update to version 20230828-3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Hák --- libs/libedit/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libedit/Makefile b/libs/libedit/Makefile index 9192ff26af..bc60c53f86 100644 --- a/libs/libedit/Makefile +++ b/libs/libedit/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libedit -PKG_VERSION:=20221030-3.1 +PKG_VERSION:=20230828-3.1 PKG_RELEASE:=1 PKG_MAINTAINER:=Daniel Salzman @@ -16,7 +16,7 @@ PKG_LICENSE:=BSD-3-Clause PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thrysoee.dk/editline/ -PKG_HASH:=f0925a5adf4b1bf116ee19766b7daa766917aec198747943b1c4edf67a4be2bb +PKG_HASH:=4ee8182b6e569290e7d1f44f0f78dac8716b35f656b76528f699c69c98814dad PKG_INSTALL:=1 From 058413daa4b810b04b7f4cdbdc2dbcaf4c7b38a9 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 6 Sep 2023 11:08:39 +0800 Subject: [PATCH 22/38] v2raya: Update to 2.2.4 Signed-off-by: Tianling Shen --- net/v2raya/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile index 9c512debdd..eec759a7b3 100644 --- a/net/v2raya/Makefile +++ b/net/v2raya/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2rayA -PKG_VERSION:=2.2.2 +PKG_VERSION:=2.2.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=fc32ac028efdd3cac0f482a765ee6e7383b4a8d9be7a343898e64235536cb235 +PKG_HASH:=844da2a4c1ac1f7eae02519a0833255a63938f08a554cbea043606b28ee6ebed PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service PKG_LICENSE:=AGPL-3.0-only @@ -59,7 +59,7 @@ define Download/v2raya-web URL:=https://github.com/v2rayA/v2rayA/releases/download/v$(PKG_VERSION)/ URL_FILE:=web.zip FILE:=$(WEB_FILE) - HASH:=24e5b61aedb6439f16264be55f50802e1198b87be2d456fc08c44945b67d736b + HASH:=2699dacdf39137af408a9ffcb91734e5af487bef4dccaa51f1bb3de6c4d3e8fe endef define Build/Prepare From a0c6ba40d9ad56b050dd01761ef6a526e472185c Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 6 Sep 2023 11:09:05 +0800 Subject: [PATCH 23/38] v2ray-geodata: Update to latest version Signed-off-by: Tianling Shen --- net/v2ray-geodata/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/v2ray-geodata/Makefile b/net/v2ray-geodata/Makefile index 3eb1fef6a3..9cc4d32654 100644 --- a/net/v2ray-geodata/Makefile +++ b/net/v2ray-geodata/Makefile @@ -12,22 +12,22 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202308030045 +GEOIP_VER:=202308310037 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL_FILE:=geoip.dat FILE:=$(GEOIP_FILE) - HASH:=9b7fa7407f35e3087f3b052d12ed40974182c6e1864570b848c1ec901292ea82 + HASH:=536d7aa9f54af747153d4f982adaa3181025dd72faaba8f532b3f514b467eff8 endef -GEOSITE_VER:=20230803193133 +GEOSITE_VER:=20230905081311 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=3d335d493f168eace5414ca1ff54e4f255f8e5b1a90261d2debb1cbefa0666a0 + HASH:=d393deda756a446ec5247730ef09fed80ba9fb8d9204d1263c45a3604435fe57 endef define Package/v2ray-geodata/template From aa03634cbcd837d25bc33c64aa9054cdd096e46d Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Tue, 5 Sep 2023 21:38:27 -0600 Subject: [PATCH 24/38] modemmanager: handle no *.conf files being installed To begin with, there are only a couple of .conf files, and one of them is for testing, and the other is only installed when MBIM is enabled, so if you build without MBIM you'll have a failing install: install -m0644 /home/pprindeville/work/openwrt/build_dir/target-x86_64_musl/modemmanager-1.20.6/ipkg-install/usr/share/ModemManager/*.conf /home/pprindeville/work/openwrt/build_dir/target-x86_64_musl/modemmanager-1.20.6/.pkgdir/modemmanager/usr/share/ModemManager install: cannot stat '/home/pprindeville/work/openwrt/build_dir/target-x86_64_musl/modemmanager-1.20.6/ipkg-install/usr/share/ModemManager/*.conf': No such file or directory make[2]: *** [Makefile:161: /home/pprindeville/work/openwrt/build_dir/target-x86_64_musl/modemmanager-1.20.6/.pkgdir/modemmanager.installed] Error 1 make[2]: Leaving directory '/home/pprindeville/work/openwrt/feeds/packages/net/modemmanager' So make sure there's anything there to copy over first. Signed-off-by: Philip Prindeville --- net/modemmanager/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index 5017d3e259..0069eaae98 100644 --- a/net/modemmanager/Makefile +++ b/net/modemmanager/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager PKG_SOURCE_VERSION:=1.20.6 -PKG_RELEASE:=12 +PKG_RELEASE:=13 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git @@ -112,7 +112,7 @@ define Package/modemmanager/install $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/dbus-1/system-services/org.freedesktop.ModemManager1.service $(1)/usr/share/dbus-1/system-services $(INSTALL_DIR) $(1)/usr/share/ModemManager - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/*.conf $(1)/usr/share/ModemManager + $$(if $$(wildcard $(PKG_INSTALL_DIR)/usr/share/ModemManager/*.conf),$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/*.conf $(1)/usr/share/ModemManager,) $(INSTALL_DATA) ./files/modemmanager.common $(1)/usr/share/ModemManager $(INSTALL_DIR) $(1)/usr/share/ModemManager/fcc-unlock.available.d From 86522d77f1ccf7ed80ef556e0d6621efbd190275 Mon Sep 17 00:00:00 2001 From: Van Waholtz Date: Tue, 5 Sep 2023 23:13:03 +0800 Subject: [PATCH 25/38] syncthing: update to 1.24.0 This package can be built with Go 1.21 and QUIC can be enabled. Signed-off-by: Van Waholtz --- utils/syncthing/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile index 1696a01cdd..e8b744a463 100644 --- a/utils/syncthing/Makefile +++ b/utils/syncthing/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syncthing -PKG_VERSION:=1.23.7 +PKG_VERSION:=1.24.0 PKG_RELEASE:=1 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION) -PKG_HASH:=18d8dd74d8077f500a139752261b78217ef0b0a912a7c017192097a7196e21a1 +PKG_HASH:=4a9459667f9b70a7d1e7d572c7c9d02431ef8f055679eef368300ce1a826608f PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME) @@ -26,7 +26,7 @@ GO_PKG_BUILD_PKG:=\ $(if $(CONFIG_PACKAGE_strelaysrv),$(GO_PKG)/cmd/strelaysrv/) GO_PKG_INSTALL_EXTRA:=^gui/ -GO_PKG_TAGS:=noupgrade,noquic +GO_PKG_TAGS:=noupgrade GO_PKG_LDFLAGS_X:=\ $(GO_PKG)/lib/build.Version=v$(PKG_VERSION) \ $(GO_PKG)/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \ From 03ef02f0f45b2999625de08d0f1a274418076bd6 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 4 Sep 2023 15:02:14 +0800 Subject: [PATCH 26/38] 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 ab72eaf201..dcd5bd9ebc 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-iconv +define Package/libslang2-mod/Default $(call Package/libslang2/Default) + DEPENDS:=@PACKAGE_libslang2 +endef + +define Package/libslang2-mod-iconv +$(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 27/38] 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 dcd5bd9ebc..48a909f16c 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 28/38] 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 25185f44b5..4e503fb6e4 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 0b4eb31592..a54d027040 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 9b6bc45a32..9bb10fac79 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 a8c06a7260..aa56d89426 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 2546048b0d..604f41d8e6 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 26241d03ea..0000000000 --- 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 0000000000..b45e65414f --- /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 29/38] 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 f790564ba0..9f57f746b7 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 b7d1748e9a..8f4d9e0aff 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 30/38] 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 110731352d..39ac66747f 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 31/38] 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 e7db64debf..872dac5821 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 36431eb0a8..0000000000 --- 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 2847b628e8..0000000000 --- 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 32/38] 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 872dac5821..464352ef9b 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 33/38] 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 464352ef9b..727a10a4d3 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 34/38] 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 9626c4e298..d0cb41fac5 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 aa1075738d..f53962fcd4 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 3f7d62b401..0000000000 --- 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 35/38] 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 b6a84a3786..4057929732 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 36/38] 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 83e1799bdd..8f9703cd5f 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 37/38] 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 54bbc42556..4b319b59a8 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 38/38] 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 b518cf12db..62c2a1c01f 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