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

19 files changed, 140 insertions, 220 deletions

diff --git a/Config.in b/Config.in
index 15a72120b..c36987e00 100644
--- a/Config.in
+++ b/Config.in
@@ -44,6 +44,7 @@ config ADK_DEVELSYSTEM
 	select BUSYBOX_TEE
 	select BUSYBOX_WGET
 	select BUSYBOX_YES
+	select BUSYBOX_TRUE
 	select ADK_PACKAGE_BASH
 	select ADK_PACKAGE_BINUTILS
 	select ADK_PACKAGE_BZIP2
diff --git a/mk/build.mk b/mk/build.mk
index f33fd5ad2..9530da61d 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -18,7 +18,6 @@ DEFCONFIG=		ADK_DEVELSYSTEM=n \
 			ADK_FORCE_PARALLEL=n \
 			ADK_PACKAGE_BZR=n \
 			ADK_PACKAGE_GRUB=n \
-			ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \
 			ADK_PACKAGE_AUFS2_UTIL=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_MGETTY=n \
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 970037f08..54e62d6b1 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -45,6 +45,8 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--with-system-png \
 			--with-system-nss \
 			--with-system-nspr \
+			--with-libIDL-prefix=${STAGING_DIR}/usr \
+			--with-glib-prefix=${STAGING_DIR}/usr \
 			--enable-libxul \
 			--disable-tests \
 			--disable-static \
diff --git a/package/git/Makefile b/package/git/Makefile
index a3c9a8fd6..162cc13ab 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.7.1
+PKG_VERSION:=		1.7.2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d2fefae2b787a19601c09d89975ce5fb
+PKG_MD5SUM:=		13fc44363df744a401552e73e5476351
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		scm
 PKG_DEPENDS:=		libopenssl libcurl libexpat libpthread
@@ -18,8 +18,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 \
-			NO_CROSS_DIRECTORY_HARDLINKS=1 \
+MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \
 			CURLDIR=${STAGING_DIR} EXPATDIR=${STAGING_DIR}
 XAKE_FLAGS+=		uname_S=Linux uname_O=GNU/Linux
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
index 6f3b70e98..dcfd4dd82 100644
--- a/package/git/patches/patch-Makefile
+++ b/package/git/patches/patch-Makefile
@@ -1,26 +1,6 @@
---- git-1.6.5.5.orig/Makefile	2009-12-06 04:51:25.000000000 +0100
-+++ git-1.6.5.5/Makefile	2009-12-07 20:13:40.753866786 +0100
-@@ -218,8 +218,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de
- 
- # CFLAGS and LDFLAGS are for the users to override from the command line.
- 
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
-+CFLAGS ?= -g -O2 -Wall
-+LDFLAGS ?=
- ALL_CFLAGS = $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
-@@ -241,7 +241,7 @@ bindir_relative = bin
- bindir = $(prefix)/$(bindir_relative)
- mandir = share/man
- infodir = share/info
--gitexecdir = libexec/git-core
-+gitexecdir = sbin/git-core
- sharedir = $(prefix)/share
- template_dir = share/git-core/templates
- htmldir = share/doc/git-doc
-@@ -1417,7 +1417,6 @@ builtin-help.o: builtin-help.c common-cm
+--- git-1.7.2.1.orig/Makefile	2010-07-28 19:03:43.000000000 +0200
++++ git-1.7.2.1/Makefile	2010-07-30 12:25:52.000000000 +0200
+@@ -1594,7 +1594,6 @@ builtin/help.s builtin/help.o: EXTRA_CPP
  
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
@@ -28,11 +8,31 @@
  	ln -s git$X $@ 2>/dev/null || \
  	cp git$X $@
  
-@@ -1749,7 +1748,6 @@ endif
+@@ -1894,7 +1893,6 @@ git-http-push$X: revision.o http.o http-
+ 
+ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
+ 	$(QUIET_LNCP)$(RM) $@ && \
+-	ln $< $@ 2>/dev/null || \
+ 	ln -s $< $@ 2>/dev/null || \
+ 	cp $< $@
+ 
+@@ -2077,18 +2075,16 @@ endif
+ 	{ test "$$bindir/" = "$$execdir/" || \
+ 		{ $(RM) "$$execdir/git$X" && \
+ 		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+-		ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
++		ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
  		cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
- 	{ for p in $(BUILT_INS); do \
+ 	for p in $(BUILT_INS); do \
  		$(RM) "$$execdir/$$p" && \
 -		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
  		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
- 	  done; } && \
+ 	done && \
+ 	remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
+ 	for p in $$remote_curl_aliases; do \
+ 		$(RM) "$$execdir/$$p" && \
+-		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ 		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
+ 	done && \
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index a1ce89161..174690c7b 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gpsd
-PKG_VERSION:=		2.92
+PKG_VERSION:=		2.95
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		50b60d9f6dd51e001f4dfbaeb825c988
+PKG_MD5SUM:=		12535a9ed9fecf9ea2c5bdc9840da5ae
 PKG_DESCR:=		An interface daemon for GPS receivers
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libpthread
@@ -15,12 +15,12 @@ PKG_CXX:=		GPSD
 PKG_SITES:=		http://download.berlios.de/gpsd/
 PKG_URL:=		http://gpsd.berlios.de/
 
-PKG_DESCR_1:=		GPS client utilities
+PKG_DESCR_CLIENTS:=	GPS client utilities
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENTS},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		EGREP="grep -E" \
 			CPP="$(TARGET_CC) -E" \
@@ -41,7 +41,7 @@ TLDFLAGS+=		-shared -pthread
 endif
 
 post-extract:
-	@find ${WRKBUILD} -name *.rej -exec rm {} \;
+	#@find ${WRKBUILD} -name *.rej -exec rm {} \;
 
 ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y)
 # add workaround because libtool tries to link libstdc++
@@ -52,7 +52,7 @@ endif
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GPSD}/usr/lib ${IDIR_GPSD}/usr/sbin
-	${CP} ${WRKINST}/usr/lib/libgps.so.* ${IDIR_GPSD}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgps.so* ${IDIR_GPSD}/usr/lib
 	${CP} ${WRKINST}/usr/sbin/gpsd ${IDIR_GPSD}/usr/sbin
 	${INSTALL_DIR} ${IDIR_GPSD_CLIENTS}/usr/bin
 	${CP} ${WRKINST}/usr/bin/{cgps,gpxlogger} \
diff --git a/package/gpsd/patches/patch-Makefile_in b/package/gpsd/patches/patch-Makefile_in
index fe57b879b..bd45358ee 100644
--- a/package/gpsd/patches/patch-Makefile_in
+++ b/package/gpsd/patches/patch-Makefile_in
@@ -1,44 +1,13 @@
---- gpsd-2.92.orig/Makefile.in	2010-03-03 14:49:11.000000000 +0100
-+++ gpsd-2.92/Makefile.in	2010-04-03 10:33:48.782836143 +0200
-@@ -615,8 +615,6 @@ libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIB
- #
- # Build Python binding
- #
--@HAVE_PYTHON_TRUE@PYEXTENSIONS = gpspacket.so gpslib.so
--@HAVE_PYTHON_TRUE@noinst_SCRIPTS = gpspacket.so gpslib.so setup.py
- @LIBGPSMM_ENABLE_FALSE@TESTBINS = test_float test_trig test_bits test_packet test_geoid \
- @LIBGPSMM_ENABLE_FALSE@	test_mkgmtime test_json
+--- gpsd-2.95.orig/Makefile.in	2010-07-14 00:48:24.000000000 +0200
++++ gpsd-2.95/Makefile.in	2010-07-30 13:04:19.000000000 +0200
+@@ -612,8 +612,8 @@ libgps_la_SOURCES = $(libgps_c_sources) 
+ libgpsd_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \
+ 				driver_rtcm2.h packet_states.h
  
-@@ -1946,32 +1944,6 @@ maskdump.c: gpsd.h-tail maskaudit.py
- 	$(PYTHON) maskaudit.py -c >maskdump.c && \
- 	chmod a-w maskdump.c
- 
--# Multiple-outputs hack.  See
--# http://www.gnu.org/software/automake/manual/automake.html#Multiple-Outputs
--@HAVE_PYTHON_TRUE@$(PYEXTENSIONS): stamp-python-modules
--@HAVE_PYTHON_TRUE@	+@WITNESS=stamp-python-modules; $(MULTIOUT_RECOVER_DELETED)
--# TODO:  Should the dependency on libgps.la be enforced inside
--# setup.py?  (See the variable 'needed_files' in setup.py.)
--@HAVE_PYTHON_TRUE@stamp-python-modules: gpspacket.c gpsclient.c libgps.la setup.py
--@HAVE_PYTHON_TRUE@	@rm -f '$@' '$@.tmp'
--@HAVE_PYTHON_TRUE@	@echo 'timestamp for $@' > '$@.tmp'
--@HAVE_PYTHON_TRUE@	(cd '$(srcdir)' && \
--@HAVE_PYTHON_TRUE@	env abs_builddir='$(abs_builddir)' \
--@HAVE_PYTHON_TRUE@	    MAKE='$(MAKE)' \
--@HAVE_PYTHON_TRUE@		$(PYTHON) setup.py build_ext \
--@HAVE_PYTHON_TRUE@			--build-lib '$(srcdir)' \
--@HAVE_PYTHON_TRUE@			--build-temp '$(srcdir)/build' \
--@HAVE_PYTHON_TRUE@			--include-dirs '$(srcdir):.'\
--@HAVE_PYTHON_TRUE@			--mangenerator '$(MANGENERATOR)') && \
--@HAVE_PYTHON_TRUE@	mv -f '$@.tmp' '$@'
--
--# Clean up after Python
--@HAVE_PYTHON_TRUE@clean-local:
--@HAVE_PYTHON_TRUE@	rm -rf build
--
--# Install Python modules
--@HAVE_PYTHON_TRUE@install-exec-local:
--@HAVE_PYTHON_TRUE@	$(PYTHON) setup.py install --prefix=${prefix} # --root=$(DESTDIR)
- 
- @HAVE_XSLT_PROCESSOR_TRUE@.xml.1:
- @HAVE_XSLT_PROCESSOR_TRUE@	$(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<
+-@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
+-@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
++@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = $(SHELL) ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
++@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = $(SHELL) ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
+ nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i
+ libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD)
+ libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la
diff --git a/package/gpsd/patches/patch-gps_1 b/package/gpsd/patches/patch-gps_1
deleted file mode 100644
index 23b1b8763..000000000
--- a/package/gpsd/patches/patch-gps_1
+++ /dev/null
@@ -1,17 +0,0 @@
---- gpsd-2.92.orig/gps.1	2010-03-01 06:00:44.000000000 +0100
-+++ gpsd-2.92/gps.1	2010-04-03 10:22:50.111390920 +0200
-@@ -2,12 +2,12 @@
- .\"     Title: gps
- .\"    Author: [see the "AUTHORS" section]
- .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
--.\"      Date: 03/01/2010
-+.\"      Date: 04/03/2010
- .\"    Manual: [FIXME: manual]
- .\"    Source: [FIXME: source]
- .\"  Language: English
- .\"
--.TH "GPS" "1" "03/01/2010" "[FIXME: source]" "[FIXME: manual]"
-+.TH "GPS" "1" "04/03/2010" "[FIXME: source]" "[FIXME: manual]"
- .\" -----------------------------------------------------------------
- .\" * set default formatting
- .\" -----------------------------------------------------------------
diff --git a/package/gpsd/patches/patch-gpsd_config_h b/package/gpsd/patches/patch-gpsd_config_h
deleted file mode 100644
index dbc0c7b12..000000000
--- a/package/gpsd/patches/patch-gpsd_config_h
+++ /dev/null
@@ -1,42 +0,0 @@
---- gpsd-2.92.orig/gpsd_config.h	2010-03-03 01:58:01.000000000 +0100
-+++ gpsd-2.92/gpsd_config.h	2010-04-03 10:22:22.423474030 +0200
-@@ -117,7 +117,7 @@
- #define HAVE_PYTHON_H 1
- 
- /* Define to 1 if you have the `round' function. */
--/* #undef HAVE_ROUND */
-+#define HAVE_ROUND 1
- 
- /* Define to 1 if you have the `setlocale' function. */
- #define HAVE_SETLOCALE 1
-@@ -141,7 +141,7 @@
- /* #undef HAVE_STRLCPY */
- 
- /* Define to 1 if you have the `strtonum' function. */
--/* #undef HAVE_STRTONUM */
-+#define HAVE_STRTONUM 1
- 
- /* Define to 1 if `struct tm' is a member of `tm_zone'. */
- #define HAVE_STRUCT_TM_TM_ZONE 1
-@@ -206,10 +206,10 @@
- #define HAVE_VSNPRINTF 1
- 
- /* Define to 1 if you have the <X11/xpm.h> header file. */
--#define HAVE_X11_XPM_H 1
-+/* #undef HAVE_X11_XPM_H */
- 
- /* Xpm available */
--#define HAVE_XPM 1
-+/* #undef HAVE_XPM */
- 
- /* Define to 1 if you have the <xpm.h> header file. */
- /* #undef HAVE_XPM_H */
-@@ -309,7 +309,7 @@
- #define SIZEOF_INT 4
- 
- /* The size of `long', as computed by sizeof. */
--#define SIZEOF_LONG 8
-+#define SIZEOF_LONG 4
- 
- /* The size of `long long', as computed by sizeof. */
- #define SIZEOF_LONG_LONG 8
diff --git a/package/gpsd/patches/patch-gpsd_h b/package/gpsd/patches/patch-gpsd_h
deleted file mode 100644
index 86912eac7..000000000
--- a/package/gpsd/patches/patch-gpsd_h
+++ /dev/null
@@ -1,42 +0,0 @@
---- gpsd-2.92.orig/gpsd.h	2010-03-03 01:58:01.000000000 +0100
-+++ gpsd-2.92/gpsd.h	2010-04-03 10:22:22.793473137 +0200
-@@ -137,7 +137,7 @@
- #define HAVE_PYTHON_H 1
- 
- /* Define to 1 if you have the `round' function. */
--/* #undef HAVE_ROUND */
-+#define HAVE_ROUND 1
- 
- /* Define to 1 if you have the `setlocale' function. */
- #define HAVE_SETLOCALE 1
-@@ -161,7 +161,7 @@
- /* #undef HAVE_STRLCPY */
- 
- /* Define to 1 if you have the `strtonum' function. */
--/* #undef HAVE_STRTONUM */
-+#define HAVE_STRTONUM 1
- 
- /* Define to 1 if `struct tm' is a member of `tm_zone'. */
- #define HAVE_STRUCT_TM_TM_ZONE 1
-@@ -226,10 +226,10 @@
- #define HAVE_VSNPRINTF 1
- 
- /* Define to 1 if you have the <X11/xpm.h> header file. */
--#define HAVE_X11_XPM_H 1
-+/* #undef HAVE_X11_XPM_H */
- 
- /* Xpm available */
--#define HAVE_XPM 1
-+/* #undef HAVE_XPM */
- 
- /* Define to 1 if you have the <xpm.h> header file. */
- /* #undef HAVE_XPM_H */
-@@ -329,7 +329,7 @@
- #define SIZEOF_INT 4
- 
- /* The size of `long', as computed by sizeof. */
--#define SIZEOF_LONG 8
-+#define SIZEOF_LONG 4
- 
- /* The size of `long long', as computed by sizeof. */
- #define SIZEOF_LONG_LONG 8
diff --git a/package/gpsd/patches/patch-revision_h b/package/gpsd/patches/patch-revision_h
deleted file mode 100644
index 98151f235..000000000
--- a/package/gpsd/patches/patch-revision_h
+++ /dev/null
@@ -1,5 +0,0 @@
---- gpsd-2.92.orig/revision.h	2010-03-03 14:49:28.000000000 +0100
-+++ gpsd-2.92/revision.h	2010-04-03 10:22:22.843473239 +0200
-@@ -1 +1 @@
--#define REVISION "svn7020"
-+#define REVISION "svnexported"
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index d043decca..dbf2e3c05 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtool
-PKG_VERSION:=		2.2.8
+PKG_VERSION:=		2.2.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		cad2a7188242bc8dbab0645532ae3d6f
+PKG_MD5SUM:=		b745d220e88163fcd9eea0a90ccf21b0
 PKG_DESCR:=		a generic dynamic object loading library
 PKG_SECTION:=		lang
 PKG_URL:=		http://www.gnu.org/software/libtool
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index ab9215be6..410c4e1e4 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		lynx
 PKG_VERSION=		2.8.7
 PKG_RELEASE=		1
-PKG_MD5SUM=		124253e635f7c76bdffc47b9d036c812
+PKG_MD5SUM=		e36d70f3f09b2d502055ca67f09e363c
 PKG_DESCR:=		Standard text browser
 PKG_SECTION:=		browser
 PKG_DEPENDS:=		libncurses libopenssl zlib
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index 1c61d1a01..aad04ff2b 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,6 +1,53 @@
 --- mysql-5.1.48.orig/configure	2010-06-03 17:54:47.000000000 +0200
-+++ mysql-5.1.48/configure	2010-07-12 22:51:24.267118950 +0200
-@@ -48273,197 +48273,14 @@ $as_echo "$as_me: error: unknown endiann
++++ mysql-5.1.48/configure	2010-07-30 11:04:50.000000000 +0200
+@@ -19825,45 +19825,7 @@ fi
+ $as_echo_n "checking \"how to check if pid exists\"... " >&6; }
+ PS=$ac_cv_path_PS
+ # Linux style
+-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
+-then
+-  FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-# Solaris
+-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-# BSD style
+-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-# SysV style
+-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-# Do anybody use this?
+-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-else
+-  case $SYSTEM_TYPE in
+-    *freebsd*|*dragonfly*)
+-      FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-      ;;
+-    *darwin*)
+-      FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-      ;;
+-    *cygwin*)
+-      FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-      ;;
+-    *netware*)
+-      FIND_PROC=
+-      ;;
+-    *)
+-      { { $as_echo "$as_me:$LINENO: error: Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual." >&5
+-$as_echo "$as_me: error: Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual." >&2;}
+-   { (exit 1); exit 1; }; }
+-  esac
+-fi
++FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+ 
+ { $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
+ $as_echo "\"$FIND_PROC\"" >&6; }
+@@ -48273,197 +48235,14 @@ $as_echo "$as_me: error: unknown endiann
    esac
  
  
@@ -198,7 +245,7 @@
  
    { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
  $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
-@@ -48581,101 +48398,6 @@ fi
+@@ -48581,101 +48360,6 @@ fi
  done
  
  
diff --git a/package/rarpd/patches/patch-Makefile_in b/package/rarpd/patches/patch-Makefile_in
new file mode 100644
index 000000000..58be90d10
--- /dev/null
+++ b/package/rarpd/patches/patch-Makefile_in
@@ -0,0 +1,9 @@
+--- rarpd-1.1.orig/Makefile.in	1999-10-20 22:57:13.000000000 +0200
++++ rarpd-1.1/Makefile.in	2010-07-16 14:34:08.453125000 +0200
+@@ -13,5 +13,5 @@ rarpd: rarpd.o @LIBOBJS@
+ 	$(CC) @LDFLAGS@ -o $@ rarpd.o @LIBOBJS@ @LIBS@
+ 
+ install: rarpd
+-	$(ENSUREDIR)	$(DESTDIR)$(SBINDIR)	755
++	@mkdir -p $(DESTDIR)$(SBINDIR)
+ 	$(INSTALL) 	-c -m 0755 rarpd	$(DESTDIR)$(SBINDIR)
diff --git a/scripts/automake.dep b/scripts/automake.dep
index 13e4e87a9..2cfd5d3ce 100644
--- a/scripts/automake.dep
+++ b/scripts/automake.dep
@@ -9,6 +9,8 @@ configure missing
 aclocal.m4 configure.in
 aclocal.m4 configure.ac
 aclocal.m4 acinclude.m4
+config-h.in configure.in
+config-h.in configure.ac
 config.h.in configure.in
 config.h.in configure.ac
 config.h.in aclocal.m4
@@ -31,3 +33,4 @@ configure.in configure.files
 acinclude.m4 admin/libtool.m4.in
 acinclude.m4 admin/acinclude.m4.in
 acinclude.m4 libltdl/ltdl.m4
+libtoolize.in configure
diff --git a/target/ibmx40/kernel.config b/target/ibmx40/kernel.config
index c3526ecc7..d40b3bdc8 100644
--- a/target/ibmx40/kernel.config
+++ b/target/ibmx40/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Thu May 20 21:14:06 2010
+# Wed Jul 28 23:45:42 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -97,12 +97,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_RD_GZIP is not set
-# CONFIG_RD_BZIP2 is not set
-CONFIG_RD_LZMA=y
-# CONFIG_RD_LZO is not set
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -294,10 +289,7 @@ CONFIG_VM86=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
-CONFIG_MICROCODE=y
-CONFIG_MICROCODE_INTEL=y
-# CONFIG_MICROCODE_AMD is not set
-CONFIG_MICROCODE_OLD_INTERFACE=y
+# CONFIG_MICROCODE is not set
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 # CONFIG_NOHIGHMEM is not set
@@ -491,9 +483,7 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
@@ -730,9 +720,9 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_PS2_ELANTECH is not set
 # CONFIG_MOUSE_PS2_SENTELIC is not set
@@ -764,10 +754,10 @@ CONFIG_SERIO_LIBPS2=y
 #
 CONFIG_VT=y
 # CONFIG_CONSOLE_TRANSLATIONS is not set
-CONFIG_VT_CONSOLE=y
+# CONFIG_VT_CONSOLE is not set
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_DEVKMEM=y
+# CONFIG_DEVKMEM is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_NOZOMI is not set
 
@@ -775,9 +765,9 @@ CONFIG_DEVKMEM=y
 # Serial drivers
 #
 CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_PCI=y
+# CONFIG_SERIAL_8250_PCI is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -786,7 +776,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # Non-8250 serial port support
 #
 CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_TIMBERDALE is not set
 CONFIG_UNIX98_PTYS=y
@@ -950,7 +939,7 @@ CONFIG_RTC_DRV_CMOS=y
 # TI VLYNQ
 #
 # CONFIG_STAGING is not set
-CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_X86_PLATFORM_DEVICES is not set
 
 #
 # Firmware Drivers
@@ -1231,7 +1220,6 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
 # CONFIG_CRC32 is not set
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
-CONFIG_DECOMPRESS_LZMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
diff --git a/target/ibmx40/uclibc.config b/target/ibmx40/uclibc.config
index 5eb214a35..288dc1b77 100644
--- a/target/ibmx40/uclibc.config
+++ b/target/ibmx40/uclibc.config
@@ -109,7 +109,7 @@ UCLIBC_HAS___PROGNAME=y
 UCLIBC_HAS_PTY=y
 ASSUME_DEVPTS=y
 UNIX98PTY_ONLY=y
-# UCLIBC_HAS_GETPT is not set
+UCLIBC_HAS_GETPT=y
 UCLIBC_HAS_TM_EXTENSIONS=y
 UCLIBC_HAS_TZ_CACHING=y
 UCLIBC_HAS_TZ_FILE=y
diff --git a/tools/cpio/src/cpio.c b/tools/cpio/src/cpio.c
index 00f4a16b7..d91f25dc1 100644
--- a/tools/cpio/src/cpio.c
+++ b/tools/cpio/src/cpio.c
@@ -81,7 +81,8 @@ int	sysv3;
 
 #if defined (__linux__) || defined (__sun) || defined (__FreeBSD__) || \
 	defined (__hpux) || defined (_AIX) || defined (__NetBSD__) || \
-	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__)
+	defined (__OpenBSD__) || defined (__DragonFly__) || \
+	defined (__APPLE__) || defined (__CYGWIN__)
 #include <sys/mtio.h>
 #else	/* SVR4.2MP */
 #include <sys/scsi.h>
@@ -4495,7 +4496,8 @@ tseek(off_t n)
 		int	i = (n - poffs) / tapeblock;
 #if defined (__linux__) || defined (__sun) || defined (__FreeBSD__) || \
 	defined (__hpux) || defined (_AIX) || defined (__NetBSD__) || \
-	defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__)
+	defined (__OpenBSD__) || defined (__DragonFly__) || \
+	defined (__APPLE__) || defined (__CYGWIN__)
 		struct mtop	mo;
 		mo.mt_op = i > 0 ? MTFSR : MTBSR;
 		mo.mt_count = i > 0 ? i : -i;
@@ -4735,7 +4737,7 @@ mstat(void)
 		emsg(3, "Error during stat() of archive");
 		done(1);
 	}
-#if defined (__linux__)
+#if defined (__linux__) 
 	if ((mtst.st_mode&S_IFMT) == S_IFCHR) {
 		struct mtget	mg;
 		if (ioctl(mt, MTIOCGET, &mg) == 0)
@@ -4787,6 +4789,13 @@ mstat(void)
 		if (ioctl(mt, MTIOCGET, &mg) == 0)
 			tapeblock = mg.mt_blksiz;
 	}
+#elif defined (__CYGWIN__)
+	if ((mtst.st_mode&S_IFMT) == S_IFCHR) {
+		struct mtget	mg;
+		if (ioctl(mt, MTIOCGET, &mg) == 0)
+			tapeblock = (mg.mt_dsreg&MT_ST_BLKSIZE_MASK) >>
+					MT_ST_BLKSIZE_SHIFT;
+	}
 #elif defined (__hpux) || defined (_AIX)
 #else	/* SVR4.2MP */
 	if ((mtst.st_mode&S_IFMT) == S_IFCHR) {