From 98604910c206c023ea9ffd51cde73e666a066f47a426c1f04a1866089a8ec1f7 Mon Sep 17 00:00:00 2001
From: James Oakley <jfunk@funktronics.ca>
Date: Wed, 18 Oct 2023 11:43:38 +0000
Subject: [PATCH] Accepting request 1118554 from home:dimstar:Factory

- Update to version 2.0.22:
  + apache2/mod_proxy_uwsgi: stricter backend HTTP response
    parsing/validation (CVE-2023-27522).
  + plugins/rack: fix compilation with ruby 3.1.
  + plugins/php: fix build with PHP >= 8.2.
- Drop uwsgi-php82-php_module_startup-signature.patch: fixed
  upstream.

OBS-URL: https://build.opensuse.org/request/show/1118554
OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=120
---
 2.0.21.tar.gz                                  |  3 ---
 2.0.22.tar.gz                                  |  3 +++
 uwsgi-php82-php_module_startup-signature.patch | 16 ----------------
 uwsgi.changes                                  | 11 +++++++++++
 uwsgi.spec                                     |  5 +----
 5 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 2.0.21.tar.gz
 create mode 100644 2.0.22.tar.gz
 delete mode 100644 uwsgi-php82-php_module_startup-signature.patch

diff --git a/2.0.21.tar.gz b/2.0.21.tar.gz
deleted file mode 100644
index 77a3666..0000000
--- a/2.0.21.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35a30d83791329429bc04fe44183ce4ab512fcf6968070a7bfba42fc5a0552a9
-size 808494
diff --git a/2.0.22.tar.gz b/2.0.22.tar.gz
new file mode 100644
index 0000000..2589fb4
--- /dev/null
+++ b/2.0.22.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc6a35ab3b9606d24e98473c7117792a239e5d56b01301b15511651f684166c9
+size 809498
diff --git a/uwsgi-php82-php_module_startup-signature.patch b/uwsgi-php82-php_module_startup-signature.patch
deleted file mode 100644
index ce80024..0000000
--- a/uwsgi-php82-php_module_startup-signature.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: uwsgi-2.0.21/plugins/php/php_plugin.c
-===================================================================
---- uwsgi-2.0.21.orig/plugins/php/php_plugin.c
-+++ uwsgi-2.0.21/plugins/php/php_plugin.c
-@@ -607,7 +607,11 @@ static void activate_user_config(const c
- static int php_uwsgi_startup(sapi_module_struct *sapi_module)
- {
- 
-+#if ((PHP_MAJOR_VERSION >= 8) && (PHP_MINOR_VERSION >= 2))
-+	if (php_module_startup(&uwsgi_sapi_module, &uwsgi_module_entry)==FAILURE) {
-+#else
- 	if (php_module_startup(&uwsgi_sapi_module, &uwsgi_module_entry, 1)==FAILURE) {
-+#endif
- 		return FAILURE;
- 	} else {
- 		return SUCCESS;
diff --git a/uwsgi.changes b/uwsgi.changes
index 9048054..2e1f7fb 100644
--- a/uwsgi.changes
+++ b/uwsgi.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Oct 18 09:48:50 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 2.0.22:
+  + apache2/mod_proxy_uwsgi: stricter backend HTTP response
+    parsing/validation (CVE-2023-27522).
+  + plugins/rack: fix compilation with ruby 3.1.
+  + plugins/php: fix build with PHP >= 8.2.
+- Drop uwsgi-php82-php_module_startup-signature.patch: fixed
+  upstream.
+
 -------------------------------------------------------------------
 Sat Jul  1 19:53:24 UTC 2023 - Andreas Schneider <asn@cryptomilk.org>
 
diff --git a/uwsgi.spec b/uwsgi.spec
index 9462fb6..15c30bd 100644
--- a/uwsgi.spec
+++ b/uwsgi.spec
@@ -29,7 +29,7 @@
 %endif
 
 Name:           uwsgi
-Version:        2.0.21
+Version:        2.0.22
 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
@@ -57,8 +57,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
-# https://github.com/unbit/uwsgi/commit/509a0fdd12870d0bf5b4c1ef7d1f7f
-Patch6:         uwsgi-php82-php_module_startup-signature.patch
 BuildRequires:  apache-rpm-macros
 %if 0%{suse_version} < 1500
 BuildRequires:  apache2-devel
@@ -449,7 +447,6 @@ This package contains support for PHP version 7.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -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=""