.github/workflows/coverage.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@5598b7f5793b6f63db5afaa39504a763fbaeb5cb
+      - uses: systemd/mkosi@655baf24474a6f0732ec1b82a71c2f6fe4eeeb49
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location

.github/workflows/linter.yml

@@ -38,7 +38,7 @@ jobs:
           LINTER_RULES_PATH: .github/linters
           GITHUB_ACTIONS_CONFIG_FILE: actionlint.yml
 
-      - uses: systemd/mkosi@5598b7f5793b6f63db5afaa39504a763fbaeb5cb
+      - uses: systemd/mkosi@655baf24474a6f0732ec1b82a71c2f6fe4eeeb49
 
       - name: Check that tabs are not used in Python code
         run: sh -c '! git grep -P "\\t" -- src/core/generate-bpf-delegate-configs.py src/boot/generate-hwids-section.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py'

.github/workflows/mkosi.yml

@@ -167,7 +167,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@5598b7f5793b6f63db5afaa39504a763fbaeb5cb
+      - uses: systemd/mkosi@655baf24474a6f0732ec1b82a71c2f6fe4eeeb49
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location

mkosi/mkosi.conf

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Config]
-MinimumVersion=commit:5598b7f5793b6f63db5afaa39504a763fbaeb5cb
+MinimumVersion=commit:655baf24474a6f0732ec1b82a71c2f6fe4eeeb49
 Dependencies=
         exitrd
         initrd

mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf

@@ -5,5 +5,5 @@ Environment=
         GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
         GIT_SUBDIR=debian
         GIT_BRANCH=debian/master
-        GIT_COMMIT=8ba719208ff28f36bc240328725eb10008838c39
+        GIT_COMMIT=61144ff7a6747bd3cc6340fbac38a8e15e9a239b
         PKG_SUBDIR=debian

src/resolve/resolved-dns-transaction.c

@@ -3595,24 +3595,27 @@ int dns_transaction_validate_dnssec(DnsTransaction *t) {
                   t->id,
                   dns_resource_key_to_string(dns_transaction_key(t), key_str, sizeof key_str));
 
-        /* First, see if this response contains any revoked trust anchors we care about. */
+        /* First, see if this response contains any revoked trust
+         * anchors we care about */
         r = dns_transaction_check_revoked_trust_anchors(t);
         if (r < 0)
                 return r;
 
-        /* Second, copy all RRs we acquired successfully from auxiliary RRs over. */
+        /* Third, copy all RRs we acquired successfully from auxiliary RRs over. */
         r = dns_transaction_copy_validated(t);
         if (r < 0)
                 return r;
 
-        /* Third, see if there are DNSKEYs we already know a validated DS for. */
+        /* Second, see if there are DNSKEYs we already know a
+         * validated DS for. */
         r = dns_transaction_validate_dnskey_by_ds(t);
         if (r < 0)
                 return r;
 
-        /* Fourth, remove all DNSKEY and DS RRs again that our trust anchor says are revoked. After all we
+        /* Fourth, remove all DNSKEY and DS RRs again that our trust
-         * might have marked some keys revoked above, but they might still be lingering in our validated_keys
+         * anchor says are revoked. After all we might have marked
-         * list. */
+         * some keys revoked above, but they might still be lingering
+         * in our validated_keys list. */
         r = dns_transaction_invalidate_revoked_keys(t);
         if (r < 0)
                 return r;

src/resolve/test-dns-query.c

@@ -707,7 +707,7 @@ TEST(dns_query_string_request_address) {
  * particular:
  *
  * - The very first thing it does is try to respond to the query by reading the system /etc/hosts file, which
- *   may be symlinked to a systemd resource. Ideally we could test this without accessing global files.
+ *   may be symlinked to a SystemD resource. Ideally we could test this without accessing global files.
  *
  * - dns_scope_get_dns_server() calls manager_get_dns_server(), which tries to read /etc/resolv.conf.
  *