From 73387cd7dc1167dbb2405f9d77448491fe593139831bb12ab820b5ad57575feb Mon Sep 17 00:00:00 2001 From: James Oakley Date: Fri, 27 Nov 2020 11:44:18 +0000 Subject: [PATCH] Accepting request 851152 from home:dirkmueller:branches:server:http MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - update 2.0.19.1: * Reverted CGI chunked encoding support * Fixed bug with WSGI responses returning * Update travis to xenial (Terence D. Honles) * Fix segfault in logsocket plugin (Riccardo Magliocchetti, #2010) * Backport Coverity fixes from master (Riccardo Magliocchetti) * Fix Python 3.7 warnings (Orivej Desh) * Fix uwsgi.workers() leak in Python plugin (Arne Welzel, #2056) * Backport redislog plugin 32-bit build fixes (Riccardo Magliocchetti, #1828) * Fix stack overflow in core/rpc (Nicola Martino) * Fix build with spaces in the path (Arne Welzel, #1939) * Add missing initialization for zend_file_handle in php plugin (Arne Welzel) * Build Python 3.7 and 3.8 plugins in CI (Arne Welzel) * Add Trove classifiers for Python 3.7 and 3.8 (Hugo) * Graceful shutdown for vassals (Sponsored by guppyltd.com) * Improve yaml parsing with libyaml (Arne Welzel, #2097) * Add smart-daemon2 option to notify daemon of master reloading (Eduardo Felipe Castegnaro) * Do not chroot multiple times when root (Arne Welzel) * Support io.BytesIO with wsgi.file_wrapper (Arne Welzel, #1126) * Add websocket continuation frames support (Timi, #1350) * Fix compilation with gevent 1.5.0 (Vytautas Liuolia) * Fix PSGI plugin build with gcc 10 (Jorge Gallegos) * Get rid of paste.script dependency in pypy/python plugins (Thomas De Schampheleire) * Improve performance for santitizing file descriptors with cgi plugin (Natanael Copa, #2053) * Fix offload-threads with honour-range (Liss Tarnell) * Fix logging packet size length overflow (Pawel Marokwsi) * Fix possible deadlock in install (Jacob Tolar) * Fix parsing of http port for ipv6 (Cyril Baÿ) * Fix impossibility of determining the end of the chunked stream with psgi plugin (ols) * Fix parsing of http-socket port for ipv6 (Daniel Holth) OBS-URL: https://build.opensuse.org/request/show/851152 OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=96 --- uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch | 38 --------------------- uwsgi-2.0.18.tar.gz | 3 -- uwsgi-2.0.19.1.tar.gz | 3 ++ uwsgi.changes | 38 +++++++++++++++++++++ uwsgi.spec | 5 +-- 5 files changed, 42 insertions(+), 45 deletions(-) delete mode 100644 uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch delete mode 100644 uwsgi-2.0.18.tar.gz create mode 100644 uwsgi-2.0.19.1.tar.gz diff --git a/uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch b/uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch deleted file mode 100644 index bde827e..0000000 --- a/uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/plugins/psgi/psgi.h b/plugins/psgi/psgi.h -index 92e6b588..064041a2 100644 ---- a/plugins/psgi/psgi.h -+++ b/plugins/psgi/psgi.h -@@ -87,3 +87,5 @@ void uwsgi_perl_exec(char *); - - void uwsgi_perl_check_auto_reload(void); - void uwsgi_psgi_preinit_apps(void); -+ -+extern struct uwsgi_perl uperl; -diff --git a/plugins/psgi/psgi_loader.c b/plugins/psgi/psgi_loader.c -index 1e61f0e9..a9211185 100644 ---- a/plugins/psgi/psgi_loader.c -+++ b/plugins/psgi/psgi_loader.c -@@ -1,7 +1,6 @@ - #include "psgi.h" - - extern struct uwsgi_server uwsgi; --struct uwsgi_perl uperl; - - extern struct uwsgi_plugin psgi_plugin; - -diff --git a/plugins/psgi/psgi_plugin.c b/plugins/psgi/psgi_plugin.c -index e1177be2..8ca0a2ed 100644 ---- a/plugins/psgi/psgi_plugin.c -+++ b/plugins/psgi/psgi_plugin.c -@@ -3,11 +3,7 @@ - extern char **environ; - extern struct uwsgi_server uwsgi; - --#ifdef __APPLE__ --extern struct uwsgi_perl uperl; --#else - struct uwsgi_perl uperl; --#endif - - struct uwsgi_plugin psgi_plugin; - \ No newline at end of file diff --git a/uwsgi-2.0.18.tar.gz b/uwsgi-2.0.18.tar.gz deleted file mode 100644 index 4c0e86d..0000000 --- a/uwsgi-2.0.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583 -size 801555 diff --git a/uwsgi-2.0.19.1.tar.gz b/uwsgi-2.0.19.1.tar.gz new file mode 100644 index 0000000..0f5dda5 --- /dev/null +++ b/uwsgi-2.0.19.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56be307f3bfcf6cc074f4354de6403778d7ec3e44addac896e26ffb3c4d9a608 +size 811149 diff --git a/uwsgi.changes b/uwsgi.changes index 9852589..47659a5 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Thu Nov 26 18:51:29 UTC 2020 - Dirk Mueller + +- update 2.0.19.1: + * Reverted CGI chunked encoding support + * Fixed bug with WSGI responses returning + * Update travis to xenial (Terence D. Honles) + * Fix segfault in logsocket plugin (Riccardo Magliocchetti, #2010) + * Backport Coverity fixes from master (Riccardo Magliocchetti) + * Fix Python 3.7 warnings (Orivej Desh) + * Fix uwsgi.workers() leak in Python plugin (Arne Welzel, #2056) + * Backport redislog plugin 32-bit build fixes (Riccardo Magliocchetti, #1828) + * Fix stack overflow in core/rpc (Nicola Martino) + * Fix build with spaces in the path (Arne Welzel, #1939) + * Add missing initialization for zend_file_handle in php plugin (Arne Welzel) + * Build Python 3.7 and 3.8 plugins in CI (Arne Welzel) + * Add Trove classifiers for Python 3.7 and 3.8 (Hugo) + * Graceful shutdown for vassals (Sponsored by guppyltd.com) + * Improve yaml parsing with libyaml (Arne Welzel, #2097) + * Add smart-daemon2 option to notify daemon of master reloading (Eduardo Felipe Castegnaro) + * Do not chroot multiple times when root (Arne Welzel) + * Support io.BytesIO with wsgi.file_wrapper (Arne Welzel, #1126) + * Add websocket continuation frames support (Timi, #1350) + * Fix compilation with gevent 1.5.0 (Vytautas Liuolia) + * Fix PSGI plugin build with gcc 10 (Jorge Gallegos) + * Get rid of paste.script dependency in pypy/python plugins (Thomas De Schampheleire) + * Improve performance for santitizing file descriptors with cgi plugin (Natanael Copa, #2053) + * Fix offload-threads with honour-range (Liss Tarnell) + * Fix logging packet size length overflow (Pawel Marokwsi) + * Fix possible deadlock in install (Jacob Tolar) + * Fix parsing of http port for ipv6 (Cyril Baÿ) + * Fix impossibility of determining the end of the chunked stream with psgi plugin (ols) + * Fix parsing of http-socket port for ipv6 (Daniel Holth) + * Add chunked request decoding to the CGI plugin (Robert Schindler) + * Add add max-worker-lifetime-delta to reload workers with a delta (Marcin Lulek , #2020) + +- remove uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch (upstream) + ------------------------------------------------------------------- Wed Sep 9 10:29:20 UTC 2020 - Andreas Schneider diff --git a/uwsgi.spec b/uwsgi.spec index 9dbe7f5..e5f6fc8 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -17,7 +17,7 @@ Name: uwsgi -Version: 2.0.18 +Version: 2.0.19.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 @@ -43,8 +43,6 @@ Patch2: uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch Patch3: uwsgi-1.9.11-systemd_logger-old_systemd.patch # PATCH-FIX-OPENSUSE uwsgi-2.0.18-postgresql-config.patch - Use pkg-config instead of pg_config Patch4: uwsgi-2.0.18-postgresql-config.patch -# PATCH-FIX-OPENSUSE uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch - Fix duplicate uperl with gcc 10 -Patch5: uwsgi-2.0.18-psgi-fix-duplicate-uperl.patch %define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o "2\\.[0-9]+") %if "%{apache_branch}" == "2.4" %define apxs %{_bindir}/apxs2 @@ -439,7 +437,6 @@ This package contains support for PHP version 7. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 # Generate a config that builds all plugins except for examples and stuff we # can't satisfy the requirements for or are just broken excluded_plugins=""