Skip to content

Commit e015790

Browse files
committed
sys-apps/systemd: Sync with Gentoo
It's from Gentoo commit fb9c9753a1649cf9c5310fec774b3b38a76b4253. Signed-off-by: Krzesimir Nowak <[email protected]>
1 parent 26a8afc commit e015790

15 files changed

+1343
-8
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
DIST systemd-257.7.tar.gz 16327096 BLAKE2B 59a28ce9b355b98f718f26489400640f3d732bbf73c00ea0571302dfc6dfb3585bf07ec56af06d74c5aa033b06a6220c3c839af6dba5ab7f8bde1aef4b58f0f6 SHA512 fdc7c0153432b261ad8018c869dc714ce1d6d2a8428bdec46f7c5f120b196d3a553a375ae433f0c166c57b6e8b3c56549f585349b7b6ff83c2a86a32982d8411
1+
DIST systemd-257.9.tar.gz 16401765 BLAKE2B c3ad528d37b89de8f82548807e950b59aab43f875a533ad983169eb539594e5e8230b6b562caee5297dcec4572e27df0e53ebee04f79e85f429f47862031592e SHA512 23b3d2764e0f990d8373068ccb41177793413bc193f7bd34e38b03d6fc3cd32d07c86e9dcbf07e32904075bb5eeca208f65beab04d628ac0e0b81ba87a975c1b
2+
DIST systemd-258.tar.gz 16976853 BLAKE2B c63bc09bff11ba4cf6e87bef689250a6b354bf8f5bfb5af6d2a173fa1e1838aa457a8a7db66f7aad20dae25b7a0defddcb052d53f18a688a2dd6d5f323d4692a SHA512 c488354da1c170ad02e10926f561d1985c3c3393fec878562f295ef764fdf3a1b2877c3b2549253f19bf23e357be6e443a50b937f60f4677f286d3402d611b85

sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/99-default.preset

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 7b9ee7375ca9a1521ff36dd9ceb8a26e59572a6e Mon Sep 17 00:00:00 2001
2+
From: Mike Gilbert <[email protected]>
3+
Date: Wed, 17 Sep 2025 15:40:57 -0400
4+
Subject: [PATCH] journald: do not change the kernel audit setting by default
5+
6+
Bug: https://bugs.gentoo.org/736910
7+
---
8+
man/journald.conf.xml | 2 +-
9+
src/journal/journald-config.c | 2 +-
10+
src/journal/journald.conf | 2 +-
11+
3 files changed, 3 insertions(+), 3 deletions(-)
12+
13+
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
14+
index 1a68ba8698..a9a77a51d1 100644
15+
--- a/man/journald.conf.xml
16+
+++ b/man/journald.conf.xml
17+
@@ -482,7 +482,7 @@
18+
kernel auditing on start-up. If disabled it will turn it off. If unset it will neither enable nor
19+
disable it, leaving the previous state unchanged. This means if another tool turns on auditing even
20+
if <command>systemd-journald</command> left it off, it will still collect the generated
21+
- messages. Defaults to on in the default journal namespace, and unset otherwise.</para>
22+
+ messages.</para>
23+
24+
<para>Note that this option does not control whether <command>systemd-journald</command> collects
25+
generated audit records, it just controls whether it tells the kernel to generate them. If you need
26+
diff --git a/src/journal/journald-config.c b/src/journal/journald-config.c
27+
index dd2e29e296..4160fa2ab9 100644
28+
--- a/src/journal/journald-config.c
29+
+++ b/src/journal/journald-config.c
30+
@@ -122,7 +122,7 @@ void manager_merge_configs(Manager *m) {
31+
MERGE_NON_NEGATIVE(read_kmsg, !m->namespace);
32+
/* By default, kernel auditing is enabled by the main namespace instance, and not controlled by
33+
* non-default namespace instances. */
34+
- MERGE_NON_NEGATIVE(set_audit, m->namespace ? -1 : true);
35+
+ MERGE_NON_NEGATIVE(set_audit, -1);
36+
MERGE_NON_ZERO(sync_interval_usec, DEFAULT_SYNC_INTERVAL_USEC);
37+
38+
/* TODO: also merge them when comdline or credentials support to configure them. */
39+
diff --git a/src/journal/journald.conf b/src/journal/journald.conf
40+
index 9a12ca7657..e42efbcf84 100644
41+
--- a/src/journal/journald.conf
42+
+++ b/src/journal/journald.conf
43+
@@ -47,4 +47,4 @@
44+
#MaxLevelSocket=debug
45+
#LineMax=48K
46+
#ReadKMsg=yes
47+
-#Audit=yes
48+
+#Audit=
49+
--
50+
2.51.0
51+
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Sample nss configuration for systemd
2+
3+
# systemd-specific modules
4+
# See the manual pages fore further information.
5+
# nss-myhostname - host resolution for the local hostname
6+
# nss-mymachines - host, user, group resolution for containers
7+
# nss-resolve - host resolution using resolved
8+
# nss-systemd - dynamic user/group resolution (DynamicUser in unit files)
9+
10+
passwd: files mymachines systemd
11+
shadow: files
12+
group: files mymachines systemd
13+
gshadow: files
14+
15+
hosts: files mymachines resolve [!UNAVAIL=return] dns myhostname
16+
networks: files
17+
18+
services: db files
19+
protocols: db files
20+
rpc: db files
21+
ethers: db files
22+
netmasks: files
23+
netgroup: files
24+
bootparams: files
25+
26+
automount: files
27+
aliases: files
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
https://bugs.gentoo.org/963528
2+
3+
From 1403faeb152e24ef74230891cc6bf1875292324f Mon Sep 17 00:00:00 2001
4+
From: Daan De Meyer <[email protected]>
5+
Date: Fri, 19 Sep 2025 11:29:36 +0200
6+
Subject: [PATCH] tree-wide: Fix two curl warnings
7+
8+
---
9+
src/import/pull-job.c | 2 +-
10+
src/journal-remote/journal-upload.c | 2 +-
11+
2 files changed, 2 insertions(+), 2 deletions(-)
12+
13+
diff --git a/src/import/pull-job.c b/src/import/pull-job.c
14+
index a0b0ef54061b9..b457c39ed1800 100644
15+
--- a/src/import/pull-job.c
16+
+++ b/src/import/pull-job.c
17+
@@ -759,7 +759,7 @@ int pull_job_begin(PullJob *j) {
18+
if (curl_easy_setopt(j->curl, CURLOPT_XFERINFODATA, j) != CURLE_OK)
19+
return -EIO;
20+
21+
- if (curl_easy_setopt(j->curl, CURLOPT_NOPROGRESS, 0) != CURLE_OK)
22+
+ if (curl_easy_setopt(j->curl, CURLOPT_NOPROGRESS, 0L) != CURLE_OK)
23+
return -EIO;
24+
25+
r = curl_glue_add(j->glue, j->curl);
26+
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
27+
index d669d27274f6a..05f0dad038449 100644
28+
--- a/src/journal-remote/journal-upload.c
29+
+++ b/src/journal-remote/journal-upload.c
30+
@@ -308,7 +308,7 @@ int start_upload(Uploader *u,
31+
}
32+
33+
if (STRPTR_IN_SET(arg_trust, "-", "all"))
34+
- easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0,
35+
+ easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L,
36+
LOG_ERR, return -EUCLEAN);
37+
else if (arg_trust || startswith(u->url, "https://"))
38+
easy_setopt(curl, CURLOPT_CAINFO, arg_trust ?: TRUST_FILE,
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
https://bugs.gentoo.org/963560
2+
https://github.com/systemd/systemd/pull/39119
3+
4+
From 6cae201ca1b0bf4a136bdf1002b4bc7983f0ceee Mon Sep 17 00:00:00 2001
5+
From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= <[email protected]>
6+
Date: Thu, 25 Sep 2025 22:52:18 +0300
7+
Subject: [PATCH] resolve: undo change to return code of next_search_domain()
8+
(#39119)
9+
10+
This caused resolved to only consider the 1st search domain of every
11+
interface and ignore the rest.
12+
13+
Fixes a regression caused by 81ae2237c1792943a1ec712ae2e630bcc592175b (v258).
14+
Fixes #39118.
15+
---
16+
src/resolve/resolved-dns-query.c | 2 +-
17+
1 file changed, 1 insertion(+), 1 deletion(-)
18+
19+
diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c
20+
index 8ad7bff398d85..4e11ad87bf545 100644
21+
--- a/src/resolve/resolved-dns-query.c
22+
+++ b/src/resolve/resolved-dns-query.c
23+
@@ -147,7 +147,7 @@ static int dns_query_candidate_next_search_domain(DnsQueryCandidate *c) {
24+
dns_search_domain_unref(c->search_domain);
25+
c->search_domain = dns_search_domain_ref(next);
26+
27+
- return 0;
28+
+ return 1;
29+
}
30+
31+
static int dns_query_candidate_add_transaction(
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
https://bugs.gentoo.org/963481
2+
https://github.com/systemd/systemd/pull/39149
3+
4+
From 3df39cedda01dec35e49f1ab5632cf9f325e5320 Mon Sep 17 00:00:00 2001
5+
From: Xarblu <[email protected]>
6+
Date: Fri, 26 Sep 2025 21:40:50 +0200
7+
Subject: [PATCH] shared: add missing alloc-util.h include
8+
9+
Needed for _cleanup_free_
10+
---
11+
src/shared/password-quality-util-passwdqc.c | 1 +
12+
1 file changed, 1 insertion(+)
13+
14+
diff --git a/src/shared/password-quality-util-passwdqc.c b/src/shared/password-quality-util-passwdqc.c
15+
index d74e0fb7f2370..844068a4d64a3 100644
16+
--- a/src/shared/password-quality-util-passwdqc.c
17+
+++ b/src/shared/password-quality-util-passwdqc.c
18+
@@ -1,5 +1,6 @@
19+
/* SPDX-License-Identifier: LGPL-2.1-or-later */
20+
21+
+#include "alloc-util.h"
22+
#include "dlfcn-util.h"
23+
#include "errno-util.h"
24+
#include "log.h"

sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/systemd-flatcar.conf

Lines changed: 0 additions & 2 deletions
This file was deleted.

sdk_container/src/third_party/portage-stable/sys-apps/systemd/files/systemd-resolv.conf

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
account include system-auth
2+
3+
session required pam_selinux.so close
4+
session required pam_selinux.so nottys open
5+
session required pam_loginuid.so
6+
session include system-auth
7+
session optional pam_systemd.so

0 commit comments

Comments
 (0)