Merge version 239-11+rpi1 and 239-12 to produce 239-12+rpi1

diff --cc debian/changelog
index d5e2326dd76cf292b3728ddb85af0dda7cd438ab,67ea1cd81336b59cee5066305c9d6bfb1cb7b86c..96542a75aa7ae6c4b91cee68ebbe4a5f9515deca
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,39 +1,52 @@@
- systemd (239-11+rpi1) buster-staging; urgency=medium
++systemd (239-12+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>  Fri, 02 Nov 2018 06:30:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 20 Nov 2018 13:18:02 +0000
++
+ systemd (239-12) unstable; urgency=high
+ 
+   [ Martin Pitt ]
+   * Enable QEMU on more architectures in "upstream" autopkgtest.
+     Taken from the Ubuntu package, so apparently QEMU works well enough on
+     these architectures now.
+   * autopkgtest: Avoid test bed reset for boot-smoke.
+     Make "boot-smoke"'s dependencies a strict superset of "upstream"'s, so
+     that autopkgtest doesn't have to provide a new testbed.
+   * Fix wrong "nobody" group from sysusers.d.
+     Fix our make-sysusers-basic sysusers.d generator to special-case the
+     nobody group. "nobody" user and "nogroup" group both have the same ID
+     65534, which is the only special case for Debian's static users/groups.
+     So specify the gid explicitly, to avoid systemd-sysusers creating a
+     dynamic system group for "nobody".
+     Also clean up the group on upgrades.
+     Thanks to Keh-Ming Luoh for the original patch! (Closes: #912525)
+ 
+   [ Michael Biebl ]
+   * autopkgtest: Use shutil.which() which is provided by Python 3
+   * Drop non-existing gnuefi=false build option.
+     This was mistakenly added when converting from autotools to meson.
+   * core: When deserializing state always use read_line(…, LONG_LINE_MAX, …)
+     Fixes a vulnerability in unit_deserialize which allows an attacker to
+     supply arbitrary state across systemd re-execution via NotifyAccess.
+     (CVE-2018-15686, Closes: #912005)
+   * meson: Use the host architecture compiler/linker for src/boot/efi.
+     Fixes cross build failure for arm64. (Closes: #905381)
+   * systemd: Do not pass .wants fragment path to manager_load_unit.
+     Fixes an issue with overridden units in /etc not being used due to a
+     .wants/ symlink pointing to /lib. (Closes: #907054)
+   * machined: When reading os-release file, join PID namespace too.
+     This ensures that we properly acquire the os-release file from containers.
+     (Closes: #911231)
+ 
+  -- Michael Biebl <biebl@debian.org>  Sat, 17 Nov 2018 18:39:21 +0100
  
  systemd (239-11) unstable; urgency=high
  

diff --cc debian/rules
Simple merge