merge in v258-stable

Author: tamaralyne

.clang-format

@@ -107,6 +107,27 @@ ForEachMacros:
   - STRV_FOREACH
   - STRV_FOREACH_BACKWARDS
   - STRV_FOREACH_PAIR
+IncludeBlocks: Regroup
+IncludeCategories:
+  # "vmlinux.h" must always be included first in BPF programs before anything else.
+  - Regex:           '^"vmlinux.h"$'
+    Priority:        1
+  # <bpf/*.h> headers must be included after <linux/types.h> by design.
+  - Regex:           '^<bpf/.*\.h>$'
+    Priority:        2
+    SortPriority:    3
+  - Regex:           '^<.*\.h>$'
+    Priority:        2
+  - Regex:           '^"_?sd-.*\.h"$'
+    Priority:        4
+  - Regex:           '^"libudev\.h"$'
+    Priority:        4
+  - Regex:           '^"audit_type-to-name.h"$'
+    Priority:        6
+  - Regex:           '.*'
+    Priority:        5
+# Make sure the "main header" is not treated any differently than other headers.
+IncludeIsMainRegex: '^$'
 IndentPPDirectives: AfterHash
 IndentWidth: 8
 IndentWrappedFunctionNames: true

.clang-tidy

@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+---
+Checks: '
+    -*,
+    misc-header-include-cycle,
+    readability-duplicate-include,
+    bugprone-argument-comment
+'
+WarningsAsErrors: '*'
+HeaderFileExtensions:
+  - h
+ImplementationFileExtensions:
+  - c
+...

.clangd

@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+Diagnostics:
+  UnusedIncludes: Strict

.editorconfig

@@ -24,7 +24,7 @@ indent_style = space
 indent_size = 8
 max_line_length = 109
 
-[*.sh,mkosi.build,mkosi.prepare,mkosi.postinst]
+[{*.sh,mkosi.build,mkosi.prepare,mkosi.postinst,shell-completion/zsh/_*}]
 indent_style = space
 indent_size = 4
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -15,10 +15,10 @@ body:
         Do not submit bug reports about anything but the two most recently released *major* systemd versions upstream!
         If there have been multiple stable releases for that major version, please consider updating to a recent one before reporting an issue.
         When using a distro package, please make sure that the version reported is meaningful for upstream.
-        If a distro build is used, please just paste the package version, e.g. `systemd-254.7-1.fc39.x86_64`.
+        If a distro build is used, please just paste the package version, e.g. `systemd-257.3-7.fc42.x86_64`.
         See https://github.com/systemd/systemd-stable/tags for the list of most recent releases.
         For older version please use distribution trackers (see https://systemd.io/CONTRIBUTING#filing-issues).
-      placeholder: '255'
+      placeholder: '257.x'
     validations:
       required: true
 
@@ -27,7 +27,7 @@ body:
     attributes:
       label: Used distribution
       description: Used distribution and its version
-      placeholder: Fedora 39
+      placeholder: Fedora 42
     validations:
       required: false
 
@@ -37,7 +37,7 @@ body:
       label: Linux kernel version used
       description: |
         Please use `uname -r` to get linux kernel version.
-      placeholder: kernel-6.6.8-200.fc39.x86_64
+      placeholder: 6.14.0-0.rc3.29.fc42.x86_64
     validations:
       required: false
 

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -121,6 +121,6 @@ body:
     attributes:
       label: The systemd version you checked that didn't have the feature you are asking for
       description: If this is not the most recently released upstream version, then please check first if it has that feature already.
-      placeholder: '255'
+      placeholder: '257.x'
     validations:
       required: false

.github/advanced-issue-labeler.yml

@@ -31,7 +31,7 @@ policy:
           - name: dissect
             keys: ['systemd-dissect']
 
-          - name: env
+          - name: env-generator
             keys: ['systemd-env-generator']
 
           - name: fsck

.github/codeql-queries/PotentiallyDangerousFunction.ql

@@ -49,6 +49,9 @@ predicate potentiallyDangerousFunction(Function f, string message) {
   ) or (
     f.getQualifiedName() = "dirname" and
     message = "Call dirname() is icky. Use path_extract_directory() instead."
+  ) or (
+    f.getQualifiedName() = "basename" and
+    message = "Call basename() is icky. Use path_extract_filename() instead."
   )
 }