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

[Sven-Hendrik Haase]

    Date: Saturday, May 15, 2021 @ 15:29:52
  Author: svenstaro
Revision: 934695

upgpkg: uwsgi 2.0.19.1-12: Remove jvm support

Modified:
  uwsgi/trunk/PKGBUILD
  uwsgi/trunk/archlinux.ini

---------------+
 PKGBUILD      |   33 ++++++++-------------------------
 archlinux.ini |    2 +-
 2 files changed, 9 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-15 15:25:23 UTC (rev 934694)
+++ PKGBUILD	2021-05-15 15:29:52 UTC (rev 934695)
@@ -18,7 +18,6 @@
   uwsgi-plugin-php
   uwsgi-plugin-php7
   uwsgi-plugin-lua51
-  uwsgi-plugin-jvm
   uwsgi-plugin-mono
   uwsgi-plugin-webdav
   uwsgi-plugin-zabbix
@@ -25,15 +24,13 @@
   uwsgi-plugin-notfound
 )
 pkgver=2.0.19.1
-pkgrel=11
+pkgrel=12
 pkgdesc="A full stack for building hosting services"
 arch=(x86_64)
 url="https://uwsgi-docs.readthedocs.io/en/latest/"
 license=(GPL2)
 makedepends=(
-  classpath
   jansson
-  java-environment=7
   libxcrypt
   libxml2
   lua51
@@ -68,7 +65,7 @@
   "${pkgbase}-2.0.19.1-php8.patch"
 )
 sha512sums=('e18359c5ea3606d5de7fb3a0074d777e1c4b41f51f4b1a21f1446f32253058d7924286d9ed8a159d4c6e6c0ea64df7fc3c70b2933c3433b9a9cce39737e702bf'
-            'f2be78fb77938ced8a4edb2899e4ee532bfc48cdc04b26a18c69e618bde869b19b546d1bf60decc5dc95de09de81a5bdd4f071501ce5c5d735eac158a995d5ed'
+            '51c474a5ae025c0fae17dec309bea29550a8ca39815b7495189394ae5ce30eb264f77a45f48f9f7529c59d907baf139cdf7c488d1b13fcb862cc7b9bdc268804'
             'd54c84838ddb2f389e115ebb81aa2583705c9e330f020e6583b496f9c271ed236b6820c2a065f2b55a79adbf13e262b9ff2428124a8044b8fa20ca29ca4930ac'
             '068ada6281fdeb504fed7e47dae2729d047ed810bb596e5268c1821ad275cd32110e801e93e7ba0ee2d92dbc39e1954180cf43d88d2990d42b802ceb54b50a9e'
             '592c85270f43b37e9c51aae126533830515b96fff9fcae969ee865fe173bd0550c7729530d5ff1e44ffee43cd5c78c96688ce091c677a4196379e24983c0180e'
@@ -80,7 +77,7 @@
             '162ca1be96282b32e8e6be919b6315bfd08954c491056958985bf99e7f5bdad3511665f059329d6cb6ef5d222f9aa11d4dc43c72e6a963ab941ada959fe8d964'
             '91b9548bb24eb4fff86ff867121edab92b531db04dacf5402b9bd8849632edfbfa0878e244bf5d243f34dcd5ee0df0ad136c888a4f27984dd6a96fd7b5e0959e')
 b2sums=('3f13da44081e85dfee01c827593656c0d1074a0217ca5fde5424ff36e0ae529d506f65a2bca658bd7df0a07520cae21cf8ce72ec85c767ec73304afd8a70b89e'
-        '4a1e79fd4d450de11079b305f1b82660c6632ca6a2f15e641ab1a404a3b867c2439aa6031cc95956ff75ac21960f8734d7b1bec28330fecbfe95af3023ec8a32'
+        '46f833e5d179d950bcbab51b539e6431959c9e3618c0d66b791a4b4d866b6195707704b394224b4fea97e1f65188b8b474499d70e5c2bb44da32c60447b80806'
         '835a1036422e9821cd52ffdf5a6053bdd59fc700d473600bda60b6730746f6c0750c30c85f4139d3ea81c6b6dd10d6849f9406decee3179861c51aca90da6161'
         '80aa3c4d3f0310f5029ac01690d2ba718d8c86fa49cd1b4f3fc1bd5ae9eadaed6562bf0a48a0fd611e92f100a8594e08fb4bae58e25765fc2eb648cdf1c60b35'
         'b6838c0c91811d4b677bf0f558134c69015708c308ef7080df328f12b0b0d58ae6cdebe277c29b6d11c20cfeb0847a4934e3a8924323e57ed661d6e9f6656a34'
@@ -97,25 +94,20 @@
 
   cd "$pkgbase-$pkgver"
 
-  for _patch in ../*.patch; do
-    printf "Applying patch %s...\n" "${_patch}"
-      patch -Np1 -i "${_patch}"
-  done
+  patch -Np1 -i "$srcdir"/uwsgi-1.9.13-ruby2.0.patch
+  patch -Np1 -i "$srcdir"/uwsgi-2.0.19.1-php8.patch
 
   # fix default lua pkgconfig name
-  sed -e 's/lua5.1/lua51/' \
-      -i plugins/lua/uwsgiplugin.py
+  sed -e 's/lua5.1/lua51/' -i plugins/lua/uwsgiplugin.py
   # move ruby plugin to new location and fix its name
   mv plugins/ruby{19,}
-  sed -e 's/ruby19/ruby/' \
-      -i plugins/ruby/uwsgiplugin.py
+  sed -e 's/ruby19/ruby/' -i plugins/ruby/uwsgiplugin.py
   # duplicate the php plugin, so that we can modify it (and leave the php7
   # version unmodified)
   cp -av plugins/php{,7}
   # 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
+  sed -e "s/ + php_version//" -i plugins/php/uwsgiplugin.py
   # copy our custom build profile into place
   cp -v ../archlinux.ini buildconf/
 }
@@ -218,15 +210,6 @@
   install -vDm 755 php7_plugin.so -t "$pkgdir"/usr/lib/uwsgi/
 }
 
-package_uwsgi-plugin-jvm() {
-  pkgdesc+=" (JVM plugin)"
-  depends=('classpath' 'glibc' 'uwsgi' 'java-environment=7')
-
-  cd "$pkgbase-$pkgver"
-  install -vDm 755 jvm_plugin.so -t "$pkgdir"/usr/lib/uwsgi/
-  install -vDm 644 plugins/jvm/uwsgi.jar -t "$pkgdir"/usr/share/java/
-}
-
 package_uwsgi-plugin-mono() {
   pkgdesc+=" (mono plugin)"
   depends=('glibc' 'mono' 'uwsgi')

Modified: archlinux.ini
===================================================================
--- archlinux.ini	2021-05-15 15:25:23 UTC (rev 934694)
+++ archlinux.ini	2021-05-15 15:29:52 UTC (rev 934695)
@@ -1,6 +1,6 @@
 [uwsgi]
 plugin_build_dir = .
 plugin_dir = /usr/lib/uwsgi
-plugins = asyncio, cgi, fiber, gevent, greenlet, jvm, php, lua, mono, notfound, psgi, pypy, python, rack, rbthreads, webdav, zabbix
+plugins = asyncio, cgi, fiber, gevent, greenlet, php, lua, mono, notfound, psgi, pypy, python, rack, rbthreads, webdav, zabbix
 main_plugin = systemd_logger,pam
 inherit = base