Roundcube Webmail: Update to v1.6.9 (SynoCommunity#6243)

* Bump to v1.6.9
* Update service scripts
* Add resource workers and PHP profiles
* Update changelog

cross/roundcube/Makefile

@@ -1,8 +1,9 @@
 PKG_NAME = roundcubemail
-PKG_VERS = 1.1.4
+PKG_VERS = 1.6.9
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-complete.$(PKG_EXT)
-PKG_DIST_SITE = https://downloads.sourceforge.net/project/roundcubemail/roundcubemail/$(PKG_VERS)
+PKG_DIST_SITE = https://github.com/roundcube/${PKG_NAME}/releases/download/${PKG_VERS}
+
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =

cross/roundcube/digests

@@ -1,3 +1,3 @@
-roundcubemail-1.1.4-complete.tar.gz SHA1 a80d7d53b48e527827407658d7bd90145f401307
-roundcubemail-1.1.4-complete.tar.gz SHA256 9bfe88255d4ffc288f5776de1cead78352469b1766d5ebaebe6e28043affe181
-roundcubemail-1.1.4-complete.tar.gz MD5 260686b4894896744bffa2d8bb259995
+roundcubemail-1.6.9-complete.tar.gz SHA1 b63f74209cf287402f6f44b85877388899261f3c
+roundcubemail-1.6.9-complete.tar.gz SHA256 b61a5f5c22f890c299e935aacfcf0870676990d8aebff0d6cdff075bf17cef4f
+roundcubemail-1.6.9-complete.tar.gz MD5 e733b71422185f296a172d35ca79ef78

spk/roundcube/Makefile

@@ -1,39 +1,50 @@
 SPK_NAME = roundcube
-SPK_VERS = 1.1.4
-SPK_REV = 4
+SPK_VERS = 1.6.9
+SPK_REV = 5
 SPK_ICON = src/roundcube.png
-DSM_UI_DIR = app
 
 DEPENDS  = cross/$(SPK_NAME)
+# Pure PHP package, make sure ARCH is not defined
+override ARCH=
+
+# Due to not obvious WebStation handling requirements
+REQUIRED_MIN_DSM = 6.0
+SPK_DEPENDS = "WebStation:PHP7.4:MariaDB10:Apache2.4"
 
-MAINTAINER = moneytoo
+MAINTAINER = SynoCommunity
 DESCRIPTION = Roundcube is a free and open source webmail solution with a desktop-like user interface which is easy to install/configure and that runs on a standard LAMPP server. It is the same software Synology offers as Mail Station except this does not depend on Mail Server package.
-ADMIN_URL = /roundcube/
 DISPLAY_NAME = Roundcube Webmail
-CHANGELOG = DSM6 compatible
+CHANGELOG = "1. Update to v1.6.9.<br/>2. Add PHP profiles for DSM 6.<br/>3. Add backup and restore functions."
 
 HOMEPAGE   = https://www.roundcube.net
 LICENSE    = GPLv3
 
+STARTABLE = no
+SERVICE_USER = auto
+SERVICE_SETUP = src/service-setup.sh
+
+ADMIN_URL = /roundcube/
+
 WIZARDS_DIR = src/wizard/
-CONF_DIR = src/conf/
+SYSTEM_GROUP = http
 
-INSTALLER_SCRIPT = src/installer.sh
-SSS_SCRIPT       = src/dsm-control.sh
+DSM_UI_DIR = app
+DSM_UI_CONFIG = src/app/config
+CONF_DIR = src/conf/
 
-INSTALL_DEP_SERVICES = apache-web mysql
-START_DEP_SERVICES = apache-web mysql
+include ../../mk/spksrc.common.mk
 
-INSTALL_PREFIX = /usr/local/$(SPK_NAME)
+# Alternate conf dir for DSM 6
+ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
+CONF_DIR = src/conf_6/
+endif
 
 POST_STRIP_TARGET = roundcube_extra_install
 
-# Pure PHP package, make sure ARCH is not defined
-override ARCH=
-
 include ../../mk/spksrc.spk.mk
 
 .PHONY: roundcube_extra_install
 roundcube_extra_install:
-	install -m 755 -d $(STAGING_DIR)/app
-	install -m 644 src/app/config $(STAGING_DIR)/app/config
+	install -m 755 -d $(STAGING_DIR)/web
+	install -m 644 src/web/roundcube.conf $(STAGING_DIR)/web/roundcube.conf
+	install -m 644 src/web/roundcube.json $(STAGING_DIR)/web/roundcube.json

spk/roundcube/src/conf/resource

@@ -0,0 +1,71 @@
+{
+    "mariadb10-db": {
+        "admin-account-m10": "root",
+        "admin-pw-m10": "{{wizard_mysql_password_root}}",
+        "create-db": {
+            "db-collision": "skip",
+            "db-name": "roundcube",
+            "flag": "{{wizard_create_db}}"
+        },
+        "drop-db-uninst": true,
+        "drop-user-uninst": true,
+        "grant-user": {
+            "db-name": "roundcube",
+            "flag": "{{mysql_grant_user}}",
+            "host": "localhost",
+            "user-name": "roundcube",
+            "user-pw": "{{wizard_mysql_password_roundcube}}"
+        }
+    },
+    "webservice": {
+        "pkg_dir_prepare": [
+            {
+                "group": "http",
+                "mode": "0755",
+                "source": "/var/packages/roundcube/target/share/roundcube",
+                "target": "roundcube",
+                "user": "sc-roundcube"
+            }
+        ],
+        "portals": [
+            {
+                "alias": "roundcube",
+                "app": "com.synocommunity.packages.roundcube",
+                "name": "Roundcube Webmail",
+                "service": "roundcube",
+                "type": "alias"
+            }
+        ],
+        "services": [
+            {
+                "backend": 2,
+                "display_name": "Roundcube Webmail",
+                "icon": "app/images/roundcube-{0}.png",
+                "php": {
+                    "backend": 8,
+                    "extensions": [
+                        "curl",
+                        "exif",
+                        "gd",
+                        "iconv",
+                        "imagick",
+                        "intl",
+                        "ldap",
+                        "mysqli",
+                        "openssl",
+                        "pdo_mysql",
+                        "sockets",
+                        "zip"
+                    ],
+                    "group": "http",
+                    "profile_desc": "PHP Profile for roundcube",
+                    "profile_name": "roundcube Profile",
+                    "user": "sc-roundcube"
+                },
+                "root": "roundcube",
+                "service": "roundcube",
+                "type": "apache_php"
+            }
+        ]
+    }
+}

spk/roundcube/src/conf_6/privilege

@@ -0,0 +1,7 @@
+{
+    "defaults": {
+        "run-as": "root"
+    },
+    "username": "sc-roundcube",
+    "join-groupname": "http"
+}

spk/roundcube/src/conf_6/resource

@@ -0,0 +1,20 @@
+{
+    "mariadb10-db": {
+        "admin-account-m10": "root",
+        "admin-pw-m10": "{{wizard_mysql_password_root}}",
+        "create-db": {
+            "db-collision": "skip",
+            "db-name": "roundcube",
+            "flag": "{{wizard_create_db}}"
+        },
+        "drop-db-uninst": true,
+        "drop-user-uninst": true,
+        "grant-user": {
+            "db-name": "roundcube",
+            "flag": "{{mysql_grant_user}}",
+            "host": "localhost",
+            "user-name": "roundcube",
+            "user-pw": "{{wizard_mysql_password_roundcube}}"
+        }
+    }
+}