diff --git a/2.0.26.tar.gz b/2.0.26.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3ec7f500864e05907454aa6cee7a24a5be153dba Binary files /dev/null and b/2.0.26.tar.gz differ diff --git a/uwsgi-2.0.23.tar.gz b/uwsgi-2.0.23.tar.gz deleted file mode 100644 index f230d28ef3ccb8a099b6af9b9ea989d4448625d5..0000000000000000000000000000000000000000 Binary files a/uwsgi-2.0.23.tar.gz and /dev/null differ diff --git a/uwsgi-docs-3be14d3.tar.gz b/uwsgi-docs-3be14d3.tar.gz deleted file mode 100644 index 4b3c42ef52cfc15f200dfcc31c2328eaa24c3b0f..0000000000000000000000000000000000000000 Binary files a/uwsgi-docs-3be14d3.tar.gz and /dev/null differ diff --git a/uwsgi-docs-59e6cd1.tar.gz b/uwsgi-docs-59e6cd1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..545588ebcf23256e724bd688aa539baad0970671 Binary files /dev/null and b/uwsgi-docs-59e6cd1.tar.gz differ diff --git a/uwsgi.spec b/uwsgi.spec index e9646de1ef2fd6c98e7b206a91296546f3638706..b3341c21c2e7983cf6818666e00ff4b3c230454a 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -1,5 +1,5 @@ # Documentation sources: -%global commit 3be14d357b7b73a82311db034de034f8c09035e8 +%global commit 59e6cd1044e20eaae73e5cd8114b77fb38c99ac5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global docrepo uwsgi-docs @@ -64,15 +64,15 @@ %endif Name: uwsgi -Version: 2.0.23 -Release: 2 +Version: 2.0.26 +Release: 1 Summary: Fast, self-healing, application container server # uwsgi is licensed under GPLv2 with a linking exception # docs are licensed under MIT License: GPL-2.0-only WITH GCC-exception-2.0 AND MIT URL: https://github.com/unbit/uwsgi -Source0: http://projects.unbit.it/downloads/uwsgi-%{version}.tar.gz +Source0: https://github.com/unbit/uwsgi/archive/refs/tags/%{version}.tar.gz Source1: openEuler.ini Source2: uwsgi.service Source3: emperor.ini @@ -90,8 +90,6 @@ Patch3: uwsgi_fix_lua.patch Patch5: uwsgi_fix_mongodb.patch Patch6: uwsgi_v8-314_compatibility.patch Patch7: uwsgi_fix_mono.patch -# https://github.com/unbit/uwsgi/issues/2283 -Patch12: uwsgi_fix_php8.patch Patch13: uwsgi_fix_chroot_chdir.patch BuildRequires: curl, libxml2-devel, libuuid-devel, jansson-devel @@ -1005,16 +1003,13 @@ cp -p %{SOURCE5} README.openEuler %patch -P1 -p1 %patch -P2 -p1 %patch -P3 -p1 -%if 0%{?fedora} %patch -P5 -p1 -%endif %if %{with v8} && 0%{?fedora} %patch -P6 -p1 %endif %if %{with mono} %patch -P7 -p1 %endif -%patch -P12 -p1 %patch -P13 -p1 %build @@ -1542,6 +1537,18 @@ exit 0 %changelog +* Mon Jul 08 2024 wangkai <13474090681@163.com> - 2.0.26-1 +- Update to 2.0.26 +- fix linking with php8 +- fix socket queue stats for ipv6 +- fixup -Wformat-signedness warnings +- Add support for building against prcre2. This changes the regexp internal data structures +- Fix a potential error with not releasing the gil in uwsgi_python_rpc +- Fix build when pcre is not found and is optional +- apache2/mod_proxy_uwsgi: let httpd handle CL/TE for non-http handlers CVE-2024-24795 +- uwsgiconfig: get compiler version with -dumpfullversion +- Fix uwsgi_regexp_match() with pcre2 + * Wed Apr 17 2024 wulei - 2.0.23-2 - Fix pkgship service startup failure diff --git a/uwsgi_fix_php8.patch b/uwsgi_fix_php8.patch deleted file mode 100644 index c968559eb5023b9e08728516656ea8142553bb3d..0000000000000000000000000000000000000000 --- a/uwsgi_fix_php8.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -uNr a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py ---- a/plugins/php/uwsgiplugin.py 2022-01-22 22:40:33.783038869 +0100 -+++ b/plugins/php/uwsgiplugin.py 2022-01-22 22:41:45.261394898 +0100 -@@ -20,7 +20,12 @@ - if ld_run_path: - LDFLAGS.append('-L%s' % ld_run_path) - --LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version] -+# PHP8 and above does not add the version to the library -+# name -+if int(php_version) < 8: -+ LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version] -+else: -+ LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp'] - - phplibdir = os.environ.get('UWSGICONFIG_PHPLIBDIR') - if phplibdir: diff --git a/uwsgi_fix_rpath.patch b/uwsgi_fix_rpath.patch index cb9295b0e64bc5652cf9f26a7e6a7d2637284009..c05d4b87c7987adf41cdda87ba00d048783d1e85 100644 --- a/uwsgi_fix_rpath.patch +++ b/uwsgi_fix_rpath.patch @@ -1,7 +1,7 @@ -diff -uNwr a/plugins/jvm/uwsgiplugin.py b/plugins/jvm/uwsgiplugin.py ---- a/plugins/jvm/uwsgiplugin.py 2022-10-24 12:21:58.000000000 +0200 -+++ b/plugins/jvm/uwsgiplugin.py 2022-10-27 20:37:16.544261133 +0200 -@@ -66,11 +66,6 @@ +diff -uNr a/plugins/jvm/uwsgiplugin.py b/plugins/jvm/uwsgiplugin.py +--- a/plugins/jvm/uwsgiplugin.py 2024-02-08 17:35:28.000000000 +0100 ++++ b/plugins/jvm/uwsgiplugin.py 2024-02-08 21:55:26.627134235 +0100 +@@ -69,11 +69,6 @@ GCC_LIST = ['jvm_plugin'] @@ -13,21 +13,21 @@ diff -uNwr a/plugins/jvm/uwsgiplugin.py b/plugins/jvm/uwsgiplugin.py def post_build(config): if subprocess.call("javac %s/plugins/jvm/uwsgi.java" % os.getcwd(), shell=True) != 0: os._exit(1) -diff -uNwr a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py ---- a/plugins/php/uwsgiplugin.py 2022-10-24 12:21:58.000000000 +0200 -+++ b/plugins/php/uwsgiplugin.py 2022-10-27 20:37:39.006374938 +0200 +diff -uNr a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py +--- a/plugins/php/uwsgiplugin.py 2024-02-08 17:35:28.000000000 +0100 ++++ b/plugins/php/uwsgiplugin.py 2024-02-08 21:56:28.630427541 +0100 @@ -19,7 +19,6 @@ if ld_run_path: LDFLAGS.append('-L%s' % ld_run_path) - os.environ['LD_RUN_PATH'] = ld_run_path - LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version] - -diff -uNwr a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py ---- a/plugins/python/uwsgiplugin.py 2022-10-24 12:21:58.000000000 +0200 -+++ b/plugins/python/uwsgiplugin.py 2022-10-27 20:38:16.898566910 +0200 -@@ -62,9 +62,6 @@ + # PHP8 and above does not add the version to the library + # name +diff -uNr a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py +--- a/plugins/python/uwsgiplugin.py 2024-02-08 17:35:28.000000000 +0100 ++++ b/plugins/python/uwsgiplugin.py 2024-02-08 21:55:26.654133927 +0100 +@@ -88,9 +88,6 @@ libdir = "%s/lib" % sysconfig.PREFIX LDFLAGS.append("-L%s" % libdir) @@ -37,10 +37,10 @@ diff -uNwr a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py LIBS.append('-lpython%s' % get_python_version()) else: -diff -uNwr a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py ---- a/plugins/rack/uwsgiplugin.py 2022-10-24 12:21:58.000000000 +0200 -+++ b/plugins/rack/uwsgiplugin.py 2022-10-27 20:38:50.787738600 +0200 -@@ -46,7 +46,6 @@ +diff -uNr a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py +--- a/plugins/rack/uwsgiplugin.py 2024-02-08 17:35:28.000000000 +0100 ++++ b/plugins/rack/uwsgiplugin.py 2024-02-08 21:55:26.655133916 +0100 +@@ -48,7 +48,6 @@ if has_shared == 'yes': LDFLAGS.append('-L' + libpath ) @@ -48,10 +48,10 @@ diff -uNwr a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip()) else: rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip() -diff -uNwr a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py ---- a/plugins/ruby19/uwsgiplugin.py 2022-10-24 12:21:58.000000000 +0200 -+++ b/plugins/ruby19/uwsgiplugin.py 2022-10-27 20:39:48.879032934 +0200 -@@ -40,6 +40,5 @@ +diff -uNr a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py +--- a/plugins/ruby19/uwsgiplugin.py 2024-02-08 17:35:28.000000000 +0100 ++++ b/plugins/ruby19/uwsgiplugin.py 2024-02-08 21:55:26.655133916 +0100 +@@ -42,6 +42,5 @@ libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip() LDFLAGS.append('-L' + libpath )