Wallabag: Update to 2.3.8 and fixes

Fix SynoCommunity#3113

cross/wallabag/Makefile

@@ -1,10 +1,10 @@
 PKG_NAME = wallabag
-PKG_VERS = 2.2.3
+PKG_VERS = 2.3.8
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-release-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://static.wallabag.org/releases
-PKG_DIR = release-$(PKG_VERS)
+PKG_DIR = $(PKG_VERS)
 
 DEPENDS =
 
@@ -14,11 +14,11 @@ LICENSE  = MIT
 
 CONFIGURE_TARGET = nop
 COMPILE_TARGET = nop
-INSTALL_TARGET = myInstall
+INSTALL_TARGET = wallabag_install
 
 include ../../mk/spksrc.cross-cc.mk
 
-.PHONY: myInstall
-myInstall:
-	mkdir -p $(STAGING_INSTALL_PREFIX)/share/wallabag
+.PHONY: wallabag_install
+wallabag_install:
+	install -m 755 -d $(STAGING_INSTALL_PREFIX)/share/wallabag
 	tar -cf - -C $(WORK_DIR)/$(PKG_DIR) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/wallabag

cross/wallabag/digests

@@ -1,3 +1,3 @@
-wallabag-2.2.3.tar.gz SHA1 496e6c7d980c078e42d3bab7b0e978bd0af02b96
-wallabag-2.2.3.tar.gz SHA256 13fe5cb7cfc741abee08312f0055e9549e60590daff2fac41be5266f7956d857
-wallabag-2.2.3.tar.gz MD5 63f4cc85397fd6db3e0e3d5f3fa11e02
+wallabag-2.3.8.tar.gz SHA1 0a925de3170b8817fb556f82226bd7c7c3c5aabe
+wallabag-2.3.8.tar.gz SHA256 58f319ee41828fcc4fd00a14c4ac7c16b2179a47af21e257a15938311d1426eb
+wallabag-2.3.8.tar.gz MD5 b5f61f50aad1c60d34ad3a3b8848b29c

spk/wallabag/Makefile

@@ -1,6 +1,6 @@
 SPK_NAME = wallabag
-SPK_VERS = 2.2.3
-SPK_REV = 2
+SPK_VERS = 2.3.8
+SPK_REV = 3
 SPK_ICON = src/wallabag.png
 DSM_UI_DIR = app
 BETA = 1
@@ -13,16 +13,14 @@ ADMIN_URL = /wallabag/web/
 RELOAD_UI = yes
 STARTABLE = no
 DISPLAY_NAME = Wallabag
-CHANGELOG = "Initial release"
+CHANGELOG = "Update to 2.3.8, Update to generic service script"
 
 HOMEPAGE = https://www.wallabag.org/
 LICENSE  = MIT
 
 WIZARDS_DIR = src/wizard/
-
-INSTALLER_SCRIPT = src/installer.sh
-SSS_SCRIPT       = src/dsm-control.sh
-
+SERVICE_SETUP = src/service-setup.sh
+STARTABLE = no
 
 INSTALL_DEP_SERVICES = apache-web mysql
 START_DEP_SERVICES = apache-web mysql

spk/wallabag/src/parameters.yml

@@ -1,34 +1,64 @@
 parameters:
     database_driver: pdo_mysql
+    database_driver_class: ~
     database_host: 127.0.0.1
     database_port: 3306
     database_name: @database_name@
     database_user: wallabag
     database_password: @database_password@
+    # For SQLite, database_path should be "%kernel.project_dir%/data/db/wallabag.sqlite"
     database_path: null
     database_table_prefix: wallabag_
     database_socket: null
+    # with PostgreSQL and SQLite, you must set "utf8"
     database_charset: utf8mb4
-    mailer_transport: smtp
-    mailer_host: 127.0.0.1
-    mailer_user: null
-    mailer_password: null
+
+    domain_name: localhost
+
+    mailer_transport:  smtp
+    mailer_user:       ~
+    mailer_password:   ~
+    mailer_host:       127.0.0.1
+    mailer_port:       false
+    mailer_encryption: ~
+    mailer_auth_mode:  ~
+
     locale: en
+
+    # A secret key that's used to generate certain security-related tokens
     secret: @wallabag_secret@
-    twofactor_auth: false
+
+    locale: en
+
+    # two factor stuff
+    twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+
+    # fosuser stuff
     fosuser_registration: true
-    fosuser_confirmation: false
+    fosuser_confirmation: true
+
+    # how long the access token should live in seconds for the API
+    fos_oauth_server_access_token_lifetime: 3600
+    # how long the refresh token should life in seconds for the API
+    fos_oauth_server_refresh_token_lifetime: 1209600
+
     from_email: no-reply@wallabag.org
+
     rss_limit: 50
+    # RabbitMQ processing
     rabbitmq_host: localhost
     rabbitmq_port: 5672
     rabbitmq_user: guest
     rabbitmq_password: guest
     rabbitmq_prefetch_count: 10
+
+    # Redis processing
     redis_scheme: tcp
     redis_host: localhost
     redis_port: 6379
     redis_path: null
     redis_password: null
-    sites_credentials: {  }
+
+    # sentry logging
+    sentry_dsn: ~

spk/wallabag/src/installer.sh → spk/wallabag/src/service-setup.sh

@@ -1,5 +1,3 @@
-#!/bin/sh
-
 # Package
 PACKAGE="wallabag"
 DNAME="Wallabag"
@@ -11,14 +9,28 @@ WEB_DIR="/var/services/web"
 USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)"
 TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp"
 PHP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /usr/local/bin/php56 || echo -n /usr/bin/php)"
+if command -v /usr/local/bin/php70 &> /dev/null; then
+    PHP="/usr/local/bin/php70"
+fi
+if command -v /usr/local/bin/php72 &> /dev/null; then
+    PHP="/usr/local/bin/php72"
+fi
+if command -v /usr/local/bin/php73 &> /dev/null; then
+    PHP="/usr/local/bin/php73"
+fi
 MYSQL="/usr/bin/mysql"
 MYSQLDUMP="/usr/bin/mysqldump"
+if command -v /var/packages/MariaDB10/target/usr/local/mariadb10/bin/mysql &> /dev/null; then
+    MYSQL="/var/packages/MariaDB10/target/usr/local/mariadb10/bin/mysql"
+fi
+if command -v /var/packages/MariaDB10/target/usr/local/mariadb10/bin/mysqldump &> /dev/null; then
+    MYSQLDUMP="/var/packages/MariaDB10/target/usr/local/mariadb10/bin/mysqldump"
+fi
 CFG_FILE="${WEB_DIR}/${PACKAGE}/app/config/parameters.yml"
 MYSQL_USER="wallabag"
 MYSQL_DATABASE="wallabag"
 
-
-preinst ()
+service_preinst ()
 {
     # Check database
     if [ "${SYNOPKG_PKG_STATUS}" == "INSTALL" ]; then
@@ -38,7 +50,7 @@ preinst ()
     exit 0
 }
 
-postinst ()
+service_postinst ()
 {
     # Link
     ln -s ${SYNOPKG_PKGDEST} ${INSTALL_DIR}
@@ -69,7 +81,7 @@ postinst ()
     exit 0
 }
 
-preuninst ()
+service_preuninst ()
 {
     # Check database
     if [ "${SYNOPKG_PKG_STATUS}" == "UNINSTALL" ] && ! ${MYSQL} -u root -p"${wizard_mysql_password_root}" -e quit > /dev/null 2>&1; then
@@ -88,7 +100,7 @@ preuninst ()
     exit 0
 }
 
-postuninst ()
+service_postuninst ()
 {
     # Remove link
     rm -f ${INSTALL_DIR}
@@ -108,7 +120,7 @@ postuninst ()
     exit 0
 }
 
-preupgrade ()
+service_preupgrade ()
 {
     rm -rf ${TMP_DIR}/${PACKAGE}
     mkdir -p ${TMP_DIR}/${PACKAGE}
@@ -117,7 +129,7 @@ preupgrade ()
     exit 0
 }
 
-postupgrade ()
+service_postupgrade ()
 {
     mv ${TMP_DIR}/${PACKAGE}/parameters.yml ${CFG_FILE}
     mv ${TMP_DIR}/${PACKAGE}/db ${WEB_DIR}/${PACKAGE}/data/db