Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
systemd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
staging
src-rhel
rpms
systemd
Commits
adf69eb3
Commit
adf69eb3
authored
6 months ago
by
importbot
Browse files
Options
Downloads
Patches
Plain Diff
import systemd-252-32.el9_4.7
parent
466cd837
Branches
r9-beta-stream-3.8
Tags
imports/r9-beta-stream-3.8/apache-commons-io-2.11.0-2.module+el9.2.0+18047+4ad4bba4
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.systemd.checksum
+1
-1
1 addition, 1 deletion
.systemd.checksum
SOURCES/0732-generator-uninline-generator_open_unit_file-and-gene.patch
+52
-0
52 additions, 0 deletions
...enerator-uninline-generator_open_unit_file-and-gene.patch
SPECS/systemd.spec
+5
-1
5 additions, 1 deletion
SPECS/systemd.spec
with
58 additions
and
2 deletions
.systemd.checksum
+
1
−
1
View file @
adf69eb3
60896e38f575e84cfe4d9cc713e94a4cd86196638cf9693a2bf91986e5994e99
06d6012342057d8f66d2c0f56e8bb1150fbf856a0f4f6d41516a9f683e062302
This diff is collapsed.
Click to expand it.
SOURCES/0732-generator-uninline-generator_open_unit_file-and-gene.patch
0 → 100644
+
52
−
0
View file @
adf69eb3
From 657e89e5893fac4711fc9984bdb4861a66f84c5d Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Tue, 16 Jul 2024 18:19:45 +0200
Subject: [PATCH] generator: "uninline" generator_open_unit_file and
generator_add_symlink
Inlining of these functions changed ABI of libsystemd-shared which
causes issue on update when generators packaged in systemd-udev
subpackage fail to execute because of ABI change. systemd and the
library are already updated while systemd-udev subpackage is not and
hence old generators can't be started when systemd is reexecuting
due to internal library incompatibility.
rhel-only: bugfix
Resolves: RHEL-49495
---
src/shared/generator.c | 4 ++++
src/shared/generator.h | 5 +----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/shared/generator.c b/src/shared/generator.c
index 284e5fc580..7f5ceb7128 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -109,6 +109,10 @@
int generator_add_symlink_full(
return 0;
}
+int generator_add_symlink(const char *dir, const char *dst, const char *dep_type, const char *src) {
+ return generator_add_symlink_full(dir, dst, dep_type, src, NULL);
+}
+
static int generator_add_ordering(
const char *dir,
const char *src,
diff --git a/src/shared/generator.h b/src/shared/generator.h
index 111900fd45..61bc79f0f7 100644
--- a/src/shared/generator.h
+++ b/src/shared/generator.h
@@ -13,10 +13,7 @@
int generator_open_unit_file(
FILE **file);
int generator_add_symlink_full(const char *dir, const char *dst, const char *dep_type, const char *src, const char *instance);
-
-static inline int generator_add_symlink(const char *dir, const char *dst, const char *dep_type, const char *src) {
- return generator_add_symlink_full(dir, dst, dep_type, src, NULL);
-}
+int generator_add_symlink(const char *dir, const char *dst, const char *dep_type, const char *src);
int generator_write_fsck_deps(
FILE *f,
This diff is collapsed.
Click to expand it.
SPECS/systemd.spec
+
5
−
1
View file @
adf69eb3
...
...
@@ -25,7 +25,7 @@
Name: systemd
Url: https://systemd.io
Version: 252
Release: 32%{?dist}.
6
Release: 32%{?dist}.
7
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: System and Service Manager
...
...
@@ -820,6 +820,7 @@ Patch0728: 0728-kernel-install-fix-uki-copy-deinstall.patch
Patch0729: 0729-cryptsetup-do-not-assert-when-unsealing-token-withou.patch
Patch0730: 0730-cryptsetup-check-the-existence-of-salt-by-salt_size-.patch
Patch0731: 0731-bootspec-fix-null-dereference-read.patch
Patch0732: 0732-generator-uninline-generator_open_unit_file-and-gene.patch
# Downstream-only patches (9000–9999)
...
...
@@ -1699,6 +1700,9 @@ systemd-hwdb update &>/dev/null || :
%{_prefix}/lib/dracut/modules.d/70rhel-net-naming-sysattrs/*
%changelog
* Thu Jul 18 2024 systemd maintenance team <systemd-maint@redhat.com> - 252-32.7
- generator: "uninline" generator_open_unit_file and generator_add_symlink (RHEL-49495)
* Wed Jun 12 2024 systemd maintenance team <systemd-maint@redhat.com> - 252-32.6
- cryptsetup: do not assert when unsealing token without salt (RHEL-40119)
- cryptsetup: check the existence of salt by salt_size > 0 (RHEL-40119)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment