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

diff --cc debian/changelog
index 26a4f4fa1e846195f6af9326e5deb04c776fb5cc,5da02c8e4b2e36eeef7e0be2ec92087679dca7dd..d5e2326dd76cf292b3728ddb85af0dda7cd438ab
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,35 +1,48 @@@
- systemd (239-10+rpi1) buster-staging; urgency=medium
++systemd (239-11+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>  Sat, 29 Sep 2018 08:55:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 02 Nov 2018 06:30:19 +0000
++
+ systemd (239-11) unstable; urgency=high
+ 
+   [ Michael Biebl ]
+   * debian/tests/upstream: Clean up after each test run.
+     Otherwise the loopback images used by qemu are not properly released and
+     we might run out of disk space.
+   * dhcp6: Make sure we have enough space for the DHCP6 option header.
+     Fixes out-of-bounds heap write in systemd-networkd dhcpv6 option
+     handling.
+     (CVE-2018-15688, LP: #1795921, Closes: #912008)
+   * chown-recursive: Rework the recursive logic to use O_PATH.
+     Fixes a race condition in chown_one() which allows an attacker to cause
+     systemd to set arbitrary permissions on arbitrary files.
+     (CVE-2018-15687, LP: #1796692, Closes: #912007)
+ 
+   [ Martin Pitt ]
+   * debian/tests/boot-and-services: Use gdm instead of lightdm.
+     This seems to work more reliably, on Ubuntu CI's i386 instances lightdm
+     fails.
+ 
+   [ Manuel A. Fernandez Montecelo ]
+   * Run "meson test" instead of "ninja test"
+     Upstream developers of meson recommend to run it in this way, because
+     "ninja test" just calls "meson test", and by using meson directly and
+     using extra command line arguments it is possible to control aspects of
+     how the tests are run.
+   * Increase timeout for test in riscv64.
+     The buildds for the riscv64 arch used at the moment are slow, so increase
+     the timeouts for this arch by a factor of 10, for good measure.
+     (Closes: #906429)
+ 
+  -- Michael Biebl <biebl@debian.org>  Sun, 28 Oct 2018 13:02:18 +0100
  
  systemd (239-10) unstable; urgency=medium
  

diff --cc debian/rules
index 1079a025d8fb7cedb3f9a18eda1b005bb7f102f5,5b36d18edb6b4485ea9c294d459bb108efc61178..443b77e483f1dbb0a3e2becebb67822c1ecfba59
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -282,10 -284,10 +286,10 @@@ override_dh_makeshlibs
        dh_makeshlibs --remaining-packages -- -c$(GENSYMBOLS_LEVEL)
  
  override_dh_auto_test:
 -ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
 +ifeq (testsuitedisabled, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
        echo "01234567890123456789012345678901" > build-deb/machine-id
        # some tests hang under fakeroot, so disable fakeroot
-       env -u LD_PRELOAD SYSTEMD_MACHINE_ID_PATH=$(CURDIR)/build-deb/machine-id ninja -C build-deb test || ( \
+       env -u LD_PRELOAD SYSTEMD_MACHINE_ID_PATH=$(CURDIR)/build-deb/machine-id meson test -C build-deb $(TEST_TIMEOUT_MULTIPLIER) || ( \
                cat build-deb/meson-logs/testlog.txt; \
                exit 1)
  endif