Date: Tuesday, December 20, 2022 @ 11:15:39 Author: dvzrv Revision: 1363716
upgpkg: nextcloud 25.0.2-2: Rebuild to adapt to new php packaging. Fix the detection of php interpreter versions matching the nextcloud version constraints. Instead of php7, we now rely on the generic php-legacy package/interpreter name. Modified: nextcloud/trunk/PKGBUILD nextcloud/trunk/nextcloud.uwsgi -----------------+ PKGBUILD | 38 ++++++++++++++++++++++---------------- nextcloud.uwsgi | 2 +- 2 files changed, 23 insertions(+), 17 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-12-20 11:10:58 UTC (rev 1363715) +++ PKGBUILD 2022-12-20 11:15:39 UTC (rev 1363716) @@ -5,12 +5,12 @@ # NOTE: always check first whether the version is supposed to be packaged: # https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule pkgver=25.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="A cloud server to store your files centrally on a hardware controlled by you" arch=(any) url="https://nextcloud.com"; license=(AGPL3) -makedepends=(php php-gd) +makedepends=(php php-legacy) optdepends=( 'curl: for webcron jobs from within uwsgi' 'ffmpeg: for preview generation' @@ -51,7 +51,7 @@ '20f12f0bb1d0ac735fb86e79e90fb99028e06e0d5a6842d449e443b418442682cad2573cfd4bf8e2a802c2aeb5780bce4647d45054bbc38156ae037802358698' '1d06f339c43d57e5f5406c2698b815241fd9e39039a9e55f777face510c9a5ddae5ccd4e051393e8f16f391301a6aa03fff2462837a2d3441d969ea7195e7d84' '919008a2bf6cf2492cb1e9c8e28c1e082d74e45da5a96e6669f8971d6cf721e36d23625c89918fe10d8bc1b202c0340aa897849d9ec501a26f3f4572ccb57a98' - '67d32011e3dccf41ecaaeffa7486e70b8ee516b3423796c19cc9c95ba6ecd5d031540eeacefb9423fdfc70b1baad15a4885b7147cfbbb2773b349e72d3fe4df2' + '77b61dc0c7424aa1aa25b79b75a90918d62b994b73158f7bf138590808b6c06fab5d761d08757e47a919a26c9a22e8cb4e547ff93f438e578703f83e95d451ec' '66f542d8b84701d81e6f6d896163faa232996ee081bcabe4acc121064ef538b5c1ea43728222b5cadc60a5d433b1e54ad7c1fe9d1d188ffa8eaf331fd4cd8ec0' 'eb69785a5b0df0e2a11f53f9c2e2dbf75681d7c698e88cbcc5ceed713a558d528511cc576813cc083cbaa28a2c83d543a39436ad4805670348ef22634305b1c8') b2sums=('8980fa45dcfa1f9cc70434f0bdd15154a2ef42b80bb4e57b5cb2792afa9ad77867640bc6a6d266b88e52a12aae829d34bd55d5c46fd2ba74acde0bea7b4c028e' @@ -62,13 +62,13 @@ 'f3d1423a457c7a24c25c8b18e24b838b63e99a7f7562ded954ea605c76bbd31e8e79158314e1343e341aa21b6a26dc57ca4f00b871bbc170f6b7d5044985e661' '1a61a89531636b65dade03cd7edca8747b3e1e880f9bbd4d5a53cffa452d70fe17e345cfed739ae92e99e336d4c1f2633c84a5c84a4ee6da518762bf1396b1db' 'd132044cb7f1d61a1ce87800d2e1142e3ac385acdec25e2f5ad685603a0ffa88e105f4c35688584d65d287adbb40b8d9a02d6a80d7a0b58bb8801a6769405218' - '67fa7d9207ab3e8309d4adcce734bd25f82bd03f1f88adea7e40adaddebb345b96a793df7960db79f4f39947f5edff61548bb409066b81e3fe643d313e68d66a' + 'b3779ca259ea6ebcb145af1f5bc8b9d53ada72b68ea02716d834f44404dc0c4a3c4b6d046db81a88a79b287d46408a3c59df5ede203cce0892c77214eb1b3243' 'a84fbdc9b5caf28eae6bfb147ea0c77e4cfc5a42f29b3fe93c0ecf8414f95ed20999a131efb7c7ba49041304fe7104813c574e6b5aaa6b03881aea3428144f33' 'e6214351ca16bfe97683e838e727d6b5eaa62194878272204034c62aac4a632c9b33cd31aa0570c2eb936d7e9e7ff60190ac05a3a8cc2e27eda423a7d89b6d39') validpgpkeys=('28806A878AE423A28372792ED75899B9A724937A') # Nextcloud Security <[email protected]> _get_php_versions() { - local _phps=(php7 php) + local _phps=(php php-legacy) local _min _max _min=$(sed -nr 's/^.*PHP_VERSION_ID < ([0-9]*).*$/\1/p' $pkgname/lib/versioncheck.php) @@ -75,19 +75,25 @@ _max=$(sed -nr 's/^.*PHP_VERSION_ID >= ([0-9]*).*$/\1/p' $pkgname/lib/versioncheck.php) _min_php="${_min:0:1}.${_min:2:1}" _max_php="${_max:0:1}.${_max:2:1}" + printf "%s requires %s >= php < %s\n" $pkgname $_min_php $_max_php _php_interpreter="" for _php in "${_phps[@]}"; do + _php_version="" if command -v "$_php" > /dev/null; then + _php_version="$($_php --version |head -n1 |cut -d ' ' -f2)" + printf "Detected interpreter: %s (%s)\n" "$_php" "$_php_version" if [[ -z "$_php_interpreter" ]]; then - _php_interpreter="$_php" + if [[ "$(vercmp "$_php_version" "$_max_php")" -lt 0 && "$(vercmp "$_php_version" "$_min_php")" -gt 0 ]]; then + _php_interpreter="$_php" + _php_interpreter_version="$_php_version" + printf "Using interpreter for package: %s (%s)\n" "$_php" "$_php_version" + else + printf "Skipping interpreter due to incompatibility: %s (%s)\n" "$_php" "$_php_version" + fi fi fi done - _system_php="$($_php_interpreter --version |head -n1 |cut -d ' ' -f2)" - printf "Detected php interpreter %s\n" $_php_interpreter - printf "Detected php %s\n" $_system_php - printf "%s requires %s >= php < %s\n" $pkgname $_min_php $_max_php } prepare() { @@ -104,12 +110,12 @@ check() { _get_php_versions - if [[ "$(vercmp "$_system_php" "$_min_php" )" -lt 0 ]]; then - printf "%s requires php >= %s, but %s is provided\n" $pkgname $_min_php $_system_php + if [[ "$(vercmp "$_php_interpreter_version" "$_min_php" )" -lt 0 ]]; then + printf "%s requires php >= %s, but %s is provided\n" $pkgname $_min_php $_php_interpreter_version exit 1 fi - if [[ "$(vercmp "$_system_php" "$_max_php" )" -gt 0 ]]; then - printf "%s requires php < %s, but %s is provided\n" $pkgname $_max_php $_system_php + if [[ "$(vercmp "$_php_interpreter_version" "$_max_php" )" -gt 0 ]]; then + printf "%s requires php < %s, but %s is provided\n" $pkgname $_max_php $_php_interpreter_version exit 1 fi } @@ -120,9 +126,9 @@ _get_php_versions depends=("php-interpreter<$_max_php") - # NOTE: this sets up a custom prefix based on the php major version for for a php based package (e.g. php7-apcu) + # NOTE: this sets a custom php postfix based on whether php-legacy needs to be used if [[ "$_php_interpreter" != *php ]]; then - _dep_ver="${_system_php%%.*}" + _dep_ver="-legacy" fi depends+=("php$_dep_ver-gd") Modified: nextcloud.uwsgi =================================================================== --- nextcloud.uwsgi 2022-12-20 11:10:58 UTC (rev 1363715) +++ nextcloud.uwsgi 2022-12-20 11:15:39 UTC (rev 1363716) @@ -79,4 +79,4 @@ # change the URL to your own address and uncomment to run a webcron job every five minutes # cron = -5 -1 -1 -1 -1 curl --silent https://change.me.tld/cron.php 1>/dev/null # uncomment to run a cron job every five minutes -# cron = -5 -1 -1 -1 -1 php -f /usr/share/webapps/%n/cron.php +# cron = -5 -1 -1 -1 -1 PHP_INTERPRETER -f /usr/share/webapps/%n/cron.php
