From 32dd978df2e0aeb0be1552a7ca8badf63fc78241 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 21:37:07 +0100
Subject: fix scons install path

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

diff --git a/package/scons/Makefile b/package/scons/Makefile
index d379eb8a4..5f2e3b7c3 100644
--- a/package/scons/Makefile
+++ b/package/scons/Makefile
@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		scons
 PKG_VERSION:=		2.3.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		083ce5624d6adcbdaf2526623f456ca9
 PKG_DESCR:=		a software construction tool
 PKG_SECTION:=		lang
-HOST_BUILDDEP:=		bzip2-host python2-host
+HOST_BUILDDEP:=		python2-host
 PKG_URL:=		http://www.scons.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=scons/}
 
@@ -23,7 +23,8 @@ $(eval $(call HOST_template,SCONS,scons,$(PKG_VERSION)-${PKG_RELEASE}))
 HOST_STYLE:=		manual
 
 scons-hostinstall:
-	(cd $(WRKBUILD); PATH='$(TARGET_PATH)' python setup.py install --prefix=$(STAGING_HOST_DIR)/)
+	(cd $(WRKBUILD); PATH='$(HOST_PATH)' python setup.py install \
+		--prefix=$(STAGING_HOST_DIR)/usr)
 
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 3c34ff6e184ee7738165e0e4c58763065fc11151 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 21:37:19 +0100
Subject: update to latest upstream version

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

diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index 350a7a097..0fdbe17b4 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		mpg123
-PKG_VERSION:=		1.13.3
+PKG_VERSION:=		1.19.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b1f990ce76dcf2fdf9d53ac39fc6bc7e
+PKG_MD5SUM:=		87731f1437cfd8c50537a606d81130e4
 PKG_DESCR:=		mp3 console player
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libpthread alsa-lib
-- 
cgit v1.2.3


From 5eae70b225b56038dd3ae73f726f5353520585dc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 21:37:26 +0100
Subject: update to latest upstream version

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

diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile
index 933333441..0d18d70cc 100644
--- a/package/fetchmail/Makefile
+++ b/package/fetchmail/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		fetchmail
-PKG_VERSION:=		6.3.9
+PKG_VERSION:=		6.3.26
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		72c20ad2b9629f1a109668b05a84d823
+PKG_MD5SUM:=		d9ae3d939205a3c06a21ea79b8f14793
 PKG_DESCR:=		fetch mail from a POP or IMAP server
 PKG_SECTION:=		mail
 PKG_URL:=		http://fetchmail.berlios.de/
-- 
cgit v1.2.3


From 38c6ad045e9cd6d96adf88da3cca02c92fc5f9bc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 21:37:45 +0100
Subject: fix dependencies

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

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 2c82f8a53..a523434f7 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -5,13 +5,14 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
 PKG_VERSION:=		2.38.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_EXTRAVER:=		2.38
 PKG_MD5SUM:=		26d1d08e478fc48c181ca8be44f5b69f
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libpthread
-PKG_BUILDDEP:=		libffi gettext-tiny libiconv-tiny glib-host zlib libelf dbus
+PKG_BUILDDEP:=		glib-host zlib libelf dbus
+HOST_BUILDDEP:=		libffi-host gettext-tiny-host libiconv-tiny-host
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
 PKG_NOPARALLEL:=	1
@@ -29,9 +30,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-HOST_STYLE:=		auto
 TARGET_CPPFLAGS+=	-D_GNU_SOURCE
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-mem-pools \
 			--disable-rebuilds \
 			--disable-fam \
@@ -43,6 +42,7 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			ac_cv_func_posix_getpwuid_r=yes \
 			ac_cv_func_posix_getgrgid_r=yes
 
+HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--disable-fam \
 			--enable-static \
 			--disable-compile-warnings
-- 
cgit v1.2.3


From 3036dd932d83799ad00b439378bc21f35755b226 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 21:37:55 +0100
Subject: fix dependencies

---
 package/gpsd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 04547a9eb..4c21e15ee 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		fc5b03aae38b9b5b6880b31924d0ace3
 PKG_DESCR:=		An interface daemon for GPS receivers
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libpthread
-PKG_BUILDDEP:=		ncurses scons-host bzip2-host python2-host
+PKG_BUILDDEP:=		scons-host ncurses
 PKG_URL:=		http://catb.org/gpsd/
 PKG_SITES:=		http://download-mirror.savannah.gnu.org/releases/gpsd/
 
-- 
cgit v1.2.3


From 4408545c20c74c63b1bf70032479d6c78bdc5876 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Mar 2014 21:38:11 +0100
Subject: fix dependencies

---
 package/libxml2/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 76df60864..8c5ee7689 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -10,7 +10,8 @@ PKG_MD5SUM:=		9c0cfef285d5c4a5c80d00904ddab380
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
-PKG_BUILDDEP:=		autotool gettext-tiny bzip2-host python2-host libxml2-host zlib
+PKG_BUILDDEP:=		libxml2-host zlib
+HOST_BUILDDEP:=		python2-host
 PKG_URL:=		http://www.xmlsoft.org/
 PKG_SITES:=		http://xmlsoft.org/sources/
 PKG_OPTS:=		dev
-- 
cgit v1.2.3


From 179f19685eb8b61828f42869e0232255d24ce267 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Mar 2014 12:35:15 +0100
Subject: mdev -s is required for cfgfs, /dev/root is missing

---
 package/base-files/Makefile            | 2 +-
 package/base-files/src/etc/init.d/boot | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7c0a7f1a7..417c3d09f 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		75
+PKG_RELEASE:=		76
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot
index f52e8dc78..2e7215fb8 100644
--- a/package/base-files/src/etc/init.d/boot
+++ b/package/base-files/src/etc/init.d/boot
@@ -19,6 +19,8 @@ mount -o remount,nosuid,nodev,mode=1777,size=${size}k -t tmpfs tmpfs /tmp
 # start mdev dynamic device node management
 echo >/dev/mdev.seq
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
+# creates f.e. /dev/root
+mdev -s
 
 # seed some random
 cat /etc/.rnd >/dev/urandom 2>&1
-- 
cgit v1.2.3


From a7fa2e4ce6c2d20521c7eb9d00d4bec1d63d2395 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Mar 2014 13:43:05 +0100
Subject: bulktoolchain fixes

---
 mk/build.mk      | 11 ++++++-----
 target/tarch.lst |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mk/build.mk b/mk/build.mk
index 4cdccd8fd..cc07d9fdc 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -475,17 +475,18 @@ bulktoolchain:
 		    ( \
 			echo === building $$arch $$libc toolchain-$$arch on $$(date); \
 			tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##"); \
-			if [ -f ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz ];then exit;fi; \
+			carch=$$(echo $$arch|sed -e "s#hf##" -e "s#mips64.*#mips64#"); \
 			$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
-				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; break;fi; \
-				if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
+				if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \
 				if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
-				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz toolchain_${GNU_HOST_NAME} target_$${arch}_$${libc}$${abi}; \
+				if [ -f ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz ];then exit;fi; \
+				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; break;fi; \
+				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz toolchain_${GNU_HOST_NAME} target_$${carch}_$${libc}$${abi}; \
 				$(GMAKE) cleantoolchain; \
 			rm .config; \
-		    ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_build.log; \
+		    ) 2>&1 | tee -a $(TOPDIR)/firmware/toolchain_build.log; \
 		    if [ -f .exit ];then break;fi \
 		done <${TOPDIR}/target/tarch.lst ;\
 		if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
diff --git a/target/tarch.lst b/target/tarch.lst
index 09eed2265..26bda2a75 100644
--- a/target/tarch.lst
+++ b/target/tarch.lst
@@ -9,6 +9,8 @@ mips64
 mips64n32
 mips64n64
 mips64el
+mips64eln32
+mips64eln64
 ppc
 ppc64
 sparc
-- 
cgit v1.2.3


From af5e6f9daf2e2b7457433d3302531ab63cc6241f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Mar 2014 20:25:19 +0100
Subject: mark as broken, need to be fixed

---
 package/dbus-python/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/dbus-python/Makefile b/package/dbus-python/Makefile
index 9645f7269..b73d43a6c 100644
--- a/package/dbus-python/Makefile
+++ b/package/dbus-python/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		dbus dbus-glib
 PKG_URL:=		http://dbus.freedesktop.org/doc/dbus-python/
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus-python/
 
+PKG_CFLINE_DBUS_PYTHON:=	depends on ADK_BROKEN
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DBUS_PYTHON,dbus-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-- 
cgit v1.2.3


From 57d3349d5ab0fbb31439bf1ead92278edf140691 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Mar 2014 20:25:34 +0100
Subject: update to latest upstream version

---
 package/python3/Makefile                           | 34 ++++++-----
 package/python3/patches/patch-Makefile_pre_in      | 70 ----------------------
 .../python3/patches/patch-Modules_posixmodule_c    | 20 -------
 3 files changed, 18 insertions(+), 106 deletions(-)
 delete mode 100644 package/python3/patches/patch-Makefile_pre_in
 delete mode 100644 package/python3/patches/patch-Modules_posixmodule_c

diff --git a/package/python3/Makefile b/package/python3/Makefile
index 3d7158443..e939a9155 100644
--- a/package/python3/Makefile
+++ b/package/python3/Makefile
@@ -4,15 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		python3
-PKG_VERSION:=		3.3.2
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		0a2ea57f6184baf45b150aee53c0c8da
+PKG_VERSION:=		3.4.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		77c22725e14af3d71022cbfdebff4903
 PKG_DESCR:=		Python scripting language (Version 3)
 PKG_SECTION:=		lang
 PKG_DEPENDS:=		libpthread libgcc libffi
 PKG_BUILDDEP:=		python3-host libffi 
+HOST_BUILDDEP:=		libffi-host
 PKG_URL:=		http://www.python.org/
-PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
+PKG_SITES:=		http://legacy.python.org/ftp/python/${PKG_VERSION}/
 
 PKG_HOST_DEPENDS:=	!netbsd !openbsd !cygwin
 
@@ -44,7 +45,7 @@ PKGFD_MOD_SSL:=		OpenSSL support
 PKGFB_MOD_SSL:=		openssl
 PKGFS_MOD_SSL:=		libopenssl
 
-DISTFILES=		Python-${PKG_VERSION}.tgz
+DISTFILES=		Python-${PKG_VERSION}.tar.xz
 WRKDIST=		${WRKDIR}/Python-${PKG_VERSION}
 
 include ${TOPDIR}/mk/host.mk
@@ -55,9 +56,9 @@ define PKG_mod_template
 INSTALL_MODS_$${ADK_PACKAGE_${1}}+=    ${2}-install
 
 ${2}-install:
-	${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.3/lib-dynload
+	${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.4/lib-dynload
 	for m in ${2}; do \
-		${INSTALL_DATA} $(WRKINST)/usr/lib/python3.3/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.3/lib-dynload ;\
+		${INSTALL_DATA} $(WRKINST)/usr/lib/python3.4/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.4/lib-dynload ;\
 	done
 endef
 
@@ -84,6 +85,7 @@ $(eval $(call PKG_mod_template,PYTHON3_MOD_SSL,_ssl))
 $(eval $(call PKG_mod_template,PYTHON3_MOD_READLINE,readline))
 
 MAKE_ENV+=		HOSTPGEN=$(STAGING_HOST_DIR)/usr/bin/pgen3
+FAKE_FLAGS+=		ENSUREPIP=no
 CONFIGURE_ARGS:=	--with-threads \
 			--with-system-ffi \
 			--with-system-expat \
@@ -97,21 +99,21 @@ HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--without-cxx-main \
 			--with-threads
 
-hostpost-install:
-	$(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \
-		$(STAGING_HOST_DIR)/usr/bin/pgen3
+#hostpost-install:
+#	$(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \
+#		$(STAGING_HOST_DIR)/usr/bin/pgen3
 			
 python3-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} ${IDIR_PYTHON3}/usr/bin ${IDIR_PYTHON3}/usr/lib
-	${INSTALL_DIR} ${IDIR_PYTHON3}/usr/lib/python3.3
-	${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.3m
+	${INSTALL_DIR} ${IDIR_PYTHON3}/usr/lib/python3.4
+	${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.4m
 	${INSTALL_BIN} ${WRKINST}/usr/bin/python3 ${IDIR_PYTHON3}/usr/bin
 	${CP} ${WRKINST}/usr/lib/libpython*.so* ${IDIR_PYTHON3}/usr/lib
-	${CP} ${WRKINST}/usr/lib/python3.3/* ${IDIR_PYTHON3}/usr/lib/python3.3
-	${CP} ${WRKINST}/usr/include/python3.3m/pyconfig.h \
-		 ${IDIR_PYTHON3}/usr/include/python3.3m
+	${CP} ${WRKINST}/usr/lib/python3.4/* ${IDIR_PYTHON3}/usr/lib/python3.4
+	${CP} ${WRKINST}/usr/include/python3.4m/pyconfig.h \
+		 ${IDIR_PYTHON3}/usr/include/python3.4m
 	@-for i in zlib _bz2 _curses _ssl _gdbm _sqlite pyexpat readline; do \
-		rm ${IDIR_PYTHON3}/usr/lib/python3.3/lib-dynload/$${i}*so; \
+		rm ${IDIR_PYTHON3}/usr/lib/python3.4/lib-dynload/$${i}*so; \
 	done
 
 include ${TOPDIR}/mk/host-bottom.mk
diff --git a/package/python3/patches/patch-Makefile_pre_in b/package/python3/patches/patch-Makefile_pre_in
deleted file mode 100644
index 5a4077eba..000000000
--- a/package/python3/patches/patch-Makefile_pre_in
+++ /dev/null
@@ -1,70 +0,0 @@
---- Python-3.3.2.orig/Makefile.pre.in	2013-05-15 18:32:57.000000000 +0200
-+++ Python-3.3.2/Makefile.pre.in	2013-10-29 07:56:46.000000000 +0100
-@@ -70,9 +70,9 @@ MAKESETUP=      $(srcdir)/Modules/makese
- OPT=		@OPT@
- BASECFLAGS=	@BASECFLAGS@
- BASECPPFLAGS=	@BASECPPFLAGS@
--CONFIGURE_CFLAGS=	@CFLAGS@
--CONFIGURE_CPPFLAGS=	@CPPFLAGS@
--CONFIGURE_LDFLAGS=	@LDFLAGS@
-+CONFIGURE_CFLAGS=	
-+CONFIGURE_CPPFLAGS=
-+CONFIGURE_LDFLAGS=
- # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
- # command line to append to these values without stomping the pre-set
- # values.
-@@ -249,6 +249,7 @@ LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
- ##########################################################################
- # Parser
- PGEN=		Parser/pgen$(EXE)
-+HOSTPGEN?=	./Parser/pgen$(EXE)	
- 
- PSRCS=		\
- 		Parser/acceler.c \
-@@ -493,7 +494,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
- 	    *) quiet="";; \
- 	esac; \
- 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
--		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-+		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py build
- 
- # Build static library
- # avoid long command lines, same as LIBRARY_OBJS
-@@ -669,7 +670,7 @@ $(IO_OBJS): $(IO_H)
- $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
- 		@$(MKDIR_P) Include
- 		$(MAKE) $(PGEN)
--		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+		$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
- $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
- 		$(MAKE) $(GRAMMAR_H)
- 		touch $(GRAMMAR_C)
-@@ -1112,28 +1113,6 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
- 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
- 	fi
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST) -f \
--		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
--		$(DESTDIR)$(LIBDEST)
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST) -f \
--		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
--		$(DESTDIR)$(LIBDEST)
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST)/site-packages -f \
--		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
--		-d $(LIBDEST)/site-packages -f \
--		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
--	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
--		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
- 
- # Create the PLATDIR source directory, if one wasn't distributed..
- $(srcdir)/Lib/$(PLATDIR):
diff --git a/package/python3/patches/patch-Modules_posixmodule_c b/package/python3/patches/patch-Modules_posixmodule_c
deleted file mode 100644
index 537958513..000000000
--- a/package/python3/patches/patch-Modules_posixmodule_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- Python-3.3.2.orig/Modules/posixmodule.c	2013-05-15 18:32:59.000000000 +0200
-+++ Python-3.3.2/Modules/posixmodule.c	2014-01-06 18:59:54.000000000 +0100
-@@ -7679,7 +7679,7 @@ PyDoc_STRVAR(posix_close__doc__,
- Close a file descriptor (for low level IO).");
- 
- static PyObject *
--posix_close(PyObject *self, PyObject *args)
-+posix_pyclose(PyObject *self, PyObject *args)
- {
-     int fd, res;
-     if (!PyArg_ParseTuple(args, "i:close", &fd))
-@@ -11082,7 +11082,7 @@ static PyMethodDef posix_methods[] = {
-     {"open",            (PyCFunction)posix_open,\
-                         METH_VARARGS | METH_KEYWORDS,
-                         posix_open__doc__},
--    {"close",           posix_close, METH_VARARGS, posix_close__doc__},
-+    {"close",           posix_pyclose, METH_VARARGS, posix_close__doc__},
-     {"closerange",      posix_closerange, METH_VARARGS, posix_closerange__doc__},
-     {"device_encoding", device_encoding, METH_VARARGS, device_encoding__doc__},
-     {"dup",             posix_dup, METH_VARARGS, posix_dup__doc__},
-- 
cgit v1.2.3


From c7c74c108059c9f77235341f43f5f6ce6e13d6f9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Mar 2014 20:25:46 +0100
Subject: update to latest upstream version

---
 package/xterm/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/xterm/Makefile b/package/xterm/Makefile
index 10bfaf21a..6575fae60 100644
--- a/package/xterm/Makefile
+++ b/package/xterm/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xterm
-PKG_VERSION:=		297
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		45610ae6fe90cf086fcd75b9cb97bbaf
+PKG_VERSION:=		303
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		48f6d49b2b6b6933d501d767cbed9254
 PKG_DESCR:=		Terminal Emulator for X Windows
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libxaw libxt libncurses libxft fontconfig
-- 
cgit v1.2.3


From dde56373e0193233bf9a9b191681d0036056f875 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Mar 2014 20:26:27 +0100
Subject: add msmtp

---
 TODO | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TODO b/TODO
index 6b54af848..3cdf527a0 100644
--- a/TODO
+++ b/TODO
@@ -17,5 +17,6 @@
 - evaluate libguestfs for image creation
 - check for gcc and SSP again
 - port w3m
+- port msmtp
 - rutorrent porting
 - lms perl 
-- 
cgit v1.2.3


From ed4403bfb1fe658735a6a9d64c282d599c6b7901 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Mar 2014 23:07:09 +0100
Subject: fix x86_64 toolchain building

---
 target/x86_64/sys-available/toolchain-x86_64 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64
index c268e9687..e71829085 100644
--- a/target/x86_64/sys-available/toolchain-x86_64
+++ b/target/x86_64/sys-available/toolchain-x86_64
@@ -1,8 +1,10 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64
 	bool "Toolchain only"
 	select ADK_x86_64
+	select ADK_64
 	select ADK_toolchain_x86_64
 	select ADK_CPU_X86_64
+	select ADK_LINUX_64
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TGZ
 	help
-- 
cgit v1.2.3


From 19afcc16965829619751f456fda136e61006ffd9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Mar 2014 12:26:42 +0100
Subject: add dts/dtb for spartan emulation, so that mtdroot can work

---
 target/microblaze/Makefile       |   2 +-
 target/microblaze/s3adsp1800.dtb | Bin 0 -> 8369 bytes
 target/microblaze/s3adsp1800.dts | 287 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 288 insertions(+), 1 deletion(-)
 create mode 100644 target/microblaze/s3adsp1800.dtb
 create mode 100644 target/microblaze/s3adsp1800.dts

diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile
index 5ab2345e7..f05884442 100644
--- a/target/microblaze/Makefile
+++ b/target/microblaze/Makefile
@@ -15,7 +15,7 @@ DTB:=-dtb target/microblaze/ml605.dtb
 endif
 ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y)
 MODEL:=petalogix-s3adsp1800
-DTB:=
+DTB:=-dtb target/microblaze/s3adsp1800.dtb
 endif
 
 ifeq ($(ADK_TARGET_FS),squashfs)
diff --git a/target/microblaze/s3adsp1800.dtb b/target/microblaze/s3adsp1800.dtb
new file mode 100644
index 000000000..163f1632d
Binary files /dev/null and b/target/microblaze/s3adsp1800.dtb differ
diff --git a/target/microblaze/s3adsp1800.dts b/target/microblaze/s3adsp1800.dts
new file mode 100644
index 000000000..9cc6bdc13
--- /dev/null
+++ b/target/microblaze/s3adsp1800.dts
@@ -0,0 +1,287 @@
+/dts-v1/;
+
+/ {
+	#address-cells = <0x1>;
+	#size-cells = <0x1>;
+	compatible = "xlnx,microblaze";
+	model = "testing";
+
+	memory@90000000 {
+		device_type = "memory";
+		reg = <0x90000000 0x8000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyUL0,115200";
+		linux,stdout-path = "/plb@0/serial@84000000";
+	};
+
+	cpus {
+		#address-cells = <0x1>;
+		#cpus = <0x1>;
+		#size-cells = <0x0>;
+
+		cpu@0 {
+			clock-frequency = <0x3b9aca0>;
+			compatible = "xlnx,microblaze-7.10.d";
+			d-cache-baseaddr = <0x90000000>;
+			d-cache-highaddr = <0x97ffffff>;
+			d-cache-line-size = <0x10>;
+			d-cache-size = <0x800>;
+			device_type = "cpu";
+			i-cache-baseaddr = <0x90000000>;
+			i-cache-highaddr = <0x97ffffff>;
+			i-cache-line-size = <0x10>;
+			i-cache-size = <0x800>;
+			model = "microblaze,7.10.d";
+			reg = <0x0>;
+			timebase-frequency = <0x3b9aca0>;
+			xlnx,addr-tag-bits = <0x10>;
+			xlnx,allow-dcache-wr = <0x1>;
+			xlnx,allow-icache-wr = <0x1>;
+			xlnx,area-optimized = <0x0>;
+			xlnx,cache-byte-size = <0x800>;
+			xlnx,d-lmb = <0x1>;
+			xlnx,d-opb = <0x0>;
+			xlnx,d-plb = <0x1>;
+			xlnx,data-size = <0x20>;
+			xlnx,dcache-addr-tag = <0x10>;
+			xlnx,dcache-always-used = <0x0>;
+			xlnx,dcache-byte-size = <0x800>;
+			xlnx,dcache-line-len = <0x4>;
+			xlnx,dcache-use-fsl = <0x1>;
+			xlnx,debug-enabled = <0x1>;
+			xlnx,div-zero-exception = <0x0>;
+			xlnx,dopb-bus-exception = <0x0>;
+			xlnx,dynamic-bus-sizing = <0x1>;
+			xlnx,edge-is-positive = <0x1>;
+			xlnx,family = "spartan3adsp";
+			xlnx,fpu-exception = <0x0>;
+			xlnx,fsl-data-size = <0x20>;
+			xlnx,fsl-exception = <0x0>;
+			xlnx,fsl-links = <0x0>;
+			xlnx,i-lmb = <0x1>;
+			xlnx,i-opb = <0x0>;
+			xlnx,i-plb = <0x1>;
+			xlnx,icache-always-used = <0x0>;
+			xlnx,icache-line-len = <0x4>;
+			xlnx,icache-use-fsl = <0x1>;
+			xlnx,ill-opcode-exception = <0x0>;
+			xlnx,instance = "microblaze_0";
+			xlnx,interconnect = <0x1>;
+			xlnx,interrupt-is-edge = <0x0>;
+			xlnx,iopb-bus-exception = <0x0>;
+			xlnx,mmu-dtlb-size = <0x4>;
+			xlnx,mmu-itlb-size = <0x2>;
+			xlnx,mmu-tlb-access = <0x3>;
+			xlnx,mmu-zones = <0x10>;
+			xlnx,number-of-pc-brk = <0x3>;
+			xlnx,number-of-rd-addr-brk = <0x2>;
+			xlnx,number-of-wr-addr-brk = <0x2>;
+			xlnx,opcode-0x0-illegal = <0x0>;
+			xlnx,pvr = <0x1>;
+			xlnx,pvr-user1 = <0x0>;
+			xlnx,pvr-user2 = <0x0>;
+			xlnx,reset-msr = <0x0>;
+			xlnx,sco = <0x0>;
+			xlnx,unaligned-exceptions = <0x1>;
+			xlnx,use-barrel = <0x1>;
+			xlnx,use-dcache = <0x1>;
+			xlnx,use-div = <0x0>;
+			xlnx,use-ext-brk = <0x1>;
+			xlnx,use-ext-nm-brk = <0x1>;
+			xlnx,use-extended-fsl-instr = <0x0>;
+			xlnx,use-fpu = <0x0>;
+			xlnx,use-hw-mul = <0x1>;
+			xlnx,use-icache = <0x1>;
+			xlnx,use-interrupt = <0x1>;
+			xlnx,use-mmu = <0x3>;
+			xlnx,use-msr-instr = <0x1>;
+			xlnx,use-pcmp-instr = <0x1>;
+		};
+	};
+
+	plb@0 {
+		#address-cells = <0x1>;
+		#size-cells = <0x1>;
+		compatible = "xlnx,plb-v46-1.03.a", "simple-bus";
+		ranges;
+
+		ethernet@81000000 {
+			compatible = "xlnx,xps-ethernetlite-2.00.b";
+			device_type = "network";
+			interrupt-parent = <0x1>;
+			interrupts = <0x1 0x0>;
+			local-mac-address = [02 00 00 00 00 00];
+			reg = <0x81000000 0x10000>;
+			xlnx,duplex = <0x1>;
+			xlnx,family = "spartan3adsp";
+			xlnx,rx-ping-pong = <0x0>;
+			xlnx,tx-ping-pong = <0x0>;
+		};
+
+		flash@a0000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			bank-width = <0x1>;
+			compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash";
+			reg = <0xa0000000 0x1000000>;
+			xlnx,family = "spartan3adsp";
+			xlnx,include-datawidth-matching-0 = <0x1>;
+			xlnx,include-datawidth-matching-1 = <0x0>;
+			xlnx,include-datawidth-matching-2 = <0x0>;
+			xlnx,include-datawidth-matching-3 = <0x0>;
+			xlnx,include-negedge-ioregs = <0x0>;
+			xlnx,include-plb-ipif = <0x1>;
+			xlnx,include-wrbuf = <0x1>;
+			xlnx,max-mem-width = <0x8>;
+			xlnx,mch-native-dwidth = <0x20>;
+			xlnx,mch-plb-clk-period-ps = <0x3e80>;
+			xlnx,mch-splb-awidth = <0x20>;
+			xlnx,mch0-accessbuf-depth = <0x10>;
+			xlnx,mch0-protocol = <0x0>;
+			xlnx,mch0-rddatabuf-depth = <0x10>;
+			xlnx,mch1-accessbuf-depth = <0x10>;
+			xlnx,mch1-protocol = <0x0>;
+			xlnx,mch1-rddatabuf-depth = <0x10>;
+			xlnx,mch2-accessbuf-depth = <0x10>;
+			xlnx,mch2-protocol = <0x0>;
+			xlnx,mch2-rddatabuf-depth = <0x10>;
+			xlnx,mch3-accessbuf-depth = <0x10>;
+			xlnx,mch3-protocol = <0x0>;
+			xlnx,mch3-rddatabuf-depth = <0x10>;
+			xlnx,mem0-width = <0x8>;
+			xlnx,mem1-width = <0x20>;
+			xlnx,mem2-width = <0x20>;
+			xlnx,mem3-width = <0x20>;
+			xlnx,num-banks-mem = <0x1>;
+			xlnx,num-channels = <0x0>;
+			xlnx,priority-mode = <0x0>;
+			xlnx,synch-mem-0 = <0x0>;
+			xlnx,synch-mem-1 = <0x0>;
+			xlnx,synch-mem-2 = <0x0>;
+			xlnx,synch-mem-3 = <0x0>;
+			xlnx,synch-pipedelay-0 = <0x2>;
+			xlnx,synch-pipedelay-1 = <0x2>;
+			xlnx,synch-pipedelay-2 = <0x2>;
+			xlnx,synch-pipedelay-3 = <0x2>;
+			xlnx,tavdv-ps-mem-0 = <0x11170>;
+			xlnx,tavdv-ps-mem-1 = <0x3a98>;
+			xlnx,tavdv-ps-mem-2 = <0x3a98>;
+			xlnx,tavdv-ps-mem-3 = <0x3a98>;
+			xlnx,tcedv-ps-mem-0 = <0x11170>;
+			xlnx,tcedv-ps-mem-1 = <0x3a98>;
+			xlnx,tcedv-ps-mem-2 = <0x3a98>;
+			xlnx,tcedv-ps-mem-3 = <0x3a98>;
+			xlnx,thzce-ps-mem-0 = <0x61a8>;
+			xlnx,thzce-ps-mem-1 = <0x1b58>;
+			xlnx,thzce-ps-mem-2 = <0x1b58>;
+			xlnx,thzce-ps-mem-3 = <0x1b58>;
+			xlnx,thzoe-ps-mem-0 = <0x61a8>;
+			xlnx,thzoe-ps-mem-1 = <0x1b58>;
+			xlnx,thzoe-ps-mem-2 = <0x1b58>;
+			xlnx,thzoe-ps-mem-3 = <0x1b58>;
+			xlnx,tlzwe-ps-mem-0 = <0x1388>;
+			xlnx,tlzwe-ps-mem-1 = <0x0>;
+			xlnx,tlzwe-ps-mem-2 = <0x0>;
+			xlnx,tlzwe-ps-mem-3 = <0x0>;
+			xlnx,twc-ps-mem-0 = <0x11170>;
+			xlnx,twc-ps-mem-1 = <0x3a98>;
+			xlnx,twc-ps-mem-2 = <0x3a98>;
+			xlnx,twc-ps-mem-3 = <0x3a98>;
+			xlnx,twp-ps-mem-0 = <0xafc8>;
+			xlnx,twp-ps-mem-1 = <0x2ee0>;
+			xlnx,twp-ps-mem-2 = <0x2ee0>;
+			xlnx,twp-ps-mem-3 = <0x2ee0>;
+			xlnx,xcl0-linesize = <0x4>;
+			xlnx,xcl0-writexfer = <0x1>;
+			xlnx,xcl1-linesize = <0x4>;
+			xlnx,xcl1-writexfer = <0x1>;
+			xlnx,xcl2-linesize = <0x4>;
+			xlnx,xcl2-writexfer = <0x1>;
+			xlnx,xcl3-linesize = <0x4>;
+			xlnx,xcl3-writexfer = <0x1>;
+			partition@0x00000000 {
+				label = "rootfs";
+				reg = <0x00000000 0x01000000>;
+			};
+		};
+
+		gpio@81400000 {
+			compatible = "xlnx,xps-gpio-1.00.a";
+			interrupt-parent = <0x1>;
+			interrupts = <0x2 0x2>;
+			reg = <0x81400000 0x10000>;
+			xlnx,all-inputs = <0x0>;
+			xlnx,all-inputs-2 = <0x0>;
+			xlnx,dout-default = <0x0>;
+			xlnx,dout-default-2 = <0x0>;
+			xlnx,family = "spartan3adsp";
+			xlnx,gpio-width = <0x8>;
+			xlnx,interrupt-present = <0x1>;
+			xlnx,is-bidir = <0x0>;
+			xlnx,is-bidir-2 = <0x1>;
+			xlnx,is-dual = <0x0>;
+			xlnx,tri-default = <0xffffffff>;
+			xlnx,tri-default-2 = <0xffffffff>;
+		};
+
+		serial@84000000 {
+			clock-frequency = <0x3b9aca0>;
+			compatible = "xlnx,xps-uartlite-1.00.a";
+			current-speed = <0x1c200>;
+			device_type = "serial";
+			interrupt-parent = <0x1>;
+			interrupts = <0x3 0x0>;
+			port-number = <0x0>;
+			reg = <0x84000000 0x10000>;
+			xlnx,baudrate = <0x1c200>;
+			xlnx,data-bits = <0x8>;
+			xlnx,family = "spartan3adsp";
+			xlnx,odd-parity = <0x0>;
+			xlnx,use-parity = <0x0>;
+		};
+
+		debug@84400000 {
+			compatible = "xlnx,mdm-1.00.d";
+			reg = <0x84400000 0x10000>;
+			xlnx,family = "spartan3adsp";
+			xlnx,interconnect = <0x1>;
+			xlnx,jtag-chain = <0x2>;
+			xlnx,mb-dbg-ports = <0x1>;
+			xlnx,uart-width = <0x8>;
+			xlnx,use-uart = <0x1>;
+			xlnx,write-fsl-ports = <0x0>;
+		};
+
+		mpmc@90000000 {
+			#address-cells = <0x1>;
+			#size-cells = <0x1>;
+			compatible = "xlnx,mpmc-4.03.a";
+		};
+
+		interrupt-controller@81800000 {
+			#interrupt-cells = <0x2>;
+			compatible = "xlnx,xps-intc-1.00.a";
+			interrupt-controller;
+			reg = <0x81800000 0x10000>;
+			xlnx,kind-of-intr = <0xa>;
+			xlnx,num-intr-inputs = <0x4>;
+			linux,phandle = <0x1>;
+		};
+
+		timer@83c00000 {
+			compatible = "xlnx,xps-timer-1.00.a";
+			interrupt-parent = <0x1>;
+			interrupts = <0x0 0x2>;
+			reg = <0x83c00000 0x10000>;
+			xlnx,count-width = <0x20>;
+			xlnx,family = "spartan3adsp";
+			xlnx,gen0-assert = <0x1>;
+			xlnx,gen1-assert = <0x1>;
+			xlnx,one-timer-only = <0x0>;
+			xlnx,trig0-assert = <0x1>;
+			xlnx,trig1-assert = <0x1>;
+		};
+	};
+};
-- 
cgit v1.2.3


From bf0b148f7f484542d0a30a9b914ca355a8efc8e9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Mar 2014 12:31:49 +0100
Subject: update to latest upstream version

---
 package/lynx/Makefile                                 |  6 +++---
 .../patch-WWW_Library_Implementation_HTUtils_h        | 14 +++++++-------
 package/lynx/patches/patch-makefile_in                | 11 +++++++++++
 package/lynx/patches/patch-src_chrtrans_makeuctb_c    | 19 +++----------------
 4 files changed, 24 insertions(+), 26 deletions(-)
 create mode 100644 package/lynx/patches/patch-makefile_in

diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 77cb6ef3e..b15da35e6 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		lynx
-PKG_VERSION:=		2.8.7
+PKG_VERSION:=		2.8.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e36d70f3f09b2d502055ca67f09e363c
+PKG_MD5SUM:=		7caa6773f94e136556c1c30629fe1431
 PKG_DESCR:=		Standard text browser
 PKG_SECTION:=		browser
 PKG_DEPENDS:=		libncurses libopenssl zlib
@@ -17,7 +17,7 @@ PKG_SITES:=		http://lynx.isc.org/${PKG_NAME}${PKG_VERSION}/
 PKG_NOPARALLEL:=	1
 
 DISTFILES=		${PKG_NAME}${PKG_VERSION}.tar.gz
-WRKDIST=		${WRKDIR}/lynx2-8-7
+WRKDIST=		${WRKDIR}/lynx2-8-8
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h b/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h
index d16953cca..c8217b70e 100644
--- a/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h
+++ b/package/lynx/patches/patch-WWW_Library_Implementation_HTUtils_h
@@ -1,6 +1,6 @@
---- lynx2-8-7.orig/WWW/Library/Implementation/HTUtils.h	2009-05-25 23:05:31.000000000 +0200
-+++ lynx2-8-7/WWW/Library/Implementation/HTUtils.h	2010-05-29 12:56:42.125000000 +0200
-@@ -677,6 +677,8 @@ extern int WWW_TraceMask;
+--- lynx2-8-8.orig/WWW/Library/Implementation/HTUtils.h	2014-02-05 01:50:18.000000000 +0100
++++ lynx2-8-8/WWW/Library/Implementation/HTUtils.h	2014-03-21 22:14:07.000000000 +0100
+@@ -725,6 +725,8 @@ extern int WWW_TraceMask;
  
  #define SHORTENED_RBIND		/* FIXME: do this in configure-script */
  
@@ -9,15 +9,15 @@
  #ifdef USE_SSL
  
  #define free_func free__func
-@@ -717,6 +719,7 @@ extern int WWW_TraceMask;
+@@ -765,6 +767,7 @@ extern int WWW_TraceMask;
  
  #undef free_func
  #endif /* USE_SSL */
 +#endif
  
- #ifdef HAVE_LIBDMALLOC
- #include <dmalloc.h>		/* Gray Watson's library */
-@@ -747,11 +750,14 @@ extern "C" {
+ #ifdef HAVE_BSD_STDLIB_H
+ #include <bsd/stdlib.h>		/* prototype for arc4random.h */
+@@ -801,11 +804,14 @@ extern "C" {
  
      extern FILE *TraceFP(void);
  
diff --git a/package/lynx/patches/patch-makefile_in b/package/lynx/patches/patch-makefile_in
new file mode 100644
index 000000000..5cb6b5962
--- /dev/null
+++ b/package/lynx/patches/patch-makefile_in
@@ -0,0 +1,11 @@
+--- lynx2-8-8.orig/makefile.in	2014-03-09 22:43:10.000000000 +0100
++++ lynx2-8-8/makefile.in	2014-03-21 23:17:26.000000000 +0100
+@@ -210,7 +210,7 @@ SRC_CFLAGS = \
+ 	WWWINC=$(WWW_DIR) \
+ 	WWWLIB="../$(WWW_DIR)/libwww.a"
+ 
+-actual_PROG  = `echo lynx|    sed '$(transform)'`
++actual_PROG  = lynx
+ binary_PROG  = $(actual_PROG)$x
+ 
+ all lynx$x: cfg_defs.h LYHelp.h
diff --git a/package/lynx/patches/patch-src_chrtrans_makeuctb_c b/package/lynx/patches/patch-src_chrtrans_makeuctb_c
index 9f23671e7..9972a6f8c 100644
--- a/package/lynx/patches/patch-src_chrtrans_makeuctb_c
+++ b/package/lynx/patches/patch-src_chrtrans_makeuctb_c
@@ -1,23 +1,10 @@
---- lynx2-8-7.orig/src/chrtrans/makeuctb.c	2009-02-02 02:41:02.000000000 +0100
-+++ lynx2-8-7/src/chrtrans/makeuctb.c	2010-05-29 12:55:33.031250000 +0200
-@@ -18,6 +18,7 @@
-  *  version 2, or at your option any later version.
-  */
- 
-+
- #ifndef HAVE_CONFIG_H
- /* override HTUtils.h fallbacks for cross-compiling */
- #undef HAVE_LSTAT
-@@ -28,10 +29,12 @@
+--- lynx2-8-8.orig/src/chrtrans/makeuctb.c	2013-11-29 01:52:56.000000000 +0100
++++ lynx2-8-8/src/chrtrans/makeuctb.c	2014-03-21 22:12:13.000000000 +0100
+@@ -28,6 +28,7 @@
  
  #define DONT_USE_GETTEXT
  #define DONT_USE_SOCKS5
 +#define DONT_USE_SSL
  #include <UCDefs.h>
  #include <UCkd.h>
- #include <LYUtils.h>
  
-+
- /*
-  *  Don't try to use LYexit() since this is a standalone file.
-  */
-- 
cgit v1.2.3


From ebf68a45b5a22acfe92ccb4723842e3a009820cf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Mar 2014 12:32:27 +0100
Subject: update to latest upstream version

---
 package/socat/Makefile                        |  6 +++---
 package/socat/patches/501-honor_ldflags.patch | 13 -------------
 package/socat/patches/patch-Makefile_in       | 12 ++++++++++++
 package/socat/patches/patch-configure         | 23 +++++++++++++++++++++++
 4 files changed, 38 insertions(+), 16 deletions(-)
 delete mode 100644 package/socat/patches/501-honor_ldflags.patch
 create mode 100644 package/socat/patches/patch-Makefile_in
 create mode 100644 package/socat/patches/patch-configure

diff --git a/package/socat/Makefile b/package/socat/Makefile
index 4969a6d85..9311ddbcb 100644
--- a/package/socat/Makefile
+++ b/package/socat/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		socat
-PKG_VERSION:=		1.7.2.3
+PKG_VERSION:=		1.7.2.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6943f7a5e1ffd553ad2a900bbf05b83a
+PKG_MD5SUM:=		2a15dc3362f49d543abdbacc267d0a41
 PKG_DESCR:=		A multipurpose relay (SOcket CAT)
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libpthread
@@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SOCAT,socat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		sc_cv_termios_ispeed="no" \
+CONFIGURE_ENV+=		sc_cv_termios_ispeed=no \
 			sc_cv_sys_crdly_shift=9 \
 			sc_cv_sys_tabdly_shift=11 \
 			sc_cv_sys_csize_shift=4
diff --git a/package/socat/patches/501-honor_ldflags.patch b/package/socat/patches/501-honor_ldflags.patch
deleted file mode 100644
index 87c777067..000000000
--- a/package/socat/patches/501-honor_ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN socat-1.4-old/Makefile.in socat-1.4-new/Makefile.in
---- socat-1.7.2.2.orig/Makefile.in	2011-12-06 08:45:03.000000000 +0100
-+++ socat-1.7.2.2/Makefile.in	2013-12-24 16:37:21.000000000 +0100
-@@ -38,7 +38,8 @@ INSTALL = @INSTALL@
- 
- #0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)
- CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(CPPFLAGS)
--CLIBS = $(LIBS)
-+LDFLAGS = @LDFLAGS@
-+CLIBS = $(LDFLAGS) $(LIBS)
- #CLIBS = $(LIBS) -lm -lefence
- XIOSRCS = xioinitialize.c xiohelp.c xioparam.c xiodiag.c xioopen.c xioopts.c \
- 	xiosignal.c xiosigchld.c xioread.c xiowrite.c \
diff --git a/package/socat/patches/patch-Makefile_in b/package/socat/patches/patch-Makefile_in
new file mode 100644
index 000000000..e8e979607
--- /dev/null
+++ b/package/socat/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+--- socat-1.7.2.4.orig/Makefile.in	2014-03-09 15:48:44.000000000 +0100
++++ socat-1.7.2.4/Makefile.in	2014-03-22 12:13:46.000000000 +0100
+@@ -38,7 +38,8 @@ INSTALL = @INSTALL@
+ 
+ #0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS)
+ CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(CPPFLAGS)
+-CLIBS = $(LIBS)
++LDFLAGS = @LDFLAGS@
++CLIBS = $(LDFLAGS) $(LIBS)
+ #CLIBS = $(LIBS) -lm -lefence
+ XIOSRCS = xioinitialize.c xiohelp.c xioparam.c xiodiag.c xioopen.c xioopts.c \
+ 	xiosignal.c xiosigchld.c xioread.c xiowrite.c \
diff --git a/package/socat/patches/patch-configure b/package/socat/patches/patch-configure
new file mode 100644
index 000000000..75b014290
--- /dev/null
+++ b/package/socat/patches/patch-configure
@@ -0,0 +1,23 @@
+--- socat-1.7.2.4.orig/configure	2014-03-09 20:57:51.000000000 +0100
++++ socat-1.7.2.4/configure	2014-03-22 12:20:13.000000000 +0100
+@@ -3347,18 +3347,8 @@ fi
+ # fail
+ 
+ 
+-
+-if test "$CC" = "gcc"; then
+-   CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
+-   ERRONWARN="-Werror -O0"
+-elif test "$CC" = "clang"; then
+-   CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
+-   ERRONWARN="-Werror -O0"
+-#elif Sun Studio
+-#   ERRONWARN="-errwarn"
+-else
+-   ERRONWARN=
+-fi
++CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -Wno-parentheses"
++ERRONWARN="-Werror -O0"
+ export CFLAGS
+ 
+ 
-- 
cgit v1.2.3


From 1422a9f917c0958845b73cb0d8e9e54892962384 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Mar 2014 12:32:35 +0100
Subject: update to latest upstream version

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

diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index cf24b3358..b14e8eaa8 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-video-fbdev
-PKG_VERSION:=		0.4.2
+PKG_VERSION:=		0.4.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a94011aac77eb9cd6d46bf0af0dbc631
+PKG_MD5SUM:=		2b5e6dd218243cf96c1a4090596a6bba
 PKG_DESCR:=		X11 driver for Linux Framebuffer devices
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server
-- 
cgit v1.2.3


From ade8f1154feea499c3743ab14e9ced6783812316 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Mar 2014 16:27:13 +0100
Subject: a bunch of microblaze fixes

---
 mk/image.mk                                       |   2 +-
 target/config/Config.in                           |  17 +-
 target/linux/config/Config.in.flash               |   4 +-
 target/linux/config/Config.in.fs                  |  23 +-
 target/microblaze/sys-available/qemu-microblaze   |   1 +
 target/microblaze/sys-available/qemu-microblazeel |   1 +
 tools/mtd-utils/patches/darwin.patch              | 261 ++++++++++++++++++++++
 tools/squashfs/Makefile                           |   2 +-
 tools/squashfs/patches/darwin.patch               |  88 ++++++++
 9 files changed, 386 insertions(+), 13 deletions(-)
 create mode 100644 tools/mtd-utils/patches/darwin.patch
 create mode 100644 tools/squashfs/patches/darwin.patch

diff --git a/mk/image.mk b/mk/image.mk
index ff95c5cb0..8ae7e087e 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -157,7 +157,7 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
 		-nopad -noappend -root-owned $(MAKE_TRACE)
 
 ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
-	${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \
+	${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -X zlib -r ${TARGET_DIR} \
 		--pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
 
 createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
diff --git a/target/config/Config.in b/target/config/Config.in
index 6125a2c81..84f19adec 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -218,12 +218,12 @@ choice
 prompt "Qemu MICROBLAZE Emulation"
 depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
 
-config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
-	boolean "Xilinx ml605"
-
 config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
 	boolean "Xilinx Spartan S3ADSP1800"
 
+config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
+	boolean "Xilinx ml605"
+
 endchoice
 
 choice
@@ -254,6 +254,8 @@ choice
 prompt "Qemu Emulation with permanent storage device (disk/flash)"
 depends on ADK_HARDWARE_QEMU
 default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_ARCHIVE
+default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_SQUASHFS
+default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_JFFS2
 
 config ADK_TARGET_QEMU_WITHOUT_BLOCK
 	boolean "disabled"
@@ -261,12 +263,14 @@ config ADK_TARGET_QEMU_WITHOUT_BLOCK
 config ADK_TARGET_QEMU_WITH_BLOCK
 	boolean "enabled"
 	select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
-	select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
+	select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
 	select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC
 	select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
 	select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
 	select ADK_KERNEL_PATA_PLATFORM if ADK_LINUX_SH
+	select ADK_HOST_NEED_JFFS2 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
+	select ADK_HOST_NEED_SQUASHFS if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
 
 endchoice
 
@@ -773,15 +777,16 @@ config ADK_TARGET_ROOTFS_SQUASHFS
 	bool "Compressed read-only root filesystem (squashfs)"
 	select ADK_KERNEL_SQUASHFS
 	select ADK_HOST_NEED_SQUASHFS
+	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU
 	depends on ADK_TARGET_WITH_MTD
 	help
 	  highly compressed read-only filesystem for MTD flash systems.
 
 config ADK_TARGET_ROOTFS_JFFS2
 	bool "Compressed read-write root filesystem (jffs2)"
-	select ADK_KERNEL_MISC_FILESYSTEMS
-	select ADK_KERNEL_JFFS2
+	select ADK_KERNEL_JFFS2_FS
 	select ADK_HOST_NEED_JFFS2
+	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU
 	depends on ADK_TARGET_WITH_MTD
 	help
 	  compressed read-write filesystem for MTD flash systems.
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index d8f4faf0f..03976a6d7 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -145,6 +145,6 @@ config ADK_TARGET_MTD
 
 config ADK_TARGET_MTD_SIZE
 	int
-	default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE	
-	default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
+	default "16777216" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
+	default "33554432" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
 	default "0"
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 377122dc5..db50c3a7f 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -11,9 +11,6 @@ config ADK_KERNEL_EXPORTFS
 	boolean
 	default y
 
-config ADK_KERNEL_JFFS2_FS
-	boolean
-
 config ADK_KERNEL_YAFFS_FS
 	tristate
 
@@ -51,6 +48,26 @@ config ADK_KERNEL_SQUASHFS_XZ
 	boolean
 	default n
 
+config ADK_KERNEL_JFFS2_FS_DEBUG
+	int
+	default "1"
+
+config ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS
+	boolean
+	default n
+
+config ADK_KERNEL_JFFS2_ZLIB
+	boolean
+	default n
+
+config ADK_KERNEL_JFFS2_FS
+	prompt "jffs2............................. JFFS2 filesystem"
+	select ADK_KERNEL_MISC_FILESYSTEMS
+	select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS
+	select ADK_KERNEL_JFFS2_ZLIB
+	select ADK_KERNEL_JFFS2_FS_DEBUG
+	boolean
+
 config ADK_KERNEL_SQUASHFS
 	prompt "squashfs.......................... SquashFS filesystem"
 	boolean
diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze
index 63214e39b..ee9cb6a52 100644
--- a/target/microblaze/sys-available/qemu-microblaze
+++ b/target/microblaze/sys-available/qemu-microblaze
@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
 	select ADK_big
 	select ADK_qemu_microblaze
 	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_WITH_MTD
 	select ADK_TARGET_KERNEL_LINUXBIN
 	help
 	 Qemu support for microblaze big endian architecture.
diff --git a/target/microblaze/sys-available/qemu-microblazeel b/target/microblaze/sys-available/qemu-microblazeel
index a58083770..88c1c25db 100644
--- a/target/microblaze/sys-available/qemu-microblazeel
+++ b/target/microblaze/sys-available/qemu-microblazeel
@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
 	select ADK_qemu_microblazeel
 	select ADK_little
 	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_WITH_MTD
 	select ADK_TARGET_KERNEL_LINUXBIN
 	help
 	 Qemu support for microblaze little endian architecture.
diff --git a/tools/mtd-utils/patches/darwin.patch b/tools/mtd-utils/patches/darwin.patch
new file mode 100644
index 000000000..1df2ccba2
--- /dev/null
+++ b/tools/mtd-utils/patches/darwin.patch
@@ -0,0 +1,261 @@
+diff -Nur mtd-utils-1.5.0.orig/common.mk mtd-utils-1.5.0/common.mk
+--- mtd-utils-1.5.0.orig/common.mk	2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-1.5.0/common.mk	2014-03-22 11:25:31.000000000 +0100
+@@ -13,8 +13,6 @@
+ 	$(call cc-option,-Wwrite-strings) \
+ 	$(call cc-option,-Wno-sign-compare)
+ CFLAGS += $(WFLAGS)
+-SECTION_CFLAGS := $(call cc-option,-ffunction-sections -fdata-sections -Wl$(comma)--gc-sections)
+-CFLAGS += $(SECTION_CFLAGS)
+ 
+ ifneq ($(WITHOUT_LARGEFILE), 1)
+   CPPFLAGS += -D_FILE_OFFSET_BITS=64
+diff -Nur mtd-utils-1.5.0.orig/compr_lzo.c mtd-utils-1.5.0/compr_lzo.c
+--- mtd-utils-1.5.0.orig/compr_lzo.c	2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-1.5.0/compr_lzo.c	2014-03-22 11:12:06.000000000 +0100
+@@ -26,7 +26,6 @@
+ #include <string.h>
+ 
+ #ifndef WITHOUT_LZO
+-#include <asm/types.h>
+ #include <linux/jffs2.h>
+ #include <lzo/lzo1x.h>
+ #include "compr.h"
+diff -Nur mtd-utils-1.5.0.orig/compr_zlib.c mtd-utils-1.5.0/compr_zlib.c
+--- mtd-utils-1.5.0.orig/compr_zlib.c	2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-1.5.0/compr_zlib.c	2014-03-22 11:11:57.000000000 +0100
+@@ -39,7 +39,6 @@
+ #include <zlib.h>
+ #undef crc32
+ #include <stdio.h>
+-#include <asm/types.h>
+ #include <linux/jffs2.h>
+ #include "common.h"
+ #include "compr.h"
+diff -Nur mtd-utils-1.5.0.orig/include/byteswap.h mtd-utils-1.5.0/include/byteswap.h
+--- mtd-utils-1.5.0.orig/include/byteswap.h	1970-01-01 01:00:00.000000000 +0100
++++ mtd-utils-1.5.0/include/byteswap.h	2014-03-22 10:52:15.000000000 +0100
+@@ -0,0 +1,25 @@
++#ifndef _BYTESWAP_H
++#define _BYTESWAP_H
++
++#include <stdint.h>
++
++static __inline uint16_t __bswap_16(uint16_t __x)
++{
++        return __x<<8 | __x>>8;
++}
++
++static __inline uint32_t __bswap_32(uint32_t __x)
++{
++        return __x>>24 | __x>>8&0xff00 | __x<<8&0xff0000 | __x<<24;
++}
++
++static __inline uint64_t __bswap_64(uint64_t __x)
++{
++        return __bswap_32(__x)+0ULL<<32 | __bswap_32(__x>>32);
++}
++
++#define bswap_16(x) __bswap_16(x)
++#define bswap_32(x) __bswap_32(x)
++#define bswap_64(x) __bswap_64(x)
++
++#endif
+diff -Nur mtd-utils-1.5.0.orig/include/endian.h mtd-utils-1.5.0/include/endian.h
+--- mtd-utils-1.5.0.orig/include/endian.h	1970-01-01 01:00:00.000000000 +0100
++++ mtd-utils-1.5.0/include/endian.h	2014-03-22 11:09:57.000000000 +0100
+@@ -0,0 +1,20 @@
++#ifndef _ENDIAN_H
++#define _ENDIAN_H
++
++#ifndef __BIG_ENDIAN 
++#define __BIG_ENDIAN 4321 
++#endif 
++	 
++ #ifndef __LITTLE_ENDIAN 
++ #define __LITTLE_ENDIAN 1234 
++ #endif 
++ 
++#ifndef __BYTE_ORDER 
++#define __BYTE_ORDER    __LITTLE_ENDIAN 
++#endif 
++ 
++#ifndef BYTE_ORDER 
++#define BYTE_ORDER      __LITTLE_ENDIAN 
++#endif 
++
++#endif 
+diff -Nur mtd-utils-1.5.0.orig/include/linux/types.h mtd-utils-1.5.0/include/linux/types.h
+--- mtd-utils-1.5.0.orig/include/linux/types.h	1970-01-01 01:00:00.000000000 +0100
++++ mtd-utils-1.5.0/include/linux/types.h	2014-03-22 11:17:12.000000000 +0100
+@@ -0,0 +1,18 @@
++#ifndef _LINUX_TYPES_H
++#define _LINUX_TYPES_H
++
++#include <mtd/ubi-media.h>
++
++typedef uint16_t __u16;
++typedef uint32_t __u32;
++typedef uint64_t __u64;
++
++typedef __u16 __le16;
++typedef __u32 __le32;
++typedef __u64 __le64;
++typedef __u64 off64_t;
++
++typedef __u16  __sum16;
++typedef __u32  __wsum;
++
++#endif /* _LINUX_TYPES_H */
+diff -Nur mtd-utils-1.5.0.orig/include/mtd/jffs2-user.h mtd-utils-1.5.0/include/mtd/jffs2-user.h
+--- mtd-utils-1.5.0.orig/include/mtd/jffs2-user.h	2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-1.5.0/include/mtd/jffs2-user.h	2014-03-22 11:01:37.000000000 +0100
+@@ -9,8 +9,13 @@
+ 
+ /* This file is blessed for inclusion by userspace */
+ #include <linux/jffs2.h>
++#if defined(__APPLE__)
++#include "endian.h"
++#include "byteswap.h"
++#else
+ #include <endian.h>
+ #include <byteswap.h>
++#endif
+ 
+ #undef cpu_to_je16
+ #undef cpu_to_je32
+diff -Nur mtd-utils-1.5.0.orig/include/mtd/mtd-abi.h mtd-utils-1.5.0/include/mtd/mtd-abi.h
+--- mtd-utils-1.5.0.orig/include/mtd/mtd-abi.h	2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-1.5.0/include/mtd/mtd-abi.h	2014-03-22 11:21:06.000000000 +0100
+@@ -171,9 +171,9 @@
+ /* Get info about OOB modes (e.g., RAW, PLACE, AUTO) - legacy interface */
+ #define MEMGETOOBSEL		_IOR('M', 10, struct nand_oobinfo)
+ /* Check if an eraseblock is bad */
+-#define MEMGETBADBLOCK		_IOW('M', 11, __kernel_loff_t)
++#define MEMGETBADBLOCK		_IOW('M', 11, off_t)
+ /* Mark an eraseblock as bad */
+-#define MEMSETBADBLOCK		_IOW('M', 12, __kernel_loff_t)
++#define MEMSETBADBLOCK		_IOW('M', 12, off_t)
+ /* Set OTP (One-Time Programmable) mode (factory vs. user) */
+ #define OTPSELECT		_IOR('M', 13, int)
+ /* Get number of OTP (One-Time Programmable) regions */
+diff -Nur mtd-utils-1.5.0.orig/include/mtd/ubi-media.h mtd-utils-1.5.0/include/mtd/ubi-media.h
+--- mtd-utils-1.5.0.orig/include/mtd/ubi-media.h	2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-1.5.0/include/mtd/ubi-media.h	2014-03-22 11:18:03.000000000 +0100
+@@ -30,7 +30,15 @@
+ #ifndef __UBI_MEDIA_H__
+ #define __UBI_MEDIA_H__
+ 
++#ifdef __linux__
+ #include <asm/byteorder.h>
++#else
++#include <stdint.h> 
++typedef uint8_t __u8; 
++typedef uint16_t __be16; 
++typedef uint32_t __be32; 
++typedef uint64_t __be64; 
++#endif
+ 
+ /* The version of UBI images supported by this implementation */
+ #define UBI_VERSION 1
+diff -Nur mtd-utils-1.5.0.orig/lib/libfec.c mtd-utils-1.5.0/lib/libfec.c
+--- mtd-utils-1.5.0.orig/lib/libfec.c	2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-1.5.0/lib/libfec.c	2014-03-22 11:24:15.000000000 +0100
+@@ -61,8 +61,6 @@
+ };
+ #define gettimeofday(x, dummy) { (x)->ticks = clock() ; }
+ #define DIFF_T(a,b) (1+ 1000000*(a.ticks - b.ticks) / CLOCKS_PER_SEC )
+-typedef unsigned long u_long ;
+-typedef unsigned short u_short ;
+ #else /* typically, unix systems */
+ #include <sys/time.h>
+ #define DIFF_T(a,b) \
+@@ -625,7 +623,7 @@
+ #define FEC_MAGIC	0xFECC0DEC
+ 
+ struct fec_parms {
+-    u_long magic ;
++    unsigned long magic ;
+     int k, n ;		/* parameters of the code */
+     gf *enc_matrix ;
+ } ;
+diff -Nur mtd-utils-1.5.0.orig/lib/libmtd.c mtd-utils-1.5.0/lib/libmtd.c
+--- mtd-utils-1.5.0.orig/lib/libmtd.c	2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-1.5.0/lib/libmtd.c	2014-03-22 11:15:49.000000000 +0100
+@@ -1006,7 +1006,7 @@
+ int mtd_is_bad(const struct mtd_dev_info *mtd, int fd, int eb)
+ {
+ 	int ret;
+-	loff_t seek;
++	off_t seek;
+ 
+ 	ret = mtd_valid_erase_block(mtd, eb);
+ 	if (ret)
+@@ -1015,7 +1015,7 @@
+ 	if (!mtd->bb_allowed)
+ 		return 0;
+ 
+-	seek = (loff_t)eb * mtd->eb_size;
++	seek = (off_t)eb * mtd->eb_size;
+ 	ret = ioctl(fd, MEMGETBADBLOCK, &seek);
+ 	if (ret == -1)
+ 		return mtd_ioctl_error(mtd, eb, "MEMGETBADBLOCK");
+@@ -1025,7 +1025,7 @@
+ int mtd_mark_bad(const struct mtd_dev_info *mtd, int fd, int eb)
+ {
+ 	int ret;
+-	loff_t seek;
++	off_t seek;
+ 
+ 	if (!mtd->bb_allowed) {
+ 		errno = EINVAL;
+@@ -1036,7 +1036,7 @@
+ 	if (ret)
+ 		return ret;
+ 
+-	seek = (loff_t)eb * mtd->eb_size;
++	seek = (off_t)eb * mtd->eb_size;
+ 	ret = ioctl(fd, MEMSETBADBLOCK, &seek);
+ 	if (ret == -1)
+ 		return mtd_ioctl_error(mtd, eb, "MEMSETBADBLOCK");
+diff -Nur mtd-utils-1.5.0.orig/lib/libmtd_legacy.c mtd-utils-1.5.0/lib/libmtd_legacy.c
+--- mtd-utils-1.5.0.orig/lib/libmtd_legacy.c	2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-1.5.0/lib/libmtd_legacy.c	2014-03-22 11:22:18.000000000 +0100
+@@ -234,7 +234,7 @@
+ 	struct stat st;
+ 	struct mtd_info_user ui;
+ 	int fd, ret;
+-	loff_t offs = 0;
++	off_t offs = 0;
+ 	struct proc_parse_info pi;
+ 
+ 	if (stat(node, &st)) {
+diff -Nur mtd-utils-1.5.0.orig/mkfs.jffs2.c mtd-utils-1.5.0/mkfs.jffs2.c
+--- mtd-utils-1.5.0.orig/mkfs.jffs2.c	2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-1.5.0/mkfs.jffs2.c	2014-03-22 11:11:15.000000000 +0100
+@@ -70,7 +70,12 @@
+ #include <sys/xattr.h>
+ #include <sys/acl.h>
+ #endif
++#if defined(__APPLE__)
++#include "endian.h"
++#include "byteswap.h"
++#else
+ #include <byteswap.h>
++#endif
+ #include <crc32.h>
+ #include <inttypes.h>
+ 
+diff -Nur mtd-utils-1.5.0.orig/rbtree.h mtd-utils-1.5.0/rbtree.h
+--- mtd-utils-1.5.0.orig/rbtree.h	2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-1.5.0/rbtree.h	2014-03-22 11:07:58.000000000 +0100
+@@ -94,8 +94,7 @@
+ #ifndef	_LINUX_RBTREE_H
+ #define	_LINUX_RBTREE_H
+ 
+-#include <linux/kernel.h>
+-#include <linux/stddef.h>
++#include <stddef.h>
+ 
+ struct rb_node
+ {
diff --git a/tools/squashfs/Makefile b/tools/squashfs/Makefile
index 423008ff8..06e4215b7 100644
--- a/tools/squashfs/Makefile
+++ b/tools/squashfs/Makefile
@@ -18,7 +18,7 @@ install: ${STAGING_HOST_DIR}/usr/bin/mksquashfs
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
 	${MAKE} -C ${WRKBUILD}/squashfs-tools CC='${CC_FOR_BUILD}' \
-		XZ_SUPPORT=1 CPPFLAGS_FOR_BUILD=$(CPPFLAGS_FOR_BUILD) \
+		XATTR_SUPPORT=0 XZ_SUPPORT=1 CPPFLAGS_FOR_BUILD=$(CPPFLAGS_FOR_BUILD) \
 		EXTRA_LDFLAGS=$(LDFLAGS_FOR_BUILD)
 	@touch $@
 
diff --git a/tools/squashfs/patches/darwin.patch b/tools/squashfs/patches/darwin.patch
new file mode 100644
index 000000000..b1d2ebd2e
--- /dev/null
+++ b/tools/squashfs/patches/darwin.patch
@@ -0,0 +1,88 @@
+diff -Nur squashfs4.2.orig/squashfs-tools/mksquashfs.c squashfs4.2/squashfs-tools/mksquashfs.c
+--- squashfs4.2.orig/squashfs-tools/mksquashfs.c	2011-02-28 23:24:09.000000000 +0100
++++ squashfs4.2/squashfs-tools/mksquashfs.c	2014-03-22 11:32:00.000000000 +0100
+@@ -60,6 +60,10 @@
+ #include <sys/sysinfo.h>
+ #endif
+ 
++#ifndef FNM_EXTMATCH 
++#define FNM_EXTMATCH 0 
++#endif 
++
+ #ifdef SQUASHFS_TRACE
+ #define TRACE(s, args...) \
+ 		do { \
+@@ -721,13 +725,13 @@
+ 			+ (((char *)A) - data_cache)))
+ 
+ 
+-inline void inc_progress_bar()
++static inline void inc_progress_bar()
+ {
+ 	cur_uncompressed ++;
+ }
+ 
+ 
+-inline void update_progress_bar()
++static inline void update_progress_bar()
+ {
+ 	pthread_mutex_lock(&progress_mutex);
+ 	pthread_cond_signal(&progress_wait);
+@@ -735,7 +739,7 @@
+ }
+ 
+ 
+-inline void waitforthread(int i)
++static inline void waitforthread(int i)
+ {
+ 	TRACE("Waiting for thread %d\n", i);
+ 	while(thread[i] != 0)
+@@ -3340,7 +3344,7 @@
+ }
+ 
+ 
+-inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
++static inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir,
+ 	struct inode_info *inode_info, struct dir_info *dir)
+ {
+ 	if((dir->count % DIR_ENTRIES) == 0) {
+diff -Nur squashfs4.2.orig/squashfs-tools/unsquashfs.c squashfs4.2/squashfs-tools/unsquashfs.c
+--- squashfs4.2.orig/squashfs-tools/unsquashfs.c	2011-02-28 23:27:06.000000000 +0100
++++ squashfs4.2/squashfs-tools/unsquashfs.c	2014-03-22 11:36:27.000000000 +0100
+@@ -29,7 +29,13 @@
+ #include "compressor.h"
+ #include "xattr.h"
+ 
++#ifndef FNM_EXTMATCH 
++#define FNM_EXTMATCH 0 
++#endif 
++
++#ifdef __linux__
+ #include <sys/sysinfo.h>
++#endif
+ #include <sys/types.h>
+ 
+ struct cache *fragment_cache, *data_cache;
+@@ -1810,7 +1816,7 @@
+ 			"\n");
+ 
+ 	if(processors == -1) {
+-#ifndef linux
++#if 0
+ 		int mib[2];
+ 		size_t len = sizeof(processors);
+ 
+@@ -1821,11 +1827,13 @@
+ 		mib[1] = HW_NCPU;
+ #endif
+ 
++#ifdef __linux__
+ 		if(sysctl(mib, 2, &processors, &len, NULL, 0) == -1) {
+ 			ERROR("Failed to get number of available processors.  "
+ 				"Defaulting to 1\n");
+ 			processors = 1;
+ 		}
++#endif
+ #else
+ 		processors = sysconf(_SC_NPROCESSORS_ONLN);
+ #endif
-- 
cgit v1.2.3


From 125928117168dcead856747db13be6df2c0ba68a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Mar 2014 21:01:52 +0100
Subject: fix watchdog for musl

---
 package/watchdog/Makefile                       |  7 ++++---
 package/watchdog/patches/patch-include_extern_h |  9 +++++++++
 package/watchdog/patches/patch-src_memory_c     | 11 +++++++++++
 package/watchdog/patches/patch-src_mntent_c     | 11 -----------
 package/watchdog/patches/patch-src_net_c        | 10 ++++++++++
 package/watchdog/patches/patch-src_shutdown_c   | 18 ++++++++++++++++++
 package/watchdog/patches/patch-src_umount_c     | 11 -----------
 7 files changed, 52 insertions(+), 25 deletions(-)
 create mode 100644 package/watchdog/patches/patch-include_extern_h
 create mode 100644 package/watchdog/patches/patch-src_memory_c
 delete mode 100644 package/watchdog/patches/patch-src_mntent_c
 create mode 100644 package/watchdog/patches/patch-src_net_c
 create mode 100644 package/watchdog/patches/patch-src_shutdown_c
 delete mode 100644 package/watchdog/patches/patch-src_umount_c

diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index a4c6d44a5..a8486dd6a 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		watchdog
-PKG_VERSION:=		5.7
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		31766450ecfc9aff70fe966c0b9df06d
+PKG_VERSION:=		5.13
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		153455f008f1cf8f65f6ad9586a21ff1
 PKG_DESCR:=		watchdog daemon
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		libtirpc
@@ -17,6 +17,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WATCHDOG,watchdog,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE
 TARGET_CFLAGS+=		-I$(STAGING_TARGET_DIR)/usr/include/tirpc
 TARGET_LDFLAGS+=	-ltirpc
 
diff --git a/package/watchdog/patches/patch-include_extern_h b/package/watchdog/patches/patch-include_extern_h
new file mode 100644
index 000000000..aea373525
--- /dev/null
+++ b/package/watchdog/patches/patch-include_extern_h
@@ -0,0 +1,9 @@
+--- watchdog-5.13.orig/include/extern.h	2013-02-01 12:15:44.000000000 +0100
++++ watchdog-5.13/include/extern.h	2014-03-22 15:41:57.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include <netinet/in.h>
+ #include <stdio.h>
++#include <time.h>
+ 
+ /* external variables */
+ extern int softboot, watchdog, temp, maxtemp, tint, lastts, nrts;
diff --git a/package/watchdog/patches/patch-src_memory_c b/package/watchdog/patches/patch-src_memory_c
new file mode 100644
index 000000000..06540812e
--- /dev/null
+++ b/package/watchdog/patches/patch-src_memory_c
@@ -0,0 +1,11 @@
+--- watchdog-5.13.orig/src/memory.c	2013-02-01 12:15:44.000000000 +0100
++++ watchdog-5.13/src/memory.c	2014-03-22 16:07:15.000000000 +0100
+@@ -81,7 +81,7 @@ int check_memory(void)
+ 	syslog(LOG_INFO, "currently there are %d kB of free memory available", free);
+ #endif				/* USE_SYSLOG */
+ 
+-    if (free < minpages * (EXEC_PAGESIZE / 1024)) {
++    if (free < minpages * (4096 / 1024)) {
+ #if USE_SYSLOG
+ 	syslog(LOG_ERR, "memory %d kB is less than %d pages", free, minpages);
+ #endif				/* USE_SYSLOG */
diff --git a/package/watchdog/patches/patch-src_mntent_c b/package/watchdog/patches/patch-src_mntent_c
deleted file mode 100644
index f2277bdbf..000000000
--- a/package/watchdog/patches/patch-src_mntent_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- watchdog-5.7.orig/src/mntent.c	2010-01-06 13:42:08.000000000 +0100
-+++ watchdog-5.7/src/mntent.c	2010-02-06 04:39:34.804334839 +0100
-@@ -157,7 +157,7 @@ my_getmntent (mntFILE *mfp) {
- 		if (fgets (buf, sizeof(buf), mfp->mntent_fp) == NULL)
- 			return NULL;
- 
--		s = index (buf, '\n');
-+		s = strchr (buf, '\n');
- 		if (s == NULL) {
- 			/* extremely long line - assume file was corrupted */
- 			mfp->mntent_errs = 1;
diff --git a/package/watchdog/patches/patch-src_net_c b/package/watchdog/patches/patch-src_net_c
new file mode 100644
index 000000000..da56cf791
--- /dev/null
+++ b/package/watchdog/patches/patch-src_net_c
@@ -0,0 +1,10 @@
+--- watchdog-5.13.orig/src/net.c	2013-02-01 12:15:44.000000000 +0100
++++ watchdog-5.13/src/net.c	2014-03-22 16:18:27.000000000 +0100
+@@ -6,6 +6,7 @@
+ 
+ #include <errno.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ #include <netinet/ip.h>
+ #include <netinet/ip_icmp.h>
+ 
diff --git a/package/watchdog/patches/patch-src_shutdown_c b/package/watchdog/patches/patch-src_shutdown_c
new file mode 100644
index 000000000..90ba0ee3c
--- /dev/null
+++ b/package/watchdog/patches/patch-src_shutdown_c
@@ -0,0 +1,18 @@
+--- watchdog-5.13.orig/src/shutdown.c	2013-02-01 12:15:44.000000000 +0100
++++ watchdog-5.13/src/shutdown.c	2014-03-22 16:29:44.000000000 +0100
+@@ -186,6 +186,7 @@ static void mnt_off()
+     FILE *fp;
+     struct mntent *mnt;
+ 
++#if defined __GLIBC__
+     fp = setmntent(MNTTAB, "r");
+     /* in some rare cases fp might be NULL so be careful */
+     while (fp != NULL && ((mnt = getmntent(fp)) != (struct mntent *) 0)) {
+@@ -241,6 +242,7 @@ static void mnt_off()
+ #endif
+     }
+     endmntent(fp);
++#endif
+ }
+ 
+ /* Parts of the following two functions are taken from Miquel van */
diff --git a/package/watchdog/patches/patch-src_umount_c b/package/watchdog/patches/patch-src_umount_c
deleted file mode 100644
index 6b5a82c1f..000000000
--- a/package/watchdog/patches/patch-src_umount_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- watchdog-5.7.orig/src/umount.c	2010-01-06 13:42:08.000000000 +0100
-+++ watchdog-5.7/src/umount.c	2010-02-06 04:39:47.664334843 +0100
-@@ -212,7 +212,7 @@ umount_one (const char *spec, const char
- 	    if (res < 0)
- 		 umnt_err2 = errno;
- 	    /* Do not complain about remote NFS mount points */
--	    if (errno == ENOENT && index(spec, ':'))
-+	    if (errno == ENOENT && strchr(spec, ':'))
- 		 umnt_err2 = 0;
-        }
-   }
-- 
cgit v1.2.3


From 0206674a310f199e0d02e2207a9ecb2d37dad34a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Mar 2014 21:02:48 +0100
Subject: fix libtirpc for musl

---
 package/libtirpc/Makefile                          |   4 +-
 package/libtirpc/patches/patch-src_auth_des_c      |  18 +
 package/libtirpc/patches/patch-src_auth_none_c     |  10 +
 package/libtirpc/patches/patch-src_auth_time_c     |  18 +-
 package/libtirpc/patches/patch-src_auth_unix_c     |  10 +
 package/libtirpc/patches/patch-src_authdes_prot_c  |   7 +
 package/libtirpc/patches/patch-src_authunix_prot_c |  10 +
 package/libtirpc/patches/patch-src_bindresvport_c  |  18 +
 package/libtirpc/patches/patch-src_clnt_bcast_c    |  22 +
 package/libtirpc/patches/patch-src_clnt_perror_c   |  10 +
 package/libtirpc/patches/patch-src_clnt_simple_c   |  10 +
 package/libtirpc/patches/patch-src_crypt_client_c  |  10 +
 package/libtirpc/patches/patch-src_des_crypt_c     |  10 +-
 package/libtirpc/patches/patch-src_des_soft_c      |   9 +
 package/libtirpc/patches/patch-src_getnetcon