busybox-system:

- merge with package busybox
- add patch to enhance fbsplash
- add more patches from busybox.net

packages/sysutils/busybox-system/config/device_table.conf

@@ -1,177 +0,0 @@
-# When building a target filesystem, it is desirable to not have to
-# become root and then run 'mknod' a thousand times.  Using a device 
-# table you can create device nodes and directories "on the fly".
-#
-# This is a sample device table file for use with genext2fs.  You can
-# do all sorts of interesting things with a device table file.  For
-# example, if you want to adjust the permissions on a particular file
-# you can just add an entry like:
-#   /sbin/foobar        f       2755    0       0       -       -       -       -       -
-# and (assuming the file /sbin/foobar exists) it will be made setuid
-# root (regardless of what its permissions are on the host filesystem.
-# Furthermore, you can use a single table entry to create a many device
-# minors.  For example, if I wanted to create /dev/hda and /dev/hda[0-15]
-# I could just use the following two table entries:
-#   /dev/hda    b       640     0       0       3       0       0       0       -
-#   /dev/hda    b       640     0       0       3       1       1       1       15
-# 
-# Device table entries take the form of:
-# <name>    <type>      <mode>  <uid>   <gid>   <major> <minor> <start> <inc>   <count>
-# where name is the file name,  type can be one of: 
-#       f       A regular file
-#       d       Directory
-#       c       Character special device file
-#       b       Block special device file
-#       p       Fifo (named pipe)
-# uid is the user id for the target file, gid is the group id for the
-# target file.  The rest of the entries (major, minor, etc) apply only 
-# to device special files.
-
-# Have fun
-# -Erik Andersen <andersen@codepoet.org>
-#
-
-#<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-/dev		d	755	0	0	-	-	-	-	-
-#/dev/pts	d	755	0	0	-	-	-	-	-
-#/dev/shm	d	755	0	0	-	-	-	-	-
-#/tmp		d	1777	0	0	-	-	-	-	-
-#/etc		d	755	0	0	-	-	-	-	-
-/sys		d	755	0	0	-	-	-	-	-
-#/config		d	755	0	0	-	-	-	-	-
-/proc		d	755	0	0	-	-	-	-	-
-#/home/default	d	2755	1000	1000	-	-	-	-	-
-#/root		d	750	0	0	-	-	-	-	-
-#<name>					<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-#/bin/busybox				f	4755	0	0	-	-	-	-	-
-#/etc/shadow				f	600	0	0	-	-	-	-	-
-#/etc/passwd				f	644	0	0	-	-	-	-	-
-#/etc/network/if-up.d			d	755	0	0	-	-	-	-	-
-#/etc/network/if-pre-up.d		d	755	0	0	-	-	-	-	-
-#/etc/network/if-down.d			d	755	0	0	-	-	-	-	-
-#/etc/network/if-post-down.d		d	755	0	0	-	-	-	-	-
-#/usr/share/udhcpc/default.script	f	755	0	0	-	-	-	-	-
-# uncomment this to allow starting x as non-root
-#/usr/X11R6/bin/Xfbdev		f	4755	0	0	-	-	-	-	-
-# Normal system devices
-#<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-#/dev/mem	c	640	0	0	1	1	0	0	-
-#/dev/kmem	c	640	0	0	1	2	0	0	-
-/dev/null	c	666	0	0	1	3	0	0	-
-#/dev/zero	c	666	0	0	1	5	0	0	-
-#/dev/random	c	666	0	0	1	8	0	0	-
-#/dev/urandom	c	666	0	0	1	9	0	0	-
-#/dev/ram	b	640	0	0	1	1	0	0	-
-#/dev/ram	b	640	0	0	1	0	0	1	4
-/dev/loop	b	640	0	0	7	0	0	1	2
-#/dev/rtc	c	640	0	0	10	135	-	-	-
-#/dev/console	c	666	0	0	5	1	-	-	-
-#/dev/tty	c	666	0	0	5	0	-	-	-
-#/dev/tty	c	666	0	0	4	0	0	1	8
-#/dev/ttyAMA	c	600	0	0	204	64	0	1	1
-#/dev/ttyp	c	666	0	0	3	0	0	1	10
-#/dev/ptyp	c       666     0       0       2       0       0       1       10
-#/dev/ptmx	c	666	0	0	5	2	-	-	-
-#/dev/ttyP	c	666	0	0	57	0	0	1	4
-#/dev/ttyS	c	666	0	0	4	64	0	1	4
-#/dev/fb		c	640	0	5	29	0	0	32	4
-#/dev/ttySA	c	666	0	0	204	5	0	1	3
-#/dev/psaux	c	666	0	0	10	1	0	0	-
-#/dev/ppp	c	666	0	0	108	0	-	-	-
-
-# Input stuff
-#/dev/input		d	755	0	0	-	-	-	-	-
-#/dev/input/mice		c	640	0	0	13	63	0	0	-
-#/dev/input/mouse	c	660	0	0	13	32	0	1	4
-#/dev/input/event	c	660	0	0	13	64	0	1	4
-#/dev/input/js		c	660	0	0	13	0	0	1	4
-
-
-# MTD stuff
-#/dev/mtd	c	640	0	0	90	0	0	2	4
-#/dev/mtdblock	b	640	0	0	31	0	0	1	4
-
-#Tun/tap driver
-#/dev/net	d	755	0	0	-	-	-	-	-
-#/dev/net/tun	c	660	0	0	10	200	-	-	-
-
-# Audio stuff
-#/dev/audio	c	666	0	29	14	4	-	-	-
-#/dev/audio1	c	666	0	29	14	20	-	-	-
-#/dev/dsp	c	666	0	29	14	3	-	-	-
-#/dev/dsp1	c	666	0	29	14	19	-	-	-
-#/dev/sndstat	c	666	0	29	14	6	-	-	-
-
-# User-mode Linux stuff
-#/dev/ubda	b	640	0	0	98	0	0	0	-
-#/dev/ubda	b	640	0	0	98	1	1	1	15
-
-# IDE Devices
-#/dev/hda	b	640	0	0	3	0	0	0	-
-#/dev/hda	b	640	0	0	3	1	1	1	15
-#/dev/hdb	b	640	0	0	3	64	0	0	-
-#/dev/hdb	b	640	0	0	3	65	1	1	15
-#/dev/hdc	b	640	0	0	22	0	0	0	-
-#/dev/hdc	b	640	0	0	22	1	1	1	15
-#/dev/hdd	b	640	0	0	22	64	0	0	-
-#/dev/hdd	b	640	0	0	22	65	1	1	15
-#/dev/hde	b	640	0	0	33	0	0	0	-
-#/dev/hde	b	640	0	0	33	1	1	1	15
-#/dev/hdf	b	640	0	0	33	64	0	0	-
-#/dev/hdf	b	640	0	0	33	65	1	1	15
-#/dev/hdg	b	640	0	0	34	0	0	0	-
-#/dev/hdg	b	640	0	0	34	1	1	1	15
-#/dev/hdh	b	640	0	0	34	64	0	0	-
-#/dev/hdh	b	640	0	0	34	65	1	1	15
-
-# SCSI Devices
-/dev/sda	b	640	0	0	8	0	0	0	-
-/dev/sda	b	640	0	0	8	1	1	1	15
-/dev/sdb	b	640	0	0	8	16	0	0	-
-/dev/sdb	b	640	0	0	8	17	1	1	15
-#/dev/sdc	b	640	0	0	8	32	0	0	-
-#/dev/sdc	b	640	0	0	8	33	1	1	15
-#/dev/sdd	b	640	0	0	8	48	0	0	-
-#/dev/sdd	b	640	0	0	8	49	1	1	15
-#/dev/sde	b	640	0	0	8	64	0	0	-
-#/dev/sde	b	640	0	0	8	65	1	1	15
-#/dev/sdf	b	640	0	0	8	80	0	0	-
-#/dev/sdf	b	640	0	0	8	81	1	1	15
-#/dev/sdg	b	640	0	0	8	96	0	0	-
-#/dev/sdg	b	640	0	0	8	97	1	1	15
-#/dev/sdh	b	640	0	0	8	112	0	0	-
-#/dev/sdh	b	640	0	0	8	113	1	1	15
-#/dev/sg	c	640	0	0	21	0	0	1	15
-#/dev/scd	b	640	0	0	11	0	0	1	15
-#/dev/st	c	640	0	0	9	0	0	1	8
-#/dev/nst	c	640	0	0	9	128	0	1	8
-#/dev/st	c	640	0	0	9	32	1	1	4
-#/dev/st	c	640	0	0	9	64	1	1	4
-#/dev/st	c	640	0	0	9	96	1	1	4
-
-# Floppy disk devices
-#/dev/fd	b	640	0	0	2	0	0	1	2
-#/dev/fd0d360	b	640	0	0	2	4	0	0	-
-#/dev/fd1d360	b	640	0	0	2	5	0	0	-
-#/dev/fd0h1200	b	640	0	0	2	8	0	0	-
-#/dev/fd1h1200	b	640	0	0	2	9	0	0	-
-#/dev/fd0u1440	b	640	0	0	2	28	0	0	-
-#/dev/fd1u1440	b	640	0	0	2	29	0	0	-
-#/dev/fd0u2880	b	640	0	0	2	32	0	0	-
-#/dev/fd1u2880	b	640	0	0	2	33	0	0	-
-
-# All the proprietary cdrom devices in the world
-#/dev/aztcd	b	640	0	0	29	0	0	0	-
-#/dev/bpcd	b	640	0	0	41	0	0	0	-
-#/dev/capi20	c	640	0	0	68	0	0	1	2
-#/dev/cdu31a	b	640	0	0	15	0	0	0	-
-#/dev/cdu535	b	640	0	0	24	0	0	0	-
-#/dev/cm206cd	b	640	0	0	32	0	0	0	-
-#/dev/sjcd	b	640	0	0	18	0	0	0	-
-#/dev/sonycd	b	640	0	0	15	0	0	0	-
-#/dev/gscd	b	640	0	0	16	0	0	0	-
-#/dev/sbpcd	b	640	0	0	25	0	0	0	-
-#/dev/sbpcd	b	640	0	0	25	0	0	1	4
-#/dev/mcd	b	640	0	0	23	0	0	0	-
-#/dev/optcd	b	640	0	0	17	0	0	0	-
-

packages/sysutils/busybox-system/config/mdev.conf

@@ -1,94 +0,0 @@
-# 
-# This is a sample mdev.conf.
-#
-
-SLEEP=10
-
-# Symlinks:
-# Syntax: %s -> %s
-MAKEDEV -> ../sbin/MAKEDEV
-/proc/core -> kcore
-fd -> /proc/self/fd
-mcdx -> mcdx0
-radio -> radio0
-ram -> ram1
-sbpcd -> sbpcd0
-sr0 -> scd0
-sr1 -> scd1
-sr10 -> scd10
-sr11 -> scd11
-sr12 -> scd12
-sr13 -> scd13
-sr14 -> scd14
-sr15 -> scd15
-sr16 -> scd16
-sr2 -> scd2
-sr3 -> scd3
-sr4 -> scd4
-sr5 -> scd5
-sr6 -> scd6
-sr7 -> scd7
-sr8 -> scd8
-sr9 -> scd9
-stderr -> fd/2
-stdin -> fd/0
-stdout -> fd/1
-vbi -> vbi0
-#vcs -> vcs0
-#vcsa -> vcsa0
-video -> video0
-
-# Devices:
-# Syntax: %s %d:%d %s
-# devices user:group mode
-
-null	root:root 777
-zero	root:root 666
-grsec	root:root 660
-
-urandom	root:root 444
-
-console	root:tty 0600
-fd0	root:floppy 0660
-kmem	root:root 000
-mem	root:root 0640
-port	root:root 0640
-ptmx	root:tty 0660
-
-sd[a-z][0-9]*	root:disk 0660	*/lib/mdev/sd_links
-hd[a-z][0-9]*	root:disk 0660	*/lib/mdev/ide_links
-md[0-9]		root:disk 0660
-
-tty		root:tty 0666
-tty[0-9]	root:tty 0660
-tty[0-9][0-9]	root:tty 0660
-ttyS[0-9]*	root:tty 640
-
-ttyLTM[0-9]	root:dialout 0660 @ln -sf $MDEV modem
-ttySHSF[0-9]	root:dialout 0660 @ln -sf $MDEV modem
-slamr		root:dialout 0660 @ln -sf $MDEV slamr0
-slusb		root:dialout 0660 @ln -sf $MDEV slusb0
-video.*		root:video 0660
-fuse		root:root  0666
-
-# alsa sound devices
-pcm.*		root:audio 0660	*/lib/mdev/subdir_dev snd
-control.*	root:audio 0660	*/lib/mdev/subdir_dev snd
-midi.*		root:audio 0660	*/lib/mdev/subdir_dev snd
-seq		root:audio 0660	*/lib/mdev/subdir_dev snd
-timer		root:audio 0660	*/lib/mdev/subdir_dev snd
-
-# load drivers for usb devices
-usbdev[0-9].*	root:root 0660 */lib/mdev/usbdev
-
-# net devices
-tun[0-9]*	root:root 0600 */lib/mdev/subdir_dev net
-tap[0-9]*	root:root 0600 */lib/mdev/subdir_dev net
-
-# zaptel devices
-zapctl		root:dialout 0660 */lib/mdev/subdir_dev zap ctl
-zaptimer	root:dialout 0660 */lib/mdev/subdir_dev zap timer
-zapchannel	root:dialout 0660 */lib/mdev/subdir_dev zap channel
-zappseudo	root:dialout 0660 */lib/mdev/subdir_dev zap pseudo
-zap[0-9]*	root:dialout 0660 */lib/mdev/subdir_dev zap
-

packages/sysutils/busybox/config/busybox.conf

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.15.1
-# Fri Sep 25 11:20:48 2009
+# Mon Oct  5 10:23:59 2009
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -587,6 +587,10 @@ CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
 CONFIG_EJECT=y
 CONFIG_FEATURE_EJECT_SCSI=y
 CONFIG_FBSPLASH=y
+CONFIG_FEATURE_FBSPLASH_8BPP=y
+CONFIG_FEATURE_FBSPLASH_SPRITES=y
+CONFIG_FEATURE_FBSPLASH_TEXT=y
+CONFIG_FEATURE_FBSPLASH_FONTLOAD=y
 # CONFIG_FLASH_LOCK is not set
 # CONFIG_FLASH_UNLOCK is not set
 # CONFIG_FLASH_ERASEALL is not set
@@ -628,16 +632,16 @@ CONFIG_MOUNTPOINT=y
 # CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_TIME is not set
 # CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
+CONFIG_TTYSIZE=y
 # CONFIG_VOLNAME is not set
 # CONFIG_WATCHDOG is not set
 
 #
 # Networking Utilities
 #
-CONFIG_FEATURE_IPV6=y
-CONFIG_FEATURE_UNIX_LOCAL=y
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
 # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
 # CONFIG_ARP is not set
 # CONFIG_ARPING is not set
@@ -670,7 +674,7 @@ CONFIG_FEATURE_IFCONFIG_STATUS=y
 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
 # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
 CONFIG_FEATURE_IFCONFIG_HW=y
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
 # CONFIG_IFENSLAVE is not set
 # CONFIG_IFPLUGD is not set
 # CONFIG_IFUPDOWN is not set
@@ -715,7 +719,7 @@ CONFIG_NETSTAT=y
 # CONFIG_FEATURE_NETSTAT_PRG is not set
 # CONFIG_NSLOOKUP is not set
 CONFIG_PING=y
-CONFIG_PING6=y
+# CONFIG_PING6 is not set
 CONFIG_FEATURE_FANCY_PING=y
 # CONFIG_PSCAN is not set
 CONFIG_ROUTE=y
@@ -743,7 +747,7 @@ CONFIG_DHCPD_LEASES_FILE=""
 CONFIG_APP_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 # CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
+CONFIG_UDHCP_DEBUG=9
 CONFIG_FEATURE_UDHCP_RFC3397=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -815,7 +819,7 @@ CONFIG_RUNSV=y
 CONFIG_RUNSVDIR=y
 # CONFIG_FEATURE_RUNSVDIR_LOG is not set
 CONFIG_SV=y
-CONFIG_SV_DEFAULT_SERVICE_DIR="/etc/service"
+CONFIG_SV_DEFAULT_SERVICE_DIR="/usr/etc/service"
 # CONFIG_SVLOGD is not set
 # CONFIG_CHPST is not set
 # CONFIG_SETUIDGID is not set

packages/sysutils/busybox/patches/30_telnetd.diff

@@ -1,12 +0,0 @@
-diff -Naur busybox-1.15.0/networking/telnetd.c busybox-1.15.0a/networking/telnetd.c
---- busybox-1.15.0/networking/telnetd.c	2009-08-21 00:26:14.000000000 +0200
-+++ busybox-1.15.0a/networking/telnetd.c	2009-08-30 11:38:57.000000000 +0200
-@@ -63,7 +63,7 @@
- };
- #define G (*(struct globals*)&bb_common_bufsiz1)
- #define INIT_G() do { \
--	G.loginpath = "/bin/login"; \
-+	G.loginpath = "/bin/sh"; \
- 	G.issuefile = "/etc/issue.net"; \
- } while (0)
- 

packages/sysutils/busybox/patches/busybox-1.15.1-ash.diff

@@ -1,29 +0,0 @@
-diff -urpN busybox-1.15.1/shell/ash.c busybox-1.15.1-ash/shell/ash.c
---- busybox-1.15.1/shell/ash.c	2009-09-12 17:56:11.000000000 +0200
-+++ busybox-1.15.1-ash/shell/ash.c	2009-09-16 16:29:09.609276492 +0200
-@@ -5553,7 +5553,7 @@ exptilde(char *startp, char *p, int flag
- 	char *name;
- 	struct passwd *pw;
- 	const char *home;
--	int quotes = flag & (EXP_FULL | EXP_CASE);
-+	int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
- 	int startloc;
- 
- 	name = p + 1;
-@@ -6321,7 +6321,7 @@ varvalue(char *name, int varflags, int f
- 	int syntax;
- 	int quoted = varflags & VSQUOTE;
- 	int subtype = varflags & VSTYPE;
--	int quotes = flags & (EXP_FULL | EXP_CASE);
-+	int quotes = flags & (EXP_FULL | EXP_CASE | EXP_REDIR);
- 
- 	if (quoted && (flags & EXP_FULL))
- 		sep = 1 << CHAR_BIT;
-@@ -6558,6 +6558,7 @@ evalvar(char *p, int flag, struct strlis
- 		patloc = expdest - (char *)stackblock();
- 		if (0 == subevalvar(p, /* str: */ NULL, patloc, subtype,
- 				startloc, varflags,
-+//TODO: | EXP_REDIR too? All other such places do it too
- 				/* quotes: */ flag & (EXP_FULL | EXP_CASE),
- 				var_str_list)
- 		) {