* updated busybox from 1.8.2 to 1.9.1

* added CONFIG_FEATURE_SHADOWPASSWDS to busybox config (as suggested by Sebastian)
* updated busybox.config
* updated busybox.links


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1568 95ad53e4-c205-0410-b2fa-d234c58c8868

10 files changed, 54 insertions, 25 deletions

diff --git a/tools/README.busybox b/tools/README.busybox
index 5d6d8d74..f6350d2c 100644
--- a/tools/README.busybox
+++ b/tools/README.busybox
@@ -1,4 +1,4 @@
-How busybox (version 1.7.1) is created:
+How busybox (version 1.9.1) is created:
 
 1. Get the current sources from busybox.net and untar them.
 2. Change to the busybox-<version> dir and create a sym link named patches
@@ -7,14 +7,14 @@ How busybox (version 1.7.1) is created:
    file.  Or apply the patches in the order shown in the series file.
 4. Create a sym link named .config pointing to ../busybox-config
 5. Call make oldconfig and adjust the configuration if required.
-6. Call make to create the busybox binary.
-7. Copy the binary to ../busybox.<arch>
-
+6. (Bind-)Mount the busybox folder into the build environment 
+   (which is 'debian-3.1-openslx-build' for i586 and 
+   'debian-4.0_x86_64-openslx-build for x86_64).
+7. Open a chrooted shell in the build environment (via slxos-setup shell),
+   chdir into the busybox folder and call make to create the busybox binary.
+8. Copy the binary to ../busybox.<arch>
 
 Current open issues
 
 - The process is not automated.
 - Should be moved to a place outside of the OpenSLX sources.
-- Ensure to create the binaries with an older Linux version.  Else the binary
-  might use newer features of libc which are not available on the used host.
-  For the last builds suse 10.1 systems created with slxos-setup had been used.
diff --git a/tools/busybox-patches/bzip2-payload-1.8.2.diff b/tools/busybox-patches/bzip2-payload-1.9.1.diff
index 7827a4cd..7827a4cd 100644
--- a/tools/busybox-patches/bzip2-payload-1.8.2.diff
+++ b/tools/busybox-patches/bzip2-payload-1.9.1.diff
diff --git a/tools/busybox-patches/cryptpw-blowfish-1.8.2.diff b/tools/busybox-patches/cryptpw-blowfish-1.9.1.diff
index f10e561b..f10e561b 100644
--- a/tools/busybox-patches/cryptpw-blowfish-1.8.2.diff
+++ b/tools/busybox-patches/cryptpw-blowfish-1.9.1.diff
diff --git a/tools/busybox-patches/series b/tools/busybox-patches/series
index 0d833277..60ee9c9a 100644
--- a/tools/busybox-patches/series
+++ b/tools/busybox-patches/series
@@ -1,5 +1,5 @@
 # series file useable by quilt
-bzip2-payload-1.8.2.diff
-cryptpw-blowfish-1.8.2.diff
-unionfs-run-init-1.8.2.diff
-vncpasswd-1.8.2.diff
+bzip2-payload-1.9.1.diff
+cryptpw-blowfish-1.9.1.diff
+unionfs-run-init-1.9.1.diff
+vncpasswd-1.9.1.diff
diff --git a/tools/busybox-patches/unionfs-run-init-1.8.2.diff b/tools/busybox-patches/unionfs-run-init-1.9.1.diff
index 768e07c6..768e07c6 100644
--- a/tools/busybox-patches/unionfs-run-init-1.8.2.diff
+++ b/tools/busybox-patches/unionfs-run-init-1.9.1.diff
diff --git a/tools/busybox-patches/vncpasswd-1.8.2.diff b/tools/busybox-patches/vncpasswd-1.9.1.diff
index 15c6158b..6f8b096c 100644
--- a/tools/busybox-patches/vncpasswd-1.8.2.diff
+++ b/tools/busybox-patches/vncpasswd-1.9.1.diff
@@ -1,7 +1,7 @@
 diff -ruw busybox-1.8.2/include/applets.h busybox-1.8.2-openslx/include/applets.h
 --- busybox-1.8.2/include/applets.h	2007-11-10 02:40:53.000000000 +0100
 +++ busybox-1.8.2-openslx/include/applets.h	2008-02-04 00:32:29.000000000 +0100
-@@ -371,6 +371,7 @@
+@@ -372,6 +372,7 @@
  USE_VCONFIG(APPLET(vconfig, _BB_DIR_SBIN, _BB_SUID_NEVER))
  USE_VI(APPLET(vi, _BB_DIR_BIN, _BB_SUID_NEVER))
  USE_VLOCK(APPLET(vlock, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))
@@ -12,7 +12,7 @@ diff -ruw busybox-1.8.2/include/applets.h busybox-1.8.2-openslx/include/applets.
 diff -ruw busybox-1.8.2/include/usage.h busybox-1.8.2-openslx/include/usage.h
 --- busybox-1.8.2/include/usage.h	2007-11-10 02:40:53.000000000 +0100
 +++ busybox-1.8.2-openslx/include/usage.h	2008-02-04 00:16:18.000000000 +0100
-@@ -4043,6 +4043,11 @@
+@@ -4070,6 +4070,11 @@
         "\n\nOptions:\n" \
         "	-a	Lock all VTs"
  
diff --git a/tools/busybox.config b/tools/busybox.config
index 7944c61f..e76a8114 100644
--- a/tools/busybox.config
+++ b/tools/busybox.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.7.1
-# Thu Sep 20 22:46:06 2007
+# Busybox version: 1.9.1
+# Thu Feb 21 19:09:54 2008
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -40,10 +40,9 @@ CONFIG_FEATURE_HAVE_RPC=y
 #
 # CONFIG_STATIC is not set
 # CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 # CONFIG_LFS is not set
-# CONFIG_BUILD_AT_ONCE is not set
 
 #
 # Debugging Options
@@ -61,7 +60,11 @@ CONFIG_NO_DEBUG_LIB=y
 # CONFIG_INSTALL_NO_USR is not set
 CONFIG_INSTALL_APPLET_SYMLINKS=y
 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
 # CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
 CONFIG_PREFIX="./_install"
 
 #
@@ -80,6 +83,7 @@ CONFIG_FEATURE_EDITING_HISTORY=15
 CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
+CONFIG_FEATURE_COPYBUF_KB=4
 CONFIG_MONOTONIC_SYSCALL=y
 CONFIG_IOCTL_HEX2STR_ERROR=y
 
@@ -93,6 +97,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 CONFIG_AR=y
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
 CONFIG_BUNZIP2=y
+CONFIG_BZIP2=y
 CONFIG_CPIO=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
@@ -101,6 +106,7 @@ CONFIG_GUNZIP=y
 CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
 CONFIG_GZIP=y
 CONFIG_RPM2CPIO=y
+CONFIG_FEATURE_RPM2CPIO_BZIP2=y
 # CONFIG_RPM is not set
 # CONFIG_FEATURE_RPM_BZ2 is not set
 CONFIG_TAR=y
@@ -148,6 +154,7 @@ CONFIG_DD=y
 # CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
 # CONFIG_FEATURE_DD_IBS_OBS is not set
 CONFIG_DF=y
+# CONFIG_FEATURE_DF_INODE is not set
 # CONFIG_DIRNAME is not set
 # CONFIG_DOS2UNIX is not set
 # CONFIG_UNIX2DOS is not set
@@ -264,6 +271,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y
 # CONFIG_CLEAR is not set
 # CONFIG_DEALLOCVT is not set
 # CONFIG_DUMPKMAP is not set
+# CONFIG_KBD_MODE is not set
 # CONFIG_LOADFONT is not set
 # CONFIG_LOADKMAP is not set
 # CONFIG_OPENVT is not set
@@ -303,6 +311,7 @@ CONFIG_AWK=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
@@ -367,9 +376,9 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 #
 # Login/Password Management Utilities
 #
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_PWD_GRP is not set
+CONFIG_FEATURE_SHADOWPASSWDS=y
+CONFIG_USE_BB_SHADOW=y
+CONFIG_USE_BB_PWD_GRP=y
 # CONFIG_ADDGROUP is not set
 # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
 # CONFIG_DELGROUP is not set
@@ -387,12 +396,14 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 # CONFIG_PASSWD is not set
 # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
 CONFIG_CRYPTPW=y
+CONFIG_FEATURE_CRYPTPW_BLOWFISH=y
 # CONFIG_CHPASSWD is not set
 # CONFIG_SU is not set
 # CONFIG_FEATURE_SU_SYSLOG is not set
 # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
 # CONFIG_SULOGIN is not set
 # CONFIG_VLOCK is not set
+CONFIG_VNCPASSWD=y
 
 #
 # Linux Ext2 FS Progs
@@ -449,6 +460,8 @@ CONFIG_FEATURE_FDISK_WRITABLE=y
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
 # CONFIG_HEXDUMP is not set
+# CONFIG_HD is not set
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
 CONFIG_HWCLOCK=y
 # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
 CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
@@ -464,6 +477,7 @@ CONFIG_MKSWAP=y
 # CONFIG_MORE is not set
 # CONFIG_FEATURE_USE_TERMIOS is not set
 CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
 CONFIG_FEATURE_MOUNT_NFS=y
 CONFIG_FEATURE_MOUNT_CIFS=y
 CONFIG_FEATURE_MOUNT_FLAGS=y
@@ -518,6 +532,7 @@ CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
 # CONFIG_MAKEDEVS is not set
 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MICROCOM is not set
 # CONFIG_MOUNTPOINT is not set
 # CONFIG_MT is not set
 # CONFIG_RAIDAUTORUN is not set
@@ -536,6 +551,7 @@ CONFIG_TIME=y
 # Networking Utilities
 #
 # CONFIG_FEATURE_IPV6 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=y
@@ -547,6 +563,7 @@ CONFIG_ARPING=y
 # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
 # CONFIG_HOSTNAME is not set
 CONFIG_HTTPD=y
+# CONFIG_FEATURE_HTTPD_RANGES is not set
 # CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
 # CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
@@ -558,6 +575,7 @@ CONFIG_HTTPD=y
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
 # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
 # CONFIG_IFCONFIG is not set
 # CONFIG_FEATURE_IFCONFIG_STATUS is not set
 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
@@ -565,7 +583,7 @@ CONFIG_HTTPD=y
 # CONFIG_FEATURE_IFCONFIG_HW is not set
 # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
 # CONFIG_IFUPDOWN is not set
-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_FEATURE_IFUPDOWN_IP is not set
 # CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
 # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
@@ -587,6 +605,7 @@ CONFIG_FEATURE_IP_ROUTE=y
 CONFIG_FEATURE_IP_TUNNEL=y
 # CONFIG_FEATURE_IP_RULE is not set
 # CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
 # CONFIG_IPADDR is not set
 # CONFIG_IPLINK is not set
 # CONFIG_IPROUTE is not set
@@ -596,6 +615,7 @@ CONFIG_FEATURE_IP_TUNNEL=y
 # CONFIG_FEATURE_IPCALC_FANCY is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
 # CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 # CONFIG_NC is not set
 # CONFIG_NC_SERVER is not set
 # CONFIG_NC_EXTRA is not set
@@ -627,8 +647,10 @@ CONFIG_FEATURE_TFTP_GET=y
 # CONFIG_APP_DUMPLEASES is not set
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
 CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
 CONFIG_FEATURE_RFC3397=y
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
@@ -645,9 +667,11 @@ CONFIG_KILL=y
 CONFIG_KILLALL=y
 # CONFIG_KILLALL5 is not set
 CONFIG_NMETER=y
+# CONFIG_PGREP is not set
 # CONFIG_PIDOF is not set
 # CONFIG_FEATURE_PIDOF_SINGLE is not set
 # CONFIG_FEATURE_PIDOF_OMIT is not set
+# CONFIG_PKILL is not set
 CONFIG_PS=y
 CONFIG_FEATURE_PS_WIDE=y
 # CONFIG_RENICE is not set
@@ -656,6 +680,7 @@ CONFIG_FEATURE_PS_WIDE=y
 # CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
 # CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
 # CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOPMEM is not set
 CONFIG_UPTIME=y
 # CONFIG_WATCH is not set
 
@@ -664,7 +689,6 @@ CONFIG_UPTIME=y
 #
 # CONFIG_FEATURE_SH_IS_ASH is not set
 # 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=y
 CONFIG_ASH=y
@@ -741,6 +765,8 @@ CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
 # CONFIG_SETENFORCE is not set
 # 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
diff --git a/tools/busybox.i586 b/tools/busybox.i586
index 745726b3..cdf7afc0 100755
--- a/tools/busybox.i586
+++ b/tools/busybox.i586
diff --git a/tools/busybox.links b/tools/busybox.links
index ae3bdbb9..add0b1dd 100644
--- a/tools/busybox.links
+++ b/tools/busybox.links
@@ -7,12 +7,14 @@
 /usr/bin/basename
 /usr/bin/bunzip2
 /usr/bin/bzcat
+/usr/bin/bzip2
 /bin/cat
 /bin/chmod
 /bin/chown
 /usr/sbin/chroot
 /bin/cp
 /bin/cpio
+/usr/bin/cryptpw
 /usr/bin/cut
 /bin/date
 /bin/dd
@@ -20,6 +22,7 @@
 /bin/dmesg
 /usr/bin/du
 /bin/echo
+/bin/egrep
 /usr/bin/env
 /usr/bin/expr
 /bin/false
@@ -44,15 +47,13 @@
 /usr/bin/md5sum
 /sbin/mdev
 /bin/mkdir
-/sbin/mke2fs
-/sbin/mkfs.ext2
-/sbin/mkfs.ext3
 /bin/mknod
 /sbin/mkswap
 /sbin/modprobe
 /bin/mount
 /bin/mv
 /bin/nice
+/usr/bin/nmeter
 /bin/ping
 /usr/bin/printf
 /bin/ps
@@ -63,6 +64,7 @@
 /bin/sed
 /bin/sleep
 /usr/bin/sort
+/usr/bin/strings
 /sbin/swapoff
 /sbin/swapon
 /sbin/switch_root
@@ -81,6 +83,7 @@
 /bin/usleep
 /sbin/vconfig
 /bin/vi
+/usr/bin/vncpasswd
 /usr/bin/wc
 /usr/bin/wget
 /bin/zcat
diff --git a/tools/busybox.x86_64 b/tools/busybox.x86_64
index efd719d1..91d13c9f 100755
--- a/tools/busybox.x86_64
+++ b/tools/busybox.x86_64