proxmox-mirrors/systemd
1
0
Fork 0
mirror of https://git.proxmox.com/git/systemd synced 2026-02-01 15:39:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rebase patches

Browse Source
This commit is contained in:
Michael Biebl 2022-10-14 15:45:55 +02:00
parent 44833dbdf1
commit 172d8bc9e6
13 changed files with 160 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/patches/Move-homectl-and-userdbctl-to-bindir.patch vendored
View File

@ -10,10 +10,10 @@ Those binaries aren't needed during early boot.
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index e2cf000..1d8b5dc 100644
index 760ee27..8c7f0be 100644
--- a/meson.build
+++ b/meson.build
@@ -2579,8 +2579,7 @@ if conf.get('ENABLE_USERDB') == 1
@@ -2589,8 +2589,7 @@ if conf.get('ENABLE_USERDB') == 1
link_with : [libshared],
dependencies : [threads],
install_rpath : rootlibexecdir,
@ -23,7 +23,7 @@ index e2cf000..1d8b5dc 100644
endif
if conf.get('ENABLE_HOMED') == 1
@@ -2623,8 +2622,7 @@ if conf.get('ENABLE_HOMED') == 1
@@ -2633,8 +2632,7 @@ if conf.get('ENABLE_HOMED') == 1
libp11kit,
libdl],
install_rpath : rootlibexecdir,

37
debian/patches/ata_id-Fixed-getting-Response-Code-from-SCSI-Sense-Data-2.patch vendored
View File

@ -1,37 +0,0 @@
From: Aleksey Vasenev <margtu-fivt@ya.ru>
Date: Wed, 5 Oct 2022 22:33:53 +0300
Subject: ata_id: Fixed getting Response Code from SCSI Sense Data (#24921)
The Response Code is contained in the first byte of the SCSI Sense Data.
Bit number 7 is reserved or has a different meaning for some Response Codes
and is set to 1 for some drives.
(cherry picked from commit 2be1ae54badf7a3a12908a8094ebaba8f91887ca)
---
src/udev/ata_id/ata_id.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index 1fc27f4..cbeb2db 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -162,8 +162,8 @@ static int disk_identify_command(
return ret;
}
- if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c) &&
- !(sense[0] == 0x70 && sense[12] == 0x00 && sense[13] == 0x1d)) {
+ if (!((sense[0] & 0x7f) == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c) &&
+ !((sense[0] & 0x7f) == 0x70 && sense[12] == 0x00 && sense[13] == 0x1d)) {
errno = EIO;
return -1;
}
@@ -240,7 +240,7 @@ static int disk_identify_packet_device_command(
return ret;
}
- if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) {
+ if (!((sense[0] & 0x7f) == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) {
errno = EIO;
return -1;
}

2
debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch vendored
View File

@ -16,7 +16,7 @@ Closes: #981407
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 11991ec..76893db 100644
index 8a14cd5..4d0add9 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -522,6 +522,7 @@ static int patch_var_run(

4
debian/patches/debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch vendored
View File

@ -14,10 +14,10 @@ Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1141137
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
index b0756bc..90ec261 100644
index 1b0c5fc..bdca10e 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -4606,16 +4606,7 @@ int unit_kill_context(
@@ -4609,16 +4609,7 @@ int unit_kill_context(
} else if (r > 0) {

4
debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch vendored
View File

@ -239,10 +239,10 @@ index 0000000..b7ad58d
+
+</refentry>
diff --git a/meson.build b/meson.build
index 2c5002c..5a27c57 100644
index 98f00f4..c63fe25 100644
--- a/meson.build
+++ b/meson.build
@@ -3221,6 +3221,15 @@ executable(
@@ -3231,6 +3231,15 @@ executable(
install : true,
install_dir : rootlibexecdir)

6
debian/patches/debian/udev-drop-SystemCallArchitectures-native-from-systemd-ude.patch vendored
View File

@ -12,12 +12,12 @@ Closes: #869719
1 file changed, 1 deletion(-)
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
index 3579de4..1e51b94 100644
index e9dbe85..22ca8b9 100644
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -35,7 +35,6 @@ RestrictRealtime=yes
RestrictSUIDSGID=yes
@@ -37,7 +37,6 @@ RestrictSUIDSGID=yes
SystemCallFilter=@system-service @module @raw-io bpf
SystemCallFilter=~@clock
SystemCallErrorNumber=EPERM
-SystemCallArchitectures=native
LockPersonality=yes

28
debian/patches/logind-do-not-emit-beep-in-wall-messages.patch vendored
View File

@ -1,28 +0,0 @@
From: =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 11 Oct 2022 13:59:45 +0200
Subject: logind: do not emit beep in wall messages
Those may go via the PC speaker, which is annoying and unexpected.
Most people have it off, so this doesn't work reliably anyway, so we can
disable it without much loss.
Fixes #23520.
(cherry picked from commit ef3458cd5dc8d5b400c9abbea92986c43aef18cc)
---
src/shared/utmp-wtmp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index c7e89ba..d2c8473 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -360,7 +360,7 @@ int utmp_wall(
}
if (asprintf(&text,
- "\a\r\n"
+ "\r\n"
"Broadcast message from %s@%s%s%s (%s):\r\n\r\n"
"%s\r\n\r\n",
un ?: username, hn,

36
debian/patches/logind-fix-getting-property-OnExternalPower-via-D-Bus.patch vendored
View File

@ -1,36 +0,0 @@
From: Michael Biebl <biebl@debian.org>
Date: Wed, 12 Oct 2022 11:07:57 +0200
Subject: logind: fix getting property OnExternalPower via D-Bus
The BUS_DEFINE_PROPERTY_GET_GLOBAL macro requires a value as third
argument, so we need to call manager_is_on_external_power(). Otherwise
the function pointer is interpreted as a boolean and always returns
true:
```
$ busctl get-property org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager OnExternalPower
b true
$ /lib/systemd/systemd-ac-power --verbose
no
```
Thanks: Helmut Grohne <helmut@subdivi.de>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021644
(cherry picked from commit 63168cb517a556b2f4f175b365f5a4b4c7e85150)
---
src/login/logind-dbus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 296e0e3..8fd46e1 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -377,7 +377,7 @@ static int property_get_scheduled_shutdown(
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_handle_action, handle_action, HandleAction);
static BUS_DEFINE_PROPERTY_GET(property_get_docked, "b", Manager, manager_is_docked_or_external_displays);
static BUS_DEFINE_PROPERTY_GET(property_get_lid_closed, "b", Manager, manager_is_lid_closed);
-static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_on_external_power, "b", manager_is_on_external_power);
+static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_on_external_power, "b", manager_is_on_external_power());
static BUS_DEFINE_PROPERTY_GET_GLOBAL(property_get_compat_user_tasks_max, "t", CGROUP_LIMIT_MAX);
static BUS_DEFINE_PROPERTY_GET_REF(property_get_hashmap_size, "t", Hashmap *, (uint64_t) hashmap_size);

2
debian/patches/logind-rework-wall-message-about-pending-shutdown-halt-re.patch vendored
View File

@ -63,7 +63,7 @@ index c891787..9a01af1 100644
HandleAction handle_action_from_string(const char *s) _pure_;
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index c40d8de..296e0e3 100644
index 6b77a04..8fd46e1 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2355,7 +2355,7 @@ static int method_cancel_scheduled_shutdown(sd_bus_message *message, void *userd

294
debian/patches/meson-install-libsystemd-shared-into-rootpkglibdir.patch vendored
View File

File diff suppressed because it is too large Load Diff

4
debian/patches/series vendored
View File

@ -2,13 +2,9 @@ Do-not-require-a-valid-version-when-parsing-sd-boot-loade.patch
Move-homectl-and-userdbctl-to-bindir.patch
meson-install-libsystemd-shared-into-rootpkglibdir.patch
shellcheck-clean-kernel-install-again.patch
udev-drop-assertion-which-is-always-false.patch
udev-add-one-more-assertion.patch
ata_id-Fixed-getting-Response-Code-from-SCSI-Sense-Data-2.patch
logind-do-not-emit-beep-in-wall-messages.patch
logind-rework-wall-message-about-pending-shutdown-halt-re.patch
logind-remember-our-idle-state-and-use-it-to-detect-idle-.patch
logind-fix-getting-property-OnExternalPower-via-D-Bus.patch
debian/Use-Debian-specific-config-files.patch
debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch
debian/Make-run-lock-tmpfs-an-API-fs.patch

2
debian/patches/shellcheck-clean-kernel-install-again.patch vendored
View File

@ -8,7 +8,7 @@ Subject: shellcheck-clean kernel-install again
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in
index cf1b81b..c6965ee 100755
index 9567be5..f7a984a 100755
--- a/src/kernel-install/kernel-install.in
+++ b/src/kernel-install/kernel-install.in
@@ -115,6 +115,7 @@ fi

25
debian/patches/udev-drop-assertion-which-is-always-false.patch vendored
View File

@ -1,25 +0,0 @@
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 10 Oct 2022 14:20:33 +0900
Subject: udev: drop assertion which is always false
Fixes a bug introduced by 67c3e1f63a5221b47a8fea85ae421671f29f3b7e.
Fixes #24945.
(cherry picked from commit 6209bbbd4b1c9ed2886028ab2ee3df0a7d0e2494)
---
src/udev/udev-builtin-path_id.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index 93069c7..1084eb2 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -556,7 +556,6 @@ static int find_real_nvme_parent(sd_device *dev, sd_device **ret) {
* /sys/devices/pci0000:00/0000:00:1c.4/0000:3c:00.0/nvme/nvme0 */
assert(dev);
- assert(nvme);
r = sd_device_get_sysname(dev, &sysname);
if (r < 0)