From d47b08c6ced262abc697994f69f42474ce3dec67 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 4 Mar 2010 20:29:45 +0100
Subject: remove unavailable wconfig target

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9959e3169..3b2d8850f 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ help:
 	@echo '  menuconfig   - Update current config utilising a menu based program'
 	@echo '                 (default when .config does not exist)'
 	@echo '  oldconfig    - Update current config utilising a provided .configs base'
-	@echo '  wconfig      - Same as "oldconfig", but also writes out hidden symbols'
 	@echo '  allmodconfig - New config selecting all packages as modules when possible'
 	@echo '  allconfig    - New config selecting all packages when possible'
 	@echo '  allnoconfig  - New config where all options are answered with no'
@@ -86,9 +85,6 @@ config: .prereq_done
 oldconfig: .prereq_done
 	@${GMAKE_INV} _config W=-o
 
-wconfig: .prereq_done
-	@${GMAKE_INV} _config W=-A
-
 download: .prereq_done
 	@${GMAKE_INV} toolchain/download
 	@${GMAKE_INV} package/download
-- 
cgit v1.2.3


From aede4f8126893a334d9b7e7b11a15af9975af385 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 5 Mar 2010 18:52:14 +0100
Subject: convert mips64 to mips

---
 target/native/target.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/native/target.mk b/target/native/target.mk
index 5667e46e4..c4eb94ace 100644
--- a/target/native/target.mk
+++ b/target/native/target.mk
@@ -1,4 +1,4 @@
-ARCH:=			$(shell uname -m|sed -e "s/i.*86/x86/" -e "s/_64//")
+ARCH:=			$(shell uname -m|sed -e "s/i.*86/x86/" -e "s/_\?64//")
 CPU_ARCH:=		$(shell uname -m)
 KERNEL_VERSION:=	2.6.33
 KERNEL_RELEASE:=	1
-- 
cgit v1.2.3


From ddfe23a76e812cf0953e0de8c376434ba2653938 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:14:10 +0100
Subject: update to latest upstream version

---
 package/subversion/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index fcae1474c..3af2bc6da 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		subversion
-PKG_VERSION:=		1.6.6
+PKG_VERSION:=		1.6.9
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0ab0f26f6eb056add1b9d3059a3f4247
+PKG_MD5SUM:=		facaa0ee78c8f24b9af12c74662bbd24
 PKG_DESCR:=		revision control program
 PKG_SECTION:=		scm
 PKG_DEPENDS:=		zlib apr apr-util libiconv libexpat libsqlite
@@ -50,7 +50,7 @@ INSTALL_TARGET:=	external-install local-install
 
 post-install:
 	${INSTALL_DIR} ${IDIR_SUBVERSION}/usr/{bin,lib}
-	${CP} ${WRKINST}/usr/bin/* ${IDIR_SUBVERSION}/usr/bin
-	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_SUBVERSION}/usr/lib
+	${INSTALL_BIN} ${WRKINST}/usr/bin/svn ${IDIR_SUBVERSION}/usr/bin
+	${CP} ${WRKINST}/usr/lib/libsvn*.so* ${IDIR_SUBVERSION}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From d473eb51590f4c4329f0a36f332f666fb67a9e2c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:14:17 +0100
Subject: update to latest upstream version

---
 package/tor/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/tor/Makefile b/package/tor/Makefile
index 414d50a30..b6e1fc093 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tor
-PKG_VERSION:=		0.2.1.20
+PKG_VERSION:=		0.2.1.24
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0d62ee2332fdd95de43debac7435df19
+PKG_MD5SUM:=		cb5629b2709ada82d34c22fef3ed77a9
 PKG_DESCR:=		An anonymous Internet communication system
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libevent libopenssl zlib libpthread
-- 
cgit v1.2.3


From 75c61241ed8a6792bbc246696b412960d1a155ca Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:14:23 +0100
Subject: update to latest upstream version

---
 package/readline/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/readline/Makefile b/package/readline/Makefile
index 644a87271..542f72d9a 100644
--- a/package/readline/Makefile
+++ b/package/readline/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		readline
-PKG_VERSION:=		5.2
+PKG_VERSION:=		6.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e39331f32ad14009b9ff49cc10c5e751
+PKG_MD5SUM:=		fc2f7e714fe792db1ce6ddc4c9fb4ef3
 PKG_DESCR:=		Command line editing library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libncurses
@@ -21,8 +21,8 @@ CONFIGURE_ARGS+= 	--with-curses
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBREADLINE}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libhistory.so.* ${IDIR_LIBREADLINE}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/libreadline.so.* ${IDIR_LIBREADLINE}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libhistory.so* ${IDIR_LIBREADLINE}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libreadline.so* ${IDIR_LIBREADLINE}/usr/lib/
 	chmod u+w ${IDIR_LIBREADLINE}/usr/lib/*
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 367a7215c9b12d60d54a29863b0083fe7fcc8967 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:14:34 +0100
Subject: update to latest beta upstream version

---
 package/moc/Makefile                |  6 +++---
 package/moc/patches/patch-configure | 12 ++++++------
 package/moc/patches/patch-options_c | 11 +++++++++++
 3 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 package/moc/patches/patch-options_c

diff --git a/package/moc/Makefile b/package/moc/Makefile
index 3aa1a16f7..77cd7cf7c 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		moc
-PKG_VERSION:=		2.4.4
+PKG_VERSION:=		2.5.0-alpha4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		647c770a5542a4ae5437386807a89796
+PKG_MD5SUM:=		2dd0cb6481d77fda09c58ec3154a21c0
 PKG_DESCR:=		console music player
 PKG_SECTION:=		sound
 PKG_DEPENDS:=		libmad libvorbis libcurl libflac ffmpeg libiconv
@@ -14,7 +14,7 @@ PKG_DEPENDS+=		libncurses libid3tag
 PKG_BUILDDEP+=		ncurses libvorbis curl libmad flac ffmpeg libiconv
 PKG_BUILDDEP+=		libid3tag
 PKG_URL:=		http://moc.daper.net
-PKG_SITES:=		ftp://ftp.daper.net/pub/soft/moc/stable/
+PKG_SITES:=		ftp://ftp.daper.net/pub/soft/moc/unstable/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/moc/patches/patch-configure b/package/moc/patches/patch-configure
index 0968574d6..2330e0f4c 100644
--- a/package/moc/patches/patch-configure
+++ b/package/moc/patches/patch-configure
@@ -1,6 +1,6 @@
---- moc-2.4.4.orig/configure	2009-01-04 09:28:51.000000000 +0100
-+++ moc-2.4.4/configure	2010-02-06 01:22:38.464334671 +0100
-@@ -13910,7 +13910,7 @@ DECODER_PLUGIN_DIR=decoder_plugins
+--- moc-2.5.0-alpha4.orig/configure	2009-09-25 10:54:41.000000000 +0200
++++ moc-2.5.0-alpha4/configure	2010-03-06 11:37:45.867276809 +0100
+@@ -17669,7 +17669,7 @@ DECODER_PLUGIN_DIR=decoder_plugins
  PLUGIN_LDFLAGS='-module -avoid-version'
  
  
@@ -9,12 +9,12 @@
  
  case "$OS" in
  	Linux)
-@@ -13929,7 +13929,7 @@ _ACEOF
+@@ -17688,7 +17688,7 @@ _ACEOF
  		;;
  esac
  
 -LDFLAGS="$LDFLAGS -export-dynamic"
 +LDFLAGS="$LDFLAGS"
  
- { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
diff --git a/package/moc/patches/patch-options_c b/package/moc/patches/patch-options_c
new file mode 100644
index 000000000..b5e9ca676
--- /dev/null
+++ b/package/moc/patches/patch-options_c
@@ -0,0 +1,11 @@
+--- moc-2.5.0-alpha4.orig/options.c	2009-09-16 12:04:53.000000000 +0200
++++ moc-2.5.0-alpha4/options.c	2010-03-06 11:38:50.596035001 +0100
+@@ -327,7 +327,7 @@ static void option_add_symb (const char 
+ 		char *val = va_arg (va, char *);
+ 		if (strlen (val) == 0 ||
+ 		    strlen (val) != strspn (val, valid) ||
+-		    index (first, val[0]) != NULL)
++		    strchr (first, val[0]) != NULL)
+ 			fatal ("Invalid symbol in '%s' constraint list.", name);
+ 		((char **) options[pos].constraints)[ix] = xstrdup (val);
+ 		if (!strcasecmp (val, value))
-- 
cgit v1.2.3


From 3c0992625fa3a54ce1f26f4b2cec8581c60758b2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:15:00 +0100
Subject: update to latest upstream version, make a new subpackage for
 libdevmapper

---
 package/lvm/Makefile                        | 20 ++++++++------
 package/lvm/patches/patch-Makefile_in       | 12 ++++----
 package/lvm/patches/patch-doc_Makefile_in   | 13 ---------
 package/lvm/patches/patch-libdm_Makefile_in | 43 ++++++++---------------------
 package/lvm/patches/patch-tools_Makefile_in | 37 +++++++++++--------------
 5 files changed, 46 insertions(+), 79 deletions(-)
 delete mode 100644 package/lvm/patches/patch-doc_Makefile_in

diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index d67bbc43e..5013b1645 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -4,16 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		lvm
-PKG_VERSION:=		2.02.51
+PKG_VERSION:=		2.02.61
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		725d07794007e021bfc592b1636100c7
+PKG_MD5SUM:=		0fdac768c78d96525d47b5a3df4c67de
 PKG_DESCR:=		logical volume management
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		device-mapper libncurses
+PKG_DEPENDS:=		libdevmapper libncurses
 PKG_URL:=		http://sourceware.org/lvm2/
 PKG_SITES:=		ftp://sources.redhat.com/pub/lvm2/
 
-PKG_DESCR_DM:=		device-mapper library and utility
+PKG_DESCR_DM:=		device-mapper utility
+PKG_DESCR_LIBDM:=	device-mapper library
 DISTFILES:=		LVM2.${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/LVM2.${PKG_VERSION}
 
@@ -21,6 +22,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_DM},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIBDM},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--with-user="" --with-group="" \
 			--with-optimisation="" \
@@ -30,12 +32,14 @@ post-install:
 	# lvm
 	${INSTALL_DIR} ${IDIR_LVM}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm ${IDIR_LVM}/usr/sbin/lvm
-	# device-mapper
-	${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${IDIR_DEVICE_MAPPER}/usr/lib
+	# libdevmapper
+	${INSTALL_DIR} ${IDIR_LIBDEVMAPPER}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
-		${IDIR_DEVICE_MAPPER}/usr/lib
+		${IDIR_LIBDEVMAPPER}/usr/lib
+	chmod u+w ${IDIR_LIBDEVMAPPER}/usr/lib/*.so*
+	# device-mapper
+	${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \
 		${IDIR_DEVICE_MAPPER}/usr/sbin
-	chmod u+w ${IDIR_DEVICE_MAPPER}/usr/lib/*.so*
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in
index d0e22571f..fd15b0060 100644
--- a/package/lvm/patches/patch-Makefile_in
+++ b/package/lvm/patches/patch-Makefile_in
@@ -1,15 +1,15 @@
---- LVM2.2.02.51.orig/Makefile.in	2009-07-31 13:49:53.000000000 +0200
-+++ LVM2.2.02.51/Makefile.in	2009-08-22 15:24:06.000000000 +0200
-@@ -16,7 +16,7 @@ srcdir = @srcdir@
- top_srcdir = @top_srcdir@
+--- LVM2.2.02.61.orig/Makefile.in	2009-10-02 21:10:31.000000000 +0200
++++ LVM2.2.02.61/Makefile.in	2010-03-03 19:43:58.976123551 +0100
+@@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
+ top_builddir = @top_builddir@
  VPATH = @srcdir@
  
 -SUBDIRS = doc include man scripts
-+SUBDIRS = doc include
++SUBDIRS = include
  
  ifeq ("@UDEV_RULES@", "yes")
    SUBDIRS += udev
-@@ -60,7 +60,7 @@ po: tools daemons
+@@ -64,7 +64,7 @@ po: tools daemons
  libdm.device-mapper: include.device-mapper
  daemons.device-mapper: libdm.device-mapper
  tools.device-mapper: libdm.device-mapper
diff --git a/package/lvm/patches/patch-doc_Makefile_in b/package/lvm/patches/patch-doc_Makefile_in
deleted file mode 100644
index 381e0ceea..000000000
--- a/package/lvm/patches/patch-doc_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
-bsd compatibility
---- LVM2.2.02.51.orig/doc/Makefile.in	2009-05-11 12:28:46.000000000 +0200
-+++ LVM2.2.02.51/doc/Makefile.in	2009-08-22 15:24:06.000000000 +0200
-@@ -23,7 +23,8 @@ include $(top_srcdir)/make.tmpl
- install_lvm2:
- 	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
- 		echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
--		@INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
-+		@INSTALL@ -d $(confdir); \
-+		@INSTALL@ $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
- 			$(confdir)/$(CONFDEST); \
- 	fi
- 
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
index 0a7799b33..259f0f9d3 100644
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -1,41 +1,21 @@
-always install static library
---- LVM2.2.02.51.orig/libdm/Makefile.in	Wed Apr  8 16:04:35 2009
-+++ LVM2.2.02.51/libdm/Makefile.in	Mon Feb 15 23:25:01 2010
-@@ -34,9 +34,9 @@ SOURCES =\
- 
- INCLUDES = -I$(interface) -I.
- 
--ifeq ("@STATIC_LINK@", "yes")
-+#ifeq ("@STATIC_LINK@", "yes")
- LIB_STATIC = $(interface)/libdevmapper.a
--endif
-+#endif
- 
- ifeq ("@LIB_SUFFIX@","dylib")
-   LIB_SHARED = $(interface)/libdevmapper.dylib
-@@ -59,9 +59,9 @@ device-mapper: all
- 
- INSTALL_TYPE = install_dynamic
- 
--ifeq ("@STATIC_LINK@", "yes")
-+#ifeq ("@STATIC_LINK@", "yes")
-   INSTALL_TYPE += install_static
--endif
-+#endif
- 
- ifeq ("@PKGCONFIG@", "yes")
-   INSTALL_TYPE += install_pkgconfig
-@@ -72,7 +72,8 @@ install: $(INSTALL_TYPE) install_include
+--- LVM2.2.02.61.orig/libdm/Makefile.in	2009-10-02 21:10:36.000000000 +0200
++++ LVM2.2.02.61/libdm/Makefile.in	2010-03-03 19:48:02.316248648 +0100
+@@ -73,26 +73,32 @@ install: $(INSTALL_TYPE) install_include
  install_device-mapper: install
  
  install_include:
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
 +	$(INSTALL) -d $(includedir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 444 libdevmapper.h \
++	$(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
  		$(includedir)/libdevmapper.h
  
  install_dynamic: install_@interface@
-@@ -83,15 +84,17 @@ install_static: install_@interface@_static
++	$(INSTALL) -d $(libdir)
+ 	$(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) \
+ 		$(libdir)/libdevmapper.$(LIB_SUFFIX)
+ 
+ install_static: install_@interface@_static
++	$(INSTALL) -d $(libdir)
  	$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
  
  install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
@@ -52,6 +32,7 @@ always install static library
  
  install_ioctl_static: ioctl/libdevmapper.a
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -d $(libdir)
 +	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
  		$(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
  
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
index 8d6e49a3f..ae6fcbf8f 100644
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ b/package/lvm/patches/patch-tools_Makefile_in
@@ -1,33 +1,28 @@
---- LVM2.2.02.51.orig/tools/Makefile.in	Thu May 21 13:11:29 2009
-+++ LVM2.2.02.51/tools/Makefile.in	Mon Feb 15 23:30:04 2010
-@@ -137,7 +137,7 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
- 
- .commands: commands.h cmdnames.h Makefile
- 	$(CC) -E -P cmdnames.h 2> /dev/null | \
--		egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
-+		egrep -v '^ *\(|#.*|dumpconfig|formats|help|pvdata|segtypes|version\) *$$' > .commands
- 
- .PHONY: install_cmdlib_dynamic install_cmdlib_static \
- 	install_tools_dynamic install_tools_static
-@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref
+--- LVM2.2.02.61.orig/tools/Makefile.in	2010-01-19 02:10:47.000000000 +0100
++++ LVM2.2.02.61/tools/Makefile.in	2010-03-03 19:46:06.396138753 +0100
+@@ -165,21 +165,26 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r
  endif
  
  install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 +	$(INSTALL) -d $(libdir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
  		$(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
  	$(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
- 	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
++	$(INSTALL) -d $(includedir)
++	$(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
  		$(includedir)/lvm2cmd.h
  
  install_cmdlib_static: liblvm2cmd-static.a
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 +	$(INSTALL) -d $(libdir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
  		$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
  	$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
- 	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
++	$(INSTALL) -d $(includedir)
++	$(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
  		$(includedir)/lvm2cmd.h
  
  install_tools_dynamic: lvm .commands
@@ -37,13 +32,13 @@
  		$(sbindir)/lvm
  	@echo Creating symbolic links for individual commands in $(sbindir)
  	@( \
-@@ -185,14 +188,17 @@ install_tools_dynamic: lvm .commands
+@@ -190,14 +195,17 @@ install_tools_dynamic: lvm .commands
  	)
  
  install_tools_static: lvm.static
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 +	$(INSTALL) -d $(sbindir)
-+	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
++	$(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
  		$(staticdir)/lvm.static
  
  install_dmsetup_dynamic: dmsetup
-- 
cgit v1.2.3


From fd73e3a459d45f4e56f5ce3dc738878c5e6f2eee Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:15:08 +0100
Subject: update to latest upstream version

---
 package/git/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/git/Makefile b/package/git/Makefile
index 4d3b382e3..af3dfae68 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.6.6
+PKG_VERSION:=		1.7.0.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		08af805fd59f68d9ad00a2f878cf820e
+PKG_MD5SUM:=		05485caf5c503ce378a87759bc3a0509
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		scm
 PKG_DEPENDS:=		libopenssl libcurl libexpat
-- 
cgit v1.2.3


From efc42ff5670e43ef03d44f24d19dfa90abe9a8a1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:15:15 +0100
Subject: update to latest upstream version

---
 package/libxml2/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index c6a911370..511663c2b 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -4,16 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libxml2
-PKG_VERSION:=		2.7.3
+PKG_VERSION:=		2.7.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8f4fda3969237c2a33bdb1583b5d06b2
+PKG_MD5SUM:=		7740a8ec23878a2f50120e1faa2730f2
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
 PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.xmlsoft.org/
-PKG_SITES:=		http://xmlsoft.org/sources/ \
-			ftp://fr.rpmfind.net/pub/libxml/
+PKG_SITES:=		http://xmlsoft.org/sources/
 
 include ${TOPDIR}/mk/package.mk
 
-- 
cgit v1.2.3


From 672f632cdc116024b535792bd2ff87e80d3b0c8c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:15:24 +0100
Subject: update to latest upstream version

---
 package/bash/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/bash/Makefile b/package/bash/Makefile
index 82b6c2334..b06ee4991 100644
--- a/package/bash/Makefile
+++ b/package/bash/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		bash
-PKG_VERSION:=		4.0
+PKG_VERSION:=		4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a90a1b5a6db4838483f05438e05e8eb9
+PKG_MD5SUM:=		9800d8724815fd84994d9be65ab5e7b8
 PKG_DESCR:=		Bourne-Again SHell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.gnu.org/software/bash/
-- 
cgit v1.2.3


From 9427b30b394ab907009007aeb415db0f1eeaab03 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:15:44 +0100
Subject: update to latest upstream version

---
 package/asterisk/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index bebd71ef9..595bae027 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		1.6.2.1
+PKG_VERSION:=		1.6.2.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8fbc60f9d80e686c749ae95292e225d8
+PKG_MD5SUM:=		9d1f7bcf6833605ced4b2740d14bd576
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
 PKG_MULTI:=		1
-- 
cgit v1.2.3


From 2ddbe2a9437ae702f8a373438b96d45fe83d77f7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:15:54 +0100
Subject: update to latest upstream version

---
 package/bind/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/bind/Makefile b/package/bind/Makefile
index 70ff2f923..eb6eb46da 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bind
-PKG_VERSION:=		9.6.1-P3
+PKG_VERSION:=		9.7.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a0952d589b3051538033387be4c983f9
+PKG_MD5SUM:=		c245b5d1aa0a4f53d9538faa1efe2c3f
 PKG_DESCR:=		popular DNS server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl libbind libxml2
-- 
cgit v1.2.3


From 77a918bdeb1ed0a175c8a64521685d59e34ca5cd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:16:20 +0100
Subject: update to latest upstream version

---
 package/glib/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 8d1430ea7..4db94344a 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
-PKG_VERSION:=		2.22.2
+PKG_VERSION:=		2.22.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		00eb873975e2ef9361b8177131c7c943
+PKG_MD5SUM:=		e699a93d62c01e0ee07caef3e11eddd8
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		gettext libiconv libpthread
-- 
cgit v1.2.3


From 8945ff70ffcf9f2539d58867c0e2fc25e1c40c7c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:16:24 +0100
Subject: update to latest upstream version

---
 package/srelay/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index b1f772faa..bdda82b64 100644
--- a/package/srelay/Makefile
+++ b/package/srelay/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		srelay
-PKG_VERSION:=		0.4.7b2
+PKG_VERSION:=		0.4.7p3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		73904ecbb5d305135b3e8907ce7d0513
+PKG_MD5SUM:=		214ca8bc476c5e0eab54adb01972be6a
 PKG_DESCR:=		A socks 4/5 proxy server
 PKG_SECTION:=		net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=socks-relay/}
@@ -17,7 +17,6 @@ $(eval $(call PKG_template,SRELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK
 
 INSTALL_STYLE:=		manual
 
-CONFIGURE_ENV+=		ac_cv_lib_nsl_getaddrinfo=no
 CONFIGURE_ARGS+=	--disable-thread \
 			--with-libwrap=no
 
-- 
cgit v1.2.3


From 4c689e33aa487c270ee579ca45259f9c0b31aba8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:16:36 +0100
Subject: update to 2.6.33

---
 target/foxboard/target.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/foxboard/target.mk b/target/foxboard/target.mk
index be0628c10..147affb9c 100644
--- a/target/foxboard/target.mk
+++ b/target/foxboard/target.mk
@@ -1,7 +1,7 @@
 ARCH:=			cris
 CPU_ARCH:=		cris
-KERNEL_VERSION:=	2.6.32
+KERNEL_VERSION:=	2.6.33
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		260551284ac224c3a43c4adac7df4879
+KERNEL_MD5SUM:=		c3883760b18d50e8d78819c54d579b00
 TARGET_OPTIMIZATION:=	-Os -pipe -fno-peephole2
 TARGET_CFLAGS_ARCH:=    -march=v10
-- 
cgit v1.2.3


From b77e7ec282a07a3c3658ca8d1412411123089f0d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:17:24 +0100
Subject: add Config.in.lib for libdevmapper

---
 package/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/Config.in b/package/Config.in
index 68c81aad1..1a5a05ea2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -260,6 +260,7 @@ source "package/libpcap/Config.in"
 source "package/libpcap/Config.in.lib"
 source "package/libpri/Config.in"
 source "package/libpri/Config.in.lib"
+source "package/lvm/Config.in.lib"
 source "package/pango/Config.in"
 source "package/pcre/Config.in"
 source "package/pcre/Config.in.lib"
-- 
cgit v1.2.3


From 5c9f1a29acc910ac258fa6a6927b159ff58da2ff Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:17:37 +0100
Subject: add builddepends

---
 package/cryptinit/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index c9298e15d..b82e67e51 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -6,13 +6,15 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		cryptinit
 PKG_VERSION:=		1.0.2
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		cryptsetup
+PKG_BUILDDEP+=		cryptsetup lvm
 PKG_DESCR:=		init for encrypted rootfilesystem
 PKG_SECTION:=		base
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
+CFLINE_CRYPTINIT:=	depends on ADK_TARGET_ROOTFS_ENCRYPTED
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-- 
cgit v1.2.3


From f5f050a0f19490169c4542d3b8ec64554fc3e3df Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:17:52 +0100
Subject: fix compile

---
 package/setserial/Makefile                  |  2 ++
 package/setserial/patches/patch-setserial_c | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 package/setserial/patches/patch-setserial_c

diff --git a/package/setserial/Makefile b/package/setserial/Makefile
index b106d11a0..e95c9e6b5 100644
--- a/package/setserial/Makefile
+++ b/package/setserial/Makefile
@@ -17,6 +17,8 @@ $(eval $(call PKG_template,SETSERIAL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$
 
 INSTALL_STYLE:=         manual
 
+TCFLAGS+=		-DFIOQSIZE=1
+
 do-install:
 	${INSTALL_DIR} ${IDIR_SETSERIAL}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/setserial ${IDIR_SETSERIAL}/usr/sbin/
diff --git a/package/setserial/patches/patch-setserial_c b/package/setserial/patches/patch-setserial_c
new file mode 100644
index 000000000..ec2cb3c84
--- /dev/null
+++ b/package/setserial/patches/patch-setserial_c
@@ -0,0 +1,10 @@
+--- setserial-2.17.orig/setserial.c	2000-01-27 16:40:52.000000000 +0100
++++ setserial-2.17/setserial.c	2010-03-05 17:42:26.316553683 +0100
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <fcntl.h>
+ #include <termios.h>
+ #include <string.h>
-- 
cgit v1.2.3


From a17cdc17cd44de44013cfe78e32248ef1fee3211 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:18:20 +0100
Subject: move binary to /usr

---
 package/shorewall-common/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile
index bfa99f834..5e311d358 100644
--- a/package/shorewall-common/Makefile
+++ b/package/shorewall-common/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		shorewall-common
 PKG_VERSION:=		4.0.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2df43356b1fdbc91920d48c5595aa101
 PKG_DESCR:=		high-level netfilter configuration tool
 PKG_SECTION:=		net
@@ -17,7 +17,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SHOREWALL,shorewall,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
@@ -41,7 +41,7 @@ endif
 do-install:
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/shorewall
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/share/shorewall
-	${INSTALL_DIR} ${IDIR_SHOREWALL}/sbin
+	${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/etc/shorewall/* \
 		${IDIR_SHOREWALL}/etc/shorewall/
 	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/actions.std \
@@ -66,6 +66,6 @@ do-install:
 		${IDIR_SHOREWALL}/usr/share/shorewall/
 	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/wait4ifup \
 		${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_BIN} ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/sbin
+	${INSTALL_BIN} ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 3f8a11b1340f98a378694f0fb68cbc339aab8223 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 13:18:33 +0100
Subject: fix intermodule dependencies

---
 mk/modules.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mk/modules.mk b/mk/modules.mk
index 5ba6ab1e6..4747a4e16 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -608,6 +608,8 @@ $(eval $(call KMOD_template,MD_RAID456,md-raid456,\
     $(MODULES_DIR)/kernel/crypto/async_tx/async_tx \
     $(MODULES_DIR)/kernel/crypto/async_tx/async_xor \
     $(MODULES_DIR)/kernel/crypto/async_tx/async_memcpy \
+    $(MODULES_DIR)/kernel/drivers/md/raid6_pq \
+    $(MODULES_DIR)/kernel/crypto/async_tx/async_raid6_recov \
     $(MODULES_DIR)/kernel/drivers/md/raid456 \
 ,35))
 
@@ -776,6 +778,7 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\
 ,11))
 
 $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
+    $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \
     $(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \
     $(MODULES_DIR)/kernel/crypto/deflate \
 ,10))
-- 
cgit v1.2.3


From 2dc4319c282f152dbdec9d77ffd6d4381c994bbf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 14:33:25 +0100
Subject: fix compile for mips64

---
 package/elinks/Makefile                   |  4 ++--
 package/elinks/patches/patch-Makefile_lib | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 package/elinks/patches/patch-Makefile_lib

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)`)
+ 
-- 
cgit v1.2.3


From 5474d03f63e63675203198f0369aa2de0e6297ed Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 14:33:35 +0100
Subject: fix compile for mips64

---
 package/mplayer/Makefile                |  4 +++-
 package/mplayer/patches/patch-configure | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 package/mplayer/patches/patch-configure

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'
-- 
cgit v1.2.3


From 68fc4717dfdce3e05cfb82216903d4ae35e42079 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 14:33:56 +0100
Subject: fix build dependencies

---
 package/fontconfig/Makefile | 1 +
 package/libXft/Makefile     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 2c6b18a65..6258cbebf 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		77e15a92006ddc2adbb06f840d591c0e
 PKG_DESCR:=		fontconfig
 PKG_SECTION:=		libs
+PKG_BUILDDEP+=		freetype
 PKG_URL:=		http://fontconfig.org
 PKG_SITES:=		http://fontconfig.org/release/
 
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
-- 
cgit v1.2.3


From 91e92eb1d309488f3bb7b394c8f6660af0c712cc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 14:34:47 +0100
Subject: enable config in /proc

---
 target/lemote/kernel.config | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/target/lemote/kernel.config b/target/lemote/kernel.config
index 29731d812..22e8d01a6 100644
--- a/target/lemote/kernel.config
+++ b/target/lemote/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.33
-# Sun Feb 28 16:36:49 2010
+# Fri Mar  5 18:56:32 2010
 #
 CONFIG_MIPS=y
 
@@ -212,7 +212,8 @@ CONFIG_TREE_RCU=y
 CONFIG_RCU_FANOUT=64
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_GROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
-- 
cgit v1.2.3


From f295a40984c165ae46c0a3fe2ae95b5517885392 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 14:35:26 +0100
Subject: add grep package, busybox grep lacks -w

---
 Config.in                                          |   1 +
 package/Config.in                                  |   1 +
 package/busybox/config/findutils/Config.in         |   3 +-
 package/cryptsetup/Makefile                        |   4 +-
 package/cryptsetup/patches/patch-Makefile_in       |  58 -------
 package/cryptsetup/patches/patch-configure         | 175 ---------------------
 package/cryptsetup/patches/patch-configure_in      |  47 ------
 package/cryptsetup/patches/patch-lib_Makefile_in   |   8 -
 package/cryptsetup/patches/patch-luks_Makefile_in  |   8 -
 package/cryptsetup/patches/patch-man_Makefile_in   |   8 -
 package/cryptsetup/patches/patch-src_Makefile_in   |   8 -
 package/cryptsetup/patches/patch-tests_Makefile_in |   8 -
 package/grep/Makefile                              |  32 ++++
 13 files changed, 38 insertions(+), 323 deletions(-)
 delete mode 100644 package/cryptsetup/patches/patch-Makefile_in
 delete mode 100644 package/cryptsetup/patches/patch-configure
 delete mode 100644 package/cryptsetup/patches/patch-configure_in
 delete mode 100644 package/cryptsetup/patches/patch-lib_Makefile_in
 delete mode 100644 package/cryptsetup/patches/patch-luks_Makefile_in
 delete mode 100644 package/cryptsetup/patches/patch-man_Makefile_in
 delete mode 100644 package/cryptsetup/patches/patch-src_Makefile_in
 delete mode 100644 package/cryptsetup/patches/patch-tests_Makefile_in
 create mode 100644 package/grep/Makefile

diff --git a/Config.in b/Config.in
index e22136582..8b7d40cd6 100644
--- a/Config.in
+++ b/Config.in
@@ -36,6 +36,7 @@ config ADK_DEVELSYSTEM
 	select ADK_PACKAGE_GAWK
 	select ADK_PACKAGE_GCC
 	select ADK_PACKAGE_GIT
+	select ADK_PACKAGE_GREP
 	select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
 	select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
diff --git a/package/Config.in b/package/Config.in
index 68c81aad1..1d5743055 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -551,6 +551,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"
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/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-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/grep/Makefile b/package/grep/Makefile
new file mode 100644
index 000000000..9508508c3
--- /dev/null
+++ b/package/grep/Makefile
@@ -0,0 +1,32 @@
+# 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}))
+
+#CONFIG_STYLE:=		manual
+# use following to add ./configure options
+#CONFIGURE_ARGS+=	--disable-foo
+# overwrite any configure variables
+#CONFIGURE_ENV+=	ac_cv_func_setpgrp_void=yes
+#BUILD_STYLE:=		manual
+#INSTALL_STYLE:=	manual
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_GREP)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/grep \
+		$(IDIR_GREP)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 6cc1a855cd27076816a882dcea78b9ad727c811c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 6 Mar 2010 14:35:40 +0100
Subject: Revert "add grep package, busybox grep lacks -w"

This reverts commit f295a40984c165ae46c0a3fe2ae95b5517885392.
---
 Config.in                                          |   1 -
 package/Config.in                                  |   1 -
 package/busybox/config/findutils/Config.in         |   3 +-
 package/cryptsetup/Makefile                        |   4 +-
 package/cryptsetup/patches/patch-Makefile_in       |  58 +++++++
 package/cryptsetup/patches/patch-configure         | 175 +++++++++++++++++++++
 package/cryptsetup/patches/patch-configure_in      |  47 ++++++
 package/cryptsetup/patches/patch-lib_Makefile_in   |   8 +
 package/cryptsetup/patches/patch-luks_Makefile_in  |   8 +
 package/cryptsetup/patches/patch-man_Makefile_in   |   8 +
 package/cryptsetup/patches/patch-src_Makefile_in   |   8 +
 package/cryptsetup/patches/patch-tests_Makefile_in |   8 +
 package/grep/Makefile                              |  32 ----
 13 files changed, 323 insertions(+), 38 deletions(-)
 create mode 100644 package/cryptsetup/patches/patch-Makefile_in
 create mode 100644 package/cryptsetup/patches/patch-configure
 create mode 100644 package/cryptsetup/patches/patch-configure_in
 create mode 100644 package/cryptsetup/patches/patch-lib_Makefile_in
 create mode 100644 package/cryptsetup/patches/patch-luks_Makefile_in
 create mode 100644 package/cryptsetup/patches/patch-man_Makefile_in
 create mode 100644 package/cryptsetup/patches/patch-src_Makefile_in
 create mode 100644 package/cryptsetup/patches/patch-tests_Makefile_in
 delete mode 100644 package/grep/Makefile

diff --git a/Config.in b/Config.in
index 8b7d40cd6..e22136582 100644
--- a/Config.in
+++ b/Config.in
@@ -36,7 +36,6 @@ config ADK_DEVELSYSTEM
 	select ADK_PACKAGE_GAWK
 	select ADK_PACKAGE_GCC
 	select ADK_PACKAGE_GIT
-	select ADK_PACKAGE_GREP
 	select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
 	select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
diff --git a/package/Config.in b/package/Config.in
index 1d5743055..68c81aad1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -551,7 +551,6 @@ 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"
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index 1a1e0f4d5..ba2e5f557 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -182,8 +182,7 @@ config BUSYBOX_FEATURE_FIND_CONTEXT
 
 config BUSYBOX_GREP
 	bool "grep"
-	default y if !ADK_PACKAGE_GREP
-	depends on !ADK_PACKAGE_GREP
+	default y
 	help
 	  grep is used to search files for a specified pattern.
 
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index f4efcccf5..4d8973482 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cryptsetup
-PKG_VERSION:=		1.0.7
+PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5eea2a77391a8a1a651b31cbaef59e22
+PKG_MD5SUM:=		8177f1833f4d6aaacc5812046d2010b6
 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
new file mode 100644
index 000000000..828b25c11
--- /dev/null
+++ b/package/cryptsetup/patches/patch-Makefile_in
@@ -0,0 +1,58 @@
+--- 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
new file mode 100644
index 000000000..be8bf3375
--- /dev/null
+++ b/package/cryptsetup/patches/patch-configure
@@ -0,0 +1,175 @@
+--- 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 r