From db7cd3e21e3b23b8f3c378fbb2f690c9ccffc81f Mon Sep 17 00:00:00 2001 From: Sebastian Schmelzer Date: Wed, 17 Dec 2008 02:45:27 +0000 Subject: * update rootfs * new busybox (1.13.1) git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2424 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/uclib-rootfs/bin/busybox | Bin 334384 -> 342224 bytes initramfs/uclib-rootfs/bin/ifrename | Bin 0 -> 21760 bytes initramfs/uclib-rootfs/bin/iwconfig | Bin 0 -> 17640 bytes initramfs/uclib-rootfs/bin/iwevent | Bin 0 -> 13540 bytes initramfs/uclib-rootfs/bin/iwgetid | Bin 0 -> 9344 bytes initramfs/uclib-rootfs/bin/iwlist | Bin 0 -> 25884 bytes initramfs/uclib-rootfs/bin/iwpriv | Bin 0 -> 9384 bytes initramfs/uclib-rootfs/bin/iwspy | Bin 0 -> 9372 bytes initramfs/uclib-rootfs/bin/ldconfig | Bin 0 -> 61808 bytes initramfs/uclib-rootfs/bin/mconf | Bin 0 -> 85264 bytes initramfs/uclib-rootfs/lib/ld-uClibc-0.9.28.so | Bin 17044 -> 0 bytes initramfs/uclib-rootfs/lib/ld-uClibc.so.0 | 2 +- initramfs/uclib-rootfs/lib/libc.so.0 | 2 +- initramfs/uclib-rootfs/lib/libcrypt-0.9.28.so | Bin 8880 -> 0 bytes initramfs/uclib-rootfs/lib/libcrypt.so.0 | 2 +- initramfs/uclib-rootfs/lib/libdl-0.9.28.so | Bin 9040 -> 0 bytes initramfs/uclib-rootfs/lib/libdl.so.0 | 2 +- initramfs/uclib-rootfs/lib/libm-0.9.28.so | Bin 66736 -> 0 bytes initramfs/uclib-rootfs/lib/libm.so.0 | 2 +- initramfs/uclib-rootfs/lib/libnsl-0.9.28.so | Bin 4568 -> 0 bytes initramfs/uclib-rootfs/lib/libnsl.so.0 | 2 +- initramfs/uclib-rootfs/lib/libpthread-0.9.28.so | Bin 78368 -> 0 bytes initramfs/uclib-rootfs/lib/libpthread.so.0 | 2 +- initramfs/uclib-rootfs/lib/libresolv-0.9.28.so | Bin 4568 -> 0 bytes initramfs/uclib-rootfs/lib/libresolv.so.0 | 2 +- initramfs/uclib-rootfs/lib/librt-0.9.28.so | Bin 4684 -> 0 bytes initramfs/uclib-rootfs/lib/librt.so.0 | 2 +- initramfs/uclib-rootfs/lib/libthread_db-0.9.28.so | Bin 13200 -> 0 bytes initramfs/uclib-rootfs/lib/libthread_db.so.1 | 2 +- initramfs/uclib-rootfs/lib/libuClibc-0.9.28.so | Bin 295120 -> 0 bytes initramfs/uclib-rootfs/lib/libutil-0.9.28.so | Bin 4808 -> 0 bytes initramfs/uclib-rootfs/lib/libutil.so.0 | 2 +- initramfs/uclib-rootfs/usr/bin/getent | 88 ++++++++-------------- initramfs/uclib-rootfs/usr/bin/ldd | Bin 9472 -> 11702 bytes initramfs/uclib-rootfs/usr/bin/strace | Bin 169584 -> 173636 bytes initramfs/uclib-rootfs/usr/sbin/kexec | Bin 116328 -> 116284 bytes 36 files changed, 43 insertions(+), 67 deletions(-) create mode 100755 initramfs/uclib-rootfs/bin/ifrename create mode 100755 initramfs/uclib-rootfs/bin/iwconfig create mode 100755 initramfs/uclib-rootfs/bin/iwevent create mode 100755 initramfs/uclib-rootfs/bin/iwgetid create mode 100755 initramfs/uclib-rootfs/bin/iwlist create mode 100755 initramfs/uclib-rootfs/bin/iwpriv create mode 100755 initramfs/uclib-rootfs/bin/iwspy create mode 100755 initramfs/uclib-rootfs/bin/ldconfig create mode 100755 initramfs/uclib-rootfs/bin/mconf delete mode 100755 initramfs/uclib-rootfs/lib/ld-uClibc-0.9.28.so delete mode 100755 initramfs/uclib-rootfs/lib/libcrypt-0.9.28.so delete mode 100755 initramfs/uclib-rootfs/lib/libdl-0.9.28.so delete mode 100755 initramfs/uclib-rootfs/lib/libm-0.9.28.so delete mode 100755 initramfs/uclib-rootfs/lib/libnsl-0.9.28.so delete mode 100755 initramfs/uclib-rootfs/lib/libpthread-0.9.28.so delete mode 100755 initramfs/uclib-rootfs/lib/libresolv-0.9.28.so delete mode 100755 initramfs/uclib-rootfs/lib/librt-0.9.28.so delete mode 100755 initramfs/uclib-rootfs/lib/libthread_db-0.9.28.so delete mode 100755 initramfs/uclib-rootfs/lib/libuClibc-0.9.28.so delete mode 100755 initramfs/uclib-rootfs/lib/libutil-0.9.28.so (limited to 'initramfs') diff --git a/initramfs/uclib-rootfs/bin/busybox b/initramfs/uclib-rootfs/bin/busybox index bcb489f0..d5ba84b2 100755 Binary files a/initramfs/uclib-rootfs/bin/busybox and b/initramfs/uclib-rootfs/bin/busybox differ diff --git a/initramfs/uclib-rootfs/bin/ifrename b/initramfs/uclib-rootfs/bin/ifrename new file mode 100755 index 00000000..454ea3bf Binary files /dev/null and b/initramfs/uclib-rootfs/bin/ifrename differ diff --git a/initramfs/uclib-rootfs/bin/iwconfig b/initramfs/uclib-rootfs/bin/iwconfig new file mode 100755 index 00000000..ebe4b5af Binary files /dev/null and b/initramfs/uclib-rootfs/bin/iwconfig differ diff --git a/initramfs/uclib-rootfs/bin/iwevent b/initramfs/uclib-rootfs/bin/iwevent new file mode 100755 index 00000000..20b6293a Binary files /dev/null and b/initramfs/uclib-rootfs/bin/iwevent differ diff --git a/initramfs/uclib-rootfs/bin/iwgetid b/initramfs/uclib-rootfs/bin/iwgetid new file mode 100755 index 00000000..6a51e3f9 Binary files /dev/null and b/initramfs/uclib-rootfs/bin/iwgetid differ diff --git a/initramfs/uclib-rootfs/bin/iwlist b/initramfs/uclib-rootfs/bin/iwlist new file mode 100755 index 00000000..de811e46 Binary files /dev/null and b/initramfs/uclib-rootfs/bin/iwlist differ diff --git a/initramfs/uclib-rootfs/bin/iwpriv b/initramfs/uclib-rootfs/bin/iwpriv new file mode 100755 index 00000000..73f711db Binary files /dev/null and b/initramfs/uclib-rootfs/bin/iwpriv differ diff --git a/initramfs/uclib-rootfs/bin/iwspy b/initramfs/uclib-rootfs/bin/iwspy new file mode 100755 index 00000000..48ff6db1 Binary files /dev/null and b/initramfs/uclib-rootfs/bin/iwspy differ diff --git a/initramfs/uclib-rootfs/bin/ldconfig b/initramfs/uclib-rootfs/bin/ldconfig new file mode 100755 index 00000000..71ea4b7c Binary files /dev/null and b/initramfs/uclib-rootfs/bin/ldconfig differ diff --git a/initramfs/uclib-rootfs/bin/mconf b/initramfs/uclib-rootfs/bin/mconf new file mode 100755 index 00000000..e561c8fc Binary files /dev/null and b/initramfs/uclib-rootfs/bin/mconf differ diff --git a/initramfs/uclib-rootfs/lib/ld-uClibc-0.9.28.so b/initramfs/uclib-rootfs/lib/ld-uClibc-0.9.28.so deleted file mode 100755 index 889f3615..00000000 Binary files a/initramfs/uclib-rootfs/lib/ld-uClibc-0.9.28.so and /dev/null differ diff --git a/initramfs/uclib-rootfs/lib/ld-uClibc.so.0 b/initramfs/uclib-rootfs/lib/ld-uClibc.so.0 index 3623e0b3..506add80 120000 --- a/initramfs/uclib-rootfs/lib/ld-uClibc.so.0 +++ b/initramfs/uclib-rootfs/lib/ld-uClibc.so.0 @@ -1 +1 @@ -ld-uClibc-0.9.28.so \ No newline at end of file +ld-uClibc-0.9.30.so \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libc.so.0 b/initramfs/uclib-rootfs/lib/libc.so.0 index 0e18fae4..d690506a 120000 --- a/initramfs/uclib-rootfs/lib/libc.so.0 +++ b/initramfs/uclib-rootfs/lib/libc.so.0 @@ -1 +1 @@ -libuClibc-0.9.28.so \ No newline at end of file +libuClibc-0.9.30.so \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libcrypt-0.9.28.so b/initramfs/uclib-rootfs/lib/libcrypt-0.9.28.so deleted file mode 100755 index edbc96be..00000000 Binary files a/initramfs/uclib-rootfs/lib/libcrypt-0.9.28.so and /dev/null differ diff --git a/initramfs/uclib-rootfs/lib/libcrypt.so.0 b/initramfs/uclib-rootfs/lib/libcrypt.so.0 index ae5864eb..b4c75335 120000 --- a/initramfs/uclib-rootfs/lib/libcrypt.so.0 +++ b/initramfs/uclib-rootfs/lib/libcrypt.so.0 @@ -1 +1 @@ -libcrypt-0.9.28.so \ No newline at end of file +libcrypt-0.9.30.so \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libdl-0.9.28.so b/initramfs/uclib-rootfs/lib/libdl-0.9.28.so deleted file mode 100755 index 6906a2fa..00000000 Binary files a/initramfs/uclib-rootfs/lib/libdl-0.9.28.so and /dev/null differ diff --git a/initramfs/uclib-rootfs/lib/libdl.so.0 b/initramfs/uclib-rootfs/lib/libdl.so.0 index d45f274c..7b405257 120000 --- a/initramfs/uclib-rootfs/lib/libdl.so.0 +++ b/initramfs/uclib-rootfs/lib/libdl.so.0 @@ -1 +1 @@ -libdl-0.9.28.so \ No newline at end of file +libdl-0.9.30.so \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libm-0.9.28.so b/initramfs/uclib-rootfs/lib/libm-0.9.28.so deleted file mode 100755 index 1e90e992..00000000 Binary files a/initramfs/uclib-rootfs/lib/libm-0.9.28.so and /dev/null differ diff --git a/initramfs/uclib-rootfs/lib/libm.so.0 b/initramfs/uclib-rootfs/lib/libm.so.0 index 71ebff23..9ade3c69 120000 --- a/initramfs/uclib-rootfs/lib/libm.so.0 +++ b/initramfs/uclib-rootfs/lib/libm.so.0 @@ -1 +1 @@ -libm-0.9.28.so \ No newline at end of file +libm-0.9.30.so \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libnsl-0.9.28.so b/initramfs/uclib-rootfs/lib/libnsl-0.9.28.so deleted file mode 100755 index 321b2216..00000000 Binary files a/initramfs/uclib-rootfs/lib/libnsl-0.9.28.so and /dev/null differ diff --git a/initramfs/uclib-rootfs/lib/libnsl.so.0 b/initramfs/uclib-rootfs/lib/libnsl.so.0 index 87de9200..5484f666 120000 --- a/initramfs/uclib-rootfs/lib/libnsl.so.0 +++ b/initramfs/uclib-rootfs/lib/libnsl.so.0 @@ -1 +1 @@ -libnsl-0.9.28.so \ No newline at end of file +libnsl-0.9.30.so \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libpthread-0.9.28.so b/initramfs/uclib-rootfs/lib/libpthread-0.9.28.so deleted file mode 100755 index 63be90aa..00000000 Binary files a/initramfs/uclib-rootfs/lib/libpthread-0.9.28.so and /dev/null differ diff --git a/initramfs/uclib-rootfs/lib/libpthread.so.0 b/initramfs/uclib-rootfs/lib/libpthread.so.0 index af26f0a7..6d884a2a 120000 --- a/initramfs/uclib-rootfs/lib/libpthread.so.0 +++ b/initramfs/uclib-rootfs/lib/libpthread.so.0 @@ -1 +1 @@ -libpthread-0.9.28.so \ No newline at end of file +libpthread-0.9.30.so \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libresolv-0.9.28.so b/initramfs/uclib-rootfs/lib/libresolv-0.9.28.so deleted file mode 100755 index 5d19420d..00000000 Binary files a/initramfs/uclib-rootfs/lib/libresolv-0.9.28.so and /dev/null differ diff --git a/initramfs/uclib-rootfs/lib/libresolv.so.0 b/initramfs/uclib-rootfs/lib/libresolv.so.0 index e27a8035..293fd57d 120000 --- a/initramfs/uclib-rootfs/lib/libresolv.so.0 +++ b/initramfs/uclib-rootfs/lib/libresolv.so.0 @@ -1 +1 @@ -libresolv-0.9.28.so \ No newline at end of file +libresolv-0.9.30.so \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/librt-0.9.28.so b/initramfs/uclib-rootfs/lib/librt-0.9.28.so deleted file mode 100755 index bb28da87..00000000 Binary files a/initramfs/uclib-rootfs/lib/librt-0.9.28.so and /dev/null differ diff --git a/initramfs/uclib-rootfs/lib/librt.so.0 b/initramfs/uclib-rootfs/lib/librt.so.0 index a61ce16a..6d698cfb 120000 --- a/initramfs/uclib-rootfs/lib/librt.so.0 +++ b/initramfs/uclib-rootfs/lib/librt.so.0 @@ -1 +1 @@ -librt-0.9.28.so \ No newline at end of file +librt-0.9.30.so \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libthread_db-0.9.28.so b/initramfs/uclib-rootfs/lib/libthread_db-0.9.28.so deleted file mode 100755 index ff500f5d..00000000 Binary files a/initramfs/uclib-rootfs/lib/libthread_db-0.9.28.so and /dev/null differ diff --git a/initramfs/uclib-rootfs/lib/libthread_db.so.1 b/initramfs/uclib-rootfs/lib/libthread_db.so.1 index e766fc1e..36b0c5cd 120000 --- a/initramfs/uclib-rootfs/lib/libthread_db.so.1 +++ b/initramfs/uclib-rootfs/lib/libthread_db.so.1 @@ -1 +1 @@ -libthread_db-0.9.28.so \ No newline at end of file +libthread_db-0.9.30.so \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libuClibc-0.9.28.so b/initramfs/uclib-rootfs/lib/libuClibc-0.9.28.so deleted file mode 100755 index 6179c1c1..00000000 Binary files a/initramfs/uclib-rootfs/lib/libuClibc-0.9.28.so and /dev/null differ diff --git a/initramfs/uclib-rootfs/lib/libutil-0.9.28.so b/initramfs/uclib-rootfs/lib/libutil-0.9.28.so deleted file mode 100755 index b6946b14..00000000 Binary files a/initramfs/uclib-rootfs/lib/libutil-0.9.28.so and /dev/null differ diff --git a/initramfs/uclib-rootfs/lib/libutil.so.0 b/initramfs/uclib-rootfs/lib/libutil.so.0 index 25065fbd..474c3d6c 120000 --- a/initramfs/uclib-rootfs/lib/libutil.so.0 +++ b/initramfs/uclib-rootfs/lib/libutil.so.0 @@ -1 +1 @@ -libutil-0.9.28.so \ No newline at end of file +libutil-0.9.30.so \ No newline at end of file diff --git a/initramfs/uclib-rootfs/usr/bin/getent b/initramfs/uclib-rootfs/usr/bin/getent index acb01403..30d515b7 100755 --- a/initramfs/uclib-rootfs/usr/bin/getent +++ b/initramfs/uclib-rootfs/usr/bin/getent @@ -1,67 +1,43 @@ #!/bin/sh # $Header: /var/cvs/uClibc/extra/scripts/getent,v 1.2 2005/02/02 14:18:01 solar Exp $ +# +# Closely (not perfectly) emulate the behavior of glibc's getent utility +# +#passwd|shadow|group|aliases|hosts|networks|ethers|netgroup|protocols|services|rpc +# only returns the first match (by design) +# dns based search is not supported (hosts,networks) +# case-insensitive matches not supported (ethers; others?) +# may return false-positives (hosts,protocols,rpc,services,ethers) -search_entry() { - if [ -e "$1" ] ; then - /bin/egrep -v "^#" $1 | /bin/sed 's/#.*$//' | /bin/egrep "${string}" | /bin/sed -n 1p - retval=$? - [ "$retval" = 0 ] || retval=2 - else - retval=2 - fi -} - -if [ -z "$1" ] ; then - echo "getent: wrong number of arguments" 1>&2 - exit 1 -fi +export PATH="${PATH}:/bin:/usr/bin" file="/etc/$1" -string="dummy" +case $1 in + passwd|group) + match="^$2:\|^[^:]*:[^:]*:$2:" ;; + shadow) + match="^$2:" ;; + networks|netgroup) + match="^[[:space:]]*$2\>" ;; + hosts|protocols|rpc|services|ethers) + match="\<$2\>" ;; + aliases) + match="^[[:space:]]*$2[[:space:]]*:" ;; + ""|-h|--help) + echo "USAGE: $0 database [key]" + exit 0 ;; + *) + echo "$0: Unknown database: $1" 1>&2 + exit 1 ;; +esac if [ ! -f "$file" ] ; then - echo "Unknown database: $1" 1>&2 - exit 1 + echo "$0: Could not find database file for $1" 1>&2 + exit 1 fi -#aliases|ethers|group|hosts|netgroup|networks|passwd|protocols|rpc|services|shadow) -# dns based search is not supported for hosts|networks -# ethers|netgroup (not done, needed)? -# it returns only the first match -case $1 in - passwd) - string="(^\<$2\>:|^.*:.*:\<$2\>:.*:.*:.*:.*)" - ;; - group) - string="(^|:)\<$2\>:" - ;; - shadow) - string="^\<$2\>:" - ;; - aliases) - if [ -f /etc/postfix/aliases ] ; then - file="/etc/postfix/aliases" - elif [ -f /etc/mail/aliases ] ; then - file="/etc/mail/aliases" - fi - string="^\<$2\>:" - ;; - networks) - string="^\<$2\>" - ;; - hosts|protocols|rpc|services) - string="\<$2\>" - ;; - *) - echo "Unknown database: $1" - exit 1 - ;; -esac - -if [ -z "$2" ] ; then - exec cat $file +if [ $# -eq 1 ] ; then + exec cat "$file" else - search_entry "$file" "$2" + sed "s/#.*//; /$match/q; d" "$file" | grep . || exit 2 fi - -exit $retval diff --git a/initramfs/uclib-rootfs/usr/bin/ldd b/initramfs/uclib-rootfs/usr/bin/ldd index 4e3291de..f018ad28 100755 Binary files a/initramfs/uclib-rootfs/usr/bin/ldd and b/initramfs/uclib-rootfs/usr/bin/ldd differ diff --git a/initramfs/uclib-rootfs/usr/bin/strace b/initramfs/uclib-rootfs/usr/bin/strace index 240f120f..3aec0598 100755 Binary files a/initramfs/uclib-rootfs/usr/bin/strace and b/initramfs/uclib-rootfs/usr/bin/strace differ diff --git a/initramfs/uclib-rootfs/usr/sbin/kexec b/initramfs/uclib-rootfs/usr/sbin/kexec index 4a3948be..efa61454 100755 Binary files a/initramfs/uclib-rootfs/usr/sbin/kexec and b/initramfs/uclib-rootfs/usr/sbin/kexec differ -- cgit v1.2.3-55-g7522