Control: tag -1 + patch Hi,
Axel Beckert wrote: > After fixing this in Debian Unstable by simply uploading the current > upstream release, please also backport the upstream fix from 3.30 for > this issue (https://github.com/syslog-ng/syslog-ng/pull/3444) to 3.28 in > Bullseye as this is a quite annoying issue in the new Debian stable > release. I've prepared a potential stable update at https://github.com/xtaran/syslog-ng-debian/tree/debian/bullseye in commit https://github.com/xtaran/syslog-ng-debian/commit/4b508ba601f16b11378886f2626016816dcf0e2a The patch is attached as well. I'm now running this in production. It still has the "~abe1" suffix in the version number (i.e. debian/changelog) in git so that any potential security update overrides my local bugfix. If you want to use this as real stable update, you need to remove that safety guard suffix at least. Feel free to also bump the changelog entry signature and replace "* Non-maintainer upload" with "[ Axel Beckert ]". Wanted to do a pull request for this, but Github doesn't seem to allow pull requests which create new branches. And this shouldn't go into any existing branch. So you need to pull or cherry-pick this on your own into a debian/bullseye (or similar) branch. The Stable Release Managers likely want to see that patch in Debian Testing first, so you should probably start with updating Debian Unstable to the latest upstream stable release and wait for that to migrate to testing, before uploading any stable update package. Thanks in advance for your consideration. Regards, Axel -- ,''`. | Axel Beckert <[email protected]>, https://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5 `- | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
From 4b508ba601f16b11378886f2626016816dcf0e2a Mon Sep 17 00:00:00 2001 From: Axel Beckert <[email protected]> Date: Tue, 12 Oct 2021 17:16:33 +0200 Subject: [PATCH] =?UTF-8?q?Backport=20fix=20for=20syslog-ng/syslog-ng#3506?= =?UTF-8?q?=20(Spams=20syslog=20=E2=80=A6)=20to=20Debian=2011?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … by cherry-picking upstream commit 1040f919. Closes: #996246 --- debian/changelog | 9 +++++ ...ation-timeout-to-verbose-from-notice.patch | 36 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 46 insertions(+) create mode 100644 debian/patches/cherry-pick-1040f919-logwriter-destination-timeout-to-verbose-from-notice.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 17ca96f8..ec18f282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +syslog-ng (3.28.1-2+deb11u1~abe1) bullseye; urgency=medium + + * Non-maintainer upload. + * Backport fix for https://github.com/syslog-ng/syslog-ng/issues/3506 + (spams syslog when enabling remote target) to Debian 11 Bullseye by + cherry-picking upstream commit 1040f919. (Closes: #996246) + + -- Axel Beckert <[email protected]> Tue, 12 Oct 2021 16:18:01 +0200 + syslog-ng (3.28.1-2) unstable; urgency=medium * [def6b75] Remove overlay configuration from gbp.conf. diff --git a/debian/patches/cherry-pick-1040f919-logwriter-destination-timeout-to-verbose-from-notice.patch b/debian/patches/cherry-pick-1040f919-logwriter-destination-timeout-to-verbose-from-notice.patch new file mode 100644 index 00000000..be82456d --- /dev/null +++ b/debian/patches/cherry-pick-1040f919-logwriter-destination-timeout-to-verbose-from-notice.patch @@ -0,0 +1,36 @@ +From 560ad49715112ee5c32927bf5b2291bf3cd6e269 Mon Sep 17 00:00:00 2001 +From: Antal Nemes <[email protected]> +Date: Thu, 1 Oct 2020 15:04:17 +0200 +Subject: [PATCH] logwriter: destination timeout to verbose from notice + +After this change, these two logs will occur together: + +``` +Destination timeout has elapsed, closing connection; fd='12' +Destination timed out, reaping; template='/dev/stdout', filename='/dev/stdout' +``` + +Originally, only the first one was visibe (without verbose +flag). Withouth the context of the second, this can cause confusion. + +Signed-off-by: Antal Nemes <[email protected]> +Bug-Debian: https://bugs.debian.org/996246 +Bug: https://github.com/syslog-ng/syslog-ng/issues/3506 +Reviewd-By: Axel Beckert <[email protected]> +--- + lib/logwriter.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/lib/logwriter.c ++++ b/lib/logwriter.c +@@ -1315,8 +1315,8 @@ + LogWriter *self = (LogWriter *) cookie; + + g_assert(!self->io_job.working); +- msg_notice("Destination timeout has elapsed, closing connection", +- evt_tag_int("fd", log_proto_client_get_fd(self->proto))); ++ msg_verbose("Destination timeout has elapsed, closing connection", ++ evt_tag_int("fd", log_proto_client_get_fd(self->proto))); + + log_pipe_notify(self->control, NC_CLOSE, self); + } diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..b607908b --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +cherry-pick-1040f919-logwriter-destination-timeout-to-verbose-from-notice.patch
signature.asc
Description: PGP signature
