From 88d010c8af2be843f250545b144ac0eb156afd8aedddf966316855cc39439f12 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 6 Apr 2020 18:29:40 +0000 Subject: [PATCH 1/2] Accepting request 791807 from home:fos:branches:Base:System Add libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch: Avoid triggering autofs in lookup_umount_fs_by_statfs (boo#1168389) OBS-URL: https://build.opensuse.org/request/show/791807 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=426 --- ...riggering-autofs-in-lookup_umount_fs.patch | 42 +++++++++++++++++++ python3-libmount.spec | 4 +- util-linux-systemd.spec | 4 +- util-linux.changes | 7 ++++ util-linux.spec | 6 ++- 5 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch diff --git a/libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch b/libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch new file mode 100644 index 0000000..16832cb --- /dev/null +++ b/libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch @@ -0,0 +1,42 @@ +From 7065cc0e5312cafc5ae3e4c342f78f264300fb5f Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 1 Apr 2020 13:15:13 +0200 +Subject: [PATCH 1/4] libmount: Avoid triggering autofs in + lookup_umount_fs_by_statfs +References: boo#1168389 +Upstream: merged (gh#karelzak/util-linux#1002) + +Currently, umount /foo results in a statfs("/foo") call, which triggers +autofs. This can create another mountpoint on /foo, which is then unmounted +later instead of the actual /foo at the time umount was called. + +This is especially an issue for umount -R /bar, which just fails with +-EBUSY as the accidental mountpoint is never accounted for and so it tries +to umount /bar before /bar/someautofs. + +Replace the direct statfs call with open(path, O_PATH) + fstatfs, which sees +the autofs mount directly, without triggering it. +--- + libmount/src/context_umount.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +Index: util-linux-2.34/libmount/src/context_umount.c +=================================================================== +--- util-linux-2.34.orig/libmount/src/context_umount.c ++++ util-linux-2.34/libmount/src/context_umount.c +@@ -283,9 +283,13 @@ static int lookup_umount_fs(struct libmn + if (!type) { + struct statfs vfs; + +- DBG(CXT, ul_debugobj(cxt, "umount: trying statfs()")); +- if (statfs(tgt, &vfs) == 0) ++ DBG(CXT, ul_debugobj(cxt, "umount: trying fstatfs()")); ++ /* O_PATH avoids triggering automount points. */ ++ int pathfd = open(tgt, O_PATH); ++ if (pathfd >= 0 && fstatfs(pathfd, &vfs) == 0) { + type = mnt_statfs_get_fstype(&vfs); ++ close(pathfd); ++ } + if (type) { + rc = mnt_fs_set_fstype(cxt->fs, type); + if (rc) diff --git a/python3-libmount.spec b/python3-libmount.spec index 578343f..116db46 100644 --- a/python3-libmount.spec +++ b/python3-libmount.spec @@ -1,7 +1,7 @@ # # spec file for package python3-libmount # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -124,7 +124,7 @@ BuildRequires: libmount-devel #END SECOND STAGE DEPENDENCIES Version: 2.34 Release: 0 -Url: https://www.kernel.org/pub/linux/utils/util-linux/ +URL: https://www.kernel.org/pub/linux/utils/util-linux/ Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 5da0245..071ea2b 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -1,7 +1,7 @@ # # spec file for package util-linux-systemd # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -124,7 +124,7 @@ BuildRequires: libmount-devel #END SECOND STAGE DEPENDENCIES Version: 2.34 Release: 0 -Url: https://www.kernel.org/pub/linux/utils/util-linux/ +URL: https://www.kernel.org/pub/linux/utils/util-linux/ Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh diff --git a/util-linux.changes b/util-linux.changes index fed1632..8e38215 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 6 14:47:56 UTC 2020 - Ignaz Forster + +- Add libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch: + Avoid triggering autofs in lookup_umount_fs_by_statfs + (boo#1168389) + ------------------------------------------------------------------- Tue Oct 8 14:48:15 CEST 2019 - kukuk@suse.de diff --git a/util-linux.spec b/util-linux.spec index 3546237..bc92281 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,7 +1,7 @@ # # spec file for package util-linux # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -124,7 +124,7 @@ BuildRequires: libmount-devel #END SECOND STAGE DEPENDENCIES Version: 2.34 Release: 0 -Url: https://www.kernel.org/pub/linux/utils/util-linux/ +URL: https://www.kernel.org/pub/linux/utils/util-linux/ Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh @@ -147,6 +147,7 @@ Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch Patch3: libeconf.patch +Patch4: libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch Patch813: e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -413,6 +414,7 @@ cp -a %{S:2} . %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch813 -p1 %build From 06d1a88bece9837b87804f74927349110343cb2c862b0cfb269876bbb635de70 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 6 Apr 2020 21:48:18 +0000 Subject: [PATCH 2/2] Accepting request 791864 from home:sbrabec:branches:Base:System - Update to version 2.35.1: - Add libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch: OBS-URL: https://build.opensuse.org/request/show/791864 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=427 --- ...9bfb76c17b1d05814436ced62c05c4011f48.patch | 30 --- libeconf.patch | 174 +++++------------- python3-libmount.changes | 32 ++++ python3-libmount.spec | 16 +- util-linux-2.34.tar.sign | 16 -- util-linux-2.34.tar.xz | 3 - util-linux-2.35.1.tar.sign | 16 ++ util-linux-2.35.1.tar.xz | 3 + util-linux-systemd.changes | 32 ++++ util-linux-systemd.spec | 14 +- util-linux.changes | 25 +++ util-linux.spec | 12 +- 12 files changed, 180 insertions(+), 193 deletions(-) delete mode 100644 e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch delete mode 100644 util-linux-2.34.tar.sign delete mode 100644 util-linux-2.34.tar.xz create mode 100644 util-linux-2.35.1.tar.sign create mode 100644 util-linux-2.35.1.tar.xz diff --git a/e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch b/e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch deleted file mode 100644 index cb1c6fd..0000000 --- a/e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 27 Jun 2019 09:22:18 +0200 -Subject: [PATCH] lsblk: force to print PKNAME for partition - -PKNAME (parent kernel device name) is based on printed tree according -to parent -> child relationship. The tree is optional and not printed -if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old -versions print the PKNAME also in this case. - -Addresses: https://github.com/karelzak/util-linux/issues/813 -Signed-off-by: Karel Zak ---- - misc-utils/lsblk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index e95af7af0..3ce6da730 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -1019,6 +1019,9 @@ static void device_to_scols( - DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); - ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); - -+ if (!parent && dev->wholedisk) -+ parent = dev->wholedisk; -+ - /* Do not print device more than one in --list mode */ - if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) - return; diff --git a/libeconf.patch b/libeconf.patch index 0e85561..593e1bb 100644 --- a/libeconf.patch +++ b/libeconf.patch @@ -10,11 +10,11 @@ Subject: [PATCH 1/2] Add support for libeconf login-utils/su-common.c | 7 ++ 4 files changed, 254 insertions(+), 11 deletions(-) -diff --git a/configure.ac b/configure.ac -index d4cf46fea..a3881ab8c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2232,6 +2232,31 @@ AS_IF([test "x$with_smack" = xyes], [ +Index: util-linux-2.35.1/configure.ac +=================================================================== +--- util-linux-2.35.1.orig/configure.ac ++++ util-linux-2.35.1/configure.ac +@@ -2274,6 +2274,31 @@ AS_IF([test "x$with_smack" = xyes], [ AC_DEFINE([HAVE_SMACK], [1], [Add SMACK support]) ]) @@ -46,7 +46,7 @@ index d4cf46fea..a3881ab8c 100644 AC_ARG_WITH([bashcompletiondir], AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]), -@@ -2461,6 +2486,7 @@ AC_MSG_RESULT([ +@@ -2527,6 +2552,7 @@ AC_MSG_RESULT([ usrbin_execdir: ${usrbin_execdir} usrsbin_execdir: ${usrsbin_execdir} usrlib_execdir: ${usrlib_execdir} @@ -54,7 +54,7 @@ index d4cf46fea..a3881ab8c 100644 compiler: ${CC} cflags: ${CFLAGS} -@@ -2476,6 +2502,7 @@ AC_MSG_RESULT([ +@@ -2542,6 +2568,7 @@ AC_MSG_RESULT([ Bash completions: ${with_bashcompletiondir} Systemd support: ${have_systemd} Systemd unitdir: ${with_systemdsystemunitdir} @@ -62,10 +62,10 @@ index d4cf46fea..a3881ab8c 100644 Btrfs support: ${have_btrfs} Wide-char support: ${build_widechar} -diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am -index aafbea307..22a6c867e 100644 ---- a/login-utils/Makemodule.am -+++ b/login-utils/Makemodule.am +Index: util-linux-2.35.1/login-utils/Makemodule.am +=================================================================== +--- util-linux-2.35.1.orig/login-utils/Makemodule.am ++++ util-linux-2.35.1/login-utils/Makemodule.am @@ -44,6 +44,9 @@ login_SOURCES = \ login-utils/logindefs.c \ login-utils/logindefs.h @@ -111,9 +111,9 @@ index aafbea307..22a6c867e 100644 su_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) su_LDADD = $(LDADD) libcommon.la -lpam if HAVE_LINUXPAM -@@ -149,6 +164,9 @@ endif - if HAVE_UTIL - su_LDADD += -lutil +@@ -152,6 +167,9 @@ su_SOURCES += lib/pty-session.c \ + lib/monotonic.c + su_LDADD += -lutil $(REALTIME_LIBS) endif +if HAVE_ECONF +su_LDADD += -leconf @@ -121,9 +121,9 @@ index aafbea307..22a6c867e 100644 endif # BUILD_SU -@@ -168,6 +186,12 @@ endif - if HAVE_UTIL - runuser_LDADD += -lutil +@@ -174,6 +192,12 @@ runuser_SOURCES += lib/pty-session.c \ + lib/monotonic.c + runuser_LDADD += -lutil $(REALTIME_LIBS) endif +if HAVE_ECONF +runuser_LDADD += -leconf @@ -134,7 +134,7 @@ index aafbea307..22a6c867e 100644 endif # BUILD_RUNUSER -@@ -192,6 +216,9 @@ lslogins_SOURCES = \ +@@ -198,6 +222,9 @@ lslogins_SOURCES = \ login-utils/logindefs.h lslogins_LDADD = $(LDADD) libcommon.la libsmartcols.la lslogins_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) @@ -144,7 +144,7 @@ index aafbea307..22a6c867e 100644 if HAVE_SELINUX lslogins_LDADD += -lselinux endif -@@ -199,6 +226,9 @@ if HAVE_SYSTEMD +@@ -205,6 +232,9 @@ if HAVE_SYSTEMD lslogins_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_JOURNAL_LIBS) lslogins_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS) endif @@ -154,7 +154,7 @@ index aafbea307..22a6c867e 100644 endif # BUILD_LSLOGINS if BUILD_VIPW -@@ -231,6 +261,12 @@ test_logindefs_SOURCES = \ +@@ -237,6 +267,12 @@ test_logindefs_SOURCES = \ login-utils/logindefs.c \ login-utils/logindefs.h test_logindefs_CPPFLAGS = -DTEST_PROGRAM $(AM_CPPFLAGS) @@ -167,10 +167,10 @@ index aafbea307..22a6c867e 100644 install-exec-hook: -diff --git a/login-utils/logindefs.c b/login-utils/logindefs.c -index 2b505d255..9075ad9e7 100644 ---- a/login-utils/logindefs.c -+++ b/login-utils/logindefs.c +Index: util-linux-2.35.1/login-utils/logindefs.c +=================================================================== +--- util-linux-2.35.1.orig/login-utils/logindefs.c ++++ util-linux-2.35.1/login-utils/logindefs.c @@ -38,6 +38,18 @@ #include "pathnames.h" #include "xalloc.h" @@ -200,7 +200,7 @@ index 2b505d255..9075ad9e7 100644 void free_getlogindefs_data(void) { struct item *ptr; -@@ -145,12 +154,6 @@ void logindefs_load_file(const char *filename) +@@ -145,12 +154,6 @@ void logindefs_load_file(const char *fil fclose(f); } @@ -213,7 +213,7 @@ index 2b505d255..9075ad9e7 100644 static void load_defaults(void) { if (logindefs_loader) -@@ -232,6 +235,156 @@ const char *getlogindefs_str(const char *name, const char *dflt) +@@ -232,6 +235,156 @@ const char *getlogindefs_str(const char return ptr->value; } @@ -252,7 +252,7 @@ index 2b505d255..9075ad9e7 100644 + +void logindefs_load_file(const char *filename) +{ -+ econf_file *file_l, *file_m; ++ econf_file *file_l = NULL, *file_m = NULL; + char *path; + + logindefs_loader = NULL; /* No recursion */ @@ -314,10 +314,7 @@ index 2b505d255..9075ad9e7 100644 + econf_errString(error)); + return dflt; + } -+ if (value == true) -+ return 0; -+ else -+ return 1; ++ return value; +} + +unsigned long getlogindefs_num(const char *name, unsigned long dflt) @@ -363,14 +360,17 @@ index 2b505d255..9075ad9e7 100644 + econf_errString(error)); + return dflt; + } -+ return value; ++ if (value) ++ return value; ++ else ++ return strdup(""); +} +#endif /* !HAVE_LIBECONF */ + /* * For compatibility with shadow-utils we have to support additional * syntax for environment variables in login.defs(5) file. The standard -@@ -283,7 +436,6 @@ int effective_access(const char *path, int mode) +@@ -283,7 +436,6 @@ int effective_access(const char *path, i return fd == -1 ? -1 : 0; } @@ -378,28 +378,23 @@ index 2b505d255..9075ad9e7 100644 /* * Check the per-account or the global hush-login setting. * -@@ -412,12 +564,33 @@ int main(int argc, char *argv[]) +@@ -412,12 +564,28 @@ int main(int argc, char *argv[]) logindefs_load_file(argv[1]); if (argc != 4) { /* list all */ +#ifdef HAVE_LIBECONF -+ econf_err error; -+ size_t key_number; -+ char **keys; ++ int i; ++ char *keys[] = {"END", "EMPTY", "CRAZY3", "CRAZY2", "CRAZY1", ++ "BOOLEAN", "NUMBER", "STRING", "HELLO_WORLD", ++ NULL}; + -+ if ((error = econf_getKeys(file, NULL, &key_number, &keys))) -+ errx(EXIT_FAILURE, "Couldn't list all keys: %s", -+ econf_errString(error)); -+ -+ for (size_t i = 0; i < key_number; i++) { ++ for (i = 0; keys[i] != NULL; i++) { + char *value = NULL; + + econf_getStringValue(file, NULL, keys[i], &value); -+ printf ("%s: $%s: '%s'\n", "logindefs.data", -+ keys[i], value); ++ printf ("%s: $%s: '%s'\n", argv[1], keys[i], value); + } + -+ econf_free (keys); + econf_free (file); + +#else @@ -413,11 +408,11 @@ index 2b505d255..9075ad9e7 100644 return EXIT_SUCCESS; } -diff --git a/login-utils/su-common.c b/login-utils/su-common.c -index 4d91b22e4..57d584e55 100644 ---- a/login-utils/su-common.c -+++ b/login-utils/su-common.c -@@ -90,8 +90,13 @@ UL_DEBUG_DEFINE_MASKNAMES(su) = UL_DEBUG_EMPTY_MASKNAMES; +Index: util-linux-2.35.1/login-utils/su-common.c +=================================================================== +--- util-linux-2.35.1.orig/login-utils/su-common.c ++++ util-linux-2.35.1/login-utils/su-common.c +@@ -90,8 +90,13 @@ UL_DEBUG_DEFINE_MASKNAMES(su) = UL_DEBUG #define PAM_SRVNAME_RUNUSER "runuser" #define PAM_SRVNAME_RUNUSER_L "runuser-l" @@ -431,7 +426,7 @@ index 4d91b22e4..57d584e55 100644 #define is_pam_failure(_rc) ((_rc) != PAM_SUCCESS) -@@ -1231,7 +1236,9 @@ static void load_config(void *data) +@@ -1038,7 +1043,9 @@ static void load_config(void *data) struct su_context *su = (struct su_context *) data; DBG(MISC, ul_debug("loading logindefs")); @@ -441,80 +436,3 @@ index 4d91b22e4..57d584e55 100644 logindefs_load_file(su->runuser ? _PATH_LOGINDEFS_RUNUSER : _PATH_LOGINDEFS_SU); } - -From 8c8aaa3e022913fbfc54bae3a26fcd13ce3412bf Mon Sep 17 00:00:00 2001 -From: Thorsten Kukuk -Date: Wed, 4 Sep 2019 14:59:25 +0200 -Subject: [PATCH 2/2] Adjust test output to pass test suite - ---- - login-utils/logindefs.c | 29 ++++++++++++----------------- - 1 file changed, 12 insertions(+), 17 deletions(-) - -diff --git a/login-utils/logindefs.c b/login-utils/logindefs.c -index 9075ad9e7..4fa2e9488 100644 ---- a/login-utils/logindefs.c -+++ b/login-utils/logindefs.c -@@ -270,7 +270,7 @@ static void load_defaults(void) - - void logindefs_load_file(const char *filename) - { -- econf_file *file_l, *file_m; -+ econf_file *file_l = NULL, *file_m = NULL; - char *path; - - logindefs_loader = NULL; /* No recursion */ -@@ -332,10 +332,7 @@ int getlogindefs_bool(const char *name, int dflt) - econf_errString(error)); - return dflt; - } -- if (value == true) -- return 0; -- else -- return 1; -+ return value; - } - - unsigned long getlogindefs_num(const char *name, unsigned long dflt) -@@ -381,7 +378,10 @@ const char *getlogindefs_str(const char *name, const char *dflt) - econf_errString(error)); - return dflt; - } -- return value; -+ if (value) -+ return value; -+ else -+ return strdup(""); - } - #endif /* !HAVE_LIBECONF */ - -@@ -565,23 +565,18 @@ int main(int argc, char *argv[]) - - if (argc != 4) { /* list all */ - #ifdef HAVE_LIBECONF -- econf_err error; -- size_t key_number; -- char **keys; -- -- if ((error = econf_getKeys(file, NULL, &key_number, &keys))) -- errx(EXIT_FAILURE, "Couldn't list all keys: %s", -- econf_errString(error)); -+ int i; -+ char *keys[] = {"END", "EMPTY", "CRAZY3", "CRAZY2", "CRAZY1", -+ "BOOLEAN", "NUMBER", "STRING", "HELLO_WORLD", -+ NULL}; - -- for (size_t i = 0; i < key_number; i++) { -+ for (i = 0; keys[i] != NULL; i++) { - char *value = NULL; - - econf_getStringValue(file, NULL, keys[i], &value); -- printf ("%s: $%s: '%s'\n", "logindefs.data", -- keys[i], value); -+ printf ("%s: $%s: '%s'\n", argv[1], keys[i], value); - } - -- econf_free (keys); - econf_free (file); - - #else diff --git a/python3-libmount.changes b/python3-libmount.changes index fed1632..a4b74cc 100644 --- a/python3-libmount.changes +++ b/python3-libmount.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Mon Apr 6 23:07:48 CEST 2020 - Stanislav Brabec + +- Update to version 2.35.1: + * agetty: add --show-issue, support for /run/issue and + * fdisk: Correct handling of hybrid MBR, cleanup wipe warning, + use 'r' to return from MBR to GPT. + * lsblk: FSVER column, + drop e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch. + * lscpu: Add HiSilicon aarch64 tsv110 cpupart, add a new columns + to --cache. + * mount: add --target-prefix. + * mountpoint: add --nofollow option. + * script: add --echo, --log-in, --logging-format, --log-out and + --log-timing. + * scriptlive: new command. + * scriptreplay: add --log-* options, --cr-mode, --stream, + --summary, -T --log-timing. + * sfdisk: add progress bars. + * unshare: add --keep-caps and --map-current-user options. + * Many other fixes and improvements, see: + https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35-ReleaseNotes + https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35.1-ReleaseNotes +- Refresh libeconf.patch. + +------------------------------------------------------------------- +Mon Apr 6 14:47:56 UTC 2020 - Ignaz Forster + +- Add libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch: + Avoid triggering autofs in lookup_umount_fs_by_statfs + (boo#1168389) + ------------------------------------------------------------------- Tue Oct 8 14:48:15 CEST 2019 - kukuk@suse.de diff --git a/python3-libmount.spec b/python3-libmount.spec index 116db46..d72ef86 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 @@ -122,10 +122,10 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.34 +Version: 2.35.1 Release: 0 URL: https://www.kernel.org/pub/linux/utils/util-linux/ -Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz +Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh Source4: raw.service @@ -136,7 +136,7 @@ Source8: login.pamd Source9: remote.pamd Source10: su.pamd Source11: su.default -Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.sign +Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-%{version}.tar.sign Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd @@ -147,7 +147,7 @@ Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch Patch3: libeconf.patch -Patch813: e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch +Patch4: libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -413,7 +413,7 @@ cp -a %{S:2} . %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch813 -p1 +%patch4 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects @@ -605,6 +605,8 @@ export TS_OPT_script_known_fail="yes" # may segfault on qemu-user-space export TS_OPT_misc_setarch_known_fail="yes" %endif +# This does not work with a chroot build: / is not a mountpoint +export TS_OPT_misc_mountpoint_known_fail="yes" # # hacks export PATH="$PATH:/sbin:/usr/sbin" @@ -996,6 +998,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_bindir}/renice %{_bindir}/rev %{_bindir}/script +%{_bindir}/scriptlive %{_bindir}/scriptreplay %{_bindir}/setarch %{_bindir}/setpriv @@ -1096,6 +1099,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_mandir}/man1/setpriv.1.gz %{_mandir}/man1/setsid.1.gz %{_mandir}/man1/script.1.gz +%{_mandir}/man1/scriptlive.1.gz %{_mandir}/man1/scriptreplay.1.gz %{_mandir}/man1/setterm.1.gz %{_mandir}/man1/taskset.1.gz diff --git a/util-linux-2.34.tar.sign b/util-linux-2.34.tar.sign deleted file mode 100644 index 183b5e0..0000000 --- a/util-linux-2.34.tar.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAl0Dem4ACgkQ5LcdXuw5 -woSlGg//eWI46Oy/Bwvd4QuZ5CGvuDzmoLsYyr3YvJrVTTZci9I/j0tZYpGKRsK4 -ftUP+dJ0eyur9b+xUlQi5WPMHITPpbo0HoKRzkBJQ+Z98IhiLDclhxgzX8wy1bos -gbZ0fVcct4L9fcrL8x/yRrT2WFIrVVdPeNUcR1gN0J4PaIr1Itd3CvXmkOU3JsxG -6KnfnQRxUcSb9QxNIrc3ME0MRnJzI+YehG66rdh7PKiTat26YYehWukelEzju22Q -BHvj4wwDNs6UQ8Y26cVArYKf+5S1FSvudY0c+4C7aQC9IYjQYh99l/APBMr1Tvep -d8f02zxZbCB30lmkCov0JQB1ajRMHlgnH4tG1nki9gi4kyBc89HY4CFX00PiCFX8 -NOJI9559syCu76aK+KMwNZTPxjxy5HzYfSDqsSSizajYahDpZ9ge9NT3dOqkM4Sz -wFwAv5IdmgH5cIO0va4obNKR0TNUCEIThETpxaY9GAkyyUavCA6RXywobYSnTdbQ -K+prQfTH25/UDoW1rDdoNe2IrDeUsPD74oXUxmDgCMBpWAHPdt+gQMzv6fhl2A3Y -e+A5Ypmh6YgIppY+rtjLbkMCYhJ1jVbV6eLVyb2y0IIltw4xrvzNlbpIHW7DPdY8 -+BUJMSG/Yq5+qKPijsq1th5s7a2B0r816ti+EllZxOTpKbKMSYo= -=iGKC ------END PGP SIGNATURE----- diff --git a/util-linux-2.34.tar.xz b/util-linux-2.34.tar.xz deleted file mode 100644 index 5391fda..0000000 --- a/util-linux-2.34.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5 -size 4974812 diff --git a/util-linux-2.35.1.tar.sign b/util-linux-2.35.1.tar.sign new file mode 100644 index 0000000..fae8c9b --- /dev/null +++ b/util-linux-2.35.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAl4z91YACgkQ5LcdXuw5 +woR+HBAAitw3A7hcWjYo+SPHRtPtLr8PwbdJMNohAtRkTBa11bBTypgJY6tHq0iU +f3ny8XX+s9x65ccSOYtSyZRLjde5lliD53rOKSU32mjcgm7WVSSBavludf9JNRuE +ou/JbN8zhWk0y/EdEoav5d27wpCSMb8QJNWItI79QJqRks1hKPXkZqXSoZv6fmhZ +qUdGLoc7V90Xe3iLEQSSMi0PUkdXFyTBD0gEo7YIHhbTn6ElQZoUHCYKno7QHVUI +b422K64X7jEeAw2EQFOuVZ7eruMswItrt6hUTp20ZfkBTcTf7r/dYTJPU8YAY5+a +b0VWmd4cpFalCuifqeCwl9sufyVB61TN5NnSzM4vHLZukPIokZn9onKjWCfayze/ +aSoTH7h/CIiYg7IIgAGPMOquU76Uyrsun5M034x9wZ4lobNyP5MFsPNhAmqJz+I/ +c49FQWO7NhPDZKfAGajOK2jx33MopYtOxr2SyObFqBH8VhAGPdF1XYlC3HBYjQ44 +4uXTeJ5AtTFOEdOYiGtyztR9am4QVrl1GOaO/ZHLDWXI5HHNNrAuQ7lI0u7NP4BS +mUqfOH+/AJL7srrgd0hWNGn7mnTQsHEIzt/cpZ+AfU93FQl8u7We4QQSjXMA3qPX +TXu9F1aEg9z2do/m/uWeYI3b8d8sE2i0Unon91Cb291EN6h5RWw= +=lzWN +-----END PGP SIGNATURE----- diff --git a/util-linux-2.35.1.tar.xz b/util-linux-2.35.1.tar.xz new file mode 100644 index 0000000..1e6fa36 --- /dev/null +++ b/util-linux-2.35.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9 +size 5138360 diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index fed1632..a4b74cc 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Mon Apr 6 23:07:48 CEST 2020 - Stanislav Brabec + +- Update to version 2.35.1: + * agetty: add --show-issue, support for /run/issue and + * fdisk: Correct handling of hybrid MBR, cleanup wipe warning, + use 'r' to return from MBR to GPT. + * lsblk: FSVER column, + drop e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch. + * lscpu: Add HiSilicon aarch64 tsv110 cpupart, add a new columns + to --cache. + * mount: add --target-prefix. + * mountpoint: add --nofollow option. + * script: add --echo, --log-in, --logging-format, --log-out and + --log-timing. + * scriptlive: new command. + * scriptreplay: add --log-* options, --cr-mode, --stream, + --summary, -T --log-timing. + * sfdisk: add progress bars. + * unshare: add --keep-caps and --map-current-user options. + * Many other fixes and improvements, see: + https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35-ReleaseNotes + https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35.1-ReleaseNotes +- Refresh libeconf.patch. + +------------------------------------------------------------------- +Mon Apr 6 14:47:56 UTC 2020 - Ignaz Forster + +- Add libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch: + Avoid triggering autofs in lookup_umount_fs_by_statfs + (boo#1168389) + ------------------------------------------------------------------- Tue Oct 8 14:48:15 CEST 2019 - kukuk@suse.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 071ea2b..1c82200 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -122,10 +122,10 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.34 +Version: 2.35.1 Release: 0 URL: https://www.kernel.org/pub/linux/utils/util-linux/ -Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz +Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh Source4: raw.service @@ -136,7 +136,7 @@ Source8: login.pamd Source9: remote.pamd Source10: su.pamd Source11: su.default -Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.sign +Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-%{version}.tar.sign Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd @@ -147,7 +147,7 @@ Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch Patch3: libeconf.patch -Patch813: e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch +Patch4: libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -413,7 +413,7 @@ cp -a %{S:2} . %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch813 -p1 +%patch4 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects @@ -605,6 +605,8 @@ export TS_OPT_script_known_fail="yes" # may segfault on qemu-user-space export TS_OPT_misc_setarch_known_fail="yes" %endif +# This does not work with a chroot build: / is not a mountpoint +export TS_OPT_misc_mountpoint_known_fail="yes" # # hacks export PATH="$PATH:/sbin:/usr/sbin" @@ -996,6 +998,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_bindir}/renice %{_bindir}/rev %{_bindir}/script +%{_bindir}/scriptlive %{_bindir}/scriptreplay %{_bindir}/setarch %{_bindir}/setpriv @@ -1096,6 +1099,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_mandir}/man1/setpriv.1.gz %{_mandir}/man1/setsid.1.gz %{_mandir}/man1/script.1.gz +%{_mandir}/man1/scriptlive.1.gz %{_mandir}/man1/scriptreplay.1.gz %{_mandir}/man1/setterm.1.gz %{_mandir}/man1/taskset.1.gz diff --git a/util-linux.changes b/util-linux.changes index 8e38215..a4b74cc 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Apr 6 23:07:48 CEST 2020 - Stanislav Brabec + +- Update to version 2.35.1: + * agetty: add --show-issue, support for /run/issue and + * fdisk: Correct handling of hybrid MBR, cleanup wipe warning, + use 'r' to return from MBR to GPT. + * lsblk: FSVER column, + drop e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch. + * lscpu: Add HiSilicon aarch64 tsv110 cpupart, add a new columns + to --cache. + * mount: add --target-prefix. + * mountpoint: add --nofollow option. + * script: add --echo, --log-in, --logging-format, --log-out and + --log-timing. + * scriptlive: new command. + * scriptreplay: add --log-* options, --cr-mode, --stream, + --summary, -T --log-timing. + * sfdisk: add progress bars. + * unshare: add --keep-caps and --map-current-user options. + * Many other fixes and improvements, see: + https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35-ReleaseNotes + https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35.1-ReleaseNotes +- Refresh libeconf.patch. + ------------------------------------------------------------------- Mon Apr 6 14:47:56 UTC 2020 - Ignaz Forster diff --git a/util-linux.spec b/util-linux.spec index bc92281..4832b03 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -122,10 +122,10 @@ BuildRequires: libmount-devel %endif %endif #END SECOND STAGE DEPENDENCIES -Version: 2.34 +Version: 2.35.1 Release: 0 URL: https://www.kernel.org/pub/linux/utils/util-linux/ -Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.xz +Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh Source4: raw.service @@ -136,7 +136,7 @@ Source8: login.pamd Source9: remote.pamd Source10: su.pamd Source11: su.default -Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-%{version}.tar.sign +Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-%{version}.tar.sign Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd @@ -148,7 +148,6 @@ Patch1: libmount-print-a-blacklist-hint-for-unknown-filesyst.patch Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch Patch3: libeconf.patch Patch4: libmount-Avoid-triggering-autofs-in-lookup_umount_fs.patch -Patch813: e3bb9bfb76c17b1d05814436ced62c05c4011f48.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -415,7 +414,6 @@ cp -a %{S:2} . %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch813 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects @@ -607,6 +605,8 @@ export TS_OPT_script_known_fail="yes" # may segfault on qemu-user-space export TS_OPT_misc_setarch_known_fail="yes" %endif +# This does not work with a chroot build: / is not a mountpoint +export TS_OPT_misc_mountpoint_known_fail="yes" # # hacks export PATH="$PATH:/sbin:/usr/sbin" @@ -998,6 +998,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_bindir}/renice %{_bindir}/rev %{_bindir}/script +%{_bindir}/scriptlive %{_bindir}/scriptreplay %{_bindir}/setarch %{_bindir}/setpriv @@ -1098,6 +1099,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_mandir}/man1/setpriv.1.gz %{_mandir}/man1/setsid.1.gz %{_mandir}/man1/script.1.gz +%{_mandir}/man1/scriptlive.1.gz %{_mandir}/man1/scriptreplay.1.gz %{_mandir}/man1/setterm.1.gz %{_mandir}/man1/taskset.1.gz