Merge version 242-4+rpi1 and 242-5 to produce 242-5+rpi1

diff --cc debian/changelog
index 77e06febd8764fdb37007a935a27632e5e86049f,f6c629bc3ae46825bc0dc09be5ff3ef466ab85e4..c8353708605c403e85e6205f482b713357c45441
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,24 +1,41 @@@
- systemd (242-4+rpi1) bullseye-staging; urgency=medium
++systemd (242-5+rpi1) bullseye-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)
 +
 +  [changes brought forward from 241-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> 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)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 24 Aug 2019 08:52:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 03 Sep 2019 18:09:29 +0000
++
+ systemd (242-5) unstable; urgency=medium
+ 
+   [ Dan Streetman ]
+   * d/rules: add CONFFGLAGS_UPSTREAM to dh_auto_configure -- params
+ 
+   [ Michael Biebl ]
+   * core: never propagate reload failure to service result.
+     Fixes a regression introduced in v239 where the main process of a
+     service unit gets killed on reload if ExecReload fails. (Closes: #936032)
+   * shared/seccomp: add sync_file_range2.
+     Some architectures need the arguments to be reordered because of alignment
+     issues. Otherwise, it's the same as sync_file_range.
+     Fixes sync_file_range failures in nspawn containers on arm, ppc.
+     (Closes: #935091)
+   * bash-completion: don't sort syslog priorities.
+     By default, the available completions are sorted alphabetically, which
+     is counterproductive in case of syslog priorities. Override the default
+     behavior using the `nosort` option. (Closes: #913222)
+   * test-bpf: skip test when run inside containers
+ 
+  -- Michael Biebl <biebl@debian.org>  Thu, 29 Aug 2019 16:18:18 +0200
  
  systemd (242-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge