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

Accepting request 530401 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/530401
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=222
This commit is contained in:
Dominique Leuenberger 2017-10-06 08:53:35 +00:00 committed by Git OBS Bridge
commit 9e2b570d46
7 changed files with 126 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python-libmount.changes
View File

@ -4,6 +4,12 @@ Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de
- Update RPM categories and summaries. - Update RPM categories and summaries.
Do not ignore errors from useradd. Do not ignore errors from useradd.
-------------------------------------------------------------------
Tue Sep 19 14:11:49 CEST 2017 - sbrabec@suse.com
- Link against tinfow instead of tinfo
(bsc#1056171, util-linux-use-tinfow.patch).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de

6
python-libmount.spec
View File

@ -73,7 +73,7 @@ Name: python-libmount
%endif %endif
Summary: %main_summary Summary: %main_summary
License: GPL-2.0+ License: GPL-2.0+
Group: %group_pl Group: %main_group
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils-devel BuildRequires: binutils-devel
@ -157,6 +157,8 @@ 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
@ -403,7 +405,6 @@ SMP systems.
%if %build_util_linux %if %build_util_linux
%package -n python-libmount %package -n python-libmount
Summary: %summary_pl Summary: %summary_pl
License: GPL-2.0+
Group: %group_pl Group: %group_pl
%description -n python-libmount %description -n python-libmount
@ -421,6 +422,7 @@ 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} .

6
util-linux-systemd.changes
View File

@ -4,6 +4,12 @@ Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de
- Update RPM categories and summaries. - Update RPM categories and summaries.
Do not ignore errors from useradd. Do not ignore errors from useradd.
-------------------------------------------------------------------
Tue Sep 19 14:11:49 CEST 2017 - sbrabec@suse.com
- Link against tinfow instead of tinfo
(bsc#1056171, util-linux-use-tinfow.patch).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de

3
util-linux-systemd.spec
View File

@ -157,6 +157,8 @@ 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
@ -420,6 +422,7 @@ 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} .

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

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

6
util-linux.changes
View File

@ -4,6 +4,12 @@ Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de
- Update RPM categories and summaries. - Update RPM categories and summaries.
Do not ignore errors from useradd. Do not ignore errors from useradd.
-------------------------------------------------------------------
Tue Sep 19 14:11:49 CEST 2017 - sbrabec@suse.com
- Link against tinfow instead of tinfo
(bsc#1056171, util-linux-use-tinfow.patch).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de

3
util-linux.spec
View File

@ -157,6 +157,8 @@ 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
@ -420,6 +422,7 @@ 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} .