patches: drop old busybox patches

12 years ago · 462d4cb784
parent 1f6fa37c05
commit 462d4cb784
10 changed files with 0 additions and 534 deletions
--- a/patches/busybox/1.18.1/1.18.1-mdstart.diff
+++ b/patches/busybox/1.18.1/1.18.1-mdstart.diff
@ -1,122 +0,0 @@
-Based on:
-
-> Forward-port the old mdstart tool from the Gentoo Busybox-1.1.3.
-> Only fires the RAID_AUTORUN ioctl on existing /dev/md nodes.
-
-diff -pruN a/include/applets.src.h mdstart/include/applets.src.h
--- a/include/applets.src.h	2011-01-20 01:08:05.470632138 +0100
-+++ mdstart/include/applets.src.h	2011-01-20 01:09:13.198003320 +0100
-@@ -235,6 +235,7 @@ IF_MAN(APPLET(man, _BB_DIR_SBIN, _BB_SUI
- IF_MATCHPATHCON(APPLET(matchpathcon, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
- IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, md5sum))
- IF_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_DROP))
-+IF_MDSTART(APPLET(mdstart, _BB_DIR_SBIN, _BB_SUID_DROP))
- IF_MICROCOM(APPLET(microcom, _BB_DIR_USR_BIN, _BB_SUID_DROP))
- IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, _BB_DIR_BIN, _BB_SUID_DROP, mkdir))
- IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_vfat))
-diff -pruN a/include/usage.src.h mdstart/include/usage.src.h
--- a/include/usage.src.h	2010-12-21 06:29:45.000000000 +0200
-+++ mdstart/include/usage.src.h	2011-01-12 21:29:47.000000000 +0200
-@@ -847,6 +847,11 @@ INSERT
-        "$ dirname /tmp/foo/\n" \
-        "/tmp\n"
- 
-+#define mdstart_trivial_usage \
-+	"{[PARTITION] MD-NODE}..."
-+#define mdstart_full_usage \
-+	"Run the RAID_AUTORUN ioctl on the given MD number"
-+
- #define dmesg_trivial_usage \
-        "[-c] [-n LEVEL] [-s SIZE]"
- #define dmesg_full_usage "\n\n" \
-diff -pruN a/util-linux/Config.src mdstart/util-linux/Config.src
--- a/util-linux/Config.src	2010-12-20 02:41:27.000000000 +0200
-+++ mdstart/util-linux/Config.src	2011-01-12 21:30:09.000000000 +0200
-@@ -456,6 +456,13 @@ config FEATURE_MDEV_LOAD_FIRMWARE
- 	  /lib/firmware/ and if it exists, send it to the kernel for
- 	  loading into the hardware.
- 
-+config MDSTART
-+	bool "mdstart"
-+	default n
-+	help
-+	  Allows you to autostart /dev/md devices if using an initramfs to
-+	  boot.
-+
- config MKSWAP
- 	bool "mkswap"
- 	default y
-diff -pruN a/util-linux/Kbuild.src mdstart/util-linux/Kbuild.src
--- a/util-linux/Kbuild.src	2010-12-20 02:41:27.000000000 +0200
-+++ mdstart/util-linux/Kbuild.src	2011-01-12 21:30:09.000000000 +0200
-@@ -24,6 +24,7 @@ lib-$(CONFIG_HWCLOCK)           += hwclo
- lib-$(CONFIG_IPCRM)             += ipcrm.o
- lib-$(CONFIG_IPCS)              += ipcs.o
- lib-$(CONFIG_LOSETUP)           += losetup.o
-+lib-$(CONFIG_MDSTART)          += mdStart.o
- lib-$(CONFIG_LSPCI)             += lspci.o
- lib-$(CONFIG_LSUSB)             += lsusb.o
- lib-$(CONFIG_MDEV)              += mdev.o
-diff -pruN a/util-linux/mdStart.c mdstart/util-linux/mdStart.c
--- a/util-linux/mdStart.c	1970-01-01 03:00:00.000000000 +0300
-+++ mdstart/util-linux/mdStart.c	2011-01-12 21:30:09.000000000 +0200
-@@ -0,0 +1,59 @@
-+/*
-+ * Linux 2.6(+) RAID Autostarter
-+ *
-+ * Copyright (C) 2005 by Tim Yamin <plasmaroo@gentoo.org> <plasm@roo.me.uk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <linux/major.h>
-+#include <linux/raid/md_u.h>
-+
-+extern int
-+mdstart_main(int argc, char *argv[])
-+{
-+	int i, fd, part = 0, retval = 0;
-+
-+	if(argc < 2)
-+	{
-+		bb_show_usage();
-+	}
-+
-+	for(i = 1; i < argc; i++)
-+	{
-+		if(sscanf(argv[i], "%d", &part) == 1)
-+			continue;
-+
-+		fd = open(argv[i], 0, 0);
-+		if (fd >= 0)
-+		{
-+			ioctl(fd, RAID_AUTORUN, part);
-+			close(fd);
-+		} else
-+		{
-+			printf("Error: Failed to open %s!\n", argv[i]);
-+			retval=1;
-+		}
-+
-+		part = 0;
-+	}
-+
-+	return retval;
-+}
--- a/patches/busybox/1.18.1/1.18.1-openvt.diff
+++ b/patches/busybox/1.18.1/1.18.1-openvt.diff
@ -1,19 +0,0 @@
-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();
- 	}
--- a/patches/busybox/1.18.1/README
+++ b/patches/busybox/1.18.1/README
@ -1,11 +0,0 @@
-1.18.1-mdstart.diff:
-This adds a 'mdstart' command to busybox, which is used for the activation of
-individual mdraid arrays. It originated with 1.1.3+gentoo or earlier.
-Patch ported from 1.7.4 to 1.18.1 by Denis Kaganovich.
-
-1.18.1-openvt.diff:
-It is unknown what problem this patch fixes. It may no longer be needed.
-Patch ported from 1.7.4 to 1.18.1 by Denis Kaganovich.
-
-busybox-1.7.4-signal-hack.patch:
-It is unknown what this patch does. It may no longer be needed.
--- a/patches/busybox/1.18.1/busybox-1.7.4-signal-hack.patch
+++ b/patches/busybox/1.18.1/busybox-1.7.4-signal-hack.patch
@ -1,28 +0,0 @@
-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
--- a/patches/busybox/1.19.3/1.18.1-openvt.diff
+++ b/patches/busybox/1.19.3/1.18.1-openvt.diff
@ -1,19 +0,0 @@
-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();
- 	}
--- a/patches/busybox/1.19.3/busybox-1.19.3-mdstart.patch
+++ b/patches/busybox/1.19.3/busybox-1.19.3-mdstart.patch
@ -1,130 +0,0 @@
-From b971b7317af525b1887d4af473307f8084015f02 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 14 Jan 2012 23:38:17 +0100
-Subject: [PATCH] Port mdstart patch to busybox 1.19.3
-
---
- include/applets.src.h |    1 +
- util-linux/Config.src |    7 +++++
- util-linux/Kbuild.src |    1 +
- util-linux/mdStart.c  |   66 +++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 75 insertions(+), 0 deletions(-)
- create mode 100644 util-linux/mdStart.c
-
-diff --git a/include/applets.src.h b/include/applets.src.h
-index 87d9cbb..331145c 100644
--- a/include/applets.src.h
-+++ b/include/applets.src.h
-@@ -241,6 +241,7 @@ IF_MAN(APPLET(man, BB_DIR_SBIN, BB_SUID_DROP))
- IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP))
- IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum))
- IF_MDEV(APPLET(mdev, BB_DIR_SBIN, BB_SUID_DROP))
-+IF_MDSTART(APPLET(mdstart, BB_DIR_SBIN, BB_SUID_DROP))
- IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
- IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
-diff --git a/util-linux/Config.src b/util-linux/Config.src
-index bb45705..2f60d04 100644
--- a/util-linux/Config.src
-+++ b/util-linux/Config.src
-@@ -462,6 +462,13 @@ config FEATURE_MDEV_LOAD_FIRMWARE
- 	  /lib/firmware/ and if it exists, send it to the kernel for
- 	  loading into the hardware.
- 
-+config MDSTART
-+	bool "mdstart"
-+	default n
-+	help
-+	  Allows you to autostart /dev/md devices if using an initramfs to
-+	  boot.
-+
- config MKSWAP
- 	bool "mkswap"
- 	default y
-diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src
-index c06d911..98cbb09 100644
--- a/util-linux/Kbuild.src
-+++ b/util-linux/Kbuild.src
-@@ -24,6 +24,7 @@ lib-$(CONFIG_HWCLOCK)           += hwclock.o
- lib-$(CONFIG_IPCRM)             += ipcrm.o
- lib-$(CONFIG_IPCS)              += ipcs.o
- lib-$(CONFIG_LOSETUP)           += losetup.o
-+lib-$(CONFIG_MDSTART)           += mdStart.o
- lib-$(CONFIG_LSPCI)             += lspci.o
- lib-$(CONFIG_LSUSB)             += lsusb.o
- lib-$(CONFIG_MDEV)              += mdev.o
-diff --git a/util-linux/mdStart.c b/util-linux/mdStart.c
-new file mode 100644
-index 0000000..0c55bab
--- /dev/null
-+++ b/util-linux/mdStart.c
-@@ -0,0 +1,66 @@
-+/*
-+ * Linux 2.6(+) RAID Autostarter
-+ *
-+ * Copyright (C) 2005 by Tim Yamin <plasmaroo@gentoo.org> <plasm@roo.me.uk>
-+ * Copyright (C) 2012 by Sebastian Pipping <sebastian@pipping.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+
-+//usage:#define mdstart_trivial_usage
-+//usage:	"[PARTITION] MD-NODE [[PARTITION] MD-NODE ...]"
-+//usage:
-+//usage:#define mdstart_full_usage "\n\n"
-+//usage:	"Run the RAID_AUTORUN ioctl on the given MD number"
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <linux/major.h>
-+#include <linux/raid/md_u.h>
-+
-+extern int
-+mdstart_main(int argc, char *argv[])
-+{
-+	int i, fd, part = 0, retval = 0;
-+
-+	if(argc < 2)
-+	{
-+		bb_show_usage();
-+	}
-+
-+	for(i = 1; i < argc; i++)
-+	{
-+		if(sscanf(argv[i], "%d", &part) == 1)
-+			continue;
-+
-+		fd = open(argv[i], 0, 0);
-+		if (fd >= 0)
-+		{
-+			ioctl(fd, RAID_AUTORUN, part);
-+			close(fd);
-+		} else
-+		{
-+			printf("Error: Failed to open %s!\n", argv[i]);
-+			retval=1;
-+		}
-+
-+		part = 0;
-+	}
-+
-+	return retval;
-+}
-- 
-1.7.8.3
-
--- 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
@ -1,28 +0,0 @@
-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
--- a/patches/busybox/1.20.1/1.18.1-openvt.diff
+++ b/patches/busybox/1.20.1/1.18.1-openvt.diff
@ -1,19 +0,0 @@
-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();
- 	}
--- a/patches/busybox/1.20.1/busybox-1.20.1-mdstart.patch
+++ b/patches/busybox/1.20.1/busybox-1.20.1-mdstart.patch
@ -1,130 +0,0 @@
-From d1f76c9546758611bcadd6ad10fc0c4c1ceb14ee Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 10 Jun 2012 19:05:38 +0200
-Subject: [PATCH] Port mdstart patch from busybox 1.19.3 to 1.20.1
-
---
- include/applets.src.h |    1 +
- util-linux/Config.src |    7 ++++++
- util-linux/Kbuild.src |    1 +
- util-linux/mdStart.c  |   66 +++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 75 insertions(+)
- create mode 100644 util-linux/mdStart.c
-
-diff --git a/include/applets.src.h b/include/applets.src.h
-index 252a060..0b199bc 100644
--- a/include/applets.src.h
-+++ b/include/applets.src.h
-@@ -239,6 +239,7 @@ IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP))
- IF_MAN(APPLET(man, BB_DIR_SBIN, BB_SUID_DROP))
- IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP))
- IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum))
-+IF_MDSTART(APPLET(mdstart, BB_DIR_SBIN, BB_SUID_DROP))
- IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
- IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
-diff --git a/util-linux/Config.src b/util-linux/Config.src
-index 57a52ce..e07fe2b 100644
--- a/util-linux/Config.src
-+++ b/util-linux/Config.src
-@@ -404,6 +404,13 @@ config LSUSB
- 
- 	  This version uses sysfs (/sys/bus/usb/devices) only.
- 
-+config MDSTART
-+	bool "mdstart"
-+	default n
-+	help
-+	  Allows you to autostart /dev/md devices if using an initramfs to
-+	  boot.
-+
- config MKSWAP
- 	bool "mkswap"
- 	default y
-diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src
-index 468fc6b..0bc9a9b 100644
--- a/util-linux/Kbuild.src
-+++ b/util-linux/Kbuild.src
-@@ -24,6 +24,7 @@ lib-$(CONFIG_HWCLOCK)           += hwclock.o
- lib-$(CONFIG_IPCRM)             += ipcrm.o
- lib-$(CONFIG_IPCS)              += ipcs.o
- lib-$(CONFIG_LOSETUP)           += losetup.o
-+lib-$(CONFIG_MDSTART)           += mdStart.o
- lib-$(CONFIG_LSPCI)             += lspci.o
- lib-$(CONFIG_LSUSB)             += lsusb.o
- lib-$(CONFIG_MKFS_EXT2)         += mkfs_ext2.o
-diff --git a/util-linux/mdStart.c b/util-linux/mdStart.c
-new file mode 100644
-index 0000000..0c55bab
--- /dev/null
-+++ b/util-linux/mdStart.c
-@@ -0,0 +1,66 @@
-+/*
-+ * Linux 2.6(+) RAID Autostarter
-+ *
-+ * Copyright (C) 2005 by Tim Yamin <plasmaroo@gentoo.org> <plasm@roo.me.uk>
-+ * Copyright (C) 2012 by Sebastian Pipping <sebastian@pipping.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+
-+//usage:#define mdstart_trivial_usage
-+//usage:	"[PARTITION] MD-NODE [[PARTITION] MD-NODE ...]"
-+//usage:
-+//usage:#define mdstart_full_usage "\n\n"
-+//usage:	"Run the RAID_AUTORUN ioctl on the given MD number"
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <linux/major.h>
-+#include <linux/raid/md_u.h>
-+
-+extern int
-+mdstart_main(int argc, char *argv[])
-+{
-+	int i, fd, part = 0, retval = 0;
-+
-+	if(argc < 2)
-+	{
-+		bb_show_usage();
-+	}
-+
-+	for(i = 1; i < argc; i++)
-+	{
-+		if(sscanf(argv[i], "%d", &part) == 1)
-+			continue;
-+
-+		fd = open(argv[i], 0, 0);
-+		if (fd >= 0)
-+		{
-+			ioctl(fd, RAID_AUTORUN, part);
-+			close(fd);
-+		} else
-+		{
-+			printf("Error: Failed to open %s!\n", argv[i]);
-+			retval=1;
-+		}
-+
-+		part = 0;
-+	}
-+
-+	return retval;
-+}
-- 
-1.7.10.2
-
--- a/patches/busybox/1.20.1/busybox-1.7.4-signal-hack.patch
+++ b/patches/busybox/1.20.1/busybox-1.7.4-signal-hack.patch
@ -1,28 +0,0 @@
-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