aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2020-10-19 12:30:29 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2020-10-19 12:33:40 +0000
commit8944143d99b457f5e1519355227b286ce1a052ac (patch)
treeff6739d430108a8ab898da85d17da57287486927
parent0ec748acdd0a5b0869155802f105915ff8bb142b (diff)
downloadaports-8944143d99b457f5e1519355227b286ce1a052ac.tar.gz
aports-8944143d99b457f5e1519355227b286ce1a052ac.tar.bz2
aports-8944143d99b457f5e1519355227b286ce1a052ac.tar.xz
community/nextcloud: upgrade to 20.0.0
-rw-r--r--community/nextcloud/APKBUILD20
-rw-r--r--community/nextcloud/nextcloud-app-encryption-info-add-mcrypt.patch (renamed from community/nextcloud/nextcloud17-app-encryption-info-add-mcrypt.patch)2
-rw-r--r--community/nextcloud/nextcloud.post-upgrade11
3 files changed, 25 insertions, 8 deletions
diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
index 0b1370bfa1..fd32ee724f 100644
--- a/community/nextcloud/APKBUILD
+++ b/community/nextcloud/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=nextcloud
-pkgver=19.0.4
+pkgver=20.0.0
pkgrel=0
pkgdesc="A safe home for all your data"
url="http://nextcloud.com"
@@ -22,6 +22,7 @@ provides="$pkgname-contactsinteraction=$pkgver-r$pkgrel
$pkgname-provisioning_api=$pkgver-r$pkgrel
$pkgname-settings=$pkgver-r$pkgrel
$pkgname-twofactor_backupcodes=$pkgver-r$pkgrel
+ $pkgname-viewer=$pkgver-r$pkgrel
$pkgname-workflowengine=$pkgver-r$pkgrel
"
install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
@@ -30,7 +31,7 @@ subpackages="$pkgname-doc $pkgname-initscript $pkgname-mysql $pkgname-pgsql $pkg
$pkgname-default-apps:_default_apps"
source="https://download.nextcloud.com/server/releases/nextcloud-$pkgver.zip
nextcloud19-dont-chmod.patch
- nextcloud17-app-encryption-info-add-mcrypt.patch
+ nextcloud-app-encryption-info-add-mcrypt.patch
dont-update-htaccess.patch
disable-integrity-check-as-default.patch
iconv-ascii-translit-not-supported.patch
@@ -51,13 +52,14 @@ builddir="$srcdir"/$pkgname
# List of bundled apps to separate into subpackages. Keep it in sync!
# Note: Don't add "contactsinteraction", "files", "dav",
# "federatedfilesharing", "lookup_server_connector", "provisioning_api",
-# "oauth2", "settings", "twofactor_backupcodes", "workflowengine"
+# "oauth2", "settings", "twofactor_backupcodes", "viewer", "workflowengine"
# here, these should be always installed.
_apps="accessibility
activity
admin_audit
cloud_federation_api
comments
+ dashboard
encryption
federation
files_external
@@ -83,7 +85,8 @@ _apps="accessibility
text
theming
user_ldap
- viewer
+ user_status
+ weather_status
"
for _i in $_apps; do
subpackages="$subpackages $pkgname-$_i:_package_app"
@@ -216,7 +219,10 @@ _package_app() {
local app_deps=""
case "$appname" in
- files_sharing) app_deps="-federatedfilesharing";;
+ dashboard) app_deps="-accessibility"
+ ;;
+ files_sharing) app_deps="-federatedfilesharing"
+ ;;
photos)
app_deps="-viewer"
provides="$pkgname-gallery=$pkgver-r$pkgrel"
@@ -239,9 +245,9 @@ _package_app() {
mv "$pkgdir"/$_appsdir/$appname "$subpkgdir"/$_appsdir/
}
-sha512sums="2c94d7b9c668df0f6195b56fdf54acc4f386ff454a7bad0c8744d57db3ebcac392de4bfc92ed0823f08f17260c12e9a633b2370f971dfadf02449e34d9312f7b nextcloud-19.0.4.zip
+sha512sums="01b930dc75bfaf75ea21e5ea6f4c7ef8541cbc402a5cf9b262803f58dc4883fafd5bc5dae227e1dc872d6840cf32a3c2e6e39c831753a233baeda515484d7ace nextcloud-20.0.0.zip
aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9 nextcloud19-dont-chmod.patch
-56b187b5410452c5375b0503cfc154f86b8662f9590638c6975457675848b4251a8b1ed530741d815adfb4494ca44acc0ffea10471296be73026dcb4279aca60 nextcloud17-app-encryption-info-add-mcrypt.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
diff --git a/community/nextcloud/nextcloud17-app-encryption-info-add-mcrypt.patch b/community/nextcloud/nextcloud-app-encryption-info-add-mcrypt.patch
index 3554fa524f..d926ee0a60 100644
--- a/community/nextcloud/nextcloud17-app-encryption-info-add-mcrypt.patch
+++ b/community/nextcloud/nextcloud-app-encryption-info-add-mcrypt.patch
@@ -7,6 +7,6 @@ index 5050996..6df2d2b 100644
<dependencies>
<lib>openssl</lib>
+ <lib>mcrypt</lib>
- <nextcloud min-version="19" max-version="19"/>
+ <nextcloud min-version="20" max-version="20"/>
</dependencies>
diff --git a/community/nextcloud/nextcloud.post-upgrade b/community/nextcloud/nextcloud.post-upgrade
index 01f2002a61..898b0ea547 100644
--- a/community/nextcloud/nextcloud.post-upgrade
+++ b/community/nextcloud/nextcloud.post-upgrade
@@ -41,6 +41,17 @@ if [ $(apk version -t "$ver_old" '15.0.2-r0') = '<' ]; then
fi
+if [ $(apk version -t "$ver_old" '20.0.0-r0') = '<' ]; then
+ cat >&2 <<-EOF
+ *
+ * If you are updating from Alpine 3.12->3.13
+ * please use the transitional package nextcloud19
+ * to upgrade from Nextcloud 18->20
+ *
+ EOF
+
+fi
+
if [ "${ver_new%-r*}" != "${ver_old%-r*}" ]; then
echo ' * Run "occ upgrade" to finish upgrading your NextCloud instance!' >&2
fi