Bug#1028092: [pkg-uWSGI-devel] Bug#1028092: uwsgi-plugin-php FTBFS with PHP 8.2

2023-01-27 Thread Jonas Smedegaard 
Quoting Alexandre Rossi (2023-01-10 11:11:50)
> > The fix seems straightforward, I'll see if I can provide a patch.
> 
> The fix was indeed straightforward and tested successfully.
> 
> https://salsa.debian.org/uwsgi-team/uwsgi/-/commit/36aaa1dd685b446d0240f89e000b04fc6031e324
> 
> @Jonas, please ping me if you need some help to prepare the upload of uwsgi 
> and
> uwsgi-plugin-php .

Thanks for the bugfix!

Great that you also forwarded it upstream - much appreciated!

I cherry-picked your upstream fix and only after the release realized
that you'd pushed a fix directly to our git as well, so I force-pushed
that to oblivion simply because that was easier than fake-merging it
away with same net result.  For the record, your pushing to our git was
perfectly alright, it is me who handled this messy.

When the new uwsgi package arrives in unstable, I will move on to do a
release of the separately package php plugin, which will close this bug.

Thanks again!

 - Jonas

-- 
 * Jonas Smedegaard - idealist & Internet-arkitekt
 * Tlf.: +45 40843136  Website: http://dr.jones.dk/
 * Sponsorship: https://ko-fi.com/drjones

 [x] quote me freely  [ ] ask before reusing  [ ] keep private

signature.asc
Description: signature

Bug#1028092: [pkg-uWSGI-devel] Bug#1028092: uwsgi-plugin-php FTBFS with PHP 8.2

2023-01-10 Thread Alexandre Rossi 
Hi,

> The fix seems straightforward, I'll see if I can provide a patch.

The fix was indeed straightforward and tested successfully.

https://salsa.debian.org/uwsgi-team/uwsgi/-/commit/36aaa1dd685b446d0240f89e000b04fc6031e324

@Jonas, please ping me if you need some help to prepare the upload of uwsgi and
uwsgi-plugin-php .

Thanks,

Alex

Bug#1028092: [pkg-uWSGI-devel] Bug#1028092: uwsgi-plugin-php FTBFS with PHP 8.2

2023-01-10 Thread Alexandre Rossi 
Hi,

Thanks for reporting.

> /usr/src/uwsgi/plugins/php/php_plugin.c: In function ‘php_uwsgi_startup’:
> /usr/src/uwsgi/plugins/php/php_plugin.c:610:13: error: too many arguments to 
> function ‘php_module_startup’
>   610 | if (php_module_startup(&uwsgi_sapi_module, 
> &uwsgi_module_entry, 1)==FAILURE) {
>   | ^~
> In file included from /usr/src/uwsgi/plugins/php/common.h:3,
>  from /usr/src/uwsgi/plugins/php/php_plugin.c:1:
> /usr/include/php/20220829/main/php_main.h:28:20: note: declared here
>28 | PHPAPI zend_result php_module_startup(sapi_module_struct *sf, 
> zend_module_entry *additional_module);
>   |^~

Seems to be related to:


5. SAPI changes


 * The signature of php_module_startup() has changed from
   int php_module_startup(sapi_module_struct *sf, zend_module_entry 
*additional_modules, uint32_t num_additional_modules)
   to
   zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry 
*additional_module)
   as only one additional module was ever provided.

(from https://raw.githubusercontent.com/php/php-src/PHP-8.2/UPGRADING.INTERNALS 
)

The fix seems straightforward, I'll see if I can provide a patch.

Thanks,

Alex