Hi Sebastian,
On Mon, May 20, 2019 at 06:51:57PM +0200, Sebastian Reichel wrote:
> Did you forgot to add the attachment? FWIW both changes are with me.
Yes, sorry. I intend to move foward with a "maintainer acknowledged NMU"
if you lack time for doing the upload.
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-05-20 17:53:54.000000000 +0200
@@ -1,3 +1,11 @@
+tt-rss (18.12+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Cherry pick JShrink PHP 7.3 compatibility patch. (Closes: #923661)
+ * Default to using syslog as log backend rather than sql.
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 20 May 2019 17:53:54 +0200
+
tt-rss (18.12+dfsg-1) unstable; urgency=medium
* New upstream release
diff --minimal -Nru tt-rss-18.12+dfsg/debian/patches/default_to_syslog.patch
tt-rss-18.12+dfsg/debian/patches/default_to_syslog.patch
--- tt-rss-18.12+dfsg/debian/patches/default_to_syslog.patch 1970-01-01
01:00:00.000000000 +0100
+++ tt-rss-18.12+dfsg/debian/patches/default_to_syslog.patch 2019-05-20
17:53:47.000000000 +0200
@@ -0,0 +1,11 @@
+--- tt-rss-18.12+dfsg.orig/config.php-dist
++++ tt-rss-18.12+dfsg/config.php-dist
+@@ -166,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-05-20
17:49:53.000000000 +0200
@@ -0,0 +1,32 @@
+From 91105810dafedba0390608d7465abd602beb6410 Mon Sep 17 00:00:00 2001
+From: Sergei Morozov <moro...@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(-)
+
+diff --git a/src/JShrink/Minifier.php b/src/JShrink/Minifier.php
+index 8103452..ad8157f 100644
+--- a/vendor/JShrink/Minifier.php
++++ b/vendor/JShrink/Minifier.php
+@@ -183,7 +183,7 @@ protected function loop()
+ // 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;
+@@ -231,7 +231,7 @@ protected function loop()
+ // 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-05-20 17:52:00.000000000
+0200
@@ -1,3 +1,5 @@
config.php-dist.patch
remove-tt-rss-layer.patch
fix-db-updater-script.patch
+jshrink_php7.3_fix.patch
+default_to_syslog.patch
