diff --git a/1001-statx.patch b/1001-statx.patch deleted file mode 100644 index 2fc69867..00000000 --- a/1001-statx.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 3657d3a01c7e25ff86d7a4642065b367c4ff7484 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Sat, 23 Jul 2022 10:38:49 +0000 -Subject: [PATCH] glibc: Remove #include to resolve - fsconfig_command/mount_attr conflict with glibc 2.36 - ---- - meson.build | 13 ++++++++++++- - src/basic/fd-util.c | 2 ++ - src/core/namespace.c | 2 ++ - src/shared/mount-util.c | 2 ++ - 4 files changed, 18 insertions(+), 1 deletion(-) - -diff --git meson.build meson.build -index 61073d4ead..4315914a2e 100644 ---- a/meson.build -+++ b/meson.build -@@ -511,7 +511,6 @@ decl_headers = ''' - #include - #include - #include --#include - ''' - - foreach decl : ['char16_t', -@@ -523,6 +522,17 @@ foreach decl : ['char16_t', - # We get -1 if the size cannot be determined - have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0 - -+ if decl == 'struct mount_attr' -+ if have -+ want_linux_fs_h = false -+ else -+ have = cc.sizeof(decl, -+ prefix : decl_headers + '#include ', -+ args : '-D_GNU_SOURCE') > 0 -+ want_linux_fs_h = have -+ endif -+ endif -+ - if decl == 'struct statx' - if have - want_linux_stat_h = false -@@ -538,6 +548,7 @@ foreach decl : ['char16_t', - endforeach - - conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h) -+conf.set10('WANT_LINUX_FS_H', want_linux_fs_h) - - foreach ident : ['secure_getenv', '__secure_getenv'] - conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident)) -diff --git src/basic/fd-util.c src/basic/fd-util.c -index 6c1de92a26..00591d6c2d 100644 ---- a/src/basic/fd-util.c -+++ b/src/basic/fd-util.c -@@ -3,7 +3,9 @@ - #include - #include - #include -+#if WANT_LINUX_FS_H - #include -+#endif - #include - #include - #include -diff --git src/core/namespace.c src/core/namespace.c -index 41457ea816..016afe4d9e 100644 ---- a/src/core/namespace.c -+++ b/src/core/namespace.c -@@ -7,7 +7,9 @@ - #include - #include - #include -+#if WANT_LINUX_FS_H - #include -+#endif - - #include "alloc-util.h" - #include "base-filesystem.h" -diff --git src/shared/mount-util.c src/shared/mount-util.c -index 8cf16affcb..a119a7c3c1 100644 ---- a/src/shared/mount-util.c -+++ b/src/shared/mount-util.c -@@ -7,7 +7,9 @@ - #include - #include - #include -+#if WANT_LINUX_FS_H - #include -+#endif - - #include "alloc-util.h" - #include "chase-symlinks.h" --- -2.35.3 - -Hmmm ... commit 3657d3a01c7e25ff86d7a4642065b367c4ff7484 is not enough - ---- systemd-v251.3+suse.27.g8cd784e925/src/basic/chattr-util.h -+++ systemd-v251.3+suse.27.g8cd784e925/src/basic/chattr-util.h 2022-08-15 10:36:27.022215514 +0000 -@@ -1,7 +1,8 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - #pragma once - -+#define _LINUX_MOUNT_H - #include - #include - #include - ---- systemd-v251.3+suse.27.g8cd784e925/src/home/homework.h -+++ systemd-v251.3+suse.27.g8cd784e925/src/home/homework.h 2022-08-15 10:46:08.835534459 +0000 -@@ -1,7 +1,9 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - #pragma once - -+#define _LINUX_MOUNT_H - #include -+#include - #include - - #include "sd-id128.h" ---- systemd-v251.3+suse.27.g8cd784e925/src/home/homework-mount.c -+++ systemd-v251.3+suse.27.g8cd784e925/src/home/homework-mount.c 2022-08-15 10:48:58.804414702 +0000 -@@ -2,6 +2,7 @@ - - #include - #include -+#define _LINUX_MOUNT_H - #include - - #include "alloc-util.h" ---- systemd-v251.3+suse.27.g8cd784e925/src/home/homework-fscrypt.c -+++ systemd-v251.3+suse.27.g8cd784e925/src/home/homework-fscrypt.c 2022-08-15 10:52:29.452548623 +0000 -@@ -1,5 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - -+#include -+#define _LINUX_MOUNT_H - #include - #include - #include ---- systemd-v251.3+suse.27.g8cd784e925/src/home/homed-manager.c -+++ systemd-v251.3+suse.27.g8cd784e925/src/home/homed-manager.c 2022-08-15 10:54:20.750506089 +0000 -@@ -1,6 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - - #include -+#define _LINUX_MOUNT_H - #include - #include - #include diff --git a/systemd-v251.3+suse.27.g8cd784e925.tar.xz b/systemd-v251.3+suse.27.g8cd784e925.tar.xz deleted file mode 100644 index 0af4209c..00000000 --- a/systemd-v251.3+suse.27.g8cd784e925.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b85c656fb5c904dced2f5add19bcd3ad463fd766ae1e435697fe4da321d721c -size 7829628 diff --git a/systemd-v251.4+suse.29.g532faa39eb.tar.xz b/systemd-v251.4+suse.29.g532faa39eb.tar.xz new file mode 100644 index 00000000..84e72c3e --- /dev/null +++ b/systemd-v251.4+suse.29.g532faa39eb.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:664d40000001006998ad05c7aa90093ee6f997f8d04fb0414dcecddf0670e583 +size 7831508 diff --git a/systemd.changes b/systemd.changes index 05d67dca..d4d59584 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Aug 16 15:55:26 UTC 2022 - Franck Bui + +- Import commit 532faa39ebaa6f56e493cc938a91a40df082b74f (merge of v251.4) + + It includes the following fixes: + + - 739d7130cb home: drop conflicted headers (bsc#1202221) + - fe0c12178 glibc: Remove #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 (bsc#1202221) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/8cd784e9250b38d20d8e14fccbfb211010283c79...532faa39ebaa6f56e493cc938a91a40df082b74f + +- Drop 1001-statx.patch, it's no more needed. + ------------------------------------------------------------------- Mon Aug 15 10:25:34 UTC 2022 - Dr. Werner Fink diff --git a/systemd.spec b/systemd.spec index 671c9a5c..bc831ba8 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.27.g8cd784e925 +%define archive_version +suse.29.g532faa39eb %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.3 +Version: 251.4 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -206,7 +206,6 @@ Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch # Temporary workaround until bsc#1197178 is addressed. Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch -Patch1001: 1001-statx.patch # Patches listed below are put in quarantine. Normally all changes # must go to upstream first and then are cherry-picked in the SUSE git