Feng Office: Update to v3.11.2.8 (#5992)

* Update makefiles and digests
* Update service scripts
* Add resource workers
* Add PHP profiles for DSM 6
* Miscellaneous fixes
* Simplify DSM6 privilage file
* Implement backup function
* Implement restore function
* Bump to v3.11.2.8

cross/fengoffice/Makefile

@@ -1,17 +1,15 @@
 PKG_NAME = fengoffice
-PKG_VERS = 2.5.1.2
-PKG_EXT = zip
-PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://sourceforge.net/projects/opengoo/files/$(PKG_NAME)/$(PKG_NAME)_$(PKG_VERS)
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+PKG_VERS = 3.11.2.8
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/fengoffice/$(PKG_NAME)/archive/$(PKG_VERS)
 
 DEPENDS =
 
 HOMEPAGE = https://www.fengoffice.com
 COMMENT  = Feng Office is a Collaboration Platform and Project Management System.
 LICENSE  = AGPL
 
-EXTRACT_PATH = $(WORK_DIR)/$(PKG_DIR)
 CONFIGURE_TARGET = nop
 COMPILE_TARGET = nop
 INSTALL_TARGET = fengoffice_install
@@ -21,5 +19,5 @@ include ../../mk/spksrc.cross-cc.mk
 .PHONY: fengoffice_install
 fengoffice_install:
 	mkdir -p $(STAGING_INSTALL_PREFIX)/share/fengoffice
-	tar -cf - -C $(WORK_DIR)/$(PKG_DIR)/$(PKG_NAME) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/fengoffice
+	tar -cf - -C $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/fengoffice
 	install -m 644 src/install_helper.php $(STAGING_INSTALL_PREFIX)/share/fengoffice/public/install/install_helper.php

cross/fengoffice/digests

@@ -1,3 +1,3 @@
-fengoffice_2.5.1.2.zip SHA1 86972fee42a48879d6da80e858407945a028d260
-fengoffice_2.5.1.2.zip SHA256 1c3dfc9ae529cd7a39105d6029fb49d5f1936d77e17aa9af8a97df8888508969
-fengoffice_2.5.1.2.zip MD5 5746ab690c818f36be9b4b7fb4206c2e
+fengoffice-3.11.2.8.tar.gz SHA1 b700ff65ec7bac41f27fc50866cd81dffca79f36
+fengoffice-3.11.2.8.tar.gz SHA256 b146bba574349d0480407a101b4f4924f876425ff5955470c515efbc953b8b6c
+fengoffice-3.11.2.8.tar.gz MD5 766ac490d2aeb1ca9a2868a35fcf1300

spk/fengoffice/Makefile

@@ -1,41 +1,50 @@
 SPK_NAME = fengoffice
-SPK_VERS = 2.5.1.2
-SPK_REV = 3
+SPK_VERS = 3.11.2.8
+SPK_REV = 4
 SPK_ICON = src/fengoffice.png
-DSM_UI_DIR = app
 
-DEPENDS  = cross/busybox cross/$(SPK_NAME)
+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 = Feng Office is a Collaboration Platform and Project Management System.
-ADMIN_URL = /fengoffice/
 DISPLAY_NAME = Feng Office
-CHANGELOG = "1. DSM 5.0 compatibility"
+CHANGELOG = "1. Update to v3.11.2.8.<br/>2. Add PHP profiles for DSM 6.<br/>3. Add backup and restore functions."
+
+HOMEPAGE = https://www.fengoffice.com/
+LICENSE = AGPL
+
+STARTABLE = yes
+SERVICE_USER = auto
+SERVICE_SETUP = src/service-setup.sh
 
-HOMEPAGE   = https://www.fengoffice.com/
-LICENSE    = AGPL
+ADMIN_URL = /fengoffice/
 
 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 = fengoffice_extra_install
 
-BUSYBOX_CONFIG = daemon nice
-ENV += BUSYBOX_CONFIG="$(BUSYBOX_CONFIG)"
-
 include ../../mk/spksrc.spk.mk
 
 .PHONY: fengoffice_extra_install
-fengoffice_extra_install: 
-	install -m 755 -d $(STAGING_DIR)/var
-	install -m 755 src/fengoffice.sh $(STAGING_DIR)/bin/
-	install -m 755 -d $(STAGING_DIR)/app
-	install -m 644 src/app/config $(STAGING_DIR)/app/config
+fengoffice_extra_install:
+	install -m 755 -d $(STAGING_DIR)/web
+	install -m 644 src/web/fengoffice.conf $(STAGING_DIR)/web/fengoffice.conf
+	install -m 644 src/web/fengoffice.json $(STAGING_DIR)/web/fengoffice.json

spk/fengoffice/src/conf/resource

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

spk/fengoffice/src/conf_6/privilege

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

spk/fengoffice/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": "fengoffice",
+            "flag": "{{wizard_create_db}}"
+        },
+        "drop-db-uninst": true,
+        "drop-user-uninst": true,
+        "grant-user": {
+            "db-name": "fengoffice",
+            "flag": "{{mysql_grant_user}}",
+            "host": "localhost",
+            "user-name": "fengoffice",
+            "user-pw": "{{wizard_mysql_password_fengoffice}}"
+        }
+    }
+}