mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-12-04 02:43:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

util-linux: bump to v2.30.1

Browse Source 
- Drop patch 0002-column-fix-compilation-when-libc-lacks-wide-characte.patch
as it has been applied upstream
- Patch 0001-Revert-build-sys-ncurses-headers-cleanup.patch is still
required to fix ncursesw support.

Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com>
Cc: "Carlos Santos" <casantos@datacom.ind.br>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Marcus Hoffmann 2017-07-29 17:36:02 +02:00 committed by Thomas Petazzoni
parent f2b9399c76
commit 94cac1184b
3 changed files with 3 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
package/util-linux/0002-column-fix-compilation-when-libc-lacks-wide-characte.patch
View File

@ -1,53 +0,0 @@
From 46a37cd25db592db878d5beccdf75d1accbbacb6 Mon Sep 17 00:00:00 2001
From: Carlos Santos <casantos@datacom.ind.br>
Date: Tue, 27 Jun 2017 13:18:48 -0300
Subject: [PATCH] column: fix compilation when libc lacks wide-character
support
Commit 4762ae9d removed mtsafe_strtok() but left behind calls to wcstok
and wcspbrk. This leads to build failures when libc does not have the
wide-character functions, like some uClibc builds.
Solve the problem by using strtok_r and strpbrk when HAVE_WIDECHAR is
not defined.
Fixes:
http://autobuild.buildroot.net/results/fd8a1a8e0cef3aeed9588540e8e663664f6b43aa
http://autobuild.buildroot.net/results/5ad73ea8b471321988c50d80a5e50d4504151dd6
http://autobuild.buildroot.net/results/04411b7280dc51ecd51236967981a42352bbeb3e
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
---
text-utils/column.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/text-utils/column.c b/text-utils/column.c
index be99f94..fb57b47 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -160,14 +160,22 @@ static wchar_t *local_wcstok(wchar_t *p, const wchar_t *separator, int greedy, w
wchar_t *result = NULL;
if (greedy)
+#ifdef HAVE_WIDECHAR
return wcstok(p, separator, state);
+#else
+ return strtok_r(p, separator, state);
+#endif
if (!p) {
if (!*state || !**state)
return NULL;
p = *state;
}
result = p;
+#ifdef HAVE_WIDECHAR
p = wcspbrk(result, separator);
+#else
+ p = strpbrk(result, separator);
+#endif
if (!p)
*state = NULL;
else {
--
2.7.5

2
package/util-linux/util-linux.hash
View File

@ -1,2 +1,2 @@
# From https://www.kernel.org/pub/linux/utils/util-linux/v2.30/sha256sums.asc
sha256 c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d util-linux-2.30.tar.xz
sha256 1be4363a91ac428c9e43fc04dc6d2c66a19ec1e36f1105bd4b481540be13b841 util-linux-2.30.1.tar.xz

3
package/util-linux/util-linux.mk
View File

@ -5,7 +5,8 @@
################################################################################
UTIL_LINUX_VERSION_MAJOR = 2.30
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR)
UTIL_LINUX_VERSION_MINOR = 1
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).$(UTIL_LINUX_VERSION_MINOR)
UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)