Merge version 239-15+rpi1 and 240-2 to produce 240-2+rpi1

diff --cc debian/changelog
index dc7f832da04d1db936e7f6a658e3edeae9f02d13,3770a93236950627f6de03ba051b88629085ddcd..3a38766348e5f5bc63c8f72cf4e54a14fff977da
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,54 +1,67 @@@
- systemd (239-15+rpi1) buster-staging; urgency=medium
++systemd (240-2+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>  Sun, 16 Dec 2018 13:20:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Jan 2019 20:59:15 +0000
++
+ systemd (240-2) unstable; urgency=medium
+ 
+   * Pass seperate dev_t var to device_path_parse_major_minor.
+     Fixes FTBFS on mips/mipsel (MIPS/O32). (Closes: #917195)
+   * test-json: Check absolute and relative difference in floating point test.
+     Fixes FTBFS due to test-suite failures on armel, armhf and hppa.
+     (Closes: #917215)
+   * sd-device: Fix segfault when error occurs in device_new_from_{nulstr,strv}()
+     Fixes a segfault in systemd-udevd when debug logging is enabled.
+   * udev-event: Do not read stdout or stderr if the pipefd is not created.
+     This fixes problems with device-mapper symlinks no longer being created
+     or certain devices not being marked as ready. (Closes: #917124)
+   * Don't bump fs.nr_open in PID 1.
+     In v240, systemd bumped fs.nr_open in PID 1 to the highest possible
+     value. Processes that are spawned directly by systemd, will have
+     RLIMIT_NOFILE be set to 512K (hard).
+     pam_limits in Debian defaults to "set_all", i.e. for limits which are
+     not explicitly configured in /etc/security/limits.conf, the value from
+     PID 1 is taken, which means for login sessions, RLIMIT_NOFILE is set to
+     the highest possible value instead of 512K. Not every software is able
+     to deal with such an RLIMIT_NOFILE properly.
+     While this is arguably a questionable default in Debian's pam_limit,
+     work around this problem by not bumping fs.nr_open in PID 1.
+     (Closes: #917167)
+ 
+  -- Michael Biebl <biebl@debian.org>  Thu, 27 Dec 2018 14:03:57 +0100
+ 
+ systemd (240-1) unstable; urgency=medium
+ 
+   [ Michael Biebl ]
+   * New upstream version 240
+     - core: Skip cgroup_subtree_mask_valid update if UNIT_STUB
+       (Closes: #903011)
+     - machined: Rework referencing of machine scopes from machined
+       (Closes: #903288)
+     - timesync: Fix serialization of IP address
+       (Closes: #916516)
+     - core: Don't track jobs-finishing-during-reload explicitly
+       (Closes: #916678)
+   * Rebase patches
+   * Install new systemd-id128 binary
+   * Update symbols file for libsystemd0
+   * Update nss build options
+ 
+   [ Martin Pitt ]
+   * tests: Disable some flaky upstream tests.
+     See https://github.com/systemd/systemd/issues/11195
+   * tests: Disable flaky TEST-17-UDEV-WANTS upstream test.
+     See https://github.com/systemd/systemd/issues/11195
+ 
+  -- Michael Biebl <biebl@debian.org>  Sat, 22 Dec 2018 16:01:43 +0100
  
  systemd (239-15) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge