synchronize patches with CSSU

diff --git a/debian/patches/cssu/busybox-portrait.patch b/debian/patches/cssu/busybox-portrait.patch
new file mode 100644 (file)
index 0000000..3e0eb27
--- /dev/null
+++ b/debian/patches/cssu/busybox-portrait.patch
@@ -0,0 +1,30 @@
+From d7db3501c813eb7083766dc86d56f449701f6f88 Mon Sep 17 00:00:00 2001
+From: Dennis Groenen <tj.groenen@gmail.com>
+Date: Sat, 25 Aug 2012 12:23:24 +0200
+Subject: [PATCH] disable redrawing lineedit window after SIGWINCH signal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fix portrait mode in busybox shell. Patch by Pali Rohár for Maemo's CSSU,
+forward-ported to BusyBox 1.20.2 for busybox-power
+---
+ libbb/lineedit.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libbb/lineedit.c b/libbb/lineedit.c
+index b89748a..9f16cac 100644
+--- a/libbb/lineedit.c
++++ b/libbb/lineedit.c
+@@ -1897,7 +1897,7 @@ static void win_changed(int nsig)
+ 
+       get_terminal_width_height(0, &width, NULL);
+ //FIXME: cmdedit_setwidth() -> redraw() -> printf() -> KABOOM! (we are in signal handler!)
+-      cmdedit_setwidth(width, /*redraw_flg:*/ nsig);
++      cmdedit_setwidth(width, /*redraw_flg:*/ 0);
+ 
+       errno = sv_errno;
+ }
+-- 
+1.7.11.5
+

diff --git a/debian/patches/series b/debian/patches/series
index e1fb88d..6a8b4d7 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,9 @@ version.patch
 busybox-zero-ifr.ifr_hwaddr.sa_data.patch
 top-display-rss.patch
 
+# Patches from CSSU
+cssu/busybox-portrait.patch
+
 # New patches to bring back Maemo's old busybox behaviour
 supress-bad-number.patch
 parse-complete-hostname.patch