From 0cefe8a1ad706687651dd1e3e1f9319856142740 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 6 Mar 2014 13:44:33 +0100
Subject: disable for uClibc until found a fix

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

diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index c0c5f749a..1dbf981cf 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		libmpc gmp mpfr
 PKG_SUBPKGS:=		GCC GXX
 PKGSD_GXX:=		GNU C++ compiler
 
+PKG_LIBC_DEPENDS:=	glibc musl
+
 WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
 
 include ${TOPDIR}/mk/package.mk
-- 
cgit v1.2.3


From 82c6a8783762311101d342edef1d8492b0feac52 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 6 Mar 2014 17:15:30 +0100
Subject: fix cross-compile of gcc, when using uClibc. --dynamic-linker was
 using /lib/ld-uClibc.so.0

---
 package/gcc/Makefile   | 2 --
 toolchain/gcc/Makefile | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 1dbf981cf..c0c5f749a 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -14,8 +14,6 @@ PKG_BUILDDEP:=		libmpc gmp mpfr
 PKG_SUBPKGS:=		GCC GXX
 PKGSD_GXX:=		GNU C++ compiler
 
-PKG_LIBC_DEPENDS:=	glibc musl
-
 WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
 
 include ${TOPDIR}/mk/package.mk
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 138e3a0d0..f32b1836d 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -18,6 +18,7 @@ GCC_CONFOPTS=		--prefix=$(STAGING_HOST_DIR) \
 			--with-libelf=$(STAGING_HOST_DIR) \
 			--disable-__cxa_atexit \
 			--with-gnu-ld \
+			--with-gnu-as \
 			--disable-libsanitizer \
 			--disable-libitm \
 			--disable-libmudflap \
@@ -176,6 +177,7 @@ $(GCC_BUILD_DIR_FINAL)/.configured:
 		$(WRKBUILD)/configure \
 			${GCC_CONFOPTS} \
 			--enable-languages=$(LANGUAGES) \
+			--with-build-sysroot='$${prefix}/${STAGING_HOST2TARGET}' \
 			--with-sysroot='$${prefix}/${STAGING_HOST2TARGET}' \
 			--enable-shared
 	touch $@
-- 
cgit v1.2.3


From 6ef0624986254ca2400a7355e296373fd54a1be8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 6 Mar 2014 17:16:25 +0100
Subject: don't remember why this workaround was added. it is in since import
 from FreeWRT.

---
 toolchain/uClibc/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index b935a2f53..e5f1d8cac 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -114,8 +114,6 @@ endif
 		RUNTIME_PREFIX=/ \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		all install_runtime
-	rm -rf $(STAGING_TARGET_DIR)/lib/libc.so
-	ln -s libc.so.0 $(STAGING_TARGET_DIR)/lib/libc.so
 	# cleanup toolchain
 	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
 ifeq ($(ADK_TOOLCHAIN),y)
-- 
cgit v1.2.3


From 55f281db11492d5bb26d6d9cef9ec7d544a2ba4e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 6 Mar 2014 17:16:52 +0100
Subject: Update TODO

---
 TODO | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/TODO b/TODO
index b88cd69be..362a8f944 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,11 @@
+- rework startup, maybe use init.c, start gettys after bootup ready
+- more output for initscripts on bootup
 - port uuterm
 - move tools to package host infrastructure, resolve dependency handling for host tools
 - finish miniconfig + cleanup
 - qemu-sh serial
 - choice qemu with graphic
 - x32 musl
-- socat openssl flavour + update
-- hash-style=gnu for non-mips and non-musl
-- add misp64 n32/n64 toolchains
 - hash-style=gnu for non-mips and non-musl
 - add fb full screen logo
 - port opkg with gpg signing
-- 
cgit v1.2.3


From af4625df716292b76560beb7747feffd134a30ee Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 6 Mar 2014 17:25:33 +0100
Subject: enable tls, after the gcc fix

---
 package/jamvm/Makefile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 4c0798c26..efa23e869 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		jamvm
 PKG_VERSION:=		1.5.4
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		7654e9657691f5f09c4f481ed4686176
 PKG_DESCR:=		A Java Virtual Machine (JVM) implementation
 PKG_SECTION:=		lang
@@ -28,12 +28,6 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 CONFIGURE_ARGS+=	--enable-ffi
-ifeq ($(ARCH),mips)
-CONFIGURE_ARGS+=	--disable-tls
-endif
-ifeq ($(ARCH),arm)
-CONFIGURE_ARGS+=	--disable-tls
-endif
 
 hostpost-install:
 	ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/bin/java
-- 
cgit v1.2.3


From 2acd2f343b691df2dc37ecbec62adbc1c575bef2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 6 Mar 2014 18:07:34 +0100
Subject: mark p5-XML-Parser as broken for now

---
 mk/perl.mk                     |  2 +-
 package/p5-XML-Parser/Makefile | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mk/perl.mk b/mk/perl.mk
index 61ce6a52c..84e423920 100644
--- a/mk/perl.mk
+++ b/mk/perl.mk
@@ -1,2 +1,2 @@
-PERL_VERSION=5.12.3
+PERL_VERSION=5.18.1
 PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION)/$(CPU_ARCH)-linux
diff --git a/package/p5-XML-Parser/Makefile b/package/p5-XML-Parser/Makefile
index 13406fb9e..7c7745181 100644
--- a/package/p5-XML-Parser/Makefile
+++ b/package/p5-XML-Parser/Makefile
@@ -5,14 +5,16 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		p5-XML-Parser
 PKG_VERSION:=		2.40
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		c66e9adba003d0667cc40115ccd837a5
 PKG_DESCR:=		XML::Parser
 PKG_SECTION:=		lang
-PKG_DEPENDS:=		libexpat
-PKG_BUILDDEP:=		expat
+PKG_DEPENDS:=		perl libexpat
+PKG_BUILDDEP:=		perl-host expat
 PKG_SITES:=		http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/
 
+PKG_CFLINE_P5_XML_PARSER:=	depends on ADK_BROKEN
+
 DISTFILES:=             XML-Parser-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/XML-Parser-${PKG_VERSION}
 
@@ -26,7 +28,10 @@ XAKE_FLAGS+=		CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS)"
 include $(TOPDIR)/mk/perl.mk
 
 pre-build:
-	(cd ${WRKSRC} && perl Makefile.PL EXPATLIBPATH=${STAGING_TARGET_DIR}/usr/lib EXPATINCPATH=${STAGING_TARGET_DIR}/usr/include)
+	(cd ${WRKSRC} && PATH='${HOST_PATH}' \
+		perl-host Makefile.PL \
+		EXPATLIBPATH=${STAGING_TARGET_DIR}/usr/lib \
+		EXPATINCPATH=${STAGING_TARGET_DIR}/usr/include)
 
 p5-xml-parser-install:
 	$(INSTALL_DIR) $(IDIR_P5_XML_PARSER)$(PERL_SITEDIR)
-- 
cgit v1.2.3


From a9254f4b25b3b91c349ca0f6ca6f30280ba7bf3b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 6 Mar 2014 18:14:31 +0100
Subject: remove some broken packages entirely

---
 package/epdfview/Makefile                          | 31 -----------
 package/miax/Makefile                              | 36 -------------
 package/miax/patches/01-cross.patch                | 24 ---------
 package/proftpd/Makefile                           | 43 ----------------
 package/proftpd/files/ftpusers                     | 37 -------------
 package/proftpd/files/proftpd.conf                 | 60 ----------------------
 package/proftpd/files/proftpd.conffiles            |  2 -
 package/proftpd/files/proftpd.init                 | 29 -----------
 package/proftpd/files/proftpd.postinst             |  3 --
 package/proftpd/patches/patch-Make_rules_in        | 16 ------
 package/proftpd/patches/patch-Makefile_in          | 33 ------------
 package/proftpd/patches/patch-locale_Makefile_in   | 11 ----
 .../proftpd/patches/patch-modules_mod_auth_unix_c  | 29 -----------
 package/ussp-push/Makefile                         | 28 ----------
 package/ussp-push/patches/patch-src_obex_socket_c  | 21 --------
 15 files changed, 403 deletions(-)
 delete mode 100644 package/epdfview/Makefile
 delete mode 100644 package/miax/Makefile
 delete mode 100644 package/miax/patches/01-cross.patch
 delete mode 100644 package/proftpd/Makefile
 delete mode 100644 package/proftpd/files/ftpusers
 delete mode 100644 package/proftpd/files/proftpd.conf
 delete mode 100644 package/proftpd/files/proftpd.conffiles
 delete mode 100644 package/proftpd/files/proftpd.init
 delete mode 100644 package/proftpd/files/proftpd.postinst
 delete mode 100644 package/proftpd/patches/patch-Make_rules_in
 delete mode 100644 package/proftpd/patches/patch-Makefile_in
 delete mode 100644 package/proftpd/patches/patch-locale_Makefile_in
 delete mode 100644 package/proftpd/patches/patch-modules_mod_auth_unix_c
 delete mode 100644 package/ussp-push/Makefile
 delete mode 100644 package/ussp-push/patches/patch-src_obex_socket_c

diff --git a/package/epdfview/Makefile b/package/epdfview/Makefile
deleted file mode 100644
index f8349b328..000000000
--- a/package/epdfview/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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:=		epdfview
-PKG_VERSION:=		0.1.8
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		0c57d5e33adbfba047ffa13e570f79d6
-PKG_DESCR:=		lightweight pdf viewer
-PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		poppler libgtk
-PKG_BUILDDEP:=		poppler gtk+
-PKG_URL:=		http://trac.emma-soft.com/epdfview/wiki
-PKG_SITES:=		http://openadk.org/distfiles
-
-PKG_CFLINE_EPDFVIEW:=  depends on ADK_BROKEN
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,EPDFVIEW,epdfview,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-epdfview-install:
-	$(INSTALL_DIR) $(IDIR_EPDFVIEW)/usr/share/epdfview
-	$(CP) $(WRKINST)/usr/share/epdfview/* \
-		$(IDIR_EPDFVIEW)/usr/share/epdfview
-	$(INSTALL_DIR) $(IDIR_EPDFVIEW)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/epdfview \
-		$(IDIR_EPDFVIEW)/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/miax/Makefile b/package/miax/Makefile
deleted file mode 100644
index 675c1f6b7..000000000
--- a/package/miax/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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:=		miax
-PKG_VERSION:=		1.4
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		44f0d2ef46ee2697d890b7b96846adc7
-PKG_DESCR:=		A console iax (asterisk) client
-PKG_SECTION:=		misc
-PKG_DEPENDS:=		libpthread
-PKG_URL:=		http://sourceforge.net/projects/miax
-PKG_SITES:=		http://mesh.dl.sourceforge.net/sourceforge/miax/
-PKG_CFLINE_MIAX:=	depends on ADK_BROKEN
-
-DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.tar.gz
-WRKDIST=		${WRKDIR}/${PKG_NAME}
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,MIAX,miax,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-MAKE_FLAGS+=		CC="${TARGET_CC}" \
-			OFLAGS="${TARGET_CFLAGS}" \
-			CPPFLAGS="${TARGET_CPPFLAGS}" \
-			LDFLAGS="${TARGET_LDFLAGS}"
-
-do-install:
-	${INSTALL_DIR} ${IDIR_MIAX}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/miax ${IDIR_MIAX}/usr/bin/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/miax/patches/01-cross.patch b/package/miax/patches/01-cross.patch
deleted file mode 100644
index 04ec04d78..000000000
--- a/package/miax/patches/01-cross.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN miax-1.4-old/Makefile miax-1.4-new/Makefile
---- miax.orig/Makefile	2005-04-27 18:56:13.000000000 +0200
-+++ miax/Makefile	2013-12-22 09:48:41.000000000 +0100
-@@ -1,4 +1,5 @@
--CFLAGS= -Iiax/ -Igsm/inc -DIAXC_IAX2 -DLIBIAX -g -DPOSIXSLEEP -DLINUX -O2 
-+OFLAGS= -02 -g
-+CFLAGS= -Iiax/ -Igsm/inc $(CPPFLAGS) -DIAXC_IAX2 -DLIBIAX -DPOSIXSLEEP -DLINUX $(OFLAGS)
- SYSLIBS=-lpthread -lm -lbluetooth
- 
- 
-@@ -32,11 +33,10 @@ OBJS=\
- 	miax.o
- 
- all: $(OBJS)
--	gcc $(OBJS) $(CFLAGS) $(SYSLIBS)  -o miax
--	cp miax /bin/miax
-+	$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) $(SYSLIBS) -o miax
- 
- static: $(OBJS) bluetooth.o 
--	gcc $(OBJS) $(CFLAGS) $(SYSLIBS)  -static -o miax
-+	$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) $(SYSLIBS) -static -o miax
- 
- clean: 
- 	rm -f $(OBJS) miax 
diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile
deleted file mode 100644
index ff15a601b..000000000
--- a/package/proftpd/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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:=		proftpd
-PKG_VERSION:=		1.3.4d
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		13c6fd7ce320886adc371c81a3e23f07
-PKG_DESCR:=		A very configurable FTP server
-PKG_SECTION:=		www
-PKG_URL:=		http://www.proftpd.org/
-PKG_SITES:=		ftp://ftp.proftpd.org/distrib/source/
-PKG_NOPARALLEL:=	1
-
-PKG_LIBC_DEPENDS:=	glibc
-PKG_CFLINE_PROFTPD:=	depends on ADK_BROKEN
-
-PKG_FLAVOURS_PROFTPD:=	WITH_FTPUSERS
-PKGFD_WITH_FTPUSERS:=	install /etc/ftpusers along with proftpd
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,PROFTPD,proftpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ARGS+=	--disable-cap
-CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes \
-			ac_cv_func_setgrent_void=yes
-TARGET_LDFLAGS+=	-ltinfo
-
-proftpd-install:
-	$(INSTALL_DIR) $(IDIR_PROFTPD)/etc
-	$(INSTALL_DATA) ./files/proftpd.conf $(IDIR_PROFTPD)/etc/
-	$(INSTALL_DIR) $(IDIR_PROFTPD)/usr/{s,}bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/ftp{count,dctl,top,who} \
-		$(IDIR_PROFTPD)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/{ftpshut,proftpd} \
-		$(IDIR_PROFTPD)/usr/sbin/
-ifeq (${ADK_PACKAGE_PROFTPD_WITH_FTPUSERS},y)
-	${INSTALL_DATA} ./files/ftpusers ${IDIR_PROFTPD}/etc/
-endif
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/proftpd/files/ftpusers b/package/proftpd/files/ftpusers
deleted file mode 100644
index 4bc8872dc..000000000
--- a/package/proftpd/files/ftpusers
+++ /dev/null
@@ -1,37 +0,0 @@
-# Provided by ftpbase (dont remove this line!)
-# /etc/ftpusers: list of users disallowed FTP access
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/files/ftpusers,v 1.1 2005/06/28 14:52:26 uberlord Exp $
-
-halt
-operator
-root
-shutdown
-sync
-bin
-daemon
-adm
-lp
-mail
-postmaster
-news
-uucp
-man
-games
-at
-cron
-www
-named
-squid
-gdm
-mysql
-postgres
-guest
-nobody
-alias
-qmaild
-qmaill
-qmailp
-qmailq
-qmailr
-qmails
-postfix
diff --git a/package/proftpd/files/proftpd.conf b/package/proftpd/files/proftpd.conf
deleted file mode 100644
index 8d4f7f2fa..000000000
--- a/package/proftpd/files/proftpd.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-ServerName			"ProFTPD Default Installation"
-ServerType			standalone
-DefaultServer			on
-
-# Port 21 is the standard FTP port.
-Port				21
-
-# Don't use IPv6 support by default.
-UseIPv6				off
-
-# Umask 022 is a good standard umask to prevent new dirs and files
-# from being group and world writable.
-Umask				022
-
-# To prevent DoS attacks, set the maximum number of child processes
-# to 30.  If you need to allow more than 30 concurrent connections
-# at once, simply increase this value.  Note that this ONLY works
-# in standalone mode, in inetd mode you should use an inetd server
-# that allows you to limit maximum number of processes per service
-# (such as xinetd).
-MaxInstances			30
-
-# Set the user and group under which the server will run.
-User				nobody
-Group				nogroup
-
-# To cause every FTP user to be "jailed" (chrooted) into their home
-# directory, uncomment this line.
-#DefaultRoot ~
-
-# Normally, we want files to be overwriteable.
-AllowOverwrite		on
-
-# Bar use of SITE CHMOD by default
-<Limit SITE_CHMOD>
-  DenyAll
-</Limit>
-
-# A basic anonymous configuration, no upload directories.  If you do not
-# want anonymous users, simply delete this entire <Anonymous> section.
-<Anonymous ~ftp>
-  User				ftp
-  Group				ftp
-
-  # We want clients to be able to login with "anonymous" as well as "ftp"
-  UserAlias			anonymous ftp
-
-  # Limit the maximum number of anonymous logins
-  MaxClients			10
-
-  # We want 'welcome.msg' displayed at login, and '.message' displayed
-  # in each newly chdired directory.
-  DisplayLogin			welcome.msg
-  DisplayChdir			.message
-
-  # Limit WRITE everywhere in the anonymous chroot
-  <Limit WRITE>
-    DenyAll
-  </Limit>
-</Anonymous>
diff --git a/package/proftpd/files/proftpd.conffiles b/package/proftpd/files/proftpd.conffiles
deleted file mode 100644
index 3ff0fb2e3..000000000
--- a/package/proftpd/files/proftpd.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/proftpd.conf
-/etc/ftpusers
diff --git a/package/proftpd/files/proftpd.init b/package/proftpd/files/proftpd.init
deleted file mode 100644
index 8e605652d..000000000
--- a/package/proftpd/files/proftpd.init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#PKG proftpd
-#INIT 60
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
-	test x"${proftpd:-NO}" = x"NO" && exit 0
-	exec sh $0 start
-	;;
-start)
-	[ -f /etc/proftpd.conf ] || exit
-	/usr/sbin/proftpd
-	;;
-stop)
-	kill $(pgrep -f /usr/sbin/proftpd)
-	;;
-restart)
-	sh $0 stop
-	sleep 1
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start | stop | restart}"
-	exit 1
-	;;
-esac
-exit $?
diff --git a/package/proftpd/files/proftpd.postinst b/package/proftpd/files/proftpd.postinst
deleted file mode 100644
index 0b3fa08aa..000000000
--- a/package/proftpd/files/proftpd.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf proftpd proftpd NO
diff --git a/package/proftpd/patches/patch-Make_rules_in b/package/proftpd/patches/patch-Make_rules_in
deleted file mode 100644
index e305b0c38..000000000
--- a/package/proftpd/patches/patch-Make_rules_in
+++ /dev/null
@@ -1,16 +0,0 @@
-	do not try to set user or group id when installing
---- proftpd-1.3.3.orig/Make.rules.in	2009-11-18 22:48:25.000000000 +0100
-+++ proftpd-1.3.3/Make.rules.in	2010-05-30 12:47:38.265625000 +0200
-@@ -28,9 +28,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@
- INSTALL=@INSTALL@
- INSTALL_USER=@install_user@
- INSTALL_GROUP=@install_group@
--INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
--INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
--INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
-+INSTALL_BIN=$(INSTALL) -m 0755
-+INSTALL_SBIN=$(INSTALL) -m 0755
-+INSTALL_MAN=$(INSTALL) -m 0644
- 
- RM=rm -f
- SHELL=@CONFIG_SHELL@
diff --git a/package/proftpd/patches/patch-Makefile_in b/package/proftpd/patches/patch-Makefile_in
deleted file mode 100644
index 0f1bdd799..000000000
--- a/package/proftpd/patches/patch-Makefile_in
+++ /dev/null
@@ -1,33 +0,0 @@
-	hiding it won't help, we install as non-root so no chown possible
---- proftpd-1.3.3.orig/Makefile.in	2009-12-16 00:24:42.000000000 +0100
-+++ proftpd-1.3.3/Makefile.in	2010-05-30 12:47:41.187500000 +0200
-@@ -79,7 +79,6 @@ check: proftpd$(EXEEXT)
- $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8:
- 	@if [ ! -d $@ ]; then \
- 		mkdir -p $@; \
--		chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
- 		chmod 0755 $@; \
- 	fi
- 
-@@ -89,7 +88,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc
- 		rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
- 	fi
- 	ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd
--	-chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd
- 
- install-libs: $(DESTDIR)$(libdir)/proftpd
- 	cd lib/ && $(MAKE) install
-@@ -125,11 +123,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE
- 	$(INSTALL_SBIN) ftpshut  $(DESTDIR)$(sbindir)/ftpshut
- 	$(INSTALL_BIN)  ftptop   $(DESTDIR)$(bindir)/ftptop
- 	$(INSTALL_BIN)  ftpwho   $(DESTDIR)$(bindir)/ftpwho
--	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
-+	$(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
- 
- install-conf: $(DESTDIR)$(sysconfdir)
- 	if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \
--		$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \
-+		$(INSTALL) -m 0644 \
- 		           $(top_srcdir)/sample-configurations/basic.conf \
- 	       	           $(DESTDIR)$(sysconfdir)/proftpd.conf ; \
- 	fi
diff --git a/package/proftpd/patches/patch-locale_Makefile_in b/package/proftpd/patches/patch-locale_Makefile_in
deleted file mode 100644
index 91f274ebd..000000000
--- a/package/proftpd/patches/patch-locale_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-	drop anything that has to do with owner/group changing *grrr*
---- proftpd-1.3.2b.orig/locale/Makefile.in	2009-04-29 00:50:22.000000000 +0200
-+++ proftpd-1.3.2b/locale/Makefile.in	2010-01-20 18:03:53.909480484 +0100
-@@ -51,7 +51,6 @@ install: $(LANGS)
- 		if [ -f $$lang.mo ]; then \
-  			if [ ! -d $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES ]; then \
- 				mkdir -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
--				chown $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
- 				chmod 0755 $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
- 			fi; \
- 			$(INSTALL_MAN) $$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
diff --git a/package/proftpd/patches/patch-modules_mod_auth_unix_c b/package/proftpd/patches/patch-modules_mod_auth_unix_c
deleted file mode 100644
index a439d6b5a..000000000
--- a/package/proftpd/patches/patch-modules_mod_auth_unix_c
+++ /dev/null
@@ -1,29 +0,0 @@
---- proftpd-1.3.3.orig/modules/mod_auth_unix.c	2009-10-14 20:49:31.000000000 +0200
-+++ proftpd-1.3.3/modules/mod_auth_unix.c	2010-05-30 13:02:15.515625000 +0200
-@@ -77,6 +77,7 @@
- # endif
- #endif /* PR_USE_SIA */
- 
-+/*
- #ifdef CYGWIN
- typedef void *HANDLE;
- typedef unsigned long DWORD;
-@@ -85,7 +86,8 @@ typedef unsigned long DWORD;
- DWORD WINAPI GetVersion(void);
- extern HANDLE cygwin_logon_user (const struct passwd *, const char *);
- extern void cygwin_set_impersonation_token (const HANDLE);
--#endif /* CYGWIN */
-+#endif 
-+*/
- 
- #ifdef SETGRENT_VOID
- # define RETSETGRENTTYPE	void
-@@ -738,7 +740,7 @@ MODRET pw_check(cmd_rec *cmd) {
- 
- #else /* !PR_USE_SIA */
- 
--# ifdef CYGWIN
-+# if 0
-   /* We have to do special Windows NT voodoo with Cygwin in order to be
-    * able to switch UID/GID. More info at
-    * http://cygwin.com/cygwin-ug-net/ntsec.html#NTSEC-SETUID
diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile
deleted file mode 100644
index c10b1ee5e..000000000
--- a/package/ussp-push/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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:=		ussp-push
-PKG_VERSION:=		0.11
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		5c44983ee27809867041feff6bb4423a
-PKG_DESCR:=		OBEX push command
-PKG_SECTION:=		misc
-PKG_DEPENDS:=		openobex
-PKG_BUILDDEP:=		openobex
-PKG_SITES:=		http://xmailserver.org/
-PKG_CFLINE_USSP_PUSH:=	depends on ADK_BROKEN
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,USSP_PUSH,ussp-push,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-MAKE_FLAGS+=		OBEXINC="${TARGET_CPPFLAGS}" \
-			OBEXLIB="${TARGET_LDFLAGS} -lopenobex -lbluetooth"
-
-ussp-push-install:
-	${INSTALL_DIR} ${IDIR_USSP_PUSH}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/ussp-push ${IDIR_USSP_PUSH}/usr/bin/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ussp-push/patches/patch-src_obex_socket_c b/package/ussp-push/patches/patch-src_obex_socket_c
deleted file mode 100644
index 770775175..000000000
--- a/package/ussp-push/patches/patch-src_obex_socket_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ussp-push-0.11.orig/src/obex_socket.c	2008-08-24 22:48:53.000000000 +0200
-+++ ussp-push-0.11/src/obex_socket.c	2008-10-16 11:08:10.000000000 +0200
-@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
- 	for (i = 0; i < niinf; i++) {
- 		char devname[128];
- 
--		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
-+		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
- 				    devname, 100000) >= 0) {
- 			if (strcasecmp(devname, btname) == 0) {
- 				*btaddr = piinf[i].bdaddr;
-@@ -297,7 +297,7 @@ static int cobex_init(struct cobex_conte
- 			gt->wfd = gt->rfd;
- 
- 			tcgetattr(gt->rfd, &gt->oldtio);
--			bzero(&gt->newtio, sizeof(struct termios));
-+			memset(&gt->newtio, 0, sizeof(struct termios));
- 			gt->newtio.c_cflag = B115200 | CS8 | CREAD;
- 			gt->newtio.c_iflag = IGNPAR;
- 			gt->newtio.c_oflag = 0;
-- 
cgit v1.2.3


From 4bf2218941e4eaeec2ce318865044469f3553353 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 7 Mar 2014 07:48:07 +0100
Subject: fix build for linux-uclibcfoo system

---
 mk/build.mk                                      |  5 +----
 package/cyrus-sasl/Makefile                      |  7 +++----
 package/cyrus-sasl/patches/patch-config_ltconfig | 13 +++++++++++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/mk/build.mk b/mk/build.mk
index b6de5f992..42d75bbcd 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -310,7 +310,7 @@ all: menuconfig
 # ---------------------------------------------------------------------------
 
 # force entering the subdir, as dependency checking is done there
-.PHONY: $(CONFIG)/conf $(CONFIG)/mconf $(CONFIG)/gconf
+.PHONY: $(CONFIG)/conf $(CONFIG)/mconf
 
 $(CONFIG)/conf:
 	@$(MAKE) -C $(CONFIG) conf
@@ -318,9 +318,6 @@ $(CONFIG)/conf:
 $(CONFIG)/mconf:
 	@$(MAKE) -C $(CONFIG)
 
-$(CONFIG)/gconf:
-	@$(MAKE) -C $(CONFIG) gconf
-
 defconfig: .menu $(CONFIG)/conf
 	@${BASH} ${TOPDIR}/scripts/update-sys
 	@${BASH} ${TOPDIR}/scripts/update-pkg
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index b3e1794b0..9ffae6c92 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cyrus-sasl
 PKG_VERSION:=		2.1.26
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		a7f4e5e559a0e37b3ffc438c9456e425
 PKG_DESCR:=		a general purpose authentication library
 PKG_SECTION:=		libs
@@ -21,10 +21,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_ARGS+=	--enable-staticdlopen \
-			--enable-plain \
-			--enable-anon \
+CONFIGURE_ARGS+=	--enable-plain \
 			--enable-login \
+			--disable-anon \
 			--disable-cram \
 			--disable-digest \
 			--disable-scram \
diff --git a/package/cyrus-sasl/patches/patch-config_ltconfig b/package/cyrus-sasl/patches/patch-config_ltconfig
index 7112c26e1..1a04b28e0 100644
--- a/package/cyrus-sasl/patches/patch-config_ltconfig
+++ b/package/cyrus-sasl/patches/patch-config_ltconfig
@@ -1,5 +1,14 @@
---- cyrus-sasl-2.1.23.orig/config/ltconfig	2003-06-12 02:32:43.000000000 +0200
-+++ cyrus-sasl-2.1.23/config/ltconfig	2011-08-08 10:54:43.509265006 +0200
+--- cyrus-sasl-2.1.26.orig/config/ltconfig	2012-10-12 16:05:48.000000000 +0200
++++ cyrus-sasl-2.1.26/config/ltconfig	2014-03-07 07:46:01.000000000 +0100
+@@ -2024,7 +2024,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
 @@ -2034,16 +2034,7 @@ linux-gnu*)
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
-- 
cgit v1.2.3


From 3f286c568e3f02b29e61757175f79539e4c6c967 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 7 Mar 2014 08:41:38 +0100
Subject: update mksh

---
 package/mksh/Makefile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index 1c18044f3..159a3efda 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -4,17 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mksh
-PKG_VERSION:=		48b
+PKG_VERSION:=		49
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ab9baa6b5a4de9d0e6a3ce9957c18da0
+PKG_MD5SUM:=		e8c205cac72c3dc8540bbc3897421422
 PKG_DESCR:=		MirBSD Korn Shell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.mirbsd.org/
 PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
 
-PKG_FLAVOURS_MKSH:=	FULL
-PKGFD_FULL:=		Include all features
-
 DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/${PKG_NAME}
 
@@ -22,10 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),)
 TARGET_CPPFLAGS+=	-DMKSH_SMALL=1
-endif
-
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
-- 
cgit v1.2.3


From 35137e6c091fcb33147ad58d52140659a63affdc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 7 Mar 2014 09:57:47 +0100
Subject: add ccache to host tools

---
 scripts/scan-pkgs.sh          |  7 -------
 target/config/Config.in.adk   |  1 +
 target/config/Config.in.tools |  4 ++++
 tools/Makefile                |  3 +++
 tools/ccache/Makefile         | 25 +++++++++++++++++++++++++
 5 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 tools/ccache/Makefile

diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 5563dcca2..8af04795b 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -83,11 +83,4 @@ if [[ -n $NEED_JAVA ]]; then
 	fi
 fi
 
-if [[ -n $ADK_USE_CCACHE ]]; then
-        if ! which ccache >/dev/null 2>&1; then
-                echo >&2 You have selected to build with ccache, but ccache could not be found.
-                out=1
-        fi
-fi
-
 exit $out
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index c8f820321..46de14044 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -46,6 +46,7 @@ config ADK_WGET_TIMEOUT
 
 config ADK_USE_CCACHE
 	bool "Use ccache to speedup recompilation"
+	select ADK_HOST_NEED_CCACHE
 	default n
 	help
 	  Useful if you have enough space for the cache and need speedup compilation.
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index d863179b8..c4dcdace4 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -34,6 +34,10 @@ config ADK_HOST_NEED_XZ
 	boolean
 	default n
 
+config ADK_HOST_NEED_CCACHE
+	boolean
+	default n
+
 config ADK_TOOLS_ADDPATTERN_ARGS
 	string
 	default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G
diff --git a/tools/Makefile b/tools/Makefile
index 2d29372dc..a8156cb79 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -29,6 +29,9 @@ endif
 ifeq ($(ADK_HOST_NEED_LZMA),y)
 TARGETS+=lzma
 endif
+ifeq ($(ADK_HOST_NEED_CCACHE),y)
+TARGETS+=ccache
+endif
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
new file mode 100644
index 000000000..fde838067
--- /dev/null
+++ b/tools/ccache/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		ccache
+PKG_VERSION:=		3.1.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a5e9954b1dae036762f7b13673a2cf76
+PKG_SITES:=		http://samba.org/ftp/ccache/
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/ccache
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	(cd ${WRKBUILD}; ./configure --prefix=$(STAGING_HOST_DIR)/usr)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/ccache: $(WRKBUILD)/.compiled
+	$(INSTALL_BIN) $(WRKBUILD)/ccache \
+		${STAGING_HOST_DIR}/usr/bin
+
+include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


From 66930ee6c1e0032c50f64c25755e46c327631239 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 7 Mar 2014 10:16:30 +0100
Subject: switching to mksh as default shell. It just works nice, when trying
 to debug the bootup process. set -x wirh ash is not working well. And another
 reason, I have a good contact to the main developer of mksh. Actually he is a
 friend of mine ;). Adds 50 Kb to the default system (measured for x86
 initramfs+kernel)

---
 package/busybox/config/shell/Config.in |  2 +-
 target/config/Config.in.runtime        | 27 +++++++++++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in
index 52a96c7e2..488041e22 100644
--- a/package/busybox/config/shell/Config.in
+++ b/package/busybox/config/shell/Config.in
@@ -8,7 +8,7 @@ menu "Shells"
 
 config BUSYBOX_ASH
 	bool "ash"
-	default y
+	default n
 	depends on !BUSYBOX_NOMMU
 	help
 	  Tha 'ash' shell adds about 60k in the default configuration and is
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index c28fd55a3..b6716cbdd 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -50,7 +50,7 @@ config ADK_RUNTIME_CONSOLE_VGA
 config ADK_RUNTIME_CONSOLE_SERIAL
 	bool "console output on serial"
 	help
-	  Start getty on serial console. (ttyS0)
+	  Start getty on serial console.
 
 config ADK_RUNTIME_CONSOLE_BOTH
 	bool "console output on VGA and serial"
@@ -74,7 +74,14 @@ config ADK_RUNTIME_KBD_LAYOUT
 
 choice
 prompt "Initial login shell for the root user"
-default ADK_ROOTSH_ASH
+default ADK_ROOTSH_MKSH
+
+config ADK_ROOTSH_MKSH
+	select ADK_PACKAGE_MKSH
+	bool "mksh (MirBSD Korn Shell)"
+	help
+	  Use mksh (a Korn Shell variant) as standard login shell
+	  for the superuser.
 
 config ADK_ROOTSH_ASH
 	select BUSYBOX_ASH
@@ -114,7 +121,14 @@ endchoice
 
 choice
 prompt "System /bin/sh (POSIX script shell)"
-default ADK_BINSH_ASH
+default ADK_BINSH_MKSH
+
+config ADK_BINSH_MKSH
+	select ADK_PACKAGE_MKSH
+	bool "mksh (MirBSD Korn Shell)"
+	help
+	  Use mksh (a Korn Shell variant) as system shell, which is
+	  both small and powerful, so quite suited for this task.
 
 config ADK_BINSH_ASH
 	select BUSYBOX_ASH
@@ -131,13 +145,6 @@ config ADK_BINSH_BASH
 	  Use GNU bash as system shell. This is discouraged due to
 	  its size and slowness.
 
-config ADK_BINSH_MKSH
-	select ADK_PACKAGE_MKSH
-	bool "mksh (MirBSD Korn Shell)"
-	help
-	  Use mksh (a Korn Shell variant) as system shell, which is
-	  both small and powerful, so quite suited for this task.
-
 config ADK_BINSH_ZSH
 	select ADK_PACKAGE_ZSH
 	bool "zsh (The Z Shell)"
-- 
cgit v1.2.3


From 76a462aed5771be7b02b0785f01147ebe995a611 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 7 Mar 2014 10:49:51 +0100
Subject: fix for linux-uclibcfoo

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

diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile
index e4ca57b8a..e5bb3f2bb 100644
--- a/package/gdbm/Makefile
+++ b/package/gdbm/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gdbm
 PKG_VERSION:=		1.8.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		1d1b1d5c0245b1c00aff92da751e9aa1
 PKG_DESCR:=		disk file format database
 PKG_SECTION:=		libs
diff --git a/package/gdbm/patches/patch-configure b/package/gdbm/patches/patch-configure
new file mode 100644
index 000000000..f8b196ec5
--- /dev/null
+++ b/package/gdbm/patches/patch-configure
@@ -0,0 +1,11 @@
+--- gdbm-1.8.3.orig/configure	2002-10-15 23:53:26.000000000 +0200
++++ gdbm-1.8.3/configure	2014-03-07 10:48:33.000000000 +0100
+@@ -5532,7 +5532,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
-- 
cgit v1.2.3


From 5101b72fac2c9a6971a0c7d2fe6bbd318e9678ab Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 7 Mar 2014 10:55:50 +0100
Subject: use mksh in tools, too

---
 package/mksh/Makefile |  2 ++
 scripts/create.sh     | 15 +--------------
 tools/Makefile        |  2 +-
 tools/mksh/Makefile   | 30 ++++++++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 tools/mksh/Makefile

diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index 159a3efda..c40d9d807 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		shells
 PKG_URL:=		http://www.mirbsd.org/
 PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
 
+PKG_DFLT_MKSH:=		y if !ADK_TOOLCHAIN_ONLY
+
 DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/${PKG_NAME}
 
diff --git a/scripts/create.sh b/scripts/create.sh
index 2d18cc64a..505549247 100755
--- a/scripts/create.sh
+++ b/scripts/create.sh
@@ -2,7 +2,7 @@
 #-
 # Copyright © 2010, 2011, 2012
 #	Thorsten Glaser <tg@mirbsd.org>
-# Copyright © 2010, 2011
+# Copyright © 2010-2014
 #	Waldemar Brodkorb <wbx@openadk.org>
 #
 # Provided that these terms and disclaimer and all copyright notices
@@ -36,19 +36,6 @@ case :$PATH: in
 (*) export PATH=$PATH:$TOPDIR/host_$HOST/usr/bin ;;
 esac
 
-test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then
-	make package=mksh fetch || exit 1
-	df=mksh-R48b.tgz
-	rm -rf build_mksh
-	mkdir -p build_mksh
-	gzip -dc dl/"$df" | (cd build_mksh; cpio -mid)
-	cd build_mksh/mksh
-	bash Build.sh -r -c lto || bash Build.sh -r || exit 1
-	cp mksh "$TOPDIR"/host_$HOST/usr/bin
-	cd "$TOPDIR"
-	rm -rf build_mksh
-fi
-
 test -n "$KSH_VERSION" || exec mksh "$me" "$@"
 if test -z "$KSH_VERSION"; then
 	echo >&2 Fatal error: could not run myself with mksh!
diff --git a/tools/Makefile b/tools/Makefile
index a8156cb79..cdbf2b4f1 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio m4 flex bc bzip2 xz
+TARGETS:=adk mksh mkcrypt cpio m4 flex bc bzip2 xz
 
 ifeq ($(ADK_HOST_NEED_GENEXT2FS),y)
 TARGETS+=genext2fs
diff --git a/tools/mksh/Makefile b/tools/mksh/Makefile
new file mode 100644
index 000000000..8cb7c29b7
--- /dev/null
+++ b/tools/mksh/Makefile
@@ -0,0 +1,30 @@
+# 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:=		mksh
+PKG_VERSION:=		49
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e8c205cac72c3dc8540bbc3897421422
+PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
+
+DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.tgz
+WRKDIST=		${WRKDIR}/${PKG_NAME}
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/mksh
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' \
+	    CPPFLAGS='${TARGET_CPPFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' \
+	    HAVE_CAN_FSTACKPROTECTORALL=0 \
+	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -c lto
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/mksh: $(WRKBUILD)/.compiled
+	${INSTALL_BIN} ${WRKBUILD}/mksh \
+		${STAGING_HOST_DIR}/usr/bin
+
+include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


From eb4fedd3c9a411c13c194c67d40f709d9599ab37 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 7 Mar 2014 14:06:03 +0100
Subject: fix jikes package, not yet packaged for the target

---
 package/jikes/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/jikes/Makefile b/package/jikes/Makefile
index 7404fc123..be7e6a749 100644
--- a/package/jikes/Makefile
+++ b/package/jikes/Makefile
@@ -8,6 +8,7 @@ PKG_VERSION:=		1.22
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		cda958c7fef6b43b803e1d1ef9afcb85
 PKG_DESCR:=		jikes java compiler
+PKG_BUILDDEP:=		jikes-host
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
 
@@ -17,6 +18,7 @@ include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 HOST_STYLE:=		auto
 
@@ -26,6 +28,7 @@ hostpost-install:
 	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/bin/javac
 	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/javac
 
+jikes-install:
 
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From d49aab691c19d114b248b88cd422a74d375d6b9f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 7 Mar 2014 14:06:23 +0100
Subject: update to latest git, x32 sysinfo fix needed

---
 toolchain/musl/patches/musl-git-20140301.patch | 8177 -----------------------
 toolchain/musl/patches/musl-git-20140307.patch | 8282 ++++++++++++++++++++++++
 2 files changed, 8282 insertions(+), 8177 deletions(-)
 delete mode 100644 toolchain/musl/patches/musl-git-20140301.patch
 create mode 100644 toolchain/musl/patches/musl-git-20140307.patch

diff --git a/toolchain/musl/patches/musl-git-20140301.patch b/toolchain/musl/patches/musl-git-20140301.patch
deleted file mode 100644
index 1362c9ba9..000000000
--- a/toolchain/musl/patches/musl-git-20140301.patch
+++ /dev/null
@@ -1,8177 +0,0 @@
-diff -Nur musl-0.9.15/arch/arm/bits/shm.h musl-git/arch/arm/bits/shm.h
---- musl-0.9.15/arch/arm/bits/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/arm/bits/shm.h	2014-03-01 08:58:13.000000000 +0100
-@@ -16,3 +16,14 @@
- 	unsigned long __pad1;
- 	unsigned long __pad2;
- };
-+
-+struct shminfo {
-+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-+};
-+
-+struct shm_info {
-+	int __used_ids;
-+	unsigned long shm_tot, shm_rss, shm_swp;
-+	unsigned long __swap_attempts, __swap_successes;
-+};
-+
-diff -Nur musl-0.9.15/arch/arm/bits/termios.h musl-git/arch/arm/bits/termios.h
---- musl-0.9.15/arch/arm/bits/termios.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/arm/bits/termios.h	2014-03-01 08:58:13.000000000 +0100
-@@ -42,6 +42,7 @@
- #define IXANY   0004000
- #define IXOFF   0010000
- #define IMAXBEL 0020000
-+#define IUTF8   0040000
- 
- #define OPOST  0000001
- #define OLCUC  0000002
-@@ -75,9 +76,6 @@
- #define VT0    0000000
- #define VT1    0040000
- 
--/* ?? */
--#define XTABS  0014000
--
- #define B0       0000000
- #define B50      0000001
- #define B75      0000002
-@@ -125,8 +123,6 @@
- #define HUPCL  0002000
- #define CLOCAL 0004000
- 
--#define CRTSCTS  020000000000
--
- #define ISIG   0000001
- #define ICANON 0000002
- #define ECHO   0000010
-@@ -137,14 +133,11 @@
- #define TOSTOP 0000400
- #define IEXTEN 0100000
- 
--/* Extensions? */
--#define CBAUDEX 0010000
- #define ECHOCTL 0001000
- #define ECHOPRT 0002000
- #define ECHOKE 0004000
- #define FLUSHO 0010000
- #define PENDIN 0040000
--#define EXTPROC 0200000
- 
- #define TCOOFF 0
- #define TCOON  1
-@@ -158,3 +151,10 @@
- #define TCSANOW   0
- #define TCSADRAIN 1
- #define TCSAFLUSH 2
-+
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+#define CBAUDEX 0010000
-+#define CRTSCTS  020000000000
-+#define EXTPROC 0200000
-+#define XTABS  0014000
-+#endif
-diff -Nur musl-0.9.15/arch/arm/syscall_arch.h musl-git/arch/arm/syscall_arch.h
---- musl-0.9.15/arch/arm/syscall_arch.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/arm/syscall_arch.h	2014-03-01 08:58:14.000000000 +0100
-@@ -3,6 +3,8 @@
- ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
- #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
- 
-+long (__syscall)(long, ...);
-+
- #ifndef __clang__
- 
- #define __asm_syscall(...) do { \
-diff -Nur musl-0.9.15/arch/i386/bits/shm.h musl-git/arch/i386/bits/shm.h
---- musl-0.9.15/arch/i386/bits/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/i386/bits/shm.h	2014-03-01 08:58:14.000000000 +0100
-@@ -16,3 +16,14 @@
- 	unsigned long __pad1;
- 	unsigned long __pad2;
- };
-+
-+struct shminfo {
-+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-+};
-+
-+struct shm_info {
-+	int __used_ids;
-+	unsigned long shm_tot, shm_rss, shm_swp;
-+	unsigned long __swap_attempts, __swap_successes;
-+};
-+
-diff -Nur musl-0.9.15/arch/i386/bits/termios.h musl-git/arch/i386/bits/termios.h
---- musl-0.9.15/arch/i386/bits/termios.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/i386/bits/termios.h	2014-03-01 08:58:14.000000000 +0100
-@@ -42,6 +42,7 @@
- #define IXANY   0004000
- #define IXOFF   0010000
- #define IMAXBEL 0020000
-+#define IUTF8   0040000
- 
- #define OPOST  0000001
- #define OLCUC  0000002
-@@ -75,9 +76,6 @@
- #define VT0    0000000
- #define VT1    0040000
- 
--/* ?? */
--#define XTABS  0014000
--
- #define B0       0000000
- #define B50      0000001
- #define B75      0000002
-@@ -125,8 +123,6 @@
- #define HUPCL  0002000
- #define CLOCAL 0004000
- 
--#define CRTSCTS  020000000000
--
- #define ISIG   0000001
- #define ICANON 0000002
- #define ECHO   0000010
-@@ -137,14 +133,11 @@
- #define TOSTOP 0000400
- #define IEXTEN 0100000
- 
--/* Extensions? */
--#define CBAUDEX 0010000
- #define ECHOCTL 0001000
- #define ECHOPRT 0002000
- #define ECHOKE 0004000
- #define FLUSHO 0010000
- #define PENDIN 0040000
--#define EXTPROC 0200000
- 
- #define TCOOFF 0
- #define TCOON  1
-@@ -158,3 +151,10 @@
- #define TCSANOW   0
- #define TCSADRAIN 1
- #define TCSAFLUSH 2
-+
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+#define CBAUDEX 0010000
-+#define CRTSCTS  020000000000
-+#define EXTPROC 0200000
-+#define XTABS  0014000
-+#endif
-diff -Nur musl-0.9.15/arch/microblaze/bits/shm.h musl-git/arch/microblaze/bits/shm.h
---- musl-0.9.15/arch/microblaze/bits/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/microblaze/bits/shm.h	2014-03-01 08:58:14.000000000 +0100
-@@ -16,3 +16,14 @@
- 	unsigned long __pad1;
- 	unsigned long __pad2;
- };
-+
-+struct shminfo {
-+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-+};
-+
-+struct shm_info {
-+	int __used_ids;
-+	unsigned long shm_tot, shm_rss, shm_swp;
-+	unsigned long __swap_attempts, __swap_successes;
-+};
-+
-diff -Nur musl-0.9.15/arch/microblaze/bits/termios.h musl-git/arch/microblaze/bits/termios.h
---- musl-0.9.15/arch/microblaze/bits/termios.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/microblaze/bits/termios.h	2014-03-01 08:58:14.000000000 +0100
-@@ -42,6 +42,7 @@
- #define IXANY   0004000
- #define IXOFF   0010000
- #define IMAXBEL 0020000
-+#define IUTF8   0040000
- 
- #define OPOST  0000001
- #define OLCUC  0000002
-@@ -75,9 +76,6 @@
- #define VT0    0000000
- #define VT1    0040000
- 
--/* ?? */
--#define XTABS  0014000
--
- #define B0       0000000
- #define B50      0000001
- #define B75      0000002
-@@ -125,8 +123,6 @@
- #define HUPCL  0002000
- #define CLOCAL 0004000
- 
--#define CRTSCTS  020000000000
--
- #define ISIG   0000001
- #define ICANON 0000002
- #define ECHO   0000010
-@@ -137,14 +133,11 @@
- #define TOSTOP 0000400
- #define IEXTEN 0100000
- 
--/* Extensions? */
--#define CBAUDEX 0010000
- #define ECHOCTL 0001000
- #define ECHOPRT 0002000
- #define ECHOKE 0004000
- #define FLUSHO 0010000
- #define PENDIN 0040000
--#define EXTPROC 0200000
- 
- #define TCOOFF 0
- #define TCOON  1
-@@ -158,3 +151,10 @@
- #define TCSANOW   0
- #define TCSADRAIN 1
- #define TCSAFLUSH 2
-+
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+#define CBAUDEX 0010000
-+#define CRTSCTS  020000000000
-+#define EXTPROC 0200000
-+#define XTABS  0014000
-+#endif
-diff -Nur musl-0.9.15/arch/microblaze/syscall_arch.h musl-git/arch/microblaze/syscall_arch.h
---- musl-0.9.15/arch/microblaze/syscall_arch.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/microblaze/syscall_arch.h	2014-03-01 08:58:14.000000000 +0100
-@@ -3,6 +3,8 @@
- ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
- #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
- 
-+long (__syscall)(long, ...);
-+
- #ifndef __clang__
- 
- static __inline long __syscall0(long n)
-diff -Nur musl-0.9.15/arch/mips/bits/fenv.h musl-git/arch/mips/bits/fenv.h
---- musl-0.9.15/arch/mips/bits/fenv.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/bits/fenv.h	2014-03-01 08:58:14.000000000 +0100
-@@ -1,3 +1,7 @@
-+#ifdef __mips_soft_float
-+#define FE_ALL_EXCEPT 0
-+#define FE_TONEAREST  0
-+#else
- #define FE_INEXACT    4
- #define FE_UNDERFLOW  8
- #define FE_OVERFLOW   16
-@@ -10,6 +14,7 @@
- #define FE_TOWARDZERO 1
- #define FE_UPWARD     2
- #define FE_DOWNWARD   3
-+#endif
- 
- typedef unsigned short fexcept_t;
- 
-diff -Nur musl-0.9.15/arch/mips/bits/shm.h musl-git/arch/mips/bits/shm.h
---- musl-0.9.15/arch/mips/bits/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/bits/shm.h	2014-03-01 08:58:14.000000000 +0100
-@@ -13,3 +13,14 @@
- 	unsigned long __pad1;
- 	unsigned long __pad2;
- };
-+
-+struct shminfo {
-+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-+};
-+
-+struct shm_info {
-+	int __used_ids;
-+	unsigned long shm_tot, shm_rss, shm_swp;
-+	unsigned long __swap_attempts, __swap_successes;
-+};
-+
-diff -Nur musl-0.9.15/arch/mips/bits/termios.h musl-git/arch/mips/bits/termios.h
---- musl-0.9.15/arch/mips/bits/termios.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/bits/termios.h	2014-03-01 08:58:14.000000000 +0100
-@@ -77,9 +77,6 @@
- #define VT0    0000000
- #define VT1    0040000
- 
--/* ?? */
--#define XTABS  0014000
--
- #define B0       0000000
- #define B50      0000001
- #define B75      0000002
-@@ -129,12 +126,6 @@
- #define PARODD 0001000
- #define HUPCL  0002000
- #define CLOCAL 0004000
--#define CBAUDEX 0010000
--
--#define CIBAUD   002003600000
--#define CMSPAR   010000000000
--#define CRTSCTS  020000000000
--#define IBSHIFT 16
- 
- #define ISIG   0000001
- #define ICANON 0000002
-@@ -152,9 +143,6 @@
- #define PENDIN 0040000
- #define TOSTOP 0100000
- #define ITOSTOP 0100000
--#define EXTPROC 0200000
--
--#define TIOCSER_TEMT 1
- 
- #define TCOOFF 0
- #define TCOON  1
-@@ -168,3 +156,14 @@
- #define TCSANOW   0
- #define TCSADRAIN 1
- #define TCSAFLUSH 2
-+
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+#define CBAUDEX 0010000
-+#define CIBAUD   002003600000
-+#define IBSHIFT 16
-+#define CMSPAR   010000000000
-+#define CRTSCTS  020000000000
-+#define EXTPROC 0200000
-+#define XTABS  0014000
-+#define TIOCSER_TEMT 1
-+#endif
-diff -Nur musl-0.9.15/arch/mips/reloc.h musl-git/arch/mips/reloc.h
---- musl-0.9.15/arch/mips/reloc.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/reloc.h	2014-03-01 08:58:14.000000000 +0100
-@@ -8,7 +8,13 @@
- #define ENDIAN_SUFFIX ""
- #endif
- 
--#define LDSO_ARCH "mips" ENDIAN_SUFFIX
-+#ifdef __mips_soft_float
-+#define FP_SUFFIX "-sf"
-+#else
-+#define FP_SUFFIX ""
-+#endif
-+
-+#define LDSO_ARCH "mips" ENDIAN_SUFFIX FP_SUFFIX
- 
- #define IS_COPY(x) ((x)==R_MIPS_COPY)
- #define IS_PLT(x) 1
-diff -Nur musl-0.9.15/arch/mips/syscall_arch.h musl-git/arch/mips/syscall_arch.h
---- musl-0.9.15/arch/mips/syscall_arch.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/mips/syscall_arch.h	2014-03-01 08:58:14.000000000 +0100
-@@ -3,6 +3,8 @@
- ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
- #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
- 
-+long (__syscall)(long, ...);
-+
- #ifndef __clang__
- 
- #define __asm_syscall(...) do { \
-diff -Nur musl-0.9.15/arch/powerpc/bits/shm.h musl-git/arch/powerpc/bits/shm.h
---- musl-0.9.15/arch/powerpc/bits/shm.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/powerpc/bits/shm.h	2014-03-01 08:58:14.000000000 +0100
-@@ -16,3 +16,14 @@
- 	unsigned long __pad1;
- 	unsigned long __pad2;
- };
-+
-+struct shminfo {
-+	unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
-+};
-+
-+struct shm_info {
-+	int __used_ids;
-+	unsigned long shm_tot, shm_rss, shm_swp;
-+	unsigned long __swap_attempts, __swap_successes;
-+};
-+
-diff -Nur musl-0.9.15/arch/powerpc/bits/termios.h musl-git/arch/powerpc/bits/termios.h
---- musl-0.9.15/arch/powerpc/bits/termios.h	2014-01-03 21:12:17.000000000 +0100
-+++ musl-git/arch/powerpc/bits/termios.h	2014-03-01 08:58:14.000000000 +0100
-@@ -66,7 +66,6 @@
- #define TAB1	00002000
- #define TAB2	00004000
- #define TAB3	00006000
--#define XTABS	00006000
- #define CRDLY	00030000
- #define CR0	00000000
- #define CR1	00010000
-@@ -101,7 +100,6 @@
- #define B38400	0000017
- #define EXTA	B19200
- #define EXTB	B38400
--#define CBAUDEX	0000000
- #define B57600	00020
- #define B115200	00021
- #define B230400	00022
-@@ -120,9 +118,6 @@
- #define B4000000	00036
- #define BOTHER	00037
- 
--#define CIBAUD	077600000
--#define IBSHIFT 16
--
- #define CSIZE	00001400
- #define CS5	00000000
- #define CS6	00000400
-@@ -136,8 +131,6 @@
- #define HUPCL	00040000
- 
- #define CLOCAL	00100000
--#define CMSPAR	010000000000
--#define CRTSCTS	020000000000
- 
- #define ISIG	0x00000080
- #define ICANON	0x00000100
-@@ -154,7 +147,6 @@
- #define FLUSHO	0x00800000
- #define PENDIN	0x20000000
- #define IEXTEN	0x00000400
--#define EXTPROC 0x10000000
- 
- #define TCOOFF	0
- #define TCOON	1
-@@ -168,3 +160,13 @@
- #define TCSANOW		0
- #define TCSADRAIN	1
- #define TCSAFLUSH	2
-+
-+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-+#define CBAUDEX	0000000
-+#define CIBAUD	077600000
-+#define IBSHIFT 16
-+#define CMSPAR	010000000000
-+#define CRTSCTS	020000000000
-+#define EXTPROC 0x10000000
-+#define XTABS	00006000
-+#endif
-diff -Nur musl-0.9.15/arch/sh/atomic.h musl-git/arch/sh/atomic.h
---- musl-0.9.15/arch/sh/atomic.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/atomic.h	2014-03-01 08:58:14.000000000 +0100
-@@ -0,0 +1,87 @@
-+#ifndef _INTERNAL_ATOMIC_H
-+#define _INTERNAL_ATOMIC_H
-+
-+#include <stdint.h>
-+
-+static inline int a_ctz_l(unsigned long x)
-+{
-+	static const char debruijn32[32] = {
-+		0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13,
-+		31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14
-+	};
-+	return debruijn32[(x&-x)*0x076be629 >> 27];
-+}
-+
-+static inline int a_ctz_64(uint64_t x)
-+{
-+	uint32_t y = x;
-+	if (!y) {
-+		y = x>>32;
-+		return 32 + a_ctz_l(y);
-+	}
-+	return a_ctz_l(y);
-+}
-+
-+int  __sh_cas(volatile int *, int, int);
-+int  __sh_swap(volatile int *, int);
-+int  __sh_fetch_add(volatile int *, int);
-+void __sh_store(volatile int *, int);
-+void __sh_and(volatile int *, int);
-+void __sh_or(volatile int *, int);
-+
-+#define a_cas(p,t,s)     __sh_cas(p,t,s)
-+#define a_swap(x,v)      __sh_swap(x,v)
-+#define a_fetch_add(x,v) __sh_fetch_add(x, v)
-+#define a_store(x,v)     __sh_store(x, v)
-+#define a_and(x,v)       __sh_and(x, v)
-+#define a_or(x,v)        __sh_or(x, v)
-+
-+static inline void *a_cas_p(volatile void *p, void *t, void *s)
-+{
-+	return (void *)a_cas(p, (int)t, (int)s);
-+}
-+
-+static inline long a_cas_l(volatile void *p, long t, long s)
-+{
-+	return a_cas(p, t, s);
-+}
-+
-+static inline void a_inc(volatile int *x)
-+{
-+	a_fetch_add(x, 1);
-+}
-+
-+static inline void a_dec(volatile int *x)
-+{
-+	a_fetch_add(x, -1);
-+}
-+
-+static inline void a_spin()
-+{
-+}
-+
-+static inline void a_crash()
-+{
-+	*(volatile char *)0=0;
-+}
-+
-+static inline void a_or_l(volatile void *p, long v)
-+{
-+	a_or(p, v);
-+}
-+
-+static inline void a_and_64(volatile uint64_t *p, uint64_t v)
-+{
-+	union { uint64_t v; uint32_t r[2]; } u = { v };
-+	a_and((int *)p,   u.r[0]);
-+	a_and((int *)p+1, u.r[1]);
-+}
-+
-+static inline void a_or_64(volatile uint64_t *p, uint64_t v)
-+{
-+	union { uint64_t v; uint32_t r[2]; } u = { v };
-+	a_or((int *)p,   u.r[0]);
-+	a_or((int *)p+1, u.r[1]);
-+}
-+
-+#endif
-diff -Nur musl-0.9.15/arch/sh/bits/alltypes.h.in musl-git/arch/sh/bits/alltypes.h.in
---- musl-0.9.15/arch/sh/bits/alltypes.h.in	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/alltypes.h.in	2014-03-01 08:58:14.000000000 +0100
-@@ -0,0 +1,23 @@
-+#define _Addr int
-+#define _Int64 long long
-+#define _Reg int
-+
-+TYPEDEF __builtin_va_list va_list;
-+TYPEDEF __builtin_va_list __isoc_va_list;
-+
-+#ifndef __cplusplus
-+TYPEDEF long wchar_t;
-+#endif
-+TYPEDEF unsigned wint_t;
-+
-+TYPEDEF float float_t;
-+TYPEDEF double double_t;
-+
-+TYPEDEF long time_t;
-+TYPEDEF long suseconds_t;
-+
-+TYPEDEF struct { union { int __i[9]; unsigned __s[9]; } __u; } pthread_attr_t;
-+TYPEDEF struct { union { int __i[6]; void *__p[6]; } __u; } pthread_mutex_t;
-+TYPEDEF struct { union { int __i[12]; void *__p[12]; } __u; } pthread_cond_t;
-+TYPEDEF struct { union { int __i[8]; void *__p[8]; } __u; } pthread_rwlock_t;
-+TYPEDEF struct { union { int __i[5]; void *__p[5]; } __u; } pthread_barrier_t;
-diff -Nur musl-0.9.15/arch/sh/bits/endian.h musl-git/arch/sh/bits/endian.h
---- musl-0.9.15/arch/sh/bits/endian.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/endian.h	2014-03-01 08:58:14.000000000 +0100
-@@ -0,0 +1,5 @@
-+#if __BIG_ENDIAN__
-+#define __BYTE_ORDER __BIG_ENDIAN
-+#else
-+#define __BYTE_ORDER __LITTLE_ENDIAN
-+#endif
-diff -Nur musl-0.9.15/arch/sh/bits/errno.h musl-git/arch/sh/bits/errno.h
---- musl-0.9.15/arch/sh/bits/errno.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/errno.h	2014-03-01 08:58:14.000000000 +0100
-@@ -0,0 +1,134 @@
-+#define EPERM            1
-+#define ENOENT           2
-+#define ESRCH            3
-+#define EINTR            4
-+#define EIO              5
-+#define ENXIO            6
-+#define E2BIG            7
-+#define ENOEXEC          8
-+#define EBADF            9
-+#define ECHILD          10
-+#define EAGAIN          11
-+#define ENOMEM          12
-+#define EACCES          13
-+#define EFAULT          14
-+#define ENOTBLK         15
-+#define EBUSY           16
-+#define EEXIST          17
-+#define EXDEV           18
-+#define ENODEV          19
-+#define ENOTDIR         20
-+#define EISDIR          21
-+#define EINVAL          22
-+#define ENFILE          23
-+#define EMFILE          24
-+#define ENOTTY          25
-+#define ETXTBSY         26
-+#define EFBIG           27
-+#define ENOSPC          28
-+#define ESPIPE          29
-+#define EROFS           30
-+#define EMLINK          31
-+#define EPIPE           32
-+#define EDOM            33
-+#define ERANGE          34
-+#define EDEADLK         35
-+#define ENAMETOOLONG    36
-+#define ENOLCK          37
-+#define ENOSYS          38
-+#define ENOTEMPTY       39
-+#define ELOOP           40
-+#define EWOULDBLOCK     EAGAIN
-+#define ENOMSG          42
-+#define EIDRM           43
-+#define ECHRNG          44
-+#define EL2NSYNC        45
-+#define EL3HLT          46
-+#define EL3RST          47
-+#define ELNRNG          48
-+#define EUNATCH         49
-+#define ENOCSI          50
-+#define EL2HLT          51
-+#define EBADE           52
-+#define EBADR           53
-+#define EXFULL          54
-+#define ENOANO          55
-+#define EBADRQC         56
-+#define EBADSLT         57
-+#define EDEADLOCK       EDEADLK
-+#define EBFONT          59
-+#define ENOSTR          60
-+#define ENODATA         61
-+#define ETIME           62
-+#define ENOSR           63
-+#define ENONET          64
-+#define ENOPKG          65
-+#define EREMOTE         66
-+#define ENOLINK         67
-+#define EADV            68
-+#define ESRMNT          69
-+#define ECOMM           70
-+#define EPROTO          71
-+#define EMULTIHOP       72
-+#define EDOTDOT         73
-+#define EBADMSG         74
-+#define EOVERFLOW       75
-+#define ENOTUNIQ        76
-+#define EBADFD          77
-+#define EREMCHG         78
-+#define ELIBACC         79
-+#define ELIBBAD         80
-+#define ELIBSCN         81
-+#define ELIBMAX         82
-+#define ELIBEXEC        83
-+#define EILSEQ          84
-+#define ERESTART        85
-+#define ESTRPIPE        86
-+#define EUSERS          87
-+#define ENOTSOCK        88
-+#define EDESTADDRREQ    89
-+#define EMSGSIZE        90
-+#define EPROTOTYPE      91
-+#define ENOPROTOOPT     92
-+#define EPROTONOSUPPORT 93
-+#define ESOCKTNOSUPPORT 94
-+#define EOPNOTSUPP      95
-+#define ENOTSUP         EOPNOTSUPP
-+#define EPFNOSUPPORT    96
-+#define EAFNOSUPPORT    97
-+#define EADDRINUSE      98
-+#define EADDRNOTAVAIL   99
-+#define ENETDOWN        100
-+#define ENETUNREACH     101
-+#define ENETRESET       102
-+#define ECONNABORTED    103
-+#define ECONNRESET      104
-+#define ENOBUFS         105
-+#define EISCONN         106
-+#define ENOTCONN        107
-+#define ESHUTDOWN       108
-+#define ETOOMANYREFS    109
-+#define ETIMEDOUT       110
-+#define ECONNREFUSED    111
-+#define EHOSTDOWN       112
-+#define EHOSTUNREACH    113
-+#define EALREADY        114
-+#define EINPROGRESS     115
-+#define ESTALE          116
-+#define EUCLEAN         117
-+#define ENOTNAM         118
-+#define ENAVAIL         119
-+#define EISNAM          120
-+#define EREMOTEIO       121
-+#define EDQUOT          122
-+#define ENOMEDIUM       123
-+#define EMEDIUMTYPE     124
-+#define ECANCELED       125
-+#define ENOKEY          126
-+#define EKEYEXPIRED     127
-+#define EKEYREVOKED     128
-+#define EKEYREJECTED    129
-+#define EOWNERDEAD      130
-+#define ENOTRECOVERABLE 131
-+#define ERFKILL         132
-+#define EHWPOISON       133
-diff -Nur musl-0.9.15/arch/sh/bits/fcntl.h musl-git/arch/sh/bits/fcntl.h
---- musl-0.9.15/arch/sh/bits/fcntl.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/fcntl.h	2014-03-01 08:58:14.000000000 +0100
-@@ -0,0 +1,39 @@
-+#define O_CREAT        0100
-+#define O_EXCL         0200
-+#define O_NOCTTY       0400
-+#define O_TRUNC       01000
-+#define O_APPEND      02000
-+#define O_NONBLOCK    04000
-+#define O_DSYNC      010000
-+#define O_SYNC     04010000
-+#define O_RSYNC    04010000
-+#define O_DIRECTORY 0200000
-+#define O_NOFOLLOW  0400000
-+#define O_CLOEXEC  02000000
-+
-+#define O_ASYNC      020000
-+#define O_DIRECT     040000
-+#define O_LARGEFILE 0100000
-+#define O_NOATIME  01000000
-+#define O_TMPFILE 020200000
-+#define O_NDELAY O_NONBLOCK
-+
-+#define F_DUPFD  0
-+#define F_GETFD  1
-+#define F_SETFD  2
-+#define F_GETFL  3
-+#define F_SETFL  4
-+
-+#define F_SETOWN 8
-+#define F_GETOWN 9
-+#define F_SETSIG 10
-+#define F_GETSIG 11
-+
-+#define F_GETLK 12
-+#define F_SETLK 13
-+#define F_SETLKW 14
-+
-+#define F_SETOWN_EX 15
-+#define F_GETOWN_EX 16
-+
-+#define F_GETOWNER_UIDS 17
-diff -Nur musl-0.9.15/arch/sh/bits/fenv.h musl-git/arch/sh/bits/fenv.h
---- musl-0.9.15/arch/sh/bits/fenv.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/fenv.h	2014-03-01 08:58:14.000000000 +0100
-@@ -0,0 +1,26 @@
-+#ifndef __SH_FPU_ANY__
-+
-+#define FE_ALL_EXCEPT 0
-+#define FE_TONEAREST  0
-+
-+#else
-+
-+#define FE_TONEAREST  0
-+#define FE_TOWARDZERO 1
-+
-+#define FE_INEXACT    0x04
-+#define FE_UNDERFLOW  0x08
-+#define FE_OVERFLOW   0x10
-+#define FE_DIVBYZERO  0x20
-+#define FE_INVALID    0x40
-+#define FE_ALL_EXCEPT 0x7c
-+
-+#endif
-+
-+typedef unsigned long fexcept_t;
-+
-+typedef struct {
-+	unsigned long __cw;
-+} fenv_t;
-+
-+#define FE_DFL_ENV    ((const fenv_t *) -1)
-diff -Nur musl-0.9.15/arch/sh/bits/float.h musl-git/arch/sh/bits/float.h
---- musl-0.9.15/arch/sh/bits/float.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/float.h	2014-03-01 08:58:14.000000000 +0100
-@@ -0,0 +1,17 @@
-+#define FLT_ROUNDS 1
-+#define FLT_EVAL_METHOD 0
-+
-+#define LDBL_TRUE_MIN 4.94065645841246544177e-324L
-+#define LDBL_MIN 2.22507385850720138309e-308L
-+#define LDBL_MAX 1.79769313486231570815e+308L
-+#define LDBL_EPSILON 2.22044604925031308085e-16L
-+
-+#define LDBL_MANT_DIG 53
-+#define LDBL_MIN_EXP (-1021)
-+#define LDBL_MAX_EXP 1024
-+
-+#define LDBL_DIG 15
-+#define LDBL_MIN_10_EXP (-307)
-+#define LDBL_MAX_10_EXP 308
-+
-+#define DECIMAL_DIG 17
-diff -Nur musl-0.9.15/arch/sh/bits/ioctl.h musl-git/arch/sh/bits/ioctl.h
---- musl-0.9.15/arch/sh/bits/ioctl.h	1970-01-01 01:00:00.000000000 +0100
-+++ musl-git/arch/sh/bits/ioctl.h	2014-03-01 08:58:14.000000000 +0100
-@@ -0,0 +1,205 @@
-+#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
-+#define _IOC_NONE  0U
-+#define _IOC_WRITE 1U
-+#define _IOC_READ  2U
-+
-+#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0)
-+#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c))
-+#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
-+#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
-+
-+#define FIOCLEX             _IO('f',  1)
-+#define FIONCLEX            _IO('f',  2)
-+#define FIOASYNC            _IOW('f', 125, int)
-+#define FIONBIO             _IOW('f', 126, int)
-+#define FIONREAD            _IOR('f', 127, int)
-+#define TIOCINQ             FIONREAD
-+#define FIOQSIZE            _IOR('f', 128, char[8])
-+
-+#define TCGETA              _IOR('t', 23, char[18])
-+#define TCSETA              _IOW('t', 24, char[18])
-+#define TCSETAW             _IOW('t', 25, char[18])
-+#define TCSETAF             _IOW('t', 28, char[18])
-+
-+#define TCSBRK              _IO('t', 29)
-+#define TCXONC              _IO('t', 30)
-+#define TCFLSH              _IO('t', 31)
-+
-+#define TIOCSWINSZ          _IOW('t', 103, char[8])
-+#define T