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

Accepting request 487606 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/487606
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=217
This commit is contained in:
Dominique Leuenberger 2017-04-25 06:55:20 +00:00 committed by Git OBS Bridge
commit 8b5a4a0e85
12 changed files with 445 additions and 83 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 Normal file
View File

@ -0,0 +1,71 @@
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

106
python-libmount.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com
- Prefer sysfs exported SMBIOS3 tables in lscu (bsc#1033718)
+ arm64-lscpu-use-sysfs-for-table-access-if-available.patch
-------------------------------------------------------------------
Thu Apr 6 17:35:34 CEST 2017 - sbrabec@suse.com
- To cover release numbers of both SLE12 SP3 and Leap 42.3, relax
release based conflict with bash-completion from 13.1 to 10.
-------------------------------------------------------------------
Tue Apr 4 14:51:09 UTC 2017 - sweet_f_a@gmx.de
- fix util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
--logical-blocksize was behaving like --nooverlap
-------------------------------------------------------------------
Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com
- Conflict with old systemd-presets-branding to ensure correct
preset migration (boo#1029775, bsc#1012850).
-------------------------------------------------------------------
Thu Mar 16 22:44:12 CET 2017 - sbrabec@suse.com
- Drop "codepage" fstab migration needed for SuSE Linux < 9.1
(bsc#51950 (suse#36950)).
-------------------------------------------------------------------
Tue Feb 28 17:27:58 CET 2017 - sbrabec@suse.com
- Keep dependency on insserv and fillup for compatibilitiy reasons
in Leap 42.3. Too many poorly written packages depend on it.
(Marked as "sysv compatibility hack".)
-------------------------------------------------------------------
Wed Feb 22 22:00:05 UTC 2017 - sweet_f_a@gmx.de
- Update to version 2.29.2:
* su(1) security issue CVE-2017-2616 (bsc#1023041)
* minor bugfixes and enhancements
-------------------------------------------------------------------
Fri Feb 10 10:40:23 UTC 2017 - fbui@suse.com
@ -20,12 +64,48 @@ Wed Feb 8 18:16:22 CET 2017 - sbrabec@suse.com
- INCOMPATIBLE CHANGE for SLE12 SP3 and Leap 42.3:
losetup -L changes its meaning from SLE12 SP1&SP2 specific
--logical-blocksize to the upstream --nooverlap).
--logical-blocksize can be used only with long option.
--logical-blocksize can be used only with long option
(bsc#966891).
- Include SLE12 + Leap 42 exclusive feature, implemented by
hare@suse.de:
* losetup: Add support for setting logical blocksizes
(bsc#931634, FATE#319010)
+ util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
SLE12 & Leap 42 specific changes:
* Fix for SLE12: bsc#956540, SLE12 SP1: bsc#953691, Leap 42.1:
boo#954482, was obsoleted by the systemd update, and skipped.
* Remove --enable-ncurses that is intended to force non-wide
ncurses (boo#978993).
* Make release-dependent conflict with old sysvinit-tools SLE
specific, as it is required only for SLE 11 upgrade,
and breaks openSUSE staging builds (boo#994399).
* Obsolete these patches, now upstreamed:
* Drop upstreamed patches
(tests-script-race-on-force-only.patch,
util-linux-libmount-ignore-redundant-slashes.patch,
util-linux-sfdisk-show-pt-geometry-1.patch,
util-linux-sfdisk-show-pt-geometry-2.patch,
util-linux-sfdisk-show-pt-geometry-3.patch,
util-linux-libblkid-partition-loop.patch,
util-linux-libblkid-wipe-offset.patch,
util-linux-mount-reuse-loop-1.patch,
util-linux-mount-reuse-loop-2.patch,
util-linux-mount-reuse-loop-3.patch,
util-linux-mount-reuse-loop-4.patch,
util-linux-loop-reuse-01.patch, util-linux-loop-reuse-02.patch,
util-linux-loop-reuse-03.patch, util-linux-loop-reuse-04.patch,
util-linux-loop-reuse-05.patch, util-linux-loop-reuse-06.patch,
util-linux-loop-reuse-07.patch, util-linux-loop-reuse-08.patch,
util-linux-loop-reuse-09.patch, util-linux-loop-reuse-10.patch,
util-linux-loop-reuse-12.patch, util-linux-loop-reuse-13.patch,
util-linux-loop-reuse-14.patch, util-linux-loop-reuse-15.patch,
util-linux-loop-reuse-16.patch, util-linux-loop-reuse-17.patch,
util-linux-loop-reuse-18.patch, util-linux-loop-reuse-19.patch,
util-linux-loop-reuse-20.patch,
util-linux-libmount-cifs-is_mounted.patch).
* Refreshed patches
(make-sure-sbin-resp-usr-sbin-are-in-PATH.diff,
util-linux-losetup-Add-support-for-setting-logical-blocksize.patch).
-------------------------------------------------------------------
Tue Feb 7 20:07:55 CET 2017 - sbrabec@suse.com
@ -67,7 +147,7 @@ Wed Dec 7 16:12:55 CET 2016 - sbrabec@suse.com
-------------------------------------------------------------------
Tue Nov 8 15:11:37 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.29
- Update to version 2.29 (FATE#322090)
* cal: possible to specify month by name (e.g. "cal January
2017") and use relative placeholders (cal "+1 month")
* fdisk(8) allows to wipe newly created partitions; the feature
@ -84,6 +164,11 @@ Tue Nov 8 15:11:37 UTC 2016 - sweet_f_a@gmx.de
mount all of them in the same time. The restriction is that
the regions should not overlap.
* lscpu supports the "drawer" topology for IBM S/390.
* sfdisk: Support for deprecated --show-pt-geometry (bsc#990531).
* libmount: various issues with cifs mount
(bsc#982331, bsc#987176).
* libblkid: Prevent infinite loop DoS while parsing DOS partition
tables (bsc#988361, CVE-2016-5011).
* More details at:
http://karelzak.blogspot.de/2016/10/util-linux-v229-whats-new.html
https://www.kernel.org/pub/linux/utils/util-linux/v2.29/v2.29-ReleaseNotes
@ -195,7 +280,7 @@ Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
openat-family functions anymore.
* The python binding for libsmartcols is available in separate
project at https://github.com/ignatenkobrain/python-smartcols
* Other bug fixes (bsc#970404, bsc#975082).
* Other bug fixes (bsc#970404, bsc#975082, FATE#318444).
* Security issue: CVE-2016-2779 is NOT FIXED yet.
- Remove old util-linux-noenc-suse.patch
@ -209,6 +294,7 @@ 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
(fixes bsc#950778, FATE#320552).
-------------------------------------------------------------------
Wed Nov 11 11:25:25 UTC 2015 - schwab@suse.de
@ -240,7 +326,8 @@ Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
* rtcwake supports a news option --list-modes and --date, no
support RTC_ALM_READ and RTC_ALM_SET fallbacks any more.
* Many fixes, most notably:
* fsck: now supports -r {fd} (bsc#903738)
* fsck: now supports -r {fd} (bsc#923777, bsc#903738)
* Fix fsck -C {fd} parsing (bsc#923777, bsc#903738)
* better handling of multi-path devices
(bsc#880468, bsc#924994)
* flock: improve timeout handling (bsc#926945)
@ -258,7 +345,7 @@ Tue Aug 4 20:31:55 CEST 2015 - sbrabec@suse.com
- Add %systemd_preset_pre and %systemd_preset_posttrans that will
do one shot presetting of uuidd.service on upgrade.
(bnc#900935#c46, FATE#318949).
(bnc#900935#c46, FATE#318949, FATE#317727).
- Remove one shot presetting hacks.
-------------------------------------------------------------------
@ -304,7 +391,9 @@ Wed Feb 25 20:43:28 CET 2015 - sbrabec@suse.cz
scripts; it's possible to save your partitioning layout to text
files and (re)use it in all fdisks
* fdisk(8), sfdisk(8): support new command-line option "--output
<list>" to specify output columns for --list or print commands
<list>" to specify output columns for --list or print commands,
do not abort when fdisk -l when device cannot be opened
[bnc#886790], [bnc#893712], [bnc#890351]
* nsenter(1): has been updated to work with the latest kernel
changes in user namespaces supports new command-line option
--preserve-credentials
@ -324,10 +413,13 @@ Wed Feb 25 20:43:28 CET 2015 - sbrabec@suse.cz
* logger(1): supports new command-line option --id= to specify
PID (or another ID) allows to specify --rfc3164 or --rfc5424
syslog protocols
* lscpu: recognizes Unisys s-Par as hypervisor (FATE#318231)
* libfdisk: the library is distributed as a shared library with a
stable API and a standard header file
* libmount: provides a new simple API to monitor mount-table
changes (including changes in userspace mount options)
* libmount: Fix mount point lookup (and mount -a) if the path
contains // (bsc#931955).
- Fix lack of I18N support in util-linux-systemd (mis-compilation).
-------------------------------------------------------------------
@ -403,7 +495,7 @@ Fri Oct 17 21:18:43 CEST 2014 - sbrabec@suse.cz
Mon Sep 8 21:04:34 CEST 2014 - sbrabec@suse.cz
- Install runuser and runuser-l PAM file
(runuser.pamd, bnc#892079).
(runuser.pamd, bnc#892079, bnc#894833).
-------------------------------------------------------------------
Wed Sep 3 16:21:57 CEST 2014 - sbrabec@suse.cz

31
python-libmount.spec
View File

@ -116,7 +116,7 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.29.1
Version: 2.29.2
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: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.tar.xz
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/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: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.tar.sign
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
@ -157,6 +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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%if %build_util_linux
@ -178,9 +180,9 @@ Conflicts: coreutils < 8.21
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87
# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3).
Conflicts: bash-completion <= 2.1-13.1
# The preset is provided by the presets branding package since 0.4 (bsc#1012850)
Conflicts: systemd-presets-branding < 0.4
Conflicts: bash-completion <= 2.1-10
# The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775)
Conflicts: systemd-presets-branding < 12.2
# bnc#805684:
%ifarch s390x
Obsoletes: s390-32
@ -189,6 +191,15 @@ Provides: s390-32
# uuid-runtime appeared in SLE11 SP1 to SLE11 SP3
Provides: uuid-runtime = %{version}-%{release}
Obsoletes: uuid-runtime < %{version}-%{release}
%if 0%{?suse_version} < 1330
#BEGIN sysv compatibility hack
# After migration of raw init script to systemd, util-linux no more depends on
# fillup and insserv. Many poorly written packages implicitly depend on them
# without declaring it. Keep these dependencies in Leap 42 + SLE 12 line to
# prevent failures.
PreReq: %insserv_prereq %fillup_prereq
#END sysv compatibility hack
%endif
#
# Using "Requires" here would lend itself to help upgrading, but since
# util-linux is in the initial bootstrap, that is not a good thing to do:
@ -402,6 +413,7 @@ library.
# logical block size support in loop does not exist in Tumbleweed and upstream kernel yet
%patch1 -p1
%endif
%patch2 -p1
#
# setctsid
cp -p %{S:22} %{S:23} .
@ -787,11 +799,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do
fi
done
# mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then
sed -i 's:code=:codepage=:' etc/fstab
fi
%preun
%{service_del_preun raw.service}
@ -854,7 +861,6 @@ fi
%postun -n uuidd
%{service_del_postun uuidd.socket uuidd.service}
%endif
%if %build_util_linux
@ -1257,7 +1263,6 @@ fi
%files -n libfdisk-devel-static
%defattr(-, root, root)
%{_libdir}/libfdisk.*a
%endif
%if %build_util_linux_systemd

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

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJYghWjAAoJEOS3HV7sOcKEsRsP/Rhl+vlB9TQmxHF4EhglTJMv
i8x65Eq4WznF+qf9ZMZ4qSrsfS/FqvIccw9MWEywj3lAHBx05jhW5Bx6vEzFijiS
CuzRcx+5UuO6DQHxySIRqxromCRaCNzUnNhZfFVlJo1EAD1TVzuF62otCRHxE6F+
NMjw9+PAPrYT00L6I3AzIHc7t+EgZX6Cyr2Yb22VQnTIJc8E7XfiA7iXgjdhqsn9
kKUl4kUDGZULX9cIjRkbaVIR7Z8+DH0LcA7QyvA+Xw3fu4UGVCRHR5EquUWEplQD
1rycHxEjRvOjheZCHdAUlhzHguNm2xVSTtcLjvMieMOM60pNxijLibhKkMmqkjJX
e/CLWFHPLnxpJ+WPRUAA5qVrpRjkUm3Wh5O/TBytICQUPTRw7wG4WPgOtgpq3aSr
aet8iClLZkAw7wNS3O+VTRZuzB+mfbguRR7S2o0UemmEBJ9Y4nkaZN/SyT/aX4t0
vhvM3tbIgw3sGozEsYMjzO/iQTDRIi284DVnfPS7Y1A2RY5lDkSzKowiL9X1vh61
5tapPthH4Fmss+sd/mC6W3XiBRvLR32l6gTq1M4kMPVKZ3XPlo2uvNbTiL93nI1q
DDWSzORi+bSsjMGUYU3VDlzqnsrhwxzdCNl6eA+/Y65tRwQNmOPpBVkSOfp+Fqy9
R6VzZW/Y6fWxPojd34A2
=OXAT
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,17 @@
-----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 Normal file
View File

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

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

@ -67,7 +67,7 @@ Index: util-linux-2.29/sys-utils/losetup.c
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(_(" -L, --logical-blocksize <size> set the logical block size to <size>\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);
@ -105,7 +105,7 @@ Index: util-linux-2.29/sys-utils/losetup.c
OPT_RAW,
- OPT_DIO
+ OPT_DIO,
+ OPT_BLOCKSIZE
+ OPT_BLOCKSIZE,
};
static const struct option longopts[] = {
{ "all", 0, 0, 'a' },
@ -113,7 +113,7 @@ Index: util-linux-2.29/sys-utils/losetup.c
{ "associated", 1, 0, 'j' },
{ "json", 0, 0, 'J' },
{ "list", 0, 0, 'l' },
+ { "logical-blocksize", 1, 0, 'L' },
+ { "logical-blocksize", 1, 0, OPT_BLOCKSIZE },
{ "noheadings", 0, 0, 'n' },
{ "offset", 1, 0, 'o' },
{ "output", 1, 0, 'O' },

106
util-linux-systemd.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com
- Prefer sysfs exported SMBIOS3 tables in lscu (bsc#1033718)
+ arm64-lscpu-use-sysfs-for-table-access-if-available.patch
-------------------------------------------------------------------
Thu Apr 6 17:35:34 CEST 2017 - sbrabec@suse.com
- To cover release numbers of both SLE12 SP3 and Leap 42.3, relax
release based conflict with bash-completion from 13.1 to 10.
-------------------------------------------------------------------
Tue Apr 4 14:51:09 UTC 2017 - sweet_f_a@gmx.de
- fix util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
--logical-blocksize was behaving like --nooverlap
-------------------------------------------------------------------
Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com
- Conflict with old systemd-presets-branding to ensure correct
preset migration (boo#1029775, bsc#1012850).
-------------------------------------------------------------------
Thu Mar 16 22:44:12 CET 2017 - sbrabec@suse.com
- Drop "codepage" fstab migration needed for SuSE Linux < 9.1
(bsc#51950 (suse#36950)).
-------------------------------------------------------------------
Tue Feb 28 17:27:58 CET 2017 - sbrabec@suse.com
- Keep dependency on insserv and fillup for compatibilitiy reasons
in Leap 42.3. Too many poorly written packages depend on it.
(Marked as "sysv compatibility hack".)
-------------------------------------------------------------------
Wed Feb 22 22:00:05 UTC 2017 - sweet_f_a@gmx.de
- Update to version 2.29.2:
* su(1) security issue CVE-2017-2616 (bsc#1023041)
* minor bugfixes and enhancements
-------------------------------------------------------------------
Fri Feb 10 10:40:23 UTC 2017 - fbui@suse.com
@ -20,12 +64,48 @@ Wed Feb 8 18:16:22 CET 2017 - sbrabec@suse.com
- INCOMPATIBLE CHANGE for SLE12 SP3 and Leap 42.3:
losetup -L changes its meaning from SLE12 SP1&SP2 specific
--logical-blocksize to the upstream --nooverlap).
--logical-blocksize can be used only with long option.
--logical-blocksize can be used only with long option
(bsc#966891).
- Include SLE12 + Leap 42 exclusive feature, implemented by
hare@suse.de:
* losetup: Add support for setting logical blocksizes
(bsc#931634, FATE#319010)
+ util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
SLE12 & Leap 42 specific changes:
* Fix for SLE12: bsc#956540, SLE12 SP1: bsc#953691, Leap 42.1:
boo#954482, was obsoleted by the systemd update, and skipped.
* Remove --enable-ncurses that is intended to force non-wide
ncurses (boo#978993).
* Make release-dependent conflict with old sysvinit-tools SLE
specific, as it is required only for SLE 11 upgrade,
and breaks openSUSE staging builds (boo#994399).
* Obsolete these patches, now upstreamed:
* Drop upstreamed patches
(tests-script-race-on-force-only.patch,
util-linux-libmount-ignore-redundant-slashes.patch,
util-linux-sfdisk-show-pt-geometry-1.patch,
util-linux-sfdisk-show-pt-geometry-2.patch,
util-linux-sfdisk-show-pt-geometry-3.patch,
util-linux-libblkid-partition-loop.patch,
util-linux-libblkid-wipe-offset.patch,
util-linux-mount-reuse-loop-1.patch,
util-linux-mount-reuse-loop-2.patch,
util-linux-mount-reuse-loop-3.patch,
util-linux-mount-reuse-loop-4.patch,
util-linux-loop-reuse-01.patch, util-linux-loop-reuse-02.patch,
util-linux-loop-reuse-03.patch, util-linux-loop-reuse-04.patch,
util-linux-loop-reuse-05.patch, util-linux-loop-reuse-06.patch,
util-linux-loop-reuse-07.patch, util-linux-loop-reuse-08.patch,
util-linux-loop-reuse-09.patch, util-linux-loop-reuse-10.patch,
util-linux-loop-reuse-12.patch, util-linux-loop-reuse-13.patch,
util-linux-loop-reuse-14.patch, util-linux-loop-reuse-15.patch,
util-linux-loop-reuse-16.patch, util-linux-loop-reuse-17.patch,
util-linux-loop-reuse-18.patch, util-linux-loop-reuse-19.patch,
util-linux-loop-reuse-20.patch,
util-linux-libmount-cifs-is_mounted.patch).
* Refreshed patches
(make-sure-sbin-resp-usr-sbin-are-in-PATH.diff,
util-linux-losetup-Add-support-for-setting-logical-blocksize.patch).
-------------------------------------------------------------------
Tue Feb 7 20:07:55 CET 2017 - sbrabec@suse.com
@ -67,7 +147,7 @@ Wed Dec 7 16:12:55 CET 2016 - sbrabec@suse.com
-------------------------------------------------------------------
Tue Nov 8 15:11:37 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.29
- Update to version 2.29 (FATE#322090)
* cal: possible to specify month by name (e.g. "cal January
2017") and use relative placeholders (cal "+1 month")
* fdisk(8) allows to wipe newly created partitions; the feature
@ -84,6 +164,11 @@ Tue Nov 8 15:11:37 UTC 2016 - sweet_f_a@gmx.de
mount all of them in the same time. The restriction is that
the regions should not overlap.
* lscpu supports the "drawer" topology for IBM S/390.
* sfdisk: Support for deprecated --show-pt-geometry (bsc#990531).
* libmount: various issues with cifs mount
(bsc#982331, bsc#987176).
* libblkid: Prevent infinite loop DoS while parsing DOS partition
tables (bsc#988361, CVE-2016-5011).
* More details at:
http://karelzak.blogspot.de/2016/10/util-linux-v229-whats-new.html
https://www.kernel.org/pub/linux/utils/util-linux/v2.29/v2.29-ReleaseNotes
@ -195,7 +280,7 @@ Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
openat-family functions anymore.
* The python binding for libsmartcols is available in separate
project at https://github.com/ignatenkobrain/python-smartcols
* Other bug fixes (bsc#970404, bsc#975082).
* Other bug fixes (bsc#970404, bsc#975082, FATE#318444).
* Security issue: CVE-2016-2779 is NOT FIXED yet.
- Remove old util-linux-noenc-suse.patch
@ -209,6 +294,7 @@ 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
(fixes bsc#950778, FATE#320552).
-------------------------------------------------------------------
Wed Nov 11 11:25:25 UTC 2015 - schwab@suse.de
@ -240,7 +326,8 @@ Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
* rtcwake supports a news option --list-modes and --date, no
support RTC_ALM_READ and RTC_ALM_SET fallbacks any more.
* Many fixes, most notably:
* fsck: now supports -r {fd} (bsc#903738)
* fsck: now supports -r {fd} (bsc#923777, bsc#903738)
* Fix fsck -C {fd} parsing (bsc#923777, bsc#903738)
* better handling of multi-path devices
(bsc#880468, bsc#924994)
* flock: improve timeout handling (bsc#926945)
@ -258,7 +345,7 @@ Tue Aug 4 20:31:55 CEST 2015 - sbrabec@suse.com
- Add %systemd_preset_pre and %systemd_preset_posttrans that will
do one shot presetting of uuidd.service on upgrade.
(bnc#900935#c46, FATE#318949).
(bnc#900935#c46, FATE#318949, FATE#317727).
- Remove one shot presetting hacks.
-------------------------------------------------------------------
@ -304,7 +391,9 @@ Wed Feb 25 20:43:28 CET 2015 - sbrabec@suse.cz
scripts; it's possible to save your partitioning layout to text
files and (re)use it in all fdisks
* fdisk(8), sfdisk(8): support new command-line option "--output
<list>" to specify output columns for --list or print commands
<list>" to specify output columns for --list or print commands,
do not abort when fdisk -l when device cannot be opened
[bnc#886790], [bnc#893712], [bnc#890351]
* nsenter(1): has been updated to work with the latest kernel
changes in user namespaces supports new command-line option
--preserve-credentials
@ -324,10 +413,13 @@ Wed Feb 25 20:43:28 CET 2015 - sbrabec@suse.cz
* logger(1): supports new command-line option --id= to specify
PID (or another ID) allows to specify --rfc3164 or --rfc5424
syslog protocols
* lscpu: recognizes Unisys s-Par as hypervisor (FATE#318231)
* libfdisk: the library is distributed as a shared library with a
stable API and a standard header file
* libmount: provides a new simple API to monitor mount-table
changes (including changes in userspace mount options)
* libmount: Fix mount point lookup (and mount -a) if the path
contains // (bsc#931955).
- Fix lack of I18N support in util-linux-systemd (mis-compilation).
-------------------------------------------------------------------
@ -403,7 +495,7 @@ Fri Oct 17 21:18:43 CEST 2014 - sbrabec@suse.cz
Mon Sep 8 21:04:34 CEST 2014 - sbrabec@suse.cz
- Install runuser and runuser-l PAM file
(runuser.pamd, bnc#892079).
(runuser.pamd, bnc#892079, bnc#894833).
-------------------------------------------------------------------
Wed Sep 3 16:21:57 CEST 2014 - sbrabec@suse.cz

31
util-linux-systemd.spec
View File

@ -116,7 +116,7 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.29.1
Version: 2.29.2
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: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.tar.xz
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/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: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.tar.sign
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
@ -157,6 +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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%if %build_util_linux
@ -178,9 +180,9 @@ Conflicts: coreutils < 8.21
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87
# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3).
Conflicts: bash-completion <= 2.1-13.1
# The preset is provided by the presets branding package since 0.4 (bsc#1012850)
Conflicts: systemd-presets-branding < 0.4
Conflicts: bash-completion <= 2.1-10
# The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775)
Conflicts: systemd-presets-branding < 12.2
# bnc#805684:
%ifarch s390x
Obsoletes: s390-32
@ -189,6 +191,15 @@ Provides: s390-32
# uuid-runtime appeared in SLE11 SP1 to SLE11 SP3
Provides: uuid-runtime = %{version}-%{release}
Obsoletes: uuid-runtime < %{version}-%{release}
%if 0%{?suse_version} < 1330
#BEGIN sysv compatibility hack
# After migration of raw init script to systemd, util-linux no more depends on
# fillup and insserv. Many poorly written packages implicitly depend on them
# without declaring it. Keep these dependencies in Leap 42 + SLE 12 line to
# prevent failures.
PreReq: %insserv_prereq %fillup_prereq
#END sysv compatibility hack
%endif
#
# Using "Requires" here would lend itself to help upgrading, but since
# util-linux is in the initial bootstrap, that is not a good thing to do:
@ -402,6 +413,7 @@ library.
# logical block size support in loop does not exist in Tumbleweed and upstream kernel yet
%patch1 -p1
%endif
%patch2 -p1
#
# setctsid
cp -p %{S:22} %{S:23} .
@ -787,11 +799,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do
fi
done
# mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then
sed -i 's:code=:codepage=:' etc/fstab
fi
%preun
%{service_del_preun raw.service}
@ -854,7 +861,6 @@ fi
%postun -n uuidd
%{service_del_postun uuidd.socket uuidd.service}
%endif
%if %build_util_linux
@ -1257,7 +1263,6 @@ fi
%files -n libfdisk-devel-static
%defattr(-, root, root)
%{_libdir}/libfdisk.*a
%endif
%if %build_util_linux_systemd

106
util-linux.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com
- Prefer sysfs exported SMBIOS3 tables in lscu (bsc#1033718)
+ arm64-lscpu-use-sysfs-for-table-access-if-available.patch
-------------------------------------------------------------------
Thu Apr 6 17:35:34 CEST 2017 - sbrabec@suse.com
- To cover release numbers of both SLE12 SP3 and Leap 42.3, relax
release based conflict with bash-completion from 13.1 to 10.
-------------------------------------------------------------------
Tue Apr 4 14:51:09 UTC 2017 - sweet_f_a@gmx.de
- fix util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
--logical-blocksize was behaving like --nooverlap
-------------------------------------------------------------------
Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com
- Conflict with old systemd-presets-branding to ensure correct
preset migration (boo#1029775, bsc#1012850).
-------------------------------------------------------------------
Thu Mar 16 22:44:12 CET 2017 - sbrabec@suse.com
- Drop "codepage" fstab migration needed for SuSE Linux < 9.1
(bsc#51950 (suse#36950)).
-------------------------------------------------------------------
Tue Feb 28 17:27:58 CET 2017 - sbrabec@suse.com
- Keep dependency on insserv and fillup for compatibilitiy reasons
in Leap 42.3. Too many poorly written packages depend on it.
(Marked as "sysv compatibility hack".)
-------------------------------------------------------------------
Wed Feb 22 22:00:05 UTC 2017 - sweet_f_a@gmx.de
- Update to version 2.29.2:
* su(1) security issue CVE-2017-2616 (bsc#1023041)
* minor bugfixes and enhancements
-------------------------------------------------------------------
Fri Feb 10 10:40:23 UTC 2017 - fbui@suse.com
@ -20,12 +64,48 @@ Wed Feb 8 18:16:22 CET 2017 - sbrabec@suse.com
- INCOMPATIBLE CHANGE for SLE12 SP3 and Leap 42.3:
losetup -L changes its meaning from SLE12 SP1&SP2 specific
--logical-blocksize to the upstream --nooverlap).
--logical-blocksize can be used only with long option.
--logical-blocksize can be used only with long option
(bsc#966891).
- Include SLE12 + Leap 42 exclusive feature, implemented by
hare@suse.de:
* losetup: Add support for setting logical blocksizes
(bsc#931634, FATE#319010)
+ util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
SLE12 & Leap 42 specific changes:
* Fix for SLE12: bsc#956540, SLE12 SP1: bsc#953691, Leap 42.1:
boo#954482, was obsoleted by the systemd update, and skipped.
* Remove --enable-ncurses that is intended to force non-wide
ncurses (boo#978993).
* Make release-dependent conflict with old sysvinit-tools SLE
specific, as it is required only for SLE 11 upgrade,
and breaks openSUSE staging builds (boo#994399).
* Obsolete these patches, now upstreamed:
* Drop upstreamed patches
(tests-script-race-on-force-only.patch,
util-linux-libmount-ignore-redundant-slashes.patch,
util-linux-sfdisk-show-pt-geometry-1.patch,
util-linux-sfdisk-show-pt-geometry-2.patch,
util-linux-sfdisk-show-pt-geometry-3.patch,
util-linux-libblkid-partition-loop.patch,
util-linux-libblkid-wipe-offset.patch,
util-linux-mount-reuse-loop-1.patch,
util-linux-mount-reuse-loop-2.patch,
util-linux-mount-reuse-loop-3.patch,
util-linux-mount-reuse-loop-4.patch,
util-linux-loop-reuse-01.patch, util-linux-loop-reuse-02.patch,
util-linux-loop-reuse-03.patch, util-linux-loop-reuse-04.patch,
util-linux-loop-reuse-05.patch, util-linux-loop-reuse-06.patch,
util-linux-loop-reuse-07.patch, util-linux-loop-reuse-08.patch,
util-linux-loop-reuse-09.patch, util-linux-loop-reuse-10.patch,
util-linux-loop-reuse-12.patch, util-linux-loop-reuse-13.patch,
util-linux-loop-reuse-14.patch, util-linux-loop-reuse-15.patch,
util-linux-loop-reuse-16.patch, util-linux-loop-reuse-17.patch,
util-linux-loop-reuse-18.patch, util-linux-loop-reuse-19.patch,
util-linux-loop-reuse-20.patch,
util-linux-libmount-cifs-is_mounted.patch).
* Refreshed patches
(make-sure-sbin-resp-usr-sbin-are-in-PATH.diff,
util-linux-losetup-Add-support-for-setting-logical-blocksize.patch).
-------------------------------------------------------------------
Tue Feb 7 20:07:55 CET 2017 - sbrabec@suse.com
@ -67,7 +147,7 @@ Wed Dec 7 16:12:55 CET 2016 - sbrabec@suse.com
-------------------------------------------------------------------
Tue Nov 8 15:11:37 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.29
- Update to version 2.29 (FATE#322090)
* cal: possible to specify month by name (e.g. "cal January
2017") and use relative placeholders (cal "+1 month")
* fdisk(8) allows to wipe newly created partitions; the feature
@ -84,6 +164,11 @@ Tue Nov 8 15:11:37 UTC 2016 - sweet_f_a@gmx.de
mount all of them in the same time. The restriction is that
the regions should not overlap.
* lscpu supports the "drawer" topology for IBM S/390.
* sfdisk: Support for deprecated --show-pt-geometry (bsc#990531).
* libmount: various issues with cifs mount
(bsc#982331, bsc#987176).
* libblkid: Prevent infinite loop DoS while parsing DOS partition
tables (bsc#988361, CVE-2016-5011).
* More details at:
http://karelzak.blogspot.de/2016/10/util-linux-v229-whats-new.html
https://www.kernel.org/pub/linux/utils/util-linux/v2.29/v2.29-ReleaseNotes
@ -195,7 +280,7 @@ Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
openat-family functions anymore.
* The python binding for libsmartcols is available in separate
project at https://github.com/ignatenkobrain/python-smartcols
* Other bug fixes (bsc#970404, bsc#975082).
* Other bug fixes (bsc#970404, bsc#975082, FATE#318444).
* Security issue: CVE-2016-2779 is NOT FIXED yet.
- Remove old util-linux-noenc-suse.patch
@ -209,6 +294,7 @@ 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
(fixes bsc#950778, FATE#320552).
-------------------------------------------------------------------
Wed Nov 11 11:25:25 UTC 2015 - schwab@suse.de
@ -240,7 +326,8 @@ Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
* rtcwake supports a news option --list-modes and --date, no
support RTC_ALM_READ and RTC_ALM_SET fallbacks any more.
* Many fixes, most notably:
* fsck: now supports -r {fd} (bsc#903738)
* fsck: now supports -r {fd} (bsc#923777, bsc#903738)
* Fix fsck -C {fd} parsing (bsc#923777, bsc#903738)
* better handling of multi-path devices
(bsc#880468, bsc#924994)
* flock: improve timeout handling (bsc#926945)
@ -258,7 +345,7 @@ Tue Aug 4 20:31:55 CEST 2015 - sbrabec@suse.com
- Add %systemd_preset_pre and %systemd_preset_posttrans that will
do one shot presetting of uuidd.service on upgrade.
(bnc#900935#c46, FATE#318949).
(bnc#900935#c46, FATE#318949, FATE#317727).
- Remove one shot presetting hacks.
-------------------------------------------------------------------
@ -304,7 +391,9 @@ Wed Feb 25 20:43:28 CET 2015 - sbrabec@suse.cz
scripts; it's possible to save your partitioning layout to text
files and (re)use it in all fdisks
* fdisk(8), sfdisk(8): support new command-line option "--output
<list>" to specify output columns for --list or print commands
<list>" to specify output columns for --list or print commands,
do not abort when fdisk -l when device cannot be opened
[bnc#886790], [bnc#893712], [bnc#890351]
* nsenter(1): has been updated to work with the latest kernel
changes in user namespaces supports new command-line option
--preserve-credentials
@ -324,10 +413,13 @@ Wed Feb 25 20:43:28 CET 2015 - sbrabec@suse.cz
* logger(1): supports new command-line option --id= to specify
PID (or another ID) allows to specify --rfc3164 or --rfc5424
syslog protocols
* lscpu: recognizes Unisys s-Par as hypervisor (FATE#318231)
* libfdisk: the library is distributed as a shared library with a
stable API and a standard header file
* libmount: provides a new simple API to monitor mount-table
changes (including changes in userspace mount options)
* libmount: Fix mount point lookup (and mount -a) if the path
contains // (bsc#931955).
- Fix lack of I18N support in util-linux-systemd (mis-compilation).
-------------------------------------------------------------------
@ -403,7 +495,7 @@ Fri Oct 17 21:18:43 CEST 2014 - sbrabec@suse.cz
Mon Sep 8 21:04:34 CEST 2014 - sbrabec@suse.cz
- Install runuser and runuser-l PAM file
(runuser.pamd, bnc#892079).
(runuser.pamd, bnc#892079, bnc#894833).
-------------------------------------------------------------------
Wed Sep 3 16:21:57 CEST 2014 - sbrabec@suse.cz

31
util-linux.spec
View File

@ -116,7 +116,7 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.29.1
Version: 2.29.2
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: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.tar.xz
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/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: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.29/%{_name}-%{version}.tar.sign
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
@ -157,6 +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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%if %build_util_linux
@ -178,9 +180,9 @@ Conflicts: coreutils < 8.21
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87
# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3).
Conflicts: bash-completion <= 2.1-13.1
# The preset is provided by the presets branding package since 0.4 (bsc#1012850)
Conflicts: systemd-presets-branding < 0.4
Conflicts: bash-completion <= 2.1-10
# The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775)
Conflicts: systemd-presets-branding < 12.2
# bnc#805684:
%ifarch s390x
Obsoletes: s390-32
@ -189,6 +191,15 @@ Provides: s390-32
# uuid-runtime appeared in SLE11 SP1 to SLE11 SP3
Provides: uuid-runtime = %{version}-%{release}
Obsoletes: uuid-runtime < %{version}-%{release}
%if 0%{?suse_version} < 1330
#BEGIN sysv compatibility hack
# After migration of raw init script to systemd, util-linux no more depends on
# fillup and insserv. Many poorly written packages implicitly depend on them
# without declaring it. Keep these dependencies in Leap 42 + SLE 12 line to
# prevent failures.
PreReq: %insserv_prereq %fillup_prereq
#END sysv compatibility hack
%endif
#
# Using "Requires" here would lend itself to help upgrading, but since
# util-linux is in the initial bootstrap, that is not a good thing to do:
@ -402,6 +413,7 @@ library.
# logical block size support in loop does not exist in Tumbleweed and upstream kernel yet
%patch1 -p1
%endif
%patch2 -p1
#
# setctsid
cp -p %{S:22} %{S:23} .
@ -787,11 +799,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do
fi
done
# mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then
sed -i 's:code=:codepage=:' etc/fstab
fi
%preun
%{service_del_preun raw.service}
@ -854,7 +861,6 @@ fi
%postun -n uuidd
%{service_del_postun uuidd.socket uuidd.service}
%endif
%if %build_util_linux
@ -1257,7 +1263,6 @@ fi
%files -n libfdisk-devel-static
%defattr(-, root, root)
%{_libdir}/libfdisk.*a
%endif
%if %build_util_linux_systemd