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
This commit is contained in:
James Oakley 2023-05-05 12:09:08 +00:00 committed by Git OBS Bridge
parent 217d8618ea
commit a3dc14c43d
3 changed files with 26 additions and 0 deletions

View File

@ -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;

View File

@ -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> Fri Jan 6 20:36:08 UTC 2023 - Dirk Müller <dmueller@suse.com>

View File

@ -56,6 +56,8 @@ Patch3: uwsgi-1.9.11-systemd_logger-old_systemd.patch
Patch4: uwsgi-2.0.18-postgresql-config.patch Patch4: uwsgi-2.0.18-postgresql-config.patch
# PATCH-FIX-UPSTREAM uwsgi-ld-noexecstack.patch - Do not create executable stack # PATCH-FIX-UPSTREAM uwsgi-ld-noexecstack.patch - Do not create executable stack
Patch5: uwsgi-ld-noexecstack.patch Patch5: uwsgi-ld-noexecstack.patch
# https://github.com/unbit/uwsgi/commit/509a0fdd12870d0bf5b4c1ef7d1f7f
Patch6: uwsgi-php82-php_module_startup-signature.patch
BuildRequires: apache-rpm-macros BuildRequires: apache-rpm-macros
%if 0%{suse_version} < 1500 %if 0%{suse_version} < 1500
BuildRequires: apache2-devel BuildRequires: apache2-devel
@ -446,6 +448,7 @@ This package contains support for PHP version 7.
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
# Generate a config that builds all plugins except for examples and stuff we # Generate a config that builds all plugins except for examples and stuff we
# can't satisfy the requirements for or are just broken # can't satisfy the requirements for or are just broken
excluded_plugins="" excluded_plugins=""