mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
extra/uwsgi to 2.0.22-1
This commit is contained in:
David Beauchamp
parent
30a0eacf6f
commit
e63a13d413
3 changed files with 6 additions and 74 deletions
|
|
@ -25,8 +25,8 @@ pkgname=(
|
|||
uwsgi-plugin-zabbix
|
||||
uwsgi-plugin-notfound
|
||||
)
|
||||
pkgver=2.0.21
|
||||
pkgrel=7
|
||||
pkgver=2.0.22
|
||||
pkgrel=1
|
||||
pkgdesc="A full stack for building hosting services"
|
||||
arch=(x86_64)
|
||||
url="https://uwsgi-docs.readthedocs.io/en/latest/"
|
||||
|
|
@ -61,10 +61,8 @@ source=(
|
|||
uwsgi.logrotate
|
||||
uwsgi.sysusers
|
||||
uwsgi.tmpfiles
|
||||
$pkgbase-1.9.13-ruby2.0.patch
|
||||
$pkgbase-2.0.22-php8.2.patch
|
||||
)
|
||||
sha512sums=('36a9c1b87a4c3d08482b9045d2227f56b006acb53f38ddf1b510880ae5fc24c0177a077338ec8af3ef0b8f8e220bc4fc7f8311dab8066e13cbcbb616f736c795'
|
||||
sha512sums=('28aaf786a88f034752ce980f6ae04ee5ea361443ffad7d7e9ec9a88a60dd63c649a44c2d41bb6ddc1572c321567da4c3985f907498bf250e2cd7cd11f4686303'
|
||||
'912b2d85cee0907454f2b1eee79fdeb7d7205c7b6a9f2a05cef969205fd4f3ccb9f3260e71a1c19cc910f6408e1e94da93fcca9978e8432273659b7caed34d9a'
|
||||
'd54c84838ddb2f389e115ebb81aa2583705c9e330f020e6583b496f9c271ed236b6820c2a065f2b55a79adbf13e262b9ff2428124a8044b8fa20ca29ca4930ac'
|
||||
'068ada6281fdeb504fed7e47dae2729d047ed810bb596e5268c1821ad275cd32110e801e93e7ba0ee2d92dbc39e1954180cf43d88d2990d42b802ceb54b50a9e'
|
||||
|
|
@ -73,10 +71,8 @@ sha512sums=('36a9c1b87a4c3d08482b9045d2227f56b006acb53f38ddf1b510880ae5fc24c0177
|
|||
'fb51a4d102a1bc7d9f7d4c4f310ee65076bcfbc94b47e2dafdf9b20e99a661c5f938185dcf698437d81409376f0276b966f09b13c8a29462c48612df43c3f3ef'
|
||||
'937878372aa1556f6ba62ad7148d1681288c94d6cff609368a9e861dd4d4524330006a08ae5993441f7d3101170e3a0a681a4c8b3c2c13b364b8b1f81cf25117'
|
||||
'9e9eab08199cf08810ec95b0697cd8817226986d1e3aeb54845c0140ea5887360580348f295060c0558fb2d6aaed26fec929ea36b28cfeaf2b3588ce40fec3df'
|
||||
'4def9dcd06cfc2c6ce554add9d9545a01f3bb2681f0a2a6fc4ba68f91011111803a955cc41b5e70832ca448b196109368fdf874e81b7ec0edee4b51f864e16f7'
|
||||
'162ca1be96282b32e8e6be919b6315bfd08954c491056958985bf99e7f5bdad3511665f059329d6cb6ef5d222f9aa11d4dc43c72e6a963ab941ada959fe8d964'
|
||||
'd62db75b0e27bbc014ec5e69c360de79f523f33bc1ab15fe7957bf8531635be1bb77200d1ad6d50184eba18c6d56bcdd284082c042792ef7822233128bc22fbc')
|
||||
b2sums=('3c5fc3ce3a6a7f8f915bb302c0b775a75227f859dd2b141034e8b1aa5cb867b447ed532b3e8b537db80acc908fc26121b752e35ebc0bf9a542678843fd02ff54'
|
||||
'4def9dcd06cfc2c6ce554add9d9545a01f3bb2681f0a2a6fc4ba68f91011111803a955cc41b5e70832ca448b196109368fdf874e81b7ec0edee4b51f864e16f7')
|
||||
b2sums=('62d9b2fdbd597fbeb6d1a9652688075912510b25cacbcd8210176e7663a0bc9a99e9ab8a298ff56227a07fd7faebe6e27f06242abe987b46193af377c947100f'
|
||||
'41a9213d55665c905f71f07c752a74fc7685b2f191381d24f3e1d9691a8dae538aa4344ebe771ffd77ba3c9cd7c52fd9eff54ff876bc399d92256cb86f5b7d53'
|
||||
'835a1036422e9821cd52ffdf5a6053bdd59fc700d473600bda60b6730746f6c0750c30c85f4139d3ea81c6b6dd10d6849f9406decee3179861c51aca90da6161'
|
||||
'80aa3c4d3f0310f5029ac01690d2ba718d8c86fa49cd1b4f3fc1bd5ae9eadaed6562bf0a48a0fd611e92f100a8594e08fb4bae58e25765fc2eb648cdf1c60b35'
|
||||
|
|
@ -85,16 +81,11 @@ b2sums=('3c5fc3ce3a6a7f8f915bb302c0b775a75227f859dd2b141034e8b1aa5cb867b447ed532
|
|||
'24c61581bb922f8065a6ea73164ca5d0b6c63ab4ca7c265660b2ec257b69ff9dd4b0349572ff20f54950961b4286c77da36c1d2778698c80943cfd6ed6531b10'
|
||||
'a8b7d003f66ed5c5b1b60d57c05339af3dcdcf346eab52760810086e17f6936dd29ed7fd26281657bc86ac6721c989cbfbaa8e81f97111c807bcd06baece3bf2'
|
||||
'82e03ea95995cfa78abc4d930bd0c250f22788d9ca4dc0921cfbb44a965c0f851cbcc7a855e36ec6e6aa5bf33fbd313b4fe68a2f1c4b7935c2b297be25895324'
|
||||
'9759827f7619358383bf0e68c955522c0054620f742f5122a59888fadfc0bc20bd587eab7a77bc73e8ee4d20cf8f02625c07f241462e8ab9c08f5af509daaef3'
|
||||
'0068763ca5a2f1b60782f53070cbff8cf930e1463d9199b156b02413026bcdb3d923bffcbba063a26d620b8e734bdbd26a4c22776532546ad8c8e5c0c73bd7d6'
|
||||
'99ddfb9918395d9d04284c6ab5160986d1aa7cdb175237ff5d2af8438a7a78b535836dee3c16dd0b8c917a00fdc9e64880756595b3070b941c406d99580c102c')
|
||||
'9759827f7619358383bf0e68c955522c0054620f742f5122a59888fadfc0bc20bd587eab7a77bc73e8ee4d20cf8f02625c07f241462e8ab9c08f5af509daaef3')
|
||||
|
||||
prepare() {
|
||||
cd $pkgbase-$pkgver
|
||||
|
||||
# allow using uwsgi-plugin-rack with ruby >= 2.0
|
||||
patch -Np1 -i "$srcdir"/uwsgi-1.9.13-ruby2.0.patch
|
||||
|
||||
# fix default lua pkgconfig name
|
||||
sed -e 's/lua5.1/lua51/' -i plugins/lua/uwsgiplugin.py
|
||||
# move ruby plugin to new location and fix its name
|
||||
|
|
@ -103,8 +94,6 @@ prepare() {
|
|||
# remove the explicit lib version from the linking stage of the PHP plugin as
|
||||
# we do not provide /usr/lib/libphp8.so
|
||||
sed -e "s/ + php_version//" -i plugins/php/uwsgiplugin.py
|
||||
# Compatibility with PHP 8.2
|
||||
patch -p1 -i "$srcdir/$pkgbase-2.0.22-php8.2.patch"
|
||||
# duplicate the php plugin, so that we can modify it
|
||||
cp -av plugins/php{,_legacy}
|
||||
# link the php_legacy plugin against libphp-legacy.so
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py
|
||||
index 2375bc9..b908417 100644
|
||||
--- a/plugins/rack/uwsgiplugin.py
|
||||
+++ b/plugins/rack/uwsgiplugin.py
|
||||
@@ -10,13 +10,14 @@ except:
|
||||
rbconfig = 'Config'
|
||||
|
||||
version = os.popen(RUBYPATH + " -e \"print RUBY_VERSION\"").read().rstrip()
|
||||
-v = version.split('.')
|
||||
|
||||
GCC_LIST = ['rack_plugin', 'rack_api']
|
||||
|
||||
-if (v[0] == '1' and v[1] == '9') or v[0] >= '2':
|
||||
+if version >= '1.9':
|
||||
CFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['CFLAGS']\"").read().rstrip().split()
|
||||
CFLAGS.append('-DRUBY19')
|
||||
+ if version >= '2.0':
|
||||
+ CFLAGS.append('-DRUBY20')
|
||||
CFLAGS.append('-Wno-unused-parameter')
|
||||
rbconfig = 'RbConfig'
|
||||
else:
|
||||
diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py
|
||||
index 4f35984..156018f 100644
|
||||
--- a/plugins/ruby19/uwsgiplugin.py
|
||||
+++ b/plugins/ruby19/uwsgiplugin.py
|
||||
@@ -10,13 +10,14 @@ except:
|
||||
rbconfig = 'Config'
|
||||
|
||||
version = os.popen(RUBYPATH + " -e \"print RUBY_VERSION\"").read().rstrip()
|
||||
-v = version.split('.')
|
||||
|
||||
GCC_LIST = ['../rack/rack_plugin', '../rack/rack_api']
|
||||
|
||||
-if v[0] == '1' and v[1] == '9':
|
||||
+if version >= '1.9':
|
||||
CFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['CFLAGS']\"").read().rstrip().split()
|
||||
CFLAGS.append('-DRUBY19')
|
||||
+ if version >= '2.0':
|
||||
+ CFLAGS.append('-DRUBY20')
|
||||
CFLAGS.append('-Wno-unused-parameter')
|
||||
rbconfig = 'RbConfig'
|
||||
else:
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
diff -uNr a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
|
||||
--- a/plugins/php/php_plugin.c 2022-10-06 19:52:07.237882916 +0200
|
||||
+++ b/plugins/php/php_plugin.c 2022-10-06 19:56:29.232418542 +0200
|
||||
@@ -607,7 +607,11 @@
|
||||
static int php_uwsgi_startup(sapi_module_struct *sapi_module)
|
||||
{
|
||||
|
||||
+#if PHP_VERSION_ID >= 80200
|
||||
+ 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;
|
||||
Loading…
Reference in a new issue