From 0cebe8f70fa2c1ab3d4b50e7e7fffdd61c0e7f77 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Wed, 24 Apr 2024 00:19:55 +0800 Subject: [PATCH] update 2024-04-24 00:19:55 --- naiveproxy/Makefile | 16 +++++++------ uwsgi/Makefile | 6 ++--- uwsgi/patches/001-dont-hardcode-zlib.patch | 2 +- ...dont-override-toolchain-optimization.patch | 13 +++++------ ...03-hard-code-Linux-as-compilation-os.patch | 2 +- .../patches/005-ssl-option-can_t-be-set.patch | 23 +++++++++++++++++++ uwsgi/patches/010-uclibc-ng.patch | 2 +- 7 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 uwsgi/patches/005-ssl-option-can_t-be-set.patch diff --git a/naiveproxy/Makefile b/naiveproxy/Makefile index 9a5f59c61..be6555653 100644 --- a/naiveproxy/Makefile +++ b/naiveproxy/Makefile @@ -8,13 +8,15 @@ PKG_NAME:=naiveproxy PKG_VERSION:=123.0.6312.40-1 PKG_RELEASE:=1 -# intel 80386 & riscv64 -ifeq ($(ARCH_PACKAGES),i386_pentium-mmx) - ARCH_PACKAGES:=x86 -else ifeq ($(ARCH_PACKAGES),i386_pentium4) - ARCH_PACKAGES:=x86 -else ifeq ($(ARCH_PACKAGES),riscv64_riscv64) - ARCH_PACKAGES:=riscv64 +# intel 80386 & riscv64 & cortex-a76 +ifeq ($(ARCH_PREBUILT),aarch64_cortex-a76) + ARCH_PREBUILT:=aarch64_generic +else ifeq ($(ARCH_PREBUILT),i386_pentium-mmx) + ARCH_PREBUILT:=x86 +else ifeq ($(ARCH_PREBUILT),i386_pentium4) + ARCH_PREBUILT:=x86 +else ifeq ($(ARCH_PREBUILT),riscv64_riscv64) + ARCH_PREBUILT:=riscv64 endif ifeq ($(ARCH_PACKAGES),aarch64_cortex-a53) diff --git a/uwsgi/Makefile b/uwsgi/Makefile index 58256b315..78a6950f2 100644 --- a/uwsgi/Makefile +++ b/uwsgi/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uwsgi -PKG_VERSION:=2.0.21 +PKG_VERSION:=2.0.25.1 PKG_RELEASE:=1 PYPI_NAME:=uWSGI PYPI_SOURCE_NAME:=uwsgi -PKG_HASH:=35a30d83791329429bc04fe44183ce4ab512fcf6968070a7bfba42fc5a0552a9 +PKG_HASH:=d653d2d804c194c8cbe2585fa56efa2650313ae75c686a9d7931374d4dfbfc6e PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE @@ -34,7 +34,7 @@ define Package/uwsgi SUBMENU:=Web Servers/Proxies TITLE:=The uWSGI server URL:=https://uwsgi-docs.readthedocs.io/en/latest/ - DEPENDS:=+libpcre +libcap +libuuid + DEPENDS:=+libpcre2 +libcap +libuuid endef define Package/uwsgi-logfile-plugin diff --git a/uwsgi/patches/001-dont-hardcode-zlib.patch b/uwsgi/patches/001-dont-hardcode-zlib.patch index 38a42c045..37a81e3ba 100644 --- a/uwsgi/patches/001-dont-hardcode-zlib.patch +++ b/uwsgi/patches/001-dont-hardcode-zlib.patch @@ -1,6 +1,6 @@ --- a/uwsgiconfig.py +++ b/uwsgiconfig.py -@@ -859,11 +859,11 @@ class uConf(object): +@@ -863,11 +863,11 @@ class uConf(object): self.cflags.append('-DUWSGI_HAS_EXECINFO') report['execinfo'] = True diff --git a/uwsgi/patches/002-dont-override-toolchain-optimization.patch b/uwsgi/patches/002-dont-override-toolchain-optimization.patch index a6c71e143..55578a52e 100644 --- a/uwsgi/patches/002-dont-override-toolchain-optimization.patch +++ b/uwsgi/patches/002-dont-override-toolchain-optimization.patch @@ -1,11 +1,10 @@ --- a/uwsgiconfig.py +++ b/uwsgiconfig.py -@@ -688,7 +688,7 @@ class uConf(object): +@@ -684,7 +684,6 @@ class uConf(object): self.include_path += os.environ['UWSGI_INCLUDES'].split(',') - -- self.cflags = ['-O2', '-I.', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split() + self.get('cflags','').split() -+ self.cflags = ['-I.', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split() + self.get('cflags','').split() - - report['kernel'] = uwsgi_os - + cflags = [ +- '-O2', + '-I.', + '-Wall', + '-D_LARGEFILE_SOURCE', diff --git a/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch b/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch index 8adc220dd..4e18674d7 100644 --- a/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch +++ b/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch @@ -1,6 +1,6 @@ --- a/uwsgiconfig.py +++ b/uwsgiconfig.py -@@ -5,9 +5,9 @@ uwsgi_version = '2.0.21' +@@ -5,9 +5,9 @@ uwsgi_version = '2.0.25.1' import os import re import time diff --git a/uwsgi/patches/005-ssl-option-can_t-be-set.patch b/uwsgi/patches/005-ssl-option-can_t-be-set.patch new file mode 100644 index 000000000..efdbd47e6 --- /dev/null +++ b/uwsgi/patches/005-ssl-option-can_t-be-set.patch @@ -0,0 +1,23 @@ +From b55d659c2ef6fb80b3b5d70192b1271992c393fc Mon Sep 17 00:00:00 2001 +From: Mathieu Lacage +Date: Tue, 30 Oct 2018 17:08:19 +0100 +Subject: [PATCH] ssl-option can't be set + +The ssl-option variable can't be set: it is designed to take a numeric argument but is specified as a "no_argument" option which results in an error when trying to set this option. This changeset sets the proper type. + +Given the changeset which introduced this option with the ssl-enable3 option which is of type no_argument, I suspect someone copy/pasted the ssl-enable3 configuration file without testing the change. +--- + core/uwsgi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/core/uwsgi.c ++++ b/core/uwsgi.c +@@ -678,7 +678,7 @@ static struct uwsgi_option uwsgi_base_op + {"ssl-enable3", no_argument, 0, "enable SSLv3 (insecure)", uwsgi_opt_true, &uwsgi.sslv3, 0}, + {"ssl-enable-sslv3", no_argument, 0, "enable SSLv3 (insecure)", uwsgi_opt_true, &uwsgi.sslv3, 0}, + {"ssl-enable-tlsv1", no_argument, 0, "enable TLSv1 (insecure)", uwsgi_opt_true, &uwsgi.tlsv1, 0}, +- {"ssl-option", no_argument, 0, "set a raw ssl option (numeric value)", uwsgi_opt_add_string_list, &uwsgi.ssl_options, 0}, ++ {"ssl-option", required_argument, 0, "set a raw ssl option (numeric value)", uwsgi_opt_add_string_list, &uwsgi.ssl_options, 0}, + #if defined(UWSGI_PCRE) || defined(UWSGI_PCRE2) + {"sni-regexp", required_argument, 0, "add an SNI-governed SSL context (the key is a regexp)", uwsgi_opt_sni, NULL, 0}, + #endif diff --git a/uwsgi/patches/010-uclibc-ng.patch b/uwsgi/patches/010-uclibc-ng.patch index e12c3c514..e98bab3e0 100644 --- a/uwsgi/patches/010-uclibc-ng.patch +++ b/uwsgi/patches/010-uclibc-ng.patch @@ -1,6 +1,6 @@ --- a/core/uwsgi.c +++ b/core/uwsgi.c -@@ -1822,7 +1822,7 @@ void uwsgi_plugins_atexit(void) { +@@ -1794,7 +1794,7 @@ void uwsgi_plugins_atexit(void) { void uwsgi_backtrace(int depth) {