Manual merge of version 257.7-1+rpi1 and 257.8-1~deb13u2 to produce 257.8-1~deb13u2...

diff --cc debian/changelog
index 0425965b99f2a3845df8dc52bf711fc9ec4e7edb,91b0dbb2292b02df2f8a2930d26e56fb7b868833..122ae5b96a3717b1e2f0294c19ad0df73ff3b310
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,29 +1,51 @@@
- systemd (257.7-1+rpi1) trixie-staging; urgency=medium
++systemd (257.8-1~deb13u2+rpi1) trixie-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)
 +
 +  [changes introduced in 254.1-3+rpi1 by Peter Michael Green.
 +  * Disable systemd-boot, it seems to fail to build and it's not really relavent
 +    for raspbian.
 +
 +  [changes introduced in 255.3-1+rpi1 by Peter Michael Green]
 +  * Remove armhf from architecture lists for files that appear systemd-boot
 +    related
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 31 Jul 2025 06:02:57 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 18 Sep 2025 13:37:22 +0000
++
+ systemd (257.8-1~deb13u2) trixie; urgency=medium
+ 
+   * Non-maintainer upload.
+   * systemd-networkd: Fix segfault on VLAN-aware bridges. (Closes: #1112535)
+ 
+  -- Philipp Kern <pkern@debian.org>  Tue, 09 Sep 2025 10:38:33 +0200
+ 
+ systemd (257.8-1~deb13u1) trixie; urgency=medium
+ 
+   * ukify: recommend sbsigntool | pesign for signing (Closes: #1108803)
+   * Move bootctl zsh completion file too to new package
+   * systemd-boot-tools: change architecture to linux-any. The tool can be
+     used for cross-building, and it's available on all architectures, not
+     just EFI ones
+   * systemd-boot: fix initramfs post-update hook for uncompressed kernels
+     (Closes: #1109098)
+   * systemd-boot: register interest in systemd-boot-signed trigger
+     (Closes: #1109984)
+   * NEWS: fix typo (Closes: #1109979)
+   * systemd-boot: fix registering/removing uncompressed kernels
+   * d/t/control: prefer systemd-boot-tools if available
+   * Update upstream source from tag 'upstream/257.8' Update to upstream
+     version '257.8' with Debian dir
+     7153da4dd3bde82b88c5f48d704826e431373076
+ 
+  -- Luca Boccassi <bluca@debian.org>  Sun, 10 Aug 2025 15:04:51 +0100
  
  systemd (257.7-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge

diff --cc debian/systemd.install
index 501c5e85cd4755e1ccdd739e6300194ba2569b87,f8d78760324e4b92443a5083cd23b25d91f71b7f..303f78140e631eb23ab57d535e1860205f264718
--- 1/debian/systemd.install
--- 2/debian/systemd.install
+++ b/debian/systemd.install
@@@ -253,8 -256,9 +256,9 @@@ usr/lib/systemd/system/sockets.target.w
  usr/lib/systemd/system/sockets.target.wants/systemd-hostnamed.socket
  usr/lib/systemd/system/sockets.target.wants/systemd-journald-dev-log.socket
  usr/lib/systemd/system/sockets.target.wants/systemd-journald.socket
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sockets.target.wants/systemd-pcrextend.socket
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sockets.target.wants/systemd-pcrlock.socket
+ <pkg.systemd.upstream> usr/lib/systemd/system/sockets.target.wants/systemd-logind-varlink.socket
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/sockets.target.wants/systemd-pcrextend.socket
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/sockets.target.wants/systemd-pcrlock.socket
  usr/lib/systemd/system/sockets.target.wants/systemd-sysext.socket
  usr/lib/systemd/system/soft-reboot.target
  usr/lib/systemd/system/sound.target
@@@ -353,27 -358,27 +358,27 @@@ usr/lib/systemd/system/systemd-logind.s
  usr/lib/systemd/system/systemd-machine-id-commit.service
  usr/lib/systemd/system/systemd-modules-load.service
  usr/lib/systemd/system/systemd-networkd*.service
- usr/lib/systemd/system/systemd-networkd.socket
+ usr/lib/systemd/system/systemd-networkd*.socket
  usr/lib/systemd/system/systemd-network-generator.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrextend@.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrextend.socket
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrfs-root.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrfs@.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock.socket
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock@.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-file-system.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-code.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-config.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-machine-id.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-make-policy.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-secureboot-authority.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-secureboot-policy.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrmachine.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/system/systemd-pcrphase-factory-reset.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase-initrd.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service
 -[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase-sysinit.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrextend@.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrextend.socket
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrfs-root.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrfs@.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock.socket
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock@.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-file-system.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-code.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-config.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-machine-id.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-make-policy.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-secureboot-authority.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-secureboot-policy.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrmachine.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/system/systemd-pcrphase-factory-reset.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase-initrd.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service
 +[amd64 i386 arm64 riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase-sysinit.service
  usr/lib/systemd/system/systemd-poweroff.service
  usr/lib/systemd/system/systemd-pstore.service
  usr/lib/systemd/system/systemd-quotacheck*.service

diff --cc debian/systemd.manpages
Simple merge