--- Begin Message ---
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package tt-rss
The updated package fixes #923661, which practically breaks the default
installation (i.e. mysql, not postgresql). The actual failure is a
regression triggered by updating PHP to 7.3 in the sql logging backend.
The upload fixes the relevant php code and additionally defaults to
logging to syslog. Doing so is more in line with best practises and
avoids the previously problematic sql logging code. Sebastian Reichel
(maintainer) agreed with that change, but presently lacks time.
unblock tt-rss/18.12+dfsg-1.1
Helmut
diff --minimal -Nru tt-rss-18.12+dfsg/debian/changelog tt-rss-18.12+dfsg/debian/changelog
--- tt-rss-18.12+dfsg/debian/changelog 2019-02-06 00:04:47.000000000 +0100
+++ tt-rss-18.12+dfsg/debian/changelog 2019-06-03 06:15:55.000000000 +0200
@@ -1,3 +1,11 @@
+tt-rss (18.12+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload acknowledged by Sebastian Reichel.
+ * Cherry pick JShrink PHP 7.3 compatibility patch. (Closes: #923661)
+ * Default to using syslog as log backend rather than sql.
+
+ -- Helmut Grohne <helmut@subdivi.de> Mon, 03 Jun 2019 06:15:55 +0200
+
tt-rss (18.12+dfsg-1) unstable; urgency=medium
* New upstream release
diff --minimal -Nru tt-rss-18.12+dfsg/debian/patches/config.php-dist.patch tt-rss-18.12+dfsg/debian/patches/config.php-dist.patch
--- tt-rss-18.12+dfsg/debian/patches/config.php-dist.patch 2019-02-06 00:04:47.000000000 +0100
+++ tt-rss-18.12+dfsg/debian/patches/config.php-dist.patch 2019-06-03 06:14:40.000000000 +0200
@@ -6,10 +6,8 @@
Author: Sebastian Reichel <sre@debian.org>
Last-Update: 2013-02-17
-Index: tt-rss/config.php-dist
-===================================================================
---- tt-rss.orig/config.php-dist
-+++ tt-rss/config.php-dist
+--- tt-rss-18.12+dfsg.orig/config.php-dist
++++ tt-rss-18.12+dfsg/config.php-dist
@@ -3,12 +3,13 @@
// *** Database configuration (important!) ***
// *******************************************
@@ -44,3 +42,12 @@
// Local cache directory for RSS feed content.
define('ICONS_DIR', "feed-icons");
+@@ -165,7 +166,7 @@
+ // Disabling auth_internal in this list would automatically disable
+ // reset password link on the login form.
+
+- define('LOG_DESTINATION', 'sql');
++ define('LOG_DESTINATION', 'syslog');
+ // Error log destination to use. Possible values: sql (uses internal logging
+ // you can read in Preferences -> System), syslog - logs to system log.
+ // Setting this to blank uses PHP logging (usually to http server
diff --minimal -Nru tt-rss-18.12+dfsg/debian/patches/jshrink_php7.3_fix.patch tt-rss-18.12+dfsg/debian/patches/jshrink_php7.3_fix.patch
--- tt-rss-18.12+dfsg/debian/patches/jshrink_php7.3_fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ tt-rss-18.12+dfsg/debian/patches/jshrink_php7.3_fix.patch 2019-06-03 06:15:08.000000000 +0200
@@ -0,0 +1,30 @@
+From 91105810dafedba0390608d7465abd602beb6410 Mon Sep 17 00:00:00 2001
+From: Sergei Morozov <morozov@tut.by>
+Date: Fri, 14 Sep 2018 19:55:03 -0700
+Subject: [PATCH] Fixed test failures on PHP 7.3
+
+1. continue in break shoud target the while loop directly (php/php-src@04e3523).
+2. strpos() doesn't longer accept non-string needles (https://wiki.php.net/rfc/deprecations_php_7_3#string_search_functions_with_integer_needle).
+ src/JShrink/Minifier.php | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+--- tt-rss-18.12+dfsg.orig/vendor/JShrink/Minifier.php
++++ tt-rss-18.12+dfsg/vendor/JShrink/Minifier.php
+@@ -181,7 +181,7 @@
+ // new lines
+ case "\n":
+ // if the next line is something that can't stand alone preserve the newline
+- if (strpos('(-+{[@', $this->b) !== false) {
++ if ($this->b !== false && strpos('(-+{[@', $this->b) !== false) {
+ echo $this->a;
+ $this->saveString();
+ break;
+@@ -224,7 +224,7 @@
+ // check for some regex that breaks stuff
+ if ($this->a === '/' && ($this->b === '\'' || $this->b === '"')) {
+ $this->saveRegex();
+- continue;
++ continue 3;
+ }
+
+ echo $this->a;
diff --minimal -Nru tt-rss-18.12+dfsg/debian/patches/series tt-rss-18.12+dfsg/debian/patches/series
--- tt-rss-18.12+dfsg/debian/patches/series 2019-02-06 00:04:47.000000000 +0100
+++ tt-rss-18.12+dfsg/debian/patches/series 2019-06-03 06:14:46.000000000 +0200
@@ -1,3 +1,4 @@
config.php-dist.patch
remove-tt-rss-layer.patch
fix-db-updater-script.patch
+jshrink_php7.3_fix.patch
--- End Message ---
--- Begin Message ---
On Mon, Jun 03, 2019 at 06:27:54AM +0200, Helmut Grohne wrote:
> The updated package fixes #923661, which practically breaks the default
> installation (i.e. mysql, not postgresql). The actual failure is a
> regression triggered by updating PHP to 7.3 in the sql logging backend.
> The upload fixes the relevant php code and additionally defaults to
> logging to syslog. Doing so is more in line with best practises and
> avoids the previously problematic sql logging code. Sebastian Reichel
> (maintainer) agreed with that change, but presently lacks time.
Unblocked; thanks.
--
Jonathan Wiltshire jmw@debian.org
Debian Developer http://people.debian.org/~jmw
4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
--- End Message ---