Merge branch 'master' of git+ssh://openadk.org/git/openadk

35 files changed, 190 insertions, 355 deletions

diff --git a/package/Config.in b/package/Config.in
index 1a5a05ea2..29c32ede3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -552,6 +552,7 @@ source "package/cpufrequtils/Config.in"
 source "package/fbset/Config.in"
 source "package/file/Config.in"
 source "package/findutils/Config.in"
+source "package/grep/Config.in"
 source "package/hdparm/Config.in"
 source "package/usbutils/Config.in"
 source "package/patch/Config.in"
@@ -582,6 +583,8 @@ menu "X server and drivers"
 source "package/xorg-server/Config.in"
 source "package/xf86-video-cirrus/Config.in"
 source "package/xf86-video-geode/Config.in"
+source "package/xf86-video-fbdev/Config.in"
+source "package/xf86-video-siliconmotion/Config.in"
 source "package/xf86-input-mouse/Config.in"
 source "package/xf86-input-keyboard/Config.in"
 source "package/xf86-input-evtouch/Config.in"
diff --git a/package/base-files/src/lib/mdev/init b/package/base-files/src/lib/mdev/init
index d2ae13e9c..de368c80c 100644
--- a/package/base-files/src/lib/mdev/init
+++ b/package/base-files/src/lib/mdev/init
@@ -1,9 +1,4 @@
 #!/bin/sh
-if [ "$ACTION" == "add" ];then
-        if [ "$DEVPATH" == "/bus/usb" ];then
-                mount -t usbfs usbfs /proc/bus/usb
-        fi
-fi
 if [ "$SUBSYSTEM" == "firmware" ];then
         logger "Firmware load for $FIRMWARE requested"
         if [ "$ACTION" == "add" ];then
diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate
index bc1082b1c..8a97495ed 100755
--- a/package/base-files/src/sbin/adkupdate
+++ b/package/base-files/src/sbin/adkupdate
@@ -23,7 +23,9 @@ check_exit() {
 
 prepare() {
 	cd /
-	umount -f /etc
+	if [ -x /sbin/cfgfs ];then
+		umount -f /etc
+	fi
 	mount -o remount,rw /
 	if [ "$system" == "RB532" ];then
 		mount -t yaffs2 /dev/mtdblock0 /boot
@@ -77,7 +79,9 @@ case $1 in
 esac
 
 sync
-mount -o bind /etc /tmp/.cfgfs/root
+if [ -x /sbin/cfgfs ];then
+	mount -o bind /etc /tmp/.cfgfs/root
+fi
 if [ "$system" == "RB532" ];then
 	umount -f /boot
 elif [ "$system" == "FOXG20" ];then
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index ba2e5f557..1a1e0f4d5 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -182,7 +182,8 @@ config BUSYBOX_FEATURE_FIND_CONTEXT
 
 config BUSYBOX_GREP
 	bool "grep"
-	default y
+	default y if !ADK_PACKAGE_GREP
+	depends on !ADK_PACKAGE_GREP
 	help
 	  grep is used to search files for a specified pattern.
 
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index 01020bde9..5951e8dec 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -283,6 +283,7 @@ config BUSYBOX_HD
 
 config BUSYBOX_HWCLOCK
 	bool "hwclock"
+	default y if ADK_TARGET_WITH_RTC
 	default n
 	help
 	  The hwclock utility is used to read and set the hardware clock
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index 4d8973482..f4efcccf5 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cryptsetup
-PKG_VERSION:=		1.1.0
+PKG_VERSION:=		1.0.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8177f1833f4d6aaacc5812046d2010b6
+PKG_MD5SUM:=		5eea2a77391a8a1a651b31cbaef59e22
 PKG_DESCR:=		LUKS cryptsetup tools
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt \
diff --git a/package/cryptsetup/patches/patch-Makefile_in b/package/cryptsetup/patches/patch-Makefile_in
deleted file mode 100644
index 828b25c11..000000000
--- a/package/cryptsetup/patches/patch-Makefile_in
+++ /dev/null
@@ -1,58 +0,0 @@
---- cryptsetup-1.1.0.orig/Makefile.in	2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/Makefile.in	2010-02-16 20:32:36.876861682 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -323,7 +323,7 @@ distclean-libtool:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -348,7 +348,7 @@ $(RECURSIVE_TARGETS):
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -512,7 +512,8 @@ distdir: $(DISTFILES)
- 	  fi; \
- 	done
- 	-test -n "$(am__skip_mode_fix)" \
--	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	|| find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -556,17 +557,17 @@ dist dist-all: distdir
- distcheck: dist
- 	case '$(DIST_ARCHIVES)' in \
- 	*.tar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
--	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- 	*.tar.lzma*) \
--	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- 	*.tar.xz*) \
- 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- 	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- 	*.shar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac
diff --git a/package/cryptsetup/patches/patch-configure b/package/cryptsetup/patches/patch-configure
deleted file mode 100644
index be8bf3375..000000000
--- a/package/cryptsetup/patches/patch-configure
+++ /dev/null
@@ -1,175 +0,0 @@
---- cryptsetup-1.1.0.orig/configure	2010-01-17 11:29:24.000000000 +0100
-+++ cryptsetup-1.1.0/configure	2010-02-16 20:32:36.868858986 +0100
-@@ -894,7 +894,6 @@ enable_nls
- enable_rpath
- with_libiconv_prefix
- with_libintl_prefix
--enable_shared_library
- enable_selinux
- with_plain_hash
- with_plain_cipher
-@@ -1543,7 +1542,7 @@ Optional Features:
-   --disable-largefile     omit support for large files
-   --disable-nls           do not use Native Language Support
-   --disable-rpath         do not hardcode runtime library paths
--  --disable-shared-library
-+  --disable-shared
-                           disable building of shared cryptsetup library
-   --disable-selinux       disable selinux support [default=auto]
- 
-@@ -5966,13 +5965,13 @@ if test "${lt_cv_nm_interface+set}" = se
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:5969: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:5968: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:5972: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:5971: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:5975: output\"" >&5)
-+  (eval echo "\"\$as_me:5974: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -7177,7 +7176,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 7180 "configure"' > conftest.$ac_ext
-+  echo '#line 7179 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -8409,11 +8408,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8412: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8411: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8416: \$? = $ac_status" >&5
-+   echo "$as_me:8415: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -8748,11 +8747,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8751: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8750: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8755: \$? = $ac_status" >&5
-+   echo "$as_me:8754: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -8853,11 +8852,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8856: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8855: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:8860: \$? = $ac_status" >&5
-+   echo "$as_me:8859: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -8908,11 +8907,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8911: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8910: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:8915: \$? = $ac_status" >&5
-+   echo "$as_me:8914: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -11292,7 +11291,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11295 "configure"
-+#line 11294 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11388,7 +11387,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11391 "configure"
-+#line 11390 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -14409,14 +14408,14 @@ POPT_LIBS=$LIBS
- LIBS=$saved_LIBS
- 
- 
--# Check whether --enable-shared-library was given.
--if test "${enable_shared_library+set}" = set; then :
--  enableval=$enable_shared_library;
-+# Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then :
-+  enableval=$enable_shared;
- else
--  enable_shared_library=yes
-+  enable_shared=yes
- fi
- 
-- if test x$enable_shared_library = xno; then
-+ if test x$enable_shared = xno; then
-   STATIC_LIBRARY_TRUE=
-   STATIC_LIBRARY_FALSE='#'
- else
-@@ -14619,7 +14618,7 @@ _ACEOF
- 
- fi
- 
--	if test x$enable_static = xyes; then
-+	if test x$enable_static_cryptsetup = xyes; then
- 		SELINUX_STATIC_LIBS=$LIBS
- 		# Check if we need -pthread with --enable-static and selinux
- 		saved_LIBS2=$LIBS
-@@ -14684,7 +14683,7 @@ fi
- 	fi
- fi
- 
--if test x$enable_static = xyes; then
-+if test x$enable_static_cryptsetup = xyes; then
- 	saved_LIBS2=$LIBS
- 	LIBS="$LIBS -static"
- 	# Check if it there is still not some missing dependency like static selinux libs
-@@ -14916,7 +14915,7 @@ fi
- 
- 
- 
-- if test x$enable_static = xyes; then
-+ if test x$enable_static_cryptsetup = xyes; then
-   STATIC_CRYPTSETUP_TRUE=
-   STATIC_CRYPTSETUP_FALSE='#'
- else
-@@ -14924,7 +14923,7 @@ else
-   STATIC_CRYPTSETUP_FALSE=
- fi
- 
-- if test x$enable_static = xno; then
-+ if test x$enable_static_cryptsetup = xno; then
-   DYNAMIC_CRYPTSETUP_TRUE=
-   DYNAMIC_CRYPTSETUP_FALSE='#'
- else
diff --git a/package/cryptsetup/patches/patch-configure_in b/package/cryptsetup/patches/patch-configure_in
deleted file mode 100644
index 6d88412f5..000000000
--- a/package/cryptsetup/patches/patch-configure_in
+++ /dev/null
@@ -1,47 +0,0 @@
---- cryptsetup-1.1.0.orig/configure.in	2010-01-17 11:26:31.000000000 +0100
-+++ cryptsetup-1.1.0/configure.in	2010-02-16 20:32:36.868858986 +0100
-@@ -62,11 +62,11 @@ LIBS=$saved_LIBS
- 
- dnl ==========================================================================
- 
--AC_ARG_ENABLE(shared-library,
--[  --disable-shared-library
-+AC_ARG_ENABLE(shared,
-+[  --disable-shared
-                           disable building of shared cryptsetup library],,
--enable_shared_library=yes)
--AM_CONDITIONAL(STATIC_LIBRARY, test x$enable_shared_library = xno)
-+enable_shared=yes)
-+AM_CONDITIONAL(STATIC_LIBRARY, test x$enable_shared = xno)
- 
- AC_ARG_ENABLE(selinux,
- [  --disable-selinux       disable selinux support [[default=auto]]],[], [])
-@@ -80,7 +80,7 @@ LIBS=$saved_LIBS
- if test "x$enable_selinux" != xno; then
- 	AC_CHECK_LIB(sepol, sepol_bool_set)
- 	AC_CHECK_LIB(selinux, is_selinux_enabled)
--	if test x$enable_static = xyes; then
-+	if test x$enable_static_cryptsetup = xyes; then
- 		SELINUX_STATIC_LIBS=$LIBS
- 		# Check if we need -pthread with --enable-static and selinux
- 		saved_LIBS2=$LIBS
-@@ -91,7 +91,7 @@ if test "x$enable_selinux" != xno; then
- 	fi
- fi
- 
--if test x$enable_static = xyes; then
-+if test x$enable_static_cryptsetup = xyes; then
- 	saved_LIBS2=$LIBS
- 	LIBS="$LIBS -static"
- 	# Check if it there is still not some missing dependency like static selinux libs
-@@ -135,8 +135,8 @@ CS_NUM_WITH([luks1-keybits],[key length 
- 
- dnl ==========================================================================
- 
--AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static = xyes)
--AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static = xno)
-+AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static_cryptsetup = xyes)
-+AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static_cryptsetup = xno)
- 
- dnl ==========================================================================
- 
diff --git a/package/cryptsetup/patches/patch-lib_Makefile_in b/package/cryptsetup/patches/patch-lib_Makefile_in
deleted file mode 100644
index 812950459..000000000
--- a/package/cryptsetup/patches/patch-lib_Makefile_in
+++ /dev/null
@@ -1,8 +0,0 @@
---- cryptsetup-1.1.0.orig/lib/Makefile.in	2010-01-17 11:29:22.000000000 +0100
-+++ cryptsetup-1.1.0/lib/Makefile.in	2010-02-16 20:32:36.872861451 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-lib_setup_c b/package/cryptsetup/patches/patch-lib_setup_c
new file mode 100644
index 000000000..97b356f68
--- /dev/null
+++ b/package/cryptsetup/patches/patch-lib_setup_c
@@ -0,0 +1,17 @@
+already added in svn upstream
+--- cryptsetup-1.0.7.orig/lib/setup.c	2009-07-22 13:12:44.000000000 +0200
++++ cryptsetup-1.0.7/lib/setup.c	2009-08-22 15:10:32.000000000 +0200
+@@ -542,7 +542,12 @@ static int __crypt_luks_open(int arg, st
+ start:
+ 	mk=NULL;
+ 
+-	if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
++	if(options->passphrase) {
++		passwordLen = strlen(options->passphrase);
++		password = safe_alloc(passwordLen + 1);
++		strncpy(password, options->passphrase, passwordLen + 1);
++		tries = 0;
++	} else if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
+ 		tries--;
+ 	else
+ 		tries = 0;
diff --git a/package/cryptsetup/patches/patch-luks_Makefile_in b/package/cryptsetup/patches/patch-luks_Makefile_in
deleted file mode 100644
index 208b1f396..000000000
--- a/package/cryptsetup/patches/patch-luks_Makefile_in
+++ /dev/null
@@ -1,8 +0,0 @@
---- cryptsetup-1.1.0.orig/luks/Makefile.in	2010-01-17 11:29:22.000000000 +0100
-+++ cryptsetup-1.1.0/luks/Makefile.in	2010-02-16 20:32:36.876861682 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-man_Makefile_in b/package/cryptsetup/patches/patch-man_Makefile_in
deleted file mode 100644
index 66fdcb7cf..000000000
--- a/package/cryptsetup/patches/patch-man_Makefile_in
+++ /dev/null
@@ -1,8 +0,0 @@
---- cryptsetup-1.1.0.orig/man/Makefile.in	2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/man/Makefile.in	2010-02-16 20:32:36.880860794 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-src_Makefile_in b/package/cryptsetup/patches/patch-src_Makefile_in
deleted file mode 100644
index 6c0b0096f..000000000
--- a/package/cryptsetup/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,8 +0,0 @@
---- cryptsetup-1.1.0.orig/src/Makefile.in	2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/src/Makefile.in	2010-02-16 20:32:36.880860794 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-tests_Makefile_in b/package/cryptsetup/patches/patch-tests_Makefile_in
deleted file mode 100644
index 30e05580d..000000000
--- a/package/cryptsetup/patches/patch-tests_Makefile_in
+++ /dev/null
@@ -1,8 +0,0 @@
---- cryptsetup-1.1.0.orig/tests/Makefile.in	2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/tests/Makefile.in	2010-02-16 20:32:36.888860137 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index b2d0c6014..a555a5db6 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		elinks
 PKG_VERSION:=		0.11.7
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		145c510cae41c204d0f23dce4bdd23ab
 PKG_DESCR:=		advanced text web browser
 PKG_SECTION:=		text
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--enable-small \
 			--without-spidermonkey \
 			--without-x \
 			--without-zlib
-MAKE_FLAGS+=		CC='${TARGET_CC}' LD='${TARGET_LD}'
+MAKE_FLAGS+=		CC='${TARGET_CC}'
 
 do-install:
 	${INSTALL_DIR} ${IDIR_ELINKS}/usr/bin
diff --git a/package/elinks/patches/patch-Makefile_lib b/package/elinks/patches/patch-Makefile_lib
new file mode 100644
index 000000000..122e6c13d
--- /dev/null
+++ b/package/elinks/patches/patch-Makefile_lib
@@ -0,0 +1,11 @@
+--- elinks-0.11.7.orig/Makefile.lib	2009-08-22 13:15:08.000000000 +0200
++++ elinks-0.11.7/Makefile.lib	2010-03-06 11:28:58.000000000 +0100
+@@ -43,7 +43,7 @@ quiet_cmd_compile = '      [$(CC_COLOR)C
+ 
+ # Rule to compile a set of .o files into one .o file
+ quiet_cmd_ld_objs = "      [$(LD_COLOR)LD$(END_COLOR)]   $(RELPATH)$@"
+-      cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^) \
++      cmd_ld_objs = $(CC) -Wl,-r -nostdlib -o $@ $(filter $(OBJS), $^) \
+       		    $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \
+ 			    `test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`)
+ 
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 2c6b18a65..0a1bee2dd 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		77e15a92006ddc2adbb06f840d591c0e
 PKG_DESCR:=		fontconfig
 PKG_SECTION:=		libs
+PKG_DEPENDS:=		libxml2
+PKG_BUILDDEP+=		freetype libxml2
 PKG_URL:=		http://fontconfig.org
 PKG_SITES:=		http://fontconfig.org/release/
 
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 3c6e0b701..4de63c4f7 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -11,15 +11,15 @@ PKG_DEPENDS:=		libgmp mpfr
 PKG_BUILDDEP+=		gmp mpfr
 
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-PKG_DEPENDS:=		uclibc-dev
+PKG_DEPENDS+=		uclibc-dev
 PKG_BUILDDEP+=		uclibc
 endif
 ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
-PKG_DEPENDS:=		eglibc-dev
+PKG_DEPENDS+=		eglibc-dev
 PKG_BUILDDEP+=		eglibc
 endif
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
-PKG_DEPENDS:=		glibc-dev
+PKG_DEPENDS+=		glibc-dev
 PKG_BUILDDEP+=		glibc
 endif
 
diff --git a/package/grep/Makefile b/package/grep/Makefile
new file mode 100644
index 000000000..6f2eba00e
--- /dev/null
+++ b/package/grep/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		grep
+PKG_VERSION:=		2.5.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		92258031d98d4f12dfc6a6d24057e672
+PKG_DESCR:=		global search for a regular expression and print out matched lines
+PKG_SECTION:=		text
+PKG_URL:=		http://www.gnu.org/software/grep/
+PKG_SITES:=		ftp://ftp.gnu.org/gnu/grep/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GREP,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_GREP)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/grep \
+		$(IDIR_GREP)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index 03a06ab75..c9e990ab2 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		0a1e129b1d8b2d3905dc02a64255b781
 PKG_DESCR:=		X FreeType library
 PKG_SECTION:=		x11
+PKG_BUILDDEP+=		libXrender
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile
index 9fe0cd9ef..3b4e9a2b0 100644
--- a/package/libpciaccess/Makefile
+++ b/package/libpciaccess/Makefile
@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libpciaccess
-PKG_VERSION:=		0.10.9
+PKG_VERSION:=		0.11.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5dad6221c2766d5a727ef32e83a0a878
+PKG_MD5SUM:=		8f7ea197384e5ddd1c355f55e639f677
 PKG_DESCR:=		X.org libpciaccess library
 PKG_SECTION:=		x11
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/lib/
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile
index d10c06083..ce41c1d1d 100644
--- a/package/libusb-compat/Makefile
+++ b/package/libusb-compat/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libusb-compat
-PKG_VERSION:=		0.1.1
+PKG_VERSION:=		0.1.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		32c775b97da7a11c6be7c487a0c9fc00
-PKG_DESCR:=		a Library for accessing Linux USB devices
+PKG_MD5SUM:=		570ac2ea085b80d1f74ddc7c6a93c0eb
+PKG_DESCR:=		a library for accessing Linux USB devices
 PKG_SECTION:=		libs
 PKG_BUILDDEP+=		libusb
 PKG_URL:=		http://libusb.wiki.sourceforge.net
diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index a5dec2885..8b68fdb79 100644
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libusb
-PKG_VERSION:=		1.0.3
+PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		03af26d0c49705fa46c1f732e1018e73
+PKG_MD5SUM:=		818c7c02112a53e0c182666ee83f2057
 PKG_DESCR:=		a library for accessing Linux USB devices
 PKG_SECTION:=		libs
 PKG_URL:=		http://libusb.wiki.sourceforge.net
diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index 30e632b5f..ab54b4b09 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		0005c9a89c381484e2d2ff450b3dfe5e
 PKG_DESCR:=		mp3 console player
 PKG_SECTION:=		sound
-PKG_DEPENDS:=		libpthread alsa-lib
+PKG_DEPENDS:=		libpthread alsa-lib libltdl
 PKG_BUILDDEP+=		alsa-lib
 PKG_URL:=		http://www.mpg123.de/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=mpg123/}
@@ -22,7 +22,9 @@ $(eval $(call PKG_template,MPG123,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PK
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_MPG123)/usr/bin $(IDIR_MPG123)/usr/lib
+	$(INSTALL_DIR) $(IDIR_MPG123)/usr/lib/mpg123
 	$(CP) $(WRKINST)/usr/lib/libmpg123.so* $(IDIR_MPG123)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/mpg123/*.so $(IDIR_MPG123)/usr/lib/mpg123
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/mpg123 \
 		$(IDIR_MPG123)/usr/bin
 
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index a5a612bac..71e6190d8 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -17,7 +17,7 @@ PKG_BUILDDEP+=		libX11 libXv libpng libXext
 PKG_URL:=		http://www.mplayerhq.hu
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu shuttle
+PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu shuttle lemote
 
 include ${TOPDIR}/mk/package.mk
 
@@ -25,6 +25,8 @@ $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P
 
 CONFIG_STYLE:=		manual
 
+FAKE_FLAGS+=		INSTALLSTRIP=''
+
 ifeq (${ADK_LINUX_X86_ALIX1C},y)
 CONFIGURE_CPU_OPTS:=	\
 			--disable-ssse3 \
diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure
new file mode 100644
index 000000000..dcebb8645
--- /dev/null
+++ b/package/mplayer/patches/patch-configure
@@ -0,0 +1,11 @@
+--- mplayer-1.0-29987.orig/configure	2009-12-10 13:18:20.000000000 +0100
++++ mplayer-1.0-29987/configure	2010-03-06 12:52:36.000000000 +0100
+@@ -2266,7 +2266,7 @@ EOF
+     _optimizing="$proc"
+     ;;
+ 
+-  mips)
++  mips|mips64|mipsel|mips64el)
+     _arch='SGI_MIPS'
+     _target_arch='ARCH_SGI_MIPS = yes'
+     iproc='sgi-mips'
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
index f6918ad68..626c9bf54 100644
--- a/package/rxvt-unicode/Makefile
+++ b/package/rxvt-unicode/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		49bb52c99e002bf85eb41d8385d903b5
 PKG_DESCR:=		x-term with unicode support
 PKG_SECTION:=		x11
-PKG_DEPENDS:=		libx11 fontconfig libxft
-PKG_BUILDDEP+=		libX11 fontconfig libXft
+PKG_DEPENDS:=		libx11 fontconfig libxft libxml2
+PKG_BUILDDEP+=		libX11 fontconfig libXft libxml2
 PKG_URL:=		http://software.schmorp.de/pkg/rxvt-unicode.html
 PKG_SITES:=		http://dist.schmorp.de/rxvt-unicode/
 
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 8d8cba862..d5d5d21ee 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		usbutils
-PKG_VERSION:=		0.73
+PKG_VERSION:=		0.86
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		88978b4ad891f610620b1b8e5e0f43eb
+PKG_MD5SUM:=		34979f675d2bcb3e1b45012fa830a53f
 PKG_DESCR:=		A program to list USB devices
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libusb libusb-compat libpthread
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index 0b66eea6e..5ed7240d7 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP+=		xorg-server
 PKG_DEPENDS:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_TARGET_DEPENDS:=	alix1c
+PKG_TARGET_DEPENDS:=	alix1c lemote
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index 4755fedc1..959a2a071 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP+=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_TARGET_DEPENDS:=	alix1c
+PKG_TARGET_DEPENDS:=	alix1c lemote
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
new file mode 100644
index 000000000..43e20a7ee
--- /dev/null
+++ b/package/xf86-video-fbdev/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xf86-video-fbdev
+PKG_VERSION:=		0.4.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c297e40b93b3636a72189cfac43d1a87
+PKG_DESCR:=		X11 driver for Linux Framebuffer devices
+PKG_SECTION:=		x11
+PKG_DEPENDS:=		xorg-server
+PKG_BUILDDEP+=		xorg-server
+PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_VIDEO_FBDEV,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_XF86_VIDEO_FBDEV}/usr/lib/xorg/modules/drivers
+	${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/fbdev_*.so \
+		${IDIR_XF86_VIDEO_FBDEV}/usr/lib/xorg/modules/drivers/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
new file mode 100644
index 000000000..b9847902b
--- /dev/null
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xf86-video-siliconmotion
+PKG_VERSION:=		1.7.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		39da891cd368960443613e7a61398216
+PKG_DESCR:=		X11 driver for Silicon Motion VGA chips
+PKG_SECTION:=		x11
+PKG_DEPENDS:=		xorg-server
+PKG_BUILDDEP+=		xorg-server
+PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
+
+PKG_TARGET_DEPENDS:=	lemote
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_VIDEO_SILICONMOTION,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_XF86_VIDEO_SILICONMOTION}/usr/lib/xorg/modules/drivers
+	${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/siliconmotion_*.so \
+		${IDIR_XF86_VIDEO_SILICONMOTION}/usr/lib/xorg/modules/drivers/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 35b7597a6..977710c4f 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xorg-server
-PKG_VERSION:=		1.7.1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		913a672cbd6da516de15965d594e20b9
+PKG_VERSION:=		1.7.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		866917789c71e7616a016ad256fe9b8f
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11
 PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile \
@@ -18,7 +18,7 @@ PKG_BUILDDEP+=		libX11 randrproto renderproto fixesproto damageproto \
 			compositeproto evieext libxkbfile libXfont pixman \
 			libpciaccess openssl xf86dgaproto
 PKG_URL:=		http://www.x.org
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/xserver/
 
 CFLINE_XORG_SERVER:=	depends on ADK_TARGET_WITH_VGA
 
@@ -32,6 +32,7 @@ CONFIGURE_ARGS+=	\
 			--enable-dga \
 			--enable-xorg \
 			--enable-xv \
+			--enable-xaa \
 			--disable-aiglx \
 			--disable-config-hal \
 			--disable-dpms \
@@ -56,6 +57,7 @@ CONFIGURE_ARGS+=	\
 			--with-vendor-web="http://openadk.org"
 
 post-install:
+	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
@@ -72,5 +74,7 @@ post-install:
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
 	${CP} ${WRKINST}/usr/lib/xorg/modules/multimedia/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
+	-$(CP) $(TOPDIR)/target/$(ADK_TARGET)/xorg.conf \
+		$(IDIR_XORG_SERVER)/etc/X11
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
new file mode 100644
index 000000000..d28b1e4e4
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
@@ -0,0 +1,25 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/os-support/linux/lnx_video.c	2010-02-16 01:24:23.000000000 +0100
++++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c	2010-03-07 16:38:06.000000000 +0100
+@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL;
+ Bool
+ xf86EnableIO(void)
+ {
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__mips__)
+ 	int fd;
+ 	unsigned int ioBase_phys;
+ #endif
+@@ -537,6 +537,13 @@ xf86EnableIO(void)
+ 	ioperm(0x40,4,0); /* trap access to the timer chip */
+ 	ioperm(0x60,4,0); /* trap access to the keyboard controller */
+ # endif
++#else
++	fd = open("/dev/mem", O_RDWR);
++	if (IOPortBase == NULL) {
++		IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
++			PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0x1fd00000);
++	}
++	close(fd);
+ #endif
+ 	ExtendedEnabled = TRUE;
+