From: Raspbian automatic forward porter Date: Thu, 20 Aug 2020 19:50:11 +0000 (+0100) Subject: Merge version 246-2+rpi1 and 246.2-1 to produce 246.2-1+rpi1 X-Git-Tag: raspbian/246.2-1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e4e372c746c5ac20844f6a56c2cbf70aa94634a1;p=systemd.git Merge version 246-2+rpi1 and 246.2-1 to produce 246.2-1+rpi1 --- 2a963fae9a4b991b0d3b75680963bc1701584eb1 diff --cc debian/changelog index c9034d38,ff56ab92..39e89db8 --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,32 +1,46 @@@ - systemd (246-2+rpi1) bullseye-staging; urgency=medium ++systemd (246.2-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 239-9+rpi1 by Peter Michael Green at Thu, 20 Sep 2018 20:22:45 +0000] + * Disable testsuite, it fails on some of our buildboxes (probablly because of + old kernels). + * Add breaks on raspi-copies-and-fills, it doesn't seem to get on with + this version of systemd/udev. + + [changes brought forward from 241-1+rpi2 by Peter Michael Green at Tue, 02 Apr 2019 19:29:26 +0000] + * Bump "breaks" on raspi-copies-and-fills to << 0.12 + (raspi-copies-and-fills was reverted by the raspberry pi foundation) + - -- Peter Michael Green Fri, 14 Aug 2020 00:03:28 +0000 ++ -- Raspbian forward porter Thu, 20 Aug 2020 19:50:10 +0000 ++ + systemd (246.2-1) unstable; urgency=medium + + * New upstream version 246.2 + * Remove resolvconf.conf drop-in, resolved integration moved to resolvconf + package + * Rebase patches + * Add versioned Breaks against resolvconf (<< 1.83~) to systemd. + The PathExists= directive was changed in v246 to match the documented + behaviour but now causes resolvconf-pull-resolved.service to be + continuously triggered by resolvconf-pull-resolved.path. + This requires a fix in the resolvconf package, see #968015. + (Closes: #967906) + * Keep journal files compatible with older versions. + Disable the KEYED-HASH journal feature by default and keep LZ4 (instead + of ZSTD) as default compression for new journal files. Otherwise journal + files are incompatible and can't be read by older journalctl + implementations. + This patch can be dropped in bullseye+1, as journalctl from bullseye + will then be able to read journal files with those features. + (Closes: #968055) + + -- Michael Biebl Mon, 17 Aug 2020 22:28:09 +0200 + + systemd (246.1-1) unstable; urgency=medium + + * New upstream version 246.1 + * Rebase patches + + -- Michael Biebl Sun, 16 Aug 2020 13:14:46 +0200 systemd (246-2) unstable; urgency=medium diff --cc debian/control index 2dcf34cb,feb577d4..7fbaba30 --- a/debian/control +++ b/debian/control @@@ -82,7 -82,7 +82,8 @@@ Conflicts: consolekit Breaks: systemd-shim (<< 10-4~), python-dbusmock (<< 0.18), python3-dbusmock (<< 0.18), + resolvconf (<< 1.83~), + raspi-copies-and-fills (<< 0.7) Description: system and service manager systemd is a system and service manager for Linux. It provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting