[arch-commits] Commit in nextcloud/trunk (PKGBUILD nextcloud.hook nextcloud.occ.sh)

[David Runge]

    Date: Saturday, February 20, 2021 @ 11:10:47
  Author: dvzrv
Revision: 866583

upgpkg: nextcloud 21.0.0-3: Rebuild to switch to php >= 8.0.0.

Nextcloud 21.0.0 supports php>=8.0.0, php<8.1.0, so all dependencies can be changed
to use php instead of php7 (https://bugs.archlinux.org/task/69709).
As uwsgi is currently not supporting php>=8.0.0 it remains as a php7 only option.
Remove redundant checksum arrays.

Modified:
  nextcloud/trunk/PKGBUILD
  nextcloud/trunk/nextcloud.hook
  nextcloud/trunk/nextcloud.occ.sh

------------------+
 PKGBUILD         |   55 +++++++++++++++++------------------------------------
 nextcloud.hook   |    2 -
 nextcloud.occ.sh |    4 +--
 3 files changed, 21 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-20 10:15:29 UTC (rev 866582)
+++ PKGBUILD	2021-02-20 11:10:47 UTC (rev 866583)
@@ -3,33 +3,33 @@
 
 pkgname=nextcloud
 pkgver=21.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
 arch=('any')
 url="https://nextcloud.com"
 license=('AGPL3')
-depends=('php7>=7.4.0' 'php7<7.5.0' 'php7-gd')
+depends=('php>=8.0.0' 'php<8.1.0' 'php-gd')
 optdepends=(
   'ffmpeg: for preview generation'
   'mariadb: to use a local MariaDB server'
   'memcached: to use a local memcached server'
-  'php7-apcu: for caching with APCU'
-  'php7-apache: to use the Apache web server'
-  'php7-fpm: to run in fastCGI process manager'
-  'php7-imagick: for preview generation'
-  'php7-imap: for external user authentication'
-  'php7-intl: to increase language translation performance and fix sorting'
-  'php7-ldap: for LDAP authentication'
-  'php7-memcached: for caching with memcached'
-  'php7-pgsql: to use the PostgreSQL database backend'
-  'php7-redis: for caching with redis'
-  'php7-sqlite: to use the SQLite database backend'
+  'php-apcu: for caching with APCU'
+  'php-apache: to use the Apache web server'
+  'php-fpm: to run in fastCGI process manager'
+  'php-imagick: for preview generation'
+  'php-imap: for external user authentication'
+  'php-intl: to increase language translation performance and fix sorting'
+  'php-ldap: for LDAP authentication'
+  'php-memcached: for caching with memcached'
+  'php-pgsql: to use the PostgreSQL database backend'
+  'php-redis: for caching with redis'
+  'php-sqlite: to use the SQLite database backend'
   'postgresql: to use a local PostgreSQL server'
   'redis: to use a local Redis server'
   'smbclient: for SMB/CIFS integration'
   'sudo: for occ command'
   'libreoffice: for preview generation'
-  'uwsgi: run as application container'
+  'uwsgi-plugin-php: run as application container - php7 only'
 )
 backup=(
   "etc/webapps/${pkgname}/config.php"
@@ -50,8 +50,8 @@
 sha512sums=('a1ae3400f0fb5997e54b0cee821c50d13e4ba0e27c9d11731c8b5233cba564666121a58aed848ccd2593a9783e27db1ed98ff559588a76a1acaeaf083ef4404a'
             'SKIP'
             '6f9f284d78d414a3bb7c159a812b105e31e8cd2393afee44465701e6f18169709f6d492d790e403e1e66f308c51b6b6496d29ddce29e4fac2c73a3c84a10c7fe'
-            '76754f2facddaca388a9cfe302850e3265bfeee55c5942d830a1bfd9a3ce303eb6e585ec93e372c9aabfe50f75f06912a88426d80e1b7808c73a18ffde52643f'
-            '8a0cd48b39566ab94b5bf5989c630c2c7e4abe89cad89e5f8e85d3355b5e059f4a1ff1b4600a3c974f3b0bed33fa14831182517fd4b9fb5983c52396d3ab3588'
+            '7b18b73ee369607b8ee3d00d2a054262a7b8f3033fc4873eb333c9b9333d7338870c035910ae123b564a65d7d245730178137311048f0713d5bc524de3654923'
+            'cd86397e08459c9f06cfd44ff27a35879157166f5e8aab95d51bc7c4bb11f93e7c414a08ec1cbe9e81f1b4edfbf5eb5eaba7c6904da80a2c92c765bcb546aa66'
             '1d06f339c43d57e5f5406c2698b815241fd9e39039a9e55f777face510c9a5ddae5ccd4e051393e8f16f391301a6aa03fff2462837a2d3441d969ea7195e7d84'
             '4f951e7cad06940d983035c3dc51531bbbcbc0c74296af63f2fab1705b413f340ff67300506377fade0ed7ddecee8552b3da028711751c120f1fad4b1c33e8d5'
             'a3ebcabcdb8c2d2653f44a248abd213bc4dbb317766b82c8f3e93b31e72ace350d7e8037bd4e22a632ab33f739e1941467b0e9d2cf7d0a7433227b4169030051')
@@ -58,34 +58,15 @@
 b2sums=('7c583c150f6b315830191329310993582439e7aef57f306b93681d654b8fa7d4d5dafee082befd493aafd2bf6efd940d52ca0ca05b8e42b79a1599ff3e809550'
         'SKIP'
         'a7e1aa1d8cb2b0ff7832bb7d6d857987733253317c0f3727e744502aeaa3b2008351b47ecc24e348fe7b252cefaffe2418797523ee288dfd55e128917e8fbe2c'
-        '0776acc402b4f6a913ab904bf9721fdb927f37410f599afb6b77411243e6d5db4f3037adb1d90f7d3be2ebdc005f4abcb00819267249c99a30f19a7501aa57f6'
-        '30b1d70346aa5be9eb37d4b4dcf8813b758a95e3eecddca99571aeac0ba3fa28f695f41abdb766053231533f0e4cffc80d1843e71825c7ee38af5d1236dc2a70'
+        '772a9571fe7d88dbcbeb46351a188354e237dfe8e020131f2752b3a36cff0ff177423b4cfd6a1a5f28946f86a8581f3e24ee06ebda7260c5f862ca4071908e43'
+        '6a90659bf0ab7163fe0cf591abed9b58b9ff09c548698e7f8844ecc710917cf05561bad754f6d7543593d13b41e9ec630042b4fc3fbad43e1011b0e45868e4ed'
         '1a61a89531636b65dade03cd7edca8747b3e1e880f9bbd4d5a53cffa452d70fe17e345cfed739ae92e99e336d4c1f2633c84a5c84a4ee6da518762bf1396b1db'
         'a644617d2b42ab357da546a5c9e3182fa9d2d8ae36ee77b24a04ed036e837212c9cbbd2f40d6e0c6f075a38aa58c7a8c01807ff820c9ee4f6556c661be81e0cb'
         'd3c66e22c3cc1b8de1c0b60cd32701080d599dc9853af41d9d9d493ffe3a8d9a2573455d80dd0de019dfe9992187cb23b9df90c18f0ca5962912566014c6779c')
 validpgpkeys=('28806A878AE423A28372792ED75899B9A724937A') # Nextcloud Security <security at nextcloud.com>
-sha512sums=('a1ae3400f0fb5997e54b0cee821c50d13e4ba0e27c9d11731c8b5233cba564666121a58aed848ccd2593a9783e27db1ed98ff559588a76a1acaeaf083ef4404a'
-            'SKIP'
-            '6f9f284d78d414a3bb7c159a812b105e31e8cd2393afee44465701e6f18169709f6d492d790e403e1e66f308c51b6b6496d29ddce29e4fac2c73a3c84a10c7fe'
-            '76754f2facddaca388a9cfe302850e3265bfeee55c5942d830a1bfd9a3ce303eb6e585ec93e372c9aabfe50f75f06912a88426d80e1b7808c73a18ffde52643f'
-            '8a0cd48b39566ab94b5bf5989c630c2c7e4abe89cad89e5f8e85d3355b5e059f4a1ff1b4600a3c974f3b0bed33fa14831182517fd4b9fb5983c52396d3ab3588'
-            '1d06f339c43d57e5f5406c2698b815241fd9e39039a9e55f777face510c9a5ddae5ccd4e051393e8f16f391301a6aa03fff2462837a2d3441d969ea7195e7d84'
-            '4f951e7cad06940d983035c3dc51531bbbcbc0c74296af63f2fab1705b413f340ff67300506377fade0ed7ddecee8552b3da028711751c120f1fad4b1c33e8d5'
-            'a3ebcabcdb8c2d2653f44a248abd213bc4dbb317766b82c8f3e93b31e72ace350d7e8037bd4e22a632ab33f739e1941467b0e9d2cf7d0a7433227b4169030051')
-b2sums=('7c583c150f6b315830191329310993582439e7aef57f306b93681d654b8fa7d4d5dafee082befd493aafd2bf6efd940d52ca0ca05b8e42b79a1599ff3e809550'
-        'SKIP'
-        'a7e1aa1d8cb2b0ff7832bb7d6d857987733253317c0f3727e744502aeaa3b2008351b47ecc24e348fe7b252cefaffe2418797523ee288dfd55e128917e8fbe2c'
-        '0776acc402b4f6a913ab904bf9721fdb927f37410f599afb6b77411243e6d5db4f3037adb1d90f7d3be2ebdc005f4abcb00819267249c99a30f19a7501aa57f6'
-        '30b1d70346aa5be9eb37d4b4dcf8813b758a95e3eecddca99571aeac0ba3fa28f695f41abdb766053231533f0e4cffc80d1843e71825c7ee38af5d1236dc2a70'
-        '1a61a89531636b65dade03cd7edca8747b3e1e880f9bbd4d5a53cffa452d70fe17e345cfed739ae92e99e336d4c1f2633c84a5c84a4ee6da518762bf1396b1db'
-        'a644617d2b42ab357da546a5c9e3182fa9d2d8ae36ee77b24a04ed036e837212c9cbbd2f40d6e0c6f075a38aa58c7a8c01807ff820c9ee4f6556c661be81e0cb'
-        'd3c66e22c3cc1b8de1c0b60cd32701080d599dc9853af41d9d9d493ffe3a8d9a2573455d80dd0de019dfe9992187cb23b9df90c18f0ca5962912566014c6779c')
 
 prepare() {
   mv -v "${pkgname}" "${pkgname}-${pkgver}"
-  cd "${pkgname}-${pkgver}"
-  # set shebang for executable
-  sed -e 's/env php/env php7/' -i occ
 }
 
 package() {

Modified: nextcloud.hook
===================================================================
--- nextcloud.hook	2021-02-20 10:15:29 UTC (rev 866582)
+++ nextcloud.hook	2021-02-20 11:10:47 UTC (rev 866583)
@@ -10,4 +10,4 @@
 [Action]
 Description = Updating Nextcloud installation
 When = PostTransaction
-Exec = /usr/bin/runuser -u nextcloud -- /usr/bin/php7 /usr/share/webapps/nextcloud/occ upgrade
+Exec = /usr/bin/runuser -u nextcloud -- /usr/bin/php /usr/share/webapps/nextcloud/occ upgrade

Modified: nextcloud.occ.sh
===================================================================
--- nextcloud.occ.sh	2021-02-20 10:15:29 UTC (rev 866582)
+++ nextcloud.occ.sh	2021-02-20 11:10:47 UTC (rev 866583)
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-readonly default_config="/etc/php7/php.ini"
-readonly default_php_command="/usr/bin/php7"
+readonly default_config="/etc/php/php.ini"
+readonly default_php_command="/usr/bin/php"
 readonly default_user="nextcloud"
 
 config=""