Merging debian version 256-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 43 insertions, 34 deletions

diff --git a/debian/systemd.install b/debian/systemd.install
index 608257c..dbc82a9 100755
--- a/debian/systemd.install
+++ b/debian/systemd.install
@@ -4,7 +4,7 @@ etc/credstore/
 etc/credstore.encrypted/
 etc/init.d/
 etc/kernel/install.d/
-<pkg.systemd.upstream> etc/ssh/ssh_config.d/20-systemd-ssh-proxy.conf
+etc/ssh/ssh_config.d/20-systemd-ssh-proxy.conf
 etc/systemd/journald.conf
 etc/systemd/logind.conf
 etc/systemd/network/
@@ -54,8 +54,8 @@ usr/bin/systemd-sysusers
 usr/bin/systemd-tmpfiles
 usr/bin/systemd-tty-ask-password-agent
 usr/bin/systemd-umount
-<pkg.systemd.upstream> usr/bin/run0
-<pkg.systemd.upstream> usr/bin/systemd-vpick
+usr/bin/run0
+usr/bin/systemd-vpick
 usr/bin/timedatectl
 usr/bin/varlinkctl
 usr/lib/environment.d/99-environment.conf
@@ -67,17 +67,17 @@ usr/lib/modprobe.d/systemd.conf
 <!stage1> usr/lib/pcrlock.d/
 [alpha amd64 arm64 ia64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64] usr/lib/sysctl.d/50-pid-max.conf
 usr/lib/systemd/catalog/
-<pkg.systemd.upstream> usr/lib/systemd/network/80-6rd-tunnel.link
+usr/lib/systemd/network/80-6rd-tunnel.link
 usr/lib/systemd/network/80-6rd-tunnel.network
 usr/lib/systemd/network/80-auto-link-local.network.example
-usr/lib/systemd/network/80-container-host0.network
-<pkg.systemd.upstream> usr/lib/systemd/network/80-container-vb.link
+usr/lib/systemd/network/80-container-host0*.network
+usr/lib/systemd/network/80-container-vb.link
 usr/lib/systemd/network/80-container-vb.network
-<pkg.systemd.upstream> usr/lib/systemd/network/80-container-ve.link
+usr/lib/systemd/network/80-container-ve.link
 usr/lib/systemd/network/80-container-ve.network
-<pkg.systemd.upstream> usr/lib/systemd/network/80-container-vz.link
+usr/lib/systemd/network/80-container-vz.link
 usr/lib/systemd/network/80-container-vz.network
-<pkg.systemd.upstream> usr/lib/systemd/network/80-vm-vt.link 
+usr/lib/systemd/network/80-vm-vt.link
 usr/lib/systemd/network/80-vm-vt.network
 usr/lib/systemd/network/80-wifi-adhoc.network
 usr/lib/systemd/network/80-wifi-ap.network.example
@@ -85,14 +85,14 @@ usr/lib/systemd/network/80-wifi-station.network.example
 usr/lib/systemd/network/89-ethernet.network.example
 usr/lib/systemd/repart/
 usr/lib/systemd/resolv.conf
-<pkg.systemd.upstream> usr/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf
+usr/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf
 usr/lib/systemd/system/autovt@.service
 usr/lib/systemd/system/basic.target
 usr/lib/systemd/system/blockdev@.target
 usr/lib/systemd/system/bluetooth.target
 usr/lib/systemd/system/boot-complete.target
-<pkg.systemd.upstream> usr/lib/systemd/system/capsule.slice
-<pkg.systemd.upstream> usr/lib/systemd/system/capsule@.service
+usr/lib/systemd/system/capsule.slice
+usr/lib/systemd/system/capsule@.service
 usr/lib/systemd/system/console-getty.service
 usr/lib/systemd/system/container-getty@.service
 <!stage1> usr/lib/systemd/system/cryptsetup-pre.target
@@ -116,7 +116,6 @@ usr/lib/systemd/system/dev-hugepages.mount
 usr/lib/systemd/system/dev-mqueue.mount
 usr/lib/systemd/systemd-executor
 usr/lib/systemd/systemd-fsck
-<!pkg.systemd.upstream> usr/lib/systemd/systemd-fsckd
 usr/lib/systemd/systemd-growfs
 usr/lib/systemd/systemd-hibernate-resume
 usr/lib/systemd/systemd-hostnamed
@@ -142,7 +141,7 @@ usr/lib/systemd/systemd-rfkill
 usr/lib/systemd/systemd-shutdown
 usr/lib/systemd/systemd-sleep
 usr/lib/systemd/systemd-socket-proxyd
-<pkg.systemd.upstream> usr/lib/systemd/systemd-ssh-proxy
+usr/lib/systemd/systemd-ssh-proxy
 usr/lib/systemd/systemd-storagetm
 usr/lib/systemd/systemd-sulogin-shell
 usr/lib/systemd/systemd-sysctl
@@ -173,10 +172,10 @@ usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
 <!stage1> usr/lib/systemd/system-generators/systemd-integritysetup-generator
 usr/lib/systemd/system-generators/systemd-rc-local-generator
 usr/lib/systemd/system-generators/systemd-run-generator
-<pkg.systemd.upstream> usr/lib/systemd/system-generators/systemd-ssh-generator
+usr/lib/systemd/system-generators/systemd-ssh-generator
 usr/lib/systemd/system-generators/systemd-system-update-generator
 usr/lib/systemd/system-generators/systemd-sysv-generator
-<pkg.systemd.upstream> usr/lib/systemd/system-generators/systemd-tpm2-generator
+usr/lib/systemd/system-generators/systemd-tpm2-generator
 <!stage1> usr/lib/systemd/system-generators/systemd-veritysetup-generator
 usr/lib/systemd/system/getty-pre.target
 usr/lib/systemd/system/getty@.service
@@ -209,6 +208,7 @@ usr/lib/systemd/system/kmod-static-nodes.service
 usr/lib/systemd/system/ldconfig.service
 usr/lib/systemd/system/local-fs-pre.target
 usr/lib/systemd/system/local-fs.target
+usr/lib/systemd/system/local-fs.target.wants/tmp.mount
 usr/lib/systemd/system/machine.slice
 usr/lib/systemd/system/modprobe@.service
 usr/lib/systemd/system/multi-user.target
@@ -253,17 +253,17 @@ usr/lib/systemd/system/sleep.target
 usr/lib/systemd/system/slices.target
 usr/lib/systemd/system/smartcard.target
 usr/lib/systemd/system/sockets.target
-<pkg.systemd.upstream> usr/lib/systemd/system/sockets.target.wants/systemd-creds.socket
+usr/lib/systemd/system/sockets.target.wants/systemd-creds.socket
 usr/lib/systemd/system/sockets.target.wants/systemd-initctl.socket
-<pkg.systemd.upstream> usr/lib/systemd/system/sockets.target.wants/systemd-hostnamed.socket
+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] <!stage1> usr/lib/systemd/system/sockets.target.wants/systemd-pcrextend.socket
-[amd64 i386 arm64 armhf riscv64] <pkg.systemd.upstream> usr/lib/systemd/system/sockets.target.wants/systemd-pcrlock.socket
+[amd64 i386 arm64 armhf riscv64] 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
-<pkg.systemd.upstream> usr/lib/systemd/system/ssh-access.target
+usr/lib/systemd/system/ssh-access.target
 usr/lib/systemd/system/storage-target-mode.target
 usr/lib/systemd/system/suspend.target
 usr/lib/systemd/system/suspend-then-hibernate.target
@@ -271,7 +271,7 @@ usr/lib/systemd/system/swap.target
 usr/lib/systemd/system/sys-fs-fuse-connections.mount
 usr/lib/systemd/system/sysinit.target
 <!stage1> usr/lib/systemd/system/sysinit.target.wants/cryptsetup.target
-<pkg.systemd.upstream> usr/lib/systemd/system/sysinit.target.wants/systemd-hibernate-clear.service
+usr/lib/systemd/system/sysinit.target.wants/systemd-hibernate-clear.service
 usr/lib/systemd/system/sysinit.target.wants/dev-hugepages.mount
 usr/lib/systemd/system/sysinit.target.wants/dev-mqueue.mount
 <!stage1> usr/lib/systemd/system/sysinit.target.wants/integritysetup.target
@@ -319,22 +319,20 @@ usr/lib/systemd/system/systemd-binfmt.service
 usr/lib/systemd/system/systemd-boot-check-no-failures.service
 <!stage1> usr/lib/systemd/system/systemd-bsod.service
 usr/lib/systemd/system/systemd-confext.service
-<pkg.systemd.upstream> usr/lib/systemd/system/systemd-creds.socket
-<pkg.systemd.upstream> usr/lib/systemd/system/systemd-creds@.service
+usr/lib/systemd/system/systemd-creds.socket
+usr/lib/systemd/system/systemd-creds@.service
 usr/lib/systemd/system/systemd-exit.service
 usr/lib/systemd/system/systemd-firstboot.service
-<!pkg.systemd.upstream> usr/lib/systemd/system/systemd-fsckd.service
-<!pkg.systemd.upstream> usr/lib/systemd/system/systemd-fsckd.socket
 usr/lib/systemd/system/systemd-fsck-root.service
 usr/lib/systemd/system/systemd-fsck@.service
 usr/lib/systemd/system/systemd-growfs-root.service
 usr/lib/systemd/system/systemd-growfs@.service
 usr/lib/systemd/system/systemd-halt.service
-<pkg.systemd.upstream> usr/lib/systemd/system/systemd-hibernate-clear.service
+usr/lib/systemd/system/systemd-hibernate-clear.service
 usr/lib/systemd/system/systemd-hibernate-resume.service
 usr/lib/systemd/system/systemd-hibernate.service
 usr/lib/systemd/system/systemd-hostnamed.service
-<pkg.systemd.upstream> usr/lib/systemd/system/systemd-hostnamed.socket
+usr/lib/systemd/system/systemd-hostnamed.socket
 usr/lib/systemd/system/systemd-hybrid-sleep.service
 usr/lib/systemd/system/systemd-initctl.service
 usr/lib/systemd/system/systemd-initctl.socket
@@ -345,6 +343,7 @@ usr/lib/systemd/system/systemd-journald.service
 usr/lib/systemd/system/systemd-journald@.service
 usr/lib/systemd/system/systemd-journald.socket
 usr/lib/systemd/system/systemd-journald@.socket
+usr/lib/systemd/system/systemd-journald-sync@.service
 usr/lib/systemd/system/systemd-journald-varlink@.socket
 usr/lib/systemd/system/systemd-journal-flush.service
 usr/lib/systemd/system/systemd-kexec.service
@@ -359,8 +358,8 @@ usr/lib/systemd/system/systemd-network-generator.service
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrextend.socket
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrfs-root.service
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrfs@.service
-[amd64 i386 arm64 armhf riscv64] <pkg.systemd.upstream> usr/lib/systemd/system/systemd-pcrlock.socket
-[amd64 i386 arm64 armhf riscv64] <pkg.systemd.upstream> usr/lib/systemd/system/systemd-pcrlock@.service
+[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrlock.socket
+[amd64 i386 arm64 armhf riscv64] usr/lib/systemd/system/systemd-pcrlock@.service
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-file-system.service
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-code.service
 [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-config.service
@@ -417,7 +416,8 @@ usr/lib/systemd/system/timers.target
 usr/lib/systemd/system/timers.target.wants/systemd-tmpfiles-clean.timer
 usr/lib/systemd/system/time-set.target
 usr/lib/systemd/system/time-sync.target
-<pkg.systemd.upstream> usr/lib/systemd/system/tpm2.target
+usr/lib/systemd/system/tmp.mount
+usr/lib/systemd/system/tpm2.target
 usr/lib/systemd/system/umount.target
 usr/lib/systemd/system/usb-gadget.target
 usr/lib/systemd/system/user@0.service.d/10-login-barrier.conf
@@ -432,7 +432,7 @@ usr/lib/systemd/user/app.slice
 usr/lib/systemd/user/background.slice
 usr/lib/systemd/user/basic.target
 usr/lib/systemd/user/bluetooth.target
-<pkg.systemd.upstream> usr/lib/systemd/user/capsule@.target
+usr/lib/systemd/user/capsule@.target
 usr/lib/systemd/user/default.target
 usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator
 usr/lib/systemd/user/exit.target
@@ -456,7 +456,7 @@ usr/lib/systemd/user/xdg-desktop-autostart.target
 usr/lib/sysusers.d/basic.conf
 usr/lib/sysusers.d/systemd-journal.conf
 usr/lib/sysusers.d/systemd-network.conf
-<pkg.systemd.upstream> usr/lib/tmpfiles.d/20-systemd-ssh-generator.conf
+usr/lib/tmpfiles.d/20-systemd-ssh-generator.conf
 usr/lib/tmpfiles.d/credstore.conf
 usr/lib/tmpfiles.d/home.conf
 usr/lib/tmpfiles.d/journal-nocow.conf
@@ -482,11 +482,13 @@ usr/share/bash-completion/completions/kernel-install
 usr/share/bash-completion/completions/localectl
 usr/share/bash-completion/completions/loginctl
 usr/share/bash-completion/completions/networkctl
+usr/share/bash-completion/completions/run0
 usr/share/bash-completion/completions/systemctl
 usr/share/bash-completion/completions/systemd-analyze
 usr/share/bash-completion/completions/systemd-cat
 usr/share/bash-completion/completions/systemd-cgls
 usr/share/bash-completion/completions/systemd-cgtop
+usr/share/bash-completion/completions/systemd-confext
 <!stage1> usr/share/bash-completion/completions/systemd-cryptenroll
 usr/share/bash-completion/completions/systemd-delta
 usr/share/bash-completion/completions/systemd-detect-virt
@@ -495,6 +497,7 @@ usr/share/bash-completion/completions/systemd-id128
 usr/share/bash-completion/completions/systemd-path
 usr/share/bash-completion/completions/systemd-run
 usr/share/bash-completion/completions/systemd-sysext
+usr/share/bash-completion/completions/systemd-vpick
 usr/share/bash-completion/completions/timedatectl
 usr/share/dbus-1/services/org.freedesktop.systemd1.service
 usr/share/dbus-1/system.d/org.freedesktop.hostname1.conf
@@ -511,8 +514,8 @@ usr/share/dbus-1/system-services/org.freedesktop.systemd1.service
 usr/share/dbus-1/system-services/org.freedesktop.timedate1.service
 usr/share/doc/systemd/
 usr/share/locale/
-<pkg.systemd.upstream> usr/share/mime/packages/io.systemd.xml
-<pkg.systemd.upstream> usr/share/polkit-1/actions/io.systemd.credentials.policy
+usr/share/mime/packages/io.systemd.xml
+usr/share/polkit-1/actions/io.systemd.credentials.policy
 usr/share/polkit-1/actions/org.freedesktop.hostname1.policy
 usr/share/polkit-1/actions/org.freedesktop.locale1.policy
 usr/share/polkit-1/actions/org.freedesktop.login1.policy
@@ -552,5 +555,11 @@ var/lib/systemd/
 ../extra/journald.conf.d usr/lib/systemd/
 ../extra/units/getty-static.service usr/lib/systemd/system/
 ../extra/units/rc-local.service.d usr/lib/systemd/system/
+../extra/units/run-lock.mount usr/lib/systemd/system/
+../extra/units/systemd-fsck-root.service.d/ usr/lib/systemd/system/
 ../extra/units/systemd-localed.service.d usr/lib/systemd/system/
 ../extra/units/systemd-logind.service.d usr/lib/systemd/system/
+../extra/system.conf.d/10-coredump-debian.conf usr/lib/systemd/system.conf.d/
+../extra/user.conf.d/10-coredump-debian.conf usr/lib/systemd/user.conf.d/
+../extra/sysctl.d/10-coredump-debian.conf usr/lib/sysctl.d/
+../extra/limits.d/10-coredump-debian.conf etc/security/limits.d/