[kernel] r20211 - in dists/wheezy/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sat Jun  8 17:22:11 2013
New Revision: 20211

Log:
kbuild: Fix missing '\n' for NEW symbols in yes  | make oldconfig >conf.new (Closes: #636029)

Added:
   dists/wheezy/linux/debian/patches/bugfix/all/kbuild-Fix-missing-n-for-NEW-symbols-in-yes-make-old.patch
Modified:
   dists/wheezy/linux/debian/changelog
   dists/wheezy/linux/debian/patches/series

Modified: dists/wheezy/linux/debian/changelog
==============================================================================
--- dists/wheezy/linux/debian/changelog	Sat Jun  8 17:18:35 2013	(r20210)
+++ dists/wheezy/linux/debian/changelog	Sat Jun  8 17:22:11 2013	(r20211)
@@ -194,6 +194,8 @@
     - maintain one seqid stream per (lockowner, file)
   * ipw2100,ipw2200: Fix order of device registration (Closes: #656813)
   * udf: Fix handling of i_blocks (Closes: #704269)
+  * kbuild: Fix missing '\n' for NEW symbols in yes "" | make oldconfig
+    >conf.new (Closes: #636029)
 
   [ Jonathan Nieder ]
   * ext3,ext4,nfsd: dir_index: Return 64-bit readdir cookies for NFSv3 and 4

Added: dists/wheezy/linux/debian/patches/bugfix/all/kbuild-Fix-missing-n-for-NEW-symbols-in-yes-make-old.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/bugfix/all/kbuild-Fix-missing-n-for-NEW-symbols-in-yes-make-old.patch	Sat Jun  8 17:22:11 2013	(r20211)
@@ -0,0 +1,64 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Tue, 19 Feb 2013 02:24:26 +0200
+Subject: kbuild: Fix missing '\n' for NEW symbols in yes "" | make oldconfig
+ >conf.new
+
+commit 62dc989921df2a98d1a73aacd085abe941cb9828 upstream.
+
+According to Documentation/kbuild/kconfig.txt, the commands:
+
+    yes "" | make oldconfig >conf.new
+    grep "(NEW)" conf.new
+
+should list the new config symbols with their default values.
+However, currently there is no line break after each new symbol.  When
+kconfig is interactive the user will type a new-line at this point,
+but when non-interactive kconfig must print it.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Reference: http://bugs.debian.org/636029
+[regid23 at nt1.in: Adjusted Ben's work to apply cleanly to this tree]
+Reported-and-tested-by: Regid Ichira <regid23 at nt1.in>
+Reviewed-by: Jonathan Nieder <jrnieder at gmail.com>
+Signed-off-by: Michal Marek <mmarek at suse.cz>
+---
+ scripts/kconfig/conf.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/scripts/kconfig/conf.c
++++ b/scripts/kconfig/conf.c
+@@ -36,6 +36,7 @@ enum input_mode {
+ } input_mode = oldaskconfig;
+ 
+ static int indent = 1;
++static int tty_stdio;
+ static int valid_stdin = 1;
+ static int sync_kconfig;
+ static int conf_cnt;
+@@ -108,6 +109,8 @@ static int conf_askvalue(struct symbol *
+ 	case oldaskconfig:
+ 		fflush(stdout);
+ 		xfgets(line, 128, stdin);
++		if (!tty_stdio)
++			printf("\n");
+ 		return 1;
+ 	default:
+ 		break;
+@@ -508,6 +511,8 @@ int main(int ac, char **av)
+ 	bindtextdomain(PACKAGE, LOCALEDIR);
+ 	textdomain(PACKAGE);
+ 
++	tty_stdio = isatty(0) && isatty(1) && isatty(2);
++
+ 	while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) {
+ 		input_mode = (enum input_mode)opt;
+ 		switch (opt) {
+@@ -624,7 +629,7 @@ int main(int ac, char **av)
+ 				return 1;
+ 			}
+ 		}
+-		valid_stdin = isatty(0) && isatty(1) && isatty(2);
++		valid_stdin = tty_stdio;
+ 	}
+ 
+ 	switch (input_mode) {

Modified: dists/wheezy/linux/debian/patches/series
==============================================================================
--- dists/wheezy/linux/debian/patches/series	Sat Jun  8 17:18:35 2013	(r20210)
+++ dists/wheezy/linux/debian/patches/series	Sat Jun  8 17:22:11 2013	(r20211)
@@ -652,3 +652,4 @@
 bugfix/all/ext3-return-32-64-bit-dir-name-hash-according-to-usa.patch
 
 bugfix/all/udf-Fix-handling-of-i_blocks.patch
+bugfix/all/kbuild-Fix-missing-n-for-NEW-symbols-in-yes-make-old.patch