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

Config.in

@@ -94,7 +94,7 @@ prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY
 
 config ADK_KERNEL_VERSION_TOOLCHAIN
-	prompt "3.13.6"
+	prompt "3.13.7"
 	boolean
 	depends on ADK_TOOLCHAIN_ONLY
 
@@ -106,35 +106,35 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 choice
 prompt "Kernel Version"
 
-config ADK_KERNEL_VERSION_3_13_6
-	prompt "3.13.6"
+config ADK_KERNEL_VERSION_3_13_7
+	prompt "3.13.7"
 	boolean
 
-config ADK_KERNEL_VERSION_3_12_13
-	prompt "3.12.13"
+config ADK_KERNEL_VERSION_3_12_14
+	prompt "3.12.14"
 	boolean
 
 config ADK_KERNEL_VERSION_3_11_10
 	prompt "3.11.10"
 	boolean
 
-config ADK_KERNEL_VERSION_3_10_33
-	prompt "3.10.33"
+config ADK_KERNEL_VERSION_3_10_34
+	prompt "3.10.34"
 	boolean
 
-config ADK_KERNEL_VERSION_3_4_82
-	prompt "3.4.82"
+config ADK_KERNEL_VERSION_3_4_84
+	prompt "3.4.84"
 	boolean
 
 endchoice
 
 config ADK_KERNEL_VERSION
 	string
-	default "3.13.6" if ADK_KERNEL_VERSION_3_13_6
-	default "3.12.13" if ADK_KERNEL_VERSION_3_12_13
+	default "3.13.7" if ADK_KERNEL_VERSION_3_13_7
+	default "3.12.14" if ADK_KERNEL_VERSION_3_12_14
 	default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
-	default "3.10.33" if ADK_KERNEL_VERSION_3_10_33
-	default "3.4.82" if ADK_KERNEL_VERSION_3_4_82
+	default "3.10.34" if ADK_KERNEL_VERSION_3_10_34
+	default "3.4.84" if ADK_KERNEL_VERSION_3_4_84
 	help
 
 config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI

Makefile

@@ -224,6 +224,7 @@ NO_ERROR=0
 	@echo "_PATH:=$$PATH" >>prereq.mk
 	@echo "PATH:=\$${TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk
 	@echo "SHELL:=$$(which bash)" >>prereq.mk
+	@echo "GIT:=$$(which git 2>/dev/null)" >>prereq.mk
 	@env NO_ERROR=${NO_ERROR} BASH="$$(which bash)" \
 		CC='${CC}' CPPFLAGS='${CPPFLAGS}' \
 	    	bash scripts/scan-tools.sh

README

@@ -5,7 +5,8 @@ This is a menu based buildsystem for your home made embedded Linux system.
 
 Before you can start you need to install some tools: 
 - bash
-- gcc 
+- gcc or clang
+- g++ or clang++
 - binutils 
 - GNU make
 - GNU awk
@@ -19,7 +20,6 @@ Before you can start you need to install some tools:
 - ncurses5 headers
 - zlib headers
 - perl
-- git
 
 There is a check for the required versions of these tools in advance, though.
 (to re-issue the checks, use "make prereq").

docs/contribute.txt

@@ -82,6 +82,7 @@ Here is a short list of details to provide in such case:
 * target for which the build fails
 * package(s) which the build fails
 * the command that fails and its output
+* the make.log file, generated when make v is used
 * any information you think that may be relevant
 
 Additionally, you can add the +.config+ file.

docs/getting.txt

@@ -5,8 +5,9 @@
 Getting OpenADK
 ---------------
 
-OpenADK does not have any releases. Only direct Git
-access is possible.
+OpenADK does not have any releases. We are following the
+http://en.wikipedia.org/wiki/Rolling_release[rolling release]
+development model.
 
 To download OpenADK using Git just do:
 
@@ -20,3 +21,4 @@ Or if you prefer HTTP or using Git behind a proxy:
  $ git clone http://git.openadk.org/openadk.git
 ---------------------
 
+Or you can get a http://www.openadk.org/snapshots/[snapshot].

docs/introduction.txt

@@ -24,3 +24,9 @@ processors, MIPS processors, ARM processors, etc.
 OpenADK supports numerous processors and their variants; it also comes
 with default configurations for some embedded systems and netbooks.
 (Raspberry PI, Sharp Zaurus, Lemote Yeelong, IBM X40 and more)
+
+OpenADK is not a Linux distribution and there are no releases or binary
+packages available. If you need something like that, better switch to
+something else. OpenADK builds everything from source. There are only a
+few exceptions to this rule (f.e. some bootloaders and firmware files for
+wireless network cards).

docs/patch-policy.txt

@@ -10,8 +10,8 @@ While integrating a new package or updating an existing one, it may be
 necessary to patch the source of the software to get it cross-built within
 OpenADK.  OpenADK offers an infrastructure to automatically handle this during
 the builds.  Patches are provided within OpenADK, in the package directory;
-these typically aim to fix cross-compilation, libc support, or other such
-issues.
+these typically aim to fix cross-compilation, libc support, portability issues
+or other things.
 
 Normally the patches are autogenerated via:
 ------------
@@ -80,3 +80,11 @@ Fetch from: <some url>
 
 It is also sensible to add a few words about any changes to the patch
 that may have been necessary.
+
+Upstreaming patches
+~~~~~~~~~~~~~~~~~~~
+
+OpenADK tries to avoid any patches to the source code. If a patch could
+not be avoided, it should be tried to make the patch of a good quality to
+get it upstream. OpenADK tries to report any found issues and try to send
+in any upstream compatible patches.

mk/build.mk

@@ -147,7 +147,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 
 world:
 	mkdir -p $(DL_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
-		$(PACKAGE_DIR) $(TOOLS_BUILD_DIR) $(STAGING_HOST_DIR)/usr/bin \
+		$(TOOLS_BUILD_DIR) $(STAGING_HOST_DIR)/usr/bin \
 		$(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
 	${BASH} ${TOPDIR}/scripts/update-sys
@@ -476,16 +476,16 @@ bulktoolchain:
 			mkdir -p ${TOPDIR}/firmware; \
 		    ( \
 			echo === building $$arch $$libc toolchain-$$arch on $$(date); \
-			tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##"); \
-			carch=$$(echo $$arch|sed -e "s#hf##" -e "s#mips64.*#mips64#"); \
+			tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##" -e "s#x86_64.*#x86_64#" ); \
+			carch=$$(echo $$arch|sed -e "s#sh#sh4#" -e "s#hf##" -e "s#mips64n.*#mips64#" -e "s#mips64el.*#mips64el#" -e "s#x86_64.*#x86_64#" ); \
 			$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
 				if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \
 				if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
-				if [ -f ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz ];then exit;fi; \
+				if [ -f ${TOPDIR}/firmware/toolchain_$${carch}_$${libc}$${abi}.tar.xz ];then exit;fi; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; break;fi; \
-				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}$${abi}.tar.xz toolchain_${GNU_HOST_NAME} target_$${carch}_$${libc}$${abi}; \
+				tar -cvJf ${TOPDIR}/firmware/toolchain_$${carch}_$${libc}$${abi}.tar.xz toolchain_${GNU_HOST_NAME} target_$${carch}_$${libc}$${abi}; \
 				$(GMAKE) cleantoolchain; \
 			rm .config; \
 		    ) 2>&1 | tee -a $(TOPDIR)/firmware/toolchain_build.log; \
@@ -503,8 +503,9 @@ test-framework:
 	for libc in $$libc;do \
 		( \
 			mkdir -p $(TOPDIR)/firmware/; \
-			for arch in arm armhf microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \
+			for arch in $$(grep -v m68k target/tarch.lst|xargs);do \
 				tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##"); \
+				arch=$$(echo $$arch|sed -e 's#x86$$#i686#'); \
 				echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
 				$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=initramfsarchive COLLECTION=test defconfig; \
@@ -527,14 +528,13 @@ test-framework:
 
 release:
 	for libc in uclibc glibc musl;do \
-		mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \
 		( \
 			echo === building $$libc on $$(date); \
 			$(GMAKE) prereq && \
 			$(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) LIBC=$$libc FS=archive allmodconfig; \
 			$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 			rm .config; \
-		) 2>&1 | tee $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc/build.log; \
+		) 2>&1 | tee $(TOPDIR)/firmware/release-build.log; \
 		if [ -f .exit ];then echo "Bulk build failed!"; break;fi \
 	done
 	if [ -f .exit ];then rm .exit;exit 1;fi
@@ -545,14 +545,14 @@ bulk:
 	  while read arch; do \
 	      systems=$$(./scripts/getsystems $$arch|grep -v toolchain); \
 	      for system in $$systems;do \
-		mkdir -p $(TOPDIR)/firmware/$${system}_$${arch}_$$libc; \
+		mkdir -p $(TOPDIR)/firmware; \
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
 		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
-            ) 2>&1 | tee $(TOPDIR)/firmware/$${system}_$${arch}_$$libc/build.log; \
+            ) 2>&1 | tee $(TOPDIR)/firmware/bulkbuild.log; \
 		if [ -f .exit ]; then break;fi \
 	      done; \
 	    if [ -f .exit ]; then break;fi \
@@ -565,14 +565,14 @@ bulkall:
 	  while read arch; do \
 	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
 	      for system in $$systems;do \
-		mkdir -p $(TOPDIR)/firmware/$${system}_$${arch}_$$libc; \
+		mkdir -p $(TOPDIR)/firmware; \
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
 		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
-            ) 2>&1 | tee $(TOPDIR)/firmware/$${system}_$${arch}_$$libc/build.log; \
+            ) 2>&1 | tee $(TOPDIR)/firmware/bulkallbuild.log; \
 		if [ -f .exit ]; then break;fi \
 	      done; \
 	      if [ -f .exit ]; then break;fi \
@@ -585,7 +585,7 @@ bulkallmod:
 	  while read arch; do \
 	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
 	      for system in $$systems;do \
-		mkdir -p $(TOPDIR)/firmware/$${system}_$${arch}_$$libc; \
+		mkdir -p $(TOPDIR)/firmware; \
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
@@ -593,7 +593,7 @@ bulkallmod:
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \
 		$(GMAKE) clean; \
 		rm .config; \
-            ) 2>&1 | tee $(TOPDIR)/firmware/$${system}_$${arch}_$$libc/build.log; \
+            ) 2>&1 | tee $(TOPDIR)/firmware/bulkallmodbuild.log; \
 	        if [ -f .exit ]; then break;fi \
 	      done; \
 	     if [ -f .exit ]; then break;fi \

mk/image.mk

@@ -34,6 +34,9 @@ imageprepare: image-prepare-post extra-install
 # if an extra directory exist in TOPDIR, copy all content over the 
 # root directory, do the same if make extra=/dir/to/extra is used
 extra-install:
+	@-if [ -h ${TARGET_DIR}/etc/resolv.conf -a -f $(TOPDIR)/extra/etc/resolv.conf ];then \
+		rm ${TARGET_DIR}/etc/resolv.conf;\
+	fi
 	@if [ -d $(TOPDIR)/extra ];then $(CP) $(TOPDIR)/extra/* ${TARGET_DIR};fi
 	@if [ ! -z $(extra) ];then $(CP) $(extra)/* ${TARGET_DIR};fi
 
@@ -51,6 +54,7 @@ image-prepare-post:
 	-rm -f ${TARGET_DIR}/bin/sh
 	ln -sf ${BINSH} ${TARGET_DIR}/bin/sh
 ifeq ($(ADK_LINUX_X86_64),y)
+ifeq ($(ADK_TARGET_ABI_32),)
 	# fixup lib dirs
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/lib/
@@ -60,6 +64,7 @@ ifeq ($(ADK_LINUX_X86_64),y)
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
+endif
 ifeq ($(ADK_LINUX_PPC64),y)
 	# fixup lib dirs
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}

mk/kernel-build.mk

@@ -54,6 +54,7 @@ $(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE)
 		LOCALVERSION="" \
 		modules_install $(MAKE_TRACE)
 	$(TRACE) target/$(ADK_TARGET_ARCH)-create-packages
+	@mkdir -p ${PACKAGE_DIR}
 ifneq ($(strip $(TARGETS)),)
 	$(MAKE) $(TARGETS)
 endif

mk/kernel-ver.mk

@@ -1,20 +1,20 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:=	3.13.6
+KERNEL_VERSION:=	3.13.7
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		445aa27da818617409982f42902a6e41
+KERNEL_MD5SUM:=		370adced5e5c1cb1d0d621c2dae2723f
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_13_6),y)
-KERNEL_VERSION:=	3.13.6
+ifeq ($(ADK_KERNEL_VERSION_3_13_7),y)
+KERNEL_VERSION:=	3.13.7
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		445aa27da818617409982f42902a6e41
+KERNEL_MD5SUM:=		370adced5e5c1cb1d0d621c2dae2723f
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_12_13),y)
-KERNEL_VERSION:=	3.12.13
+ifeq ($(ADK_KERNEL_VERSION_3_12_14),y)
+KERNEL_VERSION:=	3.12.14
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		345f5883cfb906dac4aef87e303d3a2d
+KERNEL_MD5SUM:=		5575e68e287605ad63d3a1444e9b701d
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_11_10),y)
 KERNEL_VERSION:=	3.11.10
@@ -22,15 +22,15 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_10_33),y)
-KERNEL_VERSION:=	3.10.33
+ifeq ($(ADK_KERNEL_VERSION_3_10_34),y)
+KERNEL_VERSION:=	3.10.34
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		01865f9c129f3c7eee51e25b3781a364
+KERNEL_MD5SUM:=		30991b495a3d75196d5608072d2e62e6
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_82),y)
-KERNEL_VERSION:=	3.4.82
+ifeq ($(ADK_KERNEL_VERSION_3_4_84),y)
+KERNEL_VERSION:=	3.4.84
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		9ee57efa65417a7a9ac931122c2b7377
+KERNEL_MD5SUM:=		b99f88ca356b5003ce44e952baa3e6a3
 endif

mk/vars.mk

@@ -127,7 +127,7 @@ ifneq ($(ADK_DEBUG),)
 TARGET_CFLAGS+=		-g3 -fno-omit-frame-pointer
 else
 TARGET_CPPFLAGS+=	-DNDEBUG
-TARGET_CFLAGS+=		-fomit-frame-pointer $(TARGET_OPTIMIZATION)
+TARGET_CFLAGS+=		-fomit-frame-pointer $(ADK_TARGET_CFLAGS_OPT)
 # stop generating eh_frame stuff
 TARGET_CFLAGS+=		-fno-unwind-tables -fno-asynchronous-unwind-tables
 # always add debug information
@@ -178,9 +178,10 @@ TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
 			CROSS_COMPILE='$(TARGET_CROSS)'
 
 HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${CC_FOR_BUILD}' \
-			CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \
 			CXX_FOR_BUILD='${CXX_FOR_BUILD}' \
+			CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \
 			CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \
+			CXXFLAGS_FOR_BUILD='${CXXFLAGS_FOR_BUILD}' \
 			LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}'
 
 PKG_SUFFIX:=		$(strip $(subst ",, $(ADK_PACKAGE_SUFFIX)))

package/adk-test-tools/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		adk-test-tools
 PKG_VERSION:=		0.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		5
 PKG_DESCR:=		helper tools and scripts for adk-test-framework
 PKG_SECTION:=		misc
 PKG_URL:=		http://openadk.org/

package/adk-test-tools/files/test.init

@@ -3,6 +3,10 @@
 #INIT 90
 [[ $1 = autostart ]] || exit 0
 echo "Starting test script ..."
+grep shell /proc/cmdline > /dev/null 2&>1
+if [ $? -eq 0 ];then
+	exit 0
+fi
 if [ -x /run.sh ];then
 	/run.sh
 	quit

package/asterisk/Makefile

@@ -105,7 +105,7 @@ TARGET_LDFLAGS+=	-lm -ltinfo -ldl -lpthread
 MAKE_ENV=		ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TARGET_LDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
-			OPTIMIZE="${TARGET_OPTIMIZATION}" \
+			OPTIMIZE="${TARGET_CFLAGS}" \
 			NOISY_BUILD=1
 ALL_TARGET:=		all install samples
 

package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		77
+PKG_RELEASE:=		79
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
@@ -56,6 +56,7 @@ endif
 	chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init
 	chmod 600 $(IDIR_BASE_FILES)/etc/shadow
 	chmod 600 $(IDIR_BASE_FILES)/etc/network/interfaces
+	(cd $(IDIR_BASE_FILES)/etc; ln -sf ../tmp/resolv.conf .)
 	chmod 1777 ${IDIR_BASE_FILES}/tmp
 	ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab
 	rm -rf $(IDIR_BASE_FILES)/var
@@ -76,7 +77,8 @@ endif
 	test -z $(ADK_RUNTIME_PASSWORD) || \
 	    $(SED) 's,\*NP\*,'"$$($(STAGING_HOST_DIR)/usr/bin/mkcrypt \
 	    ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow
-	git log -1|head -1|sed -e 's#commit ##' \
+	test -z $(GIT) || \
+	     $(GIT) log -1|head -1|sed -e 's#commit ##' \
 		> $(IDIR_BASE_FILES)/etc/adkversion
 	test -z $(ADK_TARGET_SYSTEM) || \
 	    echo $(ADK_TARGET_SYSTEM) > $(IDIR_BASE_FILES)/etc/adktarget
@@ -85,23 +87,20 @@ ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},)
 	gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz
 	chmod 600 $(IDIR_BASE_FILES)/etc/adkconfig.gz
 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),)
+ifeq ($(ADK_TARGET_WITH_ROOT_RW),y)
 	echo 'export IPKGTMPDIR=/root/.ipkg' >> $(IDIR_BASE_FILES)/etc/profile
 else
-	echo 'export IPKGTMPDIR=/tmp >> $(IDIR_BASE_FILES)/etc/profile
+	echo 'export IPKGTMPDIR=/tmp' >> $(IDIR_BASE_FILES)/etc/profile
 endif
-
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+	echo 'export LD_LIBRARY_PATH=/opt/vc/lib' >> $(IDIR_BASE_FILES)/etc/profile
 endif
 
 # simple network configuration
 ifneq (${ADK_SIMPLE_NETWORK_CONFIG},)
 	${INSTALL_DIR} ${IDIR_BASE_FILES}/etc/network
-
 	# network config local
 	echo -e "auto lo\niface lo inet loopback" > ${IDIR_BASE_FILES}/etc/network/interfaces
-
 	# network config eth0
 	# configure nic with dhcp
 ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC},y)
@@ -128,12 +127,10 @@ ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP},y)
 	echo -e "  broadcast ${SIMPLE_NETWORK_CONFIG_ETH0_BC}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
 	echo -e "  bridge-ports ${SIMPLE_NETWORK_CONFIG_ETH0_BRIDGE}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
 endif
-
 	# network config wlan0
 ifeq (${SIMPLE_NETWORK_CONFIG_WLAN0_TYPE_NIC},y)
 	echo -e "\nauto wlan0\niface wlan0 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces
 endif
-
 	# network config eth1
 	# configure nic with dhcp
 ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC},y)
@@ -160,13 +157,11 @@ ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_BRIDGE_IP},y)
 	echo -e "  broadcast ${SIMPLE_NETWORK_CONFIG_ETH1_BC}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
 	echo -e "  bridge-ports ${SIMPLE_NETWORK_CONFIG_ETH1_BRIDGE}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
 endif
-
 	# newline at the end of interfaces file
 	echo -en "\n" >>  ${IDIR_BASE_FILES}/etc/network/interfaces
-
 	# resolver config
+	rm ${IDIR_BASE_FILES}/etc/resolv.conf
 	echo -e "nameserver ${SIMPLE_NETWORK_CONFIG_RESOLV}" > ${IDIR_BASE_FILES}/etc/resolv.conf
 endif
 
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/base-files/files/inittab.shell

@@ -1 +1 @@
-::askfirst:/bin/sh
+::askfirst:-/bin/sh

package/base-files/src/etc/init.d/boot

@@ -4,10 +4,6 @@
 
 . /etc/functions.sh
 
-if [ -f /proc/sys/kernel/printk ];then
-	echo 0 > /proc/sys/kernel/printk
-fi
-
 # remount /dev with smaller size
 mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 
@@ -31,9 +27,9 @@ cat /etc/.rnd >/dev/urandom 2>&1
 # create some useful directories in tmpfs
 mkdir -p /var/log
 mkdir -p /var/run
+mkdir -p /var/tmp
 touch /var/log/lastlog
 touch /var/log/wtmp
-ln -s /tmp /var/tmp
 
 HOSTNAME=
 [[ -s /etc/hostname ]] && HOSTNAME=$(cat /etc/hostname)

package/base-files/src/etc/inittab

@@ -6,5 +6,5 @@ null::sysinit:/bin/mount -a -t devpts
 null::sysinit:/bin/mount -a -t tmpfs
 ::sysinit:/etc/init.d/rcS
 ::shutdown:/etc/init.d/rcK
-null::shutdown:/bin/umount -a -r
+null::shutdown:/bin/umount -a -t ext4
 null::shutdown:/sbin/swapoff -a

package/base-files/src/usr/share/udhcpc/default.script

@@ -23,16 +23,12 @@ case $1 in
 			ip route add to default via $i
 		done
 	fi
-
-	touch /tmp/resolv.conf
-	ln -sf /tmp/resolv.conf $RESOLV_CONF
 	echo -n >$RESOLV_CONF
 	${domain:+echo search $domain} >>$RESOLV_CONF
 	for i in $dns; do
 		echo "adding dns $i"
 		echo "nameserver $i" >>$RESOLV_CONF
 	done
-
 	# user rules
 	[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
 ;;

package/bash/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		bash
-PKG_VERSION:=		4.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		3fb927c7c33022f1c327f14a81c0d4b0
+PKG_VERSION:=		4.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		81348932d5da294953e15d4814c74dd1
 PKG_DESCR:=		Bourne-Again SHell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.gnu.org/software/bash/

package/bash/patches/patch-Makefile_in

@@ -1,13 +0,0 @@
---- bash-4.2.orig/Makefile.in	2010-12-01 01:22:42.000000000 +0100
-+++ bash-4.2/Makefile.in	2011-03-09 20:03:07.163370779 +0100
-@@ -710,8 +710,8 @@ pathnames.h:		Makefile $(srcdir)/pathnam
- 	@${RM} pathnames.tmp
- 
- # comment out for distribution
--$(srcdir)/configure:	$(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
--	cd $(srcdir) && autoconf
-+#$(srcdir)/configure:	$(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
-+#	cd $(srcdir) && autoconf
- 
- # for chet
- reconfig: force

package/bash/patches/patch-builtins_Makefile_in

@@ -1,11 +0,0 @@
---- bash-4.0.orig/builtins/Makefile.in	2009-01-04 20:32:22.000000000 +0100
-+++ bash-4.0/builtins/Makefile.in	2009-10-21 13:17:04.681674304 +0200
-@@ -56,7 +56,7 @@ LIBBUILD = ${BUILD_DIR}/lib
- 
- PROFILE_FLAGS = @PROFILE_FLAGS@
- CFLAGS = @CFLAGS@
--CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ @CROSS_COMPILE@
-+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
- CPPFLAGS = @CPPFLAGS@
- CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
- LOCAL_CFLAGS = @LOCAL_CFLAGS@ ${DEBUG}

package/check/Makefile

@@ -0,0 +1,26 @@
+# 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:=		check
+PKG_VERSION:=		0.9.12
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		46fe540d1a03714c7a1967dbc6d484e7
+PKG_DESCR:=		unit testing framework for C
+PKG_SECTION:=		libs
+PKG_URL:=		http://check.sourceforge.net/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=check/}
+PKG_LIBNAME:=		libcheck
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBCHECK,libcheck,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libcheck-install:
+	$(INSTALL_DIR) $(IDIR_LIBCHECK)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libcheck*.so* \
+		$(IDIR_LIBCHECK)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/dosfstools/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dosfstools
 PKG_VERSION:=		3.0.26
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		45012f5f56f2aae3afcd62120b9e5a08
 PKG_DESCR:=		utilities to create and check FAT filesystems
 PKG_SECTION:=		fs

package/dosfstools/patches/patch-src_boot_c

@@ -0,0 +1,77 @@
+--- dosfstools-3.0.26.orig/src/boot.c	2014-01-17 07:06:54.000000000 +0100
++++ dosfstools-3.0.26/src/boot.c	2014-03-26 13:20:59.000000000 +0100
+@@ -155,7 +155,7 @@ static void check_backup_boot(DOS_FS * f
+ 	    fs->backupboot_start = bbs * lss;
+ 	    b->backup_boot = htole16(bbs);
+ 	    fs_write(fs->backupboot_start, sizeof(*b), b);
+-	    fs_write((loff_t) offsetof(struct boot_sector, backup_boot),
++	    fs_write((off_t) offsetof(struct boot_sector, backup_boot),
+ 		     sizeof(b->backup_boot), &b->backup_boot);
+ 	    printf("Created backup of boot sector in sector %d\n", bbs);
+ 	    return;
+@@ -233,9 +233,9 @@ static void read_fsinfo(DOS_FS * fs, str
+ 		    break;
+ 	    if (s > 0 && s < le16toh(b->reserved)) {
+ 		init_fsinfo(&i);
+-		fs_write((loff_t) s * lss, sizeof(i), &i);
++		fs_write((off_t) s * lss, sizeof(i), &i);
+ 		b->info_sector = htole16(s);
+-		fs_write((loff_t) offsetof(struct boot_sector, info_sector),
++		fs_write((off_t) offsetof(struct boot_sector, info_sector),
+ 			 sizeof(b->info_sector), &b->info_sector);
+ 		if (fs->backupboot_start)
+ 		    fs_write(fs->backupboot_start +
+@@ -327,7 +327,7 @@ void read_boot(DOS_FS * fs)
+     unsigned total_sectors;
+     unsigned short logical_sector_size, sectors;
+     unsigned fat_length;
+-    loff_t data_size;
++    off_t data_size;
+ 
+     fs_read(0, sizeof(b), &b);
+     logical_sector_size = GET_UNALIGNED_W(b.sector_size);
+@@ -352,18 +352,18 @@ void read_boot(DOS_FS * fs)
+     if (verbose)
+ 	printf("Checking we can access the last sector of the filesystem\n");
+     /* Can't access last odd sector anyway, so round down */
+-    fs_test((loff_t) ((total_sectors & ~1) - 1) * (loff_t) logical_sector_size,
++    fs_test((off_t) ((total_sectors & ~1) - 1) * (off_t) logical_sector_size,
+ 	    logical_sector_size);
+     fat_length = le16toh(b.fat_length) ?
+ 	le16toh(b.fat_length) : le32toh(b.fat32_length);
+-    fs->fat_start = (loff_t) le16toh(b.reserved) * logical_sector_size;
+-    fs->root_start = ((loff_t) le16toh(b.reserved) + b.fats * fat_length) *
++    fs->fat_start = (off_t) le16toh(b.reserved) * logical_sector_size;
++    fs->root_start = ((off_t) le16toh(b.reserved) + b.fats * fat_length) *
+ 	logical_sector_size;
+     fs->root_entries = GET_UNALIGNED_W(b.dir_entries);
+     fs->data_start = fs->root_start + ROUND_TO_MULTIPLE(fs->root_entries <<
+ 							MSDOS_DIR_BITS,
+ 							logical_sector_size);
+-    data_size = (loff_t) total_sectors *logical_sector_size - fs->data_start;
++    data_size = (off_t) total_sectors *logical_sector_size - fs->data_start;
+     fs->clusters = data_size / fs->cluster_size;
+     fs->root_cluster = 0;	/* indicates standard, pre-FAT32 root dir */
+     fs->fsinfo_start = 0;	/* no FSINFO structure */
+@@ -491,10 +491,10 @@ static void write_boot_label(DOS_FS * fs
+     }
+ }
+ 
+-loff_t find_volume_de(DOS_FS * fs, DIR_ENT * de)
++off_t find_volume_de(DOS_FS * fs, DIR_ENT * de)
+ {
+     uint32_t cluster;
+-    loff_t offset;
++    off_t offset;
+     int i;
+ 
+     if (fs->root_cluster) {
+@@ -525,7 +525,7 @@ static void write_volume_label(DOS_FS *
+ {
+     time_t now = time(NULL);
+     struct tm *mtime = localtime(&now);
+-    loff_t offset;
++    off_t offset;
+     int created;
+     DIR_ENT de;
+ 

package/dosfstools/patches/patch-src_boot_h

@@ -0,0 +1,11 @@
+--- dosfstools-3.0.26.orig/src/boot.h	2014-01-17 07:06:55.000000000 +0100
++++ dosfstools-3.0.26/src/boot.h	2014-03-26 13:29:53.000000000 +0100
+@@ -25,7 +25,7 @@
+ 
+ void read_boot(DOS_FS * fs);
+ void write_label(DOS_FS * fs, char *label);
+-loff_t find_volume_de(DOS_FS * fs, DIR_ENT * de);
++off_t find_volume_de(DOS_FS * fs, DIR_ENT * de);
+ 
+ /* Reads the boot sector from the currently open device and initializes *FS */
+ 

package/dosfstools/patches/patch-src_check_c

@@ -0,0 +1,49 @@
+--- dosfstools-3.0.26.orig/src/check.c	2014-03-07 18:35:11.000000000 +0100
++++ dosfstools-3.0.26/src/check.c	2014-03-26 10:04:41.000000000 +0100
+@@ -64,7 +64,7 @@ static DOS_FILE *root;
+ 	p->dir_ent.start = htole16(__v&0xffff);				\
+ 	p->dir_ent.starthi = htole16(__v>>16);				\
+ 	__v = htole32(__v);						\
+-	fs_write((loff_t)offsetof(struct boot_sector,root_cluster),	\
++	fs_write((off_t)offsetof(struct boot_sector,root_cluster),	\
+ 	         sizeof(((struct boot_sector *)0)->root_cluster),	\
+ 		 &__v);							\
+     }									\
+@@ -75,16 +75,16 @@ static DOS_FILE *root;
+     }									\
+   } while(0)
+ 
+-loff_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern)
++off_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern)
+ {
+     static int curr_num = 0;
+-    loff_t offset;
++    off_t offset;
+ 
+     if (fs->root_cluster) {
+ 	DIR_ENT d2;
+ 	int i = 0, got = 0;
+ 	uint32_t clu_num, prev = 0;
+-	loff_t offset2;
++	off_t offset2;
+ 
+ 	clu_num = fs->root_cluster;
+ 	offset = cluster_start(fs, clu_num);
+@@ -333,7 +333,7 @@ static int bad_name(DOS_FILE * file)
+     return 0;
+ }
+ 
+-static void lfn_remove(loff_t from, loff_t to)
++static void lfn_remove(off_t from, off_t to)
+ {
+     DIR_ENT empty;
+ 
+@@ -949,7 +949,7 @@ static void new_dir(void)
+  * @param           cp
+  */
+ static void add_file(DOS_FS * fs, DOS_FILE *** chain, DOS_FILE * parent,
+-		     loff_t offset, FDSC ** cp)
++		     off_t offset, FDSC ** cp)
+ {
+     DOS_FILE *new;
+     DIR_ENT de;

package/dosfstools/patches/patch-src_check_h

@@ -0,0 +1,11 @@
+--- dosfstools-3.0.26.orig/src/check.h	2014-01-17 07:07:02.000000000 +0100
++++ dosfstools-3.0.26/src/check.h	2014-03-26 13:25:47.000000000 +0100
+@@ -23,7 +23,7 @@
+ #ifndef _CHECK_H
+ #define _CHECK_H
+ 
+-loff_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern);
++off_t alloc_rootdir_entry(DOS_FS * fs, DIR_ENT * de, const char *pattern);
+ 
+ /* Allocate a free slot in the root directory for a new file. The file name is
+    constructed after 'pattern', which must include a %d type format for printf

package/dosfstools/patches/patch-src_fat_c

@@ -0,0 +1,32 @@
+--- dosfstools-3.0.26.orig/src/fat.c	2014-01-17 07:07:05.000000000 +0100
++++ dosfstools-3.0.26/src/fat.c	2014-03-26 13:37:03.000000000 +0100
+@@ -180,7 +180,7 @@ void set_fat(DOS_FS * fs, uint32_t clust
+ {
+     unsigned char *data = NULL;
+     int size;
+-    loff_t offs;
++    off_t offs;
+ 
+     if (new == -1)
+ 	new = FAT_EOF(fs);
+@@ -264,9 +264,9 @@ uint32_t next_cluster(DOS_FS * fs, uint3
+     return FAT_IS_EOF(fs, value) ? -1 : value;
+ }
+ 
+-loff_t cluster_start(DOS_FS * fs, uint32_t cluster)
++off_t cluster_start(DOS_FS * fs, uint32_t cluster)
+ {
+-    return fs->data_start + ((loff_t) cluster -
++    return fs->data_start + ((off_t) cluster -
+ 			     2) * (uint64_t)fs->cluster_size;
+ }
+ 
+@@ -475,7 +475,7 @@ void reclaim_file(DOS_FS * fs)
+ 	/* If this cluster is the head of an orphan chain... */
+ 	if (get_owner(fs, i) == &orphan && !num_refs[i]) {
+ 	    DIR_ENT de;
+-	    loff_t offset;
++	    off_t offset;
+ 	    files++;
+ 	    offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC");
+ 	    de.start = htole16(i & 0xffff);

package/dosfstools/patches/patch-src_fat_h

@@ -0,0 +1,11 @@
+--- dosfstools-3.0.26.orig/src/fat.h	2014-01-17 07:07:07.000000000 +0100
++++ dosfstools-3.0.26/src/fat.h	2014-03-26 13:29:04.000000000 +0100
+@@ -49,7 +49,7 @@ uint32_t next_cluster(DOS_FS * fs, uint3
+    last cluster of the respective cluster chain. CLUSTER must not be a bad
+    cluster. */
+ 
+-loff_t cluster_start(DOS_FS * fs, uint32_t cluster);
++off_t cluster_start(DOS_FS * fs, uint32_t cluster);
+ 
+ /* Returns the byte offset of CLUSTER, relative to the respective device. */
+ 

package/dosfstools/patches/patch-src_fatlabel_c

@@ -0,0 +1,11 @@
+--- dosfstools-3.0.26.orig/src/fatlabel.c	2014-01-17 07:07:08.000000000 +0100
++++ dosfstools-3.0.26/src/fatlabel.c	2014-03-26 13:23:52.000000000 +0100
+@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
+     char *device = NULL;
+     char label[12] = { 0 };
+ 
+-    loff_t offset;
++    off_t offset;
+     DIR_ENT de;
+ 
+     check_atari();

package/dosfstools/patches/patch-src_fsck_fat_h

@@ -0,0 +1,38 @@
+--- dosfstools-3.0.26.orig/src/fsck.fat.h	2014-02-08 18:53:10.000000000 +0100
++++ dosfstools-3.0.26/src/fsck.fat.h	2014-03-26 13:29:32.000000000 +0100
+@@ -143,8 +143,8 @@ typedef struct {
+ typedef struct _dos_file {
+     DIR_ENT dir_ent;
+     char *lfn;
+-    loff_t offset;
+-    loff_t lfn_offset;
++    off_t offset;
++    off_t lfn_offset;
+     struct _dos_file *parent;	/* parent directory */
+     struct _dos_file *next;	/* next entry */
+     struct _dos_file *first;	/* first entry (directory only) */
+@@ -157,19 +157,19 @@ typedef struct {
+ 
+ typedef struct {
+     int nfats;
+-    loff_t fat_start;
++    off_t fat_start;
+     unsigned int fat_size;	/* unit is bytes */
+     unsigned int fat_bits;	/* size of a FAT entry */
+     unsigned int eff_fat_bits;	/* # of used bits in a FAT entry */
+     uint32_t root_cluster;	/* 0 for old-style root dir */
+-    loff_t root_start;
++    off_t root_start;
+     unsigned int root_entries;
+-    loff_t data_start;
++    off_t data_start;
+     unsigned int cluster_size;
+     uint32_t clusters;
+-    loff_t fsinfo_start;	/* 0 if not present */
++    off_t fsinfo_start;	/* 0 if not present */
+     long free_clusters;
+-    loff_t backupboot_start;	/* 0 if not present */
++    off_t backupboot_start;	/* 0 if not present */
+     unsigned char *fat;
+     DOS_FILE **cluster_owner;
+     char *label;

package/dosfstools/patches/patch-src_io_c

@@ -0,0 +1,59 @@
+--- dosfstools-3.0.26.orig/src/io.c	2014-01-17 07:07:14.000000000 +0100
++++ dosfstools-3.0.26/src/io.c	2014-03-26 13:27:02.000000000 +0100
+@@ -48,7 +48,7 @@
+ 
+ typedef struct _change {
+     void *data;
+-    loff_t pos;
++    off_t pos;
+     int size;
+     struct _change *next;
+ } CHANGE;
+@@ -60,7 +60,7 @@ unsigned device_no;
+ 
+ #ifdef __DJGPP__
+ #include "volume.h"		/* DOS lowlevel disk access functions */
+-loff_t llseek(int fd, loff_t offset, int whence)
++off_t llseek(int fd, off_t offset, int whence)
+ {
+     if ((whence != SEEK_SET) || (fd == 4711))
+ 	return -1;		/* only those supported */
+@@ -72,9 +72,9 @@ loff_t llseek(int fd, loff_t offset, int
+ #define read(a,b,c) ReadVolume(b,c)
+ #define write(a,b,c) WriteVolume(b,c)
+ #else
+-loff_t llseek(int fd, loff_t offset, int whence)
++off_t llseek(int fd, off_t offset, int whence)
+ {
+-    return (loff_t) lseek64(fd, (off64_t) offset, whence);
++    return (off_t) lseek64(fd, (off64_t) offset, whence);
+ }
+ #endif
+ 
+@@ -118,7 +118,7 @@ void fs_open(char *path, int rw)
+  * @param[in]   size    Number of bytes to read
+  * @param[out]  data    Where to put the data read
+  */
+-void fs_read(loff_t pos, int size, void *data)
++void fs_read(off_t pos, int size, void *data)
+ {
+     CHANGE *walk;
+     int got;
+@@ -145,7 +145,7 @@ void fs_read(loff_t pos, int size, void
+     }
+ }
+ 
+-int fs_test(loff_t pos, int size)
++int fs_test(off_t pos, int size)
+ {
+     void *scratch;
+     int okay;
+@@ -158,7 +158,7 @@ int fs_test(loff_t pos, int size)
+     return okay;
+ }
+ 
+-void fs_write(loff_t pos, int size, void *data)
++void fs_write(off_t pos, int size, void *data)
+ {
+     CHANGE *new;
+     int did;

package/dosfstools/patches/patch-src_io_h

@@ -0,0 +1,35 @@
+--- dosfstools-3.0.26.orig/src/io.h	2014-02-08 18:53:10.000000000 +0100
++++ dosfstools-3.0.26/src/io.h	2014-03-26 13:27:15.000000000 +0100
+@@ -27,9 +27,9 @@
+ #ifndef _IO_H
+ #define _IO_H
+ 
+-#include <fcntl.h>		/* for loff_t */
++#include <fcntl.h>		/* for off_t */
+ 
+-loff_t llseek(int fd, loff_t offset, int whence);
++off_t llseek(int fd, off_t offset, int whence);
+ 
+ /* lseek() analogue for large offsets. */
+ 
+@@ -38,17 +38,17 @@ void fs_open(char *path, int rw);
+ /* Opens the filesystem PATH. If RW is zero, the filesystem is opened
+    read-only, otherwise, it is opened read-write. */
+ 
+-void fs_read(loff_t pos, int size, void *data);
++void fs_read(off_t pos, int size, void *data);
+ 
+ /* Reads SIZE bytes starting at POS into DATA. Performs all applicable
+    changes. */
+ 
+-int fs_test(loff_t pos, int size);
++int fs_test(off_t pos, int size);
+ 
+ /* Returns a non-zero integer if SIZE bytes starting at POS can be read without
+    errors. Otherwise, it returns zero. */
+ 
+-void fs_write(loff_t pos, int size, void *data);
++void fs_write(off_t pos, int size, void *data);
+ 
+ /* If write_immed is non-zero, SIZE bytes are written from DATA to the disk,
+    starting at POS. If write_immed is zero, the change is added to a list in

package/dosfstools/patches/patch-src_lfn_c

@@ -0,0 +1,74 @@
+--- dosfstools-3.0.26.orig/src/lfn.c	2014-01-17 07:07:16.000000000 +0100
++++ dosfstools-3.0.26/src/lfn.c	2014-03-26 13:24:23.000000000 +0100
+@@ -52,7 +52,7 @@ typedef struct {
+ unsigned char *lfn_unicode = NULL;
+ unsigned char lfn_checksum;
+ int lfn_slot = -1;
+-loff_t *lfn_offsets = NULL;
++off_t *lfn_offsets = NULL;
+ int lfn_parts = 0;
+ 
+ static unsigned char fat_uni2esc[64] = {
+@@ -170,7 +170,7 @@ static void clear_lfn_slots(int start, i
+     }
+ }
+ 
+-void lfn_fix_checksum(loff_t from, loff_t to, const char *short_name)
++void lfn_fix_checksum(off_t from, off_t to, const char *short_name)
+ {
+     int i;
+     __u8 sum;
+@@ -195,7 +195,7 @@ void lfn_reset(void)
+ 
+ /* This function is only called with de->attr == VFAT_LN_ATTR. It stores part
+  * of the long name. */
+-void lfn_add_slot(DIR_ENT * de, loff_t dir_offset)
++void lfn_add_slot(DIR_ENT * de, off_t dir_offset)
+ {
+     LFN_ENT *lfn = (LFN_ENT *) de;
+     int slot = lfn->id & LFN_ID_SLOTMASK;
+@@ -253,7 +253,7 @@ void lfn_add_slot(DIR_ENT * de, loff_t d
+ 	lfn_slot = slot;
+ 	lfn_checksum = lfn->alias_checksum;
+ 	lfn_unicode = alloc((lfn_slot * CHARS_PER_LFN + 1) * 2);
+-	lfn_offsets = alloc(lfn_slot * sizeof(loff_t));
++	lfn_offsets = alloc(lfn_slot * sizeof(off_t));
+ 	lfn_parts = 0;
+     } else if (lfn_slot == -1 && slot != 0) {
+ 	/* No LFN in progress, but slot found; start bit missing */
+@@ -272,7 +272,7 @@ void lfn_add_slot(DIR_ENT * de, loff_t d
+ 	switch (interactive ? get_key("123", "?") : '2') {
+ 	case '1':
+ 	    if (!lfn_offsets)
+-		lfn_offsets = alloc(sizeof(loff_t));
++		lfn_offsets = alloc(sizeof(off_t));
+ 	    lfn_offsets[0] = dir_offset;
+ 	    clear_lfn_slots(0, 0);
+ 	    lfn_reset();
+@@ -287,7 +287,7 @@ void lfn_add_slot(DIR_ENT * de, loff_t d
+ 	    lfn_slot = slot;
+ 	    lfn_checksum = lfn->alias_checksum;
+ 	    lfn_unicode = alloc((lfn_slot * CHARS_PER_LFN + 1) * 2);
+-	    lfn_offsets = alloc(lfn_slot * sizeof(loff_t));
++	    lfn_offsets = alloc(lfn_slot * sizeof(off_t));
+ 	    lfn_parts = 0;
+ 	    break;
+ 	}
+@@ -319,7 +319,7 @@ void lfn_add_slot(DIR_ENT * de, loff_t d
+ 	switch (interactive ? get_key(can_fix ? "123" : "12", "?") : '2') {
+ 	case '1':
+ 	    if (!lfn_offsets) {
+-		lfn_offsets = alloc(sizeof(loff_t));
++		lfn_offsets = alloc(sizeof(off_t));
+ 		lfn_parts = 0;
+ 	    }
+ 	    lfn_offsets[lfn_parts++] = dir_offset;
+@@ -406,7 +406,7 @@ void lfn_add_slot(DIR_ENT * de, loff_t d
+ 
+ /* This function is always called when de->attr != VFAT_LN_ATTR is found, to
+  * retrieve the previously constructed LFN. */
+-char *lfn_get(DIR_ENT * de, loff_t * lfn_offset)
++char *lfn_get(DIR_ENT * de, off_t * lfn_offset)
+ {
+     char *lfn;
+     __u8 sum;

package/dosfstools/patches/patch-src_lfn_h

@@ -0,0 +1,20 @@
+--- dosfstools-3.0.26.orig/src/lfn.h	2014-01-17 07:07:17.000000000 +0100
++++ dosfstools-3.0.26/src/lfn.h	2014-03-26 13:24:56.000000000 +0100
+@@ -26,14 +26,14 @@
+ void lfn_reset(void);
+ /* Reset the state of the LFN parser. */
+ 
+-void lfn_add_slot(DIR_ENT * de, loff_t dir_offset);
++void lfn_add_slot(DIR_ENT * de, off_t dir_offset);
+ /* Process a dir slot that is a VFAT LFN entry. */
+ 
+-char *lfn_get(DIR_ENT * de, loff_t * lfn_offset);
++char *lfn_get(DIR_ENT * de, off_t * lfn_offset);
+ /* Retrieve the long name for the proper dir entry. */
+ 
+ void lfn_check_orphaned(void);
+ 
+-void lfn_fix_checksum(loff_t from, loff_t to, const char *short_name);
++void lfn_fix_checksum(off_t from, off_t to, const char *short_name);
+ 
+ #endif

package/dosfstools/patches/patch-src_mkfs_fat_c

@@ -0,0 +1,56 @@
+--- dosfstools-3.0.26.orig/src/mkfs.fat.c	2014-02-08 18:53:10.000000000 +0100
++++ dosfstools-3.0.26/src/mkfs.fat.c	2014-03-26 13:37:51.000000000 +0100
+@@ -300,7 +300,7 @@ static long do_check(char *buffer, int t
+ static void alarm_intr(int alnum);
+ static void check_blocks(void);
+ static void get_list_blocks(char *filename);
+-static int valid_offset(int fd, loff_t offset);
++static int valid_offset(int fd, off_t offset);
+ static uint64_t count_blocks(char *filename, int *remainder);
+ static void check_mount(char *device_name);
+ static void establish_params(int device_num, int size);
+@@ -477,7 +477,7 @@ static void get_list_blocks(char *filena
+ /* Given a file descriptor and an offset, check whether the offset is a valid offset for the file - return FALSE if it
+    isn't valid or TRUE if it is */
+ 
+-static int valid_offset(int fd, loff_t offset)
++static int valid_offset(int fd, off_t offset)
+ {
+     char ch;
+ 
+@@ -492,7 +492,7 @@ static int valid_offset(int fd, loff_t o
+ 
+ static uint64_t count_blocks(char *filename, int *remainder)
+ {
+-    loff_t high, low;
++    off_t high, low;
+     int fd;
+ 
+     if ((fd = open(filename, O_RDONLY)) < 0) {
+@@ -506,7 +506,7 @@ static uint64_t count_blocks(char *filen
+ 	for (high = 1; valid_offset(fd, high); high *= 2)
+ 	    low = high;
+ 	while (low < high - 1) {
+-	    const loff_t mid = (low + high) / 2;
++	    const off_t mid = (low + high) / 2;
+ 	    if (valid_offset(fd, mid))
+ 		low = mid;
+ 	    else
+@@ -1299,7 +1299,7 @@ static void setup_tables(void)
+ 
+ #define seekto(pos,errstr)						\
+   do {									\
+-    loff_t __pos = (pos);						\
++    off_t __pos = (pos);						\
+     if (llseek (dev, __pos, SEEK_SET) != __pos)				\
+ 	error ("seek to " errstr " failed whilst writing tables");	\
+   } while(0)
+@@ -1679,7 +1679,7 @@ int main(int argc, char **argv)
+ 	    exit(1);		/* The error exit code is 1! */
+ 	}
+     } else {
+-	loff_t offset = blocks * BLOCK_SIZE - 1;
++	off_t offset = blocks * BLOCK_SIZE - 1;
+ 	char null = 0;
+ 	/* create the file */
+ 	dev = open(device_name, O_EXCL | O_RDWR | O_CREAT | O_TRUNC, 0666);

package/ebtables/Makefile

@@ -21,7 +21,7 @@ $(eval $(call PKG_template,EBTABLES,ebtables,${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 CONFIG_STYLE:=		manual
 
-post-install:
+ebtables-install:
 	${INSTALL_DIR} ${IDIR_EBTABLES}/etc
 	${INSTALL_DIR} ${IDIR_EBTABLES}/usr/sbin ${IDIR_EBTABLES}/usr/lib
 	${INSTALL_DATA} ${WRKINST}/etc/ethertypes ${IDIR_EBTABLES}/etc

package/ebtables/patches/patch-Makefile

@@ -1,6 +1,6 @@
---- ebtables-v2.0.10-3.orig/Makefile	2011-12-04 10:46:26.000000000 +0100
-+++ ebtables-v2.0.10-3/Makefile	2011-12-11 16:35:34.619464748 +0100
-@@ -10,16 +10,16 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed 
+--- ebtables-v2.0.10-4.orig/Makefile	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/Makefile	2014-03-23 15:46:20.000000000 +0100
+@@ -10,16 +10,16 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed
  
  # default paths
  LIBDIR:=/usr/lib

package/ebtables/patches/patch-extensions_ebt_among_c

@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/extensions/ebt_among.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/extensions/ebt_among.c	2014-03-23 15:51:29.000000000 +0100
+@@ -13,7 +13,6 @@
+ #include <ctype.h>
+ #include <unistd.h>
+ #include "../include/ebtables_u.h"
+-#include <netinet/ether.h>
+ #include "../include/ethernetdb.h"
+ #include <linux/if_ether.h>
+ #include <linux/netfilter_bridge/ebt_among.h>

package/ebtables/patches/patch-extensions_ebt_arpreply_c

@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/extensions/ebt_arpreply.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/extensions/ebt_arpreply.c	2014-03-23 15:50:38.000000000 +0100
+@@ -12,7 +12,6 @@
+ #include <string.h>
+ #include <getopt.h>
+ #include "../include/ebtables_u.h"
+-#include <netinet/ether.h>
+ #include <linux/netfilter_bridge/ebt_arpreply.h>
+ 
+ static int mac_supplied;

package/ebtables/patches/patch-extensions_ebt_ip6_c

@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/extensions/ebt_ip6.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/extensions/ebt_ip6.c	2014-03-23 15:51:09.000000000 +0100
+@@ -11,6 +11,7 @@
+  *
+  */
+ 
++#include <sys/types.h>
+ #include <errno.h>
+ #include <inttypes.h>
+ #include <limits.h>

package/ebtables/patches/patch-extensions_ebt_limit_c

@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/extensions/ebt_limit.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/extensions/ebt_limit.c	2014-03-23 15:52:04.000000000 +0100
+@@ -8,6 +8,7 @@
+  * September, 2003
+  */
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

package/ebtables/patches/patch-extensions_ebt_nat_c

@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/extensions/ebt_nat.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/extensions/ebt_nat.c	2014-03-23 15:50:13.000000000 +0100
+@@ -11,7 +11,6 @@
+ #include <string.h>
+ #include <getopt.h>
+ #include "../include/ebtables_u.h"
+-#include <netinet/ether.h>
+ #include <linux/netfilter_bridge/ebt_nat.h>
+ 
+ static int to_source_supplied, to_dest_supplied;

package/ebtables/patches/patch-include_ethernetdb_h

@@ -0,0 +1,29 @@
+--- ebtables-v2.0.10-4.orig/include/ethernetdb.h	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/include/ethernetdb.h	2014-03-23 15:47:35.000000000 +0100
+@@ -38,21 +38,20 @@ struct ethertypeent {
+ 
+ /* Open ethertype data base files and mark them as staying open even
+    after a later search if STAY_OPEN is non-zero.  */
+-extern void setethertypeent(int __stay_open) __THROW;
++extern void setethertypeent(int __stay_open);
+ 
+ /* Close ethertype data base files and clear `stay open' flag.  */
+-extern void endethertypeent(void) __THROW;
++extern void endethertypeent(void);
+ 
+ /* Get next entry from ethertype data base file.  Open data base if
+    necessary.  */
+-extern struct ethertypeent *getethertypeent(void) __THROW;
++extern struct ethertypeent *getethertypeent(void);
+ 
+ /* Return entry from ethertype data base for network with NAME.  */
+-extern struct ethertypeent *getethertypebyname(__const char *__name)
+-    __THROW;
++extern struct ethertypeent *getethertypebyname(__const char *__name);
+ 
+ /* Return entry from ethertype data base which number is PROTO.  */
+-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW;
++extern struct ethertypeent *getethertypebynumber(int __ethertype);
+ 
+ 
+ #endif				/* ethernetdb.h */

package/ebtables/patches/patch-useful_functions_c

@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/useful_functions.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/useful_functions.c	2014-03-23 15:49:15.000000000 +0100
+@@ -25,7 +25,6 @@
+ #include "include/ebtables_u.h"
+ #include "include/ethernetdb.h"
+ #include <stdio.h>
+-#include <netinet/ether.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <getopt.h>

package/ethtool/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ethtool
 PKG_VERSION:=		3.13
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		dcb8f345d44ee79108282e7d0bdf5013
 PKG_DESCR:=		display or change ethernet card settings
 PKG_SECTION:=		net

package/ethtool/patches/patch-internal_h

@@ -1,6 +1,14 @@
 --- ethtool-3.13.orig/internal.h	2014-01-27 02:27:14.000000000 +0100
-+++ ethtool-3.13/internal.h	2014-03-22 20:49:34.000000000 +0100
-@@ -17,16 +17,16 @@
++++ ethtool-3.13/internal.h	2014-03-23 13:47:54.000000000 +0100
+@@ -7,6 +7,7 @@
+ #include "ethtool-config.h"
+ #endif
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
+@@ -17,16 +18,16 @@
  
  /* ethtool.h expects these to be defined by <linux/types.h> */
  #ifndef HAVE_BE_TYPES

package/eudev/Makefile

@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		eudev
-PKG_VERSION:=		1.3
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		164df78f6f0093578a20bdd00335845f
-PKG_DESCR:=		udev device manager
+PKG_VERSION:=		1.5.3
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		51380938b489385cc394f4ebabc048f0
+PKG_DESCR:=		device manager (udev clone)
 PKG_SECTION:=		utils
 PKG_BUILDDEP:=		gperf-host glib
 PKG_DEPENDS:=		glib
@@ -16,20 +16,22 @@ PKG_SITES:=		http://dev.gentoo.org/~blueness/eudev/
 PKG_LIBNAME:=		libudev
 PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		UDEV LIBUDEV LIBGUDEV
-PKGSC_LIBGUDEV:=	libs
-PKGSD_LIBGUDEV:=	GUDEV library
+PKG_SUBPKGS:=		UDEV LIBUDEV
+PKGSD_UDEV:=		Dynamic device management manager
 PKGSC_LIBUDEV:=		libs
-PKGSD_LIBUDEV:=		UDEV library
-PKGSD_UDEV:=		Dynamic device management subsystem
+PKGSD_LIBUDEV:=		Dynamic device management library
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBGUDEV,libgudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-manpages \
+			--datadir=${STAGING_TARGET_PREFIX}/usr/lib \
 			--disable-gtk-doc
 
 udev-install:
@@ -43,8 +45,4 @@ libudev-install:
 	${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
 
-libgudev-install:
-	${INSTALL_DIR} ${IDIR_LIBGUDEV}/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libgudev*.so* $(IDIR_LIBGUDEV)/usr/lib
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/eudev/patches/patch-rule_generator_write_cd_rules

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/rule_generator/write_cd_rules	2014-03-22 23:45:54.000000000 +0100
++++ eudev-1.5.3/rule_generator/write_cd_rules	2014-03-24 18:26:38.000000000 +0100
+@@ -27,7 +27,7 @@ if [ -n "$UDEV_LOG" ]; then
+ 	fi
+ fi
+ 
+-RULES_FILE="${prefix}/etc/udev/rules.d/70-persistent-cd.rules"
++RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
+ 
+ . ${prefix}/lib/udev/rule_generator.functions
+ 

package/eudev/patches/patch-rule_generator_write_net_rules

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/rule_generator/write_net_rules	2014-03-22 23:45:54.000000000 +0100
++++ eudev-1.5.3/rule_generator/write_net_rules	2014-03-24 18:26:38.000000000 +0100
+@@ -38,7 +38,7 @@ if [ -n "$UDEV_LOG" ]; then
+ 	fi
+ fi
+ 
+-RULES_FILE='${prefix}/etc/udev/rules.d/70-persistent-net.rules'
++RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
+ 
+ . ${prefix}/lib/udev/rule_generator.functions
+ 

package/eudev/patches/patch-src_accelerometer_accelerometer_c

@@ -0,0 +1,13 @@
+--- eudev-1.5.3.orig/src/accelerometer/accelerometer.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/accelerometer/accelerometer.c	2014-03-24 20:41:59.000000000 +0100
+@@ -58,8 +58,8 @@
+ #include <linux/limits.h>
+ #include <linux/input.h>
+ 
+-#ifdef __UCLIBC__
+-#include <linux/fcntl.h>
++#if defined(__UCLIBC__)
++#define O_CLOEXEC      02000000        /* set close_on_exec */
+ #endif
+ 
+ #include "libudev.h"

package/eudev/patches/patch-src_accelerometer_accelerometer_c.orig

@@ -0,0 +1,13 @@
+--- eudev-1.5.3.orig/src/accelerometer/accelerometer.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/accelerometer/accelerometer.c	2014-03-24 20:39:35.000000000 +0100
+@@ -58,10 +58,6 @@
+ #include <linux/limits.h>
+ #include <linux/input.h>
+ 
+-#ifdef __UCLIBC__
+-#include <linux/fcntl.h>
+-#endif
+-
+ #include "libudev.h"
+ #include "libudev-private.h"
+ 

package/eudev/patches/patch-src_ata_id_ata_id_c

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/src/ata_id/ata_id.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/ata_id/ata_id.c	2014-03-24 20:44:36.000000000 +0100
+@@ -42,7 +42,7 @@
+ #include <arpa/inet.h>
+ 
+ #ifdef __UCLIBC__
+-#include <linux/fcntl.h>
++#define O_CLOEXEC     02000000 /* Set close_on_exec.  */
+ #endif
+ 
+ #include "libudev.h"

package/eudev/patches/patch-src_ata_id_ata_id_c.orig

@@ -0,0 +1,13 @@
+--- eudev-1.5.3.orig/src/ata_id/ata_id.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/ata_id/ata_id.c	2014-03-24 20:43:14.000000000 +0100
+@@ -41,10 +41,6 @@
+ #include <linux/bsg.h>
+ #include <arpa/inet.h>
+ 
+-#ifdef __UCLIBC__
+-#include <linux/fcntl.h>
+-#endif
+-
+ #include "libudev.h"
+ #include "libudev-private.h"
+ #include "log.h"

package/eudev/patches/patch-src_collect_collect_c

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/src/collect/collect.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/collect/collect.c	2014-03-24 20:45:48.000000000 +0100
+@@ -32,7 +32,7 @@
+ #include <sys/stat.h>
+ 
+ #ifdef __UCLIBC__
+-#include <linux/fcntl.h>
++#define O_CLOEXEC     02000000 /* Set close_on_exec.  */
+ #endif
+ 
+ #include "libudev.h"

package/eudev/patches/patch-src_mtd_probe_mtd_probe_c

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/src/mtd_probe/mtd_probe.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/mtd_probe/mtd_probe.c	2014-03-24 20:46:53.000000000 +0100
+@@ -27,7 +27,7 @@
+ #include <stdlib.h>
+ 
+ #ifdef __UCLIBC__
+-#include <linux/fcntl.h>
++# define O_CLOEXEC     02000000 /* Set close_on_exec.  */
+ #endif
+ 
+ int main(int argc, char** argv)

package/eudev/patches/patch-src_scsi_id_scsi_serial_c

@@ -0,0 +1,11 @@
+--- eudev-1.5.3.orig/src/scsi_id/scsi_serial.c	2014-03-22 22:56:51.000000000 +0100
++++ eudev-1.5.3/src/scsi_id/scsi_serial.c	2014-03-24 20:49:53.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include <linux/bsg.h>
+ 
+ #ifdef __UCLIBC__
+-#include <linux/fcntl.h>
++#define O_CLOEXEC      02000000        /* set close_on_exec */
+ #endif
+ 
+ #include "libudev.h"

package/exmap/Makefile

@@ -5,32 +5,23 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		exmap
 PKG_VERSION:=		0.4.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		55aec784e214037e61400287a55b5426
-PKG_DESCR:=		memory analysing client tool
+PKG_DESCR:=		memory analysing tools
 PKG_SECTION:=		debug
-PKG_DEPENDS:=		exmap-kmod libreadline glib
+PKG_DEPENDS:=		libreadline glib
 PKG_BUILDDEP:=		glib readline autotool
 PKG_SITES:=		http://labs.o-hand.com/sources/exmap-console/
 
 PKG_ARCH_DEPENDS:=	!m68k
 PKG_CFLINE_EXMAP:=	depends on !ADK_TOOLCHAIN_ONLY
 
-PKG_SUBPKGS:=		EXMAP EXMAPD EXMAPSERVER EXMAP_KMOD
-PKGSD_EXMAPD:=		memory analysing daemon
-PKGSD_EXMAPSERVER:=	memory analysing server
-PKGSD_EXMAP_KMOD:=	memory analysing kernel module
-PKGSC_EXMAP_KMOD:=	kernel
-
 DISTFILES:=		${PKG_NAME}-console-${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_EXMAPD},${PKG_SECTION}))
-$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_EXMAPSERVER},${PKG_SECTION}))
-$(eval $(call PKG_template,EXMAP_KMOD,exmap-kmod,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKGSD_EXMAP_KMOD},${PKGSC_EXMAP_KMOD}))
 
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--disable-doc
@@ -39,17 +30,13 @@ CONFIGURE_ENV+=		LIBS="-lncurses"
 pre-build:
 	$(MAKE) -C ${WRKBUILD}/kernel $(KERNEL_MODULE_FLAGS)
 
-post-install:
-	${INSTALL_DIR} ${IDIR_EXMAP_KMOD}/etc/modules.d/
-	echo "exmap" > ${IDIR_EXMAP_KMOD}/etc/modules.d/90-exmap
-	${INSTALL_DIR} ${IDIR_EXMAP_KMOD}/lib/modules/${KERNEL_VERSION}/
+exmap-install:
+	${INSTALL_DIR} ${IDIR_EXMAP}/etc/modules.d/
+	echo "exmap" > ${IDIR_EXMAP}/etc/modules.d/90-exmap
+	${INSTALL_DIR} ${IDIR_EXMAP}/lib/modules/${KERNEL_VERSION}/
 	${INSTALL_DATA} ${WRKBUILD}/kernel/exmap.ko \
-		${IDIR_EXMAP_KMOD}/lib/modules/${KERNEL_VERSION}
+		${IDIR_EXMAP}/lib/modules/${KERNEL_VERSION}
 	${INSTALL_DIR} ${IDIR_EXMAP}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/src/exmap ${IDIR_EXMAP}/usr/sbin
-	${INSTALL_DIR} ${IDIR_EXMAPD}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/src/exmapd ${IDIR_EXMAPD}/usr/sbin
-	${INSTALL_DIR} ${IDIR_EXMAPSERVER}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/src/exmapserver ${IDIR_EXMAPSERVER}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/src/exmap* ${IDIR_EXMAP}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/findutils/Makefile

@@ -5,29 +5,38 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		findutils
 PKG_VERSION:=		4.4.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		351cc4adb07d54877fa15f75fb77d39f
 PKG_DESCR:=		GNU utilities for finding files
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		libpthread
+PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.gnu.org/software/findutils/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/findutils/
 
-PKG_SUBPKGS:=		FINDUTILS LOCATE
-PKGSD_LOCATE:=		Locate utility
+PKG_SUBPKGS:=		FIND XARGS LOCATE
+PKGSD_LOCATE:=		locate utility
+PKGSD_XARGS:=		xargs utility
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FINDUTILS,findutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FIND,find,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XARGS,xargs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XARGS},${PKG_SECTION}))
 $(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		gl_cv_func_wcwidth_works=yes \
 			ac_cv_func_working_mktime=yes
 
-findutils-install:
-	$(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/{find,oldfind,xargs} \
-		 $(IDIR_FINDUTILS)/usr/bin
+find-install:
+	$(INSTALL_DIR) $(IDIR_FIND)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/find \
+		 $(IDIR_FIND)/usr/bin
+
+xargs-install:
+	$(INSTALL_DIR) $(IDIR_XARGS)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/xargs \
+		 $(IDIR_XARGS)/usr/bin
 
 locate-install:
 	${INSTALL_DIR} ${IDIR_LOCATE}/usr/{bin,libexec}

package/findutils/patches/patch-configure_ac

@@ -0,0 +1,11 @@
+--- findutils-4.4.2.orig/configure.ac	2009-05-16 17:27:39.000000000 +0200
++++ findutils-4.4.2/configure.ac	2014-03-23 19:39:22.000000000 +0100
+@@ -77,8 +77,6 @@ AC_PROG_CPP
+ dnl for gnulib
+ gl_EARLY
+ 
+-AM_C_PROTOTYPES
+-
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ dnl AC_PROG_LIBTOOL

package/findutils/patches/patch-gnulib_lib_freadahead_c

@@ -0,0 +1,15 @@
+--- findutils-4.4.2.orig/gnulib/lib/freadahead.c	2009-05-10 23:23:57.000000000 +0200
++++ findutils-4.4.2/gnulib/lib/freadahead.c	2014-03-23 16:27:43.000000000 +0100
+@@ -19,6 +19,7 @@
+ /* Specification.  */
+ #include "freadahead.h"
+ 
++#ifndef HAVE___FREADAHEAD
+ size_t
+ freadahead (FILE *fp)
+ {
+@@ -64,3 +65,4 @@ freadahead (FILE *fp)
+  #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread on your system, then report this to bug-gnulib."
+ #endif
+ }
++#endif

package/findutils/patches/patch-gnulib_lib_freadahead_h

@@ -0,0 +1,24 @@
+--- findutils-4.4.2.orig/gnulib/lib/freadahead.h	2009-05-10 23:23:57.000000000 +0200
++++ findutils-4.4.2/gnulib/lib/freadahead.h	2014-03-23 16:27:43.000000000 +0100
+@@ -29,8 +29,21 @@ extern "C" {
+ 
+    STREAM must not be wide-character oriented.  */
+ 
++#if HAVE___FREADAHEAD || (defined(__linux__) && !defined(__GLIBC__) && !defined(__UCLIBC__)) /* musl libc */
++
++#ifndef HAVE___FREADAHEAD
++#define HAVE___FREADAHEAD 1
++#endif
++
++# include <stdio_ext.h>
++# define freadahead(stream) __freadahead (stream)
++
++#else
++
+ extern size_t freadahead (FILE *stream);
+ 
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif

package/findutils/patches/patch-gnulib_lib_fseeko_c

@@ -0,0 +1,18 @@
+--- findutils-4.4.2.orig/gnulib/lib/fseeko.c	2009-05-10 23:25:10.000000000 +0200
++++ findutils-4.4.2/gnulib/lib/fseeko.c	2014-03-23 16:35:34.000000000 +0100
+@@ -94,8 +94,14 @@ rpl_fseeko (FILE *fp, off_t offset, int
+   if ((fp->_Mode & _MWRITE ? fp->_Next == fp->_Buf : fp->_Next == fp->_Rend)
+       && fp->_Rback == fp->_Back + sizeof (fp->_Back)
+       && fp->_Rsave == NULL)
++#elif FUNC_FFLUSH_STDIN < 0 && 200809 <= _POSIX_VERSION
++  /* Cross-compiling to some other system advertising conformance to
++     POSIX.1-2008 or later.  Assume fseeko and fflush work as advertised.
++     If this assumption is incorrect, please report the bug to
++     bug-gnulib.  */
++  if (0)
+ #else
+-  #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib."
++  #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
+ #endif
+     {
+       off_t pos = lseek (fileno (fp), offset, whence);

package/findutils/patches/patch-gnulib_m4_fflush_m4

@@ -0,0 +1,25 @@
+--- findutils-4.4.2.orig/gnulib/m4/fflush.m4	2009-05-10 23:23:57.000000000 +0200
++++ findutils-4.4.2/gnulib/m4/fflush.m4	2014-03-23 18:40:09.000000000 +0100
+@@ -32,12 +32,18 @@ AC_DEFUN([gl_FUNC_FFLUSH],
+ 	   return 4;
+ 	 return !(lseek (fd, 0, SEEK_CUR) == 5);
+        ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no],
+-     [dnl Pessimistically assume fflush is broken.  This is wrong for
+-      dnl at least glibc and cygwin; but lib/fflush.c takes this into account.
+-      gl_cv_func_fflush_stdin=no])
++	[gl_cv_func_fflush_stdin=cross])
+      rm conftest.txt
+     ])
+-  if test $gl_cv_func_fflush_stdin = no; then
++  case $gl_cv_func_fflush_stdin in
++    yes) gl_func_fflush_stdin=1 ;;
++    no)  gl_func_fflush_stdin=0 ;;
++    *)   gl_func_fflush_stdin='(-1)' ;;
++  esac
++  AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin],
++    [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008,
++     0 if fflush is known to not work, -1 if unknown.])
++  if test $gl_cv_func_fflush_stdin != yes; then
+     gl_REPLACE_FFLUSH
+   fi
+ ])

package/fping/Makefile

@@ -4,15 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		fping
-PKG_VERSION:=		2.4b2_to
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		d5e8be59e307cef76bc479e1684df705
-PKG_DESCR:=		A program to ping hosts in parallel
+PKG_VERSION:=		3.9
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		7ad0313646681c33e975f7b946d8d283	
+PKG_DESCR:=		program to ping hosts in parallel
 PKG_SECTION:=		net
-PKG_URL:=		http://fping.sourceforge.net/
-PKG_SITES:=		http://fping.sourceforge.net/download/
-
-DISTFILES:=		${PKG_NAME}.tar.gz
+PKG_URL:=		http://fping.org
+PKG_SITES:=		http://fping.org/dist/
 
 include ${TOPDIR}/mk/package.mk
 

package/gdb/Makefile

@@ -20,27 +20,28 @@ TARGET_CFLAGS+=         -static
 CONFIGURE_ARGS+=	--enable-static
 endif
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CFLAGS+=		${TARGET_CPPFLAGS} -fPIC
-CONFIGURE_ARGS+=	--without-uiout --enable-gdbmi \
-			--disable-tui --disable-gdbtk --without-x \
-			--without-included-gettext --disable-sim \
-			--with-curses --disable-werror \
-			--without-auto-load-safe-path \
+CONFIGURE_ARGS+=	--without-uiout \
+			--disable-tui \
+			--disable-gdbtk \
+			--without-x \
+			--disable-sim \
+			--disable-werror \
 			--disable-gdbserver \
-			--without-python
+			--without-python \
+			--without-included-gettext \
+			--without-auto-load-safe-path \
+			--with-curses \
+			--enable-gdbmi
+
 XAKE_FLAGS+=		LDFLAGS='${TARGET_LDFLAGS}'
 # disable honour cflags stuff
 XAKE_FLAGS+=		GCC_HONOUR_COPTS:=s
 
-post-extract:
-	-mv $(STAGING_TARGET_DIR)/usr/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a.bak
-
 gdb-install:
 	${INSTALL_DIR} ${IDIR_GDB}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/
 	# shipped libbfd conflicts with system wide one
 	rm -f ${WRKINST}/usr/lib/libbfd*
-	-mv $(STAGING_TARGET_DIR)/usr/lib/libiberty.a.bak $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/gkrellm/Makefile

@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gkrellm
-PKG_VERSION:=		2.3.4
+PKG_VERSION:=		2.3.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		600f4daa395112ed19a3633deb0829ff
-PKG_DESCR:=		The GNU Krell Monitors Server
+PKG_MD5SUM:=		05d00fa8d6376038b0c7e967583c0b8d
+PKG_DESCR:=		GNU krell monitors server
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		glib libpthread
 PKG_BUILDDEP:=		glib

package/gkrellm/patches/patch-server_Makefile

@@ -1,30 +0,0 @@
---- gkrellm-2.3.4.orig/server/Makefile	2008-10-03 23:52:48.000000000 +0200
-+++ gkrellm-2.3.4/server/Makefile	2011-05-17 11:34:14.926610183 +0200
-@@ -26,7 +26,7 @@ SMANDIR ?= $(INSTALLROOT)/share/man/man1
- MANMODE ?= 644
- MANDIRMODE ?= 755
- INSTALL ?= install
--LINK_FLAGS ?= -Wl,-E
-+LINK_FLAGS ?= -Wl,-E $(LDFLAGS)
- EXTRAOBJS =
- 
- SHARED_PATH = ../shared
-@@ -109,15 +109,15 @@ endif
- 
- override CC += -Wall $(FLAGS)
- 
--OS_NAME=$(shell uname -s)
--OS_RELEASE=$(shell uname -r)
-+OS_NAME=Linux
-+OS_RELEASE=2.6
- 
- OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o log.o
- 
- all:	gkrellmd
- 
- gkrellmd: $(OBJS) $(EXTRAOBJS)
--	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS)
-+	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LINK_FLAGS) $(LIBS)
- 
- static: $(OBJS) $(EXTRAOBJS)
- 	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \

package/gkrellm/patches/patch-server_main_c

@@ -0,0 +1,24 @@
+--- gkrellm-2.3.5.orig/server/main.c	2010-10-02 18:13:29.000000000 +0200
++++ gkrellm-2.3.5/server/main.c	2014-03-23 16:06:59.000000000 +0100
+@@ -39,21 +39,6 @@
+ 	#include <syslog.h>
+ #endif // !WIN32
+ 
+-// win32 defines addrinfo but only supports getaddrinfo call on winxp or newer
+-#if !defined(HAVE_GETADDRINFO) && !defined(WIN32)
+-struct addrinfo
+-	{
+-	int		ai_flags;		/* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
+-	int		ai_family;		/* PF_xxx */
+-	int		ai_socktype;	/* SOCK_xxx */
+-	int		ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+-	size_t	ai_addrlen;		/* length of ai_addr */
+-	char	*ai_canonname;	/* canonical name for hostname */
+-	struct	sockaddr *ai_addr;	/* binary address */
+-	struct	addrinfo *ai_next;	/* next structure in linked list */
+-	};
+-#endif // !HAVE_GETADDRINFO
+-
+ #if !defined(IPV6_V6ONLY) && defined(IPV6_BINDV6ONLY)
+ #define	IPV6_V6ONLY	IPV6_BINDV6ONLY
+ #endif

package/gkrellm/patches/patch-server_sysdeps-unix_c

@@ -0,0 +1,10 @@
+--- gkrellm-2.3.5.orig/server/sysdeps-unix.c	2010-09-14 18:34:34.000000000 +0200
++++ gkrellm-2.3.5/server/sysdeps-unix.c	2014-03-23 16:13:57.000000000 +0100
+@@ -145,6 +145,7 @@ gkrellm_sensors_linux_name_fix(gchar *id
+ #endif
+ 	}
+ 
++#define HAVE_GETADDRINFO 1
+ #ifdef SENSORS_COMMON
+ gint
+ gkrellm_connect_to(gchar *server, gint server_port)

package/glib/Makefile

@@ -11,7 +11,7 @@ PKG_MD5SUM:=		26d1d08e478fc48c181ca8be44f5b69f
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libpthread
-PKG_BUILDDEP:=		glib-host zlib libelf dbus
+PKG_BUILDDEP:=		glib-host libffi gettext-tiny libiconv-tiny zlib libelf dbus
 HOST_BUILDDEP:=		libffi-host gettext-tiny-host libiconv-tiny-host
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/

package/hdparm/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		hdparm
 PKG_VERSION:=		9.43
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		f73233be118d86c779a8463d8b6a3cdb
-PKG_DESCR:=		get/set ATA drive parameters
+PKG_DESCR:=		get/set ATA/SATA drive parameters
 PKG_SECTION:=		fs
 PKG_URL:=		http://sourceforge.net/projects/hdparm
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=hdparm/}

package/igmpproxy/patches/patch-src_igmpproxy_h

@@ -0,0 +1,10 @@
+--- igmpproxy-0.1.orig/src/igmpproxy.h	2009-10-05 20:19:26.000000000 +0200
++++ igmpproxy-0.1/src/igmpproxy.h	2014-03-26 18:05:47.000000000 +0100
+@@ -48,6 +48,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
+ 

package/ipcad/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ipcad
 PKG_VERSION:=		3.7.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		125605249958894148ec26d3c88189f5
 PKG_DESCR:=		IP Cisco Accounting Daemon
 PKG_SECTION:=		net

package/ipcad/patches/patch-Makefile

@@ -0,0 +1,169 @@
+--- ipcad-3.7.3.orig/Makefile	2007-04-22 10:08:45.000000000 +0200
++++ ipcad-3.7.3/Makefile	2014-03-23 17:59:56.000000000 +0100
+@@ -1,4 +1,163 @@
+-all: bootstrap
+ 
+-bootstrap:
+-	./configure && make
++prefix= /usr
++exec_prefix= ${prefix}
++bindir= /usr/bin
++sysconfdir= /etc
++datadir= /usr/share
++
++CC= /home/wbx/hudson/toolchain_x86_64-linux-gnu/usr/bin/arm-openadk-linux-muslgnueabihf-gcc
++LDFLAGS= -L/home/wbx/hudson/target_arm_musl_eabihf/lib -L/home/wbx/hudson/target_arm_musl_eabihf/usr/lib -Wl,-O1 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/hudson/target_arm_musl_eabihf/usr/lib -Wl,-z,relro,-z,now
++LIBS= -lpcap 
++CFLAGS= -march=armv6 -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -fno-unwind-tables -fno-asynchronous-unwind-tables -g3 -DHAVE_CONFIG_H -W -Wall
++CPPFLAGS=-DIPCAD_VERSION=\"3.7.3\"
++CPPFLAGS+=-DCONFIG_FILE=\"${sysconfdir}/ipcad.conf\"
++CPPFLAGS+=-DHAVE_CONFIG_H -D_REENTRANT -D_THREAD_SAFE
++CPPFLAGS+=-DPSRC_pcap -DIFST_linux
++
++YACC=bison -y
++LEX=flex
++INSTALL=/usr/bin/install -c
++
++MANROOT=/usr/share/man/man
++MAN8=${MANROOT}8
++MAN5=${MANROOT}5
++
++NROFF= groff -Tascii -mandoc
++
++PACKAGE=ipcad
++TARGETS=ipcad
++VERSION=3.7.3
++
++IPCAD_OBJS= main.o process.o pps.o disp.o storage.o usage.o cfgy.o cfglex.o cfgread.o cfgvar.o dump.o import.o nflow.o cshelly.o cslex.o csparse.o service.o rw.o servers.o opt.o pidfile.o sf_lite.o
++IPCAD_OBJS+= ifst_linux.o		# Interface statistics
++IPCAD_OBJS+= ifs_list.o			# Interface statistics
++IPCAD_OBJS+= loop-pcap.o		# Method of capturing
++IPCAD_OBJS+= loop-file.o		# Method of capturing
++IPCAD_OBJS+= loop-divert.o		# Method of capturing
++IPCAD_OBJS+= loop-dynamic.o		# Method of capturing
++IPCAD_OBJS+= loop-ulog.o loop-ipq.o	# Methods of capturing
++IPCAD_OBJS+= psrc.o psrc-pcap.o	# Initialize capturers
++IPCAD_OBJS+= psrc-ipq.o psrc-ulog.o	# Initialize capturers
++IPCAD_OBJS+= psrc-file.o		# Initialize capturers
++IPCAD_OBJS+= psrc-dynamic.o		# Initialize capturers
++IPCAD_OBJS+= psrc-divert.o		# Initialize capturers
++IPCAD_OBJS+= wrap_oclose.o		# Special file descriptors cache
++IPCAD_OBJS+= genhash.o			# General hashing
++
++all: ${TARGETS} man
++
++ipcad: ${IPCAD_OBJS}
++	${CC} ${CFLAGS} -o $@ ${IPCAD_OBJS} ${LDFLAGS} ${LIBS}
++
++.SUFFIXES:
++.SUFFIXES: .o .c .0 .8 .5
++
++.c.o:
++	${CC} ${CPPFLAGS} ${CFLAGS} -o $@ -c $<
++
++.8.0:
++	${NROFF} $< > $@
++
++.5.0:
++	${NROFF} $< > $@
++
++cfgy.h cfgy.c: cfg.y
++	${YACC} -p ipcacfg -d cfg.y
++	@mv y.tab.c cfgy.c
++	@mv y.tab.h cfgy.h
++
++cshelly.h cshelly.c: cshell.y
++	${YACC} -p CS -d cshell.y
++	@mv y.tab.c cshelly.c
++	@mv y.tab.h cshelly.h
++
++cslex.c: cslex.l
++	${LEX} -s -p -Cem -ocslex.c -PCS cslex.l
++
++cfglex.c: cfglex.l
++	${LEX} -s -p -Cem -ocfglex.c -Pipcacfg cfglex.l
++
++
++man: ipcad.8 ipcad.conf.5
++
++distdir = $(PACKAGE)-$(VERSION)
++distdir:
++	rm -rf $(distdir)
++	mkdir $(distdir)
++	cp *.c *.h $(distdir)
++	cp ipcad.8 ipcad.conf.5 $(distdir)
++	cp *.y *.l $(distdir)
++	cp *.in configure install-sh $(distdir)
++	cp ipcad.conf.default $(distdir)
++	cp ipcad.conf.simple $(distdir)
++	cp ipcad.spec.in $(distdir)
++	cp Makefile.in Makefile $(distdir)
++	cp ChangeLog INSTALL README TODO BUGS AUTHORS COPYING FAQ $(distdir)
++	cd $(distdir) && make distclean
++
++dist: distdir
++	tar chof - $(distdir) | GZIP="--best" gzip -c > $(distdir).tar.gz
++	rm -rf $(distdir)
++
++clean:
++	rm -f *.o ${TARGETS} *.core 1
++	rm -f *.0
++
++distclean: clean
++	rm -f config.h
++	rm -f config.cache config.log config.status
++	rm -f Makefile
++	rm -f $(distdir).tar.gz
++	rm -f ipcad.spec
++	(echo "all: bootstrap"; echo; echo "bootstrap:"; \
++		echo "	./configure && make") > Makefile
++
++maintainer-clean: distclean
++	@echo "This command is intended for maintainers to use; it"
++	@echo "deletes files that may need special tools to rebuild."
++	rm -f Makefile
++	rm -f *.tab.* cfgy.? *lex.c
++	rm -f config.h.in configure
++
++install: all install-bin install-conf
++
++install-bin:
++	@${INSTALL} -d $(DESTDIR)${bindir}
++	${INSTALL} ipcad $(DESTDIR)${bindir}
++
++install-man: man
++	${INSTALL} -m 444 ipcad.8 $(DESTDIR)${MAN8}/ipcad.8
++	${INSTALL} -m 444 ipcad.conf.5 $(DESTDIR)${MAN5}/ipcad.conf.5
++
++install-conf:
++	@${INSTALL} -d $(DESTDIR)${sysconfdir}
++	${INSTALL} -m 644 ipcad.conf.simple $(DESTDIR)${sysconfdir}/ipcad.conf.simple
++	-@diff ${sysconfdir}/ipcad.conf					\
++	      ${sysconfdir}/ipcad.conf.default >/dev/null 2>&1;		\
++	if [ "$$?" -eq 0 ] || [ ! -f ${sysconfdir}/ipcad.conf ]; then	\
++	echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
++	${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
++	echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf;	\
++	${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf;	\
++	echo "**********************************************";		\
++	echo "* Please customize ${sysconfdir}/ipcad.conf *";		\
++	echo "**********************************************";		\
++	else								\
++	echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
++	${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
++	echo "*********************************************";		\
++	echo "* Updated ${sysconfdir}/ipcad.conf.default *";		\
++	echo "*********************************************";		\
++	fi
++	@echo ""
++	@echo "Now you might want to 'make install-man'"
++	@echo ""
++
++
++uninstall:
++	rm -f ${bindir}/ipcad
++	rm -f ${sysconfdir}/ipcad.conf.default
++	rm -f ${sysconfdir}/ipcad.conf.simple
++	rm -f ${MAN8}/ipcad.8
++	rm -f ${MAN5}/ipcad.conf.5
++

package/ipcad/patches/patch-Makefile_in

@@ -1,5 +1,5 @@
 --- ipcad-3.7.3.orig/Makefile.in	2007-04-22 10:08:45.000000000 +0200
-+++ ipcad-3.7.3/Makefile.in	2011-01-11 17:16:15.000000000 +0100
++++ ipcad-3.7.3/Makefile.in	2014-03-23 17:58:49.000000000 +0100
 @@ -6,10 +6,10 @@ sysconfdir= @sysconfdir@
  datadir= @datadir@
  
@@ -15,3 +15,12 @@
  CPPFLAGS+=-DCONFIG_FILE=\"${sysconfdir}/ipcad.conf\"
  CPPFLAGS+=@DEFS@ -D_REENTRANT -D_THREAD_SAFE
  CPPFLAGS+=-DPSRC_@PSRC@ -DIFST_@IFST@
+@@ -28,7 +28,7 @@ PACKAGE=ipcad
+ TARGETS=ipcad
+ VERSION=@IPCAD_VERSION@
+ 
+-IPCAD_OBJS= main.o process.o pps.o disp.o storage.o usage.o cfgy.o cfglex.o cfgread.o cfgvar.o rsh.o rshp.o dump.o import.o nflow.o cshelly.o cslex.o csparse.o service.o rw.o servers.o opt.o pidfile.o sf_lite.o
++IPCAD_OBJS= main.o process.o pps.o disp.o storage.o usage.o cfgy.o cfglex.o cfgread.o cfgvar.o dump.o import.o nflow.o cshelly.o cslex.o csparse.o service.o rw.o servers.o opt.o pidfile.o sf_lite.o
+ IPCAD_OBJS+= ifst_@IFST@.o		# Interface statistics
+ IPCAD_OBJS+= ifs_list.o			# Interface statistics
+ IPCAD_OBJS+= loop-@PSRC@.o		# Method of capturing

package/ipcad/patches/patch-cfg_y

@@ -0,0 +1,60 @@
+--- ipcad-3.7.3.orig/cfg.y	2007-04-22 10:08:45.000000000 +0200
++++ ipcad-3.7.3/cfg.y	2014-03-23 18:03:07.000000000 +0100
+@@ -3,7 +3,6 @@
+ #include "headers.h"
+ #include "cfgvar.h"
+ #include "servers.h"
+-#include "rsh.h"
+ #include "opt.h"
+ #include "storage.h"
+ 
+@@ -214,49 +213,6 @@ block:
+ 	| CAPTURE_PORTS DENY {
+ 		conf->capture_ports = 0;
+ 	}
+-	| RSH ALLOW at_ip {
+-		if(add_server(rsh_server, "RSH Server", &($3), 514))
+-			return yyerror("Failed to install RSH server");
+-		fprintf(stderr, "Configured RSH Server listening at %s\n",
+-			inet_ntoa($3));
+-	}
+-	| RSH DENY at_ip {
+-		fprintf(stderr, "Warning: Option at line %d has no effect\n",
+-			ipcacfglineno);
+-	}
+-	| RSH TIMEOUT EQ TOK_STRING {
+-		int to_ms;
+-		to_ms = atoi($4);
+-		free($4);
+-		if(to_ms < 0)
+-			to_ms = -1;	/* INFTIM */
+-		else
+-			to_ms = to_ms * 1000;
+-		rsh_rw_timeout = to_ms;
+-	}
+-	| RSH TOK_STRING privlevel {
+-		cfg_add_rsh_host("", $2, $3);
+-		free($2);
+-	}
+-	| RSH AT TOK_STRING privlevel {
+-		cfg_add_rsh_host("", $3, $4);
+-		free($3);
+-	}
+-	| RSH TOK_STRING AT TOK_STRING privlevel {
+-		cfg_add_rsh_host($2, $4, $5);
+-		free($2); free($4);
+-	}
+-	| RSH TTL EQ TOK_STRING {
+-		conf->rsh_ttl = atoi($4);
+-		free($4);
+-	}
+-	| TTL EQ TOK_STRING {
+-		fprintf(stderr, "WARNING: \"ttl = %s;\" at line %d: "
+-			"Obsolete syntax. Please use \"rsh ttl = %s;\"\n",
+-			$3, ipcacfglineno, $3);
+-		conf->rsh_ttl = atoi($3);
+-		free($3);
+-	}
+ 	| NetFlow
+ 	| CHROOT EQ TOK_STRING {
+ 		if(conf->chroot_to)

package/iptables-snmp/Makefile

@@ -13,6 +13,8 @@ PKG_BUILDDEP:=		net-snmp
 PKG_URL:=		http://www.nobiscuit.com/iptables-snmp/
 PKG_SITES:=		http://www.nobiscuit.com/iptables-snmp/
 
+PKG_LIBC_DEPENDS:=	uclibc glibc
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,IPTABLES_SNMP,iptables-snmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/kbd/Makefile

@@ -4,17 +4,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		kbd
-PKG_VERSION:=		1.15.3
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		8143e179a0f3c25646ce5085e8777200
+PKG_VERSION:=		2.0.1
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		e9f2b7046312c11cec9e52e22f307b6a
 PKG_DESCR:=		keyboard utility
 PKG_SECTION:=		utils
-PKG_SITES:=		ftp://ftp.altlinux.org/pub/people/legion/kbd/
+PKG_DEPENDS:=		libcheck
+PKG_BUILDDEP:=		flex-host bison-host check
+PKG_URL:=		http://kbd-project.org/
+PKG_SITES:=		http://kbd-project.org/download/
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,KBD,kbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ARGS+=	--disable-vlock
+
 kbd-install:
 	$(INSTALL_DIR) $(IDIR_KBD)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/loadkeys \

package/kbd/patches/patch-src_dumpkeys_c

@@ -0,0 +1,11 @@
+--- kbd-2.0.1.orig/src/dumpkeys.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/dumpkeys.c	2014-03-24 22:38:21.000000000 +0100
+@@ -3,6 +3,8 @@
+  *
+  * derived from version 0.81 - aeb@cwi.nl
+  */
++
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <ctype.h>

package/kbd/patches/patch-src_kbdinfo_c

@@ -0,0 +1,46 @@
+--- kbd-2.0.1.orig/src/kbdinfo.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/kbdinfo.c	2014-03-24 13:24:51.000000000 +0100
+@@ -1,6 +1,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+-#include <error.h>
++#include <err.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <linux/kd.h>
+@@ -75,7 +75,7 @@ main(int argc, char **argv) {
+ 
+ 	if (!strcasecmp("GETMODE", action)) {
+ 		if (ioctl(fd, KDGETMODE, &mode) == -1)
+-			error(EXIT_FAILURE, errno, "ioctl");
++			err(EXIT_FAILURE, "ioctl");
+ 
+ 		switch (mode) {
+ 			case KD_TEXT:		rc = answer("text");		break;
+@@ -84,7 +84,7 @@ main(int argc, char **argv) {
+ 
+ 	} else if (!strcasecmp("GKBMODE", action)) {
+ 		if (ioctl(fd, KDGKBMODE, &mode) == -1)
+-			error(EXIT_FAILURE, errno, "ioctl");
++			err(EXIT_FAILURE, "ioctl");
+ 
+ 		switch (mode) {
+ 			case K_RAW:		rc = answer("raw");		break;
+@@ -95,7 +95,7 @@ main(int argc, char **argv) {
+ 
+ 	} else if (!strcasecmp("GKBMETA", action)) {
+ 		if (ioctl(fd, KDGKBMETA, &mode) == -1)
+-			error(EXIT_FAILURE, errno, "ioctl");
++			err(EXIT_FAILURE, "ioctl");
+ 
+ 		switch (mode) {
+ 			case K_METABIT:		rc = answer("metabit");		break;
+@@ -104,7 +104,7 @@ main(int argc, char **argv) {
+ 
+ 	} else if (!strcasecmp("GKBLED", action)) {
+ 		if (ioctl(fd, KDGKBLED, &flags) == -1)
+-			error(EXIT_FAILURE, errno, "ioctl");
++			err(EXIT_FAILURE, "ioctl");
+ 
+ 		mode = (flags & 0x7);
+ 

package/kbd/patches/patch-src_kbdrate_c

@@ -0,0 +1,10 @@
+--- kbd-2.0.1.orig/src/kbdrate.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/kbdrate.c	2014-03-24 12:40:34.000000000 +0100
+@@ -68,6 +68,7 @@ beats rebuilding the kernel!
+ 
+ */
+ 
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>

package/kbd/patches/patch-src_libkeymap_analyze_l

@@ -0,0 +1,11 @@
+--- kbd-2.0.1.orig/src/libkeymap/analyze.l	2013-10-04 15:28:49.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/analyze.l	2014-03-24 22:34:35.000000000 +0100
+@@ -12,6 +12,8 @@
+ %}
+ 
+ %top {
++#include <stdarg.h>
++#include <stdio.h>
+ #include "keymap.h"
+ int stack_push(struct lk_ctx *ctx, lkfile_t *fp, void *scanner);
+ int stack_pop(struct lk_ctx *ctx, void *scanner);

package/kbd/patches/patch-src_libkeymap_common_c

@@ -0,0 +1,8 @@
+--- kbd-2.0.1.orig/src/libkeymap/common.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/common.c	2014-03-24 21:30:58.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <string.h>
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ 

package/kbd/patches/patch-src_libkeymap_dump_c

@@ -0,0 +1,12 @@
+--- kbd-2.0.1.orig/src/libkeymap/dump.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/dump.c	2014-03-24 21:46:08.000000000 +0100
+@@ -9,6 +9,9 @@
+  * This file is covered by the GNU General Public License,
+  * which should be included with kbd as the file COPYING.
+  */
++
++#include <sys/types.h>
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>

package/kbd/patches/patch-src_libkeymap_kernel_c

@@ -0,0 +1,13 @@
+--- kbd-2.0.1.orig/src/libkeymap/kernel.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/kernel.c	2014-03-24 21:45:01.000000000 +0100
+@@ -6,7 +6,10 @@
+  * This file is covered by the GNU General Public License,
+  * which should be included with kbd as the file COPYING.
+  */
++
++#include <stdarg.h>
+ #include <string.h>
++#include <stdio.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ 

package/kbd/patches/patch-src_libkeymap_kmap_c

@@ -0,0 +1,10 @@
+--- kbd-2.0.1.orig/src/libkeymap/kmap.c	2013-10-07 16:13:31.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/kmap.c	2014-03-24 21:46:56.000000000 +0100
+@@ -1,4 +1,7 @@
++#include <sys/types.h>
++#include <stdarg.h>
+ #include <stdlib.h>
++#include <stdio.h>
+ #include <string.h>
+ 
+ #include "nls.h"

package/kbd/patches/patch-src_libkeymap_ksyms_c

@@ -0,0 +1,8 @@
+--- kbd-2.0.1.orig/src/libkeymap/ksyms.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/ksyms.c	2014-03-24 22:37:11.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <linux/keyboard.h>
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>

package/kbd/patches/patch-src_libkeymap_loadkeys_c

@@ -0,0 +1,8 @@
+--- kbd-2.0.1.orig/src/libkeymap/loadkeys.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/loadkeys.c	2014-03-24 21:48:35.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <errno.h>
++#include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/ioctl.h>

package/kbd/patches/patch-src_libkeymap_parser_y

@@ -0,0 +1,11 @@
+--- kbd-2.0.1.orig/src/libkeymap/parser.y	2013-10-07 16:13:39.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/parser.y	2014-03-24 21:49:52.000000000 +0100
+@@ -12,6 +12,8 @@
+ %{
+ #define YY_HEADER_EXPORT_START_CONDITIONS 1
+ 
++#include <stdarg.h>
++
+ #include "nls.h"
+ #include "kbd.h"
+ 

package/kbd/patches/patch-src_libkeymap_summary_c

@@ -0,0 +1,13 @@
+--- kbd-2.0.1.orig/src/libkeymap/summary.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/summary.c	2014-03-24 21:47:48.000000000 +0100
+@@ -6,6 +6,10 @@
+  * This file is covered by the GNU General Public License,
+  * which should be included with kbd as the file COPYING.
+  */
++
++#include <sys/types.h>
++#include <stdarg.h>
++#include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>

package/kbd/patches/patch-src_loadkeys_c

@@ -0,0 +1,10 @@
+--- kbd-2.0.1.orig/src/loadkeys.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/loadkeys.c	2014-03-24 22:39:26.000000000 +0100
+@@ -10,6 +10,7 @@
+  * which should be included with kbd as the file COPYING.
+  */
+ 
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

package/kbd/patches/patch-src_openvt_c

@@ -0,0 +1,8 @@
+--- kbd-2.0.1.orig/src/openvt.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/openvt.c	2014-03-24 12:48:07.000000000 +0100
+@@ -1,3 +1,5 @@
++#include <fcntl.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <unistd.h>

package/kbd/patches/patch-src_setvtrgb_c

@@ -0,0 +1,70 @@
+--- kbd-2.0.1.orig/src/setvtrgb.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/setvtrgb.c	2014-03-24 13:10:47.000000000 +0100
+@@ -5,7 +5,7 @@
+ #include <sys/ioctl.h>
+ #include <linux/kd.h>
+ #include <errno.h>
+-#include <error.h>
++#include <err.h>
+ #include "kbd.h"
+ #include "getfd.h"
+ #include "nls.h"
+@@ -60,7 +60,7 @@ set_colormap(unsigned char *colormap)
+ 
+ 	/* Apply the color map to the tty via ioctl */
+ 	if (ioctl(fd, PIO_CMAP, colormap) == -1)
+-		error(EXIT_FAILURE, errno, "ioctl");
++		err(EXIT_FAILURE, "ioctl");
+ 
+ 	close(fd);
+ }
+@@ -72,7 +72,7 @@ parse_file(FILE *fd, const char *filenam
+ 	unsigned int rows, cols, val;
+ 
+ 	if ((cmap = calloc(3 * 16, sizeof(unsigned char))) == NULL)
+-		error(EXIT_FAILURE, errno, "calloc");
++		err(EXIT_FAILURE, "calloc");
+ 
+ 	for (rows = 0; rows < 3; rows++) {
+ 		cols = 0;
+@@ -80,26 +80,26 @@ parse_file(FILE *fd, const char *filenam
+ 		while (cols < 16) {
+ 			if ((c = fscanf(fd, "%u", &val)) != 1) {
+ 				if (c == EOF)
+-					error(EXIT_FAILURE, errno, "fscanf");
++					err(EXIT_FAILURE, "fscanf");
+ 
+-				error(EXIT_FAILURE, 0, _("Error: %s: Invalid value in field %u in line %u."),
++				err(EXIT_FAILURE, _("Error: %s: Invalid value in field %u in line %u."),
+ 				      filename, rows + 1, cols + 1);
+ 			}
+ 
+ 			cmap[rows + cols * 3] = (unsigned char) val;
+ 
+ 			if (cols < 15 && fgetc(fd) != ',')
+-				error(EXIT_FAILURE, 0, _("Error: %s: Insufficient number of fields in line %u."),
++				err(EXIT_FAILURE, _("Error: %s: Insufficient number of fields in line %u."),
+ 				      filename, rows + 1);
+ 			cols++;
+ 		}
+ 
+ 		if ((c = fgetc(fd)) == EOF)
+-			error(EXIT_FAILURE, 0, _("Error: %s: Line %u has ended unexpectedly.\n"),
++			err(EXIT_FAILURE, _("Error: %s: Line %u has ended unexpectedly.\n"),
+ 			      filename, rows + 1); 
+ 
+ 		if (c != '\n')
+-			error(EXIT_FAILURE, 0, _("Error: %s: Line %u is too long.\n"),
++			err(EXIT_FAILURE, _("Error: %s: Line %u is too long.\n"),
+ 			      filename, rows + 1);
+ 	}
+ }
+@@ -141,7 +141,7 @@ main(int argc, char **argv) {
+ 
+ 	} else {
+ 		if ((fd = fopen(file, "r")) == NULL)
+-			error(EXIT_FAILURE, errno, "fopen");
++			err(EXIT_FAILURE, "fopen");
+ 
+ 		parse_file(fd, file);
+ 		fclose(fd);

package/kbd/patches/patch-tests_libkeymap-bkeymap_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-bkeymap.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-bkeymap.c	2014-03-24 22:43:01.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

package/kbd/patches/patch-tests_libkeymap-charset_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-charset.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-charset.c	2014-03-24 22:51:27.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <check.h>

package/kbd/patches/patch-tests_libkeymap-dumpkeys_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-dumpkeys.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-dumpkeys.c	2014-03-24 22:40:50.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>

package/kbd/patches/patch-tests_libkeymap-init_c

@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/tests/libkeymap-init.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/tests/libkeymap-init.c	2014-03-24 22:45:25.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <check.h>