tt-rss: upgrade 20221230 to 20230828 (SynoCommunity#5923)

* tt-rss: upgrade 20221230 => 20230828
* Migrate to wizard-templates
* Add missing icon to webservice portal declaration
* Modernise package scripts
* Fix DSM 6 app startup permissions
* Add PHP profiles for DSM 6

---------

Co-authored-by: Smaarn <[email protected]>

cross/tt-rss/Makefile

@@ -1,8 +1,8 @@
 PKG_NAME = tt-rss
-PKG_VERS = c30b24d09f
+PKG_VERS = afd04d141c
 PKG_EXT = tar.gz
 PKG_DOWNLOAD_METHOD = git
-PKG_GIT_HASH = c30b24d09f4096e612965af658540595262f6848
+PKG_GIT_HASH = afd04d141c7bd8a1d6732a2a6a4c91c0a9b4cd6b
 PKG_DIST_SITE = https://git.tt-rss.org/fox/tt-rss.git
 PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH)

cross/tt-rss/digests

@@ -1,3 +1,3 @@
-tt-rss-gitc30b24d09f4096e612965af658540595262f6848.tar.gz SHA1 f86076fd142d872d41cdbce8427a89d03ecf158d
-tt-rss-gitc30b24d09f4096e612965af658540595262f6848.tar.gz SHA256 3752aa5eaf540c5b8d12f6d538237df88388069079bce81bf54d604f024d7b5a
-tt-rss-gitc30b24d09f4096e612965af658540595262f6848.tar.gz MD5 8f6ca72dd3d30d1b795a1a887b1f41d0
+tt-rss-gitafd04d141c7bd8a1d6732a2a6a4c91c0a9b4cd6b.tar.gz SHA1 24897a2bea4fa3f07a9cb426c9d316b624a3cbda
+tt-rss-gitafd04d141c7bd8a1d6732a2a6a4c91c0a9b4cd6b.tar.gz SHA256 3ef5c221b1505b9d0e071ee531be7ca63e3a619408fa553f0e3fd93e433fb46e
+tt-rss-gitafd04d141c7bd8a1d6732a2a6a4c91c0a9b4cd6b.tar.gz MD5 2567238d32d10abf0ac13c31f5016783

spk/tt-rss/Makefile

@@ -1,62 +1,51 @@
 SPK_NAME = tt-rss
-SPK_VERS = 20221230
-SPK_REV = 16
+SPK_VERS = 20230828
+SPK_REV = 17
 SPK_ICON = src/tt-rss.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
 DESCRIPTION = Tiny Tiny RSS is an open source web-based news feed \(RSS/Atom\) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 DESCRIPTION_FRE = Tiny Tiny RSS est un agrégateur et lecteur web de flux RSS et Atom open source conçu pour vous permettre de lire des nouvelles de n\'importe quel endroit, tout en se sentant aussi proche d\'une application de bureau que possible.
-ADMIN_URL = /tt-rss/
 DISPLAY_NAME = Tiny Tiny RSS
-CHANGELOG = "1. Update Tiny Tiny RSS to Git revision c30b24d09f (20221230) <br /> 2. Fixed broken DSM 7 initial installation procedure. <br /> 3. Upgrade PHP version to 7.4"
+CHANGELOG = "1. Update Tiny Tiny RSS to Git revision afd04d141c \(20230828\).<br/>2. Fix for DSM 6 app startup."
 
 HOMEPAGE   = https://tt-rss.org/
 LICENSE    = GPL
 
-WIZARDS_DIR = src/wizard/
-CONF_DIR = src/conf/
-
+STARTABLE = yes
+SERVICE_USER = auto
 SERVICE_SETUP = src/service-setup.sh
-SYSTEM_GROUP	 = http
 
-INSTALL_DEP_SERVICES = apache-web mysql
-START_DEP_SERVICES = apache-web mysql
-
-SERVICE_COMMAND = $(INSTALL_PREFIX)/bin/tt-rss-daemon
+ADMIN_URL = /tt-rss/
 
-POST_STRIP_TARGET = tt-rss_extra_install
+WIZARDS_TEMPLATES_DIR = src/wizard_templates
+SYSTEM_GROUP = http
 
-PHP_EXTENSIONS = curl gd intl mysqli pdo_mysql posix
+DSM_UI_DIR = app
+DSM_UI_CONFIG = src/app/config
+CONF_DIR = src/conf/
 
-override ARCH=
+include ../../mk/spksrc.common.mk
 
-# Due to not obvious WebStation handling requirements
-REQUIRED_MIN_DSM = 6.0
-INSTUNINST_RESTART_SERVICES = apache-web
+# Alternate conf dir for DSM 6
+ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
+CONF_DIR = src/conf_6/
+endif
 
-SPK_DEPENDS = "WebStation:PHP7.4:MariaDB10:Apache2.4"
+POST_STRIP_TARGET = tt-rss_extra_install
 
 include ../../mk/spksrc.spk.mk
 
-$(STAGING_DIR)/etc/php/conf.d/com.synocommunity.tt-rss.ini: 
-	@$(MSG) Generating $@
-	$(create_target_dir)
-	$(foreach extension,$(PHP_EXTENSIONS),echo "extension=$(extension).so" >> $@;)
-
 .PHONY: tt-rss_extra_install
-tt-rss_extra_install: $(STAGING_DIR)/etc/php/conf.d/com.synocommunity.tt-rss.ini
-	install -m 755 -d $(STAGING_DIR)/app
-	install -m 755 -d $(STAGING_DIR)/bin
-	install -m 644 src/app/config $(STAGING_DIR)/app/config
-	install -m 755 src/bin/tt-rss-daemon $(STAGING_DIR)/bin/tt-rss-daemon
-	install -m 755 src/bin/virtual-php $(STAGING_DIR)/bin/virtual-php
-ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
-	install -m 644 src/bin/7.0/settings.sh $(STAGING_DIR)/bin/settings.sh
-	install -m 755 src/bin/7.0/update-schema $(STAGING_DIR)/bin/update-schema
-else
-	install -m 644 src/bin/settings.sh $(STAGING_DIR)/bin/settings.sh
-	install -m 755 src/bin/update-schema $(STAGING_DIR)/bin/update-schema
-endif
+tt-rss_extra_install:
+	install -m 755 -d $(STAGING_DIR)/web
+	install -m 644 src/web/tt-rss.conf $(STAGING_DIR)/web/tt-rss.conf
+	install -m 644 src/web/tt-rss.json $(STAGING_DIR)/web/tt-rss.json