Upgrade to 1.5.10.

Changelog at <http://tt-rss.org/redmine/versions/75>.

4 files changed, 11 insertions, 27 deletions

diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile
index dcc84422278a..1dc2a46f8604 100644
--- a/www/tt-rss/Makefile
+++ b/www/tt-rss/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tt-rss
-PORTVERSION=	1.5.9
+PORTVERSION=	1.5.10
 CATEGORIES=	www
 MASTER_SITES=	http://tt-rss.org/download/
 
@@ -37,7 +37,7 @@ USE_PHP+=	curl
 .endif
 
 SUB_FILES=	httpd-tt-rss.conf pkg-message
-SUB_LIST=	DB=${DB}
+SUB_LIST=	DB=${DB} WWWOWN=${WWWOWN}
 PLIST_SUB=	WWWOWN=${WWWOWN}:${WWWGRP}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
diff --git a/www/tt-rss/distinfo b/www/tt-rss/distinfo
index 62972321077c..c64b7dac4c75 100644
--- a/www/tt-rss/distinfo
+++ b/www/tt-rss/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tt-rss-1.5.9.tar.gz) = 280121f2f8fc38ff5fbd8ccf1d31f0fa7e433e57ad6f8dfffc971a1f75b0c691
-SIZE (tt-rss-1.5.9.tar.gz) = 2816459
+SHA256 (tt-rss-1.5.10.tar.gz) = a80d292b85fd254d4ebe26a781a75ef696c5649cc6f702f8b3e51442c64986e7
+SIZE (tt-rss-1.5.10.tar.gz) = 2752801
diff --git a/www/tt-rss/files/ttrssd.in b/www/tt-rss/files/ttrssd.in
index 0f674ad6aa33..bee6640ef28f 100644
--- a/www/tt-rss/files/ttrssd.in
+++ b/www/tt-rss/files/ttrssd.in
@@ -28,6 +28,7 @@ command_interpreter=$phpcli
 long_name="Tiny Tiny RSS updating feeds daemon."
 phpupd="update_daemon2.php"
 ttrssd_log="/var/log/${name}.log"
+ttrssd_user="%%WWWOWN%%"
 
 start_cmd=${name}_start
 stop_cmd=${name}_stop
@@ -36,14 +37,14 @@ ttrssd_start() {
 	[ -x $phpcli ] || (echo "$phpcli not found"; exit 1)
 	[ -f $pidfile ] && (echo "$name already running?"; exit 2)
 	echo "Starting $long_name"
-	(cd %%WWWDIR%% && ./$phpupd > $ttrssd_log &) && \
+	(cd %%WWWDIR%% && su -fm $ttrssd_user -c "./$phpupd" > $ttrssd_log &) && \
 	echo $$ > $pidfile
 }
 
 ttrssd_stop() {
 	[ -f $pidfile ] || (echo "$name not running?"; exit 1)
 	echo "Stopping $long_name"
-	kill `ps x | grep $phpupd | grep -v grep | awk '{print $1}'`
+	kill `ps ax | grep $phpupd | grep -v grep | awk '{print $1}'`
 	rm -f $pidfile
 }
 
diff --git a/www/tt-rss/pkg-plist b/www/tt-rss/pkg-plist
index bc7a442f57b0..f544413ee542 100644
--- a/www/tt-rss/pkg-plist
+++ b/www/tt-rss/pkg-plist
@@ -27,7 +27,6 @@
 %%WWWDIR%%/classes/pref_users.php
 %%WWWDIR%%/classes/protected_handler.php
 %%WWWDIR%%/classes/public_handler.php
-%%WWWDIR%%/classes/readitlater_button.php
 %%WWWDIR%%/classes/rpc.php
 %%WWWDIR%%/classes/share_button.php
 %%WWWDIR%%/classes/tweet_button.php
@@ -112,7 +111,6 @@
 %%WWWDIR%%/js/mail_button.js
 %%WWWDIR%%/js/note_button.js
 %%WWWDIR%%/js/prefs.js
-%%WWWDIR%%/js/readitlater_button.js
 %%WWWDIR%%/js/share_button.js
 %%WWWDIR%%/js/tt-rss.js
 %%WWWDIR%%/js/tweet_button.js
@@ -1879,6 +1877,8 @@
 %%WWWDIR%%/schema/versions/mysql/85.sql
 %%WWWDIR%%/schema/versions/mysql/86.sql
 %%WWWDIR%%/schema/versions/mysql/87.sql
+%%WWWDIR%%/schema/versions/mysql/88.sql
+%%WWWDIR%%/schema/versions/mysql/89.sql
 %%WWWDIR%%/schema/versions/mysql/9.sql
 %%WWWDIR%%/schema/versions/pgsql/10.sql
 %%WWWDIR%%/schema/versions/pgsql/11.sql
@@ -1964,6 +1964,8 @@
 %%WWWDIR%%/schema/versions/pgsql/85.sql
 %%WWWDIR%%/schema/versions/pgsql/86.sql
 %%WWWDIR%%/schema/versions/pgsql/87.sql
+%%WWWDIR%%/schema/versions/pgsql/88.sql
+%%WWWDIR%%/schema/versions/pgsql/89.sql
 %%WWWDIR%%/schema/versions/pgsql/9.sql
 %%WWWDIR%%/templates/digest_template.txt
 %%WWWDIR%%/templates/digest_template_html.txt
@@ -1983,30 +1985,11 @@
 %%WWWDIR%%/utils/extract-i18n-js.pl
 %%WWWDIR%%/utils/localized_schema.txt
 %%WWWDIR%%/utils/mysql_convert_unicode.php
-%%WWWDIR%%/utils/notifier/background.html
-%%WWWDIR%%/utils/notifier/images/alert.png
-%%WWWDIR%%/utils/notifier/images/error.png
-%%WWWDIR%%/utils/notifier/images/icon.png
-%%WWWDIR%%/utils/notifier/images/normal.png
-%%WWWDIR%%/utils/notifier/images/ttrss_logo.png
-%%WWWDIR%%/utils/notifier/lib/prototype.js
-%%WWWDIR%%/utils/notifier/lib/scriptaculous/controls.js
-%%WWWDIR%%/utils/notifier/lib/scriptaculous/dragdrop.js
-%%WWWDIR%%/utils/notifier/lib/scriptaculous/effects.js
-%%WWWDIR%%/utils/notifier/lib/scriptaculous/scriptaculous.js
-%%WWWDIR%%/utils/notifier/manifest.json
-%%WWWDIR%%/utils/notifier/options.html
-%%WWWDIR%%/utils/notifier/popup.html
-%%WWWDIR%%/utils/notifier/style.css
 %%WWWDIR%%/utils/regen_config_checks.sh
 %%WWWDIR%%/utils/stats.php
 %%WWWDIR%%/utils/update-schema-translations.sh
 %%WWWDIR%%/utils/update-translations.sh
 @exec chown -R %%WWWOWN%% %D/%%WWWDIR%%
-@dirrm %%WWWDIR%%/utils/notifier/lib/scriptaculous
-@dirrm %%WWWDIR%%/utils/notifier/lib
-@dirrm %%WWWDIR%%/utils/notifier/images
-@dirrm %%WWWDIR%%/utils/notifier
 @dirrm %%WWWDIR%%/utils
 @dirrm %%WWWDIR%%/themes/triple-pane
 @dirrm %%WWWDIR%%/themes