Selfoss: Update to version 2.19

cross/selfoss/Makefile

@@ -1,22 +1,21 @@
 PKG_NAME = selfoss
-PKG_VERS = 2.13
+PKG_VERS = 2.19
 PKG_EXT = zip
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/SSilence/selfoss/releases/download/$(PKG_VERS)
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+PKG_DIST_SITE = https://github.com/fossar/$(PKG_NAME)/releases/download/$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)
 
 DEPENDS =
 
 HOMEPAGE = https://selfoss.aditu.de/
 COMMENT  = The new multipurpose rss reader, live stream, mashup, aggregation web application.
 LICENSE  = GPLv3
 
-EXTRACT_PATH = $(WORK_DIR)/$(PKG_DIR)
 INSTALL_TARGET = selfoss_install
 
 include ../../mk/spksrc.install-resources.mk
 
 .PHONY: selfoss_install
 selfoss_install:
-	mkdir -p $(STAGING_INSTALL_PREFIX)/share/selfoss
-	tar -cf - -C $(WORK_DIR)/$(PKG_DIR) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/selfoss
+	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/selfoss/digests

@@ -1,3 +1,3 @@
-selfoss-2.13.zip SHA1 d5b2efec42c028480fd1811a838f2dfb1e115f2a
-selfoss-2.13.zip SHA256 407d7899bbac684e0c78385ad02af027af441198683ceedc23edc58c0dd19b8a
-selfoss-2.13.zip MD5 1a5f2f8a233c1e9723a08f35737aaa3f
+selfoss-2.19.zip SHA1 383567d96c00027ab1f390df4e1eda2efeccba31
+selfoss-2.19.zip SHA256 e49c4750e9723277963ca699b602f09f9148e2b9f258fce6b14429498af0e4fc
+selfoss-2.19.zip MD5 c5121a54b88920eb6785e503a6f03e06

spk/selfoss/Makefile

@@ -1,41 +1,48 @@
 SPK_NAME = selfoss
-SPK_VERS = 2.13
-SPK_REV = 6
+SPK_VERS = 2.19
+SPK_REV = 7
 SPK_ICON = src/selfoss.png
-DSM_UI_DIR = app
 
-DEPENDS  = cross/busybox cross/$(SPK_NAME)
+DEPENDS  = cross/selfoss
+# Pure PHP package, make sure ARCH is not defined
+override ARCH=
+
+REQUIRED_MIN_DSM = 6.0
+SPK_DEPENDS = WebStation:PHP7.4:Apache2.4
 
 MAINTAINER = moneytoo
 DESCRIPTION = The new multipurpose rss reader, live stream, mashup, aggregation web application.
-ADMIN_URL = /selfoss/
 DISPLAY_NAME = Selfoss
-CHANGELOG = "1. Update Selfoss to 2.13<br>2. Fix DSM4.3 compatibility"
-
+CHANGELOG = "1. Update Selfoss to 2.19.<br/>2. Use faster SQLite database."
 HOMEPAGE   = https://selfoss.aditu.de/
+
 LICENSE    = GPLv3
 
 WIZARDS_DIR = src/wizard/
-CONF_DIR = src/conf/
 
-INSTALLER_SCRIPT = src/installer.sh
-SSS_SCRIPT       = src/dsm-control.sh
+SYSTEM_GROUP = http
 
-INSTALL_DEP_SERVICES = apache-web mysql
-START_DEP_SERVICES = apache-web mysql
+# Admin link for in DSM UI
+ADMIN_URL = /selfoss/
+
+DSM_UI_DIR = app
+DSM_UI_CONFIG = src/app/config
+CONF_DIR = src/conf/
 
-INSTALL_PREFIX = /usr/local/$(SPK_NAME)
+# Set user as 'auto' for DSM 6 privilege
+SERVICE_USER = auto
+SERVICE_SETUP = src/service-setup.sh
+STARTABLE = no
 
-POST_STRIP_TARGET = selfoss_extra_install
+# TMPDIR is used for selfoss built in backup and update
+USE_ALTERNATE_TMPDIR = 1
 
-BUSYBOX_CONFIG = daemon nice
-ENV += BUSYBOX_CONFIG="$(BUSYBOX_CONFIG)"
+POST_STRIP_TARGET = selfoss_extra_install
 
 include ../../mk/spksrc.spk.mk
 
 .PHONY: selfoss_extra_install
 selfoss_extra_install:
-	install -m 755 -d $(STAGING_DIR)/var
-	install -m 755 src/selfoss.sh $(STAGING_DIR)/bin/
-	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/selfoss.conf $(STAGING_DIR)/web/selfoss.conf
+	install -m 644 src/web/selfoss.json $(STAGING_DIR)/web/selfoss.json

spk/selfoss/src/app/config

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

spk/selfoss/src/conf/resource

@@ -0,0 +1,54 @@
+{
+	"webservice": {
+		"migrate": {
+			"root": [{
+				"new": "selfoss",
+				"old": "selfoss"
+			}]
+		},
+		"pkg_dir_prepare": [{
+			"group": "http",
+			"mode": "0750",
+			"source": "/var/packages/selfoss/target/share/selfoss",
+			"target": "selfoss",
+			"user": "sc-selfoss"
+		}],
+		"portals": [{
+			"alias": "selfoss",
+			"app": "com.synocommunity.packages.selfoss",
+			"display_name": "Selfoss",
+			"name": "Selfoss",
+			"service": "Selfoss",
+			"type": "alias"
+		}],
+		"services": [{
+			"backend": 2,
+			"display_name": "Selfoss",
+			"icon": "app/images/selfoss-{0}.png",
+			"php": {
+				"backend": 8,
+				"connect_timeout": 120,
+				"extensions": [
+					"curl",
+					"gd",
+					"imagick",
+					"openssl",
+					"pdo_sqlite"
+				],
+				"group": "http",
+				"php_settings": {
+					"error_log": "/var/services/web_packages/selfoss/data/logs/php_errors.log",
+					"max_execution_time": "900"
+				},
+				"profile_desc": "PHP Profile for Selfoss",
+				"profile_name": "Selfoss Profile",
+				"user": "sc-selfoss"
+			},
+			"read_timeout": 3600,
+			"root": "selfoss",
+			"send_timeout": 120,
+			"service": "Selfoss",
+			"type": "apache_php"
+		}]
+	}
+}