From df3c1a7f845575bae68e02ffa641e874ba527ab8afbe9fcdf41d4e61eb721aee Mon Sep 17 00:00:00 2001 From: James Oakley Date: Mon, 16 Apr 2018 14:13:38 +0000 Subject: [PATCH 1/2] - Update to 2.0.17: * The Emperor throttling subsystem does not make use anymore of blocking functions, like usleep(), this should fix stats serving and should improve vassals startup time * [Security/PHP] enforce DOCUMENT_ROOT check when using --php-docroot to avoid directory traversal (Marios Nicolaides) * added --shutdown-sockets to improve graceful shutdowns (Andrew Wason) OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=66 --- uwsgi-2.0.16.tar.gz | 3 --- uwsgi-2.0.17.tar.gz | 3 +++ uwsgi.changes | 11 +++++++++++ uwsgi.spec | 6 +++++- 4 files changed, 19 insertions(+), 4 deletions(-) delete mode 100644 uwsgi-2.0.16.tar.gz create mode 100644 uwsgi-2.0.17.tar.gz diff --git a/uwsgi-2.0.16.tar.gz b/uwsgi-2.0.16.tar.gz deleted file mode 100644 index 6d1972e..0000000 --- a/uwsgi-2.0.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a911f48f3cc51ac82fdabc4e001f18a32569128680beb5a833ebc3ff6edcc1f4 -size 798509 diff --git a/uwsgi-2.0.17.tar.gz b/uwsgi-2.0.17.tar.gz new file mode 100644 index 0000000..fbae39f --- /dev/null +++ b/uwsgi-2.0.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dc2e9b48db92b67bfec1badec0d3fdcc0771316486c5efa3217569da3528bf2 +size 798642 diff --git a/uwsgi.changes b/uwsgi.changes index 139bfa2..dc1bccc 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Apr 16 13:42:59 UTC 2018 - jfunk@funktronics.ca + +- Update to 2.0.17: + * The Emperor throttling subsystem does not make use anymore of blocking + functions, like usleep(), this should fix stats serving and should improve + vassals startup time + * [Security/PHP] enforce DOCUMENT_ROOT check when using --php-docroot to + avoid directory traversal (Marios Nicolaides) + * added --shutdown-sockets to improve graceful shutdowns (Andrew Wason) + ------------------------------------------------------------------- Tue Feb 27 11:53:27 UTC 2018 - bjorn.lie@gmail.com diff --git a/uwsgi.spec b/uwsgi.spec index 908ae50..d6b8f27 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -17,7 +17,7 @@ Name: uwsgi -Version: 2.0.16 +Version: 2.0.17 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 @@ -48,6 +48,9 @@ Patch3: uwsgi-1.9.11-systemd_logger-old_systemd.patch %endif %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) BuildRequires: apache2-devel +%if 0%{?suse_version} >= 1500 +BuildRequires: argon2-devel +%endif BuildRequires: gcc-c++ BuildRequires: gcc-objc %if 0%{?suse_version} > 1220 @@ -75,6 +78,7 @@ BuildRequires: lua51-devel BuildRequires: lua-devel %endif #BuildRequires: mono-web +BuildRequires: ncurses-devel BuildRequires: openldap2-devel BuildRequires: openssl-devel BuildRequires: pam-devel From 297f41ef5b01ecf6ae25cba1d0629d8bb9dc4707ecc4493bccf74e110b6e3225 Mon Sep 17 00:00:00 2001 From: James Oakley Date: Mon, 16 Apr 2018 23:50:18 +0000 Subject: [PATCH 2/2] - Disable apache2-mod_proxy_uwsgi on Leap 15 since upstream Apache includes the module now OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=67 --- uwsgi.changes | 6 ++++++ uwsgi.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/uwsgi.changes b/uwsgi.changes index dc1bccc..dee25df 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 16 23:48:42 UTC 2018 - jfunk@funktronics.ca + +- Disable apache2-mod_proxy_uwsgi on Leap 15 since upstream Apache includes + the module now + ------------------------------------------------------------------- Mon Apr 16 13:42:59 UTC 2018 - jfunk@funktronics.ca diff --git a/uwsgi.spec b/uwsgi.spec index d6b8f27..573c569 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -154,6 +154,7 @@ Different plugins can be used in order to add compatibility with different technology on top of the same core. +%if 0%{suse_version} < 1500 %package -n apache2-mod_proxy_uwsgi Summary: uWSGI Proxy Module for Apache 2.0 Group: Productivity/Networking/Web/Servers @@ -163,7 +164,7 @@ Requires: %{name} = %{version} uWSGI is a self-healing application container server coded in pure C. This package contains an Apache 2.0 proxy module for uWSGI. - +%endif %package -n apache2-mod_uwsgi Summary: uWSGI Module for Apache 2.0 @@ -525,7 +526,9 @@ python uwsgiconfig.py --build opensuse python3 uwsgiconfig.py --plugin plugins/python opensuse python3 # Build Apache modules +%if 0%{suse_version} < 1500 %{apxs} -c apache2/mod_proxy_uwsgi.c +%endif %{apxs} -c apache2/mod_uwsgi.c # Build php7 plugin @@ -656,9 +659,11 @@ ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcuwsgi %{_libdir}/uwsgi/zabbix_plugin.so %{_libdir}/uwsgi/zergpool_plugin.so +%if 0%{suse_version} < 1500 %files -n apache2-mod_proxy_uwsgi %defattr(-,root,root,-) %{apache_libexecdir}/mod_proxy_uwsgi.so +%endif %files -n apache2-mod_uwsgi %defattr(-,root,root,-)