From f41829b75344b68e9f7af6ba5ca6014ef9000c5c88ab07fad44c8564ff274278 Mon Sep 17 00:00:00 2001 From: James Oakley Date: Tue, 14 May 2024 08:56:40 +0000 Subject: [PATCH] Accepting request 1173910 from home:pgajdos - 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) OBS-URL: https://build.opensuse.org/request/show/1173910 OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=127 --- uwsgi-1.9.17-plugin_build_path.patch | 8 +++--- ...date-glusterfs-io-callback-signature.patch | 27 ------------------- uwsgi-2.0.24.tar.gz | 3 --- uwsgi-2.0.25.1.tar.gz | 3 +++ uwsgi.changes | 20 ++++++++++++++ uwsgi.spec | 4 +-- 6 files changed, 28 insertions(+), 37 deletions(-) delete mode 100644 uwsgi-2.0.24-update-glusterfs-io-callback-signature.patch delete mode 100644 uwsgi-2.0.24.tar.gz create mode 100644 uwsgi-2.0.25.1.tar.gz 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.24-update-glusterfs-io-callback-signature.patch b/uwsgi-2.0.24-update-glusterfs-io-callback-signature.patch deleted file mode 100644 index a3a26e7..0000000 --- a/uwsgi-2.0.24-update-glusterfs-io-callback-signature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ec7afe03a87210d1e76b5c56101e94f9e4ba175a Mon Sep 17 00:00:00 2001 -From: Ralf Ertzinger -Date: Sat, 10 Feb 2024 18:01:49 +0100 -Subject: [PATCH] Update glusterfs io callback function signature - -Starting with glusterfs 6.0, the IO callback function takes two -additional parameters for stats structs. - -Ideally there'd be a way to detect which API version we're building -against, but nothing convenient seems to exist. ---- - plugins/glusterfs/glusterfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/glusterfs/glusterfs.c b/plugins/glusterfs/glusterfs.c -index 83428faf3f..c0063f4e58 100644 ---- a/plugins/glusterfs/glusterfs.c -+++ b/plugins/glusterfs/glusterfs.c -@@ -46,7 +46,7 @@ struct uwsgi_glusterfs_async_io { - ssize_t rlen; - }; - --static void uwsgi_glusterfs_read_async_cb(glfs_fd_t *fd, ssize_t rlen, void *data) { -+static void uwsgi_glusterfs_read_async_cb(glfs_fd_t *fd, ssize_t rlen, struct glfs_stat *prestat, struct glfs_stat *poststat, void *data) { - struct uwsgi_glusterfs_async_io *aio = (struct uwsgi_glusterfs_async_io *) data; - #ifdef UWSGI_DEBUG - uwsgi_log("[glusterfs-cb] rlen = %d\n", rlen); diff --git a/uwsgi-2.0.24.tar.gz b/uwsgi-2.0.24.tar.gz deleted file mode 100644 index 660d6a4..0000000 --- a/uwsgi-2.0.24.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77b6dd5cd633f4ae87ee393f7701f617736815499407376e78f3d16467523afe -size 810559 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.changes b/uwsgi.changes index 8a68f7e..a16e667 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +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 diff --git a/uwsgi.spec b/uwsgi.spec index 959d326..babe438 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -29,7 +29,7 @@ %endif Name: uwsgi -Version: 2.0.24 +Version: 2.0.25.1 Release: 0 Summary: Application Container Server for Networked/Clustered Web Applications @@ -58,8 +58,6 @@ Patch3: uwsgi-1.9.11-systemd_logger-old_systemd.patch Patch4: uwsgi-2.0.18-postgresql-config.patch # PATCH-FIX-UPSTREAM uwsgi-ld-noexecstack.patch - Do not create executable stack Patch5: uwsgi-ld-noexecstack.patch -# PATCH-FIX-UPSTREAM uwsgi-2.0.24-update-glusterfs-io-callback-signature.patch - Support GlusterFS >= 6.0 -Patch6: uwsgi-2.0.24-update-glusterfs-io-callback-signature.patch BuildRequires: apache-rpm-macros %if 0%{suse_version} < 1500 BuildRequires: apache2-devel