Merge version 247.3-5+rpi1 and 247.3-6 to produce 247.3-6+rpi1

diff --cc debian/changelog
index 8447d983c3066cd4bfc98f7ce53d8bb453e58626,4659f3b26a51f3ffad59d9ae5520a0e80efd8611..a3184c8b952f9ef608c888c898c15b727675801b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,12 +1,26 @@@
- systemd (247.3-5+rpi1) bullseye-staging; urgency=medium
++systemd (247.3-6+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 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>  Fri, 30 Apr 2021 03:11:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Aug 2021 03:58:19 +0000
++
+ systemd (247.3-6) unstable; urgency=high
+ 
+   * Non-maintainer upload (acked by maintainers)
+   * unit-name: generate a clear error code when converting an overly long fs
+     path to a unit name
+   * basic/unit-name: do not use strdupa() on a path (CVE-2021-33910)
+   * basic/unit-name: adjust comments
+ 
+  -- Salvatore Bonaccorso <carnil@debian.org>  Tue, 13 Jul 2021 19:29:24 +0200
  
  systemd (247.3-5) unstable; urgency=medium