upgpkg: nextcloud-app-user-oidc 1.1.0-2

2 files changed, 44 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47901286783d..1327ed4abeff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = nextcloud-app-user-oidc
 	pkgdesc = OIDC connect user backend for Nextcloud
 	pkgver = 1.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/nextcloud/user_oidc
 	arch = x86_64
 	license = AGPL3
 	makedepends = composer
+	makedepends = nextcloud
 	makedepends = npm
 	makedepends = rsync
-	depends = nextcloud
+	makedepends = yq
 	source = https://github.com/nextcloud/user_oidc/archive/v1.1.0/user_oidc-1.1.0.tar.gz
 	sha256sums = 77eb8729f36df0a89105d2091f2cc9168fec9e953d8624baeb1e1c66c28236a0
 
diff --git a/PKGBUILD b/PKGBUILD
index 00ba93788833..f0b1d8ba93dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,55 @@
 _appname=user_oidc
 pkgname=nextcloud-app-${_appname/_/-}
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='OIDC connect user backend for Nextcloud'
 arch=(x86_64)
 url="https://github.com/nextcloud/$_appname"
 license=(AGPL3)
-depends=(nextcloud)
 makedepends=(composer
+             nextcloud
              npm
-             rsync)
+             rsync
+             yq)
 _archive="$_appname-$pkgver"
 source=("$url/archive/v$pkgver/$_archive.tar.gz")
 sha256sums=('77eb8729f36df0a89105d2091f2cc9168fec9e953d8624baeb1e1c66c28236a0')
 
+# BEGIN boilerplate nextcloud app version clamping, see also other packages in group
+# 1. Call respective function helpers in check() and package() *after* cd'ing to the source directory
+# 2. Add makedepends+=(nextcloud yq)
+_phps=(php7 php)
+_get_supported_ranges() {
+	_app_min_nextcloud="$(< appinfo/info.xml xq -r '.info.dependencies.nextcloud["@min-version"] | values')"
+	_app_max_nextcloud="$(< appinfo/info.xml xq -r '.info.dependencies.nextcloud["@max-version"] | values | tonumber | .+1')"
+	_app_min_php="$(< appinfo/info.xml xq -r '.info.dependencies.php["@min-version"] | values')"
+	_app_max_php="$(< appinfo/info.xml xq -r '.info.dependencies.php["@max-version"] | values | tonumber | .+0.1')"
+}
+_unsupported_range() {
+	printf "%s requires %s %s, but %s %s is provided.\n" "$pkgname" "$1" "$2" "$1" "$3"
+	exit 1
+}
+_nextcloud_app_check() {
+	_get_supported_ranges
+	for _php in "${_phps[@]}"; do command -v "$_php" > /dev/null && break; done
+	local _nextcloud_ver="$("$_php" <(cat /usr/share/webapps/nextcloud/version.php; echo 'print($OC_VersionString);'))"
+	local _php_ver="$("$_php" -r 'print(phpversion());')"
+	[[ "$(vercmp "${_app_min_nextcloud:-0}" "$_nextcloud_ver")" -le 0 ]] || \
+		_unsupported_range nextcloud "=> $_app_min_nextcloud" "$_nextcloud_ver"
+	[[ "$(vercmp "${_app_max_nextcloud:-999}" "$_nextcloud_ver")" -gt 0 ]] || \
+		_unsupported_range nextcloud "< $_app_max_nextcloud" "$_nextcloud_ver"
+	[[ "$(vercmp "${_app_min_php:-0}" "$_php_ver")" -le 0 ]] || \
+		_unsupported_range php ">= $_app_min_php" "$_php_ver"
+	[[ "$(vercmp "${_app_max_php:-999}" "$_php_ver")" -gt 0 ]] || \
+		_unsupported_range php "< $_app_max_php" "$_php_ver"
+}
+_nextcloud_app_package() {
+	_get_supported_ranges
+	depends+=("nextcloud>=${_app_min_nextcloud:-0}" "nextcloud<${_app_max_nextcloud:-999}")
+	depends+=("php-interpreter${_app_min_php:+>=$_app_min_php}" ${_app_max_php:+"php-interpreter<$_app_max_php"})
+}
+# END boilerplate nextcloud app version clamping
+
 prepare() {
 	cd "$_archive"
 	composer install --no-dev
@@ -24,11 +60,13 @@ prepare() {
 
 build() {
 	cd "$_archive"
+	_nextcloud_app_check
 	npm run build --cache "$srcdir/npm-cache" --offline
 }
 
 package() {
 	cd "$_archive"
+	_nextcloud_app_package
 	_appdir="$pkgdir/usr/share/webapps/nextcloud/apps/$_appname"
 	rsync -a --mkpath \
 		--include='appinfo/***' \