Wallabag: Update to v2.6.9 (#6232)

* Bump to v2.6.9 * Update package config and wizard * Update setup script * Update maintainer and changelog * Add fix for homepage * Add legacy database migration
SynoCommunity · Oct 3, 2024 · 46a9ac5 · 46a9ac5
1 parent ec1a48b
commit 46a9ac5
Show file tree

Hide file tree

Showing 17 changed files with 1,024 additions and 239 deletions.
diff --git a/cross/wallabag/Makefile b/cross/wallabag/Makefile
@@ -1,9 +1,9 @@
 PKG_NAME = wallabag
-PKG_VERS = 2.3.8
+PKG_VERS = 2.6.9
 PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_NAME)-release-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://static.wallabag.org/releases
-PKG_DIR = $(PKG_VERS)
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/wallabag/$(PKG_NAME)/releases/download/$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
 

diff --git a/cross/wallabag/digests b/cross/wallabag/digests
@@ -1,3 +1,3 @@
-wallabag-release-2.3.8.tar.gz SHA1 0a925de3170b8817fb556f82226bd7c7c3c5aabe
-wallabag-release-2.3.8.tar.gz SHA256 58f319ee41828fcc4fd00a14c4ac7c16b2179a47af21e257a15938311d1426eb
-wallabag-release-2.3.8.tar.gz MD5 b5f61f50aad1c60d34ad3a3b8848b29c
+wallabag-2.6.9.tar.gz SHA1 7dc92189472ed7a5705bb04bb35e2c1a23ecb5cc
+wallabag-2.6.9.tar.gz SHA256 578b39ff2f5f140999f969d4c54d37532462bc48a10f565429038eab84cb10ac
+wallabag-2.6.9.tar.gz MD5 3e7f5db1f64c63f2b06638fba171a2e4
diff --git a/spk/wallabag/Makefile b/spk/wallabag/Makefile
@@ -1,41 +1,52 @@
 SPK_NAME = wallabag
-SPK_VERS = 2.3.8
-SPK_REV = 3
+SPK_VERS = 2.6.9
+SPK_REV = 4
 SPK_ICON = src/wallabag.png
-DSM_UI_DIR = app
-BETA = 1
 
 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 = tolkonepiu
+MAINTAINER = SynoCommunity
 DESCRIPTION = Wallabag is a self hostable application allowing you to save an offline copy of your favorite articles. Click, save, read it when you can. It extracts content so that you can read it when you have time.
-ADMIN_URL = /wallabag/web/
-STARTABLE = no
 DISPLAY_NAME = Wallabag
-CHANGELOG = "Update to 2.3.8, Update to generic service script"
+CHANGELOG = "1. Update to 2.6.9.<br/>2. Add PHP profiles for DSM 6.<br/>3. Add backup and restore functions."
 
 HOMEPAGE = https://www.wallabag.org/
 LICENSE  = MIT
 
-WIZARDS_DIR = src/wizard/
-SERVICE_SETUP = src/service-setup.sh
 STARTABLE = no
+SERVICE_USER = auto
+SERVICE_SETUP = src/service-setup.sh
 
-INSTALL_DEP_SERVICES = apache-web mysql
-START_DEP_SERVICES = apache-web mysql
-INSTUNINST_RESTART_SERVICES = apache-web
+ADMIN_URL = /wallabag
 
-INSTALL_PREFIX = /usr/local/$(SPK_NAME)
+WIZARDS_DIR = src/wizard/
+SYSTEM_GROUP = http
 
-POST_STRIP_TARGET = wallabag_extra_install
+DSM_UI_DIR = app
+DSM_UI_CONFIG = src/app/config
+CONF_DIR = src/conf/
 
-# Pure PHP package, make sure ARCH is not defined
-override ARCH=
+include ../../mk/spksrc.common.mk
+
+# Alternate conf dir for DSM 6
+ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
+CONF_DIR = src/conf_6/
+endif
+
+POST_STRIP_TARGET = wallabag_extra_install
 
 include ../../mk/spksrc.spk.mk
 
 .PHONY: wallabag_extra_install
 wallabag_extra_install:
-	install -m 644 src/parameters.yml $(STAGING_DIR)/share/${SPK_NAME}/app/config/parameters.yml
-	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/index.php $(STAGING_DIR)/web/index.php
+	install -m 644 src/web/parameters.yml $(STAGING_DIR)/web/parameters.yml
+	install -m 644 src/web/wallabag.conf $(STAGING_DIR)/web/wallabag.conf
+	install -m 644 src/web/wallabag.json $(STAGING_DIR)/web/wallabag.json
diff --git a/spk/wallabag/src/app/config b/spk/wallabag/src/app/config
@@ -7,7 +7,7 @@
             "type": "url",
             "protocol": "http",
             "port": "80",
-            "url": "/wallabag/web",
+            "url": "/wallabag",
             "allUsers": true,
             "grantPrivilege": "local"
         }

diff --git a/spk/wallabag/src/conf/resource b/spk/wallabag/src/conf/resource
@@ -0,0 +1,80 @@
+{
+    "mariadb10-db": {
+        "admin-account-m10": "root",
+        "admin-account-m5": "root",
+        "admin-pw-m10": "{{wizard_mysql_password_root}}",
+        "admin-pw-m5": "{{wizard_mariadb5_password_root}}",
+        "create-db": {
+            "db-collision": "skip",
+            "db-name": "wallabag",
+            "flag": "{{wizard_create_db}}"
+        },
+        "drop-db-inst": {
+            "db-name": "wallabag",
+            "flag": "{{wizard_run_migration}}",
+            "ver": "m5"
+        },
+        "drop-db-uninst": true,
+        "drop-user-uninst": true,
+        "grant-user": {
+            "db-name": "wallabag",
+            "flag": "{{mysql_grant_user}}",
+            "host": "localhost",
+            "user-name": "wallabag",
+            "user-pw": "{{wizard_mysql_database_password}}"
+        },
+        "migrate-db": {
+            "db-collision": "replace",
+            "flag": "{{wizard_run_migration}}",
+            "m10-db-name": "wallabag",
+            "m5-db-name": "wallabag"
+        }
+    },
+    "webservice": {
+        "pkg_dir_prepare": [
+            {
+                "group": "http",
+                "mode": "0755",
+                "source": "/var/packages/wallabag/target/share/wallabag",
+                "target": "wallabag",
+                "user": "sc-wallabag"
+            }
+        ],
+        "portals": [
+            {
+                "alias": "wallabag",
+                "app": "com.synocommunity.packages.wallabag",
+                "name": "Wallabag",
+                "service": "wallabag",
+                "type": "alias"
+            }
+        ],
+        "services": [
+            {
+                "backend": 2,
+                "display_name": "Wallabag",
+                "icon": "app/images/wallabag-{0}.png",
+                "php": {
+                    "backend": 8,
+                    "extensions": [
+                        "bcmath",
+                        "curl",
+                        "gd",
+                        "gettext",
+                        "iconv",
+                        "imagick",
+                        "intl",
+                        "pdo_mysql"
+                    ],
+                    "group": "http",
+                    "profile_desc": "PHP Profile for wallabag",
+                    "profile_name": "wallabag Profile",
+                    "user": "sc-wallabag"
+                },
+                "root": "wallabag",
+                "service": "wallabag",
+                "type": "apache_php"
+            }
+        ]
+    }
+}
diff --git a/spk/wallabag/src/conf_6/privilege b/spk/wallabag/src/conf_6/privilege
@@ -0,0 +1,7 @@
+{
+    "defaults": {
+        "run-as": "root"
+    },
+    "username": "sc-wallabag",
+    "join-groupname": "http"
+}
diff --git a/spk/wallabag/src/conf_6/resource b/spk/wallabag/src/conf_6/resource
@@ -0,0 +1,33 @@
+{
+    "mariadb10-db": {
+        "admin-account-m10": "root",
+        "admin-account-m5": "root",
+        "admin-pw-m10": "{{wizard_mysql_password_root}}",
+        "admin-pw-m5": "{{wizard_mariadb5_password_root}}",
+        "create-db": {
+            "db-collision": "skip",
+            "db-name": "wallabag",
+            "flag": "{{wizard_create_db}}"
+        },
+        "drop-db-inst": {
+            "db-name": "wallabag",
+            "flag": "{{wizard_run_migration}}",
+            "ver": "m5"
+        },
+        "drop-db-uninst": true,
+        "drop-user-uninst": true,
+        "grant-user": {
+            "db-name": "wallabag",
+            "flag": "{{mysql_grant_user}}",
+            "host": "localhost",
+            "user-name": "wallabag",
+            "user-pw": "{{wizard_mysql_database_password}}"
+        },
+        "migrate-db": {
+            "db-collision": "replace",
+            "flag": "{{wizard_run_migration}}",
+            "m10-db-name": "wallabag",
+            "m5-db-name": "wallabag"
+        }
+    }
+}