sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 504838 from home:sbrabec:branches:util-linux-2.30

Browse Source 
Merge requests 502438 and 503441.

OBS-URL: https://build.opensuse.org/request/show/504838
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=343
This commit is contained in:
Stanislav Brabec 2017-06-19 16:44:47 +00:00 committed by Git OBS Bridge
parent b2cb9e6712
commit 339c0d8779
14 changed files with 353 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
arm64-lscpu-use-sysfs-for-table-access-if-available.patch
View File

@ -1,71 +0,0 @@
Return-Path: <ard.biesheuvel@linaro.org>
Delivered-To: agraf@imap.suse.de
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: util-linux-ng@vger.kernel.org
Cc: leif.lindholm@linaro.org,
agraf@suse.de,
kzak@redhat.com,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH] lspcu: use sysfs for table access if available
Date: Wed, 12 Apr 2017 10:11:29 +0100
Message-Id: <20170412091129.27283-1-ard.biesheuvel@linaro.org>
X-Mailer: git-send-email 2.9.3
On ARM systems, accessing SMBIOS tables via /dev/mem using read()
calls is not supported. The reason is that such tables are usually
located in EFI_RUNTIME_SERVICE_DATA memory, which is not covered
by the linear mapping on those systems, and so read() calls will
fail.
So instead, use the /sys/firmware/dmi/tables/DMI sysfs file, which
contains the entire structure table array, and will be available
on any recent Linux system, even on ones that only export the rev3
SMBIOS entry point, which is currently ignored by lscpu.
Note that the max 'num' value is inferred from the size. This is not
a limitation of the sysfs interface, but a limitation of the rev3
entry point, which no longer carries a number of array elements.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
sys-utils/lscpu-dmi.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/sys-utils/lscpu-dmi.c b/sys-utils/lscpu-dmi.c
index 0e497d10c..a8298ff74 100644
--- a/sys-utils/lscpu-dmi.c
+++ b/sys-utils/lscpu-dmi.c
@@ -192,6 +192,18 @@ static int hypervisor_decode_smbios(uint8_t *buf, const char *devmem)
devmem);
}
+static int hypervisor_decode_sysfw(void)
+{
+ static char const sys_fw_dmi_tables[] = "/sys/firmware/dmi/tables/DMI";
+ struct stat st;
+
+ if (stat(sys_fw_dmi_tables, &st))
+ return -1;
+
+ return hypervisor_from_dmi_table(0, st.st_size, st.st_size / 4,
+ sys_fw_dmi_tables);
+}
+
/*
* Probe for EFI interface
*/
@@ -242,6 +254,10 @@ int read_hypervisor_dmi(void)
|| '\0' != 0)
return rc;
+ rc = hypervisor_decode_sysfw();
+ if (rc >= 0)
+ return rc;
+
/* First try EFI (ia64, Intel-based Mac) */
switch (address_from_efi(&fp)) {
case EFI_NOT_FOUND:
--
2.11.0

4
mkzimage_cmdline.c
View File

@ -162,9 +162,9 @@ int main(int argc, char **argv)
if (clear)
memset(s, 0x0, tmp - s);
if (set)
snprintf(s, tmp - s, "%s", string);
snprintf((char*)s, tmp - s, "%s", string);
} else {
fprintf(stdout, "cmd_line size:%d\n", tmp - s);
fprintf(stdout, "cmd_line size:%td\n", tmp - s);
fprintf(stdout, "cmd_line: %s\n", s);
fprintf(stdout, "active: %c\n", *active);
}

49
python-libmount.changes
View File

@ -5,6 +5,47 @@ Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de
which wants to use a different release number scheme (lp150.x which produces
lower numbers than the conflict).
-------------------------------------------------------------------
Thu Jun 8 21:21:12 UTC 2017 - sweet_f_a@gmx.de
- Update to version 2.30:
* Many changes and improvements, most notably:
* The libblkid library has been improved for hybrid CDROM/DVD
media.
* The deprecated command tailf has been removed. Use "tail -f"
from coreutils.
* blkzone -- NEW COMMAND to run zone commands on block devices
that support Zoned Block Commands (ZBC) or Zoned-device ATA
Commands (ZAC).
* fincore -- NEW COMMAND to count pages of file contents in
core (memory).
* lsmem -- NEW COMMAND to list the ranges of available memory
with their online status.
* The command fallocate -- supports an "insert range" operation
now.
* The command "column -t|--table" has been modified to use
libsmartcols. It now provides nearly all of that library's
functionality from the command line.
* Security issues:
* hwclock - no longer makes any internal permission checks. The
System Administrator must set proper permissions to control
user access to the RTC. It is NOT recommended to use SUID.
* CVE-2016-2779 - This security issue is NOT FIXED yet.
* More details at:
https://www.kernel.org/pub/linux/utils/util-linux/v2.30/v2.30-ReleaseNotes
- Drop upstreamed patch
arm64-lscpu-use-sysfs-for-table-access-if-available.patch
- Refreshed patch
util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
- fix compiler warnings for mkzimage_cmdline
-------------------------------------------------------------------
Thu Jun 8 16:28:41 UTC 2017 - msuchanek@suse.com
- When when hypervisor_decode_sysfw fails continue with other
detection methods (bsc#1042991, bsc#1039360, bsc#1033718)
+ util-linux-lscpu-cleanup-DMI-detection-return-codes.patch
-------------------------------------------------------------------
Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com
@ -185,13 +226,13 @@ Tue Nov 8 15:11:37 UTC 2016 - sweet_f_a@gmx.de
Wed Sep 7 12:43:31 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28.2, bugfix release, see
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.2-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.30/v2.30-ReleaseNotes
-------------------------------------------------------------------
Thu Aug 11 13:24:34 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28.1, bugfix release, see
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.1-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.1-ReleaseNotes
- Remove util-linux-libblkid-wipe-offset.patch (upstream)
- use the new configure option --enable-libuuid-force-uuidd
instead of sed'ing configure.ac
@ -300,7 +341,7 @@ Tue Dec 1 10:27:17 UTC 2015 - sweet_f_a@gmx.de
Wed Nov 11 15:46:46 UTC 2015 - sweet_f_a@gmx.de
- Update to version 2.27.1, bugfix release, see
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/v2.27.1-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.27/v2.27.1-ReleaseNotes
(fixes bsc#950778, FATE#320552).
-------------------------------------------------------------------
@ -1855,7 +1896,7 @@ Fri Jul 9 06:23:27 UTC 2010 - puzel@novell.com
- new commands: findmnt, fsfreeze, swaplabel
- blkid: new option "-i" to print I/O limits
- full release notes:
ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.18/v2.18-ReleaseNotes
- update to adjtimex-1.28
- update to which-2.20
- drop util-linux-2.14.1-mount_skip_sync.patch (fixed upstream)

33
python-libmount.spec
View File

@ -73,7 +73,7 @@ Name: python-libmount
%endif
Summary: %main_summary
License: GPL-2.0+
Group: %group_pl
Group: %main_group
BuildRequires: audit-devel
BuildRequires: bc
BuildRequires: binutils-devel
@ -116,7 +116,7 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.29.2
Version: 2.30
Release: 0
# util-linux is a base package and uuidd pre-requiring pwdutils pulls
# that into the core build cycle. pwdutils also pulls in the whole
@ -125,7 +125,7 @@ Release: 0
# these tools as well
#!BuildIgnore: pwdutils
Url: https://www.kernel.org/pub/linux/utils/util-linux/
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-%{version}.tar.xz
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.30/util-linux-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source4: raw.service
Source5: etc.raw
@ -135,7 +135,7 @@ Source8: login.pamd
Source9: remote.pamd
Source10: su.pamd
Source11: su.default
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-%{version}.tar.sign
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.30/util-linux-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
@ -157,8 +157,8 @@ Source51: blkid.conf
Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
# PATCH-FEATURE-SLE util-linux-losetup-Add-support-for-setting-logical-blocksize.patch bsc931634 FATE319010 hare@suse.de -- Add support for setting logical blocksizes.
Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
# PATCH-BUG-FIX arm64-lscpu-use-sysfs-for-table-access-if-available.patch bsc#1033718 agraf@suse.de -- Use SMBIOS3 tables when available in lscpu
Patch2: arm64-lscpu-use-sysfs-for-table-access-if-available.patch
# PATCH-BUG-FIX util-linux-lscpu-cleanup-DMI-detection-return-codes.patch bsc#1039360 msuchanek@suse.de -- lscpu: cleanup DMI detection return codes
Patch2: util-linux-lscpu-cleanup-DMI-detection-return-codes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%if %build_util_linux
@ -398,7 +398,6 @@ SMP systems.
%if %build_util_linux
%package -n python-libmount
Summary: %summary_pl
License: GPL-2.0+
Group: %group_pl
%description -n python-libmount
@ -604,6 +603,7 @@ make %{?_smp_mflags}
export TS_OPT_fdisk_gpt_known_fail="yes"
export TS_OPT_fdisk_oddinput_known_fail="yes"
export TS_OPT_fdisk_sunlabel_known_fail="yes"
export TS_OPT_fincore_count_known_fail="yes"
export TS_OPT_libfdisk_gpt_known_fail="yes"
export TS_OPT_misc_flock_known_fail="yes"
export TS_OPT_misc_ionice_known_fail="yes"
@ -613,7 +613,7 @@ export TS_OPT_kill_print_pid_known_fail="yes"
export TS_OPT_kill_queue_known_fail="yes"
export TS_OPT_uuid_uuidd_known_fail="yes"
# unsupported syscall in script(1) ... might be fixed in qemu
export TS_OPT_script_known_fail="yes"
export TS_OPT_script_known_fail="yes"
# may segfault on qemu-user-space
export TS_OPT_misc_setarch_known_fail="yes"
%endif
@ -937,6 +937,7 @@ done
%{_bindir}/su
%{_bindir}/eject
%{_bindir}/cal
%{_bindir}/chmem
%{_bindir}/chrt
%{_bindir}/col
%{_bindir}/colcrt
@ -944,6 +945,7 @@ done
%{_bindir}/column
%{_bindir}/dmesg
%{_bindir}/fallocate
%{_bindir}/fincore
%{_bindir}/findmnt
%{_bindir}/flock
%{_bindir}/getopt
@ -963,6 +965,7 @@ done
%{_bindir}/lscpu
%{_bindir}/lsipc
%{_bindir}/lslocks
%{_bindir}/lsmem
%{_bindir}/lsns
%{_bindir}/mcookie
%{_bindir}/mesg
@ -979,7 +982,6 @@ done
%{_bindir}/setarch
%{_bindir}/setpriv
%{_bindir}/setsid
%{_bindir}/tailf
%{_bindir}/taskset
%{_bindir}/ul
%{_bindir}/umount
@ -997,6 +999,10 @@ done
%{_sbindir}/agetty
%{_sbindir}/blkid
%{_sbindir}/blkdiscard
# blkzone depends on linux/blkzoned.h
%if 0%{?suse_version} >= 1330
%{_sbindir}/blkzone
%endif
%{_sbindir}/blockdev
%{_sbindir}/chcpu
%{_sbindir}/ctrlaltdel
@ -1044,6 +1050,7 @@ done
%{_mandir}/man1/dmesg.1.gz
%{_mandir}/man1/eject.1.gz
%{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/fincore.1.gz
%{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz
%{_mandir}/man1/hexdump.1.gz
@ -1058,6 +1065,7 @@ done
%{_mandir}/man1/look.1.gz
%{_mandir}/man1/lscpu.1.gz
%{_mandir}/man1/lsipc.1.gz
%{_mandir}/man1/lsmem.1.gz
%{_mandir}/man1/mcookie.1.gz
%{_mandir}/man1/mesg.1.gz
%{_mandir}/man1/more.1.gz
@ -1073,7 +1081,6 @@ done
%{_mandir}/man1/script.1.gz
%{_mandir}/man1/scriptreplay.1.gz
%{_mandir}/man1/setterm.1.gz
%{_mandir}/man1/tailf.1.gz
%{_mandir}/man1/taskset.1.gz
%{_mandir}/man1/ul.1.gz
%{_mandir}/man1/unshare.1.gz
@ -1089,9 +1096,13 @@ done
%{_mandir}/man5/terminal-colors.d.5.gz
%{_mandir}/man8/addpart.8.gz
%{_mandir}/man8/agetty.8.gz
%if 0%{?suse_version} >= 1330
%{_mandir}/man8/blkzone.8.gz
%endif
%{_mandir}/man8/blockdev.8.gz
%{_mandir}/man8/delpart.8.gz
%{_mandir}/man8/chmem.8.gz
%{_mandir}/man8/ctrlaltdel.8.gz
%{_mandir}/man8/delpart.8.gz
%{_mandir}/man8/blkid.8.gz
%{_mandir}/man8/blkdiscard.8.gz
%{_mandir}/man8/switch_root.8.gz

17
util-linux-2.29.2.tar.sign
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJYrYE9AAoJEOS3HV7sOcKEjB4P/2gYS9GoYqlJaCmPj+cpRl3u
nvKd3xl6HbDZVusmj3lTdXVUZu2UF0BzZa4jp/yErzjVyKEqwXij6IE/hX2GoyU1
brqw8p9lWX7ARZAXc2v0B+u6Js8O1RY1hnprn+8L9MeJeGUxT4h2QqXmPk1gZrjb
b41yQhU21lAz3YSVf5zsmTy2wmgFZ8b8y3MYfLB9dWgCrL74xxCb3598YXf1tgG/
Ig3oThWL2Z5in3GTPwPhawu/lNQxHgxVxVUL7ntLtdiqrdX+jG7FXEtgpOpiGtvg
T4U5iJt7kQhFZC2xMFhRa8nxW+LnuqR7k2vW8qwjGpH0NqBhMPOmHutgjfcHZ9iI
ENjQ2eVGo3kmniWZ5LgH+vVtf070QIoV5kCV8zSmMvGuCImamFxUcIqqSyhD6Z1V
aQWxhOj7PylxiOXDH7v0Uvo9euv9/Odv8AWWwJSn7nDGpu2o5jHSRxC2/r4nOqog
+SgQt+4vfD0Loei11ORimSEozeUmlvF/Wgdg+2XzHm3zRgI7pw+yB70xrn/TwPKz
iIL7jgwrlVe30QTjsht4KFFAVED0yJRwU2vZnVe71CaWwiVWcO5n5NsWZVg0RNvJ
xTwHbxs1JwLajgooQJ3YWnV1/b5vVZJFwMsrBNz8DLpZdKeIjdUVYZixN+l6uaSC
B+QbU2NQcwl0rESmYnzv
=V43B
-----END PGP SIGNATURE-----

3
util-linux-2.29.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3
size 4277668

17
util-linux-2.30.tar.sign Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJZMUBLAAoJEOS3HV7sOcKEr9IP/i90Hc8Tiukh8Hlap02p4uWa
t083KEdi79a7H7vhCKNPjM8bkeod8F5/I+61uhSc9r4QoEpKX0vk8UU69NVK3gn1
RntwmuXjZB4ZR+aDN6vmp3uuZlPEMG6em8dgiO+Gjy61xRGw9Krxo6+jyTvTzouT
bZsPy3JnVRXg0toawyR39ScRjGiLjb5P+3KMoJK8R6MUbkOMCgAN73yx6UHBkzb3
n0zAALs10Y4OfYaIA4R+mcq4AKvPPsb/eCXTia75aThv/uFvdEpXK2wDYeUmjJmH
eVqTU2zYrhWvueu3FW7suAx/6o+ijGWD8ROu9Dd6sHnUK9mGLomxfxTthh2UlBES
23ZJBLLoIDPL+aUKq3EYeIsqLMf4eRaRUb5VIHwEZwcMqWvSvVZJGlk0WR3SzhfQ
UCAGWEE6ifQskVg6QbAZe8qFybbiTcH5onqKUJ2DlDiP53Kk8+0YKxhkNLulFoU1
XrN0hqRP7z2BtlrSzhGt25heExfnMMIelpiqYb2jVtbXV9s5/0jKZT4x2CRFhZ86
EHKvN1W0gtzMD1ZOLVEj1MaopS68TvmLooxf+x4Ns5GPGMReILWqwNWklwqXFGjs
P91JD3l6opcoUMO2xjVpVIcH6oLhXeLfAFEmUggrdmk/Jm4kjYQZAUi1ByWrJg30
3fOzxEEoirUWP5cZoV5B
=8KFU
-----END PGP SIGNATURE-----

3
util-linux-2.30.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d
size 4478016

78
util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
View File

@ -1,7 +1,20 @@
Index: util-linux-2.29/include/loopdev.h
===================================================================
--- util-linux-2.29.orig/include/loopdev.h
+++ util-linux-2.29/include/loopdev.h
From a60cc5c2eeaad7ea5ea0c4a74cc4af5e2dc3f6c2 Mon Sep 17 00:00:00 2001
From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Tue, 4 Apr 2017 16:29:58 +0200
Subject: [PATCH]
util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
include/loopdev.h | 5 ++++-
lib/loopdev.c | 20 ++++++++++++++++++++
sys-utils/losetup.c | 19 +++++++++++++++----
3 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/include/loopdev.h b/include/loopdev.h
index 953d2db..7c783bf 100644
--- a/include/loopdev.h
+++ b/include/loopdev.h
@@ -41,6 +41,7 @@ enum {
LO_FLAGS_AUTOCLEAR = 4, /* kernel >= 2.6.25 */
LO_FLAGS_PARTSCAN = 8, /* kernel >= 3.2 */
@ -20,7 +33,7 @@ Index: util-linux-2.29/include/loopdev.h
};
/*
@@ -173,6 +175,7 @@ int loopcxt_set_offset(struct loopdev_cx
@@ -173,6 +175,7 @@ int loopcxt_set_offset(struct loopdev_cxt *lc, uint64_t offset);
int loopcxt_set_sizelimit(struct loopdev_cxt *lc, uint64_t sizelimit);
int loopcxt_set_flags(struct loopdev_cxt *lc, uint32_t flags);
int loopcxt_set_backing_file(struct loopdev_cxt *lc, const char *filename);
@ -28,11 +41,11 @@ Index: util-linux-2.29/include/loopdev.h
extern char *loopcxt_get_backing_file(struct loopdev_cxt *lc);
extern int loopcxt_get_backing_devno(struct loopdev_cxt *lc, dev_t *devno);
Index: util-linux-2.29/lib/loopdev.c
===================================================================
--- util-linux-2.29.orig/lib/loopdev.c
+++ util-linux-2.29/lib/loopdev.c
@@ -1115,6 +1115,26 @@ int loopcxt_set_backing_file(struct loop
diff --git a/lib/loopdev.c b/lib/loopdev.c
index fd4f166..b85e2ce 100644
--- a/lib/loopdev.c
+++ b/lib/loopdev.c
@@ -1115,6 +1115,26 @@ int loopcxt_set_backing_file(struct loopdev_cxt *lc, const char *filename)
}
/*
@ -59,19 +72,19 @@ Index: util-linux-2.29/lib/loopdev.c
* In kernels prior to v3.9, if the offset or sizelimit options
* are used, the block device's size won't be synced automatically.
* blockdev --getsize64 and filesystems will use the backing
Index: util-linux-2.29/sys-utils/losetup.c
===================================================================
--- util-linux-2.29.orig/sys-utils/losetup.c
+++ util-linux-2.29/sys-utils/losetup.c
@@ -398,6 +398,7 @@ static void usage(FILE *out)
diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index 2218d3b..d8f1bfa 100644
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -399,6 +399,7 @@ static void usage(FILE *out)
fputs(USAGE_SEPARATOR, out);
fputs(_(" -o, --offset <num> start at offset <num> into file\n"), out);
fputs(_(" --sizelimit <num> device is limited to <num> bytes of the file\n"), out);
+ fputs(_(" --logical-blocksize <size> set the logical block size to <size>\n"), out);
fputs(_(" -P, --partscan create a partitioned loop device\n"), out);
fputs(_(" -r, --read-only set up a read-only loop device\n"), out);
fputs(_(" --direct-io[=<on|off>] open backing file with O_DIRECT\n"), out);
@@ -447,7 +448,8 @@ static void warn_size(const char *filena
@@ -448,7 +449,8 @@ static void warn_size(const char *filename, uint64_t size)
static int create_loop(struct loopdev_cxt *lc,
int nooverlap, int lo_flags, int flags,
@ -81,7 +94,7 @@ Index: util-linux-2.29/sys-utils/losetup.c
{
int hasdev = loopcxt_has_device(lc);
int rc = 0;
@@ -533,6 +535,8 @@ static int create_loop(struct loopdev_cx
@@ -534,6 +536,8 @@ static int create_loop(struct loopdev_cxt *lc,
loopcxt_set_offset(lc, offset);
if (flags & LOOPDEV_FL_SIZELIMIT)
loopcxt_set_sizelimit(lc, sizelimit);
@ -90,7 +103,7 @@ Index: util-linux-2.29/sys-utils/losetup.c
if (lo_flags)
loopcxt_set_flags(lc, lo_flags);
if ((rc = loopcxt_set_backing_file(lc, file))) {
@@ -561,7 +565,7 @@ int main(int argc, char **argv)
@@ -562,7 +566,7 @@ int main(int argc, char **argv)
struct loopdev_cxt lc;
int act = 0, flags = 0, no_overlap = 0, c;
char *file = NULL;
@ -99,7 +112,7 @@ Index: util-linux-2.29/sys-utils/losetup.c
int res = 0, showdev = 0, lo_flags = 0;
char *outarg = NULL;
int list = 0;
@@ -571,7 +575,8 @@ int main(int argc, char **argv)
@@ -572,7 +576,8 @@ int main(int argc, char **argv)
OPT_SIZELIMIT = CHAR_MAX + 1,
OPT_SHOW,
OPT_RAW,
@ -108,16 +121,16 @@ Index: util-linux-2.29/sys-utils/losetup.c
+ OPT_BLOCKSIZE,
};
static const struct option longopts[] = {
{ "all", 0, 0, 'a' },
@@ -584,6 +589,7 @@ int main(int argc, char **argv)
{ "associated", 1, 0, 'j' },
{ "json", 0, 0, 'J' },
{ "list", 0, 0, 'l' },
+ { "logical-blocksize", 1, 0, OPT_BLOCKSIZE },
{ "noheadings", 0, 0, 'n' },
{ "offset", 1, 0, 'o' },
{ "output", 1, 0, 'O' },
@@ -657,6 +663,10 @@ int main(int argc, char **argv)
{ "all", no_argument, NULL, 'a' },
@@ -585,6 +590,7 @@ int main(int argc, char **argv)
{ "associated", required_argument, NULL, 'j' },
{ "json", no_argument, NULL, 'J' },
{ "list", no_argument, NULL, 'l' },
+ { "logical-blocksize", required_argument, NULL, OPT_BLOCKSIZE },
{ "noheadings", no_argument, NULL, 'n' },
{ "offset", required_argument, NULL, 'o' },
{ "output", required_argument, NULL, 'O' },
@@ -658,6 +664,10 @@ int main(int argc, char **argv)
act = A_SHOW;
file = optarg;
break;
@ -128,7 +141,7 @@ Index: util-linux-2.29/sys-utils/losetup.c
case 'l':
list = 1;
break;
@@ -789,7 +799,8 @@ int main(int argc, char **argv)
@@ -790,7 +800,8 @@ int main(int argc, char **argv)
switch (act) {
case A_CREATE:
@ -138,3 +151,6 @@ Index: util-linux-2.29/sys-utils/losetup.c
if (res == 0) {
if (showdev)
printf("%s\n", loopcxt_get_device(&lc));
--
1.8.5.6

85
util-linux-lscpu-cleanup-DMI-detection-return-codes.patch Normal file
View File

@ -0,0 +1,85 @@
From c972852b29391c35b1d5c7d3e1e6413e0cc86908 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 13 Jun 2017 12:15:11 +0200
Subject: [PATCH] lscpu: cleanup DMI detection return codes
Michal wrote:
There is weird mix of logic in lscpu-dmi.c which sometimes returns 0 and
sometimes -1 on error. Since most checks are if (rc) goto done; this
bails out early on error skipping some detection methods. Further, in
lscpu.c all following detections are guarder by if(hyper) so returning
-1 causes all following methods to be skipped.
Reported-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
sys-utils/lscpu-dmi.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/sys-utils/lscpu-dmi.c b/sys-utils/lscpu-dmi.c
index 3ba999124a2e..4b845b97ccd9 100644
--- a/sys-utils/lscpu-dmi.c
+++ b/sys-utils/lscpu-dmi.c
@@ -174,7 +174,7 @@ done:
static int hypervisor_decode_legacy(uint8_t *buf, const char *devmem)
{
if (!checksum(buf, 0x0F))
- return HYPER_NONE;
+ return -1;
return hypervisor_from_dmi_table(DWORD(buf + 0x08), WORD(buf + 0x06),
WORD(buf + 0x0C),
@@ -254,11 +254,15 @@ int read_hypervisor_dmi(void)
|| sizeof(uint16_t) != 2
|| sizeof(uint32_t) != 4
|| '\0' != 0)
- return rc;
+ goto done;
+ /* -1 : no DMI in /sys,
+ * 0 : DMI exist, nothing detected (HYPER_NONE)
+ * >0 : hypervisor detected
+ */
rc = hypervisor_decode_sysfw();
- if (rc >= 0)
- return rc;
+ if (rc >= HYPER_NONE)
+ goto done;
/* First try EFI (ia64, Intel-based Mac) */
switch (address_from_efi(&fp)) {
@@ -273,8 +277,9 @@ int read_hypervisor_dmi(void)
goto done;
rc = hypervisor_decode_smbios(buf, _PATH_DEV_MEM);
- if (rc)
+ if (rc >= HYPER_NONE)
goto done;
+
free(buf);
buf = NULL;
memory_scan:
@@ -287,17 +292,17 @@ memory_scan:
for (fp = 0; fp <= 0xFFF0; fp += 16) {
if (memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0) {
rc = hypervisor_decode_smbios(buf + fp, _PATH_DEV_MEM);
- if (rc == -1)
+ if (rc < 0)
fp += 16;
} else if (memcmp(buf + fp, "_DMI_", 5) == 0)
rc = hypervisor_decode_legacy(buf + fp, _PATH_DEV_MEM);
- if (rc >= 0)
+ if (rc >= HYPER_NONE)
break;
}
#endif
done:
free(buf);
- return rc;
+ return rc < 0 ? HYPER_NONE : rc;
}
--
2.12.3

49
util-linux-systemd.changes
View File

@ -5,6 +5,47 @@ Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de
which wants to use a different release number scheme (lp150.x which produces
lower numbers than the conflict).
-------------------------------------------------------------------
Thu Jun 8 21:21:12 UTC 2017 - sweet_f_a@gmx.de
- Update to version 2.30:
* Many changes and improvements, most notably:
* The libblkid library has been improved for hybrid CDROM/DVD
media.
* The deprecated command tailf has been removed. Use "tail -f"
from coreutils.
* blkzone -- NEW COMMAND to run zone commands on block devices
that support Zoned Block Commands (ZBC) or Zoned-device ATA
Commands (ZAC).
* fincore -- NEW COMMAND to count pages of file contents in
core (memory).
* lsmem -- NEW COMMAND to list the ranges of available memory
with their online status.
* The command fallocate -- supports an "insert range" operation
now.
* The command "column -t|--table" has been modified to use
libsmartcols. It now provides nearly all of that library's
functionality from the command line.
* Security issues:
* hwclock - no longer makes any internal permission checks. The
System Administrator must set proper permissions to control
user access to the RTC. It is NOT recommended to use SUID.
* CVE-2016-2779 - This security issue is NOT FIXED yet.
* More details at:
https://www.kernel.org/pub/linux/utils/util-linux/v2.30/v2.30-ReleaseNotes
- Drop upstreamed patch
arm64-lscpu-use-sysfs-for-table-access-if-available.patch
- Refreshed patch
util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
- fix compiler warnings for mkzimage_cmdline
-------------------------------------------------------------------
Thu Jun 8 16:28:41 UTC 2017 - msuchanek@suse.com
- When when hypervisor_decode_sysfw fails continue with other
detection methods (bsc#1042991, bsc#1039360, bsc#1033718)
+ util-linux-lscpu-cleanup-DMI-detection-return-codes.patch
-------------------------------------------------------------------
Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com
@ -185,13 +226,13 @@ Tue Nov 8 15:11:37 UTC 2016 - sweet_f_a@gmx.de
Wed Sep 7 12:43:31 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28.2, bugfix release, see
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.2-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.30/v2.30-ReleaseNotes
-------------------------------------------------------------------
Thu Aug 11 13:24:34 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28.1, bugfix release, see
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.1-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.1-ReleaseNotes
- Remove util-linux-libblkid-wipe-offset.patch (upstream)
- use the new configure option --enable-libuuid-force-uuidd
instead of sed'ing configure.ac
@ -300,7 +341,7 @@ Tue Dec 1 10:27:17 UTC 2015 - sweet_f_a@gmx.de
Wed Nov 11 15:46:46 UTC 2015 - sweet_f_a@gmx.de
- Update to version 2.27.1, bugfix release, see
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/v2.27.1-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.27/v2.27.1-ReleaseNotes
(fixes bsc#950778, FATE#320552).
-------------------------------------------------------------------
@ -1855,7 +1896,7 @@ Fri Jul 9 06:23:27 UTC 2010 - puzel@novell.com
- new commands: findmnt, fsfreeze, swaplabel
- blkid: new option "-i" to print I/O limits
- full release notes:
ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.18/v2.18-ReleaseNotes
- update to adjtimex-1.28
- update to which-2.20
- drop util-linux-2.14.1-mount_skip_sync.patch (fixed upstream)

30
util-linux-systemd.spec
View File

@ -116,7 +116,7 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.29.2
Version: 2.30
Release: 0
# util-linux is a base package and uuidd pre-requiring pwdutils pulls
# that into the core build cycle. pwdutils also pulls in the whole
@ -125,7 +125,7 @@ Release: 0
# these tools as well
#!BuildIgnore: pwdutils
Url: https://www.kernel.org/pub/linux/utils/util-linux/
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-%{version}.tar.xz
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.30/util-linux-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source4: raw.service
Source5: etc.raw
@ -135,7 +135,7 @@ Source8: login.pamd
Source9: remote.pamd
Source10: su.pamd
Source11: su.default
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-%{version}.tar.sign
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.30/util-linux-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
@ -157,8 +157,8 @@ Source51: blkid.conf
Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
# PATCH-FEATURE-SLE util-linux-losetup-Add-support-for-setting-logical-blocksize.patch bsc931634 FATE319010 hare@suse.de -- Add support for setting logical blocksizes.
Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
# PATCH-BUG-FIX arm64-lscpu-use-sysfs-for-table-access-if-available.patch bsc#1033718 agraf@suse.de -- Use SMBIOS3 tables when available in lscpu
Patch2: arm64-lscpu-use-sysfs-for-table-access-if-available.patch
# PATCH-BUG-FIX util-linux-lscpu-cleanup-DMI-detection-return-codes.patch bsc#1039360 msuchanek@suse.de -- lscpu: cleanup DMI detection return codes
Patch2: util-linux-lscpu-cleanup-DMI-detection-return-codes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%if %build_util_linux
@ -603,6 +603,7 @@ make %{?_smp_mflags}
export TS_OPT_fdisk_gpt_known_fail="yes"
export TS_OPT_fdisk_oddinput_known_fail="yes"
export TS_OPT_fdisk_sunlabel_known_fail="yes"
export TS_OPT_fincore_count_known_fail="yes"
export TS_OPT_libfdisk_gpt_known_fail="yes"
export TS_OPT_misc_flock_known_fail="yes"
export TS_OPT_misc_ionice_known_fail="yes"
@ -612,7 +613,7 @@ export TS_OPT_kill_print_pid_known_fail="yes"
export TS_OPT_kill_queue_known_fail="yes"
export TS_OPT_uuid_uuidd_known_fail="yes"
# unsupported syscall in script(1) ... might be fixed in qemu
export TS_OPT_script_known_fail="yes"
export TS_OPT_script_known_fail="yes"
# may segfault on qemu-user-space
export TS_OPT_misc_setarch_known_fail="yes"
%endif
@ -936,6 +937,7 @@ done
%{_bindir}/su
%{_bindir}/eject
%{_bindir}/cal
%{_bindir}/chmem
%{_bindir}/chrt
%{_bindir}/col
%{_bindir}/colcrt
@ -943,6 +945,7 @@ done
%{_bindir}/column
%{_bindir}/dmesg
%{_bindir}/fallocate
%{_bindir}/fincore
%{_bindir}/findmnt
%{_bindir}/flock
%{_bindir}/getopt
@ -962,6 +965,7 @@ done
%{_bindir}/lscpu
%{_bindir}/lsipc
%{_bindir}/lslocks
%{_bindir}/lsmem
%{_bindir}/lsns
%{_bindir}/mcookie
%{_bindir}/mesg
@ -978,7 +982,6 @@ done
%{_bindir}/setarch
%{_bindir}/setpriv
%{_bindir}/setsid
%{_bindir}/tailf
%{_bindir}/taskset
%{_bindir}/ul
%{_bindir}/umount
@ -996,6 +999,10 @@ done
%{_sbindir}/agetty
%{_sbindir}/blkid
%{_sbindir}/blkdiscard
# blkzone depends on linux/blkzoned.h
%if 0%{?suse_version} >= 1330
%{_sbindir}/blkzone
%endif
%{_sbindir}/blockdev
%{_sbindir}/chcpu
%{_sbindir}/ctrlaltdel
@ -1043,6 +1050,7 @@ done
%{_mandir}/man1/dmesg.1.gz
%{_mandir}/man1/eject.1.gz
%{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/fincore.1.gz
%{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz
%{_mandir}/man1/hexdump.1.gz
@ -1057,6 +1065,7 @@ done
%{_mandir}/man1/look.1.gz
%{_mandir}/man1/lscpu.1.gz
%{_mandir}/man1/lsipc.1.gz
%{_mandir}/man1/lsmem.1.gz
%{_mandir}/man1/mcookie.1.gz
%{_mandir}/man1/mesg.1.gz
%{_mandir}/man1/more.1.gz
@ -1072,7 +1081,6 @@ done
%{_mandir}/man1/script.1.gz
%{_mandir}/man1/scriptreplay.1.gz
%{_mandir}/man1/setterm.1.gz
%{_mandir}/man1/tailf.1.gz
%{_mandir}/man1/taskset.1.gz
%{_mandir}/man1/ul.1.gz
%{_mandir}/man1/unshare.1.gz
@ -1088,9 +1096,13 @@ done
%{_mandir}/man5/terminal-colors.d.5.gz
%{_mandir}/man8/addpart.8.gz
%{_mandir}/man8/agetty.8.gz
%if 0%{?suse_version} >= 1330
%{_mandir}/man8/blkzone.8.gz
%endif
%{_mandir}/man8/blockdev.8.gz
%{_mandir}/man8/delpart.8.gz
%{_mandir}/man8/chmem.8.gz
%{_mandir}/man8/ctrlaltdel.8.gz
%{_mandir}/man8/delpart.8.gz
%{_mandir}/man8/blkid.8.gz
%{_mandir}/man8/blkdiscard.8.gz
%{_mandir}/man8/switch_root.8.gz

49
util-linux.changes
View File

@ -5,6 +5,47 @@ Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de
which wants to use a different release number scheme (lp150.x which produces
lower numbers than the conflict).
-------------------------------------------------------------------
Thu Jun 8 21:21:12 UTC 2017 - sweet_f_a@gmx.de
- Update to version 2.30:
* Many changes and improvements, most notably:
* The libblkid library has been improved for hybrid CDROM/DVD
media.
* The deprecated command tailf has been removed. Use "tail -f"
from coreutils.
* blkzone -- NEW COMMAND to run zone commands on block devices
that support Zoned Block Commands (ZBC) or Zoned-device ATA
Commands (ZAC).
* fincore -- NEW COMMAND to count pages of file contents in
core (memory).
* lsmem -- NEW COMMAND to list the ranges of available memory
with their online status.
* The command fallocate -- supports an "insert range" operation
now.
* The command "column -t|--table" has been modified to use
libsmartcols. It now provides nearly all of that library's
functionality from the command line.
* Security issues:
* hwclock - no longer makes any internal permission checks. The
System Administrator must set proper permissions to control
user access to the RTC. It is NOT recommended to use SUID.
* CVE-2016-2779 - This security issue is NOT FIXED yet.
* More details at:
https://www.kernel.org/pub/linux/utils/util-linux/v2.30/v2.30-ReleaseNotes
- Drop upstreamed patch
arm64-lscpu-use-sysfs-for-table-access-if-available.patch
- Refreshed patch
util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
- fix compiler warnings for mkzimage_cmdline
-------------------------------------------------------------------
Thu Jun 8 16:28:41 UTC 2017 - msuchanek@suse.com
- When when hypervisor_decode_sysfw fails continue with other
detection methods (bsc#1042991, bsc#1039360, bsc#1033718)
+ util-linux-lscpu-cleanup-DMI-detection-return-codes.patch
-------------------------------------------------------------------
Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com
@ -185,13 +226,13 @@ Tue Nov 8 15:11:37 UTC 2016 - sweet_f_a@gmx.de
Wed Sep 7 12:43:31 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28.2, bugfix release, see
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.2-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.30/v2.30-ReleaseNotes
-------------------------------------------------------------------
Thu Aug 11 13:24:34 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28.1, bugfix release, see
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.1-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.1-ReleaseNotes
- Remove util-linux-libblkid-wipe-offset.patch (upstream)
- use the new configure option --enable-libuuid-force-uuidd
instead of sed'ing configure.ac
@ -300,7 +341,7 @@ Tue Dec 1 10:27:17 UTC 2015 - sweet_f_a@gmx.de
Wed Nov 11 15:46:46 UTC 2015 - sweet_f_a@gmx.de
- Update to version 2.27.1, bugfix release, see
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/v2.27.1-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.27/v2.27.1-ReleaseNotes
(fixes bsc#950778, FATE#320552).
-------------------------------------------------------------------
@ -1855,7 +1896,7 @@ Fri Jul 9 06:23:27 UTC 2010 - puzel@novell.com
- new commands: findmnt, fsfreeze, swaplabel
- blkid: new option "-i" to print I/O limits
- full release notes:
ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ReleaseNotes
https://www.kernel.org/pub/linux/utils/util-linux/v2.18/v2.18-ReleaseNotes
- update to adjtimex-1.28
- update to which-2.20
- drop util-linux-2.14.1-mount_skip_sync.patch (fixed upstream)

30
util-linux.spec
View File

@ -116,7 +116,7 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.29.2
Version: 2.30
Release: 0
# util-linux is a base package and uuidd pre-requiring pwdutils pulls
# that into the core build cycle. pwdutils also pulls in the whole
@ -125,7 +125,7 @@ Release: 0
# these tools as well
#!BuildIgnore: pwdutils
Url: https://www.kernel.org/pub/linux/utils/util-linux/
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-%{version}.tar.xz
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.30/util-linux-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source4: raw.service
Source5: etc.raw
@ -135,7 +135,7 @@ Source8: login.pamd
Source9: remote.pamd
Source10: su.pamd
Source11: su.default
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-%{version}.tar.sign
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.30/util-linux-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
@ -157,8 +157,8 @@ Source51: blkid.conf
Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
# PATCH-FEATURE-SLE util-linux-losetup-Add-support-for-setting-logical-blocksize.patch bsc931634 FATE319010 hare@suse.de -- Add support for setting logical blocksizes.
Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
# PATCH-BUG-FIX arm64-lscpu-use-sysfs-for-table-access-if-available.patch bsc#1033718 agraf@suse.de -- Use SMBIOS3 tables when available in lscpu
Patch2: arm64-lscpu-use-sysfs-for-table-access-if-available.patch
# PATCH-BUG-FIX util-linux-lscpu-cleanup-DMI-detection-return-codes.patch bsc#1039360 msuchanek@suse.de -- lscpu: cleanup DMI detection return codes
Patch2: util-linux-lscpu-cleanup-DMI-detection-return-codes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%if %build_util_linux
@ -603,6 +603,7 @@ make %{?_smp_mflags}
export TS_OPT_fdisk_gpt_known_fail="yes"
export TS_OPT_fdisk_oddinput_known_fail="yes"
export TS_OPT_fdisk_sunlabel_known_fail="yes"
export TS_OPT_fincore_count_known_fail="yes"
export TS_OPT_libfdisk_gpt_known_fail="yes"
export TS_OPT_misc_flock_known_fail="yes"
export TS_OPT_misc_ionice_known_fail="yes"
@ -612,7 +613,7 @@ export TS_OPT_kill_print_pid_known_fail="yes"
export TS_OPT_kill_queue_known_fail="yes"
export TS_OPT_uuid_uuidd_known_fail="yes"
# unsupported syscall in script(1) ... might be fixed in qemu
export TS_OPT_script_known_fail="yes"
export TS_OPT_script_known_fail="yes"
# may segfault on qemu-user-space
export TS_OPT_misc_setarch_known_fail="yes"
%endif
@ -936,6 +937,7 @@ done
%{_bindir}/su
%{_bindir}/eject
%{_bindir}/cal
%{_bindir}/chmem
%{_bindir}/chrt
%{_bindir}/col
%{_bindir}/colcrt
@ -943,6 +945,7 @@ done
%{_bindir}/column
%{_bindir}/dmesg
%{_bindir}/fallocate
%{_bindir}/fincore
%{_bindir}/findmnt
%{_bindir}/flock
%{_bindir}/getopt
@ -962,6 +965,7 @@ done
%{_bindir}/lscpu
%{_bindir}/lsipc
%{_bindir}/lslocks
%{_bindir}/lsmem
%{_bindir}/lsns
%{_bindir}/mcookie
%{_bindir}/mesg
@ -978,7 +982,6 @@ done
%{_bindir}/setarch
%{_bindir}/setpriv
%{_bindir}/setsid
%{_bindir}/tailf
%{_bindir}/taskset
%{_bindir}/ul
%{_bindir}/umount
@ -996,6 +999,10 @@ done
%{_sbindir}/agetty
%{_sbindir}/blkid
%{_sbindir}/blkdiscard
# blkzone depends on linux/blkzoned.h
%if 0%{?suse_version} >= 1330
%{_sbindir}/blkzone
%endif
%{_sbindir}/blockdev
%{_sbindir}/chcpu
%{_sbindir}/ctrlaltdel
@ -1043,6 +1050,7 @@ done
%{_mandir}/man1/dmesg.1.gz
%{_mandir}/man1/eject.1.gz
%{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/fincore.1.gz
%{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz
%{_mandir}/man1/hexdump.1.gz
@ -1057,6 +1065,7 @@ done
%{_mandir}/man1/look.1.gz
%{_mandir}/man1/lscpu.1.gz
%{_mandir}/man1/lsipc.1.gz
%{_mandir}/man1/lsmem.1.gz
%{_mandir}/man1/mcookie.1.gz
%{_mandir}/man1/mesg.1.gz
%{_mandir}/man1/more.1.gz
@ -1072,7 +1081,6 @@ done
%{_mandir}/man1/script.1.gz
%{_mandir}/man1/scriptreplay.1.gz
%{_mandir}/man1/setterm.1.gz
%{_mandir}/man1/tailf.1.gz
%{_mandir}/man1/taskset.1.gz
%{_mandir}/man1/ul.1.gz
%{_mandir}/man1/unshare.1.gz
@ -1088,9 +1096,13 @@ done
%{_mandir}/man5/terminal-colors.d.5.gz
%{_mandir}/man8/addpart.8.gz
%{_mandir}/man8/agetty.8.gz
%if 0%{?suse_version} >= 1330
%{_mandir}/man8/blkzone.8.gz
%endif
%{_mandir}/man8/blockdev.8.gz
%{_mandir}/man8/delpart.8.gz
%{_mandir}/man8/chmem.8.gz
%{_mandir}/man8/ctrlaltdel.8.gz
%{_mandir}/man8/delpart.8.gz
%{_mandir}/man8/blkid.8.gz
%{_mandir}/man8/blkdiscard.8.gz
%{_mandir}/man8/switch_root.8.gz