aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2012-01-13 22:24:39 +0100
committerSebastian Pipping <sebastian@pipping.org>2012-01-13 22:31:21 +0100
commit4974b145257019aa2a5b8821225522eb768882ce (patch)
tree280b269818e3181802920c64fdab9129fb9e132c /patches
parentAdd a patch for e2fsprogs/1.42 from main tree (diff)
downloadgenkernel-4974b145257019aa2a5b8821225522eb768882ce.tar.gz
genkernel-4974b145257019aa2a5b8821225522eb768882ce.tar.bz2
genkernel-4974b145257019aa2a5b8821225522eb768882ce.zip
Copy some patches from busybox/1.18.1 to busybox/1.19.3
Diffstat (limited to 'patches')
-rw-r--r--patches/busybox/1.19.3/1.18.1-openvt.diff19
-rw-r--r--patches/busybox/1.19.3/busybox-1.7.4-signal-hack.patch28
2 files changed, 47 insertions, 0 deletions
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
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
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