From 5bf0ebf49a63ca945a8d3ad57fe4559ba1d58784 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Sat, 3 Jul 2021 15:42:03 +0200
Subject: [PATCH] community/nextcloud20: modernize
---
community/nextcloud21/APKBUILD | 45 ++++++++++++----------------------
1 file changed, 16 insertions(+), 29 deletions(-)
diff --git a/community/nextcloud21/APKBUILD b/community/nextcloud21/APKBUILD
index 9ddc38be4e43..07977df0687a 100644
--- a/community/nextcloud21/APKBUILD
+++ b/community/nextcloud21/APKBUILD
@@ -3,10 +3,10 @@
pkgname=nextcloud21
_pkgname=nextcloud
pkgver=21.0.3
-pkgrel=0
+pkgrel=1
_replaced_ver=20
pkgdesc="Transitional package to allow nextcloud upgrade from v18->v20 for Alpine 3.12->3.13"
-url="http://nextcloud.com"
+url="https://nextcloud.com/"
arch="noarch"
license="AGPL-3.0-only"
_php=php7
@@ -27,12 +27,12 @@ provides="$pkgname-contactsinteraction=$pkgver-r$pkgrel
$pkgname-viewer=$pkgver-r$pkgrel
$pkgname-workflowengine=$pkgver-r$pkgrel
"
-replaces="nextcloud$_replaced_ver nextcloud${_replaced_ver}-viewer"
+replaces="nextcloud$_replaced_ver nextcloud$_replaced_ver-viewer"
install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
$pkgname-initscript.post-install"
subpackages="$pkgname-doc $pkgname-initscript $pkgname-mysql $pkgname-pgsql $pkgname-sqlite
$pkgname-default-apps:_default_apps"
-source="https://download.nextcloud.com/server/releases/nextcloud-$pkgver.zip
+source="https://download.nextcloud.com/server/releases/nextcloud-$pkgver.tar.bz2
nextcloud-dont-chmod.patch
nextcloud-app-encryption-info-add-mcrypt.patch
dont-update-htaccess.patch
@@ -53,7 +53,7 @@ pkggroups="www-data"
builddir="$srcdir"/nextcloud
# List of bundled apps to separate into subpackages. Keep it in sync!
-# Note: Don't add "contactsinteraction", "files", "dav",
+# Note: Don't add "contactsinteraction", "files", "dav",
# "federatedfilesharing", "lookup_server_connector", "provisioning_api",
# "oauth2", "settings", "twofactor_backupcodes", "workflowengine"
# here, these should be always installed.
@@ -155,7 +155,7 @@ package() {
}
doc() {
- replaces="nextcloud${_replaced_ver}-doc"
+ replaces="nextcloud$_replaced_ver-doc"
default_doc
local target="$subpkgdir"/usr/share/webapps/$_pkgname/core/doc
@@ -166,7 +166,7 @@ doc() {
initscript() {
pkgdesc="Init script that runs Nextcloud with php-fpm"
depends="$pkgname $_php-fpm"
- replaces="nextcloud${_replaced_ver}-initscript"
+ replaces="nextcloud$_replaced_ver-initscript"
local confdir="$subpkgdir/etc/$_php/php-fpm.d"
local fpm_name="php-fpm${_php#php}"
@@ -184,28 +184,28 @@ initscript() {
pgsql() {
pkgdesc="Nextcloud PostgreSQL support"
depends="$pkgname $_php-pgsql $_php-pdo_pgsql"
- replaces="nextcloud${_replaced_ver}-pgsql"
+ replaces="nextcloud$_replaced_ver-pgsql"
mkdir -p "$subpkgdir"
}
sqlite() {
pkgdesc="Nextcloud SQLite support"
depends="$pkgname $_php-sqlite3 $_php-pdo_sqlite"
- replaces="nextcloud${_replaced_ver}-sqlite"
+ replaces="nextcloud$_replaced_ver-sqlite"
mkdir -p "$subpkgdir"
}
mysql() {
pkgdesc="Nextcloud MySQL support"
depends="$pkgname $_php-pdo_mysql"
- replaces="nextcloud${_replaced_ver}-mysql"
+ replaces="nextcloud$_replaced_ver-mysql"
mkdir -p "$subpkgdir"
}
_default_apps() {
pkgdesc="Nextcloud default apps"
depends="$pkgname"
- replaces="nextcloud${_replaced_ver}-default-apps"
+ replaces="nextcloud$_replaced_ver-default-apps"
local path; for path in "$pkgdir"/$_appsdir/*; do
if grep -q '<default_enable\s*/>' "$path"/appinfo/info.xml; then
@@ -222,7 +222,7 @@ _package_app() {
local name=$(xmlstarlet sel -t -v 'info/name/text()' "$appinfo")
pkgdesc="Nextcloud ${name:-$appname} app"
- replaces="nextcloud${_replaced_ver}-${appname}"
+ replaces="nextcloud$_replaced_ver-$appname"
local php_deps=$(xmlstarlet sel -t -v 'info/dependencies/lib/text()' "$appinfo" \
| xargs -r -n1 printf "$_php-%s\n")
@@ -236,7 +236,7 @@ _package_app() {
photos)
app_deps="-viewer"
provides="$pkgname-gallery=$pkgver-r$pkgrel"
- replaces="$replaces nextcloud${_replaced_ver}-gallery"
+ replaces="$replaces nextcloud$_replaced_ver-gallery"
;;
esac
@@ -248,21 +248,7 @@ _package_app() {
}
sha512sums="
-7490191ca05a9fffce49e6c4076a188d03c4a8223283b8966e637eadd0ad74b51340e0508aa29454e4e7f06693cf179d71d73754724ecaa975c2470abdbe2ff7 nextcloud-20.0.10.zip
-aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9 nextcloud-dont-chmod.patch
-2d03b90c1e2f3d96001f31f1bbf902e4c411c8de7dc5a4f956fa8297533324cb12092d3ad2198f2e02ff4835dc22febee2d49e449b003caef5b990d9dcff1e70 nextcloud-app-encryption-info-add-mcrypt.patch
-aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch
-d2100a837fef1eeae5f706650ab4c985d9e00f61efa5526ef76c7c1f5811c3906eb6c3c13c151eff9677a0c303faab64411a5a84d6792728bc520d2c618d7d5b disable-integrity-check-as-default.patch
-3fc3e06580a619d81b12f448976ffac34f0bb80fc73e9443fa213a73f160ba4b9bd14a26c134258ee12c04d8e103b46f4de10d7b11e4544a328878e57d436055 iconv-ascii-translit-not-supported.patch
-df1a16414a278c205876ec86c210a02a9009954e2d4f9033ff3c9b76c371e2764ef3587db5a4b8f76302655c6c8688c8729d1685279a77d279d3839cc359fbcd use-external-docs-if-local-not-avail.patch
-5f73cd9399fa484ef15bd47e803c93381deffbc7699eceadbb5c27e43b20156806d74e5021a64d28f0165ef87b519e962780651711a37bceb9f0b04455dfdce1 nextcloud20-config.php
-7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba nextcloud20.logrotate
-dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a nextcloud20.confd
-edb699ea6127b231793254115b334006c2d50a0d2ecc846188c3521ddffc3c0e19c5e2944f03cae81e6c645c859258380691081b1c522a22d40939b31db36e8a nextcloud20.cron
-ee9073a6df4286cba2d1d855cf40863968f20677729b2c7848ab50a70d4915b8e84c957a850a03a707231256c11312e5792e7817dd50afbf73efe767fef2112d fpm-pool.conf
-959852e34f010e635470829d66713f3e22c47717ec2c6487759eed2b6aeff9fd1421fe0271d494a02781bd1c98beb2823583623ee2cf03057cd5db794627d6c2 occ
-"
-sha512sums="bf77e0c4a13a3f6991aacbbf81ba69a08a2ecef4c722bcfe18f9ad2899773e3aa4647c194c790af1ee2fe051041147c05913f4611df426d35dcc05a0ef66be32 nextcloud-21.0.3.zip
+e618dc400659a2aca37857c446d31296e64d7671a66bf077969b3194ae35242c6de11eabd1547791067c0edc43e93149fadf102bd4022cffb92802ad9d7e4ef7 nextcloud-21.0.3.tar.bz2
aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9 nextcloud-dont-chmod.patch
67654d1b606c36ee9a8804b4ae0c9310c6f9dbc38aee0e73afb8da535fe64ee688b7052fd5d248ce094843c54dd8858e8c4cb014556a5a33f261fd3a4d56f7c4 nextcloud-app-encryption-info-add-mcrypt.patch
aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch
@@ -274,4 +260,5 @@ df1a16414a278c205876ec86c210a02a9009954e2d4f9033ff3c9b76c371e2764ef3587db5a4b8f7
dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a nextcloud21.confd
edb699ea6127b231793254115b334006c2d50a0d2ecc846188c3521ddffc3c0e19c5e2944f03cae81e6c645c859258380691081b1c522a22d40939b31db36e8a nextcloud21.cron
ee9073a6df4286cba2d1d855cf40863968f20677729b2c7848ab50a70d4915b8e84c957a850a03a707231256c11312e5792e7817dd50afbf73efe767fef2112d fpm-pool.conf
-959852e34f010e635470829d66713f3e22c47717ec2c6487759eed2b6aeff9fd1421fe0271d494a02781bd1c98beb2823583623ee2cf03057cd5db794627d6c2 occ"
+959852e34f010e635470829d66713f3e22c47717ec2c6487759eed2b6aeff9fd1421fe0271d494a02781bd1c98beb2823583623ee2cf03057cd5db794627d6c2 occ
+"
--
GitLab