Merge version 240-2+rpi1 and 240-4 to produce 240-4+rpi1

diff --cc debian/changelog
index 3a38766348e5f5bc63c8f72cf4e54a14fff977da,72506b4d3c96b02435504b488a73ee08cc8729cd..eee9d4b13981eae628faf8b2e9717b74628da208
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,48 +1,61 @@@
- systemd (240-2+rpi1) buster-staging; urgency=medium
++systemd (240-4+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 239-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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 239-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Sep 2018 22:47:19 +0000]
 +  * Force build with gcc-7 (LP: #1793415)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Jan 2019 20:59:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Jan 2019 13:00:52 +0000
++
+ systemd (240-4) unstable; urgency=medium
+ 
+   [ Benjamin Drung ]
+   * Fix shellcheck issues in initramfs-tools scripts
+ 
+   [ Michael Biebl ]
+   * Import patches from v240-stable branch (up to f02b5472c6)
+     - Fixes a problem in logind closing the controlling terminal when using
+       startx. (Closes: #918927)
+     - Fixes various journald vulnerabilities via attacker controlled alloca.
+       (CVE-2018-16864, CVE-2018-16865, Closes: #918841, Closes: #918848)
+   * sd-device-monitor: Fix ordering of setting buffer size.
+     Fixes an issue with uevents not being processed properly during coldplug
+     stage and some kernel modules not being loaded via "udevadm trigger".
+     (Closes: #917607)
+   * meson: Stop setting -fPIE globally.
+     Setting -fPIE globally can lead to miscompilations on certain
+     architectures. Instead use the b_pie=true build option, which was
+     introduced in meson 0.49. Bump the Build-Depends accordingly.
+     (Closes: #909396)
+ 
+  -- Michael Biebl <biebl@debian.org>  Sat, 12 Jan 2019 21:49:44 +0100
+ 
+ systemd (240-3) unstable; urgency=medium
+ 
+   * udev.init: Trigger add events for subsystems.
+     Update the SysV init script and mimic the behaviour of the initramfs and
+     systemd-udev-trigger.service which first trigger subsystems and then
+     devices during the coldplug stage.
+   * udevadm: Refuse to run trigger, control, settle and monitor commands in
+     chroot (Closes: #917633)
+   * network: Set link state configuring before setting addresses.
+     Fixes a crash in systemd-networkd caused by an assertion failure.
+     (Closes: #918658)
+   * libudev-util: Make util_replace_whitespace() read only len characters.
+     Fixes a regression where /dev/disk/by-id/ names had additional
+     underscores.
+   * man: Update color of journal logs in DEBUG level (Closes: #917948)
+   * Remove old state directory of systemd-timesyncd on upgrades.
+     Otherwise timesyncd will fail to update the clock file if it was created
+     as /var/lib/private/systemd/timesync/clock.
+     This was the case when the service was using DynamicUser=yes which it no
+     longer does in v240. (Closes: #918190)
+ 
+  -- Michael Biebl <biebl@debian.org>  Wed, 09 Jan 2019 18:40:57 +0100
  
  systemd (240-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge