[arch-commits] Commit in uwsgi/trunk (PKGBUILD)

[David Runge]

    Date: Tuesday, February 1, 2022 @ 08:58:57
  Author: dvzrv
Revision: 1121812

upgpkg: uwsgi 2.0.20-5: Rebuild to apply fixes for php >= 8.0.

Add description for patch to allow compilation with ruby >= 2.0.
Add patch for missing arginfo with php >= 8.0.
Add patch for issue with php >= 8.1: https://bugs.archlinux.org/task/73470

Modified:
  uwsgi/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-01 08:56:45 UTC (rev 1121811)
+++ PKGBUILD	2022-02-01 08:58:57 UTC (rev 1121812)
@@ -24,7 +24,7 @@
   uwsgi-plugin-notfound
 )
 pkgver=2.0.20
-pkgrel=4
+pkgrel=5
 pkgdesc="A full stack for building hosting services"
 arch=(x86_64)
 url="https://uwsgi-docs.readthedocs.io/en/latest/"
@@ -62,6 +62,8 @@
   uwsgi.sysusers
   uwsgi.tmpfiles
   "${pkgbase}-1.9.13-ruby2.0.patch"
+  "${pkgbase}-2.0.20-php8_arginfo.patch::https://github.com/unbit/uwsgi/pull/2391/commits/90766833f2bcd2a83039ed4e18501bfb52162e6c.patch"
+  "${pkgbase}-2.0.20-php8.1.patch::https://github.com/unbit/uwsgi/pull/2400/commits/8ca18da9a01eee19156243c5c0d28d2572698e4a.patch"
 )
 sha512sums=('22677a8ad1ea886e1a3a153f486474ce064a55e5b12515322345116980f699f4e2e73267f991c300d904284e06f265ea821e71ba3c97832b6f25705475b498ff'
             '51c474a5ae025c0fae17dec309bea29550a8ca39815b7495189394ae5ce30eb264f77a45f48f9f7529c59d907baf139cdf7c488d1b13fcb862cc7b9bdc268804'
@@ -73,7 +75,9 @@
             '937878372aa1556f6ba62ad7148d1681288c94d6cff609368a9e861dd4d4524330006a08ae5993441f7d3101170e3a0a681a4c8b3c2c13b364b8b1f81cf25117'
             '9e9eab08199cf08810ec95b0697cd8817226986d1e3aeb54845c0140ea5887360580348f295060c0558fb2d6aaed26fec929ea36b28cfeaf2b3588ce40fec3df'
             '4def9dcd06cfc2c6ce554add9d9545a01f3bb2681f0a2a6fc4ba68f91011111803a955cc41b5e70832ca448b196109368fdf874e81b7ec0edee4b51f864e16f7'
-            '162ca1be96282b32e8e6be919b6315bfd08954c491056958985bf99e7f5bdad3511665f059329d6cb6ef5d222f9aa11d4dc43c72e6a963ab941ada959fe8d964')
+            '162ca1be96282b32e8e6be919b6315bfd08954c491056958985bf99e7f5bdad3511665f059329d6cb6ef5d222f9aa11d4dc43c72e6a963ab941ada959fe8d964'
+            '35cc9f644741587043565e036cba2dfaad30820e4e1ced825becae8d9eb47088c2cef9611f979572422f71f195bb68b60f6d7755e543f617ef292b79551746fc'
+            '8b5ca9e2d050468027115cc5a93ab750e845713cd9272816a017d0fba944eaa944f92b3cc0c6a9b350a8dd15f044342b57f087e44d5554ad4bbdd4a3d7d47120')
 b2sums=('b3bff3564206119dc25bd42f399ced724354452af3414bd8b1e1876c4915e8e4f651843c2fca3795ae195bd8f608013e0c8b41e0535e76e894a3fee9410a6c3b'
         '46f833e5d179d950bcbab51b539e6431959c9e3618c0d66b791a4b4d866b6195707704b394224b4fea97e1f65188b8b474499d70e5c2bb44da32c60447b80806'
         '835a1036422e9821cd52ffdf5a6053bdd59fc700d473600bda60b6730746f6c0750c30c85f4139d3ea81c6b6dd10d6849f9406decee3179861c51aca90da6161'
@@ -84,7 +88,9 @@
         'a8b7d003f66ed5c5b1b60d57c05339af3dcdcf346eab52760810086e17f6936dd29ed7fd26281657bc86ac6721c989cbfbaa8e81f97111c807bcd06baece3bf2'
         '82e03ea95995cfa78abc4d930bd0c250f22788d9ca4dc0921cfbb44a965c0f851cbcc7a855e36ec6e6aa5bf33fbd313b4fe68a2f1c4b7935c2b297be25895324'
         '9759827f7619358383bf0e68c955522c0054620f742f5122a59888fadfc0bc20bd587eab7a77bc73e8ee4d20cf8f02625c07f241462e8ab9c08f5af509daaef3'
-        '0068763ca5a2f1b60782f53070cbff8cf930e1463d9199b156b02413026bcdb3d923bffcbba063a26d620b8e734bdbd26a4c22776532546ad8c8e5c0c73bd7d6')
+        '0068763ca5a2f1b60782f53070cbff8cf930e1463d9199b156b02413026bcdb3d923bffcbba063a26d620b8e734bdbd26a4c22776532546ad8c8e5c0c73bd7d6'
+        '4acc8271631263723a50f7a454d89136b51f6016db1ee74abfecf9c46a8612017ba1e9fb743ac1d0f06a7633dfef5563094dce79a46cdceb4462b70d28337200'
+        'b64d05912fc63be37a44c2141155d049829ac8db9d2c258558c0584a8a9b6a9f4451cc6b1f03e078e83c939157689b833fb1377afc5a08e5141cce2abad9ad5f')
 
 prepare() {
   local _patch
@@ -91,7 +97,15 @@
 
   cd "$pkgbase-$pkgver"
 
+  # allow using uwsgi-plugin-rack with ruby >= 2.0
   patch -Np1 -i "$srcdir"/uwsgi-1.9.13-ruby2.0.patch
+  # fix issue with php arginfo in php 8
+  # https://github.com/unbit/uwsgi/issues/2356
+  patch -Np1 -i ../"${pkgbase}-2.0.20-php8_arginfo.patch"
+  # fix string related issue with php 8.1
+  # https://bugs.archlinux.org/task/73470
+  # https://github.com/unbit/uwsgi/issues/2394
+  patch -Np1 -i ../"${pkgbase}-2.0.20-php8.1.patch"
 
   # fix default lua pkgconfig name
   sed -e 's/lua5.1/lua51/' -i plugins/lua/uwsgiplugin.py