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

Accepting request 543952 from home:sbrabec:branches:util-linux-2.31

Browse Source 
- Update to version 2.31:
  * New utilities: uuidparse, rfkill.
  * su has been refactored and extended to create pseudo terminal
    (new option --pty, CVE-2016-2779, bsc#968674). This new
    EXPERIMENTAL feature provides better isolation between root's
    terminal and an unprivileged su.
  * libuuid: Improved to match 
  * libuuid, uuidgen: support hash-based UUIDs v3 (md5) and v5
    (sha1) as specified by RFC-4122. Provide UUID templates for
    dns, url, oid, or x500.
  * libblkid: Extended support for DM-integrity, HPE (aka
    extended-XFS) and UBI superblock. New API to hide already
    detected signatures.
  * libfdisk: New API to modify grain, make possible to completely
    disable dialog driven partitioning.
  * libsmartcols: New API to move columns.
  * column: --table-header-repeat to repeat table headers.
  * libfdisk: Use BLKPG ioctls to inform the kernel about changes.
  * fdisk: Improved ^C and ^D behavior.
  * cfdisk: Dialog to resize partition.
  * look: Follow the WORDLIST environment variable.
  * script: Follow the usual semantics for stop/continue signals.
  * setpriv: New command line options --ambient-caps and
    --init-groups.
  * hwclock: Reduce system shutdown times, log --systz when using
    libaudit.
  * Other bug fixes.
- Drop upstreamed util-linux-use-tinfow.patch.

- Update to version 2.31:

OBS-URL: https://build.opensuse.org/request/show/543952
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=352
This commit is contained in:
Dirk Mueller 2017-11-27 10:06:27 +00:00 committed by Git OBS Bridge
parent 6025e3d210
commit 7cdd2de735
12 changed files with 173 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
View File

@ -1,7 +1,9 @@
--- a/login-utils/su-common.c Index: util-linux-2.31/login-utils/su-common.c
+++ b/login-utils/su-common.c ===================================================================
@@ -523,6 +523,117 @@ set_path(const struct passwd* pw) --- util-linux-2.31.orig/login-utils/su-common.c
err (EXIT_FAILURE, _("failed to set the %s environment variable"), "PATH"); +++ util-linux-2.31/login-utils/su-common.c
@@ -944,6 +944,117 @@ static void setenv_path(const struct pas
err(EXIT_FAILURE, _("failed to set the PATH environment variable"));
} }
+/* Add or clear /sbin and /usr/sbin for the su command +/* Add or clear /sbin and /usr/sbin for the su command
@ -115,29 +117,29 @@
+ return ret; + return ret;
+} +}
+ +
/* Update `environ' for the new shell based on PW, with SHELL being static void modify_environment(struct su_context *su, const char *shell)
the value for the SHELL environment variable. */ {
const struct passwd *pw = su->pwd;
@@ -982,6 +1093,22 @@ static void modify_environment(struct su
@@ -560,6 +671,22 @@ modify_environment (const struct passwd *pw, const char *shell) if (getlogindefs_bool("ALWAYS_SET_PATH", 0))
xsetenv ("SHELL", shell, 1); setenv_path(pw);
if (getlogindefs_bool ("ALWAYS_SET_PATH", 0)) + else
set_path(pw);
+ else
+ {
+ char const *path = getenv ("PATH");
+ char *new = NULL;
+
+ if (pw->pw_uid)
+ new = clearsbin (path);
+ else
+ new = addsbin (path);
+
+ if (new)
+ { + {
+ xsetenv ("PATH", new, 1); + char const *path = getenv ("PATH");
+ free (new); + char *new = NULL;
+
+ if (pw->pw_uid)
+ new = clearsbin (path);
+ else
+ new = addsbin (path);
+
+ if (new)
+ {
+ xsetenv ("PATH", new, 1);
+ free (new);
+ }
+ } + }
+ }
if (pw->pw_uid) if (pw->pw_uid) {
{ xsetenv("USER", pw->pw_name, 1);

32
python-libmount.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 20 17:29:11 CET 2017 - sbrabec@suse.com
- Update to version 2.31:
* New utilities: uuidparse, rfkill.
* su has been refactored and extended to create pseudo terminal
(new option --pty, CVE-2016-2779, bsc#968674). This new
EXPERIMENTAL feature provides better isolation between root's
terminal and an unprivileged su.
* libuuid: Improved to match
* libuuid, uuidgen: support hash-based UUIDs v3 (md5) and v5
(sha1) as specified by RFC-4122. Provide UUID templates for
dns, url, oid, or x500.
* libblkid: Extended support for DM-integrity, HPE (aka
extended-XFS) and UBI superblock. New API to hide already
detected signatures.
* libfdisk: New API to modify grain, make possible to completely
disable dialog driven partitioning.
* libsmartcols: New API to move columns.
* column: --table-header-repeat to repeat table headers.
* libfdisk: Use BLKPG ioctls to inform the kernel about changes.
* fdisk: Improved ^C and ^D behavior.
* cfdisk: Dialog to resize partition.
* look: Follow the WORDLIST environment variable.
* script: Follow the usual semantics for stop/continue signals.
* setpriv: New command line options --ambient-caps and
--init-groups.
* hwclock: Reduce system shutdown times, log --systz when using
libaudit.
* Other bug fixes.
- Drop upstreamed util-linux-use-tinfow.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de

14
python-libmount.spec
View File

@ -116,7 +116,7 @@ BuildRequires: libmount-devel
%endif %endif
%endif %endif
#END SECOND STAGE DEPENDENCIES #END SECOND STAGE DEPENDENCIES
Version: 2.30.1 Version: 2.31
Release: 0 Release: 0
# util-linux is a base package and uuidd pre-requiring pwdutils pulls # util-linux is a base package and uuidd pre-requiring pwdutils pulls
# that into the core build cycle. pwdutils also pulls in the whole # that into the core build cycle. pwdutils also pulls in the whole
@ -157,8 +157,6 @@ Source51: blkid.conf
Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff 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. # 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 Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
# PATCH-FIX-UPSTREAM util-linux-use-tinfow.patch bsc#1056171 sbrabec@suse.com -- Link against tinfow instead of tinfo.
Patch2: util-linux-use-tinfow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
%if %build_util_linux %if %build_util_linux
@ -173,10 +171,13 @@ PreReq: %install_info_prereq permissions
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
Provides: login = 4.0-33.7 Provides: login = 4.0-33.7
Provides: rfkill = 0.5-8.6
# File conflict of eject (up to 12.3 and SLE11). # File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8 Obsoletes: eject < 2.1.0-166.8
# File conflict of login (up to 12.1 and SLE11). # File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7 Obsoletes: login < 4.0-33.7
# File confluct (man page) of rfkill (up to Leap 15 and SLE 15).
Obsoletes: rfkill < 0.5-8.6
# File conflict of su and kill (up to 12.3 and SLE11). # File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21
@ -422,7 +423,6 @@ library.
# logical block size support in loop does not exist in Tumbleweed and upstream kernel yet # logical block size support in loop does not exist in Tumbleweed and upstream kernel yet
%patch1 -p1 %patch1 -p1
%endif %endif
%patch2 -p1
# #
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .
@ -557,6 +557,8 @@ AUTOPOINT=true autoreconf -vfi
--disable-silent-rules \ --disable-silent-rules \
--localstatedir=/run \ --localstatedir=/run \
--docdir=%{_docdir}/%{_name} \ --docdir=%{_docdir}/%{_name} \
--disable-makeinstall-chown \
--disable-makeinstall-setuid \
--with-audit \ --with-audit \
--with-btrfs \ --with-btrfs \
--with-gnu-ld \ --with-gnu-ld \
@ -993,6 +995,7 @@ getent passwd uuidd >/dev/null || \
%{_bindir}/rename %{_bindir}/rename
%{_bindir}/renice %{_bindir}/renice
%{_bindir}/rev %{_bindir}/rev
%{_bindir}/rfkill
%{_bindir}/script %{_bindir}/script
%{_bindir}/scriptreplay %{_bindir}/scriptreplay
%{_bindir}/setarch %{_bindir}/setarch
@ -1005,6 +1008,7 @@ getent passwd uuidd >/dev/null || \
%{_bindir}/mountpoint %{_bindir}/mountpoint
%{_bindir}/utmpdump %{_bindir}/utmpdump
%{_bindir}/uuidgen %{_bindir}/uuidgen
%{_bindir}/uuidparse
%{_bindir}/uname26 %{_bindir}/uname26
%ifnarch ppc ppc64 %ifnarch ppc ppc64
%{_bindir}/chrp-addnote %{_bindir}/chrp-addnote
@ -1108,6 +1112,7 @@ getent passwd uuidd >/dev/null || \
%{_mandir}/man1/utmpdump.1.gz %{_mandir}/man1/utmpdump.1.gz
%{_mandir}/man1/runuser.1.gz %{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz %{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man1/uuidparse.1.gz
%{_mandir}/man5/fstab.5.gz %{_mandir}/man5/fstab.5.gz
%{_mandir}/man5/terminal-colors.d.5.gz %{_mandir}/man5/terminal-colors.d.5.gz
%{_mandir}/man8/addpart.8.gz %{_mandir}/man8/addpart.8.gz
@ -1142,6 +1147,7 @@ getent passwd uuidd >/dev/null || \
%{_mandir}/man8/fsfreeze.8.gz %{_mandir}/man8/fsfreeze.8.gz
%{_mandir}/man8/swaplabel.8.gz %{_mandir}/man8/swaplabel.8.gz
%{_mandir}/man8/readprofile.8.gz %{_mandir}/man8/readprofile.8.gz
%{_mandir}/man8/rfkill.8.gz
%{_mandir}/man8/chcpu.8.gz %{_mandir}/man8/chcpu.8.gz
%ifnarch ppc ppc64 %ifnarch ppc ppc64
%{_mandir}/man8/mkzimage_cmdline.8.gz %{_mandir}/man8/mkzimage_cmdline.8.gz

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

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJZcHfsAAoJEOS3HV7sOcKEl7wP/jnzss0+A1BW5EVZywk69lDa
534rzlHJVyvysOXKD+zDk+Ky4Q8BYPizGQ4hYg/fhHvxgPVb8jrynwcNzdGEPjHV
OCQ1fikRgun2i77KoU2vZJ6vvo66mFRytKaoRAJRHhkkQQkcGlNPCcN0V+ZlBfn+
RWL50P0knqw/LK9NfKhASoI315p7nUypmqf+g3jxFNLjXXnHefUDLlZNn85oJLgf
Vsx/1IYk3MTOgDjAx5K24H31XNWOKaO/pvPezd1RPt6gc4EcKc2I/8AY+5yM5XAF
sCk6wCIjvf3+2B8K6XgUIBhABxgDnyQi8+lNqDUfR4NbufonzBZDpQLHfjN7XWgg
Zgfo7as21fM1vCuEuwOQbkbDFA4wso5kRgof+HfTDnLU3hDtbNiI/5ZH0cTf2qp9
8CwnSpxdES3Hw/eFkOaVMlwE4CoGJqZejMnOzNWo+b5lVqfmeSUgUxyvW3IDSUfm
+Zu9+MVL+T9YDkVuqB+rCeWSBxShev0+cRHP6p5NkWkGRgbCHkecZ7zZ9aFZ9Dsm
OE6nOot05oS8mUjpXyUs96VwbRqqBR54Tc3+DjBUjrpzlwajhz++g+XjAiwON5NT
ex30EbDFW/VRm3cWo4YH1MdesVcWqrqsrDRN0RyqZ/ctqOMgkQG6vNaQ6f3O2wgc
qFbsvhGu7NctRjuOj9UP
=cMtf
-----END PGP SIGNATURE-----

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

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

16
util-linux-2.31.tar.sign Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAlnoipIACgkQ5LcdXuw5
woSnthAAhqdxus2J9uxERU1JwMJxiDpjwZnRR3NFHvBlY04maoaniAsVlQG8uWWr
xE13jVkiG2hc+llt4UhDJA3sT0Hz1elNOKJD6fsZ598fptTYvF3fqLjstuJGCVyF
hDio8lqAqurnpX3jtyG0tNrT3CVIUU2jrTq9QXqpB8jq699ez8xulMdU+VEqmbOg
E5i5skWxfnaYxleXN8WkV+5WZx2tczWufLqVbLcUE7bOUyiEAubmXhbm9xgOJ8pX
cUrOverbfvopZYlIUB44UcNYyWsj12r7/aIQBh2q6xmv5wOOAiZzFMBh4eZu07vc
jZFKv2GYxVBU+e/1ERH0x4xbxCRXV9l1G9+V/H9GSbGCHK0+/0r7MzXf+QiADowx
YkqROTvfTagNVPBbzU0pNeTsQs+AZg49JhTcCBVtk1yxufOK3BuRqU5PtuDBQCw4
u8Z/kkZSdaOexJeaBJDhHEvPTCkAUBcuppU9tJ8dZ+3Orpdb8ghbBOxS3VUKIHn5
FAnaC7OLPPB2uBTKrG5JH+mUnXCTYfctEPB3D/Rnjsyjs+T8h6zf5cnQ6NFvXPxw
xm8FA3bcKvdSVcLwqFQLkvORfy1/Ju53HRDABSDLe4yjTUi8oAj4hqbR607/XPMA
ZYBRRZntdKNLcrQUjnawjaExXcR2oACocaZ8Ul+mpaXsmjKIEc8=
=u6TW
-----END PGP SIGNATURE-----

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

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

32
util-linux-systemd.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 20 17:29:11 CET 2017 - sbrabec@suse.com
- Update to version 2.31:
* New utilities: uuidparse, rfkill.
* su has been refactored and extended to create pseudo terminal
(new option --pty, CVE-2016-2779, bsc#968674). This new
EXPERIMENTAL feature provides better isolation between root's
terminal and an unprivileged su.
* libuuid: Improved to match
* libuuid, uuidgen: support hash-based UUIDs v3 (md5) and v5
(sha1) as specified by RFC-4122. Provide UUID templates for
dns, url, oid, or x500.
* libblkid: Extended support for DM-integrity, HPE (aka
extended-XFS) and UBI superblock. New API to hide already
detected signatures.
* libfdisk: New API to modify grain, make possible to completely
disable dialog driven partitioning.
* libsmartcols: New API to move columns.
* column: --table-header-repeat to repeat table headers.
* libfdisk: Use BLKPG ioctls to inform the kernel about changes.
* fdisk: Improved ^C and ^D behavior.
* cfdisk: Dialog to resize partition.
* look: Follow the WORDLIST environment variable.
* script: Follow the usual semantics for stop/continue signals.
* setpriv: New command line options --ambient-caps and
--init-groups.
* hwclock: Reduce system shutdown times, log --systz when using
libaudit.
* Other bug fixes.
- Drop upstreamed util-linux-use-tinfow.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de

14
util-linux-systemd.spec
View File

@ -116,7 +116,7 @@ BuildRequires: libmount-devel
%endif %endif
%endif %endif
#END SECOND STAGE DEPENDENCIES #END SECOND STAGE DEPENDENCIES
Version: 2.30.1 Version: 2.31
Release: 0 Release: 0
# util-linux is a base package and uuidd pre-requiring pwdutils pulls # util-linux is a base package and uuidd pre-requiring pwdutils pulls
# that into the core build cycle. pwdutils also pulls in the whole # that into the core build cycle. pwdutils also pulls in the whole
@ -157,8 +157,6 @@ Source51: blkid.conf
Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff 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. # 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 Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
# PATCH-FIX-UPSTREAM util-linux-use-tinfow.patch bsc#1056171 sbrabec@suse.com -- Link against tinfow instead of tinfo.
Patch2: util-linux-use-tinfow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
%if %build_util_linux %if %build_util_linux
@ -173,10 +171,13 @@ PreReq: %install_info_prereq permissions
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
Provides: login = 4.0-33.7 Provides: login = 4.0-33.7
Provides: rfkill = 0.5-8.6
# File conflict of eject (up to 12.3 and SLE11). # File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8 Obsoletes: eject < 2.1.0-166.8
# File conflict of login (up to 12.1 and SLE11). # File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7 Obsoletes: login < 4.0-33.7
# File confluct (man page) of rfkill (up to Leap 15 and SLE 15).
Obsoletes: rfkill < 0.5-8.6
# File conflict of su and kill (up to 12.3 and SLE11). # File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21
@ -422,7 +423,6 @@ library.
# logical block size support in loop does not exist in Tumbleweed and upstream kernel yet # logical block size support in loop does not exist in Tumbleweed and upstream kernel yet
%patch1 -p1 %patch1 -p1
%endif %endif
%patch2 -p1
# #
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .
@ -557,6 +557,8 @@ AUTOPOINT=true autoreconf -vfi
--disable-silent-rules \ --disable-silent-rules \
--localstatedir=/run \ --localstatedir=/run \
--docdir=%{_docdir}/%{_name} \ --docdir=%{_docdir}/%{_name} \
--disable-makeinstall-chown \
--disable-makeinstall-setuid \
--with-audit \ --with-audit \
--with-btrfs \ --with-btrfs \
--with-gnu-ld \ --with-gnu-ld \
@ -993,6 +995,7 @@ getent passwd uuidd >/dev/null || \
%{_bindir}/rename %{_bindir}/rename
%{_bindir}/renice %{_bindir}/renice
%{_bindir}/rev %{_bindir}/rev
%{_bindir}/rfkill
%{_bindir}/script %{_bindir}/script
%{_bindir}/scriptreplay %{_bindir}/scriptreplay
%{_bindir}/setarch %{_bindir}/setarch
@ -1005,6 +1008,7 @@ getent passwd uuidd >/dev/null || \
%{_bindir}/mountpoint %{_bindir}/mountpoint
%{_bindir}/utmpdump %{_bindir}/utmpdump
%{_bindir}/uuidgen %{_bindir}/uuidgen
%{_bindir}/uuidparse
%{_bindir}/uname26 %{_bindir}/uname26
%ifnarch ppc ppc64 %ifnarch ppc ppc64
%{_bindir}/chrp-addnote %{_bindir}/chrp-addnote
@ -1108,6 +1112,7 @@ getent passwd uuidd >/dev/null || \
%{_mandir}/man1/utmpdump.1.gz %{_mandir}/man1/utmpdump.1.gz
%{_mandir}/man1/runuser.1.gz %{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz %{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man1/uuidparse.1.gz
%{_mandir}/man5/fstab.5.gz %{_mandir}/man5/fstab.5.gz
%{_mandir}/man5/terminal-colors.d.5.gz %{_mandir}/man5/terminal-colors.d.5.gz
%{_mandir}/man8/addpart.8.gz %{_mandir}/man8/addpart.8.gz
@ -1142,6 +1147,7 @@ getent passwd uuidd >/dev/null || \
%{_mandir}/man8/fsfreeze.8.gz %{_mandir}/man8/fsfreeze.8.gz
%{_mandir}/man8/swaplabel.8.gz %{_mandir}/man8/swaplabel.8.gz
%{_mandir}/man8/readprofile.8.gz %{_mandir}/man8/readprofile.8.gz
%{_mandir}/man8/rfkill.8.gz
%{_mandir}/man8/chcpu.8.gz %{_mandir}/man8/chcpu.8.gz
%ifnarch ppc ppc64 %ifnarch ppc ppc64
%{_mandir}/man8/mkzimage_cmdline.8.gz %{_mandir}/man8/mkzimage_cmdline.8.gz

98
util-linux-use-tinfow.patch
View File

@ -1,98 +0,0 @@
From ad442a818c6eefabb8258a9949206e12f2296161 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 19 Sep 2017 12:55:49 +0200
Subject: [PATCH] build-sys: add libtinfow check
It seems some systems differentiate between tinfo and tinfow. And it
seems that mix ncursesw and tinfo (wide vs. non-wide char) is problem
for the systems.
Note that for example Fedora have ncursesw as well as ncurses, but
only one tinfo library. So, we need fallback this scenario.
Reported-by: Stanislav Brabec <sbrabec@suse.cz>
Signed-off-by: Karel Zak <kzak@redhat.com>
---
configure.ac | 24 +++++++++---------------
m4/ul.m4 | 27 +++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index c534b49f2..73cf22168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -905,27 +905,21 @@ AC_ARG_WITH([tinfo], AS_HELP_STRING([--without-tinfo], [compile without libtinfo
[], [with_tinfo=auto]
)
have_tinfo=no
+have_tinfow=no
AS_IF([test "x$with_tinfo" != xno], [
- dnl Try pkg-config for libtinfo
- PKG_CHECK_MODULES(TINFO, [tinfo], [
- dnl pkg-config success
- have_tinfo=yes
- UL_PKG_STATIC([TINFO_LIBS_STATIC], [tinfo])], [
-
- dnl If pkg-config failed, fall back to classic searching.
- AC_CHECK_LIB([tinfo], [tgetent], [
- have_tinfo=yes
- TINFO_LIBS="-ltinfo"
- TINFO_LIBS_STATIC="-ltinfo"
- TINFO_CFLAGS=""])
+ AS_IF([test "x$have_ncursesw" = xyes], [
+ UL_TINFO_CHECK([tinfow])
+ ])
+ AS_IF([test "x$have_tinfow" = xno], [
+ UL_TINFO_CHECK([tinfo])
])
])
AC_SUBST([TINFO_LIBS])
AC_SUBST([TINFO_LIBS_STATIC])
AC_SUBST([TINFO_CFLAGS])
-AM_CONDITIONAL([HAVE_TINFO], [test "x$have_tinfo" = xyes])
-AS_IF([test "x$have_tinfo" = xyes], [
- AC_DEFINE(HAVE_LIBTINFO, 1, [Define if libtinfo available.])
+AM_CONDITIONAL([HAVE_TINFO], [test "x$have_tinfo" = xyes -o "x$have_tinfow" = xyes])
+AS_IF([test "x$have_tinfo" = xyes -o "x$have_tinfow" = xyes], [
+ AC_DEFINE(HAVE_LIBTINFO, 1, [Define if libtinfo or libtinfow available.])
])
diff --git a/m4/ul.m4 b/m4/ul.m4
index cfd2e68fc..351d9cb6b 100644
--- a/m4/ul.m4
+++ b/m4/ul.m4
@@ -498,3 +498,30 @@ AC_DEFUN([UL_NCURSES_CHECK], [
AS_IF([test "x$have_[]suffix" = xyes], [NCURSES_LIBS="-l[]suffix"])
])
])
+
+dnl
+dnl UL_TINFO_CHECK(NAME)
+dnl
+dnl Initializes $have_<name>, TINFO_LIBS and TINFO_CFLAGS variables.
+dnl
+dnl The expected <name> is tinfow or tinfo.
+dnl
+AC_DEFUN([UL_TINFO_CHECK], [
+ m4_define([suffix], $1)
+ m4_define([SUFFIX], m4_toupper($1))
+
+ PKG_CHECK_MODULES(SUFFIX, [$1], [
+ dnl pkg-config success
+ have_[]suffix=yes
+ TINFO_LIBS=${SUFFIX[]_LIBS}
+ TINFO_CFLAGS=${SUFFIX[]_CFLAGS}
+ UL_PKG_STATIC([TINFO_LIBS_STATIC], [$1])
+ ],[
+ dnl If pkg-config failed, fall back to classic searching.
+ AC_CHECK_LIB([$1], [tgetent], [
+ have_[]suffix=yes
+ TINFO_LIBS="-l[]suffix"
+ TINFO_LIBS_STATIC="-l[]suffix"
+ TINFO_CFLAGS=""])
+ ])
+])
--
2.14.1

32
util-linux.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 20 17:29:11 CET 2017 - sbrabec@suse.com
- Update to version 2.31:
* New utilities: uuidparse, rfkill.
* su has been refactored and extended to create pseudo terminal
(new option --pty, CVE-2016-2779, bsc#968674). This new
EXPERIMENTAL feature provides better isolation between root's
terminal and an unprivileged su.
* libuuid: Improved to match
* libuuid, uuidgen: support hash-based UUIDs v3 (md5) and v5
(sha1) as specified by RFC-4122. Provide UUID templates for
dns, url, oid, or x500.
* libblkid: Extended support for DM-integrity, HPE (aka
extended-XFS) and UBI superblock. New API to hide already
detected signatures.
* libfdisk: New API to modify grain, make possible to completely
disable dialog driven partitioning.
* libsmartcols: New API to move columns.
* column: --table-header-repeat to repeat table headers.
* libfdisk: Use BLKPG ioctls to inform the kernel about changes.
* fdisk: Improved ^C and ^D behavior.
* cfdisk: Dialog to resize partition.
* look: Follow the WORDLIST environment variable.
* script: Follow the usual semantics for stop/continue signals.
* setpriv: New command line options --ambient-caps and
--init-groups.
* hwclock: Reduce system shutdown times, log --systz when using
libaudit.
* Other bug fixes.
- Drop upstreamed util-linux-use-tinfow.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de

14
util-linux.spec
View File

@ -116,7 +116,7 @@ BuildRequires: libmount-devel
%endif %endif
%endif %endif
#END SECOND STAGE DEPENDENCIES #END SECOND STAGE DEPENDENCIES
Version: 2.30.1 Version: 2.31
Release: 0 Release: 0
# util-linux is a base package and uuidd pre-requiring pwdutils pulls # util-linux is a base package and uuidd pre-requiring pwdutils pulls
# that into the core build cycle. pwdutils also pulls in the whole # that into the core build cycle. pwdutils also pulls in the whole
@ -157,8 +157,6 @@ Source51: blkid.conf
Patch0: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff 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. # 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 Patch1: util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
# PATCH-FIX-UPSTREAM util-linux-use-tinfow.patch bsc#1056171 sbrabec@suse.com -- Link against tinfow instead of tinfo.
Patch2: util-linux-use-tinfow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
%if %build_util_linux %if %build_util_linux
@ -173,10 +171,13 @@ PreReq: %install_info_prereq permissions
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
Provides: login = 4.0-33.7 Provides: login = 4.0-33.7
Provides: rfkill = 0.5-8.6
# File conflict of eject (up to 12.3 and SLE11). # File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8 Obsoletes: eject < 2.1.0-166.8
# File conflict of login (up to 12.1 and SLE11). # File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7 Obsoletes: login < 4.0-33.7
# File confluct (man page) of rfkill (up to Leap 15 and SLE 15).
Obsoletes: rfkill < 0.5-8.6
# File conflict of su and kill (up to 12.3 and SLE11). # File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21
@ -422,7 +423,6 @@ library.
# logical block size support in loop does not exist in Tumbleweed and upstream kernel yet # logical block size support in loop does not exist in Tumbleweed and upstream kernel yet
%patch1 -p1 %patch1 -p1
%endif %endif
%patch2 -p1
# #
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .
@ -557,6 +557,8 @@ AUTOPOINT=true autoreconf -vfi
--disable-silent-rules \ --disable-silent-rules \
--localstatedir=/run \ --localstatedir=/run \
--docdir=%{_docdir}/%{_name} \ --docdir=%{_docdir}/%{_name} \
--disable-makeinstall-chown \
--disable-makeinstall-setuid \
--with-audit \ --with-audit \
--with-btrfs \ --with-btrfs \
--with-gnu-ld \ --with-gnu-ld \
@ -993,6 +995,7 @@ getent passwd uuidd >/dev/null || \
%{_bindir}/rename %{_bindir}/rename
%{_bindir}/renice %{_bindir}/renice
%{_bindir}/rev %{_bindir}/rev
%{_bindir}/rfkill
%{_bindir}/script %{_bindir}/script
%{_bindir}/scriptreplay %{_bindir}/scriptreplay
%{_bindir}/setarch %{_bindir}/setarch
@ -1005,6 +1008,7 @@ getent passwd uuidd >/dev/null || \
%{_bindir}/mountpoint %{_bindir}/mountpoint
%{_bindir}/utmpdump %{_bindir}/utmpdump
%{_bindir}/uuidgen %{_bindir}/uuidgen
%{_bindir}/uuidparse
%{_bindir}/uname26 %{_bindir}/uname26
%ifnarch ppc ppc64 %ifnarch ppc ppc64
%{_bindir}/chrp-addnote %{_bindir}/chrp-addnote
@ -1108,6 +1112,7 @@ getent passwd uuidd >/dev/null || \
%{_mandir}/man1/utmpdump.1.gz %{_mandir}/man1/utmpdump.1.gz
%{_mandir}/man1/runuser.1.gz %{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz %{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man1/uuidparse.1.gz
%{_mandir}/man5/fstab.5.gz %{_mandir}/man5/fstab.5.gz
%{_mandir}/man5/terminal-colors.d.5.gz %{_mandir}/man5/terminal-colors.d.5.gz
%{_mandir}/man8/addpart.8.gz %{_mandir}/man8/addpart.8.gz
@ -1142,6 +1147,7 @@ getent passwd uuidd >/dev/null || \
%{_mandir}/man8/fsfreeze.8.gz %{_mandir}/man8/fsfreeze.8.gz
%{_mandir}/man8/swaplabel.8.gz %{_mandir}/man8/swaplabel.8.gz
%{_mandir}/man8/readprofile.8.gz %{_mandir}/man8/readprofile.8.gz
%{_mandir}/man8/rfkill.8.gz
%{_mandir}/man8/chcpu.8.gz %{_mandir}/man8/chcpu.8.gz
%ifnarch ppc ppc64 %ifnarch ppc ppc64
%{_mandir}/man8/mkzimage_cmdline.8.gz %{_mandir}/man8/mkzimage_cmdline.8.gz