From 133dde32cf2703460e422cae1bc52347482f78e14371a8b8d238cab25c41bf23 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 8 Nov 2022 16:55:14 +0000 Subject: [PATCH] - Import commit 9cdd78585069b133bebcd479f3a204057ad25d76 (merge of v251.8) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/c212388f7de8d22a3f7c22b19553548ccc0cdd15...9cdd78585069b133bebcd479f3a204057ad25d76 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1322 --- systemd-v251.7+suse.36.gc212388f7d.tar.xz | 3 --- systemd-v251.8+suse.38.g9cdd785850.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 9 +++++++-- 4 files changed, 18 insertions(+), 5 deletions(-) delete mode 100644 systemd-v251.7+suse.36.gc212388f7d.tar.xz create mode 100644 systemd-v251.8+suse.38.g9cdd785850.tar.xz diff --git a/systemd-v251.7+suse.36.gc212388f7d.tar.xz b/systemd-v251.7+suse.36.gc212388f7d.tar.xz deleted file mode 100644 index 0045d70f..00000000 --- a/systemd-v251.7+suse.36.gc212388f7d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8117034a438ce90af5534a3bd40736b29823c71936c061db831a919ca9c17663 -size 7839088 diff --git a/systemd-v251.8+suse.38.g9cdd785850.tar.xz b/systemd-v251.8+suse.38.g9cdd785850.tar.xz new file mode 100644 index 00000000..c6e92a6a --- /dev/null +++ b/systemd-v251.8+suse.38.g9cdd785850.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e21e408a70aef50bbba4a5e39b1c728a7ef48105d226f516b51d36a18cc24d0f +size 7844584 diff --git a/systemd.changes b/systemd.changes index 7db52fbc..73e866a8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 8 16:33:26 UTC 2022 - Franck Bui + +- Import commit 9cdd78585069b133bebcd479f3a204057ad25d76 (merge of v251.8) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/c212388f7de8d22a3f7c22b19553548ccc0cdd15...9cdd78585069b133bebcd479f3a204057ad25d76 + ------------------------------------------------------------------- Tue Oct 25 07:19:15 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index ce9046de..4c912853 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.36.gc212388f7d +%define archive_version +suse.38.g9cdd785850 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -72,7 +72,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 251.7 +Version: 251.8 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -639,6 +639,11 @@ Have fun (at your own risk). %autosetup -p1 -n systemd-v%{version}%{archive_version} %build +# Disable _FORTIFY_SOURCE=3 as it get confused by the use of +# malloc_usable_size() (bsc#1200819). There used to be a workaround but it was +# reverted, see 2cfb790391958ada34284290af1f9ab863a515c7 for the details. +export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" + %meson \ -Dmode=release \ -Dversion-tag=%{version}%{archive_version} \