Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package util-linux for openSUSE:Factory
checked in at 2022-07-29 16:46:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/util-linux (Old)
and /work/SRC/openSUSE:Factory/.util-linux.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "util-linux"
Fri Jul 29 16:46:52 2022 rev:255 rq:990582 version:2.37.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/util-linux/python3-libmount.changes
2022-03-14 19:33:57.533902836 +0100
+++ /work/SRC/openSUSE:Factory/.util-linux.new.1533/python3-libmount.changes
2022-07-29 16:46:55.638490632 +0200
@@ -1,0 +2,5 @@
+Thu Jul 21 08:00:59 UTC 2022 - Andreas Schwab <sch...@suse.de>
+
+- linux-fs.patch: Fix conflict between <linux/fs.h> and <sys/mount.h>
+
+-------------------------------------------------------------------
util-linux-systemd.changes: same change
util-linux.changes: same change
New:
----
linux-fs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-libmount.spec ++++++
--- /var/tmp/diff_new_pack.MIqrcK/_old 2022-07-29 16:46:56.786493824 +0200
+++ /var/tmp/diff_new_pack.MIqrcK/_new 2022-07-29 16:46:56.790493835 +0200
@@ -151,6 +151,8 @@
Patch3: util-linux-sulogin4bsc1175514.patch
# PATCH-FIX-SUSE util-linux-bash-completion-su-chsh-l.patch bsc1172427 -- Fix
"su -s" bash completion.
Patch4: util-linux-bash-completion-su-chsh-l.patch
+# PATH-FIX-UPSTREAM linux-fs.patch -- sulogin: fix includes
+Patch5: linux-fs.patch
#
%if %build_util_linux
Supplements: filesystem(minix)
util-linux-systemd.spec: same change
++++++ util-linux.spec ++++++
--- /var/tmp/diff_new_pack.MIqrcK/_old 2022-07-29 16:46:56.858494024 +0200
+++ /var/tmp/diff_new_pack.MIqrcK/_new 2022-07-29 16:46:56.862494035 +0200
@@ -151,6 +151,8 @@
Patch3: util-linux-sulogin4bsc1175514.patch
# PATCH-FIX-SUSE util-linux-bash-completion-su-chsh-l.patch bsc1172427 -- Fix
"su -s" bash completion.
Patch4: util-linux-bash-completion-su-chsh-l.patch
+# PATH-FIX-UPSTREAM linux-fs.patch -- sulogin: fix includes
+Patch5: linux-fs.patch
#
%if %build_util_linux
Supplements: filesystem(minix)
++++++ linux-fs.patch ++++++
>From 89c7c6ea6ef12722eac31c18b8fa6fbcf429525b Mon Sep 17 00:00:00 2001
From: Karel Zak <k...@redhat.com>
Date: Wed, 20 Jul 2022 16:55:02 +0200
Subject: [PATCH] sulogin: fix includes
* support --enable-sulogin-emergency-mount on Linux only
* don't include unnecessary linux/magic.h
* don't include linux/fs.h, sys/mount.h should be enough, otherwise
define a fallback for MS_RELATIME
Reported-by: Andreas Schwab <sch...@suse.de>
Signed-off-by: Karel Zak <k...@redhat.com>
---
configure.ac | 2 ++
login-utils/sulogin-consoles.c | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 824e8bbd2..51deeecd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2615,6 +2615,8 @@ AC_ARG_ENABLE([sulogin-emergency-mount],
)
AS_IF([test "x$enable_sulogin_emergency_mount" = xyes], [
+ AS_IF([test "x$linux_os" = xyes], [ ],
+ [AC_MSG_ERROR([--enable-sulogin-emergency-mount selected for non-linux
system])])
AC_DEFINE([USE_SULOGIN_EMERGENCY_MOUNT], [1],
[Should sulogin use an emergency mount of /dev and /proc?])
])
diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
index 9ae4b2eba..9ae525556 100644
--- a/login-utils/sulogin-consoles.c
+++ b/login-utils/sulogin-consoles.c
@@ -41,10 +41,11 @@
#include <fcntl.h>
#include <unistd.h>
-#ifdef USE_SULOGIN_EMERGENCY_MOUNT
+#if defined(USE_SULOGIN_EMERGENCY_MOUNT)
# include <sys/mount.h>
-# include <linux/fs.h>
-# include <linux/magic.h>
+# ifndef MS_RELATIME
+# define MS_RELATIME (1<<21)
+# endif
# ifndef MNT_DETACH
# define MNT_DETACH 2
# endif
--
2.37.1
