Date: Friday, October 28, 2022 @ 20:07:34 Author: dvzrv Revision: 1338445
upgpkg: uwsgi 2.0.21-1: Upgrade to 2.0.21. Remove merged patches. Remove unnecessary quotes and curly braces. Modified: uwsgi/trunk/PKGBUILD ----------+ PKGBUILD | 95 +++++++++++++++++++++++-------------------------------------- 1 file changed, 37 insertions(+), 58 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-28 19:58:41 UTC (rev 1338444) +++ PKGBUILD 2022-10-28 20:07:34 UTC (rev 1338445) @@ -23,8 +23,8 @@ uwsgi-plugin-zabbix uwsgi-plugin-notfound ) -pkgver=2.0.20 -pkgrel=7 +pkgver=2.0.21 +pkgrel=1 pkgdesc="A full stack for building hosting services" arch=(x86_64) url="https://uwsgi-docs.readthedocs.io/en/latest/"; @@ -52,7 +52,7 @@ ) options=(debug) source=( - "https://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz"; + $pkgbase-$pkgver.tar.gz::https://github.com/unbit/$pkgbase/archive/refs/tags/$pkgver.tar.gz archlinux.ini emperor.ini emperor.uwsgi.service @@ -62,12 +62,9 @@ uwsgi.logrotate 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"; - "${pkgbase}-2.0.20-python3.10.patch::https://github.com/unbit/uwsgi/pull/2363/commits/94b28b156c26d5b0b4ba93fedb057e9aebf59545.patch"; + $pkgbase-1.9.13-ruby2.0.patch ) -sha512sums=('22677a8ad1ea886e1a3a153f486474ce064a55e5b12515322345116980f699f4e2e73267f991c300d904284e06f265ea821e71ba3c97832b6f25705475b498ff' +sha512sums=('36a9c1b87a4c3d08482b9045d2227f56b006acb53f38ddf1b510880ae5fc24c0177a077338ec8af3ef0b8f8e220bc4fc7f8311dab8066e13cbcbb616f736c795' '51c474a5ae025c0fae17dec309bea29550a8ca39815b7495189394ae5ce30eb264f77a45f48f9f7529c59d907baf139cdf7c488d1b13fcb862cc7b9bdc268804' 'd54c84838ddb2f389e115ebb81aa2583705c9e330f020e6583b496f9c271ed236b6820c2a065f2b55a79adbf13e262b9ff2428124a8044b8fa20ca29ca4930ac' '068ada6281fdeb504fed7e47dae2729d047ed810bb596e5268c1821ad275cd32110e801e93e7ba0ee2d92dbc39e1954180cf43d88d2990d42b802ceb54b50a9e' @@ -77,11 +74,8 @@ '937878372aa1556f6ba62ad7148d1681288c94d6cff609368a9e861dd4d4524330006a08ae5993441f7d3101170e3a0a681a4c8b3c2c13b364b8b1f81cf25117' '9e9eab08199cf08810ec95b0697cd8817226986d1e3aeb54845c0140ea5887360580348f295060c0558fb2d6aaed26fec929ea36b28cfeaf2b3588ce40fec3df' '4def9dcd06cfc2c6ce554add9d9545a01f3bb2681f0a2a6fc4ba68f91011111803a955cc41b5e70832ca448b196109368fdf874e81b7ec0edee4b51f864e16f7' - '162ca1be96282b32e8e6be919b6315bfd08954c491056958985bf99e7f5bdad3511665f059329d6cb6ef5d222f9aa11d4dc43c72e6a963ab941ada959fe8d964' - '35cc9f644741587043565e036cba2dfaad30820e4e1ced825becae8d9eb47088c2cef9611f979572422f71f195bb68b60f6d7755e543f617ef292b79551746fc' - '8b5ca9e2d050468027115cc5a93ab750e845713cd9272816a017d0fba944eaa944f92b3cc0c6a9b350a8dd15f044342b57f087e44d5554ad4bbdd4a3d7d47120' - 'baf12f5a6c1da2115e916a2a74c05651886531d61073b3a3c8f900e1f158b64d7d88ea7bb247b3e49513d8022703a6072d3303b5c993f93aeba6c3a8ed23528b') -b2sums=('b3bff3564206119dc25bd42f399ced724354452af3414bd8b1e1876c4915e8e4f651843c2fca3795ae195bd8f608013e0c8b41e0535e76e894a3fee9410a6c3b' + '162ca1be96282b32e8e6be919b6315bfd08954c491056958985bf99e7f5bdad3511665f059329d6cb6ef5d222f9aa11d4dc43c72e6a963ab941ada959fe8d964') +b2sums=('3c5fc3ce3a6a7f8f915bb302c0b775a75227f859dd2b141034e8b1aa5cb867b447ed532b3e8b537db80acc908fc26121b752e35ebc0bf9a542678843fd02ff54' '46f833e5d179d950bcbab51b539e6431959c9e3618c0d66b791a4b4d866b6195707704b394224b4fea97e1f65188b8b474499d70e5c2bb44da32c60447b80806' '835a1036422e9821cd52ffdf5a6053bdd59fc700d473600bda60b6730746f6c0750c30c85f4139d3ea81c6b6dd10d6849f9406decee3179861c51aca90da6161' '80aa3c4d3f0310f5029ac01690d2ba718d8c86fa49cd1b4f3fc1bd5ae9eadaed6562bf0a48a0fd611e92f100a8594e08fb4bae58e25765fc2eb648cdf1c60b35' @@ -91,29 +85,14 @@ 'a8b7d003f66ed5c5b1b60d57c05339af3dcdcf346eab52760810086e17f6936dd29ed7fd26281657bc86ac6721c989cbfbaa8e81f97111c807bcd06baece3bf2' '82e03ea95995cfa78abc4d930bd0c250f22788d9ca4dc0921cfbb44a965c0f851cbcc7a855e36ec6e6aa5bf33fbd313b4fe68a2f1c4b7935c2b297be25895324' '9759827f7619358383bf0e68c955522c0054620f742f5122a59888fadfc0bc20bd587eab7a77bc73e8ee4d20cf8f02625c07f241462e8ab9c08f5af509daaef3' - '0068763ca5a2f1b60782f53070cbff8cf930e1463d9199b156b02413026bcdb3d923bffcbba063a26d620b8e734bdbd26a4c22776532546ad8c8e5c0c73bd7d6' - '4acc8271631263723a50f7a454d89136b51f6016db1ee74abfecf9c46a8612017ba1e9fb743ac1d0f06a7633dfef5563094dce79a46cdceb4462b70d28337200' - 'b64d05912fc63be37a44c2141155d049829ac8db9d2c258558c0584a8a9b6a9f4451cc6b1f03e078e83c939157689b833fb1377afc5a08e5141cce2abad9ad5f' - '835537c1e204f6c0832a753b76c7ea70f76d2be050523d8c19d93208297a1fc7683b86f3b1680683472ed11347d0a5000b72f88f82c150e3113665a3c0f13dcd') + '0068763ca5a2f1b60782f53070cbff8cf930e1463d9199b156b02413026bcdb3d923bffcbba063a26d620b8e734bdbd26a4c22776532546ad8c8e5c0c73bd7d6') prepare() { - local _patch + cd $pkgbase-$pkgver - 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 issues with python 3.10: https://github.com/unbit/uwsgi/pull/2363 - patch -Np1 -i ../"${pkgbase}-2.0.20-python3.10.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 @@ -130,7 +109,7 @@ } build() { - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver python uwsgiconfig.py --verbose --build archlinux # build php7 plugin separately and override php-config in use UWSGICONFIG_PHPPATH='php-config7' \ @@ -138,12 +117,12 @@ } package_uwsgi() { - depends=('glibc' 'jansson' 'libcap.so' 'libcrypt.so' 'libpam.so' 'libxml2' - 'libsystemd.so' 'libuuid.so' 'openssl' 'pcre' 'zlib') + depends=(glibc jansson libcap.so libcrypt.so libpam.so libxml2 + libsystemd.so libuuid.so openssl pcre zlib) backup=('etc/uwsgi/emperor.ini') install=uwsgi.install - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 "${pkgbase}" -t "$pkgdir/usr/bin/" install -vDm 644 ../uwsgi_at.service "$pkgdir"/usr/lib/systemd/system/[email protected] install -vDm 644 ../uwsgi_at.socket "$pkgdir"/usr/lib/systemd/system/[email protected] @@ -157,25 +136,25 @@ package_uwsgi-plugin-cgi() { pkgdesc+=" (CGI plugin)" - depends=('glibc' 'uwsgi') + depends=(glibc uwsgi) - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 cgi_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ } package_uwsgi-plugin-rack() { - depends=('glibc' 'ruby' 'uwsgi') + depends=(glibc ruby uwsgi) pkgdesc="Ruby rack plugin" - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 {rack,fiber,rbthreads}_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ } package_uwsgi-plugin-psgi() { pkgdesc+=" (Perl psgi plugin)" - depends=('glibc' 'perl' 'uwsgi') + depends=(glibc perl uwsgi) - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 psgi_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ } @@ -183,9 +162,9 @@ local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") pkgdesc+=" (Python plugin)" - depends=('glibc' 'python' 'python-gevent' 'python-greenlet' 'uwsgi') + depends=(glibc python python-gevent python-greenlet uwsgi) - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 {asyncio,gevent,greenlet,python}_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ install -vDm 644 uwsgidecorators.py -t "${pkgdir}${site_packages}" python -m compileall "${pkgdir}${site_packages}" @@ -194,9 +173,9 @@ package_uwsgi-plugin-pypy() { pkgdesc+=" (PyPy plugin)" - depends=('glibc' 'pypy' 'uwsgi') + depends=(glibc pypy uwsgi) - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 pypy_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ install -vDm 644 uwsgidecorators.py -t "$pkgdir"/opt/pypy/site-packages/ pypy -m compileall "$pkgdir"/opt/pypy/site-packages/ @@ -205,33 +184,33 @@ package_uwsgi-plugin-lua51() { pkgdesc+=" (LUA plugin)" - depends=('glibc' 'lua51' 'uwsgi') + depends=(glibc lua51 uwsgi) - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 lua_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ } package_uwsgi-plugin-php() { pkgdesc+=" (PHP plugin)" - depends=('glibc' 'php-embed' 'uwsgi') + depends=(glibc php-embed uwsgi) - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 php_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ } package_uwsgi-plugin-php7() { pkgdesc+=" (PHP7 plugin)" - depends=('glibc' 'php7-embed' 'uwsgi') + depends=(glibc php7-embed uwsgi) - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 php7_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ } package_uwsgi-plugin-mono() { pkgdesc+=" (mono plugin)" - depends=('glibc' 'mono' 'uwsgi') + depends=(glibc mono uwsgi) - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 plugins/mono/uwsgi.dll -t "$pkgdir"/usr/lib/mono/2.0/ install -vDm 755 mono_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ } @@ -238,24 +217,24 @@ package_uwsgi-plugin-webdav() { pkgdesc+=" (WebDav plugin)" - depends=('glibc' 'libxml2' 'uwsgi') + depends=(glibc libxml2 uwsgi) - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 webdav_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ } package_uwsgi-plugin-zabbix() { pkgdesc+=" (zabbix plugin)" - depends=('glibc' 'uwsgi') + depends=(glibc uwsgi) - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 zabbix_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ } package_uwsgi-plugin-notfound() { pkgdesc+=" (notfound plugin)" - depends=('uwsgi') + depends=(uwsgi) - cd "$pkgbase-$pkgver" + cd $pkgbase-$pkgver install -vDm 755 notfound_plugin.so -t "$pkgdir"/usr/lib/uwsgi/ }
