[util-linux-ng] version bump 2.17.2 -> 2.18

The patch from the old version is now in upstream and can be removed.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

4 files changed, 11 insertions, 43 deletions

diff --git a/patches/util-linux-ng-2.17.2/0001-replace-bzero-with-memset.patch b/patches/util-linux-ng-2.17.2/0001-replace-bzero-with-memset.patch
deleted file mode 100644
index 6951ae632..000000000
--- a/patches/util-linux-ng-2.17.2/0001-replace-bzero-with-memset.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 06fe890db9b7798363b814269f2a6cc2ec594e8f Mon Sep 17 00:00:00 2001
-From: Jon Ringle <jon@ringle.org>
-Date: Thu, 25 Mar 2010 22:38:53 -0400
-Subject: [PATCH] replace bzero with memset
-
-Work on this was done in commit c0f19ccff73aa0ec5e9f3b61b932ea4a8bf4e6ed,
-however a couple of bzero call sites were missed
-
-Signed-off-by: Jon Ringle <jon@ringle.org>
----
- fdisk/fdiskbsdlabel.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fdisk/fdiskbsdlabel.c b/fdisk/fdiskbsdlabel.c
-index 2f41561..9c09252 100644
---- a/fdisk/fdiskbsdlabel.c
-+++ b/fdisk/fdiskbsdlabel.c
-@@ -540,7 +540,7 @@ xbsd_write_bootstrap (void)
-   memmove (&dl, d, sizeof (struct xbsd_disklabel));
- 
-   /* The disklabel will be overwritten by 0's from bootxx anyway */
--  bzero (d, sizeof (struct xbsd_disklabel));
-+  memset (d, 0, sizeof (struct xbsd_disklabel));
- 
-   snprintf (path, sizeof(path), "%s/boot%s", bootdir, dkbasename);
-   if (!xbsd_get_bootstrap (path, &disklabelbuffer[xbsd_dlabel.d_secsize],
-@@ -656,7 +656,7 @@ xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d, int pindex) {
- 	struct geom g;
- 
- 	get_geometry (fd, &g);
--	bzero (d, sizeof (struct xbsd_disklabel));
-+	memset (d, 0, sizeof (struct xbsd_disklabel));
- 
- 	d -> d_magic = BSD_DISKMAGIC;
- 
--- 
-1.7.0.2.182.ge007
-
diff --git a/patches/util-linux-ng-2.17.2/series b/patches/util-linux-ng-2.17.2/series
deleted file mode 100644
index 80f9ac96a..000000000
--- a/patches/util-linux-ng-2.17.2/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-replace-bzero-with-memset.patch
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index 00645b5b4..cee1c5930 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -17,6 +17,9 @@ config UTIL_LINUX_NG_LIBBLKID
 config UTIL_LINUX_NG_LIBUUID
 	bool
 
+config UTIL_LINUX_NG_LIBMOUNT
+	bool
+
 config UTIL_LINUX_NG_USES_NCURSES
 	bool
 
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index d3c28904f..d61c0ac26 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
 #
 # Paths and names
 #
-UTIL_LINUX_NG_VERSION	:= 2.17.2
+UTIL_LINUX_NG_VERSION	:= 2.18
 UTIL_LINUX_NG		:= util-linux-ng-$(UTIL_LINUX_NG_VERSION)
 UTIL_LINUX_NG_SUFFIX	:= tar.bz2
-UTIL_LINUX_NG_URL	:= http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)
+UTIL_LINUX_NG_URL	:= http://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)
 UTIL_LINUX_NG_SOURCE	:= $(SRCDIR)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)
 UTIL_LINUX_NG_DIR	:= $(BUILDDIR)/$(UTIL_LINUX_NG)
 UTIL_LINUX_NG_LICENSE	:= GPLv2+
@@ -69,7 +69,6 @@ UTIL_LINUX_NG_AUTOCONF := \
 	--disable-mesg \
 	--disable-partx \
 	--disable-raw \
-	--disable-rdev \
 	--disable-rename \
 	--disable-reset \
 	--enable-schedutils \
@@ -86,7 +85,8 @@ UTIL_LINUX_NG_AUTOCONF := \
 	--without-pam \
 	--without-slang \
 	--without-selinux \
-	--without-audit
+	--without-audit \
+	--without-utempter
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -164,6 +164,10 @@ ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID
 	@$(call install_link, util-linux-ng, libuuid.so.1.3.0, /lib/libuuid.so)
 endif
 
+ifdef PTXCONF_UTIL_LINUX_NG_LIBMOUNT
+	# FIXME - no user yet
+endif
+
 ifdef PTXCONF_UTIL_LINUX_NG_UUIDGEN
 	@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/uuidgen)
 endif