Merging upstream version 256.

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

8 files changed, 14 insertions, 7 deletions

diff --git a/test/fuzz/fuzz-catalog/systemd.pl.catalog b/test/fuzz/fuzz-catalog/systemd.pl.catalog
index 6e99c04..99a62ce 100644
--- a/test/fuzz/fuzz-catalog/systemd.pl.catalog
+++ b/test/fuzz/fuzz-catalog/systemd.pl.catalog
@@ -4,7 +4,7 @@
 # Polish translation
 
 # The catalog format is documented on
-# https://www.freedesktop.org/wiki/Software/systemd/catalog
+# https://systemd.io/CATALOG
 
 # For an explanation why we do all this, see https://xkcd.com/1024/
 
diff --git a/test/fuzz/fuzz-execute-serialize/initial b/test/fuzz/fuzz-execute-serialize/initial
index 403cf08..4d9103c 100644
--- a/test/fuzz/fuzz-execute-serialize/initial
+++ b/test/fuzz/fuzz-execute-serialize/initial
@@ -31,7 +31,6 @@ exec-context-protect-home=
 exec-context-protect-system=
 exec-context-mount-api-vfs=
 exec-context-same-pgrp=
-exec-context-cpu-sched-reset-on-fork=
 exec-context-non-blocking=
 exec-context-ignore-sigpipe=
 exec-context-memory-deny-write-execute=
diff --git a/test/fuzz/fuzz-netdev-parser/bond.netdev b/test/fuzz/fuzz-netdev-parser/bond.netdev
index 4e4885c..04e237d 100644
--- a/test/fuzz/fuzz-netdev-parser/bond.netdev
+++ b/test/fuzz/fuzz-netdev-parser/bond.netdev
@@ -14,5 +14,6 @@ MinLinks=1
 AdActorSystemPriority=1218
 AdUserPortKey=811
 AdActorSystem=00:11:22:33:44:55
+ARPMissedMax=10
 # feed the sanitizer
 AdActorSystem=00:11:22:33:44:55
diff --git a/test/fuzz/fuzz-network-parser/sysctl b/test/fuzz/fuzz-network-parser/sysctl
index 2452fb7..01b45a2 100644
--- a/test/fuzz/fuzz-network-parser/sysctl
+++ b/test/fuzz/fuzz-network-parser/sysctl
@@ -7,4 +7,5 @@ IPv6PrivacyExtensions=true
 IPv6DuplicateAddressDetection=3
 IPv6HopLimit=5
 IPv4ProxyARP=true
+IPv4ProxyARPPrivateVLAN=true
 IPv6ProxyNDP=true
diff --git a/test/fuzz/fuzz-unit-file/binfmt_misc.automount b/test/fuzz/fuzz-unit-file/binfmt_misc.automount
index 8d761b0..d9fd0f0 100644
--- a/test/fuzz/fuzz-unit-file/binfmt_misc.automount
+++ b/test/fuzz/fuzz-unit-file/binfmt_misc.automount
@@ -11,7 +11,7 @@ automount
 [Unit]
 Description=Arbitrary Executable File Formats File System Automount Point
 Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+Documentation=https://systemd.io/API_FILE_SYSTEMS
 DefaultDependencies=no
 Before=sysinit.target
 ConditionPathExists=/proc/sys/fs/binfmt_misc/
diff --git a/test/fuzz/fuzz-unit-file/directives-all.service b/test/fuzz/fuzz-unit-file/directives-all.service
index 4bdc48a..dbd56ec 100644
--- a/test/fuzz/fuzz-unit-file/directives-all.service
+++ b/test/fuzz/fuzz-unit-file/directives-all.service
@@ -185,6 +185,7 @@ PAMName=
 PIDFile=
 PartOf=
 PassCredentials=
+PassFileDescriptorsToExec=
 PassSecurity=
 PassPacketInfo=
 PathChanged=
@@ -276,6 +277,7 @@ User=
 WakeSystem=
 WantedBy=
 Wants=
+WantsMountsFor=
 WatchdogSec=
 What=
 Where=
@@ -471,6 +473,7 @@ IPForward=
 IPMasquerade=
 IPv4LLRoute=
 IPv4ProxyARP=
+IPv4ProxyARPPrivateVLAN=
 IPv6AcceptRA=
 IPv6DuplicateAddressDetection=
 IPv6FlowLabel=
@@ -494,6 +497,7 @@ KernelVersion=
 Key=
 Kind=
 L2MissNotification=
+L3MasterDevice=
 L3MissNotification=
 LACPTransmitRate=
 LLDP=
@@ -702,6 +706,7 @@ CPUAffinity=
 CapabilityBoundingSet=
 CrashChangeVT=
 CrashReboot=
+CrashAction=
 CrashShell=
 CtrlAltDelBurstAction=
 DefaultBlockIOAccounting=
@@ -862,6 +867,7 @@ MaxLevelKMsg=
 MaxLevelStore=
 MaxLevelSyslog=
 MaxLevelWall=
+MaxLevelSocket=
 MaxRetentionSec=
 MaxUse=
 MemoryDenyWriteExecute=
diff --git a/test/fuzz/fuzz-unit-file/syslog.socket b/test/fuzz/fuzz-unit-file/syslog.socket
index 969ee42..bb046a5 100644
--- a/test/fuzz/fuzz-unit-file/syslog.socket
+++ b/test/fuzz/fuzz-unit-file/syslog.socket
@@ -11,7 +11,7 @@ socket
 [Unit]
 Description=Syslog Socket
 Documentation=man:systemd.special(7)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/syslog
+Documentation=https://systemd.io/SYSLOG
 DefaultDependencies=no
 Before=sockets.target
 
@@ -45,7 +45,7 @@ ReceiveBuffer=8M
 # [Install]
 # Alias=syslog.service
 #
-# See https://www.freedesktop.org/wiki/Software/systemd/syslog for details.
+# See https://systemd.io/SYSLOG for details.
 
 [Socket]
 ListenStream=1.2.3.4:1234
diff --git a/test/fuzz/fuzz-unit-file/systemd-resolved.service b/test/fuzz/fuzz-unit-file/systemd-resolved.service
index 49d272b..1b7cc15 100644
--- a/test/fuzz/fuzz-unit-file/systemd-resolved.service
+++ b/test/fuzz/fuzz-unit-file/systemd-resolved.service
@@ -12,8 +12,8 @@ service
 Description=Network Name Resolution
 Documentation=man:systemd-resolved.service(8)
 Documentation=man:org.freedesktop.resolve1(5)
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-network-configuration-managers
-Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-resolver-clients
+Documentation=https://systemd.io/WRITING_NETWORK_CONFIGURATION_MANAGERS
+Documentation=https://systemd.io/WRITING_RESOLVER_CLIENTS
 DefaultDependencies=no
 After=systemd-sysusers.service systemd-networkd.service
 Before=network.target nss-lookup.target shutdown.target