diff options
| author | Dan McGregor <daniel.mcgregor@vecima.com> | 2025-08-13 10:46:50 -0600 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-08-22 07:07:19 -0700 |
| commit | e1b698abcccc4bcad34f693de9affb176738a371 (patch) | |
| tree | 484d91c83fff4a1bf35a61261358e23a31d80a40 | |
| parent | 39df9602b1c0339519be81d1cba9a4a25379309a (diff) | |
| download | poky-e1b698abcccc4bcad34f693de9affb176738a371.tar.gz | |
systemd: Fix manpage build after CVE-2025-4598
The previous fix missed another cherry-pick that fixed building
manpages after the coredump patch. The version-info.xml file doesn't
exist in 250. It was introduced later, so remove the reference to
it.
(From OE-Core rev: 0a383ef579ffe5f5c4ef2c78040540f1332e4ea6)
Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-core/systemd/systemd/CVE-2025-4598-0003.patch | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-core/systemd/systemd/CVE-2025-4598-0003.patch b/meta/recipes-core/systemd/systemd/CVE-2025-4598-0003.patch index 737121af12..a3337b9108 100644 --- a/meta/recipes-core/systemd/systemd/CVE-2025-4598-0003.patch +++ b/meta/recipes-core/systemd/systemd/CVE-2025-4598-0003.patch | |||
| @@ -33,16 +33,16 @@ Upstream-Status: Backport [https://github.com/systemd/systemd-stable/commit/2eb4 | |||
| 33 | 33 | ||
| 34 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 34 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 35 | --- | 35 | --- |
| 36 | man/systemd-coredump.xml | 12 ++++++++++++ | 36 | man/systemd-coredump.xml | 11 +++++++++++ |
| 37 | src/coredump/coredump.c | 21 ++++++++++++++++++--- | 37 | src/coredump/coredump.c | 21 ++++++++++++++++++--- |
| 38 | sysctl.d/50-coredump.conf.in | 2 +- | 38 | sysctl.d/50-coredump.conf.in | 2 +- |
| 39 | 3 files changed, 31 insertions(+), 4 deletions(-) | 39 | 3 files changed, 30 insertions(+), 4 deletions(-) |
| 40 | 40 | ||
| 41 | diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml | 41 | diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml |
| 42 | index cb9f47745b..ba7cad12bc 100644 | 42 | index cb9f47745b..ba7cad12bc 100644 |
| 43 | --- a/man/systemd-coredump.xml | 43 | --- a/man/systemd-coredump.xml |
| 44 | +++ b/man/systemd-coredump.xml | 44 | +++ b/man/systemd-coredump.xml |
| 45 | @@ -259,6 +259,18 @@ COREDUMP_FILENAME=/var/lib/systemd/coredump/core.Web….552351.….zst | 45 | @@ -259,6 +259,17 @@ COREDUMP_FILENAME=/var/lib/systemd/coredump/core.Web….552351.….zst |
| 46 | </listitem> | 46 | </listitem> |
| 47 | </varlistentry> | 47 | </varlistentry> |
| 48 | 48 | ||
| @@ -54,7 +54,6 @@ index cb9f47745b..ba7cad12bc 100644 | |||
| 54 | + project='man-pages'><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>. | 54 | + project='man-pages'><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>. |
| 55 | + </para> | 55 | + </para> |
| 56 | + | 56 | + |
| 57 | + <xi:include href="version-info.xml" xpointer="v258"/> | ||
| 58 | + </listitem> | 57 | + </listitem> |
| 59 | + </varlistentry> | 58 | + </varlistentry> |
| 60 | + | 59 | + |
