Copy some patches from busybox/1.18.1 to busybox/1.19.3

diff --git a/ChangeLog b/ChangeLog
index 8faffc4d8644535878abf358ea54f99117d23652..6d2a5a8169a4b347d6f287788ad216b0bc15b103 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Jan 2012; Sebastian Pipping <sping@gentoo.org>
+  +patches/busybox/1.19.3/1.18.1-openvt.diff,
+  +patches/busybox/1.19.3/busybox-1.7.4-signal-hack.patch:
+  Copy patches from busybox/1.18.1 to busybox/1.19.3
+
   13 Jan 2012; Sebastian Pipping <sping@gentoo.org>
   +patches/e2fsprogs/1.42/e2fsprogs-1.41.12-getpagesize.patch:
   Add a patch for e2fsprogs/1.42 from main tree

diff --git a/patches/busybox/1.19.3/1.18.1-openvt.diff b/patches/busybox/1.19.3/1.18.1-openvt.diff
new file mode 100644 (file)
index 0000000..b8a9f8a
--- /dev/null
+++ b/patches/busybox/1.19.3/1.18.1-openvt.diff
@@ -0,0 +1,19 @@
+Based on:
+
+> Allow a slightly wider range of valid vt numbers. Forward-ported from Gentoo
+> Busybox 1.1.3.
+
+> The previous spin of this patch on 1.1.3 had a 'wait(NULL);' right before
+> return EXIT_SUCCESS. I don't think it's needed anymore, so I left it out.
+
+--- a/console-tools/openvt.c   2010-11-22 22:24:58.000000000 +0200
++++ b/console-tools/openvt.c   2010-11-29 15:32:18.000000000 +0200
+@@ -124,7 +124,7 @@ int openvt_main(int argc UNUSED_PARAM, c
+ 
+       if (flags & OPT_c) {
+               /* Check for illegal vt number: < 1 or > 63 */
+-              vtno = xatou_range(str_c, 1, 63);
++              vtno = xatou_range(str_c, 0, 63);
+       } else {
+               vtno = find_free_vtno();
+       }

diff --git a/patches/busybox/1.19.3/busybox-1.7.4-signal-hack.patch b/patches/busybox/1.19.3/busybox-1.7.4-signal-hack.patch
new file mode 100644 (file)
index 0000000..ba11830
--- /dev/null
+++ b/patches/busybox/1.19.3/busybox-1.7.4-signal-hack.patch
@@ -0,0 +1,28 @@
+workaround while we get it fixed upstream
+
+http://bugs.gentoo.org/201114
+
+--- libbb/u_signal_names.c
++++ libbb/u_signal_names.c
+@@ -66,7 +66,7 @@
+ #ifdef SIGTERM
+       [SIGTERM  ] = "TERM",
+ #endif
+-#ifdef SIGSTKFLT
++#if defined(SIGSTKFLT) && SIGSTKFLT < 32
+       [SIGSTKFLT] = "STKFLT",
+ #endif
+ #ifdef SIGCHLD
+@@ -90,10 +90,10 @
+ #ifdef SIGURG
+       [SIGURG   ] = "URG",
+ #endif
+-#ifdef SIGXCPU
++#if defined(SIGXCPU) && SIGXCPU < 32
+       [SIGXCPU  ] = "XCPU",
+ #endif
+-#ifdef SIGXFSZ
++#if defined(SIGXFSZ) && SIGXFSZ < 32
+       [SIGXFSZ  ] = "XFSZ",
+ #endif
+ #ifdef SIGVTALRM