testing/util-linux
SHA256
3
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 389157 from home:rudi_m:branches:Base:System

Browse Source 
- Update to version 2.28:
  * Many changes and improvements, most notably ...
  * Security issue: CVE-2016-2779 is NOT FIXED yet.
- Remove old util-linux-noenc-suse.patch

OBS-URL: https://build.opensuse.org/request/show/389157
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=302
This commit is contained in:
Stanislav Brabec 2016-04-13 16:27:53 +00:00 committed by Git OBS Bridge
parent ad43cdf969
commit afb635ea16
11 changed files with 188 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
python-libmount.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28:
* Many changes and improvements, most notably:
* Now cfdisk, sfdisk and fdisk wipe all filesystem and RAID
signatures when creating a new disk label in interactive
mode. See --wipe[=auto|never|always].
* lsns -- this NEW COMMAND lists information about all
currently accessible namespaces or about the given namespace.
* The command sfdisk supports new operations --delete,
--move-data and --reorder.
* The command blkdiscard supports a new option --zeroout to
zero-fill rather than discard a specified area.
* The command cal supports a new option --span to span the date
when displaying multiple months.
* The command chrt supports the DEADLINE scheduling class and
the new options --sched-runtime --sched-period and
--sched-deadline.
* The command logger supports RFC 5424 structured data through
the new options --sd-id and --sd-param.
* The command losetup supports a new option --direct-io.
* The command lsblk allows to sort output by unprinted columns.
* The command mount applies the nofail mount option to
ENOMEDIUM errors.
* The commands nsenter and unshare support a new option
--cgroup for work with cgroups namespaces (CLONE_NEWCGROUP).
* The library libmount has been improved to properly detect
already mounted btrfs subvolumes.
* The library libsmartcols has been massively improved to print
table ranges, multi-line cells, table titles and to support
continuous printing.
* The package build system and code have been improved to be
more portable to non-Linux systems (BSD, OSX).
* The package does not provide fallback solutions for
openat-family functions anymore.
* The python binding for libsmartcols is available in separate
project at https://github.com/ignatenkobrain/python-smartcols
* Security issue: CVE-2016-2779 is NOT FIXED yet.
- Remove old util-linux-noenc-suse.patch
-------------------------------------------------------------------
Tue Dec 1 10:27:17 UTC 2015 - sweet_f_a@gmx.de

34
python-libmount.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package python-libmount
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -121,7 +121,7 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.27.1
Version: 2.28
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
@ -130,7 +130,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.27/%{_name}-%{version}.tar.xz
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/%{_name}-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source4: raw.init
Source5: etc.raw
@ -140,7 +140,7 @@ Source8: login.pamd
Source9: remote.pamd
Source10: su.pamd
Source11: su.default
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/%{_name}-%{version}.tar.sign
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/%{_name}-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
@ -160,8 +160,6 @@ Source51: blkid.conf
##
# PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path
Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
# PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr.
Patch12: util-linux-noenc-suse.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%if %build_util_linux
@ -404,7 +402,6 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} -
%endif
%setup -q -n %{_name}-%{version} -b 40
%patch4 -p1
%patch12 -p1
#
# setctsid
cp -p %{S:22} %{S:23} .
@ -442,13 +439,6 @@ UTIL_LINUX_KNOWN_SYSTEMD_DEPS='$UTIL_LINUX_FOUND_SYSTEMD_DEPS'"
exit 1
fi
#END SYSTEMD SAFETY CHECK
#BEGIN FIRST STAGE MODIFICATIONS
%if !%build_util_linux_systemd
sed -i 's/BUILD_LSLOGINS/FALSE/
s/BUILD_LOGGER/FALSE/
' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am
%endif
#END FIRST STAGE MODIFICATIONS
%else
#BEGIN SECOND STAGE MODIFICATIONS
# delete all make modules except wanted ones
@ -579,10 +569,14 @@ AUTOPOINT=true autoreconf -vfi
--disable-kill \
%endif
%if %build_util_linux_systemd
--enable-logger \
--enable-lslogins \
--enable-uuidd \
--with-systemd \
--with-systemdsystemunitdir=%{_unitdir} \
%else
--disable-logger \
--disable-lslogins \
--disable-uuidd \
--without-systemd \
%endif
@ -606,9 +600,6 @@ make %{?_smp_mflags}
%check
# mark some tests "known_fail"
#
# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO
export TS_OPT_misc_setarch_known_fail="yes"
#
%if 0%{?qemu_user_space_build}
export TS_OPT_fdisk_gpt_known_fail="yes"
export TS_OPT_fdisk_oddinput_known_fail="yes"
@ -619,11 +610,12 @@ export TS_OPT_misc_swaplabel_known_fail="yes"
export TS_OPT_kill_name_to_number_known_fail="yes"
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"
# may segfault on qemu-user-space
export TS_OPT_misc_setarch_known_fail="yes"
%endif
# FIXME: These sometimes fails:
export TS_OPT_libmount_lock_fake="yes"
#
# hacks
export PATH="$PATH:/sbin:/usr/sbin"
@ -1005,6 +997,7 @@ fi
%{_bindir}/lscpu
%{_bindir}/lsipc
%{_bindir}/lslocks
%{_bindir}/lsns
%{_bindir}/mcookie
%{_bindir}/mesg
%{_bindir}/more
@ -1156,6 +1149,7 @@ fi
%{_mandir}/man8/ldattach.8.gz
%{_mandir}/man8/losetup.8.gz
%{_mandir}/man8/lslocks.8.gz
%{_mandir}/man8/lsns.8.gz
%{_mandir}/man8/mkfs.8.gz
%{_mandir}/man8/mkfs.cramfs.8.gz
%{_mandir}/man8/mkswap.8.gz
@ -1198,6 +1192,7 @@ fi
%{_datadir}/bash-completion/*
%if %build_util_linux_systemd
%exclude %{_datadir}/bash-completion/logger
%exclude %{_datadir}/bash-completion/lslogins
%exclude %{_datadir}/bash-completion/uuidd
%endif
%ifnarch ia64 m68k
@ -1329,6 +1324,7 @@ fi
%{_bindir}/logger
%{_bindir}/lslogins
%{_datadir}/bash-completion/logger
%{_datadir}/bash-completion/lslogins
%{_mandir}/man1/logger.1.gz
%{_mandir}/man1/lslogins.1.gz
%{_sbindir}/rcfstrim

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

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJWN0FGAAoJEOS3HV7sOcKEwYIP/0eA52LeAeSVAb3hATWA0TMg
N0zfKyRECDxRuwdQW3yyjtypd4Cir6QlgyBrqLyXSskVuIj0dq7S1mlI/Xa94IFU
Fa2lmzyAcxvl33Bv/Fljh/GeVSqqmUHk8q1ecRh7DYR1Lda6xzfCFs2Dl3Q5JXK/
k2tTgNug0+f8E6LT/5qrrXeDS+O7/hAtRqqA6yHkAHGqYV2RgBJ9NDAanaGYXDeB
abrduP2xRIvJ9oYOrayG5WH/wAY/sKT433zx20J9ZZvtutTV4VF2ML9zfeQiYitY
hoQOGt5tJW/CfvU2DUaBlTlrXW/MnMQE8KDWn64NbokA3HOxrW+7wJ/gJCp+7e7v
gLELeLLTnMq3NX++SR5I2I2fvqBejYykcaOQMHi9DK+UZed/CBJKR+6SF1WKOndI
GRYJSs9DAXL3dJCSCp6V4fqf+Lfr2Vv4z+Jo8EzIIIlfly1cZx2Blx7C0Y6CNETA
fYPYYKW7qKHsdS5J2Axf8vNIHQsRhkpiUltjQHQ+rIAmx1hl/10a7Fd9KkqFEJV2
R0zLPaJK8d9gEWHRdzQNozABZVeR8PV3WXuDD2XjC2T30ldlFNlbzyWhDiPf6DNk
tIEi3f+RTTltIvCobChq+Ri2dKM0+wAV/FwwR31E/YgJIpUWfJNKRwWT8Ja887JN
j5aNV18qjet7TUosKYqm
=BMBT
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJXDNKPAAoJEOS3HV7sOcKEHo0P/RpIujRPSYGgh6kYObPjAoNY
fO/TJ6NeWMb5QcXbITH4dl9C+LoF9HXXZMG4lNsSckqT0OKoIjblFMs3QpqxLIVT
WOJbMktrrop5faJwixeEnWqtfRHBBtjdiTcLj5PMzajwijeYNIOyDx6uIr7UnGtF
v8DbxXFCZByTQvNRvibrXPk9FB/yushqOKakUrrNmrlwokDWHK5Ds8ZtqfSkNrMS
RZxRpAkpE4C3RYjttVJCkOqaH2B7Utxa03jxQN8UDxSvsXikvHFi5GDa1RZxRdOg
jwpZm8aUxSlb5EITSoioWqikVUQRCpErBZr+yFAt6VGAo8460rlTVb1OjqkTixHR
2QVRFLCATeUfHaWBi5Gnz29JUWnMykbsmOW8ZiLpEOL3KHr+0/s6N5e9x4xiFiE+
fywoo+NlvbarM53cSXW6GZjazGQOqtGuEijyn29hoMwxuOyzF83pvFnZonbgessF
2UB+edl9Ppz4PCt2xqDaP55fXwk9rtO7Vqbd8xOImbrVjQF3+9EoY3H4I0QxnhV3
XbozEYyc/9IyCapW7KBMyYD+dkWWu8bTVMK4JATWSR3F33Sl3a4e4GMmWB89n8Bs
fA/nj3lGvnApbvESR45os9gLx701Pbatvv4PITWKMuMsPi/FSBRlAYkc/Uznf2Fc
9BS4IkThuR4m+oIKyTNL
=VNvh
-----END PGP SIGNATURE-----

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

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

14
util-linux-noenc-suse.patch
View File

@ -1,14 +0,0 @@
Index: util-linux/libmount/src/context_loopdev.c
===================================================================
--- util-linux.orig/libmount/src/context_loopdev.c
+++ util-linux/libmount/src/context_loopdev.c
@@ -212,6 +212,9 @@ int mnt_context_setup_loopdev(struct lib
if (rc == 0 && (cxt->user_mountflags & MNT_MS_ENCRYPTION) &&
mnt_optstr_get_option(optstr, "encryption", &val, &len) == 0) {
DBG(CXT, ul_debugobj(cxt, "encryption no longer supported"));
+ // XXX: nasty for the lib but there's on better way to give a hint atm
+ fprintf(stderr, "mount: encryption no longer supported.\n"
+ " Please use /etc/crypttab instead (man 5 crypttab)\n");
rc = -MNT_ERR_MOUNTOPT;
}

41
util-linux-systemd.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28:
* Many changes and improvements, most notably:
* Now cfdisk, sfdisk and fdisk wipe all filesystem and RAID
signatures when creating a new disk label in interactive
mode. See --wipe[=auto|never|always].
* lsns -- this NEW COMMAND lists information about all
currently accessible namespaces or about the given namespace.
* The command sfdisk supports new operations --delete,
--move-data and --reorder.
* The command blkdiscard supports a new option --zeroout to
zero-fill rather than discard a specified area.
* The command cal supports a new option --span to span the date
when displaying multiple months.
* The command chrt supports the DEADLINE scheduling class and
the new options --sched-runtime --sched-period and
--sched-deadline.
* The command logger supports RFC 5424 structured data through
the new options --sd-id and --sd-param.
* The command losetup supports a new option --direct-io.
* The command lsblk allows to sort output by unprinted columns.
* The command mount applies the nofail mount option to
ENOMEDIUM errors.
* The commands nsenter and unshare support a new option
--cgroup for work with cgroups namespaces (CLONE_NEWCGROUP).
* The library libmount has been improved to properly detect
already mounted btrfs subvolumes.
* The library libsmartcols has been massively improved to print
table ranges, multi-line cells, table titles and to support
continuous printing.
* The package build system and code have been improved to be
more portable to non-Linux systems (BSD, OSX).
* The package does not provide fallback solutions for
openat-family functions anymore.
* The python binding for libsmartcols is available in separate
project at https://github.com/ignatenkobrain/python-smartcols
* Security issue: CVE-2016-2779 is NOT FIXED yet.
- Remove old util-linux-noenc-suse.patch
-------------------------------------------------------------------
Tue Dec 1 10:27:17 UTC 2015 - sweet_f_a@gmx.de

34
util-linux-systemd.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package util-linux-systemd
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -121,7 +121,7 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.27.1
Version: 2.28
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
@ -130,7 +130,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.27/%{_name}-%{version}.tar.xz
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/%{_name}-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source4: raw.init
Source5: etc.raw
@ -140,7 +140,7 @@ Source8: login.pamd
Source9: remote.pamd
Source10: su.pamd
Source11: su.default
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/%{_name}-%{version}.tar.sign
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/%{_name}-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
@ -160,8 +160,6 @@ Source51: blkid.conf
##
# PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path
Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
# PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr.
Patch12: util-linux-noenc-suse.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%if %build_util_linux
@ -404,7 +402,6 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} -
%endif
%setup -q -n %{_name}-%{version} -b 40
%patch4 -p1
%patch12 -p1
#
# setctsid
cp -p %{S:22} %{S:23} .
@ -442,13 +439,6 @@ UTIL_LINUX_KNOWN_SYSTEMD_DEPS='$UTIL_LINUX_FOUND_SYSTEMD_DEPS'"
exit 1
fi
#END SYSTEMD SAFETY CHECK
#BEGIN FIRST STAGE MODIFICATIONS
%if !%build_util_linux_systemd
sed -i 's/BUILD_LSLOGINS/FALSE/
s/BUILD_LOGGER/FALSE/
' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am
%endif
#END FIRST STAGE MODIFICATIONS
%else
#BEGIN SECOND STAGE MODIFICATIONS
# delete all make modules except wanted ones
@ -579,10 +569,14 @@ AUTOPOINT=true autoreconf -vfi
--disable-kill \
%endif
%if %build_util_linux_systemd
--enable-logger \
--enable-lslogins \
--enable-uuidd \
--with-systemd \
--with-systemdsystemunitdir=%{_unitdir} \
%else
--disable-logger \
--disable-lslogins \
--disable-uuidd \
--without-systemd \
%endif
@ -606,9 +600,6 @@ make %{?_smp_mflags}
%check
# mark some tests "known_fail"
#
# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO
export TS_OPT_misc_setarch_known_fail="yes"
#
%if 0%{?qemu_user_space_build}
export TS_OPT_fdisk_gpt_known_fail="yes"
export TS_OPT_fdisk_oddinput_known_fail="yes"
@ -619,11 +610,12 @@ export TS_OPT_misc_swaplabel_known_fail="yes"
export TS_OPT_kill_name_to_number_known_fail="yes"
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"
# may segfault on qemu-user-space
export TS_OPT_misc_setarch_known_fail="yes"
%endif
# FIXME: These sometimes fails:
export TS_OPT_libmount_lock_fake="yes"
#
# hacks
export PATH="$PATH:/sbin:/usr/sbin"
@ -1005,6 +997,7 @@ fi
%{_bindir}/lscpu
%{_bindir}/lsipc
%{_bindir}/lslocks
%{_bindir}/lsns
%{_bindir}/mcookie
%{_bindir}/mesg
%{_bindir}/more
@ -1156,6 +1149,7 @@ fi
%{_mandir}/man8/ldattach.8.gz
%{_mandir}/man8/losetup.8.gz
%{_mandir}/man8/lslocks.8.gz
%{_mandir}/man8/lsns.8.gz
%{_mandir}/man8/mkfs.8.gz
%{_mandir}/man8/mkfs.cramfs.8.gz
%{_mandir}/man8/mkswap.8.gz
@ -1198,6 +1192,7 @@ fi
%{_datadir}/bash-completion/*
%if %build_util_linux_systemd
%exclude %{_datadir}/bash-completion/logger
%exclude %{_datadir}/bash-completion/lslogins
%exclude %{_datadir}/bash-completion/uuidd
%endif
%ifnarch ia64 m68k
@ -1329,6 +1324,7 @@ fi
%{_bindir}/logger
%{_bindir}/lslogins
%{_datadir}/bash-completion/logger
%{_datadir}/bash-completion/lslogins
%{_mandir}/man1/logger.1.gz
%{_mandir}/man1/lslogins.1.gz
%{_sbindir}/rcfstrim

41
util-linux.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de
- Update to version 2.28:
* Many changes and improvements, most notably:
* Now cfdisk, sfdisk and fdisk wipe all filesystem and RAID
signatures when creating a new disk label in interactive
mode. See --wipe[=auto|never|always].
* lsns -- this NEW COMMAND lists information about all
currently accessible namespaces or about the given namespace.
* The command sfdisk supports new operations --delete,
--move-data and --reorder.
* The command blkdiscard supports a new option --zeroout to
zero-fill rather than discard a specified area.
* The command cal supports a new option --span to span the date
when displaying multiple months.
* The command chrt supports the DEADLINE scheduling class and
the new options --sched-runtime --sched-period and
--sched-deadline.
* The command logger supports RFC 5424 structured data through
the new options --sd-id and --sd-param.
* The command losetup supports a new option --direct-io.
* The command lsblk allows to sort output by unprinted columns.
* The command mount applies the nofail mount option to
ENOMEDIUM errors.
* The commands nsenter and unshare support a new option
--cgroup for work with cgroups namespaces (CLONE_NEWCGROUP).
* The library libmount has been improved to properly detect
already mounted btrfs subvolumes.
* The library libsmartcols has been massively improved to print
table ranges, multi-line cells, table titles and to support
continuous printing.
* The package build system and code have been improved to be
more portable to non-Linux systems (BSD, OSX).
* The package does not provide fallback solutions for
openat-family functions anymore.
* The python binding for libsmartcols is available in separate
project at https://github.com/ignatenkobrain/python-smartcols
* Security issue: CVE-2016-2779 is NOT FIXED yet.
- Remove old util-linux-noenc-suse.patch
-------------------------------------------------------------------
Tue Dec 1 10:27:17 UTC 2015 - sweet_f_a@gmx.de

34
util-linux.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package util-linux
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -121,7 +121,7 @@ BuildRequires: libmount-devel
%endif
%endif
#END SECOND STAGE DEPENDENCIES
Version: 2.27.1
Version: 2.28
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
@ -130,7 +130,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.27/%{_name}-%{version}.tar.xz
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/%{_name}-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source4: raw.init
Source5: etc.raw
@ -140,7 +140,7 @@ Source8: login.pamd
Source9: remote.pamd
Source10: su.pamd
Source11: su.default
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/%{_name}-%{version}.tar.sign
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/%{_name}-%{version}.tar.sign
Source13: %{_name}.keyring
Source14: runuser.pamd
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
@ -160,8 +160,6 @@ Source51: blkid.conf
##
# PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path
Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
# PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr.
Patch12: util-linux-noenc-suse.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
%if %build_util_linux
@ -404,7 +402,6 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} -
%endif
%setup -q -n %{_name}-%{version} -b 40
%patch4 -p1
%patch12 -p1
#
# setctsid
cp -p %{S:22} %{S:23} .
@ -442,13 +439,6 @@ UTIL_LINUX_KNOWN_SYSTEMD_DEPS='$UTIL_LINUX_FOUND_SYSTEMD_DEPS'"
exit 1
fi
#END SYSTEMD SAFETY CHECK
#BEGIN FIRST STAGE MODIFICATIONS
%if !%build_util_linux_systemd
sed -i 's/BUILD_LSLOGINS/FALSE/
s/BUILD_LOGGER/FALSE/
' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am
%endif
#END FIRST STAGE MODIFICATIONS
%else
#BEGIN SECOND STAGE MODIFICATIONS
# delete all make modules except wanted ones
@ -579,10 +569,14 @@ AUTOPOINT=true autoreconf -vfi
--disable-kill \
%endif
%if %build_util_linux_systemd
--enable-logger \
--enable-lslogins \
--enable-uuidd \
--with-systemd \
--with-systemdsystemunitdir=%{_unitdir} \
%else
--disable-logger \
--disable-lslogins \
--disable-uuidd \
--without-systemd \
%endif
@ -606,9 +600,6 @@ make %{?_smp_mflags}
%check
# mark some tests "known_fail"
#
# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO
export TS_OPT_misc_setarch_known_fail="yes"
#
%if 0%{?qemu_user_space_build}
export TS_OPT_fdisk_gpt_known_fail="yes"
export TS_OPT_fdisk_oddinput_known_fail="yes"
@ -619,11 +610,12 @@ export TS_OPT_misc_swaplabel_known_fail="yes"
export TS_OPT_kill_name_to_number_known_fail="yes"
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"
# may segfault on qemu-user-space
export TS_OPT_misc_setarch_known_fail="yes"
%endif
# FIXME: These sometimes fails:
export TS_OPT_libmount_lock_fake="yes"
#
# hacks
export PATH="$PATH:/sbin:/usr/sbin"
@ -1005,6 +997,7 @@ fi
%{_bindir}/lscpu
%{_bindir}/lsipc
%{_bindir}/lslocks
%{_bindir}/lsns
%{_bindir}/mcookie
%{_bindir}/mesg
%{_bindir}/more
@ -1156,6 +1149,7 @@ fi
%{_mandir}/man8/ldattach.8.gz
%{_mandir}/man8/losetup.8.gz
%{_mandir}/man8/lslocks.8.gz
%{_mandir}/man8/lsns.8.gz
%{_mandir}/man8/mkfs.8.gz
%{_mandir}/man8/mkfs.cramfs.8.gz
%{_mandir}/man8/mkswap.8.gz
@ -1198,6 +1192,7 @@ fi
%{_datadir}/bash-completion/*
%if %build_util_linux_systemd
%exclude %{_datadir}/bash-completion/logger
%exclude %{_datadir}/bash-completion/lslogins
%exclude %{_datadir}/bash-completion/uuidd
%endif
%ifnarch ia64 m68k
@ -1329,6 +1324,7 @@ fi
%{_bindir}/logger
%{_bindir}/lslogins
%{_datadir}/bash-completion/logger
%{_datadir}/bash-completion/lslogins
%{_mandir}/man1/logger.1.gz
%{_mandir}/man1/lslogins.1.gz
%{_sbindir}/rcfstrim