ownCloud: Update to version 10.12 (#5619)

* Update ownCloud to 10.12
* Move backend to SQLite
* Update UI wizards
* Move data dir to share
* Patch DSM6 shared folder handling
* Framework: Fix icon generation

cross/owncloud/Makefile

@@ -1,22 +1,22 @@
 PKG_NAME = owncloud
-PKG_VERS = 8.1.12
+PKG_VERS = 10.12
+PKG_DATE = 20230313
 PKG_EXT = tar.bz2
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_NAME = $(PKG_NAME)-complete-$(PKG_DATE).$(PKG_EXT)
 PKG_DIST_SITE = https://download.owncloud.com/server/stable
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)
 
 DEPENDS =
 
 HOMEPAGE = https://owncloud.org/
 COMMENT  = ownCloud gives you universal access to your files through a web interface or WebDAV. It also provides a platform to easily view & sync your contacts, calendars and bookmarks across all your devices and enables basic editing right on the web. Installation has minimal server requirements, doesn’t need special permissions and is quick. ownCloud is extendable via a simple but powerful API for applications and plugins.
 LICENSE  = AGPL
 
-EXTRACT_PATH = $(WORK_DIR)/$(PKG_DIR)
 INSTALL_TARGET = owncloud_install
 
 include ../../mk/spksrc.install-resources.mk
 
 .PHONY: owncloud_install
 owncloud_install:
-	mkdir -p $(STAGING_INSTALL_PREFIX)/share/owncloud
-	tar -cf - -C $(WORK_DIR)/$(PKG_DIR)/$(PKG_NAME) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/owncloud
+	mkdir -p $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)
+	tar -cf - -C $(WORK_DIR)/$(PKG_DIR) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)

cross/owncloud/digests

@@ -1,3 +1,3 @@
-owncloud-8.1.12.tar.bz2 SHA1 07f7338fddc972acce3967f68b87b07141c039dc
-owncloud-8.1.12.tar.bz2 SHA256 e6a544dedbd118edc10ac3e2d858c7646c5b365c5ada23f028d37b06770b329e
-owncloud-8.1.12.tar.bz2 MD5 d12c661faa502cd36caafe9a9aef5724
+owncloud-complete-20230313.tar.bz2 SHA1 a67d25383ccc78a9adb3caaf58ea4bcca9a26f2a
+owncloud-complete-20230313.tar.bz2 SHA256 174f48076cefd574b35f6e5f088555eabefc46c419d621c5c0215be7621a08b9
+owncloud-complete-20230313.tar.bz2 MD5 4fd9486d0dfb24036dae5d0bbb27cce8

mk/spksrc.icon.mk

@@ -14,7 +14,7 @@ ICON_COOKIE = $(WORK_DIR)/.$(COOKIE_PREFIX)icon_done
 # Icons are only needed with "DSM UI configuration" (see spksrc.service.mk)
 ifneq ($(strip $(DSM_UI_DIR)),)
 ifneq ($(strip $(SPK_ICON)),)
-ifneq ($(strip $(SERVICE_PORT)),)
+ifneq ($(or $(strip $(SERVICE_PORT)), $(strip $(ADMIN_URL))),)
 ifeq ($(strip $(NO_SERVICE_SHORTCUT)),)
 ICON_DIR = $(STAGING_DIR)/$(DSM_UI_DIR)/images
 endif

spk/owncloud/Makefile

@@ -1,44 +1,52 @@
 SPK_NAME = owncloud
-SPK_VERS = 8.1.12
-SPK_REV = 8
+SPK_VERS = 10.12
+SPK_REV = 9
 SPK_ICON = src/owncloud.png
 DSM_UI_DIR = app
 
-DEPENDS = cross/busybox cross/$(SPK_NAME)
+DEPENDS = cross/$(SPK_NAME)
+SPK_DEPENDS = "WebStation:PHP7.4:Apache2.4"
+
+REQUIRED_MIN_DSM = 6.0
 
 MAINTAINER = ymartin59
 DESCRIPTION = ownCloud is a personal cloud which runs on your own server and gives you freedom and control over your own data.
-ADMIN_URL = /owncloud/
+CHANGELOG = "1. Update ownCloud to 10.12.<br/>2. Use faster SQLite database.<br/>3. Use shared folder for data directory."
 DISPLAY_NAME = ownCloud
-CHANGELOG = "1. Update ownCloud to 8.1.12"
-
-HOMEPAGE   = https://owncloud.org/
-LICENSE    = AGPL
+HOMEPAGE = https://owncloud.org/
+LICENSE = AGPL
 
-REQUIRED_MIN_DSM = 5.0
+STARTABLE = yes
+SERVICE_USER = auto
+SERVICE_WIZARD_SHARE = wizard_data_share
+USE_DATA_SHARE_WORKER = yes
+SERVICE_SETUP = src/service-setup.sh
 
-WIZARDS_DIR = src/wizard/
-CONF_DIR = src/conf/
+SYSTEM_GROUP = http
 
-INSTALLER_SCRIPT = src/installer.sh
-SSS_SCRIPT       = src/dsm-control.sh
+# Admin link for in DSM UI
+ADMIN_URL = /owncloud/
+ADMIN_PROTOCOL = https
 
-INSTALL_DEP_SERVICES = apache-web mysql
-START_DEP_SERVICES = apache-web mysql
-INSTUNINST_RESTART_SERVICES = apache-web
+CONF_DIR = src/conf/
+WIZARDS_DIR = src/wizard/
 
-INSTALL_PREFIX = /usr/local/$(SPK_NAME)
+DSM_UI_CONFIG = src/app/config
 
 POST_STRIP_TARGET = owncloud_extra_install
 
-BUSYBOX_CONFIG = daemon nice
-ENV += BUSYBOX_CONFIG="$(BUSYBOX_CONFIG)"
+# TMPDIR is used for owncloud built in backup and update
+USE_ALTERNATE_TMPDIR = 1
+
+# Pure PHP package, make sure ARCH is not defined
+override ARCH=
 
 include ../../mk/spksrc.spk.mk
 
 .PHONY: owncloud_extra_install
 owncloud_extra_install:
-	install -m 755 -d $(STAGING_DIR)/var -d $(STAGING_DIR)/app
-	install -m 755 src/owncloud.sh $(STAGING_DIR)/bin/
+	install -m 755 -d $(STAGING_DIR)/app -d $(STAGING_DIR)/bin -d $(STAGING_DIR)/web
 	install -m 644 src/app/config $(STAGING_DIR)/app/config
-	install -m 644 src/autoconfig.php $(STAGING_DIR)/share/$(SPK_NAME)/config/autoconfig.php
+	install -m 755 src/bin/owncloud-daemon $(STAGING_DIR)/bin/owncloud-daemon
+	install -m 644 src/web/owncloud.conf $(STAGING_DIR)/web/owncloud.conf
+	install -m 644 src/web/owncloud.json $(STAGING_DIR)/web/owncloud.json

spk/owncloud/src/app/config

@@ -1,15 +1,14 @@
 {
-    ".url": {
-        "com.synocommunity.packages.owncloud": {
-            "title": "ownCloud",
-            "desc": "ownCloud",
-            "icon": "images/owncloud-{0}.png",
-            "type": "url",
-            "protocol": "http",
-            "port": "80",
-            "url": "/owncloud",
-            "allUsers": true,
-            "grantPrivilege": "local"
-        }
-    }
+	".url": {
+		"com.synocommunity.packages.owncloud": {
+			"allUsers": true,
+			"desc": "ownCloud",
+			"icon": "images/owncloud-{0}.png",
+			"port": "443",
+			"protocol": "https",
+			"title": "ownCloud",
+			"type": "url",
+			"url": "/owncloud/"
+		}
+	}
 }

spk/owncloud/src/bin/owncloud-daemon

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+# ownCloud service setup
+WEB_DIR="/var/services/web_packages"
+# for backwards compatability
+if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ];then
+    WEB_DIR="/var/services/web"
+    if [ -z ${SYNOPKG_PKGNAME} ]; then
+        SYNOPKG_PKGNAME="owncloud"
+    fi
+fi
+PHP="/usr/local/bin/php74"
+OWNCLOUD="${PHP} ${WEB_DIR}/${SYNOPKG_PKGNAME}/occ background:cron"
+HOME_DIR="${SYNOPKG_PKGVAR}"
+# for backwards compatability
+if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ];then
+    HOME_DIR="${SYNOPKG_PKGDEST}/var"
+fi
+SLEEP_TIME="1800"
+
+# Main loop
+while true; do
+    # Update
+    echo "Updating..."
+    ${OWNCLOUD} >> "${HOME_DIR}/daemon.log" 2>&1
+
+    # Wait
+    echo "Waiting ${SLEEP_TIME} seconds..."
+    sleep ${SLEEP_TIME}
+done

spk/owncloud/src/conf/resource

@@ -0,0 +1,73 @@
+{
+	"webservice": {
+		"migrate": {
+			"root": [{
+				"new": "owncloud",
+				"old": "owncloud"
+			}]
+		},
+		"pkg_dir_prepare": [{
+			"group": "http",
+			"mode": "0750",
+			"source": "/var/packages/owncloud/target/share/owncloud",
+			"target": "owncloud",
+			"user": "sc-owncloud"
+		}],
+		"portals": [{
+			"alias": "owncloud",
+			"app": "com.synocommunity.packages.owncloud",
+			"display_name": "ownCloud",
+			"name": "ownCloud",
+			"service": "ownCloud",
+			"type": "alias"
+		}],
+		"services": [{
+			"backend": 2,
+			"display_name": "ownCloud",
+			"icon": "app/images/owncloud-{0}.png",
+			"php": {
+				"backend": 8,
+				"connect_timeout": 120,
+				"extensions": [
+					"bcmath",
+					"bz2",
+					"curl",
+					"gd",
+					"gmp",
+					"imagick",
+					"imap",
+					"intl",
+					"ldap",
+					"openssl",
+					"pdo_sqlite",
+					"sqlite3",
+					"ssh2",
+					"zip",
+					"zlib"
+				],
+				"group": "http",
+				"php_settings": {
+					"error_log": "/var/services/web_packages/owncloud/php_errors.log",
+					"max_execution_time": "900"
+				},
+				"profile_desc": "PHP Profile for ownCloud",
+				"profile_name": "ownCloud Profile",
+				"user": "sc-owncloud"
+			},
+			"read_timeout": 3600,
+			"root": "owncloud",
+			"send_timeout": 120,
+			"service": "ownCloud",
+			"type": "apache_php"
+		}]
+	},
+	"data-share": {
+		"shares": [{
+			"name": "{{wizard_data_share}}",
+			"permission": {
+				"rw": ["sc-owncloud"]
+			},
+			"once": true
+		}]
+	}
+}