util-linux-ng: version bump 2.22.2 -> 2.23.1

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

7 files changed, 42 insertions, 107 deletions

diff --git a/patches/util-linux-2.21.2/0003-replace-index-with-strchr.patch b/patches/util-linux-2.21.2/0003-replace-index-with-strchr.patch
deleted file mode 100644
index 71fcdd016..000000000
--- a/patches/util-linux-2.21.2/0003-replace-index-with-strchr.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Jon Ringle <jon@ringle.org>
-Date: Tue, 24 May 2011 12:14:09 -0400
-Subject: [PATCH] replace index with strchr
-
-index is deprecated and not available in uclibc
-replace with strchr
-
-Signed-off-by: Jon Ringle <jon@ringle.org>
----
- libmount/src/tab_parse.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
-index 0bfae8a..489ef1f 100644
---- a/libmount/src/tab_parse.c
-+++ b/libmount/src/tab_parse.c
-@@ -306,14 +306,14 @@ static int mnt_table_parse_next(struct libmnt_table *tb, FILE *f, struct libmnt_
- 		if (fgets(buf, sizeof(buf), f) == NULL)
- 			return -EINVAL;
- 		++*nlines;
--		s = index (buf, '\n');
-+		s = strchr (buf, '\n');
- 		if (!s) {
- 			/* Missing final newline?  Otherwise extremely */
- 			/* long line - assume file was corrupted */
- 			if (feof(f)) {
- 				DBG(TAB, mnt_debug_h(tb,
- 					"%s: no final newline",	filename));
--				s = index (buf, '\0');
-+				s = strchr (buf, '\0');
- 			} else {
- 				DBG(TAB, mnt_debug_h(tb,
- 					"%s:%d: missing newline at line",
diff --git a/patches/util-linux-2.21.2/0004-text-utils-hexsyntax.c-fix-for-missing-program_invoc.patch b/patches/util-linux-2.21.2/0004-text-utils-hexsyntax.c-fix-for-missing-program_invoc.patch
deleted file mode 100644
index 51e28d4ef..000000000
--- a/patches/util-linux-2.21.2/0004-text-utils-hexsyntax.c-fix-for-missing-program_invoc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= <biessmann@corscience.de>
-Date: Tue, 29 May 2012 09:51:24 +0200
-Subject: [PATCH] text-utils/hexsyntax.c: fix for missing
- program_invocation_short_name
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some libc do not expose program_invocation_short_name. Therefore util-linux
-comes with helpers in 'c.h'. Use the 'c.h' in hexsyntax.c where it was missed.
-
-This patch fixes following error for me:
----8<---
-hexsyntax.c: In function 'newsyntax':
-hexsyntax.c:115: error: 'program_invocation_short_name' undeclared (first use in this function)
-hexsyntax.c:115: error: (Each undeclared identifier is reported only once
-hexsyntax.c:115: error: for each function it appears in.)
---->8---
-
-Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
----
- text-utils/hexsyntax.c |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/text-utils/hexsyntax.c b/text-utils/hexsyntax.c
-index 5cdd1de..74146c8 100644
---- a/text-utils/hexsyntax.c
-+++ b/text-utils/hexsyntax.c
-@@ -45,6 +45,7 @@
- #include "hexdump.h"
- #include "nls.h"
- #include "strutils.h"
-+#include "c.h"
- 
- off_t skip;				/* bytes to skip */
- 
diff --git a/patches/util-linux-2.21.2/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch b/patches/util-linux-2.23.1/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch
index b00a429fb..79334c3d4 100644
--- a/patches/util-linux-2.21.2/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch
+++ b/patches/util-linux-2.23.1/0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch
@@ -6,16 +6,16 @@ Subject: [PATCH] libmount: add fallbacks for old systems without umount2()
 Reported-by: Peter Breitenlohner <peb@mppmu.mpg.de>
 Signed-off-by: Karel Zak <kzak@redhat.com>
 ---
- libmount/src/context_umount.c |   28 ++++++++++++++++++++++++++++
+ libmount/src/context_umount.c | 28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
 
 diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
-index 98019ce..3eb1212 100644
+index 4a8659c..2f74ef7 100644
 --- a/libmount/src/context_umount.c
 +++ b/libmount/src/context_umount.c
-@@ -39,6 +39,34 @@
- #endif
- 
+@@ -178,6 +178,34 @@ err:
+ 	return rc;
+ }
  
 +#if defined(MNT_FORCE)
 +/* Interesting ... it seems libc knows about MNT_FORCE and presumably
@@ -47,4 +47,4 @@ index 98019ce..3eb1212 100644
 +
  static int lookup_umount_fs(struct libmnt_context *cxt)
  {
- 	int rc, loopdev = 0;
+ 	const char *tgt;
diff --git a/patches/util-linux-2.21.2/0002-__progname-redefinition-fix.patch b/patches/util-linux-2.23.1/0002-__progname-redefinition-fix.patch
index caef95e9a..46e4b3bde 100644
--- a/patches/util-linux-2.21.2/0002-__progname-redefinition-fix.patch
+++ b/patches/util-linux-2.23.1/0002-__progname-redefinition-fix.patch
@@ -11,18 +11,18 @@ In file included from ../include/writeall.h:7,
 
 Signed-off-by: Jon Ringle <jon@ringle.org>
 ---
- lib/at.c                 |    1 +
- lib/tt.c                 |    1 +
- libmount/src/cache.c     |    1 +
- libmount/src/iter.c      |    1 +
- libmount/src/tab_parse.c |    1 +
+ lib/at.c                 | 1 +
+ lib/tt.c                 | 1 +
+ libmount/src/cache.c     | 1 +
+ libmount/src/iter.c      | 1 +
+ libmount/src/tab_parse.c | 1 +
  5 files changed, 5 insertions(+)
 
 diff --git a/lib/at.c b/lib/at.c
-index 062a10f..60f2a2a 100644
+index f8bfe13..e715e5f 100644
 --- a/lib/at.c
 +++ b/lib/at.c
-@@ -7,6 +7,7 @@
+@@ -10,6 +10,7 @@
  #include <stdlib.h>
  #include <fcntl.h>
  #include <sys/stat.h>
@@ -31,7 +31,7 @@ index 062a10f..60f2a2a 100644
  #include "at.h"
  #include "c.h"
 diff --git a/lib/tt.c b/lib/tt.c
-index 16a0098..930e85c 100644
+index cbe4e3b..ca53a5a 100644
 --- a/lib/tt.c
 +++ b/lib/tt.c
 @@ -15,6 +15,7 @@
@@ -39,11 +39,11 @@ index 16a0098..930e85c 100644
  #include <string.h>
  #include <termios.h>
 +#include <errno.h>
- #ifdef HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
- #endif
+ #include <ctype.h>
+ 
+ #include "c.h"
 diff --git a/libmount/src/cache.c b/libmount/src/cache.c
-index f3156a5..ad32b24 100644
+index 7b65122..9d066e3 100644
 --- a/libmount/src/cache.c
 +++ b/libmount/src/cache.c
 @@ -23,6 +23,7 @@
@@ -55,7 +55,7 @@ index f3156a5..ad32b24 100644
  #include "canonicalize.h"
  #include "mountP.h"
 diff --git a/libmount/src/iter.c b/libmount/src/iter.c
-index 393c23e..211d465 100644
+index d7b8adb..1a20acb 100644
 --- a/libmount/src/iter.c
 +++ b/libmount/src/iter.c
 @@ -16,6 +16,7 @@
@@ -67,7 +67,7 @@ index 393c23e..211d465 100644
  #include "mountP.h"
  
 diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
-index 28c8536..0bfae8a 100644
+index e930fd8..1cb8f9d 100644
 --- a/libmount/src/tab_parse.c
 +++ b/libmount/src/tab_parse.c
 @@ -15,6 +15,7 @@
diff --git a/patches/util-linux-2.21.2/series b/patches/util-linux-2.23.1/series
index 971818439..1454bce2d 100644
--- a/patches/util-linux-2.21.2/series
+++ b/patches/util-linux-2.23.1/series
@@ -2,6 +2,4 @@
 #tag:base --start-number 1
 0001-libmount-add-fallbacks-for-old-systems-without-umoun.patch
 0002-__progname-redefinition-fix.patch
-0003-replace-index-with-strchr.patch
-0004-text-utils-hexsyntax.c-fix-for-missing-program_invoc.patch
-# f153341f4051f66cbeedef2bbd15c9cf  - git-ptx-patches magic
+# afd57198fa5bc0e91e11bef53e764212  - git-ptx-patches magic
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index f07124c1f..249bc3739 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -79,12 +79,6 @@ config UTIL_LINUX_NG_MOUNTPOINT
 comment "BusyBox' mountpoint is selected!"
 	depends on BUSYBOX_MOUNTPOINT
 
-config UTIL_LINUX_NG_DDATE
-	bool
-	prompt "ddate"
-	help
-	  The ddate utility.
-
 config UTIL_LINUX_NG_FDISK
 	bool
 	prompt "fdisk"
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index b875cbabd..d4d6877e7 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
 #
 # Paths and names
 #
-UTIL_LINUX_NG_VERSION	:= 2.22.2
-UTIL_LINUX_NG_MD5	:= 3e379b4d8b9693948d751c154614c73e
+UTIL_LINUX_NG_VERSION	:= 2.23.1
+UTIL_LINUX_NG_MD5	:= 33ba55ce82f8e3b8d7a38fac0f62779a
 UTIL_LINUX_NG		:= util-linux-$(UTIL_LINUX_NG_VERSION)
-UTIL_LINUX_NG_SUFFIX	:= tar.bz2
-UTIL_LINUX_NG_URL	:= $(call ptx/mirror, KERNEL, utils/util-linux/v2.22/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
+UTIL_LINUX_NG_SUFFIX	:= tar.xz
+UTIL_LINUX_NG_URL	:= $(call ptx/mirror, KERNEL, utils/util-linux/v2.23/$(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, GPLv2+, GPLv3+, LGPLv2+, BSD, public_domain
@@ -60,21 +60,26 @@ UTIL_LINUX_NG_AUTOCONF := \
 	--disable-deprecated-mount \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNT)-mount \
 	--disable-losetup \
+	--disable-cytune \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_FSCK)-fsck \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PARTX_TOOLS)-partx \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_UUIDD)-uuidd \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_MOUNTPOINT)-mountpoint \
 	--disable-fallocate \
 	--disable-unshare \
-	--disable-arch \
-	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_DDATE)-ddate \
+	--disable-nsenter \
+	--disable-setpriv \
 	--disable-eject \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_AGETTY)-agetty \
 	--disable-cramfs \
+	--disable-bfs \
+	--disable-fdformat \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_HWCLOCK)-hwclock \
 	--disable-wdctl \
 	--disable-switch_root \
 	--disable-pivot_root \
 	--disable-elvtune \
+	--disable-tunelp \
 	--disable-kill \
 	--disable-last \
 	--disable-utmpdump \
@@ -85,6 +90,7 @@ UTIL_LINUX_NG_AUTOCONF := \
 	--disable-reset \
 	--disable-vipw \
 	--disable-newgrp \
+	--disable-chfn-chsh-password \
 	--disable-chfn-chsh \
 	--disable-chsh-only-listed \
 	--disable-login \
@@ -92,14 +98,19 @@ UTIL_LINUX_NG_AUTOCONF := \
 	--disable-login-stat-mail \
 	--disable-sulogin \
 	--disable-su \
+	--disable-runuser \
+	--disable-ul \
+	--disable-more \
+	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SETTERM)-setterm \
+	--disable-pg \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SCHEDUTILS)-schedutils \
 	--disable-wall \
 	--disable-write \
-	--disable-chkdupexe \
 	--disable-socket-activation \
+	--disable-bash-completion \
 	--disable-pg-bell \
-	--enable-require-password \
 	--disable-use-tty-group \
+	--disable-sulogin-emergency-mount \
 	--disable-makeinstall-chown \
 	--disable-makeinstall-setuid \
 	--without-libiconv-prefix \
@@ -109,7 +120,8 @@ UTIL_LINUX_NG_AUTOCONF := \
 	--without-udev \
 	--$(call ptx/wwo, PTXCONF_UTIL_LINUX_NG_USES_NCURSES)-ncurses \
 	--without-slang \
-	--without-utempter
+	--without-utempter \
+	--without-user
 
 # ----------------------------------------------------------------------------
 # Target-Install