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

Conflicts:
	TODO

Config.in

@@ -97,7 +97,7 @@ prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY
 
 config ADK_KERNEL_VERSION_TOOLCHAIN
-	prompt "3.11.10"
+	prompt "3.12.6"
 	boolean
 	depends on ADK_TOOLCHAIN_ONLY
 

TODO

@@ -1,6 +1,10 @@
 - qemu-system-mips64el memory alloc probs
 - hash-style=gnu for non-mips and non-musl
 - add toolchain archive creation target
+- add hash-style=gnu for non-mips non-musl
+- add arm hard and softfloat toolchains
+- add misp64 n32/n64 toolchains
+- add support for static toolchains
 - add fb full screen logo
 - update gcc to 4.8.2
 - port opkg with gpg signing

mk/build.mk

@@ -544,7 +544,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
 # build all target architecture and libc combinations (toolchain only)
 bulktoolchain:
-	for libc in uclibc eglibc glibc;do \
+	for libc in uclibc eglibc glibc musl;do \
 		while read arch; do \
 		    mkdir -p $(TOPDIR)/bin/toolchain_$${arch}_$$libc; \
 		    ( \

mk/kernel-ver.mk

@@ -1,8 +1,8 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:=	3.11.10
+KERNEL_VERSION:=	3.12.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
+KERNEL_MD5SUM:=		ab2fcc368e20d804e77970196154fb9e
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_12_6),y)
 KERNEL_VERSION:=	3.12.6

mk/modules.mk

@@ -1736,3 +1736,14 @@ $(eval $(call KMOD_template,SCx200_ACB,scx200-acb,\
 	$(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_acb \
 ,25))
 
+#
+# VirtIO
+#
+$(eval $(call KMOD_template,VIRTIO_BLK,virtio-block,\
+	$(MODULES_DIR)/kernel/drivers/net/virtio_blk \
+,20))
+
+$(eval $(call KMOD_template,VIRTIO_NET,virtio-net,\
+	$(MODULES_DIR)/kernel/drivers/net/virtio_net \
+,40))
+

mk/rootfs.mk

@@ -13,6 +13,9 @@ MTDDEV:=	root=/dev/mtdblock0
 ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
 ROOTFS:=	root=/dev/sda1
 endif
+ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
+ROOTFS:=	root=/dev/vda1
+endif
 endif
 
 ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)

mk/vars.mk

@@ -82,7 +82,7 @@ TARGET_CFLAGS_LIBC:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(T
 endif
 TARGET_CXXFLAGS:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident
 TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
-			-Wl,-O2 -Wl,-rpath -Wl,/usr/lib \
+			-Wl,-O1 -Wl,-rpath -Wl,/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
 			$(ADK_TARGET_ABI_LDFLAGS) $(TARGET_CFLAGS_ARCH)
 # security optimization, see http://www.akkadia.org/drepper/dsohowto.pdf

package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		64
+PKG_RELEASE:=		65
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
@@ -95,6 +95,12 @@ ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 	echo 'export LD_LIBRARY_PATH=/opt/vc/lib' >> $(IDIR_BASE_FILES)/etc/profile
+ifneq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI)$(ADK_TARGET_SYSTEM_IBM_X40)$(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),)
+	echo 'export IPKGTMPDIR=/root/.ipkg' >> $(IDIR_BASE_FILES)/etc/profile
+else
+	echo 'export IPKGTMPDIR=/tmp >> $(IDIR_BASE_FILES)/etc/profile
+endif
+
 endif
 
 # simple network configuration

package/bcm2835-firmware/Makefile → package/bcm2835-bootloader/Makefile

@@ -3,27 +3,28 @@
 
 include ${TOPDIR}/rules.mk
 
-PKG_NAME:=		bcm2835-firmware
+PKG_NAME:=		bcm2835-bootloader
 # actually f46e6d9cb9a6bf419fe2a428a8a586239e93aa2d from 07.01.2014
+# https://github.com/raspberrypi/firmware
 PKG_VERSION:=		0.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e4c1b8f3dd13ae8742a7831c19d212b0
-PKG_DESCR:=		firmware for raspberry pi (bcm2835)
-PKG_SECTION:=		base
+PKG_MD5SUM:=		dba84ce20fc8a8c1bf473758d9350e19
+PKG_DESCR:=		bootloader for raspberry pi (bcm2835)
+PKG_SECTION:=		boot
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BCM2835_FIRMWARE,bcm2835-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BCM2835_BOOTLOADER,bcm2835-bootloader,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
 
 do-install:
-	${INSTALL_DIR} ${IDIR_BCM2835_FIRMWARE}/boot
-	${CP} ${WRKBUILD}/boot/* ${IDIR_BCM2835_FIRMWARE}/boot/
+	${INSTALL_DIR} ${IDIR_BCM2835_BOOTLOADER}/boot
+	${CP} ${WRKBUILD}/boot/* ${IDIR_BCM2835_BOOTLOADER}/boot/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/boost/Makefile

@@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		boost
 PKG_VERSION:=		1.55.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		93780777cfbf999a600f62883bd54b17
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		autotool bzip2-host python2-host
 PKG_URL:=		http://www.boost.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
 PKG_OPTS:=		dev
@@ -18,24 +19,24 @@ PKG_ARCH_DEPENDS:=	!m68k
 DISTFILES:=		boost_1_55_0.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_1_55_0
 
-PKG_FLAVOURS_BOOST:=	date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave
-
-PKGFD_date_time:=	with date-time
-PKGFD_python:=	with Python
-PKGFB_python:=	python2
-PKGFS_python:=	python2
-PKGFD_iostreams:=	with iostreams
-PKGFD_graph:=	with graph
-PKGFD_graph_parallel:=	with graph_parallel
-PKGFD_math:=	with math
-PKGFD_program_options:=	with program_options
-PKGFD_regex:=	with regex
-PKGFD_serialization:=	with serialization
-PKGFD_signals:=	with signals
-PKGFD_system:=	with system
-PKGFD_test:=	with test
-PKGFD_thread:=	with thread
-PKGFD_wave:=	with wave
+PKG_FLAVOURS_BOOST:=	DATE_TIME GRAPH GRAPH_PARALLEL IOSTREAMS MATH PROGRAM_OPTIONS PYTHON REGEX SERIALIZATION SIGNALS SYSTEM TEST THREAD WAVE
+
+PKGFD_DATE_TIME:=	with date-time
+PKGFD_PYTHON:=		with Python
+PKGFB_PYTHON:=		python2
+PKGFS_PYTHON:=		python2
+PKGFD_IOSTREAMS:=	with iostreams
+PKGFD_GRAPH:=	with graph
+PKGFD_GRAPH_PARALLEL:=	with graph_parallel
+PKGFD_MATH:=	with math
+PKGFD_PROGRAM_OPTIONS:=	with program_options
+PKGFD_REGEX:=	with regex
+PKGFD_SERIALIZATION:=	with serialization
+PKGFD_SIGNALS:=	with signals
+PKGFD_SYSTEM:=	with system
+PKGFD_TEST:=	with test
+PKGFD_THREAD:=	with thread
+PKGFD_WAVE:=	with wave
 
 include ${TOPDIR}/mk/package.mk
 
@@ -107,7 +108,7 @@ endif
 GPP_PATH:=	${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++
 GPP_VERSION:=	"`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`"
 BJAM_PATH:=	"`find ${WRKBUILD} -type f -name "bjam$(EXEEXT)"`"
-PYTHON_PATH:=	${STAGING_TARGET_DIR}/usr/bin/python
+PYTHON_PATH:=	${STAGING_HOST_DIR}/usr/bin/python
 PYTHON_INCLUDE:="`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`"
 PYTHON_LIB:=	"`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`"
 USER_JAM:=	${WRKBUILD}/tools/build/v2/user-config.jam
@@ -141,6 +142,7 @@ endif
 			--layout=versioned \
 			--disable-long-double \
 			--without-mpi \
+			--debug-configuration \
 			${CONFIGURE_ARGS} \
 			install \
 	)

package/busybox/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.21.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		795394f83903b5eec6567d51eebb417e
 PKG_DESCR:=		core utilities for embedded systems
 PKG_SECTION:=		base

package/busybox/patches/001-ipkg.patch

@@ -1,6 +1,6 @@
 diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config.src
 --- busybox-1.21.1.orig/archival/Config.src	2013-05-12 01:30:43.000000000 +0200
-+++ busybox-1.21.1/archival/Config.src	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/Config.src	2014-02-17 14:25:39.802534016 +0100
 @@ -214,6 +214,12 @@
  	  are actually slower than gzip at equivalent compression ratios
  	  and take up 3.2K of code.
@@ -16,7 +16,7 @@ diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config
  	default y
 diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c
 --- busybox-1.21.1.orig/archival/ipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/ipkg.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/ipkg.c	2014-02-17 14:25:39.802534016 +0100
 @@ -0,0 +1,28 @@
 +/* ipkg.c - the itsy package management system
 +
@@ -48,7 +48,7 @@ diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c
 +}
 diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild.src
 --- busybox-1.21.1.orig/archival/Kbuild.src	2013-05-12 01:30:43.000000000 +0200
-+++ busybox-1.21.1/archival/Kbuild.src	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/Kbuild.src	2014-02-17 14:25:39.802534016 +0100
 @@ -22,6 +22,7 @@
  lib-$(CONFIG_LZOP)		+= lzop.o bbunzip.o
  lib-$(CONFIG_GZIP)		+= gzip.o bbunzip.o
@@ -59,7 +59,7 @@ diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild
  lib-$(CONFIG_UNLZMA)		+= bbunzip.o
 diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/archival/libarchive/Kbuild.src
 --- busybox-1.21.1.orig/archival/libarchive/Kbuild.src	2013-06-29 16:58:06.000000000 +0200
-+++ busybox-1.21.1/archival/libarchive/Kbuild.src	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libarchive/Kbuild.src	2014-02-17 14:25:39.802534016 +0100
 @@ -25,14 +25,14 @@
  \
  	data_align.o \
@@ -79,7 +79,7 @@ diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/arch
  
 diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/libipkg/args.c
 --- busybox-1.21.1.orig/archival/libipkg/args.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/args.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/args.c	2014-02-17 14:25:39.826534090 +0100
 @@ -0,0 +1,242 @@
 +/* args.c - parse command-line args
 + 
@@ -325,7 +325,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/li
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/libipkg/args.h
 --- busybox-1.21.1.orig/archival/libipkg/args.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/args.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/args.h	2014-02-17 14:25:39.826534090 +0100
 @@ -0,0 +1,72 @@
 +/* args.h - parse command-line args
 +
@@ -401,7 +401,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/li
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archival/libipkg/conffile.c
 --- busybox-1.21.1.orig/archival/libipkg/conffile.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/conffile.c	2014-02-17 14:25:39.826534090 +0100
 @@ -0,0 +1,65 @@
 +/* conffile.c - the itsy package management system
 +
@@ -470,7 +470,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archiva
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archival/libipkg/conffile.h
 --- busybox-1.21.1.orig/archival/libipkg/conffile.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/conffile.h	2014-02-17 14:25:39.826534090 +0100
 @@ -0,0 +1,30 @@
 +/* conffile.h - the itsy package management system
 +
@@ -504,7 +504,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/archival/libipkg/conffile_list.c
 --- busybox-1.21.1.orig/archival/libipkg/conffile_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile_list.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/conffile_list.c	2014-02-17 14:25:39.850534164 +0100
 @@ -0,0 +1,47 @@
 +/* conffile_list.c - the itsy package management system
 +
@@ -555,7 +555,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/ar
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.h busybox-1.21.1/archival/libipkg/conffile_list.h
 --- busybox-1.21.1.orig/archival/libipkg/conffile_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/conffile_list.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/conffile_list.h	2014-02-17 14:25:39.850534164 +0100
 @@ -0,0 +1,36 @@
 +/* conffile_list.h - the itsy package management system
 +
@@ -595,7 +595,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.h busybox-1.21.1/ar
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.c busybox-1.21.1/archival/libipkg/file_util.c
 --- busybox-1.21.1.orig/archival/libipkg/file_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/file_util.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/file_util.c	2014-02-17 14:25:39.850534164 +0100
 @@ -0,0 +1,186 @@
 +/* file_util.c - convenience routines for common stat operations
 +
@@ -785,7 +785,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.c busybox-1.21.1/archiv
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.h busybox-1.21.1/archival/libipkg/file_util.h
 --- busybox-1.21.1.orig/archival/libipkg/file_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/file_util.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/file_util.h	2014-02-17 14:25:39.850534164 +0100
 @@ -0,0 +1,29 @@
 +/* file_util.h - convenience routines for common file operations
 +
@@ -818,7 +818,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.h busybox-1.21.1/archiv
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.c busybox-1.21.1/archival/libipkg/hash_table.c
 --- busybox-1.21.1.orig/archival/libipkg/hash_table.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/hash_table.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/hash_table.c	2014-02-17 14:25:39.850534164 +0100
 @@ -0,0 +1,155 @@
 +/* hash.c - hash tables for ipkg
 +
@@ -977,7 +977,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.c busybox-1.21.1/archi
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.h busybox-1.21.1/archival/libipkg/hash_table.h
 --- busybox-1.21.1.orig/archival/libipkg/hash_table.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/hash_table.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/hash_table.h	2014-02-17 14:25:39.854534176 +0100
 @@ -0,0 +1,44 @@
 +/* hash.h - hash tables for ipkg
 +
@@ -1025,7 +1025,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.h busybox-1.21.1/archi
 +#endif /* _HASH_TABLE_H_ */
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.21.1/archival/libipkg/ipkg_cmd.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_cmd.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.c	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,1367 @@
 +/* ipkg_cmd.c - the itsy package management system
 +
@@ -2396,7 +2396,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.21.1/archival/libipkg/ipkg_cmd.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_cmd.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.h	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,41 @@
 +/* ipkg_cmd.h - the itsy package management system
 +
@@ -2441,8 +2441,8 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.21.1/archiva
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archival/libipkg/ipkg_conf.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_conf.c	2013-11-02 15:26:12.000000000 +0100
-@@ -0,0 +1,711 @@
++++ busybox-1.21.1/archival/libipkg/ipkg_conf.c	2014-02-17 19:29:30.303924578 +0100
+@@ -0,0 +1,739 @@
 +/* ipkg_conf.c - the itsy package management system
 +
 +   Carl D. Worth
@@ -2548,6 +2548,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archiv
 +int ipkg_conf_init(ipkg_conf_t *conf, const args_t *args)
 +{
 +     int err;
++     int remountroot;
++     struct mntent *mnt;
++     FILE *f;
 +     char *tmp_dir_base;
 +     nv_pair_list_t tmp_dest_nv_pair_list;
 +     char * lists_dir =NULL;
@@ -2571,16 +2574,41 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archiv
 +     if (args->tmp_dir)
 +	  tmp_dir_base = args->tmp_dir;
 +     else 
-+	  tmp_dir_base = getenv("TMPDIR");
++	  tmp_dir_base = getenv("IPKGTMPDIR");
 +     sprintf_alloc(&conf->tmp_dir, "%s/%s",
 +		   tmp_dir_base ? tmp_dir_base : IPKG_CONF_DEFAULT_TMP_DIR_BASE,
 +		   IPKG_CONF_TMP_DIR_SUFFIX);
++     
++     remountroot = 0;
++     /* check if /dev/root is mounted read-only */
++     if ((f = setmntent("/proc/mounts", "r")) == NULL)
++          fprintf (stderr, "Checking /proc/mounts failed\n");
++     while ((mnt = getmntent(f)) != NULL) {
++          if (strcmp(mnt->mnt_fsname, "/dev/root") == 0 &&
++                  hasmntopt(mnt, MNTOPT_RO) != NULL) {
++                  remountroot = 1;
++          }
++     }
++     endmntent(f);
++
++     if (remountroot) {
++          /* mount rootfs read-write */
++          if (mount("","/",0,MS_REMOUNT,0)<0)
++                fprintf (stderr, "Mounting rootfs read-write failed\n");
++     }     
++     mkdir(tmp_dir_base, S_IRWXU);
 +     conf->tmp_dir = mkdtemp(conf->tmp_dir);
 +     if (conf->tmp_dir == NULL) {
 +	  fprintf(stderr, "%s: Failed to create temporary directory `%s': %s\n",
 +		  __FUNCTION__, conf->tmp_dir, strerror(errno));
 +	  return errno;
 +     }
++     if (remountroot) {
++           sync();
++           /* mount rootfs read-only */
++           if (mount("","/",0,MS_REMOUNT|MS_RDONLY,0)<0)
++                  fprintf (stderr, "Mounting rootfs read-only failed\n");
++     }
 +
 +     conf->force_depends = 0;
 +     conf->force_defaults = 0;
@@ -3156,7 +3184,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archiv
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h busybox-1.21.1/archival/libipkg/ipkg_conf.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_conf.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_conf.h	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,107 @@
 +/* ipkg_conf.h - the itsy package management system
 +
@@ -3267,7 +3295,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h busybox-1.21.1/archiv
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c busybox-1.21.1/archival/libipkg/ipkg_configure.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_configure.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_configure.c	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,40 @@
 +/* ipkg_configure.c - the itsy package management system
 +
@@ -3311,7 +3339,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c busybox-1.21.1/a
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h busybox-1.21.1/archival/libipkg/ipkg_configure.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_configure.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_configure.h	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,25 @@
 +/* ipkg_configure.h - the itsy package management system
 +
@@ -3340,7 +3368,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h busybox-1.21.1/a
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.c busybox-1.21.1/archival/libipkg/ipkg_download.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_download.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_download.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_download.c	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,195 @@
 +/* ipkg_download.c - the itsy package management system
 +
@@ -3539,7 +3567,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.c busybox-1.21.1/ar
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.h busybox-1.21.1/archival/libipkg/ipkg_download.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_download.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_download.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_download.h	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,30 @@
 +/* ipkg_download.h - the itsy package management system
 +
@@ -3573,7 +3601,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.h busybox-1.21.1/ar
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg.h busybox-1.21.1/archival/libipkg/ipkg.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg.h	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,68 @@
 +/* ipkg.h - the itsy package management system
 +
@@ -3645,7 +3673,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg.h busybox-1.21.1/archival/li
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h busybox-1.21.1/archival/libipkg/ipkg_includes.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_includes.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_includes.h	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,82 @@
 +#ifndef IPKG_INCLUDES_H
 +#define IPKG_INCLUDES_H
@@ -3731,7 +3759,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h busybox-1.21.1/ar
 +#endif /* IPKG_INCLUDES_H */
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.c busybox-1.21.1/archival/libipkg/ipkg_install.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_install.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_install.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_install.c	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,1982 @@
 +/* ipkg_install.c - the itsy package management system
 +
@@ -5717,7 +5745,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.c busybox-1.21.1/arc
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.h busybox-1.21.1/archival/libipkg/ipkg_install.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_install.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_install.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_install.h	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_install.h - the itsy package management system
 +
@@ -5756,7 +5784,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.h busybox-1.21.1/arc
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.c busybox-1.21.1/archival/libipkg/ipkg_message.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_message.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_message.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_message.c	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,35 @@
 +/* ipkg_message.c - the itsy package management system
 +
@@ -5795,7 +5823,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.c busybox-1.21.1/arc
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.h busybox-1.21.1/archival/libipkg/ipkg_message.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_message.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_message.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_message.h	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,32 @@
 +/* ipkg_message.h - the itsy package management system
 +
@@ -5831,7 +5859,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.h busybox-1.21.1/arc
 +#endif /* _IPKG_MESSAGE_H_ */
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c busybox-1.21.1/archival/libipkg/ipkg_remove.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_remove.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_remove.c	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,385 @@
 +/* ipkg_remove.c - the itsy package management system
 +
@@ -6220,7 +6248,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c busybox-1.21.1/arch
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h busybox-1.21.1/archival/libipkg/ipkg_remove.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_remove.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_remove.h	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,33 @@
 +/* ipkg_remove.h - the itsy package management system
 +
@@ -6257,7 +6285,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h busybox-1.21.1/arch
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.21.1/archival/libipkg/ipkg_upgrade.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.c	2014-02-17 14:25:39.858534188 +0100
 @@ -0,0 +1,79 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6340,7 +6368,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.21.1/arc
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.21.1/archival/libipkg/ipkg_upgrade.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.h	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,18 @@
 +/* ipkg_upgrade.c - the itsy package management system
 +
@@ -6362,7 +6390,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.21.1/arc
 +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c busybox-1.21.1/archival/libipkg/ipkg_utils.c
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_utils.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_utils.c	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,185 @@
 +/* ipkg_utils.c - the itsy package management system
 +
@@ -6551,7 +6579,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c busybox-1.21.1/archi
 +       
 diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h busybox-1.21.1/archival/libipkg/ipkg_utils.h
 --- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/ipkg_utils.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/ipkg_utils.h	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,29 @@
 +/* ipkg_utils.h - the itsy package management system
 +
@@ -6584,7 +6612,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h busybox-1.21.1/archi
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/Kbuild busybox-1.21.1/archival/libipkg/Kbuild
 --- busybox-1.21.1.orig/archival/libipkg/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/Kbuild	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/Kbuild	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,60 @@
 +# Makefile for busybox
 +#
@@ -6648,7 +6676,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/Kbuild busybox-1.21.1/archival/li
 +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\""
 diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.c busybox-1.21.1/archival/libipkg/libipkg.c
 --- busybox-1.21.1.orig/archival/libipkg/libipkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/libipkg.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/libipkg.c	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,583 @@
 +/* ipkglib.c - the itsy package management system
 +
@@ -7235,7 +7263,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.c busybox-1.21.1/archival
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.h busybox-1.21.1/archival/libipkg/libipkg.h
 --- busybox-1.21.1.orig/archival/libipkg/libipkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/libipkg.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/libipkg.h	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,78 @@
 +/* ipkglib.h - the itsy package management system
 +
@@ -7317,7 +7345,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.h busybox-1.21.1/archival
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.c busybox-1.21.1/archival/libipkg/nv_pair.c
 --- busybox-1.21.1.orig/archival/libipkg/nv_pair.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair.c	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,40 @@
 +/* nv_pair.c - the itsy package management system
 +
@@ -7361,7 +7389,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.c busybox-1.21.1/archival
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.h busybox-1.21.1/archival/libipkg/nv_pair.h
 --- busybox-1.21.1.orig/archival/libipkg/nv_pair.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair.h	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,32 @@
 +/* nv_pair.h - the itsy package management system
 +
@@ -7397,7 +7425,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.h busybox-1.21.1/archival
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c busybox-1.21.1/archival/libipkg/nv_pair_list.c
 --- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair_list.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair_list.c	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,98 @@
 +/* nv_pair_list.c - the itsy package management system
 +
@@ -7499,7 +7527,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c busybox-1.21.1/arc
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h busybox-1.21.1/archival/libipkg/nv_pair_list.h
 --- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/nv_pair_list.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/nv_pair_list.h	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,60 @@
 +/* nv_pair_list.h - the itsy package management system
 +
@@ -7563,7 +7591,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h busybox-1.21.1/arc
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.c busybox-1.21.1/archival/libipkg/pkg.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg.c	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,1757 @@
 +/* pkg.c - the itsy package management system
 +
@@ -9324,7 +9352,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.c busybox-1.21.1/archival/lib
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.c busybox-1.21.1/archival/libipkg/pkg_depends.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_depends.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_depends.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_depends.c	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,1032 @@
 +/* pkg_depends.c - the itsy package management system
 +
@@ -10360,7 +10388,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.c busybox-1.21.1/arch
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.h busybox-1.21.1/archival/libipkg/pkg_depends.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_depends.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_depends.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_depends.h	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,105 @@
 +/* pkg_depends.h - the itsy package management system
 +
@@ -10469,7 +10497,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.h busybox-1.21.1/arch
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.c busybox-1.21.1/archival/libipkg/pkg_dest.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_dest.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest.c	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,92 @@
 +/* pkg_dest.c - the itsy package management system
 +
@@ -10565,7 +10593,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.c busybox-1.21.1/archiva
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.h busybox-1.21.1/archival/libipkg/pkg_dest.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_dest.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest.h	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,38 @@
 +/* pkg_dest.h - the itsy package management system
 +
@@ -10607,7 +10635,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.h busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.21.1/archival/libipkg/pkg_dest_list.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest_list.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.c	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,85 @@
 +/* pkg_dest_list.c - the itsy package management system
 +
@@ -10696,7 +10724,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.21.1/ar
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.21.1/archival/libipkg/pkg_dest_list.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_dest_list.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.h	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,50 @@
 +/* pkg_dest_list.h - the itsy package management system
 +
@@ -10750,7 +10778,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.21.1/ar
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.c busybox-1.21.1/archival/libipkg/pkg_extract.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_extract.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_extract.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_extract.c	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,255 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11009,7 +11037,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.c busybox-1.21.1/arch
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.h busybox-1.21.1/archival/libipkg/pkg_extract.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_extract.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_extract.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_extract.h	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,32 @@
 +/* pkg_extract.c - the itsy package management system
 +
@@ -11045,7 +11073,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.h busybox-1.21.1/arch
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.h busybox-1.21.1/archival/libipkg/pkg.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg.h	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,229 @@
 +/* pkg.h - the itsy package management system
 +
@@ -11278,7 +11306,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.h busybox-1.21.1/archival/lib
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.c busybox-1.21.1/archival/libipkg/pkg_hash.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_hash.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_hash.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_hash.c	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,623 @@
 +/* ipkg_hash.c - the itsy package management system
 +
@@ -11905,7 +11933,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.c busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.h busybox-1.21.1/archival/libipkg/pkg_hash.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_hash.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_hash.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_hash.h	2014-02-17 14:25:39.862534201 +0100
 @@ -0,0 +1,61 @@
 +/* pkg_hash.h - the itsy package management system
 +
@@ -11970,7 +11998,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.h busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.c busybox-1.21.1/archival/libipkg/pkg_parse.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_parse.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_parse.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_parse.c	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,368 @@
 +/* pkg_parse.c - the itsy package management system
 +
@@ -12342,7 +12370,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.c busybox-1.21.1/archiv
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.h busybox-1.21.1/archival/libipkg/pkg_parse.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_parse.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_parse.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_parse.h	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,31 @@
 +/* pkg_parse.h - the itsy package management system
 +
@@ -12377,7 +12405,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.h busybox-1.21.1/archiv
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.c busybox-1.21.1/archival/libipkg/pkg_src.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_src.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src.c	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,43 @@
 +/* pkg_src.c - the itsy package management system
 +
@@ -12424,7 +12452,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.c busybox-1.21.1/archival
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.h busybox-1.21.1/archival/libipkg/pkg_src.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_src.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src.h	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,34 @@
 +/* pkg_src.h - the itsy package management system
 +
@@ -12462,7 +12490,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.h busybox-1.21.1/archival
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c busybox-1.21.1/archival/libipkg/pkg_src_list.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src_list.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src_list.c	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,75 @@
 +/* pkg_src_list.c - the itsy package management system
 +
@@ -12541,7 +12569,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c busybox-1.21.1/arc
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h busybox-1.21.1/archival/libipkg/pkg_src_list.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_src_list.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_src_list.h	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,57 @@
 +/* pkg_src_list.h - the itsy package management system
 +
@@ -12602,7 +12630,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h busybox-1.21.1/arc
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.c busybox-1.21.1/archival/libipkg/pkg_vec.c
 --- busybox-1.21.1.orig/archival/libipkg/pkg_vec.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_vec.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_vec.c	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,231 @@
 +/* pkg_vec.c - the itsy package management system
 +
@@ -12837,7 +12865,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.c busybox-1.21.1/archival
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.h busybox-1.21.1/archival/libipkg/pkg_vec.h
 --- busybox-1.21.1.orig/archival/libipkg/pkg_vec.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/pkg_vec.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/pkg_vec.h	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,62 @@
 +/* pkg_vec.h - the itsy package management system
 +
@@ -12903,7 +12931,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.h busybox-1.21.1/archival
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.21.1/archival/libipkg/sprintf_alloc.h
 --- busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/sprintf_alloc.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/sprintf_alloc.h	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,25 @@
 +/* sprintf_alloca.c -- like sprintf with memory allocation
 +
@@ -12932,7 +12960,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.21.1/ar
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.c busybox-1.21.1/archival/libipkg/str_list.c
 --- busybox-1.21.1.orig/archival/libipkg/str_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_list.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/str_list.c	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,76 @@
 +/* str_list.c - the itsy package management system
 +
@@ -13012,7 +13040,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.c busybox-1.21.1/archiva
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.h busybox-1.21.1/archival/libipkg/str_list.h
 --- busybox-1.21.1.orig/archival/libipkg/str_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_list.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/str_list.h	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,51 @@
 +/* str_list.h - the itsy package management system
 +
@@ -13067,7 +13095,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.h busybox-1.21.1/archiva
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.c busybox-1.21.1/archival/libipkg/str_util.c
 --- busybox-1.21.1.orig/archival/libipkg/str_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_util.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/str_util.c	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,69 @@
 +/* str_utils.c - the itsy package management system
 +
@@ -13140,7 +13168,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.c busybox-1.21.1/archiva
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.h busybox-1.21.1/archival/libipkg/str_util.h
 --- busybox-1.21.1.orig/archival/libipkg/str_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/str_util.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/str_util.h	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,27 @@
 +/* str_utils.h - the itsy package management system
 +
@@ -13171,7 +13199,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.h busybox-1.21.1/archiva
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/user.c busybox-1.21.1/archival/libipkg/user.c
 --- busybox-1.21.1.orig/archival/libipkg/user.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/user.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/user.c	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,49 @@
 +/* user.c - the itsy package management system
 +
@@ -13224,7 +13252,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/user.c busybox-1.21.1/archival/li
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/user.h busybox-1.21.1/archival/libipkg/user.h
 --- busybox-1.21.1.orig/archival/libipkg/user.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/user.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/user.h	2014-02-17 14:25:39.866534213 +0100
 @@ -0,0 +1,23 @@
 +/* user.c - the itsy package management system
 +
@@ -13251,7 +13279,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/user.h busybox-1.21.1/archival/li
 +
 diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.c busybox-1.21.1/archival/libipkg/void_list.c
 --- busybox-1.21.1.orig/archival/libipkg/void_list.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/void_list.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/void_list.c	2014-02-17 14:25:39.886534275 +0100
 @@ -0,0 +1,194 @@
 +/* void_list.c - the itsy package management system
 +
@@ -13449,7 +13477,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.c busybox-1.21.1/archiv
 +}
 diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.h busybox-1.21.1/archival/libipkg/void_list.h
 --- busybox-1.21.1.orig/archival/libipkg/void_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/void_list.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/void_list.h	2014-02-17 14:25:39.886534275 +0100
 @@ -0,0 +1,59 @@
 +/* void_list.h - the itsy package management system
 +
@@ -13512,7 +13540,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.h busybox-1.21.1/archiv
 +#endif
 diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.c busybox-1.21.1/archival/libipkg/xsystem.c
 --- busybox-1.21.1.orig/archival/libipkg/xsystem.c	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/xsystem.c	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/xsystem.c	2014-02-17 14:25:39.886534275 +0100
 @@ -0,0 +1,64 @@
 +/* xsystem.c - system(3) with error messages
 +
@@ -13580,7 +13608,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.c busybox-1.21.1/archival
 +	 
 diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.h busybox-1.21.1/archival/libipkg/xsystem.h
 --- busybox-1.21.1.orig/archival/libipkg/xsystem.h	1970-01-01 01:00:00.000000000 +0100
-+++ busybox-1.21.1/archival/libipkg/xsystem.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/archival/libipkg/xsystem.h	2014-02-17 14:25:39.890534287 +0100
 @@ -0,0 +1,34 @@
 +/* xsystem.h - system(3) with error messages
 +
@@ -13618,7 +13646,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.h busybox-1.21.1/archival
 +	 
 diff -Nur busybox-1.21.1.orig/include/applets.src.h busybox-1.21.1/include/applets.src.h
 --- busybox-1.21.1.orig/include/applets.src.h	2013-06-29 16:58:06.000000000 +0200
-+++ busybox-1.21.1/include/applets.src.h	2013-11-02 15:27:08.000000000 +0100
++++ busybox-1.21.1/include/applets.src.h	2014-02-17 14:25:39.890534287 +0100
 @@ -199,6 +199,7 @@
  IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
  IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP))
@@ -13629,7 +13657,7 @@ diff -Nur busybox-1.21.1.orig/include/applets.src.h busybox-1.21.1/include/apple
  IF_IPRULE(APPLET(iprule, BB_DIR_SBIN, BB_SUID_DROP))
 diff -Nur busybox-1.21.1.orig/include/bb_archive.h busybox-1.21.1/include/bb_archive.h
 --- busybox-1.21.1.orig/include/bb_archive.h	2013-06-29 16:58:06.000000000 +0200
-+++ busybox-1.21.1/include/bb_archive.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/include/bb_archive.h	2014-02-17 14:25:39.890534287 +0100
 @@ -79,7 +79,7 @@
  	/* Archiver specific. Can make it a union if it ever gets big */
  #define PAX_NEXT_FILE 0
@@ -13650,7 +13678,7 @@ diff -Nur busybox-1.21.1.orig/include/bb_archive.h busybox-1.21.1/include/bb_arc
  	/* How to process any sub archive, e.g. get_header_tar_gz */
 diff -Nur busybox-1.21.1.orig/include/usage.src.h busybox-1.21.1/include/usage.src.h
 --- busybox-1.21.1.orig/include/usage.src.h	2013-05-12 01:30:43.000000000 +0200
-+++ busybox-1.21.1/include/usage.src.h	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/include/usage.src.h	2014-02-17 14:25:39.890534287 +0100
 @@ -19,4 +19,80 @@
  #define busybox_notes_usage \
         "Hello world!\n"
@@ -13734,7 +13762,7 @@ diff -Nur busybox-1.21.1.orig/include/usage.src.h busybox-1.21.1/include/usage.s
  #endif
 diff -Nur busybox-1.21.1.orig/Makefile busybox-1.21.1/Makefile
 --- busybox-1.21.1.orig/Makefile	2013-06-29 17:00:18.000000000 +0200
-+++ busybox-1.21.1/Makefile	2013-11-02 15:26:12.000000000 +0100
++++ busybox-1.21.1/Makefile	2014-02-17 14:25:39.890534287 +0100
 @@ -466,6 +466,7 @@
  libs-y		:= \
  		archival/ \

package/bzr/Makefile

@@ -4,15 +4,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		bzr
-PKG_VERSION:=		2.5.1
+PKG_VERSION:=		2.6.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ac5079858364a046071000d5cdccb67b
+PKG_MD5SUM:=		28c86653d0df10d202c6b842deb0ea35
 PKG_DESCR:=		bazaar
 PKG_SECTION:=		scm
 PKG_BUILDDEP:=		python2
 PKG_DEPENDS:=		python2
 PKG_URL:=		http://bazaar.canonical.com/en/
-PKG_SITES:=		https://launchpad.net/bzr/2.5/2.5.1/+download/
+PKG_SITES:=		https://launchpad.net/bzr/2.6/2.6.0/+download/
+
+PKG_HOST_DEPENDS:=	!darwin
 
 include $(TOPDIR)/mk/package.mk
 

package/cups/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cups
 PKG_VERSION:=		1.7.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		55277c40fd4b7183dc3671d39c5c42b7
 PKG_DESCR:=		Common Unix Printing System
 PKG_SECTION:=		net/misc
@@ -48,7 +48,7 @@ HOST_CONFIGURE_ARGS+=	--disable-tcp-wrappers \
 			--with-components=core \
 			--with-rcdir=$(STAGING_HOST_DIR)/etc
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
-			OPTIM='-fPIC -std=c89'
+			OPTIM='-fPIC -std=c89' LSB_BUILD=y
 
 CONFIGURE_ARGS+=	--with-cups-user=cups \
 			--with-cups-group=cups \

package/file/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		file
-PKG_VERSION:=		5.15
+PKG_VERSION:=		5.17
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3f99565532f548d7540912c4642d1ede
+PKG_MD5SUM:=		e19c47e069ced7b01ccb4db402cc01d3
 PKG_DESCR:=		a file type guesser
 PKG_SECTION:=		utils
 PKG_BUILDDEP:=		file-host

package/gdb/patches/patch-gdb_amd64-linux-nat_c

@@ -1,81 +0,0 @@
---- gdb-7.6.orig/gdb/amd64-linux-nat.c	2013-03-11 09:25:57.000000000 +0100
-+++ gdb-7.6/gdb/amd64-linux-nat.c	2013-10-26 22:30:11.000000000 +0200
-@@ -25,15 +25,13 @@
- #include "regset.h"
- #include "linux-nat.h"
- #include "amd64-linux-tdep.h"
--#include "linux-btrace.h"
--#include "btrace.h"
- 
- #include "gdb_assert.h"
- #include "gdb_string.h"
- #include "elf/common.h"
- #include <sys/uio.h>
- #include <sys/ptrace.h>
--#include <sys/debugreg.h>
-+#include "debugreg.h"
- #include <sys/syscall.h>
- #include <sys/procfs.h>
- #include <sys/user.h>
-@@ -1121,47 +1119,6 @@ amd64_linux_read_description (struct tar
-     }
- }
- 
--/* Enable branch tracing.  */
--
--static struct btrace_target_info *
--amd64_linux_enable_btrace (ptid_t ptid)
--{
--  struct btrace_target_info *tinfo;
--  struct gdbarch *gdbarch;
--
--  errno = 0;
--  tinfo = linux_enable_btrace (ptid);
--
--  if (tinfo == NULL)
--    error (_("Could not enable branch tracing for %s: %s."),
--	   target_pid_to_str (ptid), safe_strerror (errno));
--
--  /* Fill in the size of a pointer in bits.  */
--  gdbarch = target_thread_architecture (ptid);
--  tinfo->ptr_bits = gdbarch_ptr_bit (gdbarch);
--
--  return tinfo;
--}
--
--/* Disable branch tracing.  */
--
--static void
--amd64_linux_disable_btrace (struct btrace_target_info *tinfo)
--{
--  int errcode = linux_disable_btrace (tinfo);
--
--  if (errcode != 0)
--    error (_("Could not disable branch tracing: %s."), safe_strerror (errcode));
--}
--
--/* Teardown branch tracing.  */
--
--static void
--amd64_linux_teardown_btrace (struct btrace_target_info *tinfo)
--{
--  /* Ignore errors.  */
--  linux_disable_btrace (tinfo);
--}
- 
- /* Provide a prototype to silence -Wmissing-prototypes.  */
- void _initialize_amd64_linux_nat (void);
-@@ -1201,13 +1158,6 @@ _initialize_amd64_linux_nat (void)
- 
-   t->to_read_description = amd64_linux_read_description;
- 
--  /* Add btrace methods.  */
--  t->to_supports_btrace = linux_supports_btrace;
--  t->to_enable_btrace = amd64_linux_enable_btrace;
--  t->to_disable_btrace = amd64_linux_disable_btrace;
--  t->to_teardown_btrace = amd64_linux_teardown_btrace;
--  t->to_read_btrace = linux_read_btrace;
--
-   /* Register the target.  */
-   linux_nat_add_target (t);
-   linux_nat_set_new_thread (t, amd64_linux_new_thread);

package/gdb/patches/patch-gdb_common_gdb_thread_db_h

@@ -1,37 +0,0 @@
-* added from https://github.com/rofl0r/sabotage
-
---- gdb-7.6.orig/gdb/common/gdb_thread_db.h	2013-01-01 07:32:54.000000000 +0100
-+++ gdb-7.6/gdb/common/gdb_thread_db.h	2013-08-13 16:37:40.000000000 +0200
-@@ -1,17 +1,6 @@
- #ifdef HAVE_THREAD_DB_H
- #include <thread_db.h>
- 
--#ifndef LIBTHREAD_DB_SO
--#define LIBTHREAD_DB_SO "libthread_db.so.1"
--#endif
--
--#ifndef LIBTHREAD_DB_SEARCH_PATH
--/* $sdir appears before $pdir for some minimal security protection:
--   we trust the system libthread_db.so a bit more than some random
--   libthread_db associated with whatever libpthread the app is using.  */
--#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir"
--#endif
--
- #else
- 
- /* Copyright (C) 1999-2013 Free Software Foundation, Inc.
-@@ -453,3 +442,14 @@ extern td_err_e td_thr_dbresume (const t
- #endif	/* thread_db.h */
- 
- #endif /* HAVE_THREAD_DB_H */
-+
-+#ifndef LIBTHREAD_DB_SO
-+#define LIBTHREAD_DB_SO "libthread_db.so.1"
-+#endif
-+
-+#ifndef LIBTHREAD_DB_SEARCH_PATH
-+/* $sdir appears before $pdir for some minimal security protection:
-+   we trust the system libthread_db.so a bit more than some random
-+   libthread_db associated with whatever libpthread the app is using.  */
-+#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir"
-+#endif

package/gdb/patches/patch-gdb_config_i386_linux64_mh

@@ -1,11 +0,0 @@
---- gdb-7.6.orig/gdb/config/i386/linux64.mh	2013-03-11 09:25:58.000000000 +0100
-+++ gdb-7.6/gdb/config/i386/linux64.mh	2013-09-04 13:19:59.000000000 +0200
-@@ -3,7 +3,7 @@ NATDEPFILES= inf-ptrace.o fork-child.o \
- 	i386-nat.o amd64-nat.o amd64-linux-nat.o \
- 	linux-nat.o linux-osdata.o \
- 	proc-service.o linux-thread-db.o linux-fork.o \
--	linux-procfs.o linux-ptrace.o linux-btrace.o
-+	linux-procfs.o linux-ptrace.o
- NAT_FILE= config/nm-linux.h
- NAT_CDEPS = $(srcdir)/proc-service.list
- 

package/gdb/patches/patch-gdb_config_i386_linux_mh

@@ -1,12 +0,0 @@
---- gdb-7.6.orig/gdb/config/i386/linux.mh	2013-03-11 09:25:58.000000000 +0100
-+++ gdb-7.6/gdb/config/i386/linux.mh	2013-09-04 13:19:46.000000000 +0200
-@@ -4,8 +4,7 @@ NAT_FILE= config/nm-linux.h
- NATDEPFILES= inf-ptrace.o fork-child.o \
- 	i386-nat.o i386-linux-nat.o \
- 	proc-service.o linux-thread-db.o \
--	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
--	linux-btrace.o
-+	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o
- NAT_CDEPS = $(srcdir)/proc-service.list
- 
- # The dynamically loaded libthread_db needs access to symbols in the

package/gnutls/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gnutls
-PKG_VERSION:=		3.2.3
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		7c0dd4f77dc70c64d2f385aeb2df4157
+PKG_VERSION:=		3.2.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9ae2bfa55d4c12dd6005cfb7014977f9
 PKG_DESCR:=		GNU TLS library
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libgcrypt libtasn1 zlib libnettle libgmp

package/grub-bin/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=		1.98
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		50dbe739776f904c318be05faf1d7ce5
 PKG_DESCR:=		GRUB2 bootloader (binary package)
-PKG_SECTION:=		base
+PKG_SECTION:=		boot
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_URL:=		http://www.gnu.org/software/grub
 

package/grub/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.98
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c0bcf60e524739bb64e3a2d4e3732a59
 PKG_DESCR:=		GRUB2 bootloader (source package)
-PKG_SECTION:=		base
+PKG_SECTION:=		boot
 PKG_URL:=		http://www.gnu.org/software/grub
 PKG_SITES:=		ftp://alpha.gnu.org/gnu/grub/
 

package/krb5/Makefile

@@ -4,16 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		krb5
-PKG_VERSION:=		1.11.3
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		56f0ae274b285320b8a597cb89442449
+PKG_VERSION:=		1.12.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		524b1067b619cb5bf780759b6884c3f5
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libkrb5 libncurses libss libcom-err keyutils
 PKG_DEPENDS+=		libpthread
 PKG_BUILDDEP:=		ncurses e2fsprogs gettext-tiny bison-host
 PKG_URL:=		http://web.mit.edu/kerberos/
-PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.11/
+PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.12/
 PKG_NOPARALLEL:=	1
 PKG_LIBNAME:=		libkrb5
 PKG_OPTS:=		dev

package/krb5/patches/patch-src_include_k5-int_h

@@ -1,6 +1,6 @@
---- krb5-1.11.3.orig/src/include/k5-int.h	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/include/k5-int.h	2013-08-14 14:05:17.000000000 +0200
-@@ -1156,7 +1156,7 @@ void k5_free_pa_otp_challenge(krb5_conte
+--- krb5-1.12.1.orig/src/include/k5-int.h	2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/include/k5-int.h	2014-02-11 18:55:39.000000000 +0100
+@@ -904,7 +904,7 @@ void k5_free_pa_otp_challenge(krb5_conte
  void k5_free_pa_otp_req(krb5_context context, krb5_pa_otp_req *val);
  
  /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */

package/krb5/patches/patch-src_include_osconf_hin

@@ -1,21 +0,0 @@
---- krb5-1.11.3.orig/src/include/osconf.hin	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/include/osconf.hin	2013-08-14 14:05:17.000000000 +0200
-@@ -58,14 +58,14 @@
- #define DEFAULT_PLUGIN_BASE_DIR "@LIBDIR/krb5/plugins"
- #define PLUGIN_EXT              "@DYNOBJEXT"
- 
--#define DEFAULT_KDB_FILE        "@LOCALSTATEDIR/krb5kdc/principal"
--#define DEFAULT_KEYFILE_STUB    "@LOCALSTATEDIR/krb5kdc/.k5."
--#define KRB5_DEFAULT_ADMIN_ACL  "@LOCALSTATEDIR/krb5kdc/krb5_adm.acl"
-+#define DEFAULT_KDB_FILE        "@SYSCONFDIR/krb5kdc/principal"
-+#define DEFAULT_KEYFILE_STUB    "@SYSCONFDIR/krb5kdc/.k5."
-+#define KRB5_DEFAULT_ADMIN_ACL  "@SYSCONFDIR/krb5kdc/krb5_adm.acl"
- /* Used by old admin server */
- #define DEFAULT_ADMIN_ACL       "@LOCALSTATEDIR/krb5kdc/kadm_old.acl"
- 
- /* Location of KDC profile */
--#define DEFAULT_KDC_PROFILE     "@LOCALSTATEDIR/krb5kdc/kdc.conf"
-+#define DEFAULT_KDC_PROFILE     "@SYSCONFDIR/krb5kdc/kdc.conf"
- #define KDC_PROFILE_ENV         "KRB5_KDC_PROFILE"
- 
- #if TARGET_OS_MAC

package/krb5/patches/patch-src_kdc_main_c

@@ -1,10 +0,0 @@
---- krb5-1.11.3.orig/src/kdc/main.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/kdc/main.c	2013-08-14 14:05:17.000000000 +0200
-@@ -34,7 +34,6 @@
- #include <sys/wait.h>
- 
- #include "k5-int.h"
--#include "com_err.h"
- #include "adm.h"
- #include "adm_proto.h"
- #include "kdc_util.h"

package/krb5/patches/patch-src_krb5-config_in

@@ -1,22 +0,0 @@
---- krb5-1.11.3.orig/src/krb5-config.in	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/krb5-config.in	2013-08-14 14:05:17.000000000 +0200
-@@ -34,8 +34,6 @@ libdir=@libdir@
- CC_LINK='@CC_LINK@'
- KDB5_DB_LIB=@KDB5_DB_LIB@
- LDFLAGS='@LDFLAGS@'
--RPATH_FLAG='@RPATH_FLAG@'
--PROG_RPATH_FLAGS='@PROG_RPATH_FLAGS@'
- PTHREAD_CFLAGS='@PTHREAD_CFLAGS@'
- DL_LIB='@DL_LIB@'
- DEFCCNAME='@DEFCCNAME@'
-@@ -213,10 +211,7 @@ if test -n "$do_libs"; then
-     # Ugly gross hack for our build tree
-     lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \
- 	    -e 's/\$(PURE)//' \
--	    -e 's#\$(PROG_RPATH_FLAGS)#'"$PROG_RPATH_FLAGS"'#' \
--	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
- 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
--	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
- 	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
- 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- 	    -e 's#\$(CFLAGS)##'`

package/krb5/patches/patch-src_lib_kadm5_alt_prof_c

@@ -1,11 +1,11 @@
---- krb5-1.11.3.orig/src/lib/kadm5/alt_prof.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/lib/kadm5/alt_prof.c	2013-10-09 09:42:35.000000000 +0200
-@@ -164,7 +164,7 @@ krb5_aprof_get_boolean(krb5_pointer acon
-     char **values;
-     char *valp;
+--- krb5-1.12.1.orig/src/lib/kadm5/alt_prof.c	2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/lib/kadm5/alt_prof.c	2014-02-11 18:55:39.000000000 +0100
+@@ -155,7 +155,7 @@ krb5_aprof_get_boolean(krb5_pointer acon
+     krb5_error_code ret;
+     char **values, *valp;
      int idx;
 -    krb5_boolean val;
 +    krb5_boolean val = 0;
  
-     kret = krb5_aprof_getvals (acontext, hierarchy, &values);
-     if (kret)
+     ret = krb5_aprof_getvals(acontext, hierarchy, &values);
+     if (ret)

package/krb5/patches/patch-src_lib_krad_packet_c

@@ -0,0 +1,12 @@
+--- krb5-1.12.1.orig/src/lib/krad/packet.c	2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/lib/krad/packet.c	2014-02-11 19:01:06.000000000 +0100
+@@ -253,8 +253,8 @@ krad_packet_new_request(krb5_context ctx
+ {
+     krb5_error_code retval;
+     krad_packet *pkt;
+-    uchar id;
+     size_t attrset_len;
++    uchar id = NULL;
+ 
+     pkt = packet_new();
+     if (pkt == NULL) {

package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c

@@ -1,5 +1,5 @@
---- krb5-1.11.3.orig/src/lib/krb5/krb/gic_pwd.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/lib/krb5/krb/gic_pwd.c	2013-08-14 14:05:17.000000000 +0200
+--- krb5-1.12.1.orig/src/lib/krb5/krb/gic_pwd.c	2014-01-16 01:44:15.000000000 +0100
++++ krb5-1.12.1/src/lib/krb5/krb/gic_pwd.c	2014-02-11 18:55:39.000000000 +0100
 @@ -1,6 +1,6 @@
  /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
  #include "k5-int.h"
@@ -7,4 +7,4 @@
 +#include <et/com_err.h>
  #include "init_creds_ctx.h"
  #include "int-proto.h"
- 
+ #include "os-proto.h"

package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c

@@ -1,11 +0,0 @@
---- krb5-1.11.3.orig/src/lib/krb5/krb/preauth2.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/lib/krb5/krb/preauth2.c	2013-10-09 09:30:28.000000000 +0200
-@@ -957,7 +957,7 @@ krb5_do_preauth(krb5_context context, kr
-     size_t i, h;
-     int out_pa_list_size = 0;
-     krb5_pa_data **out_pa_list = NULL;
--    krb5_error_code ret, module_ret;
-+    krb5_error_code ret, module_ret = 0;
-     krb5_responder_fn responder = opte->opt_private->responder;
-     static const int paorder[] = { PA_INFO, PA_REAL };
- 

package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c

@@ -1,11 +0,0 @@
---- krb5-1.11.3.orig/src/lib/krb5/krb/sendauth.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/lib/krb5/krb/sendauth.c	2013-08-14 14:05:18.000000000 +0200
-@@ -25,7 +25,7 @@
-  */
- 
- #include "k5-int.h"
--#include "com_err.h"
-+#include <et/com_err.h>
- #include "auth_con.h"
- #include <errno.h>
- #include <stdio.h>

package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c

@@ -1,11 +0,0 @@
---- krb5-1.11.3.orig/src/lib/krb5/unicode/ucstr.c	2013-06-03 23:39:43.000000000 +0200
-+++ krb5-1.11.3/src/lib/krb5/unicode/ucstr.c	2013-10-09 09:34:54.000000000 +0200
-@@ -109,7 +109,7 @@ krb5int_utf8_normalize(
- 		       krb5_data ** newdataptr,
- 		       unsigned flags)
- {
--    int i, j, len, clen, outpos, ucsoutlen, outsize;
-+    int i, j, len, clen, outpos = 0, ucsoutlen, outsize;
-     char *out = NULL, *outtmp, *s;
-     krb5_ucs4 *ucs = NULL, *p, *ucsout = NULL;
-     krb5_data *newdata;

package/mc/Makefile

@@ -4,17 +4,19 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mc
-PKG_VERSION:=		4.7.0.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		f48b2c8dd140aeb36f59d16a662f0779
+PKG_VERSION:=		4.8.11
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1a2d74b75ddbff0b0d6cdc04bf4a7d31
 PKG_DESCR:=		norton commander clone
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		glib libncurses
 PKG_BUILDDEP:=		glib ncurses
 PKG_URL:=		http://www.midnight-commander.org/
-PKG_SITES:=		http://openadk.org/distfiles/
+PKG_SITES:=		http://ftp.midnight-commander.org/
 PKG_NOPARALLEL:=	1
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -45,7 +47,7 @@ mc-install:
 	${INSTALL_DIR} ${IDIR_MC}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/mc ${IDIR_MC}/usr/bin/
 	cd ${IDIR_MC}/usr/bin && ln -fs mc mcedit && ln -fs mc mcview
-	cd ${WRKINST}/etc/mc && ${CP} cedit.menu mc.ext \
-	    mc.lib mc.menu extfs ${IDIR_MC}/etc/mc/
+	cd ${WRKINST}/etc/mc && ${CP} mcedit.menu mc.ext \
+	    mc.menu ${IDIR_MC}/etc/mc/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/mc/patches/patch-Makefile_in

@@ -1,11 +0,0 @@
---- mc-4.7.0.2.orig/Makefile.in	2010-02-02 16:24:55.000000000 +0100
-+++ mc-4.7.0.2/Makefile.in	2010-02-06 00:46:00.203084693 +0100
-@@ -308,7 +308,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.5
--SUBDIRS = intl po lib src doc contrib misc
-+SUBDIRS = intl po lib src contrib misc
- EXTRA_DIST = 
- dist_noinst_SCRIPTS = build-glib2.sh
- dist_noinst_HEADERS = $(top_srcdir)/version.h

package/mc/patches/patch-lib_tty_key_c

@@ -0,0 +1,18 @@
+--- mc-4.8.11.orig/lib/tty/key.c	2013-11-29 19:27:07.000000000 +0100
++++ mc-4.8.11/lib/tty/key.c	2014-02-11 20:02:34.000000000 +0100
+@@ -1946,6 +1946,7 @@ int
+ tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block)
+ {
+     int c;
++    static int flag = 0;    /* Return value from select */
+ #ifdef HAVE_LIBGPM
+     static struct Gpm_Event ev; /* Mouse event */
+ #endif
+@@ -1978,7 +1979,6 @@ tty_get_event (struct Gpm_Event *event,
+     while (pending_keys == NULL)
+     {
+         int nfd;
+-        static int flag = 0;    /* Return value from select */
+         fd_set select_set;
+ 
+         FD_ZERO (&select_set);

package/mc/patches/patch-lib_tty_tty-ncurses_c

@@ -0,0 +1,27 @@
+--- mc-4.8.11.orig/lib/tty/tty-ncurses.c	2013-11-29 19:27:07.000000000 +0100
++++ mc-4.8.11/lib/tty/tty-ncurses.c	2014-02-12 12:40:05.000000000 +0100
+@@ -65,7 +65,7 @@
+ 
+ /*** file scope macro definitions ****************************************************************/
+ 
+-#if defined(_AIX) && !defined(CTRL)
++#if !defined(CTRL)
+ #define CTRL(x) ((x) & 0x1f)
+ #endif
+ 
+@@ -530,6 +530,7 @@ tty_print_anychar (int c)
+     if (mc_global.utf8_display || c > 255)
+     {
+         int res;
++        unsigned char str[UTF8_CHAR_LEN + 1];
+ 
+         res = g_unichar_to_utf8 (c, (char *) str);
+         if (res == 0)
+@@ -540,7 +541,6 @@ tty_print_anychar (int c)
+         }
+         else
+         {
+-            unsigned char str[UTF8_CHAR_LEN + 1];
+             const char *s;
+ 
+             str[res] = '\0';

package/monit/patches/patch-configure

@@ -0,0 +1,11 @@
+--- monit-5.6.orig/configure	2013-09-03 14:55:49.000000000 +0200
++++ monit-5.6/configure	2014-02-10 18:05:03.000000000 +0100
+@@ -13575,7 +13575,7 @@ fi
+ # ------------------------------------------------------------------------
+ 
+ # Backward compatibility until we get ride of arch settings
+-architecture=`uname`
++architecture=Linux
+ if test "$architecture" = "SunOS"
+ then
+    ARCH="SOLARIS"

package/mozjs/Makefile

@@ -13,6 +13,8 @@ PKG_BUILDDEP:=		bzip2-host python2-host nspr
 PKG_SITES:=		http://ftp.mozilla.org/pub/mozilla.org/js/
 PKG_OPTS:=		dev
 
+PKG_HOST_DEPENDS:=	!darwin
+
 DISTFILES:=             ${PKG_NAME}${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}${PKG_VERSION}
 WRKSRC=                 ${WRKDIST}/js/src

package/nmap/Makefile

@@ -27,6 +27,7 @@ endif
 
 TARGET_CPPFLAGS+=	-DNOLUA
 TARGET_LDFLAGS+=	-lpthread
+CONFIGURE_ENV+=		ac_cv_dnet_bsd_bpf=no
 CONFIGURE_ARGS+=	--without-openssl \
 			--without-zenmap \
 			--without-ndiff \

package/nmap/patches/patch-liblinear_Makefile

@@ -0,0 +1,16 @@
+--- nmap-6.40.orig/liblinear/Makefile	2011-09-23 23:15:09.000000000 +0200
++++ nmap-6.40/liblinear/Makefile	2014-02-11 19:38:23.000000000 +0100
+@@ -1,10 +1,10 @@
+ CXX ?= g++
+ CC ?= gcc
+-CFLAGS = -Wall -Wconversion -O3 -fPIC
++CFLAGS ?= -Wall -Wconversion -O3 -fPIC
+ LIBS = blas/blas.a
+ SHVER = 1
+-AR = ar
+-RANLIB = ranlib
++AR ?= ar
++RANLIB ?= ranlib
+ #LIBS = -lblas
+ 
+ all: train predict

package/openjdk7/Makefile

@@ -13,10 +13,11 @@ PKG_BUILDDEP:=		gettext-tiny-host glib-host flex-host bison-host qemu-host
 PKG_BUILDDEP+=		fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host 
 PKG_BUILDDEP+=		xineramaproto-host libXinerama-host recordproto-host libXi-host libXtst-host freetype-host
 PKG_BUILDDEP+=		renderproto-host libXrender-host alsa-lib-host libffi-host gcj-host ecj-host jikes-host 
-PKG_BUILDDEP+=		classpath-host jamvm-host ant-host cups-host openjdk7-host
+PKG_BUILDDEP+=		classpath-host jamvm-host ant-host cups-host openjdk7-host nss
 PKG_BUILDDEP+=		alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
 PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
-PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi libgcc
+PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi libgcc cups
+PKG_DEPENDS+=		libfreetype libxrender libx11 libxext libpthread nss
 PKG_URL:=		http://openjdk.org/
 PKG_SITES:=		http://icedtea.classpath.org/download/source/
 
@@ -66,6 +67,7 @@ CONFIGURE_COMMON:=	--disable-docs \
 			--with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
 			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
 			--with-gcj=$(STAGING_HOST_DIR)/usr/bin/gcj \
+			--enable-nss \
 			--without-hotspot-build \
 			--disable-system-jpeg \
 			--disable-system-lcms \

package/openjdk7/patches/openadk.patch

@@ -3203,8 +3203,8 @@ diff -Nur icedtea-2.4.5.orig/Makefile.in.orig icedtea-2.4.5/Makefile.in.orig
 +.NOEXPORT:
 diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk.patch
 --- icedtea-2.4.5.orig/patches/openadk.patch	1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.4.5/patches/openadk.patch	2014-02-10 18:48:24.000000000 +0100
-@@ -0,0 +1,544 @@
++++ icedtea-2.4.5/patches/openadk.patch	2014-02-12 12:48:40.000000000 +0100
+@@ -0,0 +1,687 @@
 +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
 +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2014-01-28 18:58:08.000000000 +0100
 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2014-02-10 11:31:48.000000000 +0100
@@ -3321,6 +3321,19 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk
 +       endif
 +     endif
 +   endif
++diff -Nur openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk
++--- openjdk.orig/jdk/make/common/Sanity.gmk	2014-01-28 19:02:26.000000000 +0100
+++++ openjdk/jdk/make/common/Sanity.gmk	2014-02-12 12:28:47.000000000 +0100
++@@ -91,8 +91,7 @@
++     sane-ld_run_path \
++     sane-alt_bootdir \
++     sane-bootdir \
++-    sane-local-bootdir \
++-    sane-alsa-headers
+++    sane-local-bootdir
++ 
++ ifdef OPENJDK
++ sanity-all:: sane-freetype 
 +diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
 +--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2014-01-28 19:02:26.000000000 +0100
 ++++ openjdk/jdk/make/common/shared/Platform.gmk	2014-02-10 11:32:16.000000000 +0100
@@ -3334,6 +3347,64 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk
 +   archExpr = case "$(mach)" in \
 +                 i[3-9]86) \
 +                     echo i586 \
++diff -Nur openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
++--- openjdk.orig/jdk/make/common/shared/Sanity.gmk	2014-01-28 19:02:26.000000000 +0100
+++++ openjdk/jdk/make/common/shared/Sanity.gmk	2014-02-12 12:31:12.000000000 +0100
++@@ -114,11 +114,6 @@
++     elif [ -f /etc/lsb-release ] ; then \
++       $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
++     fi)
++-  ALSA_INCLUDE=/usr/include/alsa/version.h
++-  ALSA_LIBRARY=/usr/lib/libasound.so
++-  _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
++-           $(SED) -e 's@.*"\(.*\)".*@\1@' )
++-  ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
++ endif
++ 
++ ifeq ($(PLATFORM), macosx)
++@@ -225,7 +220,6 @@
++ 	sane-compiler \
++ 	sane-link \
++ 	sane-cacerts \
++-	sane-alsa-headers \
++ 	sane-ant_version \
++ 	sane-zip_version \
++ 	sane-unzip_version \
++@@ -1381,34 +1375,6 @@
++   endif
++ endif
++ 
++-######################################################
++-# Check that ALSA headers and libs are installed and 
++-# that the header has the right version. We only
++-# need /usr/include/alsa/version.h and /usr/lib/libasound.so
++-######################################################
++-
++-ifdef REQUIRED_ALSA_VERSION
++-  ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION))
++-endif
++-sane-alsa-headers:
++-ifdef REQUIRED_ALSA_VERSION
++-	@if [ "$(ALSA_CHECK)" != "missing" ] ; then \
++-	    if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer"  ] ; then \
++-		$(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \
++-		"      You have the following ALSA version installed: $${alsa_version} \n" \
++-		"      Please reinstall ALSA (drivers and lib). You can download \n" \
++-		"      the source distribution from http://www.alsa-project.org \n" \
++-		"      or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
++-		"" >> $(ERROR_FILE) ; \
++-	    fi ; \
++-	else \
++-	    $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \
++-	    "      Please install ALSA (drivers and lib). You can download the \n" \
++-	    "      source distribution from http://www.alsa-project.org or go to \n" \
++-	    "      http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
++-	    "" >> $(ERROR_FILE) ; \
++-	fi
++-endif
++ 
++ # If a sanity file doesn't exist, just make sure it's dir exists
++ $(SANITY_FILES):
 +diff -Nur openjdk.orig/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile
 +--- openjdk.orig/jdk/make/java/instrument/Makefile	2014-01-28 19:02:26.000000000 +0100
 ++++ openjdk/jdk/make/java/instrument/Makefile	2014-02-10 11:31:49.000000000 +0100
@@ -3712,13 +3783,85 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk
 + 
 +diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make openjdk-boot/hotspot/make/linux/makefiles/zero.make
 +--- openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make	2014-01-28 18:58:08.000000000 +0100
-++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make	2014-02-10 18:35:50.000000000 +0100
+++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make	2014-02-11 17:33:53.000000000 +0100
 +@@ -33,4 +33,4 @@
 + 
 + # Make sure libffi is included
 + CFLAGS += $(LIBFFI_CFLAGS)
 +-LIBS_VM += $(LIBFFI_LIBS)
 ++LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic
++diff -Nur openjdk-boot.orig/jdk/make/common/Sanity.gmk openjdk-boot/jdk/make/common/Sanity.gmk
++--- openjdk-boot.orig/jdk/make/common/Sanity.gmk	2014-01-28 19:02:26.000000000 +0100
+++++ openjdk-boot/jdk/make/common/Sanity.gmk	2014-02-11 14:46:04.000000000 +0100
++@@ -91,8 +91,7 @@
++     sane-ld_run_path \
++     sane-alt_bootdir \
++     sane-bootdir \
++-    sane-local-bootdir \
++-    sane-alsa-headers
+++    sane-local-bootdir
++ 
++ ifdef OPENJDK
++ sanity-all:: sane-freetype 
++diff -Nur openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk openjdk-boot/jdk/make/common/shared/Sanity.gmk
++--- openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk	2014-01-28 19:02:26.000000000 +0100
+++++ openjdk-boot/jdk/make/common/shared/Sanity.gmk	2014-02-11 14:45:37.000000000 +0100
++@@ -114,11 +114,6 @@
++     elif [ -f /etc/lsb-release ] ; then \
++       $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
++     fi)
++-  ALSA_INCLUDE=/usr/include/alsa/version.h
++-  ALSA_LIBRARY=/usr/lib/libasound.so
++-  _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
++-           $(SED) -e 's@.*"\(.*\)".*@\1@' )
++-  ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
++ endif
++ 
++ ifeq ($(PLATFORM), macosx)
++@@ -225,7 +220,6 @@
++ 	sane-compiler \
++ 	sane-link \
++ 	sane-cacerts \
++-	sane-alsa-headers \
++ 	sane-ant_version \
++ 	sane-zip_version \
++ 	sane-unzip_version \
++@@ -1381,35 +1375,6 @@
++   endif
++ endif
++ 
++-######################################################
++-# Check that ALSA headers and libs are installed and 
++-# that the header has the right version. We only
++-# need /usr/include/alsa/version.h and /usr/lib/libasound.so
++-######################################################
++-
++-ifdef REQUIRED_ALSA_VERSION
++-  ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION))
++-endif
++-sane-alsa-headers:
++-ifdef REQUIRED_ALSA_VERSION
++-	@if [ "$(ALSA_CHECK)" != "missing" ] ; then \
++-	    if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer"  ] ; then \
++-		$(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \
++-		"      You have the following ALSA version installed: $${alsa_version} \n" \
++-		"      Please reinstall ALSA (drivers and lib). You can download \n" \
++-		"      the source distribution from http://www.alsa-project.org \n" \
++-		"      or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
++-		"" >> $(ERROR_FILE) ; \
++-	    fi ; \
++-	else \
++-	    $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \
++-	    "      Please install ALSA (drivers and lib). You can download the \n" \
++-	    "      source distribution from http://www.alsa-project.org or go to \n" \
++-	    "      http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \
++-	    "" >> $(ERROR_FILE) ; \
++-	fi
++-endif
++-
++ # If a sanity file doesn't exist, just make sure it's dir exists
++ $(SANITY_FILES):
++ 	-@$(prep-target)
 +diff -Nur openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk openjdk-boot/jdk/make/sun/awt/mawt.gmk
 +--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk	2014-01-28 19:02:26.000000000 +0100
 ++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk	2014-02-10 18:28:56.000000000 +0100

package/openssh/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssh
-PKG_VERSION:=		6.2p1
+PKG_VERSION:=		6.5p1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7b2d9dd75b5cf267ea1737ec75500316
+PKG_MD5SUM:=		a084e7272b8cbd25afe0f5dce4802fef
 PKG_DESCR:=		OpenSSH
 PKG_SECTION:=		net/security
 PKG_BUILDDEP:=		zlib openssl

package/openssh/patches/patch-cipher_c

@@ -1,7 +1,7 @@
 diff -Nur openssh-6.2p1.orig/cipher.c openssh-6.2p1/cipher.c
---- openssh-6.2p1.orig/cipher.c	2013-02-12 01:00:35.000000000 +0100
-+++ openssh-6.2p1/cipher.c	2013-08-20 08:56:48.923159083 +0200
-@@ -69,23 +69,33 @@ struct Cipher {
+--- openssh-6.5p1.orig/cipher.c	2014-01-25 23:37:26.000000000 +0100
++++ openssh-6.5p1/cipher.c	2014-02-11 15:26:16.000000000 +0100
+@@ -75,23 +75,33 @@ static const struct Cipher ciphers[] = {
  	{ "none",	SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },
  	{ "des",	SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc },
  	{ "3des",	SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des },

package/openssh/patches/patch-digest_c

@@ -0,0 +1,12 @@
+--- openssh-6.5p1.orig/digest.c	2014-01-20 02:41:53.000000000 +0100
++++ openssh-6.5p1/digest.c	2014-02-11 17:41:23.000000000 +0100
+@@ -44,7 +44,9 @@ struct ssh_digest {
+ /* NB. Indexed directly by algorithm number */
+ const struct ssh_digest digests[] = {
+ 	{ SSH_DIGEST_MD5,	"MD5",	 	16,	EVP_md5 },
++#ifndef OPENSSL_NO_RIPEMD
+ 	{ SSH_DIGEST_RIPEMD160,	"RIPEMD160",	20,	EVP_ripemd160 },
++#endif
+ 	{ SSH_DIGEST_SHA1,	"SHA1",	 	20,	EVP_sha1 },
+ #ifdef HAVE_EVP_SHA256 /* XXX replace with local if missing */
+ 	{ SSH_DIGEST_SHA256,	"SHA256", 	32,	EVP_sha256 },

package/openssh/patches/patch-mac_c

@@ -1,7 +1,7 @@
 diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c
---- openssh-6.2p1.orig/mac.c	2012-12-12 01:00:37.000000000 +0100
-+++ openssh-6.2p1/mac.c	2013-08-20 08:56:49.123256567 +0200
-@@ -68,8 +68,10 @@ struct {
+--- openssh-6.5p1.orig/mac.c	2014-01-10 00:37:05.000000000 +0100
++++ openssh-6.5p1/mac.c	2014-02-11 15:26:16.000000000 +0100
+@@ -70,8 +70,10 @@ static const struct macalg macs[] = {
  #endif
  	{ "hmac-md5",				SSH_EVP, EVP_md5, 0, 0, 0, 0 },
  	{ "hmac-md5-96",			SSH_EVP, EVP_md5, 96, 0, 0, 0 },
@@ -12,7 +12,7 @@ diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c
  	{ "umac-64@openssh.com",		SSH_UMAC, NULL, 0, 128, 64, 0 },
  	{ "umac-128@openssh.com",		SSH_UMAC128, NULL, 0, 128, 128, 0 },
  
-@@ -82,7 +84,9 @@ struct {
+@@ -84,7 +86,9 @@ static const struct macalg macs[] = {
  #endif
  	{ "hmac-md5-etm@openssh.com",		SSH_EVP, EVP_md5, 0, 0, 0, 1 },
  	{ "hmac-md5-96-etm@openssh.com",	SSH_EVP, EVP_md5, 96, 0, 0, 1 },

package/openssl/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssl
-PKG_VERSION:=		1.0.1e
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		66bf6f10f060d561929de96f9dfe5b8c
+PKG_VERSION:=		1.0.1f
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f26b09c028a0541cab33da697d522b25
 PKG_DESCR:=		OpenSSL (Secure Socket Layer) libraries
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib

package/openvpn/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		06e5f93dbf13f2c19647ca15ffc23ac1
 PKG_DESCR:=		Open Source VPN solution using SSL
 PKG_SECTION:=		net/security
+PKG_BUILDDEP:=		autotool
 PKG_DEPENDS:=		kmod-tun ip
 PKG_URL:=		http://openvpn.net/
 PKG_SITES:=		http://swupdate.openvpn.org/community/releases/
@@ -35,6 +36,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autoreconf
+
 ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),)
 CONFIGURE_ARGS+=	--enable-lzo
 else

package/openvpn/patches/patch-configure_ac

@@ -0,0 +1,31 @@
+--- openvpn-2.3.2.orig/configure.ac	2013-05-31 14:00:25.000000000 +0200
++++ openvpn-2.3.2/configure.ac	2014-02-15 14:45:30.000000000 +0100
+@@ -353,19 +353,13 @@ AC_PROG_MAKE_SET
+ 
+ AC_ARG_VAR([IFCONFIG], [full path to ipconfig utility])
+ AC_ARG_VAR([ROUTE], [full path to route utility])
+-AC_ARG_VAR([IPROUTE], [full path to ip utility])
+ AC_ARG_VAR([NETSTAT], [path to netstat utility]) # tests
+ AC_ARG_VAR([MAN2HTML], [path to man2html utility])
+ AC_ARG_VAR([GIT], [path to git utility])
+-AC_PATH_PROGS([IFCONFIG], [ifconfig],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin])
+-AC_PATH_PROGS([ROUTE], [route],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin])
+-AC_PATH_PROGS([IPROUTE], [ip],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin])
+ AC_CHECK_PROGS([NETSTAT], [netstat], [netstat], [$PATH:/usr/local/sbin:/usr/sbin:/sbin:/etc]) # tests
+ AC_CHECK_PROGS([MAN2HTML], [man2html])
+ AC_CHECK_PROGS([GIT], [git]) # optional
+-AC_DEFINE_UNQUOTED([IFCONFIG_PATH], ["$IFCONFIG"], [Path to ifconfig tool])
+-AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["$IPROUTE"], [Path to iproute tool])
+-AC_DEFINE_UNQUOTED([ROUTE_PATH], ["$ROUTE"], [Path to route tool])
++AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["/sbin"], [Path to iproute tool])
+ 
+ #
+ # Libtool
+@@ -982,7 +976,6 @@ else
+ fi
+ 
+ if test "${enable_iproute2}" = "yes"; then
+-	test -z "${IPROUTE}" && AC_MSG_ERROR([ip utility is required but missing])
+ 	AC_DEFINE([ENABLE_IPROUTE], [1], [enable iproute2 support])
+ else
+ 	if test "${WIN32}" != "yes"; then

package/polkit/Makefile

@@ -15,6 +15,8 @@ PKG_URL:=		http://www.freedesktop.org/wiki/Software/polkit/
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
 
+PKG_HOST_DEPENDS:=	!darwin
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,POLKIT,polkit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))

package/section.lst

@@ -1,4 +1,5 @@
 base	Base System
+boot	Boot Loaders
 browser	Browser / Editor / Pager
 editor	Browser / Editor / Pager
 pager	Browser / Editor / Pager
@@ -21,7 +22,7 @@ lang	Programming / Languages
 libs	Libraries
 mail	Mail
 misc	Misc
-multimedia	Multimedia
+multimedia	Multimedia / Audio / Video
 net	Networking
 net/fs	Network Filesystems
 net/misc	Networking Misc

package/systemd/Makefile

@@ -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:=		systemd
-PKG_VERSION:=		208
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		df64550d92afbffb4f67a434193ee165
-PKG_DESCR:=		System and Service Manager
-PKG_SECTION:=		utils
-PKG_DEPENDS:=		libblkid libcap
-PKG_BUILDDEP:=		autotool usbutils glib kmod util-linux libcap
-PKG_BUILDDEP+=		libgcrypt gperf-host
-PKG_URL:=		http://freedesktop.org/wiki/Software/systemd/
-PKG_SITES:=		http://www.freedesktop.org/software/systemd/
-
-PKG_LIBC_DEPENDS:=	eglibc glibc
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,SYSTEMD,systemd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-AUTOTOOL_STYLE:=	autoreconf
-TARGET_LDFLAGS+=	-lrt
-CONFIGURE_ARGS+=	--disable-static \
-			--without-python \
-			--enable-gudev \
-			--disable-manpages \
-			--disable-polkit
-
-# TODO
-systemd-install:
-
-include ${TOPDIR}/mk/pkg-bottom.mk

package/systemd/files/udev.conffiles

@@ -1 +0,0 @@
-/etc/udev/udev.conf

package/systemd/patches/patch-Makefile_am

@@ -1,20 +0,0 @@
---- systemd-208.orig/Makefile.am	2013-10-02 04:57:09.000000000 +0200
-+++ systemd-208/Makefile.am	2013-12-14 16:18:32.000000000 +0100
-@@ -23,7 +23,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- AM_MAKEFLAGS = --no-print-directory
- AUTOMAKE_OPTIONS = color-tests parallel-tests
- 
--SUBDIRS = . po
-+SUBDIRS = .
- 
- # remove targets if the command fails
- .DELETE_ON_ERROR:
-@@ -537,8 +537,6 @@ dist_doc_DATA = \
- 	LICENSE.MIT \
- 	DISTRO_PORTING
- 
--@INTLTOOL_POLICY_RULE@
--
- # ------------------------------------------------------------------------------
- 
- MANPAGES =

package/systemd/patches/patch-configure_ac

@@ -1,12 +0,0 @@
---- systemd-208.orig/configure.ac	2013-10-02 01:54:26.000000000 +0200
-+++ systemd-208/configure.ac	2013-12-13 16:37:55.000000000 +0100
-@@ -47,9 +47,6 @@ LT_INIT([disable-static])
- AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by systemd])])
- AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by systemd])])
- 
--# i18n stuff for the PolicyKit policy files
--IT_PROG_INTLTOOL([0.40.0])
--
- GETTEXT_PACKAGE=systemd
- AC_SUBST(GETTEXT_PACKAGE)
- 

package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in

@@ -1,13 +0,0 @@
---- systemd-208.orig/src/gudev/gudev-1.0.pc.in	2013-08-13 22:02:46.000000000 +0200
-+++ systemd-208/src/gudev/gudev-1.0.pc.in	2014-01-10 16:50:37.000000000 +0100
-@@ -1,7 +1,7 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=@prefix@
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
- 
- Name: gudev-1.0
- Description: GObject bindings for libudev

package/systemd/patches/patch-src_libudev_libudev_pc_in

@@ -1,15 +0,0 @@
---- systemd-208.orig/src/libudev/libudev.pc.in	2013-08-13 22:02:46.000000000 +0200
-+++ systemd-208/src/libudev/libudev.pc.in	2013-12-14 17:20:31.000000000 +0100
-@@ -6,9 +6,9 @@
- #  (at your option) any later version.
- 
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
-+exec_prefix=${prefix}/usr
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
- 
- Name: libudev
- Description: Library to access udev device information

scripts/ipkg-build

@@ -82,7 +82,7 @@ You probably want to remove them: " >&2
 	[ "$?" -ne 0 ] && PKG_ERROR=1
 	if [ -z "$section" ]; then
 	    echo "The Section field should have one of the following values:" >&2
-	    echo "admin, base, comm, editors, extras, games, graphics, kernel, lang, libs, misc, net, scm, text, web, x11" >&2
+	    echo "admin, base, boot, comm, editors, extras, games, graphics, kernel, lang, libs, misc, net, scm, text, web, x11" >&2
 	fi
 
 	priority=`required_field Priority`

scripts/scan-pkgs.sh

@@ -61,6 +61,10 @@ if [[ -n $ADK_NATIVE ]];then
 	fi
 fi
 
+if [[ -n $ADK_PACKAGE_XBMC ]]; then
+	NEED_JAVA="$NEED_JAVA xbmc"
+fi
+
 if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
 fi
@@ -78,7 +82,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 fi
 
 if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
-	NEED_WWW="$NEED_WWW libXfont"
 	NEED_XMLTO="$NEED_XMLTO libXfont"
 fi
 
@@ -258,6 +261,13 @@ if [[ -n $NEED_DBUSGLIB ]]; then
 	fi
 fi
 
+if [[ -n $NEED_JAVA ]]; then
+	if ! which java >/dev/null 2>&1; then
+		echo >&2 You need java to build $NEED_JAVA
+		out=1
+	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.

target/arm/sys-available/keyasic-ka2000

@@ -8,8 +8,8 @@ config ADK_TARGET_SYSTEM_KEYASIC_KA2000
 	select ADK_CPU_ARMV5
 	select ADK_TARGET_NO_FPU
 	select ADK_TOOLCHAIN
-	select ADK_STATIC
-	select BUSYBOX_STATIC
+	select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL
+	select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL
 	help
 	  KeyASIC KA2000 aka Transcend WifiSD.
 	  Build a toolchain only and make all binaries static.

target/arm/sys-available/raspberry-pi

@@ -9,7 +9,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_INPUT
-	select ADK_PACKAGE_BCM2835_FIRMWARE
+	select ADK_PACKAGE_BCM2835_BOOTLOADER
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_USE_KERNEL_MINICONFIG
 	help

target/arm/sys-available/toolchain-arm

@@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
 	select ADK_TOOLCHAIN
 	select ADK_EABI
 	select ADK_TARGET_NO_FPU
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  ARM toolchain (little endian).
 

target/arm/sys-available/toolchain-armeb

@@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMEB
 	select ADK_TOOLCHAIN
 	select ADK_EABI
 	select ADK_TARGET_NO_FPU
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  ARM toolchain (big endian).
 

target/config/Config.in

@@ -97,6 +97,12 @@ config ADK_TARGET_ABI
 	default "n32" if ADK_n32
 	default "64" if ADK_n64
 
+config ADK_TARGET_ABI_MIPS_O32
+	boolean
+	select ADK_o32
+	depends on !ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
+	default y
+
 choice
 prompt "Target ABI"
 depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
@@ -165,6 +171,23 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686
 	default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 
+choice
+prompt "Qemu Emulation using VirtIO drivers"
+depends on ADK_TARGET_SYSTEM_QEMU_SPARC64
+
+config ADK_TARGET_QEMU_WITH_VIRTIO
+	boolean "enabled"
+	select ADK_KERNEL_BLK_DEV
+	select ADK_KERNEL_VIRTIO
+	select ADK_KERNEL_VIRTIO_PCI
+	select ADK_KERNEL_VIRTIO_NET
+	select ADK_KERNEL_VIRTIO_BLK
+
+config ADK_TARGET_QEMU_WITHOUT_VIRTIO
+	boolean "disabled"
+
+endchoice
+
 choice
 prompt "Qemu MICROBLAZE Emulation"
 depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
@@ -461,7 +484,7 @@ config ADK_TARGET_CPU_ARCH
 
 config ADK_TARGET_ABI_CFLAGS
 	string
-	default "-mabi=32" if ADK_TARGET_ABI_O32
+	default "-mabi=32" if ADK_TARGET_ABI_O32 || ADK_TARGET_ABI_MIPS_O32
 	default "-mabi=n32" if ADK_TARGET_ABI_N32
 	default "-mabi=64" if ADK_TARGET_ABI_N64
 	default "-m32" if ADK_TARGET_ABI_32
@@ -474,9 +497,10 @@ config ADK_TARGET_ABI_LDFLAGS
 
 config ADK_TARGET_KERNEL_LDFLAGS
 	string
-	default "-mabi=64" if ADK_TARGET_ABI_N32
-	default "-mabi=64" if ADK_TARGET_ABI_O32
-	default "-mabi=64" if ADK_TARGET_ABI_N64
+	default "-mabi=64" if ADK_TARGET_ABI_N32 && ADK_TARGET_KERNEL64
+	default "-mabi=64" if ADK_TARGET_ABI_O32 && ADK_TARGET_KERNEL64
+	default "-mabi=64" if ADK_TARGET_ABI_N64 && ADK_TARGET_KERNEL64
+	default ""
 
 config ADK_TARGET_CFLAGS
 	string

target/linux/Config.in

@@ -25,3 +25,4 @@ source target/linux/config/Config.in.serial
 source target/linux/config/Config.in.spi
 source target/linux/config/Config.in.kvm
 source target/linux/config/Config.in.debug
+source target/linux/config/Config.in.virtio

target/linux/config/Config.in.netdevice

@@ -144,38 +144,6 @@ config ADK_KERNEL_B44
 	default n
 	help
 
-config ADK_KERNEL_E1000
-	boolean
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_NETDEV_1000
-	default y if ADK_TARGET_SYSTEM_VBOX_I686
-	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_QEMU_I686
-	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
-	default n
-	help
-
-config ADK_KERNEL_E1000E
-	boolean
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_NETDEV_1000
-	default y if ADK_TARGET_SYSTEM_TAROX_PC
-	default y if ADK_NATIVE_SYSTEM_TAROX_PC
-	default n
-	help
-
-config ADK_KERNEL_SKY2
-	boolean
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_NETDEV_1000
-	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
-	default n
-	help
-
 config ADK_KERNEL_R8169
 	boolean
 	select ADK_KERNEL_NETDEVICES

target/linux/config/Config.in.virtio

@@ -0,0 +1,37 @@
+config ADK_KERNEL_VIRTIO
+	boolean
+
+config ADK_KERNEL_VIRTIO_PCI
+	boolean
+
+config ADK_KERNEL_VIRTIO_NET
+	boolean
+
+config ADK_KERNEL_VIRTIO_BLK
+	boolean
+
+menu "Virtio driver support"
+depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU
+
+config ADK_KPACKAGE_KMOD_VIRTIO_NET
+	prompt "kmod-virtio-net.................... Virtio net driver"
+	tristate
+	select ADK_KERNEL_VIRTIO
+	select ADK_KERNEL_VIRTIO_PCI
+	depends on !ADK_KERNEL_VIRTIO_NET
+	default n
+	help
+	  Enables support for Virtio Net driver.
+
+config ADK_KPACKAGE_KMOD_VIRTIO_BLK
+	prompt "kmod-virtio-block.................. Virtio block driver"
+	tristate
+	select ADK_KERNEL_VIRTIO
+	select ADK_KERNEL_VIRTIO_PCI
+	select ADK_KERNEL_BLK_DEV
+	depends on !ADK_KERNEL_VIRTIO_BLK
+	default n
+	help
+	  Enables support for Virtio Block driver.
+
+endmenu

target/m68k/sys-available/toolchain-m68k

@@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K
 	select ADK_m68k
 	select ADK_toolchain_m68k
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a m68k toolchain.
 

target/microblaze/sys-available/toolchain-microblaze

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZE
 	select ADK_big
 	select ADK_toolchain_microblaze
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Microblaze toolchain.
 

target/microblaze/sys-available/toolchain-microblazeel

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZEEL
 	select ADK_little
 	select ADK_toolchain_microblazeel
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Microblaze toolchain.
 

target/mips/sys-available/toolchain-mips

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS
 	select ADK_big
 	select ADK_toolchain_mips
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  MIPS toolchain.
 

target/mips/sys-available/toolchain-mipsel

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL
 	select ADK_little
 	select ADK_toolchain_mipsel
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  MIPS toolchain.
 

target/ppc/sys-available/toolchain-ppc

@@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC
 	select ADK_ppc
 	select ADK_toolchain_ppc
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a ppc toolchain.
 

target/ppc64/sys-available/toolchain-ppc64

@@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64
 	select ADK_ppc64
 	select ADK_toolchain_ppc64
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a ppc64 toolchain.
 

target/sh/sys-available/toolchain-sh

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH
 	select ADK_toolchain_sh
 	select ADK_CPU_SH4
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a superh toolchain (sh4).
 

target/sparc/sys-available/toolchain-sparc

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC
 	select ADK_toolchain_sparc
 	select ADK_CPU_SPARC_V8
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a sparc toolchain.
 

target/sparc64/Makefile

@@ -18,7 +18,12 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-sparc64 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img -append "root=/dev/sda1"'
+ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
+	@echo 'qemu-system-sparc64 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 \
+		-net nic,model=virtio -net user'
+else
+	@echo 'qemu-system-sparc64 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
+endif
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)

target/sparc64/kernel/qemu-sparc64

@@ -16,10 +16,6 @@ CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ATA=y
-CONFIG_ATA_SFF=y
-CONFIG_ATA_BMDMA=y
-CONFIG_PATA_CMD64X=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_CORE=y
 CONFIG_ETHERNET=y

target/sparc64/sys-available/toolchain-sparc64

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64
 	select ADK_toolchain_sparc64
 	select ADK_CPU_SPARC_V9
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a sparc64 toolchain.
 

target/x86/sys-available/toolchain-i686

@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86
 	select ADK_toolchain_x86
 	select ADK_CPU_I686
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a x86 toolchain (i686 optimized).
 

target/x86_64/sys-available/toolchain-x86_64

@@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64
 	select ADK_x86_64
 	select ADK_toolchain_x86_64
 	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
 	help
 	  Build a x86_64 toolchain.
 

toolchain/gcc/Makefile

@@ -26,6 +26,7 @@ GCC_CONFOPTS=		--prefix=$(STAGING_HOST_DIR) \
 			--disable-cloog-version-check \
 			--without-ppl \
 			--without-cloog \
+			--without-isl \
 			--disable-nls
 
 ifeq ($(ADK_TOOLCHAIN_GCC_SJLJ),y)
@@ -61,13 +62,21 @@ GCC_CONFOPTS+=		--disable-lto
 endif
 
 ifeq ($(ARCH),m68k)
+ifeq ($(ADK_TARGET_LIBC),uclibc)
 GCC_CONFOPTS+=		--disable-tls
 else
 GCC_CONFOPTS+=		--enable-tls
 endif
+else
+GCC_CONFOPTS+=		--enable-tls
+endif
 
 ifeq ($(ARCH),powerpc)
+ifeq ($(ADK_TARGET_LIBC),uclibc)
+GCC_CONFOPTS+=		--disable-target-optspace --with-long-double-128 --enable-secureplt
+else
 GCC_CONFOPTS+=		--disable-target-optspace --with-long-double-64 --enable-secureplt
+endif
 else
 GCC_CONFOPTS+=		--enable-target-optspace
 endif
@@ -107,7 +116,7 @@ $(GCC_BUILD_DIR_MINIMAL)/.configured:
 	mkdir -p $(GCC_BUILD_DIR_MINIMAL)
 	# these symlinks are very important, do not remove
 	rm -rf $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
-	ln -sf ${STAGING_TARGET_DIR}/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
+	ln -sf ${STAGING_TARGET_DIR}/usr/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
 	rm -rf ${STAGING_HOST_DIR}/$(REAL_GNU_TARGET_NAME)/lib
 	ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib
 ifeq ($(ADK_LINUX_SH),y)
@@ -177,10 +186,12 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 		done;
 	# remove duplicate tools, convert hardlinks to symlinks
 	set -e; \
-	cd $(STAGING_HOST_DIR)/bin; \
-		for app in ar as c++ g++ gcc gcc-${PKG_VERSION} ld ld.bfd nm objcopy objdump ranlib strip; do \
-			ln -sf ../$(REAL_GNU_TARGET_NAME)/bin/$${app} $(REAL_GNU_TARGET_NAME)-$${app}; \
+	cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin; \
+		for app in ar as c++ g++ gcc ld ld.bfd nm objcopy objdump ranlib strip; do \
+			ln -sf ../../bin/$(REAL_GNU_TARGET_NAME)-$${app} $${app}; \
 		done;
+	(cd $(STAGING_HOST_DIR)/bin && \
+		ln -sf $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-gcc-${PKG_VERSION})
 	# setup symlink, so that gcc/g++ find cc1plus
 	(cd $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/ && \
 		ln -sf ../libexec .)
@@ -194,6 +205,8 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 	@-test -d $(STAGING_TARGET_DIR)/lib64 && \
 		cd $(STAGING_TARGET_DIR)/lib64 && \
 		ln -sf libstdc++.so.6.0.17 libstdc++.so
+	# cleanup unneeded docs
+	rm -rf $(STAGING_HOST_DIR)/share
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk

toolchain/gcc/patches/4.8.2/musl-cross.patch

@@ -0,0 +1,698 @@
+# HG changeset patch
+# Parent df1a439b9058b07024ca556225d55535f5feb5dd
+Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one.
+
+diff -r df1a439b9058 libstdc++-v3/configure.host
+--- a/libstdc++-v3/configure.host	Tue Dec 31 14:52:24 2013 -0500
++++ b/libstdc++-v3/configure.host	Tue Dec 31 14:54:49 2013 -0500
+@@ -264,6 +264,13 @@
+     os_include_dir="os/bsd/freebsd"
+     ;;
+   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
++    # check for musl by target
++    case "${host_os}" in
++      *-musl*)
++        os_include_dir="os/generic"
++        ;;
++      *)
++
+     if [ "$uclibc" = "yes" ]; then
+       os_include_dir="os/uclibc"
+     elif [ "$bionic" = "yes" ]; then
+@@ -272,6 +279,9 @@
+       os_include_dir="os/gnu-linux"
+     fi
+     ;;
++
++    esac
++    ;;
+   hpux*)
+     os_include_dir="os/hpux"
+     ;;
+# HG changeset patch
+# Parent e5b4564f249f8634194bdabef4b3057d0e54ee97
+Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker.
+
+diff -r e5b4564f249f gcc/config.gcc
+--- a/gcc/config.gcc	Tue Dec 31 14:54:49 2013 -0500
++++ b/gcc/config.gcc	Tue Dec 31 14:54:52 2013 -0500
+@@ -550,7 +550,7 @@
+ esac
+ 
+ # Common C libraries.
+-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
+ 
+ # Common parts for widely ported systems.
+ case ${target} in
+@@ -653,6 +653,9 @@
+     *-*-*uclibc*)
+       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
+       ;;
++    *-*-*musl*)
++      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
++      ;;
+     *)
+       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
+       ;;
+diff -r e5b4564f249f gcc/config/linux.h
+--- a/gcc/config/linux.h	Tue Dec 31 14:54:49 2013 -0500
++++ b/gcc/config/linux.h	Tue Dec 31 14:54:52 2013 -0500
+@@ -32,10 +32,12 @@
+ #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
+ #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
+ #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
++#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
+ #else
+ #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
+ #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
+ #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
++#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
+ #endif
+ 
+ #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
+@@ -53,18 +55,21 @@
+    uClibc or Bionic is the default C library and whether
+    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
+ 
+-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
+-  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
++  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
+ 
+ #if DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
+ #elif DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
+ #elif DEFAULT_LIBC == LIBC_BIONIC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+-  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif /* DEFAULT_LIBC */
+@@ -84,21 +89,21 @@
+ 
+ #define GNU_USER_DYNAMIC_LINKER						\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
+-			 BIONIC_DYNAMIC_LINKER)
++			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ #define GNU_USER_DYNAMIC_LINKER32					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
+-			 BIONIC_DYNAMIC_LINKER32)
++			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
+-			 BIONIC_DYNAMIC_LINKER64)
++			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ #define GNU_USER_DYNAMIC_LINKERX32					\
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
+-			 BIONIC_DYNAMIC_LINKERX32)
++			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
+ 
+ /* Determine whether the entire c99 runtime
+    is present in the runtime library.  */
+ #undef TARGET_C99_FUNCTIONS
+-#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
++#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL)
+ 
+ /* Whether we have sincos that follows the GNU extension.  */
+ #undef TARGET_HAS_SINCOS
+@@ -107,3 +112,74 @@
+ /* Whether we have Bionic libc runtime */
+ #undef TARGET_HAS_BIONIC
+ #define TARGET_HAS_BIONIC (OPTION_BIONIC)
++
++/* musl avoids problematic includes by rearranging the include directories.
++ * Unfortunately, this is mostly duplicated from cppdefault.c */
++#if DEFAULT_LIBC == LIBC_MUSL
++#define INCLUDE_DEFAULTS_MUSL_GPP			\
++    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,		\
++      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },		\
++    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,		\
++      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },		\
++    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\
++      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
++
++#ifdef LOCAL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_LOCAL			\
++    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\
++    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_LOCAL
++#endif
++
++#ifdef PREFIX_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_PREFIX			\
++    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_PREFIX
++#endif
++
++#ifdef CROSS_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_CROSS			\
++    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#ifdef TOOL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_TOOL			\
++    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_TOOL
++#endif
++
++#ifdef NATIVE_SYSTEM_HEADER_DIR
++#define INCLUDE_DEFAULTS_MUSL_NATIVE			\
++    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
++    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_NATIVE
++#endif
++
++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
++# undef INCLUDE_DEFAULTS_MUSL_LOCAL
++# define INCLUDE_DEFAULTS_MUSL_LOCAL
++# undef INCLUDE_DEFAULTS_MUSL_NATIVE
++# define INCLUDE_DEFAULTS_MUSL_NATIVE
++#else
++# undef INCLUDE_DEFAULTS_MUSL_CROSS
++# define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#undef INCLUDE_DEFAULTS
++#define INCLUDE_DEFAULTS				\
++  {							\
++    INCLUDE_DEFAULTS_MUSL_GPP				\
++    INCLUDE_DEFAULTS_MUSL_PREFIX			\
++    INCLUDE_DEFAULTS_MUSL_CROSS				\
++    INCLUDE_DEFAULTS_MUSL_TOOL				\
++    INCLUDE_DEFAULTS_MUSL_NATIVE			\
++    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
++    { 0, 0, 0, 0, 0, 0 }				\
++  }
++#endif
+diff -r e5b4564f249f gcc/config/linux.opt
+--- a/gcc/config/linux.opt	Tue Dec 31 14:54:49 2013 -0500
++++ b/gcc/config/linux.opt	Tue Dec 31 14:54:52 2013 -0500
+@@ -30,3 +30,7 @@
+ muclibc
+ Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
+ Use uClibc C library
++
++mmusl
++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
++Use musl C library
+diff -r e5b4564f249f gcc/ginclude/stddef.h
+--- a/gcc/ginclude/stddef.h	Tue Dec 31 14:54:49 2013 -0500
++++ b/gcc/ginclude/stddef.h	Tue Dec 31 14:54:52 2013 -0500
+@@ -181,6 +181,7 @@
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+ #ifndef __size_t
++#ifndef __DEFINED_size_t /* musl */
+ #define __size_t__	/* BeOS */
+ #define __SIZE_T__	/* Cray Unicos/Mk */
+ #define _SIZE_T
+@@ -197,6 +198,7 @@
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#define __DEFINED_size_t /* musl */
+ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+   || defined(__FreeBSD_kernel__)
+ /* __size_t is a typedef on FreeBSD 5, must not trash it. */
+@@ -214,6 +216,7 @@
+ typedef long ssize_t;
+ #endif /* __BEOS__ */
+ #endif /* !(defined (__GNUG__) && defined (size_t)) */
++#endif /* __DEFINED_size_t */
+ #endif /* __size_t */
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
+# HG changeset patch
+# Parent e08e44e39f5edde422f444487422046147d5821e
+A fix for libgomp to correctly request a POSIX version for time support.
+
+diff -r e08e44e39f5e libgomp/config/posix/time.c
+--- a/libgomp/config/posix/time.c	Tue Dec 31 14:54:52 2013 -0500
++++ b/libgomp/config/posix/time.c	Tue Dec 31 14:54:55 2013 -0500
+@@ -28,6 +28,8 @@
+    The following implementation uses the most simple POSIX routines.
+    If present, POSIX 4 clocks should be used instead.  */
+ 
++#define _POSIX_C_SOURCE 199309L /* for clocks */
++
+ #include "libgomp.h"
+ #include <unistd.h>
+ #if TIME_WITH_SYS_TIME
+diff -r 809c85574bfe libgcc/unwind-dw2-fde-dip.c
+--- a/libgcc/unwind-dw2-fde-dip.c	Tue Dec 31 14:54:55 2013 -0500
++++ b/libgcc/unwind-dw2-fde-dip.c	Tue Dec 31 14:54:58 2013 -0500
+@@ -46,33 +46,13 @@
+ #include "unwind-compat.h"
+ #include "gthr.h"
+ 
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+-	|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
+ # define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(__BIONIC__)
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(__FreeBSD__) && __FreeBSD__ >= 7
+-# define ElfW __ElfN
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(__OpenBSD__)
+-# define ElfW(type) Elf_##type
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+-    && defined(TARGET_DL_ITERATE_PHDR) \
+-    && defined(__sun__) && defined(__svr4__)
+-# define USE_PT_GNU_EH_FRAME
++# ifdef __OpenBSD__
++#  define ElfW(type) Elf_##typ
++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7
++#  define ElfW __ElfN
++# endif
+ #endif
+ 
+ #if defined(USE_PT_GNU_EH_FRAME)
+diff -r 03604918697c gcc/configure
+--- a/gcc/configure	Tue Dec 31 14:54:58 2013 -0500
++++ b/gcc/configure	Tue Dec 31 14:55:01 2013 -0500
+@@ -26739,6 +26739,9 @@
+ else
+   gcc_cv_libc_provides_ssp=no
+     case "$target" in
++       *-*-musl*)
++         # All versions of musl provide stack protector
++	 gcc_cv_libc_provides_ssp=yes;;
+        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+       # glibc 2.4 and later provides __stack_chk_fail and
+       # either __stack_chk_guard, or TLS access to stack guard canary.
+@@ -26772,6 +26775,7 @@
+ 	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
+ 	 # simply assert that glibc does provide this, which is true for all
+ 	 # realistically usable GNU/Hurd configurations.
++	 # All supported versions of musl provide it as well
+ 	 gcc_cv_libc_provides_ssp=yes;;
+        *-*-darwin* | *-*-freebsd*)
+ 	 ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"
+@@ -26854,6 +26858,9 @@
+       gcc_cv_target_dl_iterate_phdr=no
+     fi
+     ;;
++  *-linux-musl*)
++    gcc_cv_target_dl_iterate_phdr=yes
++    ;;
+ esac
+ 
+ if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+diff -r 03604918697c gcc/configure.ac
+--- a/gcc/configure.ac	Tue Dec 31 14:54:58 2013 -0500
++++ b/gcc/configure.ac	Tue Dec 31 14:55:01 2013 -0500
+@@ -4722,6 +4722,9 @@
+       gcc_cv_libc_provides_ssp,
+       [gcc_cv_libc_provides_ssp=no
+     case "$target" in
++       *-*-musl*)
++         # All versions of musl provide stack protector
++	 gcc_cv_libc_provides_ssp=yes;;
+        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+       [# glibc 2.4 and later provides __stack_chk_fail and
+       # either __stack_chk_guard, or TLS access to stack guard canary.
+@@ -4755,6 +4758,7 @@
+ 	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
+ 	 # simply assert that glibc does provide this, which is true for all
+ 	 # realistically usable GNU/Hurd configurations.
++	 # All supported versions of musl provide it as well
+ 	 gcc_cv_libc_provides_ssp=yes;;
+        *-*-darwin* | *-*-freebsd*)
+ 	 AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],
+@@ -4820,6 +4824,9 @@
+       gcc_cv_target_dl_iterate_phdr=no
+     fi
+     ;;
++  *-linux-musl*)
++    gcc_cv_target_dl_iterate_phdr=yes
++    ;;
+ esac
+ GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
+ if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+# HG changeset patch
+# Parent 600a8a422ccaf5627ad1f5a138e7398df2b9e9d8
+Get rid of ever-broken fixincludes on musl.
+
+diff -r 600a8a422cca fixincludes/mkfixinc.sh
+--- a/fixincludes/mkfixinc.sh	Tue Dec 31 14:55:01 2013 -0500
++++ b/fixincludes/mkfixinc.sh	Tue Dec 31 14:55:04 2013 -0500
+@@ -19,7 +19,8 @@
+     powerpc-*-eabi*    | \
+     powerpc-*-rtems*   | \
+     powerpcle-*-eabisim* | \
+-    powerpcle-*-eabi* )
++    powerpcle-*-eabi* | \
++    *-musl* )
+ 	#  IF there is no include fixing,
+ 	#  THEN create a no-op fixer and exit
+ 	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
+# HG changeset patch
+# Parent 4696c3bf3d913eca88e9385ea9717541dfe1e033
+Support for i386-linux-musl and x86_64-linux-musl.
+
+diff -r 4696c3bf3d91 gcc/config/i386/linux.h
+--- a/gcc/config/i386/linux.h	Tue Dec 31 14:55:04 2013 -0500
++++ b/gcc/config/i386/linux.h	Tue Dec 31 14:55:08 2013 -0500
+@@ -21,3 +21,4 @@
+ 
+ #define GNU_USER_LINK_EMULATION "elf_i386"
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
+diff -r 4696c3bf3d91 gcc/config/i386/linux64.h
+--- a/gcc/config/i386/linux64.h	Tue Dec 31 14:55:04 2013 -0500
++++ b/gcc/config/i386/linux64.h	Tue Dec 31 14:55:08 2013 -0500
+@@ -30,3 +30,7 @@
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
++
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
+diff -r 4696c3bf3d91 libitm/config/linux/x86/tls.h
+--- a/libitm/config/linux/x86/tls.h	Tue Dec 31 14:55:04 2013 -0500
++++ b/libitm/config/linux/x86/tls.h	Tue Dec 31 14:55:08 2013 -0500
+@@ -25,16 +25,19 @@
+ #ifndef LIBITM_X86_TLS_H
+ #define LIBITM_X86_TLS_H 1
+ 
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ /* Use slots in the TCB head rather than __thread lookups.
+    GLIBC has reserved words 10 through 13 for TM.  */
+ #define HAVE_ARCH_GTM_THREAD 1
+ #define HAVE_ARCH_GTM_THREAD_DISP 1
+ #endif
++#endif
+ 
+ #include "config/generic/tls.h"
+ 
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ namespace GTM HIDDEN {
+ 
+ #ifdef __x86_64__
+@@ -101,5 +104,6 @@
+ 
+ } // namespace GTM
+ #endif /* >= GLIBC 2.10 */
++#endif
+ 
+ #endif // LIBITM_X86_TLS_H
+# HG changeset patch
+# Parent 6738fd6f6fcc2a72f2ba527bda3325642af26885
+Support for arm-linux-musl.
+
+diff -r 6738fd6f6fcc gcc/config/arm/linux-eabi.h
+--- a/gcc/config/arm/linux-eabi.h	Tue Dec 31 14:55:08 2013 -0500
++++ b/gcc/config/arm/linux-eabi.h	Tue Dec 31 14:55:11 2013 -0500
+@@ -77,6 +77,23 @@
+     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
+     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
+ 
++/* For ARM musl currently supports four dynamic linkers:
++   - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
++   - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
++   - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
++   - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
++   musl does not support the legacy OABI mode.
++   All the dynamic linkers live in /lib.
++   We default to soft-float, EL. */
++#undef  MUSL_DYNAMIC_LINKER
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
++#endif
++#define MUSL_DYNAMIC_LINKER \
++  "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+diff -r 6738fd6f6fcc libitm/config/arm/hwcap.cc
+--- a/libitm/config/arm/hwcap.cc	Tue Dec 31 14:55:08 2013 -0500
++++ b/libitm/config/arm/hwcap.cc	Tue Dec 31 14:55:11 2013 -0500
+@@ -40,7 +40,11 @@
+ 
+ #ifdef __linux__
+ #include <unistd.h>
++#ifdef __GLIBC__
+ #include <sys/fcntl.h>
++#else
++#include <fcntl.h>
++#endif
+ #include <elf.h>
+ 
+ static void __attribute__((constructor))
+# HG changeset patch
+# Parent 7d7383f638705a01fdc18e0e7e0c9cdb6387fc5d
+Support for mips-linux-musl.
+
+diff -r 7d7383f63870 gcc/config/mips/linux.h
+--- a/gcc/config/mips/linux.h	Tue Dec 31 14:55:11 2013 -0500
++++ b/gcc/config/mips/linux.h	Tue Dec 31 14:55:14 2013 -0500
+@@ -18,3 +18,10 @@
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++
++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
++#endif
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
+# HG changeset patch
+# Parent 89df6d7e91c686da676ce27ef9b9d10522810c26
+Support for powerpc-linux-musl.
+
+diff -r 89df6d7e91c6 gcc/config.gcc
+--- a/gcc/config.gcc	Tue Dec 31 14:55:14 2013 -0500
++++ b/gcc/config.gcc	Tue Dec 31 14:55:17 2013 -0500
+@@ -2117,6 +2117,10 @@
+ 	    powerpc*-*-linux*paired*)
+ 		tm_file="${tm_file} rs6000/750cl.h" ;;
+ 	esac
++        case ${target} in
++            *-linux*-musl*)
++                enable_secureplt=yes ;;
++        esac
+ 	if test x${enable_secureplt} = xyes; then
+ 		tm_file="rs6000/secureplt.h ${tm_file}"
+ 	fi
+diff -r 89df6d7e91c6 gcc/config/rs6000/linux64.h
+--- a/gcc/config/rs6000/linux64.h	Tue Dec 31 14:55:14 2013 -0500
++++ b/gcc/config/rs6000/linux64.h	Tue Dec 31 14:55:17 2013 -0500
+@@ -354,17 +354,21 @@
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
+ #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
+ #elif DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER32 \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ 
+ #undef  DEFAULT_ASM_ENDIAN
+ #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
+diff -r 89df6d7e91c6 gcc/config/rs6000/secureplt.h
+--- a/gcc/config/rs6000/secureplt.h	Tue Dec 31 14:55:14 2013 -0500
++++ b/gcc/config/rs6000/secureplt.h	Tue Dec 31 14:55:17 2013 -0500
+@@ -18,3 +18,4 @@
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
+diff -r 89df6d7e91c6 gcc/config/rs6000/sysv4.h
+--- a/gcc/config/rs6000/sysv4.h	Tue Dec 31 14:55:14 2013 -0500
++++ b/gcc/config/rs6000/sysv4.h	Tue Dec 31 14:55:17 2013 -0500
+@@ -550,6 +550,9 @@
+ #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
+ #define CC1_SECURE_PLT_DEFAULT_SPEC ""
+ #endif
++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
++#define LINK_SECURE_PLT_DEFAULT_SPEC ""
++#endif
+ 
+ /* Pass -G xxx to the compiler and set correct endian mode.  */
+ #define	CC1_SPEC "%{G*} %(cc1_cpu)" \
+@@ -600,7 +603,8 @@
+ 
+ /* Override the default target of the linker.  */
+ #define	LINK_TARGET_SPEC \
+-  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
++  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
++  "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
+ 
+ /* Any specific OS flags.  */
+ #define LINK_OS_SPEC "\
+@@ -778,15 +782,18 @@
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER \
+-  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
++  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ 
+ #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+@@ -912,6 +919,7 @@
+   { "cc1_endian_little",	CC1_ENDIAN_LITTLE_SPEC },		\
+   { "cc1_endian_default",	CC1_ENDIAN_DEFAULT_SPEC },		\
+   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
++  { "link_secure_plt_default",	LINK_SECURE_PLT_DEFAULT_SPEC },		\
+   { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
+   { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
+   { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
+diff -r d7ce17b2f2d6 gcc/config/aarch64/aarch64-linux.h
+--- a/gcc/config/aarch64/aarch64-linux.h	Tue Dec 31 14:55:17 2013 -0500
++++ b/gcc/config/aarch64/aarch64-linux.h	Tue Dec 31 14:55:20 2013 -0500
+@@ -21,7 +21,11 @@
+ #ifndef GCC_AARCH64_LINUX_H
+ #define GCC_AARCH64_LINUX_H
+ 
++/* The AArch64 port currently supports two dynamic linkers:
++   - ld-linux-aarch64.so.1 - GLIBC dynamic linker
++   - ld-musl-aarch64.so.1 - musl libc dynamic linker  */
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1"
+ 
+ #define CPP_SPEC "%{pthread:-D_REENTRANT}"
+ 
+# HG changeset patch
+# Parent f2601e4063d0d58d8ab04185e8baefd560d09496
+Microblaze support (again).
+
+
+diff -r f2601e4063d0 -r 0736dfe1aa0d gcc/config/microblaze/linux.h
+--- a/gcc/config/microblaze/linux.h	Tue Dec 31 14:55:20 2013 -0500
++++ b/gcc/config/microblaze/linux.h	Tue Dec 31 15:09:52 2013 -0500
+@@ -25,7 +25,22 @@
+ #undef TLS_NEEDS_GOT
+ #define TLS_NEEDS_GOT 1
+ 
+-#define DYNAMIC_LINKER "/lib/ld.so.1"
++#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
++#endif
++
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
++#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++
++#if DEFAULT_LIBC == LIBC_MUSL
++#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER
++#else
++#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
++#endif
++
++
+ #undef  SUBTARGET_EXTRA_SPECS
+ #define SUBTARGET_EXTRA_SPECS \
+   { "dynamic_linker", DYNAMIC_LINKER }
+From 478ee0c03a08e2ef9371fd88d516738936943e78 Mon Sep 17 00:00:00 2001
+From: David Holsgrove <david.holsgrove@xilinx.com>
+Date: Fri, 28 Sep 2012 16:32:03 +1000
+Subject: [PATCH 06/11] [Patch, microblaze]: Add SIZE_TYPE and PTRDIFF_TYPE to
+ microblaze.h
+
+Fixes warnings like;
+
+warning: format '%zX' expects argument of type 'size_t',
+but argument 3 has type 'unsigned int' [-Wformat]
+
+Changelog
+
+2013-03-18  David Holsgrove <david.holsgrove@xilinx.com>
+
+ * gcc/config/microblaze/microblaze.h: Define SIZE_TYPE
+   and PTRDIFF_TYPE.
+
+Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
+---
+ gcc/config/microblaze/microblaze.h |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h
+index 19cdfed..e772a3f 100644
+--- a/gcc/config/microblaze/microblaze.h
++++ b/gcc/config/microblaze/microblaze.h
+@@ -213,6 +213,12 @@ extern enum pipeline_type microblaze_pipe;
+ #define STRICT_ALIGNMENT        1
+ #define PCC_BITFIELD_TYPE_MATTERS 1
+ 
++#undef SIZE_TYPE
++#define SIZE_TYPE "unsigned int"
++
++#undef PTRDIFF_TYPE
++#define PTRDIFF_TYPE "int"
++
+ #define CONSTANT_ALIGNMENT(EXP, ALIGN)					\
+   ((TREE_CODE (EXP) == STRING_CST  || TREE_CODE (EXP) == CONSTRUCTOR)	\
+    && (ALIGN) < BITS_PER_WORD						\
+-- 
+1.7.9.5
+

toolchain/gdb/Makefile.inc

@@ -2,8 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=	gdb
-PKG_VERSION:=	7.6
-PKG_MD5SUM:=	fda57170e4d11cdde74259ca575412a8
+PKG_VERSION:=	7.7
+PKG_MD5SUM:=	271a18f41858a7e98b28ae4eb91287c9
 PKG_RELEASE:=	1
 PKG_SITES:=	${MASTER_SITE_GNU:=gdb/}
 DISTFILES:=	$(PKG_NAME)-$(PKG_VERSION).tar.bz2

tools/adk/pkgmaker.c

@@ -33,7 +33,7 @@
 #define MAXVALUE 168
 #define MAXVAR 	64
 #define MAXPATH 320
-#define HASHSZ	32
+#define HASHSZ	96
 
 static int nobinpkgs;