Skip to contentSkip to conversation

util-linux: bump to version 2.26

PATCH New Gustavo Zacarias 2 participants 2 messages Feb 20, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 util-linux: bump to version 2.26

---
 package/util-linux/0001-sscanf-no-ms-as.patch   |  52 ++------
 package/util-linux/0004-fix-CVE-2014-9114.patch | 168 ------------------------
 package/util-linux/Config.in                    |   5 +
 package/util-linux/util-linux.hash              |   4 +-
 package/util-linux/util-linux.mk                |  12 +-
 5 files changed, 24 insertions(+), 217 deletions(-)
 delete mode 100644 package/util-linux/0004-fix-CVE-2014-9114.patch
package/util-linux/0001-sscanf-no-ms-as.patch +9 -43
index be2b0eb..81b2be5 100644
@@ -3,58 +3,24 @@ Fix libmount build under uClibc
 See https://bugs.gentoo.org/show_bug.cgi?id=406303
 http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.21.1-no-printf-alloc.patch?revision=1.2
 
-[Gustavo: Ported to util-linux-2.25.1]
+[Gustavo: Ported to util-linux-2.26]
 
 Signed-off-by: Gustavo Zacarias <[email protected]>
 
-diff -Nura util-linux-2.25.1.orig/configure.ac util-linux-2.25.1/configure.ac
---- util-linux-2.25.1.orig/configure.ac	2014-09-05 10:44:45.302080174 -0300
-+++ util-linux-2.25.1/configure.ac	2014-09-05 10:45:07.183832640 -0300
-@@ -791,7 +791,6 @@
+diff -Nura util-linux-2.26.orig/configure.ac util-linux-2.26/configure.ac
+--- util-linux-2.26.orig/configure.ac	2015-02-19 09:11:13.146192401 -0300
++++ util-linux-2.26/configure.ac	2015-02-20 08:13:32.740006582 -0300
+@@ -840,7 +840,6 @@
+ )
  UL_BUILD_INIT([libmount])
- UL_REQUIRES_LINUX([libmount])
  UL_REQUIRES_BUILD([libmount], [libblkid])
 -UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier])
  AM_CONDITIONAL([BUILD_LIBMOUNT], [test "x$build_libmount" = xyes])
  AM_CONDITIONAL([BUILD_LIBMOUNT_TESTS], [test "x$build_libmount" = xyes -a "x$enable_static" = xyes])
  
-diff -Nura util-linux-2.25.1.orig/lib/colors.c util-linux-2.25.1/lib/colors.c
---- util-linux-2.25.1.orig/lib/colors.c	2014-09-05 10:44:45.301080140 -0300
-+++ util-linux-2.25.1/lib/colors.c	2014-09-05 13:12:00.175205476 -0300
-@@ -16,6 +16,10 @@
- #include "pathnames.h"
- #include "strutils.h"
- 
-+#ifndef HAVE_SCANF_MS_MODIFIER
-+# define UL_SCNsA "%s"
-+#endif
-+
- /*
-  * terminal-colors.d file types
-  */
-@@ -577,9 +581,19 @@
- 		if (*p == '\0' || *p == '#')
- 			continue;
- 
-+#ifndef HAVE_SCANF_MS_MODIFIER
-+		size_t len = strlen(p) + 1;
-+		cn = malloc(len);
-+		seq = malloc(len);
-+#endif
-+
- 		rc = sscanf(p,  UL_SCNsA" "	/* name */
- 				UL_SCNsA,	/* color */
-+#ifdef HAVE_SCANF_MS_MODIFIER
- 				&cn, &seq);
-+#else
-+				cn, seq);
-+#endif
- 		if (rc == 2 && cn && seq)
- 			rc = colors_add_scheme(cc, cn, seq);	/* set rc=0 on success */
- 		if (rc) {
-diff -Nura util-linux-2.25.1.orig/libmount/src/tab_parse.c util-linux-2.25.1/libmount/src/tab_parse.c
---- util-linux-2.25.1.orig/libmount/src/tab_parse.c	2014-09-05 10:44:45.276079280 -0300
-+++ util-linux-2.25.1/libmount/src/tab_parse.c	2014-09-05 10:51:22.500738967 -0300
+diff -Nura util-linux-2.26.orig/libmount/src/tab_parse.c util-linux-2.26/libmount/src/tab_parse.c
+--- util-linux-2.26.orig/libmount/src/tab_parse.c	2015-02-16 09:57:34.070017496 -0300
++++ util-linux-2.26/libmount/src/tab_parse.c	2015-02-20 08:13:32.741006617 -0300
 @@ -22,6 +22,10 @@
  #include "pathnames.h"
  #include "strutils.h"
package/util-linux/0004-fix-CVE-2014-9114.patch deleted +0 -168

168 lines not on this page · raw message

package/util-linux/Config.in +5 -0
index 1b475d4..960a21c 100644
@@ -271,6 +271,11 @@ config BR2_PACKAGE_UTIL_LINUX_WRITE
 	help
 	  Send a message to another user
 
+config BR2_PACKAGE_UTIL_LINUX_ZRAMCTL
+	bool "zramctl"
+	help
+	  Set up and control zram devices
+
 endif
 
 endif
package/util-linux/util-linux.hash +2 -2
index b5fc18e..d28d681 100644
@@ -1,2 +1,2 @@
-# From https://www.kernel.org/pub/linux/utils/util-linux/v2.25/sha256sums.asc
-sha256	e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6	util-linux-2.25.2.tar.xz
+# From https://www.kernel.org/pub/linux/utils/util-linux/v2.26/sha256sums.asc
+sha256	a23c6f39dea0ed215ccd589509ffc7bb6f706f6e1a04760f493fb0fd7e93c489	util-linux-2.26.tar.xz
package/util-linux/util-linux.mk +8 -4
index 0b99618..cb4b480 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
-UTIL_LINUX_VERSION_MAJOR = 2.25
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR)
+UTIL_LINUX_VERSION_MAJOR = 2.26
 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)
 
@@ -17,7 +17,10 @@ UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2
 UTIL_LINUX_AUTORECONF = YES
 UTIL_LINUX_INSTALL_STAGING = YES
 UTIL_LINUX_DEPENDENCIES = host-pkgconf
-UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no
+# uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support
+# (used in logger.c), and the common default is N.
+UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no \
+	$(if $(BR2_TOOLCHAIN_USES_UCLIBC),ac_cv_header_sys_timex_h=no)
 UTIL_LINUX_CONF_OPTS += \
 	--disable-rpath \
 	--disable-makeinstall-chown \
@@ -107,7 +110,8 @@ UTIL_LINUX_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write)
+	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl)
 
 # In the host version of util-linux, we so far only require libuuid,
 # and none of the util-linux utilities, so we disable all of them, unless
Signature · 1 line
2.0.5
#1 lore raw

PATCH 1/1 util-linux: bump to version 2.26

Dear Gustavo Zacarias,

Quoted 9 lines · Gustavo Zacarias
---
 package/util-linux/0001-sscanf-no-ms-as.patch   |  52 ++------
 package/util-linux/0004-fix-CVE-2014-9114.patch | 168 ------------------------
 package/util-linux/Config.in                    |   5 +
 package/util-linux/util-linux.hash              |   4 +-
 package/util-linux/util-linux.mk                |  12 +-
 5 files changed, 24 insertions(+), 217 deletions(-)
 delete mode 100644 package/util-linux/0004-fix-CVE-2014-9114.patch

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com