Package: release.debian.org Severity: normal Tags: bookworm User: release.debian....@packages.debian.org Usertags: pu X-Debbugs-Cc: pkg-systemd-maintain...@lists.alioth.debian.org, a...@adam-barratt.org.uk
Dear Release Team, This upload backports one patch to revert adding a new comment that was added in 252.30-1~deb12u1 to a conffile as indicated in: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1079086#25 Debdiff attached. -- Kind regards, Luca Boccassi
diff -Nru systemd-252.30/debian/changelog systemd-252.30/debian/changelog --- systemd-252.30/debian/changelog 2024-08-19 21:32:22.000000000 +0100 +++ systemd-252.30/debian/changelog 2024-08-25 18:35:39.000000000 +0100 @@ -1,3 +1,10 @@ +systemd (252.30-1~deb12u2) bookworm; urgency=medium + + * Backport patch to revert new comment in /etc/systemd/journald.conf. + Avoid dpkg prompt on upgrade + + -- Luca Boccassi <bl...@debian.org> Sun, 25 Aug 2024 18:35:39 +0100 + systemd (252.30-1~deb12u1) bookworm; urgency=medium * New upstream version 252.30 diff -Nru systemd-252.30/debian/patches/Revert-journal-comment-the-default-value-in-journald.conf.patch systemd-252.30/debian/patches/Revert-journal-comment-the-default-value-in-journald.conf.patch --- systemd-252.30/debian/patches/Revert-journal-comment-the-default-value-in-journald.conf.patch 1970-01-01 01:00:00.000000000 +0100 +++ systemd-252.30/debian/patches/Revert-journal-comment-the-default-value-in-journald.conf.patch 2024-08-25 18:34:31.000000000 +0100 @@ -0,0 +1,17 @@ +Author: Luca Boccassi <bl...@debian.org> +Bug-Debian: http://bugs.debian.org/1079086 +Description: Revert "journal: comment the default value in journald.conf" + Because of how dpkg handles config files, this will cause a prompt to + users on upgrade, which is undesirable for stable updates, so revert it + in v252-stable. +--- a/src/journal/journald.conf ++++ b/src/journal/journald.conf +@@ -30,7 +30,7 @@ + #RuntimeKeepFree= + #RuntimeMaxFileSize= + #RuntimeMaxFiles=100 +-#MaxRetentionSec=0 ++#MaxRetentionSec= + #MaxFileSec=1month + #ForwardToSyslog=yes + #ForwardToKMsg=no diff -Nru systemd-252.30/debian/patches/series systemd-252.30/debian/patches/series --- systemd-252.30/debian/patches/series 2024-08-19 21:32:22.000000000 +0100 +++ systemd-252.30/debian/patches/series 2024-08-25 18:32:58.000000000 +0100 @@ -18,3 +18,4 @@ debian/systemctl-do-not-shutdown-immediately-on-scheduled-shutdo.patch debian/Downgrade-a-couple-of-warnings-to-debug.patch debian/Skip-flaky-test_resolved_domain_restricted_dns-in-network.patch +Revert-journal-comment-the-default-value-in-journald.conf.patch
signature.asc
Description: This is a digitally signed message part
