From a3dc14c43d492d1ceaedeb6bd5ddf27dcfcd0d817c20a1eaa1cbfd234c303a68 Mon Sep 17 00:00:00 2001
From: James Oakley <jfunk@funktronics.ca>
Date: Fri, 5 May 2023 12:09:08 +0000
Subject: [PATCH] Accepting request 1085034 from home:pgajdos

- added patches
  fix https://github.com/unbit/uwsgi/commit/509a0fdd12870d0bf5b4c1ef7d1f7f
  + uwsgi-php82-php_module_startup-signature.patch

OBS-URL: https://build.opensuse.org/request/show/1085034
OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=116
---
 uwsgi-php82-php_module_startup-signature.patch | 16 ++++++++++++++++
 uwsgi.changes                                  |  7 +++++++
 uwsgi.spec                                     |  3 +++
 3 files changed, 26 insertions(+)
 create mode 100644 uwsgi-php82-php_module_startup-signature.patch

diff --git a/uwsgi-php82-php_module_startup-signature.patch b/uwsgi-php82-php_module_startup-signature.patch
new file mode 100644
index 0000000..ce80024
--- /dev/null
+++ b/uwsgi-php82-php_module_startup-signature.patch
@@ -0,0 +1,16 @@
+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 c3b00cf..fff8fad 100644
--- a/uwsgi.changes
+++ b/uwsgi.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May  5 10:49:27 UTC 2023 - pgajdos@suse.com
+
+- added patches
+  fix https://github.com/unbit/uwsgi/commit/509a0fdd12870d0bf5b4c1ef7d1f7f
+  + uwsgi-php82-php_module_startup-signature.patch
+
 -------------------------------------------------------------------
 Fri Jan  6 20:36:08 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
diff --git a/uwsgi.spec b/uwsgi.spec
index df92ce1..960b68a 100644
--- a/uwsgi.spec
+++ b/uwsgi.spec
@@ -56,6 +56,8 @@ 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
@@ -446,6 +448,7 @@ 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=""