From b126e765cc8bc100336ea42fab5f655c0d4c6325 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Tue, 23 May 2023 22:26:26 +0000 Subject: [PATCH 1/2] curl: update to 8.1.1 * https://curl.se/changes.html#8_1_1 Signed-off-by: Stan Grishin --- net/curl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/curl/Makefile b/net/curl/Makefile index d167cebfc..392679b9b 100644 --- a/net/curl/Makefile +++ b/net/curl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/nls.mk PKG_NAME:=curl -PKG_VERSION:=8.1.0 +PKG_VERSION:=8.1.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_, https://dl.uxnr.de/mirror/curl/ \ https://curl.askapache.com/download/ \ https://curl.se/download/ -PKG_HASH:=6bd80ad4f07187015911216ee7185b90d285ac5162aed1bded144f9f93232a3c +PKG_HASH:=08a948e061929645597c1ef7194e07b308b22084ff03fa7400b465e6c05149e5 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING From 9e95dff9ac461d7bcd6fc053292c975241d11448 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 25 May 2023 13:19:48 +0800 Subject: [PATCH 2/2] python-packages: Remove __PYVENV_LAUNCHER__ environment variable Setting __PYVENV_LAUNCHER__ for Python package builds was added in a91a992abb1fe9b7c4e4e5d11532dbf18c5b213d, but neither the commit message nor the pull request[1] explain its purpose in detail. My guess is this was done to set the shebang for installed Python scripts. We now have a Makefile recipe to set the shebang, so it would be unnecessary to set this variable for this purpose. It appears that Python 3.11 has changed the handling of this (internal) environment variable, and setting it appears to be causing build errors for all Python packages. This removes setting __PYVENV_LAUNCHER__ for Python package builds. [1]: https://github.com/openwrt/packages/pull/525 Fixes: https://github.com/openwrt/packages/issues/21162 Signed-off-by: Jeffery To --- lang/python/python3-package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk index d5d4f8a0f..d07cec174 100644 --- a/lang/python/python3-package.mk +++ b/lang/python/python3-package.mk @@ -39,7 +39,6 @@ PYTHON3_VARS = \ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON3_INC_DIR)" \ LDFLAGS="$(TARGET_LDFLAGS) -lpython$(PYTHON3_VERSION)" \ _PYTHON_HOST_PLATFORM="$(_PYTHON_HOST_PLATFORM)" \ - __PYVENV_LAUNCHER__="/usr/bin/$(PYTHON3)" \ PYTHONPATH="$(PYTHON3PATH)" \ PYTHONDONTWRITEBYTECODE=1 \ _python_sysroot="$(STAGING_DIR)" \