OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=11

2008-10-22 15:42:03 +00:00 · 2008-10-22 15:42:03 +00:00 · c9ec48ad51
commit c9ec48ad51
parent 0d8a5bec1e
10 changed files with 172 additions and 141 deletions
--- a/busybox-1.12.1.tar.bz2
+++ b/busybox-1.12.1.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:80829f38d719879dcf01db6251015c8aea2567a382dad463f65d2299447e949b
+size 2022321
--- a/busybox-1.8.2-arping.patch
+++ b/busybox-1.8.2-arping.patch
@ -1,13 +0,0 @@
-diff -urN busybox-1.8.2/networking/arping.c busybox-1.8.2-arping/networking/arping.c
--- busybox-1.8.2/networking/arping.c	2007-11-10 01:40:47.000000000 +0000
-+++ busybox-1.8.2-arping/networking/arping.c	2007-12-18 10:31:55.000000000 +0000
-@@ -207,7 +207,8 @@
- 		}
- 
- 		if (last) {
-			printf(" %u.%03ums\n", last / 1000, last % 1000);
-+			unsigned diff = MONOTONIC_US() - last;
-+			printf(" %u.%03ums\n", diff / 1000, diff % 1000);
- 		} else {
- 			printf(" UNSOLICITED?\n");
- 		}
--- a/busybox-1.8.2-static.patch
+++ b/busybox-1.8.2-static.patch
@ -1,12 +0,0 @@
-diff -urN busybox-1.8.2/applets/applets.c busybox-1.8.2-static/applets/applets.c
--- busybox-1.8.2/applets/applets.c	2007-11-10 01:40:53.000000000 +0000
-+++ busybox-1.8.2-static/applets/applets.c	2007-12-09 03:46:04.000000000 +0000
-@@ -17,7 +17,7 @@
- #warning See sources.redhat.com/bugzilla/show_bug.cgi?id=3400
- #warning Note that glibc is unsuitable for static linking anyway.
- #warning If you still want to do it, remove -Wl,--gc-sections
-#warning from top-level Makefile and remove this warning.
-+#warning from file scripts/trylink and remove this warning.
- #error Aborting compilation.
- #endif
- 
--- a/busybox-1.8.2-vi.patch
+++ b/busybox-1.8.2-vi.patch
@ -1,40 +0,0 @@
-diff -urN busybox-1.8.2/editors/vi.c busybox-1.8.2-vi/editors/vi.c
--- busybox-1.8.2/editors/vi.c	2007-11-10 01:40:54.000000000 +0000
-+++ busybox-1.8.2-vi/editors/vi.c	2007-12-10 16:26:01.000000000 +0000
-@@ -184,6 +184,7 @@
- #if ENABLE_FEATURE_VI_COLON
- 	char *initial_cmds[3];  // currently 2 entries, NULL terminated
- #endif
-+	char readbuffer[MAX_LINELEN];
- };
- #define G (*ptr_to_globals)
- #define text           (G.text          )
-@@ -200,6 +201,10 @@
- #define term_orig      (G.term_orig     )
- #define term_vi        (G.term_vi       )
- #define initial_cmds   (G.initial_cmds  )
-+#define readbuffer     (G.readbuffer    )
-+#define INIT_G() do { \
-+	PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
-+} while (0)
- 
- static int init_text_buffer(char *); // init from file or create new
- static void edit_file(char *);	// edit one file
-@@ -321,7 +326,7 @@
- 	my_pid = getpid();
- #endif
- 
-	PTR_TO_GLOBALS = xzalloc(sizeof(G));
-+	INIT_G();
- 
- #if ENABLE_FEATURE_VI_CRASHME
- 	srand((long) my_pid);
-@@ -2142,8 +2147,6 @@
- 	return safe_poll(pfd, 1, hund*10) > 0;
- }
- 
-#define readbuffer bb_common_bufsiz1
-
- static int readed_for_parse;
- 
- //----- IO Routines --------------------------------------------
--- a/busybox-1.8.2.tar.bz2
+++ b/busybox-1.8.2.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e444c15c064ca111299323a5193113c8bcb80f7a946675b70f14b0166a2a59c
-size 1765399
--- a/busybox.SuSE.config
+++ b/busybox.SuSE.config
@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.8.1
-# Fri Nov 16 13:55:35 2007
+# Busybox version: 1.12.1
+# Wed Oct 15 12:33:48 2008
 #
 CONFIG_HAVE_DOT_CONFIG=y

@ -12,9 +12,10 @@ CONFIG_HAVE_DOT_CONFIG=y
 #
 # General Configuration
 #
-# CONFIG_NITPICK is not set
 CONFIG_DESKTOP=y
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_FEATURE_ASSUME_UNICODE is not set
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_SHOW_USAGE=y
@ -39,20 +40,25 @@ CONFIG_FEATURE_HAVE_RPC=y
 # Build Options
 #
 # CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
 # CONFIG_BUILD_LIBBUSYBOX is not set
 # CONFIG_FEATURE_INDIVIDUAL is not set
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""

 #
 # Debugging Options
 #
 # CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
 # CONFIG_WERROR is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
 CONFIG_INCLUDE_SUSv2=y
+# CONFIG_PARSE is not set

 #
 # Installation Options
@ -76,15 +82,17 @@ CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
-CONFIG_FEATURE_EDITING_FANCY_KEYS=y
 # CONFIG_FEATURE_EDITING_VI is not set
 CONFIG_FEATURE_EDITING_HISTORY=666
 CONFIG_FEATURE_EDITING_SAVEHISTORY=y
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
 CONFIG_MONOTONIC_SYSCALL=y
 CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y

 #
 # Applets
@ -93,44 +101,37 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 #
 # Archival Utilities
 #
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
+# CONFIG_FEATURE_SEAMLESS_GZ is not set
+# CONFIG_FEATURE_SEAMLESS_Z is not set
 CONFIG_AR=y
 CONFIG_FEATURE_AR_LONG_FILENAMES=y
 CONFIG_BUNZIP2=y
 CONFIG_BZIP2=y
 CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
 CONFIG_GUNZIP=y
-CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
 CONFIG_GZIP=y
 CONFIG_RPM2CPIO=y
 CONFIG_RPM=y
-CONFIG_FEATURE_RPM_BZ2=y
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_LZMA is not set
+# CONFIG_FEATURE_TAR_AUTODETECT is not set
 CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_GZIP=y
-CONFIG_FEATURE_TAR_COMPRESS=y
 # CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
 # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
 CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
 CONFIG_UNCOMPRESS=y
-# CONFIG_UNLZMA is not set
+CONFIG_UNLZMA=y
 # CONFIG_FEATURE_LZMA_FAST is not set
 CONFIG_UNZIP=y

-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
-# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
-# CONFIG_FEATURE_DEB_TAR_LZMA is not set
-
 #
 # Coreutils
 #
@ -152,6 +153,7 @@ CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
 CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_DF=y
+# CONFIG_FEATURE_DF_INODE is not set
 CONFIG_DIRNAME=y
 CONFIG_DOS2UNIX=y
 CONFIG_UNIX2DOS=y
@ -203,10 +205,12 @@ CONFIG_READLINK=y
 CONFIG_REALPATH=y
 CONFIG_RM=y
 CONFIG_RMDIR=y
+# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
 CONFIG_SEQ=y
 CONFIG_SHA1SUM=y
 CONFIG_SLEEP=y
 # CONFIG_FEATURE_FANCY_SLEEP is not set
+# CONFIG_FEATURE_FLOAT_SLEEP is not set
 CONFIG_SORT=y
 CONFIG_FEATURE_SORT_BIG=y
 CONFIG_SPLIT=y
@ -216,6 +220,7 @@ CONFIG_FEATURE_STAT_FORMAT=y
 CONFIG_STTY=y
 CONFIG_SUM=y
 CONFIG_SYNC=y
+# CONFIG_TAC is not set
 CONFIG_TAIL=y
 # CONFIG_FEATURE_FANCY_TAIL is not set
 CONFIG_TEE=y
@ -277,8 +282,10 @@ CONFIG_RESIZE=y
 CONFIG_FEATURE_RESIZE_PRINT=y
 CONFIG_SETCONSOLE=y
 # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETFONT is not set
 CONFIG_SETKEYCODES=y
 CONFIG_SETLOGCONS=y
+# CONFIG_SHOWKEY is not set

 #
 # Debian Utilities
@ -297,7 +304,7 @@ CONFIG_WHICH=y
 # Editors
 #
 CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_FEATURE_AWK_MATH is not set
 CONFIG_CMP=y
 CONFIG_DIFF=y
 CONFIG_FEATURE_DIFF_BINARY=y
@ -308,6 +315,7 @@ CONFIG_PATCH=y
 CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
@ -361,6 +369,8 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 CONFIG_INIT=y
 CONFIG_DEBUG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
+CONFIG_FEATURE_KILL_DELAY=0
 CONFIG_FEATURE_INIT_SCTTY=y
 CONFIG_FEATURE_INIT_SYSLOG=y
 CONFIG_FEATURE_EXTRA_QUIET=y
@ -373,13 +383,16 @@ CONFIG_MESG=y
 # Login/Password Management Utilities
 #
 CONFIG_FEATURE_SHADOWPASSWDS=y
-CONFIG_USE_BB_SHADOW=y
 CONFIG_USE_BB_PWD_GRP=y
+CONFIG_USE_BB_SHADOW=y
+CONFIG_USE_BB_CRYPT=y
 CONFIG_ADDGROUP=y
 # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
 CONFIG_DELGROUP=y
 # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
 CONFIG_ADDUSER=y
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
 CONFIG_DELUSER=y
 CONFIG_GETTY=y
 CONFIG_FEATURE_UTMP=y
@ -409,6 +422,12 @@ CONFIG_LSATTR=y
 #
 # Linux Module Utilities
 #
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+# CONFIG_DEPMOD is not set
+# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set
+# CONFIG_FEATURE_DEPMOD_ALIAS is not set
 CONFIG_INSMOD=y
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
@ -421,6 +440,7 @@ CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 CONFIG_MODPROBE=y
 CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
 CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set

 #
 # Options common to multiple modutils
@ -428,6 +448,8 @@ CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
 CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 # CONFIG_FEATURE_2_4_MODULES is not set
 CONFIG_FEATURE_2_6_MODULES=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set

 #
@ -448,12 +470,15 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
 # CONFIG_FEATURE_SUN_LABEL is not set
 # CONFIG_FEATURE_OSF_LABEL is not set
 # CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
 # CONFIG_FREERAMDISK is not set
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 CONFIG_GETOPT=y
 CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
 CONFIG_HWCLOCK=y
 CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
 CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
@ -462,23 +487,49 @@ CONFIG_IPCS=y
 CONFIG_LOSETUP=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
 CONFIG_MKSWAP=y
 # CONFIG_FEATURE_MKSWAP_V0 is not set
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
+# CONFIG_VOLUMEID is not set
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
 CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
 CONFIG_FEATURE_MOUNT_HELPERS=y
+# CONFIG_FEATURE_MOUNT_LABEL is not set
 CONFIG_FEATURE_MOUNT_NFS=y
 CONFIG_FEATURE_MOUNT_CIFS=y
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
 # CONFIG_PIVOT_ROOT is not set
 CONFIG_RDATE=y
+# CONFIG_RDEV is not set
 CONFIG_READPROFILE=y
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
 # CONFIG_SETARCH is not set
 CONFIG_SWAPONOFF=y
+# CONFIG_FEATURE_SWAPON_PRI is not set
 CONFIG_SWITCH_ROOT=y
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
@ -494,19 +545,32 @@ CONFIG_FEATURE_MTAB_SUPPORT=y
 #
 CONFIG_ADJTIMEX=y
 # CONFIG_BBCONFIG is not set
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
 CONFIG_CHRT=y
 CONFIG_CROND=y
 # CONFIG_DEBUG_CROND_OPTION is not set
 CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
 CONFIG_CRONTAB=y
-CONFIG_DC=y
+# CONFIG_DC is not set
 # CONFIG_DEVFSD is not set
 # CONFIG_DEVFSD_MODLOAD is not set
 # CONFIG_DEVFSD_FG_NP is not set
 # CONFIG_DEVFSD_VERBOSE is not set
 # CONFIG_FEATURE_DEVFS is not set
 CONFIG_EJECT=y
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_INOTIFYD is not set
 CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
 CONFIG_FEATURE_LESS_BRACKETS=y
@ -524,6 +588,7 @@ CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
 CONFIG_MAKEDEVS=y
 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
 CONFIG_FEATURE_MAKEDEVS_TABLE=y
+CONFIG_MAN=y
 # CONFIG_MICROCOM is not set
 CONFIG_MOUNTPOINT=y
 CONFIG_MT=y
@ -531,21 +596,25 @@ CONFIG_RAIDAUTORUN=y
 # CONFIG_READAHEAD is not set
 CONFIG_RUNLEVEL=y
 CONFIG_RX=y
-CONFIG_STRINGS=y
 CONFIG_SETSID=y
+CONFIG_STRINGS=y
 CONFIG_TASKSET=y
 CONFIG_FEATURE_TASKSET_FANCY=y
 CONFIG_TIME=y
-# CONFIG_TTYSIZE is not set
+CONFIG_TTYSIZE=y
 CONFIG_WATCHDOG=y

 #
 # Networking Utilities
 #
 CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 CONFIG_VERBOSE_RESOLUTION_ERRORS=y
 CONFIG_ARP=y
 CONFIG_ARPING=y
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
 CONFIG_DNSD=y
 CONFIG_ETHER_WAKE=y
 CONFIG_FAKEIDENTD=y
@ -573,6 +642,7 @@ CONFIG_FEATURE_IFCONFIG_SLIP=y
 CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
 CONFIG_FEATURE_IFCONFIG_HW=y
 CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+# CONFIG_IFENSLAVE is not set
 CONFIG_IFUPDOWN=y
 CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
 CONFIG_FEATURE_IFUPDOWN_IP=y
@ -606,17 +676,21 @@ CONFIG_IPCALC=y
 CONFIG_FEATURE_IPCALC_FANCY=y
 CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
 CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 CONFIG_NC=y
 CONFIG_NC_SERVER=y
 CONFIG_NC_EXTRA=y
 CONFIG_NETSTAT=y
 CONFIG_FEATURE_NETSTAT_WIDE=y
+# CONFIG_FEATURE_NETSTAT_PRG is not set
 CONFIG_NSLOOKUP=y
 CONFIG_PING=y
 CONFIG_PING6=y
-CONFIG_PSCAN=y
 CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PSCAN=y
 CONFIG_ROUTE=y
+# CONFIG_SENDMAIL is not set
+# CONFIG_FETCHMAIL is not set
 # CONFIG_SLATTACH is not set
 CONFIG_TELNET=y
 CONFIG_FEATURE_TELNET_TTYPE=y
@ -624,6 +698,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 CONFIG_TELNETD=y
 CONFIG_FEATURE_TELNETD_STANDALONE=y
 CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
 CONFIG_FEATURE_TFTP_GET=y
 CONFIG_FEATURE_TFTP_PUT=y
 CONFIG_FEATURE_TFTP_BLOCKSIZE=y
@ -636,15 +711,22 @@ CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
 # CONFIG_APP_DHCPRELAY is not set
 # CONFIG_APP_DUMPLEASES is not set
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE=""
 CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
 CONFIG_FEATURE_RFC3397=y
+CONFIG_DHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 # CONFIG_ZCIP is not set
+# CONFIG_TCPSVD is not set
+# CONFIG_UDPSVD is not set

 #
 # Process Utilities
@ -662,6 +744,8 @@ CONFIG_FEATURE_PIDOF_OMIT=y
 # CONFIG_PKILL is not set
 CONFIG_PS=y
 CONFIG_FEATURE_PS_WIDE=y
+# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 CONFIG_RENICE=y
 CONFIG_BB_SYSCTL=y
 CONFIG_TOP=y
@ -677,7 +761,6 @@ CONFIG_WATCH=y
 #
 CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
 # CONFIG_FEATURE_SH_IS_MSH is not set
 # CONFIG_FEATURE_SH_IS_NONE is not set
 CONFIG_ASH=y
@ -685,6 +768,7 @@ CONFIG_ASH=y
 #
 # Ash Shell Options
 #
+CONFIG_ASH_BASH_COMPAT=y
 CONFIG_ASH_JOB_CONTROL=y
 CONFIG_ASH_READ_NCHARS=y
 CONFIG_ASH_READ_TIMEOUT=y
@ -693,6 +777,7 @@ CONFIG_ASH_MATH_SUPPORT=y
 CONFIG_ASH_MATH_SUPPORT_64=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
 CONFIG_ASH_BUILTIN_TEST=y
 # CONFIG_ASH_CMDCMD is not set
 # CONFIG_ASH_MAIL is not set
@ -706,6 +791,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_HUSH_TICK is not set
 # CONFIG_HUSH_IF is not set
 # CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set

@ -714,6 +800,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 #
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 # CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
 CONFIG_CTTYHACK=y

 #
@ -722,6 +809,7 @@ CONFIG_CTTYHACK=y
 CONFIG_SYSLOGD=y
 CONFIG_FEATURE_ROTATE_LOGFILE=y
 # CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
 # CONFIG_LOGREAD is not set
@ -741,6 +829,10 @@ CONFIG_SVLOGD=y
 # CONFIG_ENVUIDGID is not set
 # CONFIG_ENVDIR is not set
 # CONFIG_SOFTLIMIT is not set
+
+#
+# Selinux Utilities
+#
 # CONFIG_CHCON is not set
 # CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
 # CONFIG_GETENFORCE is not set
@ -755,9 +847,11 @@ CONFIG_SVLOGD=y
 # CONFIG_SETFILES is not set
 # CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
 # CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set

 #
-# ipsvd utilities
+# Print Utilities
 #
-# CONFIG_TCPSVD is not set
-# CONFIG_UDPSVD is not set
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
--- a/busybox.changes
+++ b/busybox.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Oct 15 14:17:15 CEST 2008 - sassmann@suse.de
+
+- update to 1.12.1
+  see http://www.busybox.net/ for full changelog
+- removed patches included upstream
+  * busybox-1.8.2-arping.patch
+  * busybox-1.8.2-static
+  * busybox-1.8.2-vi.patch
+- refreshed patches
+  * busybox.libunarchive-array.patch
+  * busybox.dmesg-size.patch
+- updated config file
+  * removed awk math support and dc to get rid of libm
+
 -------------------------------------------------------------------
 Wed Sep  3 11:09:34 CEST 2008 - hare@suse.de

--- a/busybox.dmesg-size.patch
+++ b/busybox.dmesg-size.patch
@ -17,14 +17,14 @@
 +}
 +
 int dmesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int dmesg_main(int argc, char **argv)
+ int dmesg_main(int argc UNUSED_PARAM, char **argv)
 {
-@@ -25,7 +33,7 @@ int dmesg_main(int argc, char **argv)
- 		int len;
- 		char *buf;
+@@ -31,7 +39,7 @@ int dmesg_main(int argc UNUSED_PARAM, ch
+ 		return EXIT_SUCCESS;
+ 	}
 
-		len = (flags & 2) ? xatoul_range(size, 2, INT_MAX) : 16384;
-+		len = (flags & 2) ? xatoul_range(size, 2, INT_MAX) : kernel_ringbuffer_size();
- 		buf = xmalloc(len);
- 		if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
- 			bb_perror_msg_and_die("klogctl");
+-	len = (flags & OPT_s) ? xatoul_range(size, 2, INT_MAX) : 16384;
+	len = (flags & OPT_s) ? xatoul_range(size, 2, INT_MAX) : kernel_ringbuffer_size();
+ 	buf = xmalloc(len);
+ 	len = klogctl(3 + (flags & OPT_c), buf, len);
+ 	if (len < 0)
--- a/busybox.libunarchive-array.patch
+++ b/busybox.libunarchive-array.patch
@ -5,35 +5,18 @@ archival/libunarchive/get_header_tar.c:158: warning: array subscript is above ar
 make[1]: *** [archival/libunarchive/get_header_tar.o] Error 1

 ---
- archival/libunarchive/get_header_tar.c |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ archival/libunarchive/get_header_tar.c |    3 +++
+ 1 file changed, 3 insertions(+)

 --- a/archival/libunarchive/get_header_tar.c
 +++ b/archival/libunarchive/get_header_tar.c
-@@ -162,8 +162,8 @@ char get_header_tar(archive_handle_t *ar
+@@ -225,6 +225,9 @@ char FAST_FUNC get_header_tar(archive_ha
 	}
 	file_header->link_target = NULL;
- 	if (!linkname && parse_names && tar.linkname[0]) {
-		/* we trash magic[0] here, it's ok */
-		tar.linkname[sizeof(tar.linkname)] = '\0';
+ 	if (!p_linkname && parse_names && tar.linkname[0]) {
 +		/* we trash magic[0] here to terminate tar.linkname, it's ok */
 +		tar.magic[0] = '\0';
- 		file_header->link_target = xstrdup(tar.linkname);
+
+ 		file_header->link_target = xstrndup(tar.linkname, sizeof(tar.linkname));
 		/* FIXME: what if we have non-link object with link_target? */
 		/* Will link_target be free()ed? */
-@@ -177,11 +177,11 @@ char get_header_tar(archive_handle_t *ar
- 
- 	file_header->name = NULL;
- 	if (!longname && parse_names) {
-		/* we trash mode[0] here, it's ok */
-		tar.name[sizeof(tar.name)] = '\0';
-+		/* we trash mode[0] here to terminate tar.name, it's ok */
-+		tar.mode[0] = '\0';
- 		if (tar.prefix[0]) {
-			/* and padding[0] */
-			tar.prefix[sizeof(tar.prefix)] = '\0';
-+			/* and padding[0] to terminate tar.prefix */
-+			tar.padding[0] = '\0';
- 			file_header->name = concat_path_file(tar.prefix, tar.name);
- 		} else
- 			file_header->name = xstrdup(tar.name);
--- a/busybox.spec
+++ b/busybox.spec
@ -1,5 +1,5 @@
 #
-# spec file for package busybox (Version 1.8.2)
+# spec file for package busybox (Version 1.12.1)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -19,11 +19,10 @@


 Name:           busybox
-BuildRequires:  dietlibc
 BuildRequires:  libselinux-devel
 Url:            http://www.busybox.net/
-Version:        1.8.2
-Release:        47
+Version:        1.12.1
+Release:        1
 Summary:        The Swiss Army Knife of Embedded Linux
 License:        GPL v2 or later
 Group:          System/Base
@ -32,9 +31,6 @@ Source:         http://busybox.net/downloads/%{name}-%{version}.tar.bz2
 Source2:        busybox.SuSE.config
 Source3:        mkinitrd-setup.sh
 Source4:        mkinitrd-boot.sh
-Patch1:         busybox-1.8.2-arping.patch
-Patch2:         busybox-1.8.2-static.patch
-Patch3:         busybox-1.8.2-vi.patch
 Patch100:       busybox.install.patch
 Patch101:       busybox.libunarchive-array.patch
 Patch102:       busybox.dmesg-size.patch
@ -59,9 +55,6 @@ Authors:

 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@ -78,7 +71,6 @@ make -e doc busybox.links %{?jobs:-j%jobs}

 %install
 find -name ".cvsignore" -exec rm {} \;
-rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/usr/bin
 install -d $RPM_BUILD_ROOT/usr/share/busybox
 install busybox.links $RPM_BUILD_ROOT/usr/share/busybox
@ -112,6 +104,18 @@ exit 0
 /lib/mkinitrd/scripts/boot-busybox.sh

 %changelog
+* Wed Oct 15 2008 sassmann@suse.de
+- update to 1.12.1
+  see http://www.busybox.net/ for full changelog
+- removed patches included upstream
+  * busybox-1.8.2-arping.patch
+  * busybox-1.8.2-static
+  * busybox-1.8.2-vi.patch
+- refreshed patches
+  * busybox.libunarchive-array.patch
+  * busybox.dmesg-size.patch
+- updated config file
+  * removed awk math support and dc to get rid of libm
 * Wed Sep 03 2008 hare@suse.de
 - Call mkinitrd_setup during %%post and %%postun (bnc#413709)
 * Fri Aug 22 2008 prusnak@suse.cz