diff --git a/uwsgi-1.9.17-plugin_build_path.patch b/uwsgi-1.9.17-plugin_build_path.patch index 0010d23..598178f 100644 --- a/uwsgi-1.9.17-plugin_build_path.patch +++ b/uwsgi-1.9.17-plugin_build_path.patch @@ -1,8 +1,8 @@ -Index: uwsgi-2.0.13/uwsgiconfig.py +Index: uwsgi-2.0.25.1/uwsgiconfig.py =================================================================== ---- uwsgi-2.0.13.orig/uwsgiconfig.py -+++ uwsgi-2.0.13/uwsgiconfig.py -@@ -1420,10 +1420,7 @@ def build_plugin(path, uc, cflags, ldfla +--- uwsgi-2.0.25.1.orig/uwsgiconfig.py ++++ uwsgi-2.0.25.1/uwsgiconfig.py +@@ -1444,10 +1444,7 @@ def build_plugin(path, uc, cflags, ldfla except: pass diff --git a/uwsgi-2.0.12-no-LD_RUN_PATH.patch b/uwsgi-2.0.12-no-LD_RUN_PATH.patch index e49ea9e..cac4fee 100644 --- a/uwsgi-2.0.12-no-LD_RUN_PATH.patch +++ b/uwsgi-2.0.12-no-LD_RUN_PATH.patch @@ -1,8 +1,6 @@ -Index: uwsgi-2.0.21/plugins/jvm/uwsgiplugin.py -=================================================================== ---- uwsgi-2.0.21.orig/plugins/jvm/uwsgiplugin.py -+++ uwsgi-2.0.21/plugins/jvm/uwsgiplugin.py -@@ -66,11 +66,6 @@ if "-framework JavaVM" in JVM_LIBPATH: +--- a/plugins/jvm/uwsgiplugin.py ++++ b/plugins/jvm/uwsgiplugin.py +@@ -69,11 +69,6 @@ if "-framework JavaVM" in JVM_LIBPATH: GCC_LIST = ['jvm_plugin'] @@ -14,23 +12,19 @@ Index: uwsgi-2.0.21/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) -Index: uwsgi-2.0.21/plugins/php/uwsgiplugin.py -=================================================================== ---- uwsgi-2.0.21.orig/plugins/php/uwsgiplugin.py -+++ uwsgi-2.0.21/plugins/php/uwsgiplugin.py +--- a/plugins/php/uwsgiplugin.py ++++ b/plugins/php/uwsgiplugin.py @@ -19,7 +19,6 @@ LDFLAGS = os.popen(PHPPATH + ' --ldflags 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] - -Index: uwsgi-2.0.21/plugins/python/uwsgiplugin.py -=================================================================== ---- uwsgi-2.0.21.orig/plugins/python/uwsgiplugin.py -+++ uwsgi-2.0.21/plugins/python/uwsgiplugin.py -@@ -64,8 +64,6 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro + # PHP8 and above does not add the version to the library + # name +--- a/plugins/python/uwsgiplugin.py ++++ b/plugins/python/uwsgiplugin.py +@@ -90,8 +90,6 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro LDFLAGS.append("-L%s" % libdir) LDFLAGS.append("-Wl,-rpath,%s" % libdir) @@ -39,11 +33,9 @@ Index: uwsgi-2.0.21/plugins/python/uwsgiplugin.py LIBS.append('-lpython%s' % get_python_version()) else: LIBS = [] -Index: uwsgi-2.0.21/plugins/rack/uwsgiplugin.py -=================================================================== ---- uwsgi-2.0.21.orig/plugins/rack/uwsgiplugin.py -+++ uwsgi-2.0.21/plugins/rack/uwsgiplugin.py -@@ -46,7 +46,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir +--- a/plugins/rack/uwsgiplugin.py ++++ b/plugins/rack/uwsgiplugin.py +@@ -48,7 +48,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir if has_shared == 'yes': LDFLAGS.append('-L' + libpath ) @@ -51,11 +43,9 @@ Index: uwsgi-2.0.21/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() -Index: uwsgi-2.0.21/plugins/ruby19/uwsgiplugin.py -=================================================================== ---- uwsgi-2.0.21.orig/plugins/ruby19/uwsgiplugin.py -+++ uwsgi-2.0.21/plugins/ruby19/uwsgiplugin.py -@@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req +--- a/plugins/ruby19/uwsgiplugin.py ++++ b/plugins/ruby19/uwsgiplugin.py +@@ -42,6 +42,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip() LDFLAGS.append('-L' + libpath ) diff --git a/uwsgi-2.0.23.tar.gz b/uwsgi-2.0.23.tar.gz deleted file mode 100644 index e6697f9..0000000 --- a/uwsgi-2.0.23.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f498466b7bb5818c694496fa7fc32bd6442f6057db94d95af9bfa050440aa4ef -size 810116 diff --git a/uwsgi-2.0.25.1.tar.gz b/uwsgi-2.0.25.1.tar.gz new file mode 100644 index 0000000..9274ffd --- /dev/null +++ b/uwsgi-2.0.25.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1e4a401f71d29e49d4762223412c32a42594c415f9d72d0f759680e5b8f4cf9 +size 811635 diff --git a/uwsgi-ld-noexecstack.patch b/uwsgi-ld-noexecstack.patch index 9b0304a..e1ca552 100644 --- a/uwsgi-ld-noexecstack.patch +++ b/uwsgi-ld-noexecstack.patch @@ -1,8 +1,6 @@ -Index: uwsgi-2.0.21/uwsgiconfig.py -=================================================================== ---- uwsgi-2.0.21.orig/uwsgiconfig.py -+++ uwsgi-2.0.21/uwsgiconfig.py -@@ -539,7 +539,7 @@ def build_uwsgi(uc, print_only=False, gc +--- a/uwsgiconfig.py ++++ b/uwsgiconfig.py +@@ -535,7 +535,7 @@ def build_uwsgi(uc, print_only=False, gc gcc_list.append('%s/%s' % (path, cfile)) for bfile in up.get('BINARY_LIST', []): try: @@ -11,7 +9,7 @@ Index: uwsgi-2.0.21/uwsgiconfig.py print(binary_link_cmd) if subprocess.call(binary_link_cmd, shell=True) != 0: raise Exception('unable to link binary file') -@@ -1146,7 +1146,7 @@ class uConf(object): +@@ -1150,7 +1150,7 @@ class uConf(object): if not self.embed_config: self.embed_config = self.get('embed_config') if self.embed_config: @@ -20,7 +18,7 @@ Index: uwsgi-2.0.21/uwsgiconfig.py print(binary_link_cmd) subprocess.call(binary_link_cmd, shell=True) self.cflags.append("-DUWSGI_EMBED_CONFIG=_binary_%s_start" % binarize(self.embed_config)) -@@ -1165,7 +1165,7 @@ class uConf(object): +@@ -1169,7 +1169,7 @@ class uConf(object): for directory, directories, files in os.walk(ef): for f in files: fname = "%s/%s" % (directory, f) @@ -29,7 +27,7 @@ Index: uwsgi-2.0.21/uwsgiconfig.py print(binary_link_cmd) subprocess.call(binary_link_cmd, shell=True) if symbase: -@@ -1175,7 +1175,7 @@ class uConf(object): +@@ -1179,7 +1179,7 @@ class uConf(object): subprocess.call(objcopy_cmd, shell=True) binary_list.append(binarize(fname)) else: @@ -38,7 +36,7 @@ Index: uwsgi-2.0.21/uwsgiconfig.py print(binary_link_cmd) subprocess.call(binary_link_cmd, shell=True) binary_list.append(binarize(ef)) -@@ -1460,7 +1460,7 @@ def build_plugin(path, uc, cflags, ldfla +@@ -1464,7 +1464,7 @@ def build_plugin(path, uc, cflags, ldfla gcc_list.append(path + '/' + cfile) for bfile in up.get('BINARY_LIST', []): try: diff --git a/uwsgi.changes b/uwsgi.changes index f5300d8..a16e667 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue May 14 07:07:42 UTC 2024 - pgajdos@suse.com + +- version update to 2.0.25.1 + * fixed build with gcc14 + 2.0.25.1 + * Fix build when pcre is not found and is optional (umut) + 2.0.25 + * Update glusterfs io callback function signature for 6.0 (Ralf Ertzinger) + * Fix default values in help for min-worker-lifetime & legion-skew-tolerance (Thomas Riccardi) + * Fix build regression with gcc < 5 (Riccardo Magliocchetti) + * Add support for building against prcre2. This changes the regexp internal data structures (Alexandre Rossi) + * Allow the valgrind generator script to run with a different python version (Wynn Wilkes) + * Fix a potential error with not releasing the gil in uwsgi_python_rpc (Wynn Wilkes) + * Rework threading cancellation handling. This can fix issues with threading, missing atexit callbacks and whatnot. (Inada Naoki) +- modified patches + % uwsgi-1.9.17-plugin_build_path.patch (refreshed) +- deleted patches + - uwsgi-2.0.24-update-glusterfs-io-callback-signature.patch (upstreamed) + +------------------------------------------------------------------- +Fri Mar 15 14:26:20 UTC 2024 - James Oakley + +- Update to 2.0.24 + * properly init cache for purge_lru (Alexandre Rossi) + * fix linking with php8 (Remi Collet) + * remove unused variables to fix compilation (László Károlyi) + * fix function parameter type to avoid overflow in harakiri (Shai Bentov) + * fix socket queue stats for ipv6 (Riccardo Magliocchetti) + * fixup -Wformat-signedness warnings (Riccardo Magliocchetti) + * Avoid strncpy from null in pyloader (Ben Kallus) + * add clang to compile test matrix in ci (Riccardo Magliocchetti) + ------------------------------------------------------------------- Tue Feb 20 15:39:21 UTC 2024 - Dominique Leuenberger diff --git a/uwsgi.spec b/uwsgi.spec index df7ecc1..babe438 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -29,7 +29,8 @@ %endif Name: uwsgi -Version: 2.0.23 +Version: 2.0.25.1 + Release: 0 Summary: Application Container Server for Networked/Clustered Web Applications License: Apache-2.0 AND GPL-2.0-only WITH GCC-exception-2.0