Date: Wednesday, October 7, 2020 @ 20:35:22 Author: jelle Revision: 720973
archrelease: copy trunk to community-x86_64 Added: uwsgi/repos/community-x86_64/PKGBUILD (from rev 720972, uwsgi/trunk/PKGBUILD) uwsgi/repos/community-x86_64/archlinux.ini (from rev 720972, uwsgi/trunk/archlinux.ini) uwsgi/repos/community-x86_64/emperor.ini (from rev 720972, uwsgi/trunk/emperor.ini) uwsgi/repos/community-x86_64/emperor.uwsgi.service (from rev 720972, uwsgi/trunk/emperor.uwsgi.service) uwsgi/repos/community-x86_64/emperor.uwsgi.socket (from rev 720972, uwsgi/trunk/emperor.uwsgi.socket) uwsgi/repos/community-x86_64/tmpfilesd (from rev 720972, uwsgi/trunk/tmpfilesd) uwsgi/repos/community-x86_64/uwsgi.install (from rev 720972, uwsgi/trunk/uwsgi.install) uwsgi/repos/community-x86_64/uwsgi.logrotate (from rev 720972, uwsgi/trunk/uwsgi.logrotate) uwsgi/repos/community-x86_64/uwsgi.sysusers (from rev 720972, uwsgi/trunk/uwsgi.sysusers) uwsgi/repos/community-x86_64/uwsgi_at.service (from rev 720972, uwsgi/trunk/uwsgi_at.service) uwsgi/repos/community-x86_64/uwsgi_at.socket (from rev 720972, uwsgi/trunk/uwsgi_at.socket) uwsgi/repos/community-x86_64/uwsgi_fix_rpath.patch (from rev 720972, uwsgi/trunk/uwsgi_fix_rpath.patch) uwsgi/repos/community-x86_64/uwsgi_ruby20_compatibility.patch (from rev 720972, uwsgi/trunk/uwsgi_ruby20_compatibility.patch) uwsgi/repos/community-x86_64/uwsgi_trick_chroot.patch (from rev 720972, uwsgi/trunk/uwsgi_trick_chroot.patch) Deleted: uwsgi/repos/community-x86_64/PKGBUILD uwsgi/repos/community-x86_64/archlinux.ini uwsgi/repos/community-x86_64/emperor.ini uwsgi/repos/community-x86_64/emperor.uwsgi.service uwsgi/repos/community-x86_64/emperor.uwsgi.socket uwsgi/repos/community-x86_64/tmpfilesd uwsgi/repos/community-x86_64/uwsgi.install uwsgi/repos/community-x86_64/uwsgi.logrotate uwsgi/repos/community-x86_64/uwsgi.sysusers uwsgi/repos/community-x86_64/uwsgi_at.service uwsgi/repos/community-x86_64/uwsgi_at.socket uwsgi/repos/community-x86_64/uwsgi_fix_rpath.patch uwsgi/repos/community-x86_64/uwsgi_ruby20_compatibility.patch uwsgi/repos/community-x86_64/uwsgi_trick_chroot.patch ----------------------------------+ PKGBUILD | 380 ++++++++++++++++++------------------- archlinux.ini | 10 emperor.ini | 4 emperor.uwsgi.service | 31 +-- emperor.uwsgi.socket | 18 - tmpfilesd | 2 uwsgi.install | 18 - uwsgi.logrotate | 20 - uwsgi.sysusers | 2 uwsgi_at.service | 31 +-- uwsgi_at.socket | 18 - uwsgi_fix_rpath.patch | 132 ++++++------ uwsgi_ruby20_compatibility.patch | 84 ++++---- uwsgi_trick_chroot.patch | 32 +-- 14 files changed, 390 insertions(+), 392 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-10-07 20:35:01 UTC (rev 720972) +++ PKGBUILD 2020-10-07 20:35:22 UTC (rev 720973) @@ -1,190 +0,0 @@ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> -# Contributor: Valentin Hăloiu <vially.ichb+...@gmail.com> -# Contributor: Angel Velasquez <an...@archlinux.org> -# Contributor: Kevin Zuber <u...@knet.eu> -# Contributor: Vsevolod Balashov <vsevo...@balashov.name> -# Contributor: David Runge <d...@sleepmap.de> - -pkgbase=uwsgi -pkgname=(uwsgi - uwsgi-plugin-rack - uwsgi-plugin-psgi - uwsgi-plugin-cgi - uwsgi-plugin-python - uwsgi-plugin-pypy - uwsgi-plugin-php - uwsgi-plugin-lua51 - uwsgi-plugin-jvm - uwsgi-plugin-mono - uwsgi-plugin-webdav - uwsgi-plugin-zabbix - uwsgi-plugin-notfound) -pkgver=2.0.19.1 -pkgrel=4 -arch=(x86_64) -url="http://projects.unbit.it/$pkgbase" -license=(GPL2) -backup=('etc/uwsgi/emperor.ini') -conflicts=(python-$pkgbase) -makedepends=(gcc python ruby python-greenlet php-embed curl libxml2 libyaml - perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7 - jansson classpath pypy mono python-gevent systemd) -optdepends=('systemd: daemon scripts') -source=("https://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz" - uwsgiplugin.py::https://raw.githubusercontent.com/unbit/uwsgi/9787f6882c2475aa9873e400988160b17dd04545/plugins/systemd_logger/uwsgiplugin.py - archlinux.ini - tmpfilesd - uwsgi_at.service - uwsgi_at.socket - uwsgi_ruby20_compatibility.patch - uwsgi_trick_chroot.patch - emperor.ini - emperor.uwsgi.service - emperor.uwsgi.socket - uwsgi.logrotate - uwsgi.sysusers) -sha512sums=('e18359c5ea3606d5de7fb3a0074d777e1c4b41f51f4b1a21f1446f32253058d7924286d9ed8a159d4c6e6c0ea64df7fc3c70b2933c3433b9a9cce39737e702bf' - '68eef703de39cb336915e1e9c36b11c65c2d46482407b0234ca245df0e052952abb7dd85b0a1cd4507c78356a3b7a55424524b3aa0997b559b51e7b20eab5e16' - 'acfe9fb089d1905c3d736dbeaaef7eb1848b4ce8d1f585de653086cf7f90c166a1e493d0b62ba030a4bcf2eca9c919e0d6deea2ea1c0bcb8533d7cb040d2f67c' - '4def9dcd06cfc2c6ce554add9d9545a01f3bb2681f0a2a6fc4ba68f91011111803a955cc41b5e70832ca448b196109368fdf874e81b7ec0edee4b51f864e16f7' - 'c0c1a5c2d31cdb7e0dc878ea3d0b6025532fb640ae7cf4d5f1eed2f89987e625c8dc7844d367283ed560fb3ef37915e3e9199be2e1b06fc4586ca862a653b4b5' - 'fb51a4d102a1bc7d9f7d4c4f310ee65076bcfbc94b47e2dafdf9b20e99a661c5f938185dcf698437d81409376f0276b966f09b13c8a29462c48612df43c3f3ef' - '162ca1be96282b32e8e6be919b6315bfd08954c491056958985bf99e7f5bdad3511665f059329d6cb6ef5d222f9aa11d4dc43c72e6a963ab941ada959fe8d964' - 'bc30f8ec69abd14fb96ada5b36cf65811a7a63ee27e224fcb6ceabe9935c1f17379cd872149a17da3d590b8ff60fbe7f77140d777aaf06e25e83388f897f611d' - 'd54c84838ddb2f389e115ebb81aa2583705c9e330f020e6583b496f9c271ed236b6820c2a065f2b55a79adbf13e262b9ff2428124a8044b8fa20ca29ca4930ac' - '83a6859d729bf186236aaa7fb7433415f6b985f17e05b7ac571d8919bbf1fb9bd577b4f673d9787dea09752e3d8043f47ce3d9c7d5690faaa1365e477e6c9388' - '592c85270f43b37e9c51aae126533830515b96fff9fcae969ee865fe173bd0550c7729530d5ff1e44ffee43cd5c78c96688ce091c677a4196379e24983c0180e' - '937878372aa1556f6ba62ad7148d1681288c94d6cff609368a9e861dd4d4524330006a08ae5993441f7d3101170e3a0a681a4c8b3c2c13b364b8b1f81cf25117' - '9e9eab08199cf08810ec95b0697cd8817226986d1e3aeb54845c0140ea5887360580348f295060c0558fb2d6aaed26fec929ea36b28cfeaf2b3588ce40fec3df') - -prepare() { - cd $pkgbase-$pkgver - cp "$srcdir"/archlinux.ini buildconf/archlinux.ini - for patch in uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch; do - patch -Np1 -i "$srcdir"/$patch - done - rm -rf plugins/ruby - mv plugins/ruby{19,} - sed -i 's:\(ruby\)19:\1:' plugins/ruby/uwsgiplugin.py - - sed -i 's/--cflags mono-2/--cflags mono-2 glib-2.0/g' plugins/mono/uwsgiplugin.py - - cp "$srcdir"/uwsgiplugin.py plugins/systemd_logger/uwsgiplugin.py -} - -build() { - pushd "$srcdir"/$pkgbase-$pkgver - - export UWSGICONFIG_LUAPC='lua51' - - python uwsgiconfig.py --build archlinux - python uwsgiconfig.py --plugin plugins/python archlinux python - python uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet - python uwsgiconfig.py --plugin plugins/gevent archlinux gevent - python uwsgiconfig.py --plugin plugins/asyncio archlinux asyncio - python uwsgiconfig.py --plugin plugins/zabbix archlinux zabbix - python uwsgiconfig.py --plugin plugins/pypy archlinux pypy - python uwsgiconfig.py --plugin plugins/notfound archlinux notfound -} - -package_uwsgi() { - pkgdesc="A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C" - depends=(libxml2 jansson systemd-libs libcap pam pcre) - install=uwsgi.install - cd "$srcdir"/$pkgbase-$pkgver - install -Dm755 uwsgi "$pkgdir"/usr/bin/uwsgi - install -Dm644 "$srcdir"/uwsgi_at.service "$pkgdir"/usr/lib/systemd/system/uwsgi@.service - install -Dm644 "$srcdir"/uwsgi_at.socket "$pkgdir"/usr/lib/systemd/system/uwsgi@.socket - install -Dm644 "$srcdir"/emperor.uwsgi.service "$pkgdir"/usr/lib/systemd/system/emperor.uwsgi.service - install -Dm644 "$srcdir"/emperor.uwsgi.socket "$pkgdir"/usr/lib/systemd/system/emperor.uwsgi.socket - install -Dm644 "$srcdir"/emperor.ini "$pkgdir"/etc/uwsgi/emperor.ini - install -Dm644 "$srcdir"/tmpfilesd "$pkgdir"/usr/lib/tmpfiles.d/uwsgi.conf - install -Dm644 "$srcdir"/uwsgi.logrotate "$pkgdir"/etc/logrotate.d/uwsgi - install -Dm644 "$srcdir"/uwsgi.sysusers "$pkgdir"/usr/lib/sysusers.d/uwsgi.conf -} - -package_uwsgi-plugin-cgi() { - depends=(uwsgi) - pkgdesc="CGI plugin" - install -Dm755 $pkgbase-$pkgver/cgi_plugin.so "$pkgdir"/usr/lib/uwsgi/cgi_plugin.so -} - -package_uwsgi-plugin-rack() { - depends=(uwsgi ruby) - pkgdesc="Ruby rack plugin" - install -Dm755 $pkgbase-$pkgver/rack_plugin.so "$pkgdir"/usr/lib/uwsgi/rack_plugin.so - install -Dm755 $pkgbase-$pkgver/fiber_plugin.so "$pkgdir"/usr/lib/uwsgi/fiber_plugin.so - install -Dm755 $pkgbase-$pkgver/rbthreads_plugin.so "$pkgdir"/usr/lib/uwsgi/rbthreads_plugin.so -} - -package_uwsgi-plugin-psgi() { - depends=(uwsgi perl) - pkgdesc="Perl psgi plugin" - install -Dm755 $pkgbase-$pkgver/psgi_plugin.so "$pkgdir"/usr/lib/uwsgi/psgi_plugin.so -} - -package_uwsgi-plugin-python() { - depends=(uwsgi python python-greenlet) - pkgdesc="Plugin for Python support" - install -Dm755 $pkgbase-$pkgver/python_plugin.so "$pkgdir"/usr/lib/uwsgi/python_plugin.so - install -Dm755 $pkgbase-$pkgver/greenlet_plugin.so "$pkgdir"/usr/lib/uwsgi/greenlet_plugin.so - install -Dm755 $pkgbase-$pkgver/gevent_plugin.so "$pkgdir"/usr/lib/uwsgi/gevent_plugin.so - install -Dm755 $pkgbase-$pkgver/asyncio_plugin.so "$pkgdir"/usr/lib/uwsgi/asyncio_plugin.so - install -Dm644 $pkgbase-$pkgver/uwsgidecorators.py "$pkgdir"/usr/lib/python3.8/site-packages/uwsgidecorators.py - python -m compileall "$pkgdir"/usr/lib/python3.8/site-packages/ - python -O -m compileall "$pkgdir"/usr/lib/python3.8/site-packages/ -} - -package_uwsgi-plugin-pypy() { - depends=(uwsgi pypy) - pkgdesc="Plugin for PyPy support" - install -Dm755 $pkgbase-$pkgver/pypy_plugin.so "$pkgdir"/usr/lib/uwsgi/pypy_plugin.so - install -Dm644 $pkgbase-$pkgver/uwsgidecorators.py "$pkgdir"/opt/pypy/site-packages/uwsgidecorators.py - pypy -m compileall "$pkgdir"/opt/pypy/site-packages/ - pypy -O -m compileall "$pkgdir"/opt/pypy/site-packages/ -} - -package_uwsgi-plugin-lua51() { - depends=(uwsgi lua51) - pkgdesc="Plugin for Lua support" - install -Dm755 $pkgbase-$pkgver/lua_plugin.so "$pkgdir"/usr/lib/uwsgi/lua_plugin.so -} - -package_uwsgi-plugin-php() { - depends=(uwsgi php-embed libyaml jansson) - pkgdesc="Plugin for PHP support" - install -Dm755 $pkgbase-$pkgver/php_plugin.so "$pkgdir"/usr/lib/uwsgi/php_plugin.so -} - -package_uwsgi-plugin-jvm() { - depends=(uwsgi java-environment=7 classpath) - pkgdesc="Plugin for Jvm support" - install -Dm644 $pkgbase-$pkgver/plugins/jvm/uwsgi.jar "$pkgdir"/usr/share/java/uwsgi.jar - install -Dm755 $pkgbase-$pkgver/jvm_plugin.so "$pkgdir"/usr/lib/uwsgi/jvm_plugin.so -} - -package_uwsgi-plugin-mono() { - depends=(uwsgi mono) - pkgdesc="Plugin for mono support" - install -Dm755 $pkgbase-$pkgver/plugins/mono/uwsgi.dll "$pkgdir"/usr/lib/mono/2.0/uwsgi.dll - install -Dm755 $pkgbase-$pkgver/mono_plugin.so "$pkgdir"/usr/lib/uwsgi/mono_plugin.so -} - -package_uwsgi-plugin-webdav() { - depends=(uwsgi) - pkgdesc="Plugin for webdav support" - install -Dm755 $pkgbase-$pkgver/webdav_plugin.so "$pkgdir"/usr/lib/uwsgi/webdav_plugin.so -} - -package_uwsgi-plugin-zabbix() { - depends=(uwsgi) - pkgdesc="Plugin for zabbix support" - install -Dm755 $pkgbase-$pkgver/zabbix_plugin.so "$pkgdir"/usr/lib/uwsgi/zabbix_plugin.so -} - -package_uwsgi-plugin-notfound() { - depends=(uwsgi) - pkgdesc="Plugin for notfound support" - install -Dm755 $pkgbase-$pkgver/notfound_plugin.so "$pkgdir"/usr/lib/uwsgi/notfound_plugin.so -} Copied: uwsgi/repos/community-x86_64/PKGBUILD (from rev 720972, uwsgi/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,190 @@ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> +# Contributor: Valentin Hăloiu <vially.ichb+...@gmail.com> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Kevin Zuber <u...@knet.eu> +# Contributor: Vsevolod Balashov <vsevo...@balashov.name> +# Contributor: David Runge <d...@sleepmap.de> + +pkgbase=uwsgi +pkgname=(uwsgi + uwsgi-plugin-rack + uwsgi-plugin-psgi + uwsgi-plugin-cgi + uwsgi-plugin-python + uwsgi-plugin-pypy + uwsgi-plugin-php + uwsgi-plugin-lua51 + uwsgi-plugin-jvm + uwsgi-plugin-mono + uwsgi-plugin-webdav + uwsgi-plugin-zabbix + uwsgi-plugin-notfound) +pkgver=2.0.19.1 +pkgrel=4 +arch=(x86_64) +url="http://projects.unbit.it/$pkgbase" +license=(GPL2) +backup=('etc/uwsgi/emperor.ini') +conflicts=(python-$pkgbase) +makedepends=(gcc python ruby python-greenlet php-embed curl libxml2 libyaml + perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7 + jansson classpath pypy mono python-gevent systemd) +optdepends=('systemd: daemon scripts') +source=("https://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz" + uwsgiplugin.py::https://raw.githubusercontent.com/unbit/uwsgi/9787f6882c2475aa9873e400988160b17dd04545/plugins/systemd_logger/uwsgiplugin.py + archlinux.ini + tmpfilesd + uwsgi_at.service + uwsgi_at.socket + uwsgi_ruby20_compatibility.patch + uwsgi_trick_chroot.patch + emperor.ini + emperor.uwsgi.service + emperor.uwsgi.socket + uwsgi.logrotate + uwsgi.sysusers) +sha512sums=('e18359c5ea3606d5de7fb3a0074d777e1c4b41f51f4b1a21f1446f32253058d7924286d9ed8a159d4c6e6c0ea64df7fc3c70b2933c3433b9a9cce39737e702bf' + '68eef703de39cb336915e1e9c36b11c65c2d46482407b0234ca245df0e052952abb7dd85b0a1cd4507c78356a3b7a55424524b3aa0997b559b51e7b20eab5e16' + 'acfe9fb089d1905c3d736dbeaaef7eb1848b4ce8d1f585de653086cf7f90c166a1e493d0b62ba030a4bcf2eca9c919e0d6deea2ea1c0bcb8533d7cb040d2f67c' + '4def9dcd06cfc2c6ce554add9d9545a01f3bb2681f0a2a6fc4ba68f91011111803a955cc41b5e70832ca448b196109368fdf874e81b7ec0edee4b51f864e16f7' + '29e51d3f441bd8af23c9378bca6cb38376bbbf31bb3b07f318a04ea5620cf25d35d7799ba4a8ecff12634dccd903eef27a6957b932370706e35549f8fbcd2455' + 'fb51a4d102a1bc7d9f7d4c4f310ee65076bcfbc94b47e2dafdf9b20e99a661c5f938185dcf698437d81409376f0276b966f09b13c8a29462c48612df43c3f3ef' + '162ca1be96282b32e8e6be919b6315bfd08954c491056958985bf99e7f5bdad3511665f059329d6cb6ef5d222f9aa11d4dc43c72e6a963ab941ada959fe8d964' + 'bc30f8ec69abd14fb96ada5b36cf65811a7a63ee27e224fcb6ceabe9935c1f17379cd872149a17da3d590b8ff60fbe7f77140d777aaf06e25e83388f897f611d' + 'd54c84838ddb2f389e115ebb81aa2583705c9e330f020e6583b496f9c271ed236b6820c2a065f2b55a79adbf13e262b9ff2428124a8044b8fa20ca29ca4930ac' + '068ada6281fdeb504fed7e47dae2729d047ed810bb596e5268c1821ad275cd32110e801e93e7ba0ee2d92dbc39e1954180cf43d88d2990d42b802ceb54b50a9e' + '592c85270f43b37e9c51aae126533830515b96fff9fcae969ee865fe173bd0550c7729530d5ff1e44ffee43cd5c78c96688ce091c677a4196379e24983c0180e' + '937878372aa1556f6ba62ad7148d1681288c94d6cff609368a9e861dd4d4524330006a08ae5993441f7d3101170e3a0a681a4c8b3c2c13b364b8b1f81cf25117' + '9e9eab08199cf08810ec95b0697cd8817226986d1e3aeb54845c0140ea5887360580348f295060c0558fb2d6aaed26fec929ea36b28cfeaf2b3588ce40fec3df') + +prepare() { + cd $pkgbase-$pkgver + cp "$srcdir"/archlinux.ini buildconf/archlinux.ini + for patch in uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch; do + patch -Np1 -i "$srcdir"/$patch + done + rm -rf plugins/ruby + mv plugins/ruby{19,} + sed -i 's:\(ruby\)19:\1:' plugins/ruby/uwsgiplugin.py + + sed -i 's/--cflags mono-2/--cflags mono-2 glib-2.0/g' plugins/mono/uwsgiplugin.py + + cp "$srcdir"/uwsgiplugin.py plugins/systemd_logger/uwsgiplugin.py +} + +build() { + pushd "$srcdir"/$pkgbase-$pkgver + + export UWSGICONFIG_LUAPC='lua51' + + python uwsgiconfig.py --build archlinux + python uwsgiconfig.py --plugin plugins/python archlinux python + python uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet + python uwsgiconfig.py --plugin plugins/gevent archlinux gevent + python uwsgiconfig.py --plugin plugins/asyncio archlinux asyncio + python uwsgiconfig.py --plugin plugins/zabbix archlinux zabbix + python uwsgiconfig.py --plugin plugins/pypy archlinux pypy + python uwsgiconfig.py --plugin plugins/notfound archlinux notfound +} + +package_uwsgi() { + pkgdesc="A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C" + depends=(libxml2 jansson systemd-libs libcap pam pcre) + install=uwsgi.install + cd "$srcdir"/$pkgbase-$pkgver + install -Dm755 uwsgi "$pkgdir"/usr/bin/uwsgi + install -Dm644 "$srcdir"/uwsgi_at.service "$pkgdir"/usr/lib/systemd/system/uwsgi@.service + install -Dm644 "$srcdir"/uwsgi_at.socket "$pkgdir"/usr/lib/systemd/system/uwsgi@.socket + install -Dm644 "$srcdir"/emperor.uwsgi.service "$pkgdir"/usr/lib/systemd/system/emperor.uwsgi.service + install -Dm644 "$srcdir"/emperor.uwsgi.socket "$pkgdir"/usr/lib/systemd/system/emperor.uwsgi.socket + install -Dm644 "$srcdir"/emperor.ini "$pkgdir"/etc/uwsgi/emperor.ini + install -Dm644 "$srcdir"/tmpfilesd "$pkgdir"/usr/lib/tmpfiles.d/uwsgi.conf + install -Dm644 "$srcdir"/uwsgi.logrotate "$pkgdir"/etc/logrotate.d/uwsgi + install -Dm644 "$srcdir"/uwsgi.sysusers "$pkgdir"/usr/lib/sysusers.d/uwsgi.conf +} + +package_uwsgi-plugin-cgi() { + depends=(uwsgi) + pkgdesc="CGI plugin" + install -Dm755 $pkgbase-$pkgver/cgi_plugin.so "$pkgdir"/usr/lib/uwsgi/cgi_plugin.so +} + +package_uwsgi-plugin-rack() { + depends=(uwsgi ruby) + pkgdesc="Ruby rack plugin" + install -Dm755 $pkgbase-$pkgver/rack_plugin.so "$pkgdir"/usr/lib/uwsgi/rack_plugin.so + install -Dm755 $pkgbase-$pkgver/fiber_plugin.so "$pkgdir"/usr/lib/uwsgi/fiber_plugin.so + install -Dm755 $pkgbase-$pkgver/rbthreads_plugin.so "$pkgdir"/usr/lib/uwsgi/rbthreads_plugin.so +} + +package_uwsgi-plugin-psgi() { + depends=(uwsgi perl) + pkgdesc="Perl psgi plugin" + install -Dm755 $pkgbase-$pkgver/psgi_plugin.so "$pkgdir"/usr/lib/uwsgi/psgi_plugin.so +} + +package_uwsgi-plugin-python() { + depends=(uwsgi python python-greenlet) + pkgdesc="Plugin for Python support" + install -Dm755 $pkgbase-$pkgver/python_plugin.so "$pkgdir"/usr/lib/uwsgi/python_plugin.so + install -Dm755 $pkgbase-$pkgver/greenlet_plugin.so "$pkgdir"/usr/lib/uwsgi/greenlet_plugin.so + install -Dm755 $pkgbase-$pkgver/gevent_plugin.so "$pkgdir"/usr/lib/uwsgi/gevent_plugin.so + install -Dm755 $pkgbase-$pkgver/asyncio_plugin.so "$pkgdir"/usr/lib/uwsgi/asyncio_plugin.so + install -Dm644 $pkgbase-$pkgver/uwsgidecorators.py "$pkgdir"/usr/lib/python3.8/site-packages/uwsgidecorators.py + python -m compileall "$pkgdir"/usr/lib/python3.8/site-packages/ + python -O -m compileall "$pkgdir"/usr/lib/python3.8/site-packages/ +} + +package_uwsgi-plugin-pypy() { + depends=(uwsgi pypy) + pkgdesc="Plugin for PyPy support" + install -Dm755 $pkgbase-$pkgver/pypy_plugin.so "$pkgdir"/usr/lib/uwsgi/pypy_plugin.so + install -Dm644 $pkgbase-$pkgver/uwsgidecorators.py "$pkgdir"/opt/pypy/site-packages/uwsgidecorators.py + pypy -m compileall "$pkgdir"/opt/pypy/site-packages/ + pypy -O -m compileall "$pkgdir"/opt/pypy/site-packages/ +} + +package_uwsgi-plugin-lua51() { + depends=(uwsgi lua51) + pkgdesc="Plugin for Lua support" + install -Dm755 $pkgbase-$pkgver/lua_plugin.so "$pkgdir"/usr/lib/uwsgi/lua_plugin.so +} + +package_uwsgi-plugin-php() { + depends=(uwsgi php-embed libyaml jansson) + pkgdesc="Plugin for PHP support" + install -Dm755 $pkgbase-$pkgver/php_plugin.so "$pkgdir"/usr/lib/uwsgi/php_plugin.so +} + +package_uwsgi-plugin-jvm() { + depends=(uwsgi java-environment=7 classpath) + pkgdesc="Plugin for Jvm support" + install -Dm644 $pkgbase-$pkgver/plugins/jvm/uwsgi.jar "$pkgdir"/usr/share/java/uwsgi.jar + install -Dm755 $pkgbase-$pkgver/jvm_plugin.so "$pkgdir"/usr/lib/uwsgi/jvm_plugin.so +} + +package_uwsgi-plugin-mono() { + depends=(uwsgi mono) + pkgdesc="Plugin for mono support" + install -Dm755 $pkgbase-$pkgver/plugins/mono/uwsgi.dll "$pkgdir"/usr/lib/mono/2.0/uwsgi.dll + install -Dm755 $pkgbase-$pkgver/mono_plugin.so "$pkgdir"/usr/lib/uwsgi/mono_plugin.so +} + +package_uwsgi-plugin-webdav() { + depends=(uwsgi) + pkgdesc="Plugin for webdav support" + install -Dm755 $pkgbase-$pkgver/webdav_plugin.so "$pkgdir"/usr/lib/uwsgi/webdav_plugin.so +} + +package_uwsgi-plugin-zabbix() { + depends=(uwsgi) + pkgdesc="Plugin for zabbix support" + install -Dm755 $pkgbase-$pkgver/zabbix_plugin.so "$pkgdir"/usr/lib/uwsgi/zabbix_plugin.so +} + +package_uwsgi-plugin-notfound() { + depends=(uwsgi) + pkgdesc="Plugin for notfound support" + install -Dm755 $pkgbase-$pkgver/notfound_plugin.so "$pkgdir"/usr/lib/uwsgi/notfound_plugin.so +} Deleted: archlinux.ini =================================================================== --- archlinux.ini 2020-10-07 20:35:01 UTC (rev 720972) +++ archlinux.ini 2020-10-07 20:35:22 UTC (rev 720973) @@ -1,5 +0,0 @@ -[uwsgi] -plugin_dir = /usr/lib/uwsgi -plugins = rack, rbthreads, fiber, psgi, lua, php, jvm, mono, cgi, webdav -main_plugin = systemd_logger,pam -inherit = base Copied: uwsgi/repos/community-x86_64/archlinux.ini (from rev 720972, uwsgi/trunk/archlinux.ini) =================================================================== --- archlinux.ini (rev 0) +++ archlinux.ini 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,5 @@ +[uwsgi] +plugin_dir = /usr/lib/uwsgi +plugins = rack, rbthreads, fiber, psgi, lua, php, jvm, mono, cgi, webdav +main_plugin = systemd_logger,pam +inherit = base Deleted: emperor.ini =================================================================== --- emperor.ini 2020-10-07 20:35:01 UTC (rev 720972) +++ emperor.ini 2020-10-07 20:35:22 UTC (rev 720973) @@ -1,2 +0,0 @@ -[uwsgi] -emperor = /etc/uwsgi/vassals Copied: uwsgi/repos/community-x86_64/emperor.ini (from rev 720972, uwsgi/trunk/emperor.ini) =================================================================== --- emperor.ini (rev 0) +++ emperor.ini 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,2 @@ +[uwsgi] +emperor = /etc/uwsgi/vassals Deleted: emperor.uwsgi.service =================================================================== --- emperor.uwsgi.service 2020-10-07 20:35:01 UTC (rev 720972) +++ emperor.uwsgi.service 2020-10-07 20:35:22 UTC (rev 720973) @@ -1,16 +0,0 @@ -[Unit] -Description=uWSGI Emperor -After=syslog.target - -[Service] -ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/emperor.ini -ExecReload=/bin/kill -HUP $MAINPID -ExecStop=/bin/kill -INT $MAINPID -Restart=always -Type=notify -StandardError=syslog -NotifyAccess=all -KillSignal=SIGQUIT - -[Install] -WantedBy=multi-user.target Copied: uwsgi/repos/community-x86_64/emperor.uwsgi.service (from rev 720972, uwsgi/trunk/emperor.uwsgi.service) =================================================================== --- emperor.uwsgi.service (rev 0) +++ emperor.uwsgi.service 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,15 @@ +[Unit] +Description=uWSGI Emperor +After=syslog.target + +[Service] +ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/emperor.ini +ExecReload=/bin/kill -HUP $MAINPID +ExecStop=/bin/kill -INT $MAINPID +Restart=always +Type=notify +NotifyAccess=all +KillSignal=SIGQUIT + +[Install] +WantedBy=multi-user.target Deleted: emperor.uwsgi.socket =================================================================== --- emperor.uwsgi.socket 2020-10-07 20:35:01 UTC (rev 720972) +++ emperor.uwsgi.socket 2020-10-07 20:35:22 UTC (rev 720973) @@ -1,9 +0,0 @@ -[Unit] -Description=Socket for uWSGI Emperor - -[Socket] -# Change this to your uwsgi application port or unix socket location -ListenStream=/run/uwsgi/emperor.sock - -[Install] -WantedBy=sockets.target Copied: uwsgi/repos/community-x86_64/emperor.uwsgi.socket (from rev 720972, uwsgi/trunk/emperor.uwsgi.socket) =================================================================== --- emperor.uwsgi.socket (rev 0) +++ emperor.uwsgi.socket 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,9 @@ +[Unit] +Description=Socket for uWSGI Emperor + +[Socket] +# Change this to your uwsgi application port or unix socket location +ListenStream=/run/uwsgi/emperor.sock + +[Install] +WantedBy=sockets.target Deleted: tmpfilesd =================================================================== --- tmpfilesd 2020-10-07 20:35:01 UTC (rev 720972) +++ tmpfilesd 2020-10-07 20:35:22 UTC (rev 720973) @@ -1 +0,0 @@ -d /run/uwsgi 0775 root http - - Copied: uwsgi/repos/community-x86_64/tmpfilesd (from rev 720972, uwsgi/trunk/tmpfilesd) =================================================================== --- tmpfilesd (rev 0) +++ tmpfilesd 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1 @@ +d /run/uwsgi 0775 root http - - Deleted: uwsgi.install =================================================================== --- uwsgi.install 2020-10-07 20:35:01 UTC (rev 720972) +++ uwsgi.install 2020-10-07 20:35:22 UTC (rev 720973) @@ -1,9 +0,0 @@ -post_update(){ - echo "To use uwsgi@.socket and uwsgi@.service:" - echo "\tAll you need to do is put the name of your .ini file after the @ sign" - echo "\tYou can use either the .socket or .service, but if you use the .socket" - echo "\tuwsgi@<sameinifile>.service won't be started until the first time your http" - echo "\tserver touches the socket. You will also not need to specify the socket in" - echo "\tthe .ini file or in the .service file. Systemd will handle listening to" - echo "\tthe socket for you." -} Copied: uwsgi/repos/community-x86_64/uwsgi.install (from rev 720972, uwsgi/trunk/uwsgi.install) =================================================================== --- uwsgi.install (rev 0) +++ uwsgi.install 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,9 @@ +post_update(){ + echo "To use uwsgi@.socket and uwsgi@.service:" + echo "\tAll you need to do is put the name of your .ini file after the @ sign" + echo "\tYou can use either the .socket or .service, but if you use the .socket" + echo "\tuwsgi@<sameinifile>.service won't be started until the first time your http" + echo "\tserver touches the socket. You will also not need to specify the socket in" + echo "\tthe .ini file or in the .service file. Systemd will handle listening to" + echo "\tthe socket for you." +} Deleted: uwsgi.logrotate =================================================================== --- uwsgi.logrotate 2020-10-07 20:35:01 UTC (rev 720972) +++ uwsgi.logrotate 2020-10-07 20:35:22 UTC (rev 720973) @@ -1,10 +0,0 @@ -/var/log/uwsgi/*.log /var/log/uwsgi/*/*.log { - copytruncate - daily - rotate 7 - compress - delaycompress - missingok - notifempty - su root uwsgi -} Copied: uwsgi/repos/community-x86_64/uwsgi.logrotate (from rev 720972, uwsgi/trunk/uwsgi.logrotate) =================================================================== --- uwsgi.logrotate (rev 0) +++ uwsgi.logrotate 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,10 @@ +/var/log/uwsgi/*.log /var/log/uwsgi/*/*.log { + copytruncate + daily + rotate 7 + compress + delaycompress + missingok + notifempty + su root uwsgi +} Deleted: uwsgi.sysusers =================================================================== --- uwsgi.sysusers 2020-10-07 20:35:01 UTC (rev 720972) +++ uwsgi.sysusers 2020-10-07 20:35:22 UTC (rev 720973) @@ -1 +0,0 @@ -g uwsgi 53 - Copied: uwsgi/repos/community-x86_64/uwsgi.sysusers (from rev 720972, uwsgi/trunk/uwsgi.sysusers) =================================================================== --- uwsgi.sysusers (rev 0) +++ uwsgi.sysusers 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1 @@ +g uwsgi 53 - Deleted: uwsgi_at.service =================================================================== --- uwsgi_at.service 2020-10-07 20:35:01 UTC (rev 720972) +++ uwsgi_at.service 2020-10-07 20:35:22 UTC (rev 720973) @@ -1,16 +0,0 @@ -[Unit] -Description=uWSGI service unit -After=syslog.target - -[Service] -ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/%I.ini -ExecReload=/bin/kill -HUP $MAINPID -ExecStop=/bin/kill -INT $MAINPID -Restart=always -Type=notify -StandardError=syslog -NotifyAccess=all -KillSignal=SIGQUIT - -[Install] -WantedBy=multi-user.target Copied: uwsgi/repos/community-x86_64/uwsgi_at.service (from rev 720972, uwsgi/trunk/uwsgi_at.service) =================================================================== --- uwsgi_at.service (rev 0) +++ uwsgi_at.service 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,15 @@ +[Unit] +Description=uWSGI service unit +After=syslog.target + +[Service] +ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/%I.ini +ExecReload=/bin/kill -HUP $MAINPID +ExecStop=/bin/kill -INT $MAINPID +Restart=always +Type=notify +NotifyAccess=all +KillSignal=SIGQUIT + +[Install] +WantedBy=multi-user.target Deleted: uwsgi_at.socket =================================================================== --- uwsgi_at.socket 2020-10-07 20:35:01 UTC (rev 720972) +++ uwsgi_at.socket 2020-10-07 20:35:22 UTC (rev 720973) @@ -1,9 +0,0 @@ -[Unit] -Description=Socket for uWSGI %I - -[Socket] -# Change this to your uwsgi application port or unix socket location -ListenStream=/run/uwsgi/%I.sock - -[Install] -WantedBy=sockets.target Copied: uwsgi/repos/community-x86_64/uwsgi_at.socket (from rev 720972, uwsgi/trunk/uwsgi_at.socket) =================================================================== --- uwsgi_at.socket (rev 0) +++ uwsgi_at.socket 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,9 @@ +[Unit] +Description=Socket for uWSGI %I + +[Socket] +# Change this to your uwsgi application port or unix socket location +ListenStream=/run/uwsgi/%I.sock + +[Install] +WantedBy=sockets.target Deleted: uwsgi_fix_rpath.patch =================================================================== --- uwsgi_fix_rpath.patch 2020-10-07 20:35:01 UTC (rev 720972) +++ uwsgi_fix_rpath.patch 2020-10-07 20:35:22 UTC (rev 720973) @@ -1,66 +0,0 @@ -diff --git a/plugins/jvm/uwsgiplugin.py b/plugins/jvm/uwsgiplugin.py -index ac7eb3e..0911288 100644 ---- a/plugins/jvm/uwsgiplugin.py -+++ b/plugins/jvm/uwsgiplugin.py -@@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH: - - GCC_LIST = ['jvm_plugin'] - --if 'LD_RUN_PATH' in os.environ: -- os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:] --else: -- os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:] -- - def post_build(config): - if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0: - os._exit(1) -diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py -index fb9e5bb..fd12c91 100644 ---- a/plugins/php/uwsgiplugin.py -+++ b/plugins/php/uwsgiplugin.py -@@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-error=sign-co - LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split() - if ld_run_path: - LDFLAGS.append('-L%s' % ld_run_path) -- os.environ['LD_RUN_PATH'] = ld_run_path - - LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5'] - -diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py -index c4f03e1..8d4b2e0 100644 ---- a/plugins/python/uwsgiplugin.py -+++ b/plugins/python/uwsgiplugin.py -@@ -45,10 +45,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ: - else: - try: - LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR')) -- os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR')) - except: - LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX) -- os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX - - LIBS.append('-lpython%s' % get_python_version()) - else: -diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py -index 8dee214..2375bc9 100644 ---- a/plugins/rack/uwsgiplugin.py -+++ b/plugins/rack/uwsgiplugin.py -@@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBS']\"" - - if has_shared == 'yes': - LDFLAGS.append('-L' + libpath ) -- os.environ['LD_RUN_PATH'] = libpath - LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip()) - else: - GCC_LIST.append("%s/%s" % (libpath, os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBRUBY_A']\"" % rbconfig).read().rstrip())) -diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py -index ecea48d..4f35984 100644 ---- a/plugins/ruby19/uwsgiplugin.py -+++ b/plugins/ruby19/uwsgiplugin.py -@@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LDFLAG - - libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip() - LDFLAGS.append('-L' + libpath ) --os.environ['LD_RUN_PATH'] = libpath - LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split() - Copied: uwsgi/repos/community-x86_64/uwsgi_fix_rpath.patch (from rev 720972, uwsgi/trunk/uwsgi_fix_rpath.patch) =================================================================== --- uwsgi_fix_rpath.patch (rev 0) +++ uwsgi_fix_rpath.patch 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,66 @@ +diff --git a/plugins/jvm/uwsgiplugin.py b/plugins/jvm/uwsgiplugin.py +index ac7eb3e..0911288 100644 +--- a/plugins/jvm/uwsgiplugin.py ++++ b/plugins/jvm/uwsgiplugin.py +@@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH: + + GCC_LIST = ['jvm_plugin'] + +-if 'LD_RUN_PATH' in os.environ: +- os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:] +-else: +- os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:] +- + def post_build(config): + if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0: + os._exit(1) +diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py +index fb9e5bb..fd12c91 100644 +--- a/plugins/php/uwsgiplugin.py ++++ b/plugins/php/uwsgiplugin.py +@@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-error=sign-co + LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split() + if ld_run_path: + LDFLAGS.append('-L%s' % ld_run_path) +- os.environ['LD_RUN_PATH'] = ld_run_path + + LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5'] + +diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py +index c4f03e1..8d4b2e0 100644 +--- a/plugins/python/uwsgiplugin.py ++++ b/plugins/python/uwsgiplugin.py +@@ -45,10 +45,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ: + else: + try: + LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR')) +- os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR')) + except: + LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX) +- os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX + + LIBS.append('-lpython%s' % get_python_version()) + else: +diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py +index 8dee214..2375bc9 100644 +--- a/plugins/rack/uwsgiplugin.py ++++ b/plugins/rack/uwsgiplugin.py +@@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBS']\"" + + if has_shared == 'yes': + LDFLAGS.append('-L' + libpath ) +- os.environ['LD_RUN_PATH'] = libpath + LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip()) + else: + GCC_LIST.append("%s/%s" % (libpath, os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBRUBY_A']\"" % rbconfig).read().rstrip())) +diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py +index ecea48d..4f35984 100644 +--- a/plugins/ruby19/uwsgiplugin.py ++++ b/plugins/ruby19/uwsgiplugin.py +@@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LDFLAG + + libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip() + LDFLAGS.append('-L' + libpath ) +-os.environ['LD_RUN_PATH'] = libpath + LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split() + Deleted: uwsgi_ruby20_compatibility.patch =================================================================== --- uwsgi_ruby20_compatibility.patch 2020-10-07 20:35:01 UTC (rev 720972) +++ uwsgi_ruby20_compatibility.patch 2020-10-07 20:35:22 UTC (rev 720973) @@ -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: Copied: uwsgi/repos/community-x86_64/uwsgi_ruby20_compatibility.patch (from rev 720972, uwsgi/trunk/uwsgi_ruby20_compatibility.patch) =================================================================== --- uwsgi_ruby20_compatibility.patch (rev 0) +++ uwsgi_ruby20_compatibility.patch 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,42 @@ +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: Deleted: uwsgi_trick_chroot.patch =================================================================== --- uwsgi_trick_chroot.patch 2020-10-07 20:35:01 UTC (rev 720972) +++ uwsgi_trick_chroot.patch 2020-10-07 20:35:22 UTC (rev 720973) @@ -1,16 +0,0 @@ -diff --git a/uwsgiconfig.py b/uwsgiconfig.py -index e447123..4d55f2c 100644 ---- a/uwsgiconfig.py -+++ b/uwsgiconfig.py -@@ -1129,10 +1129,7 @@ def build_plugin(path, uc, cflags, ldflags, libs, name = None): - except: - pass - -- if uc: -- plugin_dest = uc.get('plugin_build_dir', uc.get('plugin_dir')) + '/' + name + '_plugin' -- else: -- plugin_dest = name + '_plugin' -+ plugin_dest = name + '_plugin' - - shared_flag = '-shared' - Copied: uwsgi/repos/community-x86_64/uwsgi_trick_chroot.patch (from rev 720972, uwsgi/trunk/uwsgi_trick_chroot.patch) =================================================================== --- uwsgi_trick_chroot.patch (rev 0) +++ uwsgi_trick_chroot.patch 2020-10-07 20:35:22 UTC (rev 720973) @@ -0,0 +1,16 @@ +diff --git a/uwsgiconfig.py b/uwsgiconfig.py +index e447123..4d55f2c 100644 +--- a/uwsgiconfig.py ++++ b/uwsgiconfig.py +@@ -1129,10 +1129,7 @@ def build_plugin(path, uc, cflags, ldflags, libs, name = None): + except: + pass + +- if uc: +- plugin_dest = uc.get('plugin_build_dir', uc.get('plugin_dir')) + '/' + name + '_plugin' +- else: +- plugin_dest = name + '_plugin' ++ plugin_dest = name + '_plugin' + + shared_flag = '-shared' +