Patchwork util-linux version update 2.22.1

login
register
mail settings
Submitter Alexander Khryukin
Date Oct. 11, 2012, 1:25 p.m.
Message ID <1349961942.28555.1.camel@localhost>
Download mbox | patch
Permalink /patch/190906/
State Superseded
Headers show

Comments

Alexander Khryukin - Oct. 11, 2012, 1:25 p.m.
Signed-off-by: Alexander Khryukin <alexander@mezon.ru>
---
From dc455e2d000e07d74b3865357ee879c3078314d5 Mon Sep 17 00:00:00 2001
From: Alexander Khryukin <alexander@mezon.ru>
Date: Thu, 11 Oct 2012 12:10:49 +0000
Subject: [PATCH 1/3] util-linux version update 2.22

---
 package/util-linux/util-linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Gustavo Zacarias - Oct. 11, 2012, 1:46 p.m.
On 10/11/12 10:25, Alexander Khryukin wrote:

> Signed-off-by: Alexander Khryukin <alexander@mezon.ru>

NAK, PAM is mandatory for >2.20.1
Regards.
Alexander Khryukin - Oct. 11, 2012, 1:50 p.m.
В Чт., 11/10/2012 в 10:46 -0300, Gustavo Zacarias пишет:
> On 10/11/12 10:25, Alexander Khryukin wrote:
> 
> > Signed-off-by: Alexander Khryukin <alexander@mezon.ru>
> 
> NAK, PAM is mandatory for >2.20.1
> Regards.
> 
> 

I can comile util-linux 2.22.1 with

        $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),,--disable-login) \
        $(if $(BR2_PACKAGE_UTIL_LINUX_SU),,--disable-su)
Gustavo Zacarias - Oct. 11, 2012, 1:53 p.m.
On 10/11/12 10:50, Alexander Khryukin wrote:
> I can comile util-linux 2.22.1 with
> 
>         $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),,--disable-login) \
>         $(if $(BR2_PACKAGE_UTIL_LINUX_SU),,--disable-su)

Yes, but you're not accounting for it in your patch.
Maybe someone wants util-linux loginutils instead of busybox, and when
selected if they don't enable PAM the build breaks.
And removing options isn't that nice either.
Regards.

Patch

diff --git a/package/util-linux/util-linux.mk
b/package/util-linux/util-linux.mk
index 71a6c53..ba2d5ed 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -4,7 +4,7 @@ 
 #
 #############################################################
 UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
-UTIL_LINUX_VERSION_MAJOR = 2.20
+UTIL_LINUX_VERSION_MAJOR = 2.22
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v
$(UTIL_LINUX_VERSION_MAJOR)
 UTIL_LINUX_AUTORECONF = YES
-- 
1.7.11.3




From 339d4a728090c55696fa5190e1e370a624e819dc Mon Sep 17 00:00:00 2001
From: Alexander Khryukin <alexander@mezon.ru>
Date: Thu, 11 Oct 2012 13:20:29 +0000
Subject: [PATCH] old-patch with uclibc support disabled and new options
now
 in Config.in

---
 package/util-linux/Config.in                       |  6 ++
 .../util-linux-2.20.1-sscanf-no-ms-as.patch        | 87
----------------------
 .../util-linux/util-linux-uclibc-build-fix.patch   | 16 ----
 package/util-linux/util-linux.mk                   |  7 +-
 4 files changed, 11 insertions(+), 105 deletions(-)
 delete mode 100644
package/util-linux/util-linux-2.20.1-sscanf-no-ms-as.patch
 delete mode 100644 package/util-linux/util-linux-uclibc-build-fix.patch

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 43a8444..5d4468f 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -99,6 +99,12 @@  config BR2_PACKAGE_UTIL_LINUX_RESET
 config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
 	bool "build \"chfn, chsh, login, newgrp, vipw\""
 
+config BR2_PACKAGE_UTIL_LINUX_SU
+	bool "build \"su, requires PAM headers\""
+
+config BR2_PACKAGE_UTIL_LINUX_LOGIN
+	bool "build \"login requires PAM headers\""
+
 config BR2_PACKAGE_UTIL_LINUX_WRITE
 	bool "build \"write\""
 
diff --git a/package/util-linux/util-linux-2.20.1-sscanf-no-ms-as.patch
b/package/util-linux/util-linux-2.20.1-sscanf-no-ms-as.patch
deleted file mode 100644
index 5b0ac36..0000000
--- a/package/util-linux/util-linux-2.20.1-sscanf-no-ms-as.patch
+++ /dev/null
@@ -1,87 +0,0 @@ 
-[PATCH] Fix libmount build under uClibc
-
-Taken from gentoo-hardened:
-http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=91879751
-
-For details, see https://bugs.gentoo.org/show_bug.cgi?id=406303
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-diff -Naur util-linux-2.20.1.orig/libmount/src/tab_parse.c
util-linux-2.20.1/libmount/src/tab_parse.c
---- util-linux-2.20.1.orig/libmount/src/tab_parse.c	2011-12-12
20:51:06.646614964 -0500
-+++ util-linux-2.20.1/libmount/src/tab_parse.c	2011-12-12
21:02:03.587865010 -0500
-@@ -51,19 +51,21 @@
-  */
- static int mnt_parse_table_line(struct libmnt_fs *fs, char *s)
- {
--	int rc, n = 0;
--	char *src, *fstype, *optstr;
--
--	rc = sscanf(s,	UL_SCNsA" "	/* (1) source */
--			UL_SCNsA" "	/* (2) target */
--			UL_SCNsA" "	/* (3) FS type */
--			UL_SCNsA" "	/* (4) options */
-+	int rc, n = 0, len = strlen (s) + 1;
-+	char *src     = malloc (sizeof *src * len);
-+  char *fstype  = malloc (sizeof *fstype * len);
-+  char *optstr  = malloc (sizeof *optstr * len);
-+
-+	rc = sscanf(s,	"%s"" "	/* (1) source */
-+			"%s"" "	/* (2) target */
-+			"%s"" "	/* (3) FS type */
-+			"%s"" "	/* (4) options */
- 			"%n",		/* byte count */
- 
--			&src,
--			&fs->target,
--			&fstype,
--			&optstr,
-+			src,
-+			fs->target,
-+			fstype,
-+			optstr,
- 			&n);
- 
- 	if (rc == 4) {
-@@ -108,16 +110,20 @@
-  */
- static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s)
- {
--	int rc, end = 0;
-+	int rc, end = 0, len = strlen (s) + 1;
- 	unsigned int maj, min;
- 	char *fstype, *src, *p;
- 
-+  fs->root        = malloc (sizeof *fs->root * len);
-+  fs->target      = malloc (sizeof *fs->target * len);
-+  fs->vfs_optstr  = malloc (sizeof *fs->vfs_optstr * len);
-+
- 	rc = sscanf(s,	"%u "		/* (1) id */
- 			"%u "		/* (2) parent */
- 			"%u:%u "	/* (3) maj:min */
--			UL_SCNsA" "	/* (4) mountroot */
--			UL_SCNsA" "	/* (5) target */
--			UL_SCNsA	/* (6) vfs options (fs-independent) */
-+			"%s"" "	/* (4) mountroot */
-+			"%s"" "	/* (5) target */
-+			"%s"	/* (6) vfs options (fs-independent) */
- 			"%n",		/* number of read bytes */
- 
- 			&fs->id,
-@@ -139,9 +145,14 @@
- 	}
- 	s = p + 3;
- 
--	rc += sscanf(s,	UL_SCNsA" "	/* (8) FS type */
--			UL_SCNsA" "	/* (9) source */
--			UL_SCNsA,	/* (10) fs options (fs specific) */
-+  len           = strlen (s) + 1;
-+	fstype        = malloc (sizeof *fstype * len);
-+  src           = malloc (sizeof *src * len);
-+  fs->fs_optstr = malloc (sizeof *fs->fs_optstr * len);
-+
-+	rc += sscanf(s,	"%s"" "	/* (8) FS type */
-+			"%s"" "	/* (9) source */
-+			"%s",	/* (10) fs options (fs specific) */
- 
- 			&fstype,
- 			&src,
diff --git a/package/util-linux/util-linux-uclibc-build-fix.patch
b/package/util-linux/util-linux-uclibc-build-fix.patch
deleted file mode 100644
index f9da863..0000000
--- a/package/util-linux/util-linux-uclibc-build-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@ 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: util-linux-2.19.1/configure.ac
-===================================================================
---- util-linux-2.19.1.orig/configure.ac
-+++ util-linux-2.19.1/configure.ac
-@@ -250,7 +250,7 @@ esac
-
-
- AC_MSG_CHECKING(whether program_invocation_short_name is defined)
--AC_TRY_COMPILE([#include <argp.h>],
-+AC_TRY_COMPILE([#include <errno.h>],
-                [program_invocation_short_name = "test";],
-                AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
-                          [Define if program_invocation_short_name is
defined])
-
diff --git a/package/util-linux/util-linux.mk
b/package/util-linux/util-linux.mk
index ba2d5ed..4c4b716 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -54,7 +54,9 @@  UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),,--disable-rename) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),,--disable-schedutils) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_WALL),,--disable-wall) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),,--disable-partx)
+	$(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),,--disable-partx) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),,--disable-login) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_SU),,--disable-su)
 
 #############################################
 #
@@ -79,7 +81,8 @@  HOST_UTIL_LINUX_CONF_OPT += \
 	--disable-uuidd --disable-libblkid --disable-agetty \
 	--disable-cramfs --disable-switch_root --disable-pivot_root \
 	--disable-fallocate --disable-unshare --disable-rename \
-	--disable-schedutils --disable-wall --disable-partx
+	--disable-schedutils --disable-wall --disable-partx --disable-login \
+	--disable-su
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))