From d23ec5587a89b09262d3b448ca2eb231d88545b06a19221564a0378a76639047 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 10 Feb 2021 10:50:18 +0000 Subject: [PATCH 1/2] Accepting request 870580 from home:jengelh:branches:Base:System - Override GTKDOCIZE with /bin/true so we can run autoreconf without needing gtk-doc as a dependency. OBS-URL: https://build.opensuse.org/request/show/870580 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=444 --- python3-libmount.changes | 6 ++++++ python3-libmount.spec | 4 ++-- util-linux-systemd.changes | 6 ++++++ util-linux-systemd.spec | 2 +- util-linux.changes | 6 ++++++ util-linux.spec | 2 +- 6 files changed, 22 insertions(+), 4 deletions(-) diff --git a/python3-libmount.changes b/python3-libmount.changes index 588b08c..6237530 100644 --- a/python3-libmount.changes +++ b/python3-libmount.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 9 11:19:40 UTC 2021 - Jan Engelhardt + +- Override GTKDOCIZE with /bin/true so we can run autoreconf + without needing gtk-doc as a dependency. + ------------------------------------------------------------------- Thu Feb 4 02:17:39 UTC 2021 - Stanislav Brabec diff --git a/python3-libmount.spec b/python3-libmount.spec index bc74c08..af52d90 100644 --- a/python3-libmount.spec +++ b/python3-libmount.spec @@ -79,7 +79,7 @@ Name: python3-libmount %endif Summary: %main_summary License: GPL-2.0-or-later -Group: %main_group +Group: %group_pl BuildRequires: audit-devel BuildRequires: binutils-devel BuildRequires: fdupes @@ -541,7 +541,7 @@ export CXXFLAGS="%{optflags} -D_GNU_SOURCE" # # SUSE now supports only systemd based system. We do not build # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. -AUTOPOINT=true autoreconf -vfi +AUTOPOINT=true GTKDOCIZE=true autoreconf -vfi %configure \ --disable-silent-rules \ --docdir=%{_docdir}/%{_name} \ diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 588b08c..6237530 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 9 11:19:40 UTC 2021 - Jan Engelhardt + +- Override GTKDOCIZE with /bin/true so we can run autoreconf + without needing gtk-doc as a dependency. + ------------------------------------------------------------------- Thu Feb 4 02:17:39 UTC 2021 - Stanislav Brabec diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index fa0a009..9822fc1 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -541,7 +541,7 @@ export CXXFLAGS="%{optflags} -D_GNU_SOURCE" # # SUSE now supports only systemd based system. We do not build # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. -AUTOPOINT=true autoreconf -vfi +AUTOPOINT=true GTKDOCIZE=true autoreconf -vfi %configure \ --disable-silent-rules \ --docdir=%{_docdir}/%{_name} \ diff --git a/util-linux.changes b/util-linux.changes index 588b08c..6237530 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 9 11:19:40 UTC 2021 - Jan Engelhardt + +- Override GTKDOCIZE with /bin/true so we can run autoreconf + without needing gtk-doc as a dependency. + ------------------------------------------------------------------- Thu Feb 4 02:17:39 UTC 2021 - Stanislav Brabec diff --git a/util-linux.spec b/util-linux.spec index 573db41..6799817 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -541,7 +541,7 @@ export CXXFLAGS="%{optflags} -D_GNU_SOURCE" # # SUSE now supports only systemd based system. We do not build # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. -AUTOPOINT=true autoreconf -vfi +AUTOPOINT=true GTKDOCIZE=true autoreconf -vfi %configure \ --disable-silent-rules \ --docdir=%{_docdir}/%{_name} \ From f76dd9471f70d073561a45d2a5a2315d02b9873f6f0b9af7a3d25e34f3bcd3dd Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 10 Feb 2021 23:51:24 +0000 Subject: [PATCH 2/2] Accepting request 871017 from home:sbrabec:branches:util-linux-boo1181750 - libmount: don't use "symfollow" for helpers on user mounts (boo#1181750, util-linux-libmount-dont-use-symfollow.patch) OBS-URL: https://build.opensuse.org/request/show/871017 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=445 --- python3-libmount.changes | 6 ++++ python3-libmount.spec | 4 ++- util-linux-libmount-dont-use-symfollow.patch | 37 ++++++++++++++++++++ util-linux-systemd.changes | 6 ++++ util-linux-systemd.spec | 2 ++ util-linux.changes | 6 ++++ util-linux.spec | 2 ++ 7 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 util-linux-libmount-dont-use-symfollow.patch diff --git a/python3-libmount.changes b/python3-libmount.changes index 6237530..fd755c8 100644 --- a/python3-libmount.changes +++ b/python3-libmount.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 10 23:18:39 UTC 2021 - Stanislav Brabec + +- libmount: don't use "symfollow" for helpers on user mounts + (boo#1181750, util-linux-libmount-dont-use-symfollow.patch) + ------------------------------------------------------------------- Tue Feb 9 11:19:40 UTC 2021 - Jan Engelhardt diff --git a/python3-libmount.spec b/python3-libmount.spec index af52d90..325e4c1 100644 --- a/python3-libmount.spec +++ b/python3-libmount.spec @@ -79,7 +79,7 @@ Name: python3-libmount %endif Summary: %main_summary License: GPL-2.0-or-later -Group: %group_pl +Group: %main_group BuildRequires: audit-devel BuildRequires: binutils-devel BuildRequires: fdupes @@ -152,6 +152,8 @@ Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch # PATCH-FIX-SUSE: Avoid sulogin failing on not existing or not functional console devices Patch3: util-linux-sulogin4bsc1175514.patch +# PATCH-FIX-UPSTREAM util-linux-libmount-dont-use-symfollow.patch boo1181750 ailin.nemui@gmail.com -- libmount: don't use "symfollow" for helpers on user mounts https://github.com/karelzak/util-linux/issues/1193 +Patch4: util-linux-libmount-dont-use-symfollow.patch # %if %build_util_linux Supplements: filesystem(minix) diff --git a/util-linux-libmount-dont-use-symfollow.patch b/util-linux-libmount-dont-use-symfollow.patch new file mode 100644 index 0000000..ecee214 --- /dev/null +++ b/util-linux-libmount-dont-use-symfollow.patch @@ -0,0 +1,37 @@ +From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 19 Nov 2020 09:49:16 +0100 +Subject: [PATCH] libmount: don't use "symfollow" for helpers on user mounts + +Addresses: https://github.com/karelzak/util-linux/issues/1193 +Signed-off-by: Karel Zak +--- + libmount/src/context_mount.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c +index 8c394c1ff..dd1786176 100644 +--- a/libmount/src/context_mount.c ++++ b/libmount/src/context_mount.c +@@ -415,6 +415,9 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr) + * string, because there is nothing like MS_EXEC (we only have + * MS_NOEXEC in mount flags and we don't care about the original + * mount string in libmount for VFS options). ++ * ++ * This use-case makes sense for MS_SECURE flags only (see ++ * mnt_optstr_get_flags() and mnt_context_merge_mflags()). + */ + if (!(cxt->mountflags & MS_NOEXEC)) + mnt_optstr_append_option(optstr, "exec", NULL); +@@ -422,11 +425,8 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr) + mnt_optstr_append_option(optstr, "suid", NULL); + if (!(cxt->mountflags & MS_NODEV)) + mnt_optstr_append_option(optstr, "dev", NULL); +- if (!(cxt->mountflags & MS_NOSYMFOLLOW)) +- mnt_optstr_append_option(optstr, "symfollow", NULL); + } + +- + if (cxt->flags & MNT_FL_SAVED_USER) + rc = mnt_optstr_set_option(optstr, "user", cxt->orig_user); + if (rc) diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 6237530..fd755c8 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 10 23:18:39 UTC 2021 - Stanislav Brabec + +- libmount: don't use "symfollow" for helpers on user mounts + (boo#1181750, util-linux-libmount-dont-use-symfollow.patch) + ------------------------------------------------------------------- Tue Feb 9 11:19:40 UTC 2021 - Jan Engelhardt diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 9822fc1..24dece1 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -152,6 +152,8 @@ Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch # PATCH-FIX-SUSE: Avoid sulogin failing on not existing or not functional console devices Patch3: util-linux-sulogin4bsc1175514.patch +# PATCH-FIX-UPSTREAM util-linux-libmount-dont-use-symfollow.patch boo1181750 ailin.nemui@gmail.com -- libmount: don't use "symfollow" for helpers on user mounts https://github.com/karelzak/util-linux/issues/1193 +Patch4: util-linux-libmount-dont-use-symfollow.patch # %if %build_util_linux Supplements: filesystem(minix) diff --git a/util-linux.changes b/util-linux.changes index 6237530..fd755c8 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 10 23:18:39 UTC 2021 - Stanislav Brabec + +- libmount: don't use "symfollow" for helpers on user mounts + (boo#1181750, util-linux-libmount-dont-use-symfollow.patch) + ------------------------------------------------------------------- Tue Feb 9 11:19:40 UTC 2021 - Jan Engelhardt diff --git a/util-linux.spec b/util-linux.spec index 6799817..be53a61 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -152,6 +152,8 @@ Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch # PATCH-FIX-SUSE: Avoid sulogin failing on not existing or not functional console devices Patch3: util-linux-sulogin4bsc1175514.patch +# PATCH-FIX-UPSTREAM util-linux-libmount-dont-use-symfollow.patch boo1181750 ailin.nemui@gmail.com -- libmount: don't use "symfollow" for helpers on user mounts https://github.com/karelzak/util-linux/issues/1193 +Patch4: util-linux-libmount-dont-use-symfollow.patch # %if %build_util_linux Supplements: filesystem(minix)