[gentoo-commits] proj/genkernel:master commit in: /, patches/busybox/1.20.2/

[gentoo-commits] proj/genkernel:master commit in: /, patches/busybox/1.20.2/

[Sebastian Pipping]

commit:     6785827617abc7142dcaf63ea23016d9469e0472
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Sep 10 01:24:29 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 01:24:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=67858276

Copy busybox patches from 1.20.1 to 1.20.2

---
 ChangeLog                                          |    6 +
 patches/busybox/1.20.2/1.18.1-openvt.diff          |   19 +++
 .../busybox/1.20.2/busybox-1.20.1-mdstart.patch    |  130 ++++++++++++++++++++
 .../busybox/1.20.2/busybox-1.7.4-signal-hack.patch |   28 ++++
 4 files changed, 183 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a02ce76..87096cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@
 # Distributed under the GPL v2
 # $Id$
 
+  10 Sep 2012; Sebastian Pipping <sping@gentoo.org>
+  +patches/busybox/1.20.2/1.18.1-openvt.diff,
+  +patches/busybox/1.20.2/busybox-1.7.4-signal-hack.patch,
+  +patches/busybox/1.20.2/busybox-1.20.1-mdstart.patch:
+  Copy busybox patches from 1.20.1 to 1.20.2
+
   30 Aug 2012; Fabio Erculiani <lxnay@gentoo.org> defaults/linuxrc:
   mount /mnt/cdrom inside target chroot even when aufs/unionfs is disabled
 

diff --git a/patches/busybox/1.20.2/1.18.1-openvt.diff b/patches/busybox/1.20.2/1.18.1-openvt.diff
new file mode 100644
index 0000000..b8a9f8a
--- /dev/null
+++ b/patches/busybox/1.20.2/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.20.2/busybox-1.20.1-mdstart.patch b/patches/busybox/1.20.2/busybox-1.20.1-mdstart.patch
new file mode 100644
index 0000000..5ca3eca
--- /dev/null
+++ b/patches/busybox/1.20.2/busybox-1.20.1-mdstart.patch
@@ -0,0 +1,130 @@
+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
+

diff --git a/patches/busybox/1.20.2/busybox-1.7.4-signal-hack.patch b/patches/busybox/1.20.2/busybox-1.7.4-signal-hack.patch
new file mode 100644
index 0000000..ba11830
--- /dev/null
+++ b/patches/busybox/1.20.2/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

[gentoo-commits] proj/genkernel:master commit in: /, patches/busybox/1.20.2/

[Sebastian Pipping]

commit:     91a13e61b1249bc6c263847c2862a81478e9914d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Sep 10 01:25:56 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 01:25:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=91a13e61

Add busybox 1.20.2 patch: busybox-1.20.2-glibc-sys-resource.patch

---
 ChangeLog                                          |    4 +
 .../1.20.2/busybox-1.20.2-glibc-sys-resource.patch |  109 ++++++++++++++++++++
 2 files changed, 113 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 87096cd..a0ac016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 # $Id$
 
   10 Sep 2012; Sebastian Pipping <sping@gentoo.org>
+  +patches/busybox/1.20.2/busybox-1.20.2-glibc-sys-resource.patch:
+  Add busybox 1.20.2 patch: busybox-1.20.2-glibc-sys-resource.patch
+
+  10 Sep 2012; Sebastian Pipping <sping@gentoo.org>
   +patches/busybox/1.20.2/1.18.1-openvt.diff,
   +patches/busybox/1.20.2/busybox-1.7.4-signal-hack.patch,
   +patches/busybox/1.20.2/busybox-1.20.1-mdstart.patch:

diff --git a/patches/busybox/1.20.2/busybox-1.20.2-glibc-sys-resource.patch b/patches/busybox/1.20.2/busybox-1.20.2-glibc-sys-resource.patch
new file mode 100644
index 0000000..f682d00
--- /dev/null
+++ b/patches/busybox/1.20.2/busybox-1.20.2-glibc-sys-resource.patch
@@ -0,0 +1,109 @@
+https://bugs.gentoo.org/424954
+
+From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 5 Jul 2012 23:19:09 -0400
+Subject: [PATCH] include sys/resource.h where needed
+
+We use functions from sys/resource.h in misc applets, but don't include
+the header.  This breaks building with newer glibc versions, so add the
+include where needed.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ loginutils/passwd.c      |    1 +
+ miscutils/time.c         |    1 +
+ networking/inetd.c       |    1 +
+ networking/ntpd.c        |    1 +
+ networking/ntpd_simple.c |    1 +
+ runit/chpst.c            |    1 +
+ shell/shell_common.c     |    1 +
+ 7 files changed, 7 insertions(+)
+
+diff --git a/loginutils/passwd.c b/loginutils/passwd.c
+index b83db00..a7006f0 100644
+--- a/loginutils/passwd.c
++++ b/loginutils/passwd.c
+@@ -15,6 +15,7 @@
+ 
+ #include "libbb.h"
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
+ 
+ static void nuke_str(char *str)
+ {
+diff --git a/miscutils/time.c b/miscutils/time.c
+index 945f15f..ffed386 100644
+--- a/miscutils/time.c
++++ b/miscutils/time.c
+@@ -16,6 +16,7 @@
+ //usage:     "\n	-v	Verbose"
+ 
+ #include "libbb.h"
++#include <sys/resource.h> /* getrusage */
+ 
+ /* Information on the resources used by a child process.  */
+ typedef struct {
+diff --git a/networking/inetd.c b/networking/inetd.c
+index 1308d74..00baf69 100644
+--- a/networking/inetd.c
++++ b/networking/inetd.c
+@@ -165,6 +165,7 @@
+ //usage:     "\n		(default: 0 - disabled)"
+ 
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
+ #include <sys/un.h>
+ 
+ #include "libbb.h"
+diff --git a/networking/ntpd.c b/networking/ntpd.c
+index 72e9d0b..5b92db6 100644
+--- a/networking/ntpd.c
++++ b/networking/ntpd.c
+@@ -46,6 +46,7 @@
+ #include "libbb.h"
+ #include <math.h>
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #include <sys/timex.h>
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
+index 4ad44e4..1b7c66b 100644
+--- a/networking/ntpd_simple.c
++++ b/networking/ntpd_simple.c
+@@ -7,6 +7,7 @@
+  */
+ #include "libbb.h"
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+ #endif
+diff --git a/runit/chpst.c b/runit/chpst.c
+index ac296ba..ed72c8b 100644
+--- a/runit/chpst.c
++++ b/runit/chpst.c
+@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //usage:     "\n			a SIGXCPU after N seconds"
+ 
+ #include "libbb.h"
++#include <sys/resource.h> /* getrlimit */
+ 
+ /*
+ Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
+diff --git a/shell/shell_common.c b/shell/shell_common.c
+index 51c92d6..780e27e 100644
+--- a/shell/shell_common.c
++++ b/shell/shell_common.c
+@@ -18,6 +18,7 @@
+  */
+ #include "libbb.h"
+ #include "shell_common.h"
++#include <sys/resource.h> /* getrlimit */
+ 
+ const char defifsvar[] ALIGN1 = "IFS= \t\n";
+ 
+-- 
+1.7.9.7
+