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

BUGS

@@ -1,5 +1,2 @@
-- qemu-sparc: startup kernel with gcc 4.8.2 broken
-- qemu-sh4: usb keyboard is broken
-- qemu-arm: thumb mode with glibc does not boot
 - qemu-sparc64: ide driver not working, only virtio (but unstable)
 - qemu-microblaze: ml605 early printk and network card emulation fails, little endian works

Config.in

@@ -106,6 +106,7 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 
 choice
 prompt "Kernel Version"
+default ADK_KERNEL_VERSION_3_13_11
 
 config ADK_KERNEL_VERSION_3_14_1
 	prompt "3.14.1"

TODO

@@ -1,24 +1,39 @@
+global:
+- projects dir idea
+
+toolchain stuff:
 - hash-style=gnu for non-mips and non-musl
-- fix libiberty.a mess
 - check gold for mozilla compile
-- add stunnel
-- check for gcc and SSP again
+- check for gcc and SSP
 - config.site/config.cache usage for speedup?
   http://lists.gnu.org/archive/html/autoconf/2014-03/msg00031.html
-- add daemon() function to functions.sh
-- add printing of OK/FAIL (optional verbose bootup)
 - fixup rework libgcc --export-symbols
 - libgcc static?
 - static toolchain support
-- try Preset Loops per Jiffy for faster bootup via lpj=
-- port uuterm
+
+base system:
+- automount ntfs/ntfs-3g
+- add daemon() function to functions.sh
 - add fb full screen logo
-- port opkg with gpg signing
+- add printing of OK/FAIL (optional verbose bootup)
+- try Preset Loops per Jiffy for faster bootup via lpj=
 - restart network (kill wpa_supplicant)
 - essid with spaces
+
+new or update packages:
+- xbmc gotham
+- add rsyslog
+- add btrfs-utils
+- add stunnel
+- port uuterm
+- port opkg with gpg signing
 - add grsec kernel patch
-- microblaze: add cfgfs partition to dts, add partition to spartan dts
-- evaluate libguestfs for image creation
 - port msmtp
 - rutorrent porting
 - lms perl 
+
+system target specific:
+- fix ibm x40 bootup
+- reenable rb532
+- qemu superh more ram
+- microblaze: add cfgfs partition to dts, add partition to spartan dts

adk/tools/pkgmaker.c

@@ -758,7 +758,7 @@ int main() {
 				fprintf(cfg, "\ttristate\n");
 				if (pkg_multi != NULL)
 					if (strncmp(pkg_multi, "1", 1) == 0)
-						if (strncmp(toupperstr(token), toupperstr(pkgdirp->d_name), strlen(token)) != 0)
+						if (strncmp(toupperstr(token), toupperstr(pkgdirp->d_name), strlen(pkgdirp->d_name)) != 0)
 							fprintf(cfg, "\tdepends on ADK_PACKAGE_%s\n", toupperstr(pkgdirp->d_name));
 
 				free(pseudo_name);

mk/build.mk

@@ -22,7 +22,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_E2FSCK_STATIC=n \
 			ADK_PACKAGE_KEXECINIT=n \
-			ADK_PACKAGE_INSTALLER=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
@@ -31,12 +30,10 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_U_BOOT=n \
 			ADK_PACKAGE_CRYPTINIT=n \
-			ADK_PACKAGE_PAM=n \
 			ADK_PACKAGE_VIRTINST=n \
 			ADK_PACKAGE_URLGRABBER=n \
 			ADK_PACKAGE_LIBSSP=n \
 			ADK_PACKAGE_OPENAFS=n \
-			ADK_PACKAGE_OPENJDK7=n \
 			ADK_PKG_XORG=n \
 			ADK_PKG_CONSOLE=n \
 			ADK_PKG_TEST=n \
@@ -361,9 +358,9 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/.defconfig; \
 	fi
-	@if [ ! -z "$(LIBC)" ];then \
+	@if [ ! -z "$(CLIB)" ];then \
 		grep "^config" target/config/Config.in \
-			|grep -i "$(LIBC)" \
+			|grep -i "$(CLIB)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/.defconfig; \
 	fi
@@ -419,9 +416,9 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/all.config; \
 	fi
-	@if [ ! -z "$(LIBC)" ];then \
+	@if [ ! -z "$(CLIB)" ];then \
 		grep "^config" target/config/Config.in \
-			|grep -i "$(LIBC)" \
+			|grep -i "$(CLIB)" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/all.config; \
 	fi
@@ -466,10 +463,10 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
 # build all target architecture and libc combinations (toolchain only)
 bulktoolchain:
-	@if [ -z "$(LIBC)" ];then \
+	@if [ -z "$(CLIB)" ];then \
 		libc="glibc uclibc musl"; \
 	else \
-		libc="$(LIBC)"; \
+		libc="$(CLIB)"; \
 	fi; \
 	for libc in $$libc;do \
 		while read arch; do \
@@ -478,7 +475,7 @@ bulktoolchain:
 			tarch=$$(echo $$arch|sed -e "s#sh4.*#sh#" -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#hf##" -e "s#mips64n.*#mips64#" -e "s#mips64el.*#mips64el#" -e 's#x86$$#i686#' -e "s#x86_64.*#x86_64#" ); \
 			echo === building $$tarch $$libc toolchain-$$arch on $$(date); \
-				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
+				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch CLIB=$$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; \
@@ -494,19 +491,19 @@ bulktoolchain:
 	done
 
 test-framework:
-	@if [ -z "$(LIBC)" ];then \
+	@if [ -z "$(CLIB)" ];then \
 		libc="glibc uclibc musl"; \
 	else \
-		libc="$(LIBC)"; \
+		libc="$(CLIB)"; \
 	fi; \
 	for libc in $$libc;do \
 		( \
 			mkdir -p $(TOPDIR)/firmware/; \
-			for arch in $$(grep -v m68k target/tarch.lst|xargs);do \
+			for arch in $$(grep -v "\(m68k\|aarch64\)" toolchain/$$libc/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##" -e "s#x86_64.*#x86_64#"); \
 				arch=$$(echo $$arch|sed -e 's#x86$$#i686#'); \
 				echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
-				$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=initramfsarchive COLLECTION=test defconfig; \
+				$(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch CLIB=$$libc FS=initramfsarchive COLLECTION=test defconfig; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 				tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
 				if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \
@@ -529,7 +526,7 @@ release:
 		( \
 			echo === building $$libc on $$(date); \
 			$(GMAKE) prereq && \
-			$(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) LIBC=$$libc FS=archive allmodconfig; \
+			$(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) CLIB=$$libc FS=archive allmodconfig; \
 			$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 			rm .config; \
 		) 2>&1 | tee $(TOPDIR)/firmware/release-build.log; \
@@ -547,7 +544,7 @@ bulk:
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
-		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \
+		$(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive defconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/firmware/bulkbuild.log; \
@@ -567,7 +564,7 @@ bulkall:
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
-		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allconfig; \
+		$(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive allconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/firmware/bulkallbuild.log; \
@@ -587,7 +584,7 @@ bulkallmod:
 	    ( \
 		echo === building $$arch $$system $$libc on $$(date); \
 		$(GMAKE) prereq && \
-		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \
+		$(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive allmodconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \
 		$(GMAKE) clean; \
 		rm .config; \

mk/buildhlp.mk

@@ -1,6 +1,9 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+shellescape='$(subst ','\'',$(1))'
+shellexport=$(1)=$(call shellescape,${$(1)})
+
 ifneq ($(strip ${PKG_SITES}),)
 ifeq ($(strip ${DISTFILES}),)
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
@@ -105,14 +108,10 @@ endif
 			mv $$i.bak $$i; \
 		fi;\
 	done
-	@toedit=$$(WRKDIST='${WRKDIST}' CURDIR=$$(pwd) \
-	    PATCH_LIST='patch-* *.patch' WRKDIR1='${WRKDIR}' \
-	    ${BASH} ${TOPDIR}/scripts/update-patches); \
-	    if [[ -n $$toedit && $$toedit != FAIL ]]; then \
-		echo -n 'edit patches: '; read i; \
-		cd patches && $${VISUAL:-$${EDITOR:-vi}} $$toedit; \
-	    fi; \
-	    rm -rf ${WRKDIR}.orig; \
-	    [[ $$toedit != FAIL ]]
+	@WRKDIST=$(call shellescape,${WRKDIST}) \
+	    WRKDIR1=$(call shellescape,${WRKDIR}) \
+	    PATH=$(call shellescape,${HOST_PATH}) \
+	    $(call shellexport,DIFF_IGNOREFILES) \
+	    mksh ${TOPDIR}/scripts/update-patches2
 
 .PHONY: update-patches host-update-patches

mk/modules.mk

@@ -1238,6 +1238,12 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
 	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
 ,55, kmod-snd-soc))
 
+$(eval $(call KMOD_template,SND_IMX_SOC,snd-imx-soc,\
+	$(MODULES_DIR)/kernel/sound/soc/fsl/imx-pcm-dma \
+	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-fsl-spdif \
+	$(MODULES_DIR)/kernel/sound/soc/fsl/snd-soc-imx-spdif \
+,55, kmod-snd-soc))
+
 $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
 	$(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \
 ,55))
@@ -1482,15 +1488,15 @@ $(eval $(call KMOD_template,LEDS_ALIX2,leds-alix2,\
 ,10))
 
 $(eval $(call KMOD_template,LEDS_TRIGGER_TIMER,leds-trigger-timer,\
-	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-timer \
+	$(MODULES_DIR)/kernel/drivers/leds/trigger/ledtrig-timer \
 ,20))
 
 $(eval $(call KMOD_template,LEDS_TRIGGER_HEARTBEAT,leds-trigger-heartbeat,\
-	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-heartbeat \
+	$(MODULES_DIR)/kernel/drivers/leds/trigger/ledtrig-heartbeat \
 ,20))
 
 $(eval $(call KMOD_template,LEDS_TRIGGER_DEFAULT_ON,leds-trigger-default-on,\
-	$(MODULES_DIR)/kernel/drivers/leds/ledtrig-default-on \
+	$(MODULES_DIR)/kernel/drivers/leds/trigger/ledtrig-default-on \
 ,20))
 
 $(eval $(call KMOD_template,NETFILTER_XT_TARGET_LED,netfilter-xt-target-led,\

mk/pkg-bottom.mk

@@ -267,3 +267,8 @@ ifeq (,$(filter noremove,${PKG_OPTS}))
 	fi
 endif
 	@rm -f '${STAGING_PKG_DIR}/${PKG_NAME}'
+
+ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE}))
+DIFF_IGNOREFILES?=	configure missing depcomp install-sh INSTALL \
+			aclocal.m4 config.h.in Makefile.in */Makefile.in
+endif

mk/vars.mk

@@ -86,15 +86,6 @@ TARGET_CC+=		$(ADK_TARGET_ABI_CFLAGS)
 TARGET_CXX+=		$(ADK_TARGET_ABI_CFLAGS)
 endif
 
-MODE_FLAGS:=
-ifeq ($(ADK_LINUX_ARM),y)
-ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
-MODE_FLAGS:=		-mthumb
-else
-MODE_FLAGS:=		-marm
-endif
-endif
-
 TARGET_CPPFLAGS:=	
 TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
 TARGET_CXXFLAGS:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident
@@ -149,9 +140,14 @@ TARGET_CFLAGS+=		-fno-unwind-tables -fno-asynchronous-unwind-tables
 TARGET_CFLAGS+=		-g3
 endif
 
-ifneq ($(MODE_FLAGS),)
-TARGET_CFLAGS+=		$(MODE_CFLAGS)
-TARGET_CXXFLAGS+=	$(MODE_CFLAGS)
+ifeq ($(ADK_LINUX_ARM),y)
+ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
+TARGET_CFLAGS+=		-mthumb
+TARGET_CXXFLAGS+=	-mthumb
+else
+TARGET_CFLAGS+=		-marm
+TARGET_CXXFLAGS+=	-marm
+endif
 endif
 
 # A nifty macro to make testing gcc features easier (from uClibc project)

package/adkinstall/Makefile

@@ -1,48 +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:=		adkinstall
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		10
-PKG_DESCR:=		openadk installer
-PKG_SECTION:=		base
-PKG_DEPENDS:=		parted sfdisk mke2fs
-PKG_URL:=		http://openadk.org/
-
-PKG_ARCH_DEPENDS:=	!m68k
-
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
-NO_DISTFILES:=		1
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,ADKINSTALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-pre-configure:
-	mkdir -p ${WRKBUILD}
-
-do-install:
-	${INSTALL_DIR} $(IDIR_ADKINSTALL)/sbin
-ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
-	${INSTALL_BIN} ./src/adkinstall.rb532 \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y)
-	${INSTALL_BIN} ./src/adkinstall.foxg20 \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
-	${INSTALL_BIN} ./src/adkinstall.yeelong \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB4XX),y)
-	${INSTALL_BIN} ./src/adkinstall.rb4xx \
-		$(IDIR_ADKINSTALL)/sbin/adkinstall
-else
-	${INSTALL_BIN} ./src/adkinstall $(IDIR_ADKINSTALL)/sbin
-endif
-
-include ${TOPDIR}/mk/pkg-bottom.mk

package/adkinstall/src/adkinstall

@@ -1,167 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a Compact Flash disk
-
-check_exit() {
-        if [ $? -ne 0 ];then
-                echo "Installation failed."
-                exit 1
-        fi
-}
-
-rescue=0
-while getopts "r" option
-do
-	case $option in
-		r)
-			rescue=1
-			;;
-		*)
-			printf "Option not recognized\n"
-			exit 1
-			;;
-	esac
-done
-shift $(($OPTIND - 1))
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-if [ $rescue -eq 1 ];then
-	if [ -z $2 ];then
-		printf "Please give your rescue kernel image as second parameter\n"
-		exit 2
-	fi
-	if [ ! -f $2 ];then
-		printf "$2 is not a file, Exiting.\n"
-		exit 1
-	fi
-fi
-
-printf "Creating partitions ...\n"
-parted -s /dev/sda mklabel msdos
-check_exit
-sleep 2
-maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-2))
-start=0
-rootp=1
-cfgfsp=2
-if [ $rescue -eq 1 ];then
-	rootp=3
-	cfgfsp=4
-	start=2
-	parted -s /dev/sda unit cyl mkpart primary ext2 0 1
-	check_exit
-	mke2fs -q /dev/sda1
-	check_exit
-	parted -s /dev/sda unit cyl mkpart primary ext2 1 2
-	check_exit
-	mke2fs -q /dev/sda2
-	check_exit
-fi
-parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize
-check_exit
-mke2fs -q /dev/sda1
-check_exit
-parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
-check_exit
-parted -s /dev/sda set $rootp boot on
-check_exit
-sfdisk --change-id /dev/sda $cfgfsp 88 >/dev/null 2>&1
-check_exit
-# settle down
-sleep 2
-mount -t ext2 /dev/sda$rootp /mnt
-check_exit
-printf "Extracting install archive ...\n"
-tar -C /mnt -xzpf $1
-check_exit
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-if [ $rescue -eq 1 ];then
-	mkdir /mnt/boot/grub
-fi
-
-speed=$(awk -F \, '/console=ttyS0/ { print $2 }' /proc/cmdline|sed -e "s/ .*$//")
-
-if [ $rescue -eq 1 ];then
-	umount /mnt
-	mount /dev/sda2 /mnt
-	cp $2 /mnt/rescue
-fi
-printf "Installing bootloader ...\n"
-mkdir -p /mnt/boot/grub
-if [ $rescue -eq 1 ];then
-mount /dev/sda1 /mnt/boot/grub
-cat << EOF > /mnt/boot/grub/grub.cfg
-set timeout=1
-serial --unit=0 --speed=$speed
-terminal_output serial 
-terminal_input serial 
-
-if [ -s \$prefix/grubenv ]; then
-  load_env
-fi
-
-set default="\${saved_entry}"
-
-if [ \${prev_saved_entry} ]; then
-  set saved_entry=\${prev_saved_entry}
-  save_env saved_entry
-  set prev_saved_entry=
-  save_env prev_saved_entry
-  set boot_once=true
-fi
-
-function savedefault {
-  if [ -z \${boot_once} ]; then
-    saved_entry=\${chosen}
-    save_env saved_entry
-  fi
-}
-
-function recordfail {
-  set recordfail=1
-  if [ -n \${have_grubenv} ]; then if [ -z \${boot_once} ]; then save_env recordfail; fi; fi
-}
-
-menuentry "GNU/Linux (OpenADK)" {
-	recordfail
-        insmod ext2
-        set root=(hd0,3)
-        linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10
-}
-
-menuentry "GNU/Linux (OpenADK) Rescue Mode" {
-	recordfail
-        insmod ext2
-        set root=(hd0,2)
-        linux /rescue ro init=/init panic=10
-}
-EOF
-else
-cat << EOF > /mnt/boot/grub/grub.cfg
-set default=0
-set timeout=1
-serial --unit=0 --speed=$speed
-terminal_output serial 
-terminal_input serial 
-
-menuentry "GNU/Linux (OpenADK)" {
-        insmod ext2
-        set root=(hd0,1)
-        linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10
-}
-EOF
-fi
-grub-install --root-directory=/mnt /dev/sda 
-check_exit
-if [ $rescue -eq 1 ];then
-	grub-set-default --root-directory=/mnt 0
-	umount /mnt/boot/grub
-fi
-umount /mnt
-printf "Successfully installed. You can reboot now.\n"
-exit 0

package/adkinstall/src/adkinstall.foxg20

@@ -1,54 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a micro SD card
-# special script for foxboard netus aka foxg20
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-if [ ! -f $1 ];then
-	printf "given root tar archive does not exist\n"
-	exit 1
-fi
-
-printf "Creating partition scheme\n"
-parted -s /dev/mmcblk0 mklabel msdos
-sleep 2
-maxsize=$(env LC_ALL=C parted /dev/mmcblk0 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-2))
-parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 0 5
-parted -s /dev/mmcblk0 unit cyl mkpart primary ext2 5 $rootsize
-parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 $rootsize $maxsize
-parted -s /dev/mmcblk0 set 1 boot on
-sfdisk --change-id /dev/mmcblk0 3 88 >/dev/null 2>&1
-sleep 2
-sync
-printf "Creating vfat filesystem\n"
-mkfs.vfat /dev/mmcblk0p1 >/dev/null 2>&1
-printf "Creating ext2 filesystem\n"
-mke2fs /dev/mmcblk0p2 >/dev/null 2>&1
-tune2fs -c0 -i0 /dev/mmcblk0p2 >/dev/null 2>&1
-mount -t ext2 /dev/mmcblk0p2 /mnt
-mkdir /mnt/boot
-mount -t vfat /dev/mmcblk0p1 /mnt/boot
-
-printf "Extracting install archive\n"
-tar -C /mnt -xzpf $1
-if [ $? -ne 0 ];then
-	printf "Extracting of install archive failed"
-	exit 1
-fi
-
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-sync
-umount /mnt/boot
-umount /mnt
-if [ $? -ne 0 ];then
-	printf "Unmounting filesystem failed"
-	exit 1
-else
-	printf "Successfully installed.\n"
-	exit 0
-fi

package/adkinstall/src/adkinstall.rb4xx

@@ -1,35 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a NAND device
-# special script for routerboard rb4xx
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-printf "Preparing mountpoints\n"
-mount -t yaffs2 /dev/mtdblock2 /mnt
-rm -rf /mnt/* >/dev/null 2>&1
-mkdir /mnt/boot
-mount -t yaffs2 /dev/mtdblock1 /mnt/boot
-
-printf "Extracting install archive\n"
-tar -C /mnt -xzpf $1
-if [ $? -ne 0 ];then
-	printf "Extracting of install archive failed"
-	exit 1
-fi
-
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-
-sync
-umount /mnt/boot
-umount /mnt
-if [ $? -ne 0 ];then
-	printf "Unmounting filesystem failed"
-	exit 1
-else
-	printf "Successfully installed.\n"
-	exit 0
-fi

package/adkinstall/src/adkinstall.rb532

@@ -1,88 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto 
-# a Compact Flash disk or NAND device
-# special script for routerboard rb532
-
-nandinstall=0
-cfinstall=0
-
-if [ -z $1 ];then
-        printf "Please give your target device as first parameter [cf|nand]\n"
-        exit 1
-fi
-if [ -z $2 ];then
-        printf "Please give your root tar archive as second parameter\n"
-        exit 1
-fi
-case $1 in
-	nand)
-		nandinstall=1
-		;;
-	cf)
-		cfinstall=1
-		;;
-	*)
-		printf "Target device not known.\n"
-		exit 1
-		;;
-esac
-
-if [ $cfinstall -eq 1 ];then
-	if [ -z $3 ];then
-       	 printf "Please give your kernel as third parameter\n"
-       	 exit 1
-	fi
-fi
-
-if [ $cfinstall -eq 1 ];then
-	# create empty partition table
-	printf "Creating partition scheme\n"
-	parted -s /dev/sda mklabel msdos
-	sleep 2
-	maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-	rootsize=$(($maxsize-2))
-	parted -s /dev/sda unit cyl mkpart primary ext2 0 1
-	parted -s /dev/sda unit cyl mkpart primary ext2 1 $rootsize
-	parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
-	parted -s /dev/sda set 1 boot on
-	sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1
-	sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1
-	sleep 2
-	mke2fs /dev/sda2
-	sync
-	printf "Installing kernel\n"
-	dd if=$3 of=/dev/sda1 bs=2048 >/dev/null 2>&1
-	sync
-	mount -t ext2 /dev/sda2 /mnt
-fi
-
-if [ $nandinstall -eq 1 ];then
-	printf "Preparing mountpoints\n"
-	mount -t yaffs2 /dev/mtdblock1 /mnt
-	rm -rf /mnt/* >/dev/null 2>&1
-	mkdir /mnt/boot
-	mount -t yaffs2 /dev/mtdblock0 /mnt/boot
-fi
-
-printf "Extracting install archive\n"
-tar -C /mnt -xzpf $2
-if [ $? -ne 0 ];then
-	printf "Extracting of install archive failed"
-	exit 1
-fi
-
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-sync
-
-if [ $nandinstall -eq 1 ];then
-	umount /mnt/boot
-fi
-umount /mnt
-if [ $? -ne 0 ];then
-	printf "Unmounting filesystem failed"
-	exit 1
-else
-	printf "Successfully installed.\n"
-	exit 0
-fi

package/adkinstall/src/adkinstall.yeelong

@@ -1,59 +0,0 @@
-#!/bin/sh
-# installs a rootfs tar archive from OpenADK onto a disk
-# lemote yeelong specific installer
-
-check_exit() {
-        if [ $? -ne 0 ];then
-                echo "Installation failed."
-                exit 1
-        fi
-}
-
-if [ -z $1 ];then
-        printf "Please give your root tar archive as parameter\n"
-        exit 1
-fi
-
-printf "Creating partitions ...\n"
-parted -s /dev/sda mklabel msdos
-check_exit
-sleep 2
-maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
-rootsize=$(($maxsize-2))
-start=0
-rootp=1
-cfgfsp=2
-
-parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize
-check_exit
-mke2fs -q /dev/sda1
-check_exit
-parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
-check_exit
-parted -s /dev/sda set $rootp boot on
-check_exit
-sfdisk --change-id /dev/sda $cfgfsp 88 >/dev/null 2>&1
-check_exit
-# settle down
-sleep 2
-mount -t ext2 /dev/sda$rootp /mnt
-check_exit
-printf "Extracting install archive ...\n"
-tar -C /mnt -xzpf $1
-check_exit
-chmod 1777 /mnt/tmp
-chmod 4755 /mnt/bin/busybox
-
-cat << EOF > /mnt/boot/boot.cfg
-default 0
-timeout 3
-showmenu 1
-title OpenADK
-        kernel (wd0,0)/boot/kernel
-        args root=/dev/sda1 ro panic=10
-}
-EOF
-
-umount /mnt
-printf "Successfully installed. You can reboot now.\n"
-exit 0

package/ant/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c474fa9d0c35a24037c23b6e476862c1
 PKG_DESCR:=		ant utility
 PKG_SECTION:=		lang
+HOST_BUILDDEP:=		gcj-host
 PKG_SITES:=		http://archive.apache.org/dist/ant/source/
 
 PKG_CFLINE_ANT:=	depends on ADK_HOST_ONLY
@@ -27,7 +28,7 @@ host-build:
 	if [ ! -f $(WRKBUILD)/lib/optional/junit-4.9b2.jar ];then \
 		cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar; \
 	fi
-	cp $(STAGING_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional
+	cp $(DL_DIR)/ecj.jar $(WRKBUILD)/lib/optional
 	cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \
 		LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \
 		JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ; \

package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		82
+PKG_RELEASE:=		83
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 

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

@@ -8,7 +8,7 @@
 # activate any logical volumes
 [ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; }
 
-fstypes="ext2 ext3 ext4 xfs"
+fstypes="ext2 ext3 ext4 xfs vfat"
 
 # filesystem checks
 for fs in $fstypes; do

package/base-files/src/sbin/adkupdate

@@ -1,112 +0,0 @@
-#!/bin/sh
-
-who=$(id -u)
-if [ $who -ne 0 ]; then
-  echo 'Exit. System update must be run as root.'
-  exit 1
-fi
-
-system=$(awk '/system type/ { print $5 }' /proc/cpuinfo 2>/dev/null)
-
-if [ -x /sbin/mtd ];then
-	if [ "$system" == "AR7" ];then
-		updatecmd="dd bs=16 skip=3 | mtd -r write - linux"
-	else
-		updatecmd="mtd -r write - linux"
-	fi
-else
-	updatecmd="gunzip -c | tar -xf -"
-fi
-
-
-check_exit() {
-	if [ $? -ne 0 ];then
-		echo "Update failed."
-		exit 1
-	fi
-}
-
-prepare() {
-	cd /
-	if [ -x /sbin/cfgfs ];then
-		mount -o bind /tmp/.cfgfs/root /etc
-		check_exit
-		mount -o remount,rw /etc
-		check_exit
-	fi
-	mount -o remount,rw /
-	check_exit
-	if [ "$system" == "RB532" ];then
-		mount -t yaffs2 /dev/mtdblock0 /boot
-	elif [ "$system" == "AR7130" ];then
-		mount -t yaffs2 /dev/mtdblock1 /boot
-	elif [ "$system" == "FOXG20" ];then
-		mount -t vfat /dev/mmcblk0p1 /boot
-	fi
-}
-
-extract_from_file() {
-	prepare
-        cat $1 | eval $updatecmd
-	check_exit
-}
-
-extract_from_ssh() {
-	prepare
-        ssh $1 "cat $2" | eval $updatecmd
-	check_exit
-}
-
-extract_from_http() {
-	prepare
-        wget -O - $1 | eval $updatecmd
-	check_exit
-}
-                
-case $1 in
-        file://*|/*)
-                url=$(echo $1|sed -e "s#file://##")
-		echo "Updating system from $1"
-                extract_from_file $url
-                ;;
-        ssh://*)
-                host=$(echo $1|sed -e "s#ssh://\(.*\):.*#\1#")
-                file=$(echo $1|sed -e "s#ssh://.*:\(.*\)#\1#")
-		echo "Updating system from $1"
-                extract_from_ssh $host $file
-                ;;
-        http://*|ftp://*)
-		echo "Updating system from $1"
-                extract_from_http $1
-                ;;
-        *)
-                echo "No or wrong uri given. exit."
-		echo "Use one of the following uri:"
-		echo "http://myserver/myupdate.tar.gz"
-		echo "ssh://myuser@myserver:/my/path/myupdate.tar.gz"
-		echo "file:///mypath/myupdate.tar.gz"
-                exit 1
-                ;;
-esac
-
-# fix permissions
-if [ -f /usr/bin/sudo ];then
-	chmod 4755 /usr/bin/sudo
-fi
-if [ -f /usr/bin/Xorg ];then
-	chmod 4755 /usr/bin/Xorg
-fi
-
-sync
-if [ -x /sbin/cfgfs ];then
-	umount /etc
-fi
-if [ "$system" == "RB532" ];then
-	umount -f /boot
-elif [ "$system" == "AR7130" ];then
-	umount -f /boot
-elif [ "$system" == "FOXG20" ];then
-	umount -f /boot
-fi
-
-echo "Update sucessful. You should reboot now."

package/busybox/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.21.1
 PKG_RELEASE:=		6
 PKG_MD5SUM:=		795394f83903b5eec6567d51eebb417e
 PKG_DESCR:=		core utilities for embedded systems
-PKG_SECTION:=		base
+PKG_SECTION:=		core
 PKG_BUILDDEP:=		bzip2-host
 PKG_URL:=		http://www.busybox.net/
 PKG_SITES:=		http://www.busybox.net/downloads/

package/classpath/Makefile

@@ -14,6 +14,8 @@ PKG_DEPENDS:=		libgtk gdk-pixbuf orbit2 gconf
 PKG_URL:=		http://www.gnu.org/software/classpath/home.html
 PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
 PKG_HOST_DEPENDS:=	linux
 PKG_ARCH_DEPENDS:=	!arm
 

package/coreutils/Makefile

@@ -7,26 +7,24 @@ PKG_NAME:=		coreutils
 PKG_VERSION:=		8.22
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		8fb0ae2267aa6e728958adc38f8163a2
-PKG_DESCR:=		basic file, shell and text manipulation utilities
-PKG_SECTION:=		base
+PKG_DESCR:=		basic file, shell and text manipulation utilities (also provided by busybox)
+PKG_SECTION:=		core
 PKG_BUILDDEP:=		gmp autotool
 PKG_URL:=		http://www.gnu.org/software/coreutils/
 PKG_SITES:=		http://ftp.gnu.org/gnu/coreutils/
+PKG_MULTI:=		1
 
-PKG_SUBPKGS:=		TSORT SHA256SUM TOUCH
+PKG_SUBPKGS:=		COREUTILS TSORT SHA256SUM TOUCH
 PKGSD_TSORT:=		topological sort utility
-PKGSC_TSORT:=		misc
 PKGSD_SHA256SUM:=	SHA1 256 bit checksum utility
-PKGSC_SHA256SUM:=	misc
 PKGSD_TOUCH:=		touch utility
-PKGSC_TOUCH:=		misc
 
 include $(TOPDIR)/mk/package.mk
 
-#$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TSORT},${PKGSC_TSORT}))
-$(eval $(call PKG_template,TOUCH,touch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TOUCH},${PKGSC_TOUCH}))
-$(eval $(call PKG_template,SHA256SUM,sha256sum,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SHA256SUM},${PKGSC_SHA256SUM}))
+$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TSORT},${PKG_SECTION}))
+$(eval $(call PKG_template,TOUCH,touch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TOUCH},${PKG_SECTION}))
+$(eval $(call PKG_template,SHA256SUM,sha256sum,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SHA256SUM},${PKG_SECTION}))
 
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--disable-rpath

package/fastjar/Makefile

@@ -11,6 +11,8 @@ PKG_DESCR:=		fastjar utility
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
 PKG_CFLINE_FASTJAR:=	depends on ADK_HOST_ONLY
 
 include $(TOPDIR)/mk/host.mk

package/findutils/Makefile

@@ -7,27 +7,29 @@ PKG_NAME:=		findutils
 PKG_VERSION:=		4.4.2
 PKG_RELEASE:=		5
 PKG_MD5SUM:=		351cc4adb07d54877fa15f75fb77d39f
-PKG_DESCR:=		utilities for finding files
-PKG_SECTION:=		utils
+PKG_DESCR:=		utilities for finding files (also provided by busybox)
+PKG_SECTION:=		core
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP:=		autotool
 HOST_BUILDDEP:=		autotool
 PKG_URL:=		http://www.gnu.org/software/findutils/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/findutils/
+PKG_MULTI:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_SUBPKGS:=		FIND XARGS LOCATE
+PKG_SUBPKGS:=		FINDUTILS XARGS LOCATE FIND
 PKGSD_LOCATE:=		locate utility
 PKGSD_XARGS:=		xargs utility
+PKGSD_FIND:=		find utility
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,FINDUTILS,findutils,$(PKG_VERSION)-${PKG_RELEASE}))
-$(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,FIND,find,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FIND},${PKG_SECTION}))
 $(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION}))
+$(eval $(call PKG_template,XARGS,xargs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XARGS},${PKG_SECTION}))
 
 HOST_STYLE:=		auto
 AUTOTOOL_STYLE:=	autoreconf

package/freeradius-server/Makefile

@@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		freeradius-server
 PKG_VERSION:=		3.0.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		3532b6439270f9da0ebfc03d3623f962
 PKG_DESCR:=		flexible RADIUS server
 PKG_SECTION:=		ppp
-PKG_DEPENDS:=		libltdl libopenssl libpthread
-PKG_BUILDDEP:=		autotool libtool openssl samba
+PKG_DEPENDS:=		libltdl libopenssl libpthread libpcre
+PKG_BUILDDEP:=		autotool libtool openssl samba pcre
 PKG_URL:=		http://www.freeradius.org/
 PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/
 PKG_MULTI:=		1

package/genext2fs/Makefile

@@ -11,6 +11,8 @@ PKG_DESCR:=		genext2fs utility
 PKG_SECTION:=		fs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=genext2fs/}
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
 PKG_CFLINE_GENEXT2FS:=	depends on ADK_HOST_ONLY
 
 include $(TOPDIR)/mk/host.mk

package/geoclue/Makefile

@@ -0,0 +1,29 @@
+# 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:=		geoclue
+PKG_VERSION:=		1.99.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		514efbecd69c78b3e0a3d86012b7d88c
+PKG_DESCR:=		D-Bus service that provides location information
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		json-glib
+PKG_BUILDDEP:=		json-glib
+PKG_URL:=		http://www.freedesktop.org/wiki/Software/GeoClue/
+PKG_SITES:=		http://www.freedesktop.org/software/geoclue/releases/1.99/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GEOCLUE,geoclue,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+geoclue-install:
+	$(INSTALL_DIR) $(IDIR_GEOCLUE)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/geoclue*.so* \
+		$(IDIR_GEOCLUE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/harfbuzz/Makefile

@@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		harfbuzz
 PKG_VERSION:=		0.9.9
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		e901ffe556d706b7d43b272f83be7f09
 PKG_DESCR:=		OpenType text shaping engine
 PKG_SECTION:=		libs
 PKG_SITES:=		http://www.freedesktop.org/software/harfbuzz/release/
-PKG_DEPENDS:=		libstdcxx cairo
-PKG_BUILDDEP:=		libstdcxx cairo
+PKG_DEPENDS:=		libstdcxx cairo icu4c
+PKG_BUILDDEP:=		libstdcxx cairo icu4c
 PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!m68k
@@ -22,6 +22,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+pre-install:
+	$(INSTALL_DIR) $(WRKINST)/usr/include/harfbuzz
+	$(CP) $(WRKBUILD)/src/hb-icu.h $(WRKINST)/usr/include/harfbuzz
+
 harfbuzz-install:
 	$(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libharfbuzz*.so* \

package/icu4c/Makefile

@@ -0,0 +1,47 @@
+# 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:=		icu4c
+PKG_VERSION:=		52.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9e96ed4c1d99c0d14ac03c140f9f346c
+PKG_DESCR:=		unicode and globalization library
+PKG_SECTION:=		libs
+PKG_BUILDDEP:=		icu4c-host
+PKG_URL:=		http://icu-project.org
+PKG_SITES:=		http://download.icu-project.org/files/icu4c/52.1/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-52_1-src.tgz
+
+WRKDIST=		${WRKDIR}/icu/source
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,ICU4C,icu4c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--enable-extras=no \
+			--enable-samples=no \
+			--enable-tests=no \
+			--enable-shared=no \
+			--enable-dyload=no \
+			--enable-static
+CONFIGURE_ARGS+=	--with-cross-build=${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host/icu/source \
+			--enable-extras=no \
+			--enable-samples=no \
+			--enable-tests=no \
+
+icu4c-hostinstall:
+
+icu4c-install:
+	$(INSTALL_DIR) $(IDIR_ICU4C)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libicuuc.so* \
+		$(IDIR_ICU4C)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/installer/Makefile

@@ -1,26 +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:=		installer
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-PKG_DESCR:=		OpenADK disk installer
-PKG_SECTION:=		base
-
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
-NO_DISTFILES:=		1
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,INSTALLER,installer,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-do-install:
-	$(INSTALL_BIN) ./src/installer $(IDIR_INSTALLER)/
-
-include ${TOPDIR}/mk/pkg-bottom.mk

package/installer/src/installer

@@ -1,145 +0,0 @@
-#!/bin/sh
-
-#set -x
-
-rootsize=1024
-usbrootsize=512
-cfgsize=16
-
-create_bootcfg() {
-	cat << FOO > /mnt/boot/boot.cfg
-default 0
-timeout 2
-showmenu 1
-title OpenADK
-	kernel (wd0,0)/boot/kernel
-	args root=/dev/sda1
-
-title USB
-	kernel (usb0,0)/boot/kernel-usb
-	args root=/dev/sdc1
-FOO
-
-}
-
-create_fstab() {
-	cat << FOO > /mnt/etc/fstab
-/dev/sda2 /home ext4 defaults 0 0
-/dev/sda3 none swap sw 0 0
-FOO
-
-}
-
-create_usb_fstab() {
-	cat << FOO > /mnt/etc/fstab
-/dev/sdc2 /home ext4 defaults 0 0
-FOO
-
-}
-
-create_home() { 
-	mkdir -p /mnt/home
-	mkdir -p /tmp/home/lemote
-	chown 1000:1000 /tmp/home/lemote
-	echo "lemote:x:1000:1000:Linux User,,,:/home/lemote:/bin/mksh" >> /mnt/etc/passwd
-	echo "lemote:.m3Jtyyc5L4W6:15426:0:99999:7:::" >> /mnt/etc/shadow
-	echo "setxkbmap -option terminate:ctrl_alt_bksp" >> /tmp/home/lemote/.xsession
-	echo fluxbox >> /tmp/home/lemote/.xsession
-}
-
-usb_install() {
-	size=$(parted -s /dev/sdc unit mb print|awk '/Disk/ {print $3}'|sed -e "s#MB##")
-	homesize=$(($size-$usbrootsize-$cfgsize))
-	mkdir /tmp/home
-	parted -s /dev/sdc mklabel msdos
-	parted -s /dev/sdc mkpart primary ext2 0 ${usbrootsize}M 2>&1 >/dev/null
-	parted -s /dev/sdc mkpart primary ext2 ${usbrootsize}M ${homesize}M
-	parted -s /dev/sdc -- mkpart primary ext2 ${homesize}M -0
-	sfdisk --change-id /dev/sdc 3 88 2>&1 >/dev/null
-	echo "Creating filesystem on /home"
-	mke2fs -q -j /dev/sdc2
-	mount -t ext4 /dev/sdc2 /tmp/home
-	echo "Copying system to disk" 
-	dd if=/dev/sdc of=/tmp/home/lemote.tar.gz bs=16384 skip=1024 count=8000 2>/dev/null
-	echo "Creating filesystem on /"
-	mke2fs -q -j /dev/sdc1
-	mount -t ext4 /dev/sdc1 /mnt
-	echo "Installing system to USB disk ..."
-	tar xzf /tmp/home/lemote.tar.gz -C /mnt
-	test -x /mnt/usr/bin/sudo && chmod u+s /mnt/usr/bin/sudo
-	test -x /mnt/usr/bin/Xorg && chmod u+s /mnt/usr/bin/Xorg
-	create_home
-	create_bootcfg
-	create_usb_fstab
-	umount /mnt
-	umount /tmp/home
-	
-}
-
-disk_install() {
-	size=$(parted -s /dev/sda unit mb print|awk '/Disk/ {print $3}'|sed -e "s#MB##")
-	swap=1024
-	homesize=$(($size-$rootsize-$cfgsize-$swap))
-	swapsize=$(($homesize+$swap))
-	mkdir /tmp/home
-	parted -s /dev/sda mklabel msdos
-	parted -s /dev/sda mkpart primary ext2 0 ${rootsize}M 2>&1 >/dev/null
-	parted -s /dev/sda mkpart primary ext2 ${rootsize}M ${homesize}M
-	parted -s /dev/sda mkpart primary ext2 ${homesize}M ${swapsize}M
-	parted -s /dev/sda -- mkpart primary ext2 ${swapsize}M -0
-	sfdisk --change-id /dev/sda 3 82 2>&1 >/dev/null
-	sfdisk --change-id /dev/sda 4 88 2>&1 >/dev/null
-	sleep 2
-	echo "Creating filesystem on /home"
-	mke2fs -q -j /dev/sda2
-	mkswap /dev/sda3
-	mount -t ext4 /dev/sda2 /tmp/home
-	echo "Copying system to disk" 
-	dd if=/dev/sdc of=/tmp/home/lemote.tar.gz bs=16384 skip=1024 count=8000 2>/dev/null
-	mke2fs -q -j /dev/sda1
-	mount -t ext4 /dev/sda1 /mnt
-	echo "Installing system to hard disk ..."
-	tar xzf /tmp/home/lemote.tar.gz -C /mnt
-	test -x /mnt/usr/bin/sudo && chmod u+s /mnt/usr/bin/sudo
-	test -x /mnt/usr/bin/Xorg && chmod u+s /mnt/usr/bin/Xorg
-	create_home
-	create_bootcfg
-	create_fstab
-	umount /mnt
-	umount /tmp/home
-	
-}
-
-. /etc/functions.sh
-echo 0 > /proc/sys/kernel/printk
-
-load_modules /etc/modules
-for f in /etc/modules.d/*; do
-	[[ -e $f ]] && load_modules /etc/modules.d/*
-	break
-done
-
-echo "  ___                      _    ____  _  __ "
-echo " / _ \ _ __   ___ _ __    / \  |  _ \| |/ / "
-echo "| | | | '_ \ / _ \ '_ \  / _ \ | | | | ' /  "
-echo "| |_| | |_) |  __/ | | |/ ___ \| |_| | . \  "
-echo " \___/| .__/ \___|_| |_/_/   \_\____/|_|\_\ "
-echo "      |_|                                   "
-echo ""
-# settle down, after module load
-sleep 2
-echo "Should I install OpenADK to disk (d) or usb disk (u) or do nothing (any key)"
-read answer
-if [ "$answer" = "d" ];then
-	disk_install
-fi
-if [ "$answer" = "u" ];then
-	usb_install
-fi
-echo "Should I reboot now (y/n)"
-read answer
-if [ "$answer" = "y" ];then
-	/bin/busybox reboot -f
-else
-	exit
-fi

package/intltool/Makefile

@@ -0,0 +1,27 @@
+# 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:=		intltool
+PKG_VERSION:=		0.50.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		23fbd879118253cb99aeac067da5f591
+PKG_DESCR:=		internationalization utility to create po files
+PKG_SECTION:=		misc
+PKG_URL:=		http://freedesktop.org/wiki/Software/intltool/
+PKG_SITES:=		https://launchpad.net/intltool/trunk/0.50.2/+download/
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
+PKG_ARCH_DEPENDS:=	native
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,INTLTOOL,intltool,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:=		auto
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/json-glib/Makefile

@@ -0,0 +1,27 @@
+# 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:=		json-glib
+PKG_VERSION:=		0.14.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2a22832c4654156a35b38ee027f6f065
+PKG_DESCR:=		a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format 
+PKG_SECTION:=		libs
+PKG_URL:=		https://wiki.gnome.org/JsonGlib/
+PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.14/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JSON_GLIB,json-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+json-glib-install:
+	$(INSTALL_DIR) $(IDIR_JSON_GLIB)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjson-glib*.so* \
+		$(IDIR_JSON_GLIB)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libICE/Makefile

@@ -9,7 +9,8 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		4b8dae73fce37e994c3a6fa05d6db7ca
 PKG_DESCR:=		Inter-Client Exchange library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xtrans-host xtrans xproto-host xproto libICE-host
+PKG_BUILDDEP:=		xtrans xproto
+HOST_BUILDDEP:=		xtrans-host xproto-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libice
 PKG_OPTS:=		dev
@@ -23,7 +24,6 @@ $(eval $(call HOST_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 HOST_STYLE:=		auto
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 
 libice-install:
 	${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib

package/libSM/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		1d507651e9fa50aab7ef11be9e0e2f20
 PKG_DESCR:=		X11 Session Management library
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libuuid
-PKG_BUILDDEP:=		libSM-host libICE util-linux
+PKG_BUILDDEP:=		libICE util-linux
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libsm
 PKG_OPTS:=		dev

package/libcec/Makefile

@@ -14,6 +14,8 @@ PKG_URL:=		http://libcec.pulse-eight.com/
 PKG_SITES:=		http://packages.pulse-eight.net/pulse/sources/libcec/
 PKG_OPTS:=		dev
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
 PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc
 PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc
 PKG_SYSTEM_DEPENDS:=    raspberry-pi ibm-x40

package/libcroco/Makefile

@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libcroco
+PKG_VERSION:=		0.6.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		767e73c4174f75b99695d4530fd9bb80
+PKG_DESCR:=		CSS2 parsing and manipulation library
+PKG_SECTION:=		libs
+PKG_URL:=		https://github.com/GNOME/libcroco
+PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,LIBCROCO,libcroco,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBCROCO,libcroco,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+HOST_STYLE:=		auto
+
+libcroco-install:
+	$(INSTALL_DIR) $(IDIR_LIBCROCO)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libcroco*.so* \
+		$(IDIR_LIBCROCO)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/librsvg/Makefile

@@ -0,0 +1,34 @@
+# 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:=		librsvg
+PKG_VERSION:=		2.40.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		acdecdb9f08f3bf662a68bf7dafb8b82
+PKG_DESCR:=		SVG library
+PKG_BUILDDEP:=		libcroco
+HOST_BUILDDEP:=		libcroco-host
+PKG_SECTION:=		libs
+PKG_URL:=		https://wiki.gnome.org/action/show/Projects/LibRsvg?action=show&redirect=LibRsvg
+PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBRSVG,librsvg,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+HOST_STYLE:=		auto
+CONFIGURE_ARGS+=	--enable-introspection=no
+
+librsvg-install:
+	$(INSTALL_DIR) $(IDIR_LIBRSVG)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/librsvg*.so* \
+		$(IDIR_LIBRSVG)/usr/lib
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libsecret/Makefile

@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libsecret
+PKG_VERSION:=		0.18
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		279d723cd005e80d1d304f74a3488acc
+PKG_DESCR:=		library for storing and retrieving passwords
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libgcrypt glib
+PKG_BUILDDEP:=		intltool-host gettext-tiny libgcrypt glib
+PKG_URL:=		https://wiki.gnome.org/Libsecret
+PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/libsecret/${PKG_VERSION}/
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSECRET,libsecret,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_ARGS+=	--enable-vala=no \
+			--enable-gcrypt
+
+libsecret-install:
+	$(INSTALL_DIR) $(IDIR_LIBSECRET)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libsecret*.so* \
+		$(IDIR_LIBSECRET)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libsoup/Makefile

@@ -0,0 +1,31 @@
+# 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:=		libsoup
+PKG_VERSION:=		2.44.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		92aa3667357157e8f3489bcca287f2fa
+PKG_DESCR:=		HTTP client/server library
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libsqlite
+PKG_BUILDDEP:=		autotool sqlite
+PKG_URL:=		https://wiki.gnome.org/LibSoup
+PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.44/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSOUP,libsoup,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+AUTOTOOL_STYLE:=	autoreconf
+
+libsoup-install:
+	$(INSTALL_DIR) $(IDIR_LIBSOUP)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libsoup*.so* \
+		$(IDIR_LIBSOUP)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libsoup/patches/patch-Makefile_am

@@ -0,0 +1,20 @@
+--- libsoup-2.44.2.orig/Makefile.am	2013-11-11 16:02:00.000000000 +0100
++++ libsoup-2.44.2/Makefile.am	2014-04-14 17:24:56.713849496 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = libsoup po tests examples docs
++SUBDIRS = libsoup
+ 
+ EXTRA_DIST =				\
+ 	data/effective_tld_names.dat	\
+@@ -12,8 +12,6 @@ EXTRA_DIST =				\
+ 	m4/introspection.m4		\
+ 	Makefile.glib
+ 
+-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+-
+ pkgconfigdir = $(libdir)/pkgconfig
+ 
+ pkgconfig_DATA = libsoup-2.4.pc

package/libsoup/patches/patch-build-aux_config_guess

@@ -0,0 +1,447 @@
+--- libsoup-2.44.2.orig/build-aux/config.guess	2013-10-18 00:01:48.000000000 +0200
++++ libsoup-2.44.2/build-aux/config.guess	2014-04-14 17:21:42.176934834 +0200
+@@ -1,10 +1,8 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-#   2011, 2012, 2013 Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+-timestamp='2012-12-29'
++timestamp='2014-01-25'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -26,7 +24,7 @@ timestamp='2012-12-29'
+ # program.  This Exception is an additional permission under section 7
+ # of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# Originally written by Per Bothner. 
++# Originally written by Per Bothner.
+ #
+ # You can get the latest version of this script from:
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+@@ -52,9 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+-2012, 2013 Free Software Foundation, Inc.
++Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
++case "${UNAME_SYSTEM}" in
++Linux|GNU|GNU/*)
++	# If the system lacks a compiler, then just pick glibc.
++	# We could probably try harder.
++	LIBC=gnu
++
++	eval $set_cc_for_build
++	cat <<-EOF > $dummy.c
++	#include <features.h>
++	#if defined(__UCLIBC__)
++	LIBC=uclibc
++	#elif defined(__dietlibc__)
++	LIBC=dietlibc
++	#else
++	LIBC=gnu
++	#endif
++	EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	;;
++esac
++
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -857,21 +874,21 @@ EOF
+ 	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit ;;
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ 	exit ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+     aarch64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     aarch64_be:Linux:*:*)
+ 	UNAME_MACHINE=aarch64_be
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -884,59 +901,54 @@ EOF
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+ 	esac
+ 	objdump --private-headers /bin/sh | grep -q ld.so.1
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    arc:Linux:*:* | arceb:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 	    | grep -q __ARM_EABI__
+ 	then
+-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	else
+ 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ 		| grep -q __ARM_PCS_VFP
+ 	    then
+-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ 	    else
+-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ 	    fi
+ 	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo ${UNAME_MACHINE}-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ 	exit ;;
+     frv:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     hexagon:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     i*86:Linux:*:*)
+-	LIBC=gnu
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ 	exit ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     m32r*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+@@ -955,54 +967,63 @@ EOF
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ 	;;
++    or1k:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
+     or32:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     padre:Linux:*:*)
+-	echo sparc-unknown-linux-gnu
++	echo sparc-unknown-linux-${LIBC}
+ 	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++	echo hppa64-unknown-linux-${LIBC}
+ 	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+-	  *)    echo hppa-unknown-linux-gnu ;;
++	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
++	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
++	  *)    echo hppa-unknown-linux-${LIBC} ;;
+ 	esac
+ 	exit ;;
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++	echo powerpc64-unknown-linux-${LIBC}
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo powerpc-unknown-linux-${LIBC}
++	exit ;;
++    ppc64le:Linux:*:*)
++	echo powerpc64le-unknown-linux-${LIBC}
++	exit ;;
++    ppcle:Linux:*:*)
++	echo powerpcle-unknown-linux-${LIBC}
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+-	echo ${UNAME_MACHINE}-ibm-linux
++	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ 	exit ;;
+     sh64*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     sh*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     tile*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     vax:Linux:*:*)
+-	echo ${UNAME_MACHINE}-dec-linux-gnu
++	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     xtensa*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1235,19 +1256,31 @@ EOF
+ 	exit ;;
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+-	case $UNAME_PROCESSOR in
+-	    i386)
+-		eval $set_cc_for_build
+-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+-		      grep IS_64BIT_ARCH >/dev/null
+-		  then
+-		      UNAME_PROCESSOR="x86_64"
+-		  fi
+-		fi ;;
+-	    unknown) UNAME_PROCESSOR=powerpc ;;
+-	esac
++	eval $set_cc_for_build
++	if test "$UNAME_PROCESSOR" = unknown ; then
++	    UNAME_PROCESSOR=powerpc
++	fi
++	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
++	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		    grep IS_64BIT_ARCH >/dev/null
++		then
++		    case $UNAME_PROCESSOR in
++			i386) UNAME_PROCESSOR=x86_64 ;;
++			powerpc) UNAME_PROCESSOR=powerpc64 ;;
++		    esac
++		fi
++	    fi
++	elif test "$UNAME_PROCESSOR" = i386 ; then
++	    # Avoid executing cc on OS X 10.9, as it ships with a stub
++	    # that puts up a graphical alert prompting to install
++	    # developer tools.  Any system running Mac OS X 10.7 or
++	    # later (Darwin 11 and later) is required to have a 64-bit
++	    # processor. This is not true of the ARM version of Darwin
++	    # that Apple uses in portable devices.
++	    UNAME_PROCESSOR=x86_64
++	fi
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ 	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+@@ -1338,154 +1371,6 @@ EOF
+ 	exit ;;
+ esac
+ 
+-eval $set_cc_for_build
+-cat >$dummy.c <<EOF
+-#ifdef _SEQUENT_
+-# include <sys/types.h>
+-# include <sys/utsname.h>
+-#endif
+-main ()
+-{
+-#if defined (sony)
+-#if defined (MIPSEB)
+-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+-     I don't know....  */
+-  printf ("mips-sony-bsd\n"); exit (0);
+-#else
+-#include <sys/param.h>
+-  printf ("m68k-sony-newsos%s\n",
+-#ifdef NEWSOS4
+-	"4"
+-#else
+-	""
+-#endif
+-	); exit (0);
+-#endif
+-#endif
+-
+-#if defined (__arm) && defined (__acorn) && defined (__unix)
+-  printf ("arm-acorn-riscix\n"); exit (0);
+-#endif
+-
+-#if defined (hp300) && !defined (hpux)
+-  printf ("m68k-hp-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (NeXT)
+-#if !defined (__ARCHITECTURE__)
+-#define __ARCHITECTURE__ "m68k"
+-#endif
+-  int version;
+-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+-  if (version < 4)
+-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+-  else
+-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+-  exit (0);
+-#endif
+-
+-#if defined (MULTIMAX) || defined (n16)
+-#if defined (UMAXV)
+-  printf ("ns32k-encore-sysv\n"); exit (0);
+-#else
+-#if defined (CMU)
+-  printf ("ns32k-encore-mach\n"); exit (0);
+-#else
+-  printf ("ns32k-encore-bsd\n"); exit (0);
+-#endif
+-#endif
+-#endif
+-
+-#if defined (__386BSD__)
+-  printf ("i386-pc-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (sequent)
+-#if defined (i386)
+-  printf ("i386-sequent-dynix\n"); exit (0);
+-#endif
+-#if defined (ns32000)
+-  printf ("ns32k-sequent-dynix\n"); exit (0);
+-#endif
+-#endif
+-
+-#if defined (_SEQUENT_)
+-    struct utsname un;
+-
+-    uname(&un);
+-
+-    if (strncmp(un.version, "V2", 2) == 0) {
+-	printf ("i386-sequent-ptx2\n"); exit (0);
+-    }
+-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+-	printf ("i386-sequent-ptx1\n"); exit (0);
+-    }
+-    printf ("i386-sequent-ptx\n"); exit (0);
+-
+-#endif
+-
+-#if defined (vax)
+-# if !defined (ultrix)
+-#  include <sys/param.h>
+-#  if defined (BSD)
+-#   if BSD == 43
+-      printf ("vax-dec-bsd4.3\n"); exit (0);
+-#   else
+-#    if BSD == 199006
+-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+-#    else
+-      printf ("vax-dec-bsd\n"); exit (0);
+-#    endif
+-#   endif
+-#  else
+-    printf ("vax-dec-bsd\n"); exit (0);
+-#  endif
+-# else
+-    printf ("vax-dec-ultrix\n"); exit (0);
+-# endif
+-#endif
+-
+-#if defined (alliant) && defined (i860)
+-  printf ("i860-alliant-bsd\n"); exit (0);
+-#endif
+-
+-  exit (1);
+-}
+-EOF
+-
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+-	{ echo "$SYSTEM_NAME"; exit; }
+-
+-# Apollos put the system type in the environment.
+-
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+-
+-# Convex versions that predate uname can use getsysinfo(1)
+-
+-if [ -x /usr/convex/getsysinfo ]
+-then
+-    case `getsysinfo -f cpu_type` in
+-    c1*)
+-	echo c1-convex-bsd
+-	exit ;;
+-    c2*)
+-	if getsysinfo -f scalar_acc
+-	then echo c32-convex-bsd
+-	else echo c2-convex-bsd
+-	fi
+-	exit ;;
+-    c34*)
+-	echo c34-convex-bsd
+-	exit ;;
+-    c38*)
+-	echo c38-convex-bsd
+-	exit ;;
+-    c4*)
+-	echo c4-convex-bsd
+-	exit ;;
+-    esac
+-fi
+-
+ cat >&2 <<EOF
+ $0: unable to guess system type
+ 

package/libsoup/patches/patch-build-aux_config_sub

@@ -0,0 +1,183 @@
+--- libsoup-2.44.2.orig/build-aux/config.sub	2013-10-18 00:01:48.000000000 +0200
++++ libsoup-2.44.2/build-aux/config.sub	2014-04-14 17:21:42.176934834 +0200
+@@ -1,10 +1,8 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-#   2011, 2012, 2013 Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+-timestamp='2012-12-29'
++timestamp='2014-01-01'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -70,9 +68,7 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+-2012, 2013 Free Software Foundation, Inc.
++Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -256,12 +252,12 @@ case $basic_machine in
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+-	| arc \
++	| arc | arceb \
+ 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ 	| avr | avr32 \
+ 	| be32 | be64 \
+ 	| bfin \
+-	| c4x | clipper \
++	| c4x | c8051 | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+ 	| epiphany \
+ 	| fido | fr30 | frv \
+@@ -269,6 +265,7 @@ case $basic_machine in
+ 	| hexagon \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
++	| k1om \
+ 	| le32 | le64 \
+ 	| lm32 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+@@ -290,16 +287,17 @@ case $basic_machine in
+ 	| mipsisa64r2 | mipsisa64r2el \
+ 	| mipsisa64sb1 | mipsisa64sb1el \
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
++	| mipsr5900 | mipsr5900el \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
+ 	| moxie \
+ 	| mt \
+ 	| msp430 \
+ 	| nds32 | nds32le | nds32be \
+-	| nios | nios2 \
++	| nios | nios2 | nios2eb | nios2el \
+ 	| ns16k | ns32k \
+ 	| open8 \
+-	| or32 \
++	| or1k | or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+ 	| pyramid \
+@@ -327,7 +325,7 @@ case $basic_machine in
+ 	c6x)
+ 		basic_machine=tic6x-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+@@ -369,13 +367,13 @@ case $basic_machine in
+ 	| aarch64-* | aarch64_be-* \
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* | avr32-* \
+ 	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+-	| clipper-* | craynv-* | cydra-* \
++	| c8051-* | clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+ 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+@@ -384,6 +382,7 @@ case $basic_machine in
+ 	| hexagon-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
++	| k1om-* \
+ 	| le32-* | le64-* \
+ 	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+@@ -407,12 +406,13 @@ case $basic_machine in
+ 	| mipsisa64r2-* | mipsisa64r2el-* \
+ 	| mipsisa64sb1-* | mipsisa64sb1el-* \
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
++	| mipsr5900-* | mipsr5900el-* \
+ 	| mipstx39-* | mipstx39el-* \
+ 	| mmix-* \
+ 	| mt-* \
+ 	| msp430-* \
+ 	| nds32-* | nds32le-* | nds32be-* \
+-	| nios-* | nios2-* \
++	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| open8-* \
+ 	| orion-* \
+@@ -796,7 +796,7 @@ case $basic_machine in
+ 		os=-mingw64
+ 		;;
+ 	mingw32)
+-		basic_machine=i386-pc
++		basic_machine=i686-pc
+ 		os=-mingw32
+ 		;;
+ 	mingw32ce)
+@@ -832,7 +832,7 @@ case $basic_machine in
+ 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ 		;;
+ 	msys)
+-		basic_machine=i386-pc
++		basic_machine=i686-pc
+ 		os=-msys
+ 		;;
+ 	mvs)
+@@ -1008,7 +1008,7 @@ case $basic_machine in
+ 		;;
+ 	ppc64)	basic_machine=powerpc64-unknown
+ 		;;
+-	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ 		basic_machine=powerpc64le-unknown
+@@ -1354,7 +1354,7 @@ case $os in
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+-	      | -sym* | -kopensolaris* \
++	      | -sym* | -kopensolaris* | -plan9* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ 	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1500,9 +1500,6 @@ case $os in
+ 	-aros*)
+ 		os=-aros
+ 		;;
+-	-kaos*)
+-		os=-kaos
+-		;;
+ 	-zvmoe)
+ 		os=-zvmoe
+ 		;;
+@@ -1551,6 +1548,9 @@ case $basic_machine in
+ 	c4x-* | tic4x-*)
+ 		os=-coff
+ 		;;
++	c8051-*)
++		os=-elf
++		;;
+ 	hexagon-*)
+ 		os=-elf
+ 		;;
+@@ -1594,6 +1594,9 @@ case $basic_machine in
+ 	mips*-*)
+ 		os=-elf
+ 		;;
++	or1k-*)
++		os=-elf
++		;;
+ 	or32-*)
+ 		os=-coff
+ 		;;

package/libsoup/patches/patch-build-aux_depcomp

@@ -0,0 +1,682 @@
+--- libsoup-2.44.2.orig/build-aux/depcomp	2013-10-18 00:01:49.000000000 +0200
++++ libsoup-2.44.2/build-aux/depcomp	2014-04-14 17:21:42.708937363 +0200
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+ 
+-scriptversion=2013-05-30.07; # UTC
++scriptversion=2012-03-27.16; # UTC
+ 
+-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
++# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+ 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -27,9 +27,9 @@ scriptversion=2013-05-30.07; # UTC
+ 
+ case $1 in
+   '')
+-    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+-    exit 1;
+-    ;;
++     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
++     exit 1;
++     ;;
+   -h | --h*)
+     cat <<\EOF
+ Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+@@ -56,65 +56,11 @@ EOF
+     ;;
+ esac
+ 
+-# Get the directory component of the given path, and save it in the
+-# global variables '$dir'.  Note that this directory component will
+-# be either empty or ending with a '/' character.  This is deliberate.
+-set_dir_from ()
+-{
+-  case $1 in
+-    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+-      *) dir=;;
+-  esac
+-}
+-
+-# Get the suffix-stripped basename of the given path, and save it the
+-# global variable '$base'.
+-set_base_from ()
+-{
+-  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+-}
+-
+-# If no dependency file was actually created by the compiler invocation,
+-# we still have to create a dummy depfile, to avoid errors with the
+-# Makefile "include basename.Plo" scheme.
+-make_dummy_depfile ()
+-{
+-  echo "#dummy" > "$depfile"
+-}
+-
+-# Factor out some common post-processing of the generated depfile.
+-# Requires the auxiliary global variable '$tmpdepfile' to be set.
+-aix_post_process_depfile ()
+-{
+-  # If the compiler actually managed to produce a dependency file,
+-  # post-process it.
+-  if test -f "$tmpdepfile"; then
+-    # Each line is of the form 'foo.o: dependency.h'.
+-    # Do two passes, one to just change these to
+-    #   $object: dependency.h
+-    # and one to simply output
+-    #   dependency.h:
+-    # which is needed to avoid the deleted-header problem.
+-    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+-      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+-    } > "$depfile"
+-    rm -f "$tmpdepfile"
+-  else
+-    make_dummy_depfile
+-  fi
+-}
+-
+ # A tabulation character.
+ tab='	'
+ # A newline character.
+ nl='
+ '
+-# Character ranges might be problematic outside the C locale.
+-# These definitions help.
+-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+-lower=abcdefghijklmnopqrstuvwxyz
+-digits=0123456789
+-alpha=${upper}${lower}
+ 
+ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+   echo "depcomp: Variables source, object and depmode must be set" 1>&2
+@@ -128,9 +74,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile"
+ 
+ rm -f "$tmpdepfile"
+ 
+-# Avoid interferences from the environment.
+-gccflag= dashmflag=
+-
+ # Some modes work just like other modes, but use different flags.  We
+ # parameterize here, but still list the modes in the big case below,
+ # to make depend.m4 easier to write.  Note that we *cannot* use a case
+@@ -142,32 +85,32 @@ if test "$depmode" = hp; then
+ fi
+ 
+ if test "$depmode" = dashXmstdout; then
+-  # This is just like dashmstdout with a different argument.
+-  dashmflag=-xM
+-  depmode=dashmstdout
++   # This is just like dashmstdout with a different argument.
++   dashmflag=-xM
++   depmode=dashmstdout
+ fi
+ 
+ cygpath_u="cygpath -u -f -"
+ if test "$depmode" = msvcmsys; then
+-  # This is just like msvisualcpp but w/o cygpath translation.
+-  # Just convert the backslash-escaped backslashes to single forward
+-  # slashes to satisfy depend.m4
+-  cygpath_u='sed s,\\\\,/,g'
+-  depmode=msvisualcpp
++   # This is just like msvisualcpp but w/o cygpath translation.
++   # Just convert the backslash-escaped backslashes to single forward
++   # slashes to satisfy depend.m4
++   cygpath_u='sed s,\\\\,/,g'
++   depmode=msvisualcpp
+ fi
+ 
+ if test "$depmode" = msvc7msys; then
+-  # This is just like msvc7 but w/o cygpath translation.
+-  # Just convert the backslash-escaped backslashes to single forward
+-  # slashes to satisfy depend.m4
+-  cygpath_u='sed s,\\\\,/,g'
+-  depmode=msvc7
++   # This is just like msvc7 but w/o cygpath translation.
++   # Just convert the backslash-escaped backslashes to single forward
++   # slashes to satisfy depend.m4
++   cygpath_u='sed s,\\\\,/,g'
++   depmode=msvc7
+ fi
+ 
+ if test "$depmode" = xlc; then
+-  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+-  gccflag=-qmakedep=gcc,-MF
+-  depmode=gcc
++   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
++   gccflag=-qmakedep=gcc,-MF
++   depmode=gcc
+ fi
+ 
+ case "$depmode" in
+@@ -190,7 +133,8 @@ gcc3)
+   done
+   "$@"
+   stat=$?
+-  if test $stat -ne 0; then
++  if test $stat -eq 0; then :
++  else
+     rm -f "$tmpdepfile"
+     exit $stat
+   fi
+@@ -198,17 +142,13 @@ gcc3)
+   ;;
+ 
+ gcc)
+-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+-## (see the conditional assignment to $gccflag above).
+ ## There are various ways to get dependency output from gcc.  Here's
+ ## why we pick this rather obscure method:
+ ## - Don't want to use -MD because we'd like the dependencies to end
+ ##   up in a subdir.  Having to rename by hand is ugly.
+ ##   (We might end up doing this anyway to support other compilers.)
+ ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+-##   -MM, not -M (despite what the docs say).  Also, it might not be
+-##   supported by the other compilers which use the 'gcc' depmode.
++##   -MM, not -M (despite what the docs say).
+ ## - Using -M directly means running the compiler twice (even worse
+ ##   than renaming).
+   if test -z "$gccflag"; then
+@@ -216,14 +156,15 @@ gcc)
+   fi
+   "$@" -Wp,"$gccflag$tmpdepfile"
+   stat=$?
+-  if test $stat -ne 0; then
++  if test $stat -eq 0; then :
++  else
+     rm -f "$tmpdepfile"
+     exit $stat
+   fi
+   rm -f "$depfile"
+   echo "$object : \\" > "$depfile"
+-  # The second -e expression handles DOS-style file names with drive
+-  # letters.
++  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
++## The second -e expression handles DOS-style file names with drive letters.
+   sed -e 's/^[^:]*: / /' \
+       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+ ## This next piece of magic avoids the "deleted header file" problem.
+@@ -232,15 +173,15 @@ gcc)
+ ## typically no way to rebuild the header).  We avoid this by adding
+ ## dummy dependencies for each header file.  Too bad gcc doesn't do
+ ## this for us directly.
++  tr ' ' "$nl" < "$tmpdepfile" |
+ ## Some versions of gcc put a space before the ':'.  On the theory
+ ## that the space means something, we add a space to the output as
+ ## well.  hp depmode also adds that space, but also prefixes the VPATH
+ ## to the object.  Take care to not repeat it in the output.
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly.  Breaking it into two sed invocations is a workaround.
+-  tr ' ' "$nl" < "$tmpdepfile" \
+-    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+-    | sed -e 's/$/ :/' >> "$depfile"
++    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
++      | sed -e 's/$/ :/' >> "$depfile"
+   rm -f "$tmpdepfile"
+   ;;
+ 
+@@ -258,7 +199,8 @@ sgi)
+     "$@" -MDupdate "$tmpdepfile"
+   fi
+   stat=$?
+-  if test $stat -ne 0; then
++  if test $stat -eq 0; then :
++  else
+     rm -f "$tmpdepfile"
+     exit $stat
+   fi
+@@ -266,6 +208,7 @@ sgi)
+ 
+   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+     echo "$object : \\" > "$depfile"
++
+     # Clip off the initial element (the dependent).  Don't try to be
+     # clever and replace this with sed code, as IRIX sed won't handle
+     # lines with more than a fixed number of characters (4096 in
+@@ -273,15 +216,19 @@ sgi)
+     # the IRIX cc adds comments like '#:fec' to the end of the
+     # dependency line.
+     tr ' ' "$nl" < "$tmpdepfile" \
+-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+-      | tr "$nl" ' ' >> "$depfile"
++    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
++    tr "$nl" ' ' >> "$depfile"
+     echo >> "$depfile"
++
+     # The second pass generates a dummy entry for each header file.
+     tr ' ' "$nl" < "$tmpdepfile" \
+-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+-      >> "$depfile"
++   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
++   >> "$depfile"
+   else
+-    make_dummy_depfile
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+@@ -299,8 +246,9 @@ aix)
+   # current directory.  Also, the AIX compiler puts '$object:' at the
+   # start of each line; $object doesn't have directory information.
+   # Version 6 uses the directory in both cases.
+-  set_dir_from "$object"
+-  set_base_from "$object"
++  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++  test "x$dir" = "x$object" && dir=
++  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+   if test "$libtool" = yes; then
+     tmpdepfile1=$dir$base.u
+     tmpdepfile2=$base.u
+@@ -313,7 +261,9 @@ aix)
+     "$@" -M
+   fi
+   stat=$?
+-  if test $stat -ne 0; then
++
++  if test $stat -eq 0; then :
++  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+     exit $stat
+   fi
+@@ -322,113 +272,65 @@ aix)
+   do
+     test -f "$tmpdepfile" && break
+   done
+-  aix_post_process_depfile
+-  ;;
+-
+-tcc)
+-  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+-  # FIXME: That version still under development at the moment of writing.
+-  #        Make that this statement remains true also for stable, released
+-  #        versions.
+-  # It will wrap lines (doesn't matter whether long or short) with a
+-  # trailing '\', as in:
+-  #
+-  #   foo.o : \
+-  #    foo.c \
+-  #    foo.h \
+-  #
+-  # It will put a trailing '\' even on the last line, and will use leading
+-  # spaces rather than leading tabs (at least since its commit 0394caf7
+-  # "Emit spaces for -MD").
+-  "$@" -MD -MF "$tmpdepfile"
+-  stat=$?
+-  if test $stat -ne 0; then
+-    rm -f "$tmpdepfile"
+-    exit $stat
++  if test -f "$tmpdepfile"; then
++    # Each line is of the form 'foo.o: dependent.h'.
++    # Do two passes, one to just change these to
++    # '$object: dependent.h' and one to simply 'dependent.h:'.
++    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++  else
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
+   fi
+-  rm -f "$depfile"
+-  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+-  # We have to change lines of the first kind to '$object: \'.
+-  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+-  # And for each line of the second kind, we have to emit a 'dep.h:'
+-  # dummy dependency, to avoid the deleted-header problem.
+-  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+   rm -f "$tmpdepfile"
+   ;;
+ 
+-## The order of this option in the case statement is important, since the
+-## shell code in configure will try each of these formats in the order
+-## listed in this file.  A plain '-MD' option would be understood by many
+-## compilers, so we must ensure this comes after the gcc and icc options.
+-pgcc)
+-  # Portland's C compiler understands '-MD'.
+-  # Will always output deps to 'file.d' where file is the root name of the
+-  # source file under compilation, even if file resides in a subdirectory.
+-  # The object file name does not affect the name of the '.d' file.
+-  # pgcc 10.2 will output
++icc)
++  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
++  # However on
++  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
++  # ICC 7.0 will fill foo.d with something like
++  #    foo.o: sub/foo.c
++  #    foo.o: sub/foo.h
++  # which is wrong.  We want
++  #    sub/foo.o: sub/foo.c
++  #    sub/foo.o: sub/foo.h
++  #    sub/foo.c:
++  #    sub/foo.h:
++  # ICC 7.1 will output
+   #    foo.o: sub/foo.c sub/foo.h
+-  # and will wrap long lines using '\' :
++  # and will wrap long lines using '\':
+   #    foo.o: sub/foo.c ... \
+   #     sub/foo.h ... \
+   #     ...
+-  set_dir_from "$object"
+-  # Use the source, not the object, to determine the base name, since
+-  # that's sadly what pgcc will do too.
+-  set_base_from "$source"
+-  tmpdepfile=$base.d
+-
+-  # For projects that build the same source file twice into different object
+-  # files, the pgcc approach of using the *source* file root name can cause
+-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+-  # the same $tmpdepfile.
+-  lockdir=$base.d-lock
+-  trap "
+-    echo '$0: caught signal, cleaning up...' >&2
+-    rmdir '$lockdir'
+-    exit 1
+-  " 1 2 13 15
+-  numtries=100
+-  i=$numtries
+-  while test $i -gt 0; do
+-    # mkdir is a portable test-and-set.
+-    if mkdir "$lockdir" 2>/dev/null; then
+-      # This process acquired the lock.
+-      "$@" -MD
+-      stat=$?
+-      # Release the lock.
+-      rmdir "$lockdir"
+-      break
+-    else
+-      # If the lock is being held by a different process, wait
+-      # until the winning process is done or we timeout.
+-      while test -d "$lockdir" && test $i -gt 0; do
+-        sleep 1
+-        i=`expr $i - 1`
+-      done
+-    fi
+-    i=`expr $i - 1`
+-  done
+-  trap - 1 2 13 15
+-  if test $i -le 0; then
+-    echo "$0: failed to acquire lock after $numtries attempts" >&2
+-    echo "$0: check lockdir '$lockdir'" >&2
+-    exit 1
+-  fi
+-
+-  if test $stat -ne 0; then
++  # tcc 0.9.26 (FIXME still under development at the moment of writing)
++  # will emit a similar output, but also prepend the continuation lines
++  # with horizontal tabulation characters.
++  "$@" -MD -MF "$tmpdepfile"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
+     rm -f "$tmpdepfile"
+     exit $stat
+   fi
+   rm -f "$depfile"
+-  # Each line is of the form `foo.o: dependent.h',
+-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
++  # Each line is of the form 'foo.o: dependent.h',
++  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+   # Do two passes, one to just change these to
+-  # `$object: dependent.h' and one to simply `dependent.h:'.
+-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+-  # Some versions of the HPUX 10.20 sed can't process this invocation
+-  # correctly.  Breaking it into two sed invocations is a workaround.
+-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+-    | sed -e 's/$/ :/' >> "$depfile"
++  # '$object: dependent.h' and one to simply 'dependent.h:'.
++  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
++    < "$tmpdepfile" > "$depfile"
++  sed '
++    s/[ '"$tab"'][ '"$tab"']*/ /g
++    s/^ *//
++    s/ *\\*$//
++    s/^[^:]*: *//
++    /^$/d
++    /:$/d
++    s/$/ :/
++  ' < "$tmpdepfile" >> "$depfile"
+   rm -f "$tmpdepfile"
+   ;;
+ 
+@@ -439,8 +341,9 @@ hp2)
+   # 'foo.d', which lands next to the object file, wherever that
+   # happens to be.
+   # Much of this is similar to the tru64 case; see comments there.
+-  set_dir_from  "$object"
+-  set_base_from "$object"
++  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++  test "x$dir" = "x$object" && dir=
++  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+   if test "$libtool" = yes; then
+     tmpdepfile1=$dir$base.d
+     tmpdepfile2=$dir.libs/$base.d
+@@ -451,7 +354,8 @@ hp2)
+     "$@" +Maked
+   fi
+   stat=$?
+-  if test $stat -ne 0; then
++  if test $stat -eq 0; then :
++  else
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      exit $stat
+   fi
+@@ -461,61 +365,76 @@ hp2)
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+-    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
++    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+     # Add 'dependent.h:' lines.
+     sed -ne '2,${
+-               s/^ *//
+-               s/ \\*$//
+-               s/$/:/
+-               p
+-             }' "$tmpdepfile" >> "$depfile"
++	       s/^ *//
++	       s/ \\*$//
++	       s/$/:/
++	       p
++	     }' "$tmpdepfile" >> "$depfile"
+   else
+-    make_dummy_depfile
++    echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile" "$tmpdepfile2"
+   ;;
+ 
+ tru64)
+-  # The Tru64 compiler uses -MD to generate dependencies as a side
+-  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+-  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+-  # dependencies in 'foo.d' instead, so we check for that too.
+-  # Subdirectories are respected.
+-  set_dir_from  "$object"
+-  set_base_from "$object"
++   # The Tru64 compiler uses -MD to generate dependencies as a side
++   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
++   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
++   # dependencies in 'foo.d' instead, so we check for that too.
++   # Subdirectories are respected.
++   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++   test "x$dir" = "x$object" && dir=
++   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ 
+-  if test "$libtool" = yes; then
+-    # Libtool generates 2 separate objects for the 2 libraries.  These
+-    # two compilations output dependencies in $dir.libs/$base.o.d and
+-    # in $dir$base.o.d.  We have to check for both files, because
+-    # one of the two compilations can be disabled.  We should prefer
+-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+-    # automatically cleaned when .libs/ is deleted, while ignoring
+-    # the former would cause a distcleancheck panic.
+-    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+-    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+-    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+-    "$@" -Wc,-MD
+-  else
+-    tmpdepfile1=$dir$base.d
+-    tmpdepfile2=$dir$base.d
+-    tmpdepfile3=$dir$base.d
+-    "$@" -MD
+-  fi
++   if test "$libtool" = yes; then
++      # With Tru64 cc, shared objects can also be used to make a
++      # static library.  This mechanism is used in libtool 1.4 series to
++      # handle both shared and static libraries in a single compilation.
++      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
++      #
++      # With libtool 1.5 this exception was removed, and libtool now
++      # generates 2 separate objects for the 2 libraries.  These two
++      # compilations output dependencies in $dir.libs/$base.o.d and
++      # in $dir$base.o.d.  We have to check for both files, because
++      # one of the two compilations can be disabled.  We should prefer
++      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
++      # automatically cleaned when .libs/ is deleted, while ignoring
++      # the former would cause a distcleancheck panic.
++      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
++      tmpdepfile2=$dir$base.o.d          # libtool 1.5
++      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
++      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
++      "$@" -Wc,-MD
++   else
++      tmpdepfile1=$dir$base.o.d
++      tmpdepfile2=$dir$base.d
++      tmpdepfile3=$dir$base.d
++      tmpdepfile4=$dir$base.d
++      "$@" -MD
++   fi
+ 
+-  stat=$?
+-  if test $stat -ne 0; then
+-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+-    exit $stat
+-  fi
++   stat=$?
++   if test $stat -eq 0; then :
++   else
++      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++      exit $stat
++   fi
+ 
+-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+-  do
+-    test -f "$tmpdepfile" && break
+-  done
+-  # Same post-processing that is required for AIX mode.
+-  aix_post_process_depfile
+-  ;;
++   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++   do
++     test -f "$tmpdepfile" && break
++   done
++   if test -f "$tmpdepfile"; then
++      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++   else
++      echo "#dummy" > "$depfile"
++   fi
++   rm -f "$tmpdepfile"
++   ;;
+ 
+ msvc7)
+   if test "$libtool" = yes; then
+@@ -526,7 +445,8 @@ msvc7)
+   "$@" $showIncludes > "$tmpdepfile"
+   stat=$?
+   grep -v '^Note: including file: ' "$tmpdepfile"
+-  if test $stat -ne 0; then
++  if test "$stat" = 0; then :
++  else
+     rm -f "$tmpdepfile"
+     exit $stat
+   fi
+@@ -552,7 +472,6 @@ $ {
+   G
+   p
+ }' >> "$depfile"
+-  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+   rm -f "$tmpdepfile"
+   ;;
+ 
+@@ -604,14 +523,13 @@ dashmstdout)
+   # in the target name.  This is to cope with DOS-style filenames:
+   # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+   "$@" $dashmflag |
+-    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
++    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+   rm -f "$depfile"
+   cat < "$tmpdepfile" > "$depfile"
+-  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+-  # correctly.  Breaking it into two sed invocations is a workaround.
+-  tr ' ' "$nl" < "$tmpdepfile" \
+-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+-    | sed -e 's/$/ :/' >> "$depfile"
++  tr ' ' "$nl" < "$tmpdepfile" | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+   rm -f "$tmpdepfile"
+   ;;
+ 
+@@ -664,12 +582,10 @@ makedepend)
+   # makedepend may prepend the VPATH from the source file name to the object.
+   # No need to regex-escape $object, excess matching of '.' is harmless.
+   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+-  # Some versions of the HPUX 10.20 sed can't process the last invocation
+-  # correctly.  Breaking it into two sed invocations is a workaround.
+-  sed '1,2d' "$tmpdepfile" \
+-    | tr ' ' "$nl" \
+-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+-    | sed -e 's/$/ :/' >> "$depfile"
++  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+   rm -f "$tmpdepfile" "$tmpdepfile".bak
+   ;;
+ 
+@@ -705,10 +621,10 @@ cpp)
+     esac
+   done
+ 
+-  "$@" -E \
+-    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+-             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+-    | sed '$ s: \\$::' > "$tmpdepfile"
++  "$@" -E |
++    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    sed '$ s: \\$::' > "$tmpdepfile"
+   rm -f "$depfile"
+   echo "$object : \\" > "$depfile"
+   cat < "$tmpdepfile" >> "$depfile"
+@@ -740,15 +656,15 @@ msvisualcpp)
+       shift
+       ;;
+     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+-        set fnord "$@"
+-        shift
+-        shift
+-        ;;
++	set fnord "$@"
++	shift
++	shift
++	;;
+     *)
+-        set fnord "$@" "$arg"
+-        shift
+-        shift
+-        ;;
++	set fnord "$@" "$arg"
++	shift
++	shift
++	;;
+     esac
+   done
+   "$@" -E 2>/dev/null |

package/libsoup/patches/patch-build-aux_missing

@@ -0,0 +1,440 @@
+--- libsoup-2.44.2.orig/build-aux/missing	2013-10-18 00:01:48.000000000 +0200
++++ libsoup-2.44.2/build-aux/missing	2014-04-14 17:21:42.180934853 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+-# Common wrapper for a few potentially missing GNU programs.
++# Common stub for a few missing GNU programs while installing.
+ 
+-scriptversion=2012-06-26.16; # UTC
++scriptversion=2012-01-06.18; # UTC
+ 
+-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
++# Copyright (C) 1996-2012 Free Software Foundation, Inc.
++# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+ 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -29,33 +29,61 @@ if test $# -eq 0; then
+   exit 1
+ fi
+ 
+-case $1 in
++run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+ 
+-  --is-lightweight)
+-    # Used by our autoconf macros to check whether the available missing
+-    # script is modern enough.
+-    exit 0
+-    ;;
++# In the cases where this matters, 'missing' is being run in the
++# srcdir already.
++if test -f configure.ac; then
++  configure_ac=configure.ac
++else
++  configure_ac=configure.in
++fi
+ 
+-  --run)
+-    # Back-compat with the calling convention used by older automake.
+-    shift
+-    ;;
++msg="missing on your system"
++
++case $1 in
++--run)
++  # Try to run requested program, and just exit if it succeeds.
++  run=
++  shift
++  "$@" && exit 0
++  # Exit code 63 means version mismatch.  This often happens
++  # when the user try to use an ancient version of a tool on
++  # a file that requires a minimum version.  In this case we
++  # we should proceed has if the program had been absent, or
++  # if --run hadn't been passed.
++  if test $? = 63; then
++    run=:
++    msg="probably too old"
++  fi
++  ;;
+ 
+   -h|--h|--he|--hel|--help)
+     echo "\
+ $0 [OPTION]... PROGRAM [ARGUMENT]...
+ 
+-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+-to PROGRAM being missing or too old.
++Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
++error status if there is no known handling for PROGRAM.
+ 
+ Options:
+   -h, --help      display this help and exit
+   -v, --version   output version information and exit
++  --run           try to run the given command, and emulate it if it fails
+ 
+ Supported PROGRAM values:
+-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+-  bison     yacc      flex         lex       help2man
++  aclocal      touch file 'aclocal.m4'
++  autoconf     touch file 'configure'
++  autoheader   touch file 'config.h.in'
++  autom4te     touch the output file, or create a stub one
++  automake     touch all 'Makefile.in' files
++  bison        create 'y.tab.[ch]', if possible, from existing .[ch]
++  flex         create 'lex.yy.c', if possible, from existing .c
++  help2man     touch the output file
++  lex          create 'lex.yy.c', if possible, from existing .c
++  makeinfo     touch the output file
++  yacc         create 'y.tab.[ch]', if possible, from existing .[ch]
+ 
+ Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+ 'g' are ignored when checking the name.
+@@ -70,141 +98,228 @@ Send bug reports to <bug-automake@gnu.or
+     ;;
+ 
+   -*)
+-    echo 1>&2 "$0: unknown '$1' option"
++    echo 1>&2 "$0: Unknown '$1' option"
+     echo 1>&2 "Try '$0 --help' for more information"
+     exit 1
+     ;;
+ 
+ esac
+ 
+-# Run the given program, remember its exit status.
+-"$@"; st=$?
++# normalize program name to check for.
++program=`echo "$1" | sed '
++  s/^gnu-//; t
++  s/^gnu//; t
++  s/^g//; t'`
+ 
+-# If it succeeded, we are done.
+-test $st -eq 0 && exit 0
++# Now exit if we have it, but it failed.  Also exit now if we
++# don't have it and --version was passed (most likely to detect
++# the program).  This is about non-GNU programs, so use $1 not
++# $program.
++case $1 in
++  lex*|yacc*)
++    # Not GNU programs, they don't have --version.
++    ;;
+ 
+-# Also exit now if we it failed (or wasn't found), and '--version' was
+-# passed; such an option is passed most likely to detect whether the
+-# program is present and works.
+-case $2 in --version|--help) exit $st;; esac
++  *)
++    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
++       # We have it, but it failed.
++       exit 1
++    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++       # Could not run --version or --help.  This is probably someone
++       # running '$TOOL --version' or '$TOOL --help' to check whether
++       # $TOOL exists and not knowing $TOOL uses missing.
++       exit 1
++    fi
++    ;;
++esac
+ 
+-# Exit code 63 means version mismatch.  This often happens when the user
+-# tries to use an ancient version of a tool on a file that requires a
+-# minimum version.
+-if test $st -eq 63; then
+-  msg="probably too old"
+-elif test $st -eq 127; then
+-  # Program was missing.
+-  msg="missing on your system"
+-else
+-  # Program was found and executed, but failed.  Give up.
+-  exit $st
+-fi
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case $program in
++  aclocal*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
++         to install the Automake and Perl packages.  Grab them from
++         any GNU archive site."
++    touch aclocal.m4
++    ;;
+ 
+-perl_URL=http://www.perl.org/
+-flex_URL=http://flex.sourceforge.net/
+-gnu_software_URL=http://www.gnu.org/software
++  autoconf*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified '${configure_ac}'.  You might want to install the
++         Autoconf and GNU m4 packages.  Grab them from any GNU
++         archive site."
++    touch configure
++    ;;
+ 
+-program_details ()
+-{
+-  case $1 in
+-    aclocal|automake)
+-      echo "The '$1' program is part of the GNU Automake package:"
+-      echo "<$gnu_software_URL/automake>"
+-      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+-      echo "<$gnu_software_URL/autoconf>"
+-      echo "<$gnu_software_URL/m4/>"
+-      echo "<$perl_URL>"
+-      ;;
+-    autoconf|autom4te|autoheader)
+-      echo "The '$1' program is part of the GNU Autoconf package:"
+-      echo "<$gnu_software_URL/autoconf/>"
+-      echo "It also requires GNU m4 and Perl in order to run:"
+-      echo "<$gnu_software_URL/m4/>"
+-      echo "<$perl_URL>"
+-      ;;
+-  esac
+-}
++  autoheader*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified 'acconfig.h' or '${configure_ac}'.  You might want
++         to install the Autoconf and GNU m4 packages.  Grab them
++         from any GNU archive site."
++    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
++    test -z "$files" && files="config.h"
++    touch_files=
++    for f in $files; do
++      case $f in
++      *:*) touch_files="$touch_files "`echo "$f" |
++				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
++      *) touch_files="$touch_files $f.in";;
++      esac
++    done
++    touch $touch_files
++    ;;
+ 
+-give_advice ()
+-{
+-  # Normalize program name to check for.
+-  normalized_program=`echo "$1" | sed '
+-    s/^gnu-//; t
+-    s/^gnu//; t
+-    s/^g//; t'`
++  automake*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
++         You might want to install the Automake and Perl packages.
++         Grab them from any GNU archive site."
++    find . -type f -name Makefile.am -print |
++	   sed 's/\.am$/.in/' |
++	   while read f; do touch "$f"; done
++    ;;
+ 
+-  printf '%s\n' "'$1' is $msg."
++  autom4te*)
++    echo 1>&2 "\
++WARNING: '$1' is needed, but is $msg.
++         You might have modified some files without having the
++         proper tools for further handling them.
++         You can get '$1' as part of Autoconf from any GNU
++         archive site."
+ 
+-  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+-  case $normalized_program in
+-    autoconf*)
+-      echo "You should only need it if you modified 'configure.ac',"
+-      echo "or m4 files included by it."
+-      program_details 'autoconf'
+-      ;;
+-    autoheader*)
+-      echo "You should only need it if you modified 'acconfig.h' or"
+-      echo "$configure_deps."
+-      program_details 'autoheader'
+-      ;;
+-    automake*)
+-      echo "You should only need it if you modified 'Makefile.am' or"
+-      echo "$configure_deps."
+-      program_details 'automake'
+-      ;;
+-    aclocal*)
+-      echo "You should only need it if you modified 'acinclude.m4' or"
+-      echo "$configure_deps."
+-      program_details 'aclocal'
+-      ;;
+-   autom4te*)
+-      echo "You might have modified some maintainer files that require"
+-      echo "the 'automa4te' program to be rebuilt."
+-      program_details 'autom4te'
+-      ;;
+-    bison*|yacc*)
+-      echo "You should only need it if you modified a '.y' file."
+-      echo "You may want to install the GNU Bison package:"
+-      echo "<$gnu_software_URL/bison/>"
+-      ;;
+-    lex*|flex*)
+-      echo "You should only need it if you modified a '.l' file."
+-      echo "You may want to install the Fast Lexical Analyzer package:"
+-      echo "<$flex_URL>"
+-      ;;
+-    help2man*)
+-      echo "You should only need it if you modified a dependency" \
+-           "of a man page."
+-      echo "You may want to install the GNU Help2man package:"
+-      echo "<$gnu_software_URL/help2man/>"
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++    if test -f "$file"; then
++	touch $file
++    else
++	test -z "$file" || exec >$file
++	echo "#! /bin/sh"
++	echo "# Created by GNU Automake missing as a replacement of"
++	echo "#  $ $@"
++	echo "exit 0"
++	chmod +x $file
++	exit 1
++    fi
+     ;;
+-    makeinfo*)
+-      echo "You should only need it if you modified a '.texi' file, or"
+-      echo "any other file indirectly affecting the aspect of the manual."
+-      echo "You might want to install the Texinfo package:"
+-      echo "<$gnu_software_URL/texinfo/>"
+-      echo "The spurious makeinfo call might also be the consequence of"
+-      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+-      echo "want to install GNU make:"
+-      echo "<$gnu_software_URL/make/>"
+-      ;;
+-    *)
+-      echo "You might have modified some files without having the proper"
+-      echo "tools for further handling them.  Check the 'README' file, it"
+-      echo "often tells you about the needed prerequisites for installing"
+-      echo "this package.  You may also peek at any GNU archive site, in"
+-      echo "case some other package contains this missing '$1' program."
+-      ;;
+-  esac
+-}
+ 
+-give_advice "$1" | sed -e '1s/^/WARNING: /' \
+-                       -e '2,$s/^/         /' >&2
++  bison*|yacc*)
++    echo 1>&2 "\
++WARNING: '$1' $msg.  You should only need it if
++         you modified a '.y' file.  You may need the Bison package
++         in order for those modifications to take effect.  You can get
++         Bison from any GNU archive site."
++    rm -f y.tab.c y.tab.h
++    if test $# -ne 1; then
++        eval LASTARG=\${$#}
++	case $LASTARG in
++	*.y)
++	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
++	    if test -f "$SRCFILE"; then
++	         cp "$SRCFILE" y.tab.c
++	    fi
++	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
++	    if test -f "$SRCFILE"; then
++	         cp "$SRCFILE" y.tab.h
++	    fi
++	  ;;
++	esac
++    fi
++    if test ! -f y.tab.h; then
++	echo >y.tab.h
++    fi
++    if test ! -f y.tab.c; then
++	echo 'main() { return 0; }' >y.tab.c
++    fi
++    ;;
+ 
+-# Propagate the correct exit status (expected to be 127 for a program
+-# not found, 63 for a program that failed due to version mismatch).
+-exit $st
++  lex*|flex*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified a '.l' file.  You may need the Flex package
++         in order for those modifications to take effect.  You can get
++         Flex from any GNU archive site."
++    rm -f lex.yy.c
++    if test $# -ne 1; then
++        eval LASTARG=\${$#}
++	case $LASTARG in
++	*.l)
++	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
++	    if test -f "$SRCFILE"; then
++	         cp "$SRCFILE" lex.yy.c
++	    fi
++	  ;;
++	esac
++    fi
++    if test ! -f lex.yy.c; then
++	echo 'main() { return 0; }' >lex.yy.c
++    fi
++    ;;
++
++  help2man*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++	 you modified a dependency of a manual page.  You may need the
++	 Help2man package in order for those modifications to take
++	 effect.  You can get Help2man from any GNU archive site."
++
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++    if test -f "$file"; then
++	touch $file
++    else
++	test -z "$file" || exec >$file
++	echo ".ab help2man is required to generate this page"
++	exit $?
++    fi
++    ;;
++
++  makeinfo*)
++    echo 1>&2 "\
++WARNING: '$1' is $msg.  You should only need it if
++         you modified a '.texi' or '.texinfo' file, or any other file
++         indirectly affecting the aspect of the manual.  The spurious
++         call might also be the consequence of using a buggy 'make' (AIX,
++         DU, IRIX).  You might want to install the Texinfo package or
++         the GNU make package.  Grab either from any GNU archive site."
++    # The file to touch is that specified with -o ...
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++    if test -z "$file"; then
++      # ... or it is the one specified with @setfilename ...
++      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++      file=`sed -n '
++	/^@setfilename/{
++	  s/.* \([^ ]*\) *$/\1/
++	  p
++	  q
++	}' $infile`
++      # ... or it is derived from the source name (dir/f.texi becomes f.info)
++      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
++    fi
++    # If the file does not exist, the user really needs makeinfo;
++    # let's fail without touching anything.
++    test -f $file || exit 1
++    touch $file
++    ;;
++
++  *)
++    echo 1>&2 "\
++WARNING: '$1' is needed, and is $msg.
++         You might have modified some files without having the
++         proper tools for further handling them.  Check the 'README' file,
++         it often tells you about the needed prerequisites for installing
++         this package.  You may also peek at any GNU archive site, in case
++         some other package would contain this missing '$1' program."
++    exit 1
++    ;;
++esac
++
++exit 0
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)

package/libsoup/patches/patch-configure_ac

@@ -0,0 +1,10 @@
+--- libsoup-2.44.2.orig/configure.ac	2013-11-11 23:40:56.000000000 +0100
++++ libsoup-2.44.2/configure.ac	2014-04-14 17:20:43.656655730 +0200
+@@ -116,7 +116,6 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32
+ dnl ************************
+ dnl *** gettext/intltool ***
+ dnl ************************
+-IT_PROG_INTLTOOL([0.35.0])
+ GETTEXT_PACKAGE=libsoup
+ AC_SUBST([GETTEXT_PACKAGE])
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gettext domain name])

package/libwebp/Makefile

@@ -0,0 +1,27 @@
+# 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:=		libwebp
+PKG_VERSION:=		0.3.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		dc862bb4006d819b7587767a9e83d31f
+PKG_DESCR:=		new image format for the web
+PKG_SECTION:=		libs
+PKG_URL:=		https://developers.google.com/speed/webp/
+PKG_SITES:=		https://webp.googlecode.com/files/
+PKG_OPTS:=		dev
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBWEBP,libwebp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libwebp-install:
+	$(INSTALL_DIR) $(IDIR_LIBWEBP)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libwebp*.so* \
+		$(IDIR_LIBWEBP)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/ltrace/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:=		ltrace
+PKG_VERSION:=		0.7.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2cb7660738b1e28fd84ce0dc06f6ea69
+PKG_DESCR:=		intercepts and records dynamic library calls 
+PKG_SECTION:=		debug
+PKG_DEPENDS:=		libelf
+PKG_BUILDDEP:=		libelf
+PKG_URL:=		http://ltrace.org/
+PKG_SITES:=		https://alioth.debian.org/frs/download.php/file/3948/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LTRACE,ltrace,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+ltrace-install:
+	$(INSTALL_DIR) $(IDIR_LTRACE)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/ltrace \
+		$(IDIR_LTRACE)/usr/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/ltrace/patches/patch-breakpoints_c

@@ -0,0 +1,14 @@
+--- ltrace-0.7.3.orig/breakpoints.c	2013-09-09 11:46:54.000000000 +0200
++++ ltrace-0.7.3/breakpoints.c	2013-10-16 11:26:00.000000000 +0200
+@@ -159,9 +159,10 @@ int
+ breakpoint_clone(struct breakpoint *retp, struct Process *new_proc,
+ 		 struct breakpoint *bp, struct Process *old_proc)
+ {
++	__attribute__((unused))int rc;
+ 	struct library_symbol *libsym = NULL;
+ 	if (bp->libsym != NULL) {
+-		int rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
++		rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
+ 		assert(rc == 0);
+ 	}
+ 

package/ltrace/patches/patch-breakpoints_c.orig

@@ -0,0 +1,14 @@
+--- ltrace-0.7.3.orig/breakpoints.c	2013-09-09 11:46:54.000000000 +0200
++++ ltrace-0.7.3/breakpoints.c	2013-10-16 11:13:21.000000000 +0200
+@@ -159,9 +159,10 @@ int
+ breakpoint_clone(struct breakpoint *retp, struct Process *new_proc,
+ 		 struct breakpoint *bp, struct Process *old_proc)
+ {
++	int rc;
+ 	struct library_symbol *libsym = NULL;
+ 	if (bp->libsym != NULL) {
+-		int rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
++		rc = proc_find_symbol(new_proc, bp->libsym, NULL, &libsym);
+ 		assert(rc == 0);
+ 	}
+ 

package/ltrace/patches/patch-handle_event_c

@@ -0,0 +1,19 @@
+--- ltrace-0.7.3.orig/handle_event.c	2013-02-05 12:05:39.000000000 +0100
++++ ltrace-0.7.3/handle_event.c	2013-10-16 11:29:03.000000000 +0200
+@@ -533,6 +533,7 @@ calc_time_spent(Process *proc) {
+ 
+ static void
+ handle_sysret(Event *event) {
++	__attribute__((unused))unsigned d;
+ 	debug(DEBUG_FUNCTION, "handle_sysret(pid=%d, sysnum=%d)", event->proc->pid, event->e_un.sysnum);
+ 	if (event->proc->state != STATE_IGNORED) {
+ 		if (opt_T || options.summary) {
+@@ -544,7 +545,7 @@ handle_sysret(Event *event) {
+ 						     event->e_un.sysnum));
+ 
+ 		assert(event->proc->callstack_depth > 0);
+-		unsigned d = event->proc->callstack_depth - 1;
++		d = event->proc->callstack_depth - 1;
+ 		assert(event->proc->callstack[d].is_syscall);
+ 		callstack_pop(event->proc);
+ 	}

package/ltrace/patches/patch-proc_c

@@ -0,0 +1,32 @@
+--- ltrace-0.7.3.orig/proc.c	2013-02-05 12:05:39.000000000 +0100
++++ ltrace-0.7.3/proc.c	2013-10-16 11:37:49.000000000 +0200
+@@ -329,6 +329,7 @@ clone_single_bp(void *key, void *value,
+ int
+ process_clone(struct Process *retp, struct Process *proc, pid_t pid)
+ {
++	__attribute__((unused))int rc;
+ 	if (process_bare_init(retp, proc->filename, pid, 0) < 0) {
+ 	fail1:
+ 		fprintf(stderr, "failed to clone process %d->%d : %s\n",
+@@ -432,7 +433,7 @@ process_clone(struct Process *retp, stru
+ 		 * library.  */
+ 		if (!elem->is_syscall && elem->c_un.libfunc != NULL) {
+ 			struct library_symbol *libfunc = elem->c_un.libfunc;
+-			int rc = proc_find_symbol(retp, libfunc,
++			rc = proc_find_symbol(retp, libfunc,
+ 						  NULL, &elem->c_un.libfunc);
+ 			assert(rc == 0);
+ 		}
+@@ -937,10 +938,11 @@ proc_add_breakpoint(struct Process *proc
+ void
+ proc_remove_breakpoint(struct Process *proc, struct breakpoint *bp)
+ {
++	__attribute__((unused))struct breakpoint *removed;
+ 	debug(DEBUG_FUNCTION, "proc_remove_breakpoint(pid=%d, %s@%p)",
+ 	      proc->pid, breakpoint_name(bp), bp->addr);
+ 	check_leader(proc);
+-	struct breakpoint *removed = dict_remove(proc->breakpoints, bp->addr);
++	removed = dict_remove(proc->breakpoints, bp->addr);
+ 	assert(removed == bp);
+ }
+ 

package/midori/Makefile

@@ -0,0 +1,39 @@
+# 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:=		midori
+PKG_VERSION:=		0.5.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		5815eac39f4d9511ce2c71a81567647f
+PKG_DESCR:=		web browser
+PKG_SECTION:=		x11/apps
+PKG_DEPENDS:=		libnotify webkitgtk
+PKG_BUILDDEP:=		autotool cmake-host vala-host libnotify webkitgtk
+PKG_BUILDDEP+=		librsvg-host librsvg
+PKG_URL:=		http://www.midori-browser.org
+PKG_SITES:=		http://www.openadk.org/distfiles/
+
+WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,MIDORI,midori,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=          manual
+
+do-configure:
+	(cd $(WRKBUILD) && PATH='${HOST_PATH}' \
+		cmake -DCMAKE_SYSTEM_NAME=Linux \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DENABLE_NLS=0 \
+		-DUSE_ZEITGEIST=0 \
+		$(WRKSRC)/)
+
+midori-install:
+	$(INSTALL_DIR) $(IDIR_MIDORI)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/midori \
+		$(IDIR_MIDORI)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/mplayer/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
 PKG_VERSION:=		1.1.1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		39dd55f30eb5403f219a606e79a6648a
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
@@ -19,6 +19,8 @@ PKG_BUILDDEP+=		xvidcore libvpx gettext-tiny
 PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://www.mplayerhq.hu/MPlayer/releases/
 
+PKG_BUILDDEP_IBM_X40:=	yasm-host
+
 DISTFILES:=		MPlayer-$(PKG_VERSION).tar.xz
 WRKDIST=		${WRKDIR}/MPlayer-${PKG_VERSION}
 
@@ -89,6 +91,12 @@ else
 CONFIGURE_DIRECTFB=	--disable-directfb
 endif
 
+ifeq ($(ADK_TARGET_SYSTEM_IBM_X40),y)
+			--yasm=${STAGING_HOST_DIR}/usr/bin/yasm
+else
+			--yasm=''
+endif
+
 CONFIGURE_ARGS:=	--prefix=/usr \
 			--enable-x11 \
 			--confdir=/etc \
@@ -96,8 +104,6 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--target=${ARCH}-linux \
 			--cc='$(TARGET_CC)' \
 			--host-cc=$(CC_FOR_BUILD) \
-			--yasm='' \
-			--disable-mencoder \
 			--enable-fbdev \
 			--enable-alsa \
 			--enable-tv \
@@ -109,7 +115,11 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--enable-faac \
 			--enable-theora \
 			--enable-xvid \
+			--enable-x264 \
+			--enable-x264-lavc \
+			--disable-mencoder \
 			--disable-ossaudio \
+			--disable-caca \
 			--disable-vm \
 			--disable-iconv \
 			--disable-lirc \
@@ -141,6 +151,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--disable-xinerama \
 			--disable-vidix \
 			--disable-gl \
+			--disable-ssse3 \
 			--extra-cflags="${EXTRA_CFLAGS}" \
 			${CONFIGURE_CPU_OPTS} \
 			${CONFIGURE_DEBUG} \

package/mplayer/patches/patch-ffmpeg_libavcodec_h264_cabac_c

@@ -0,0 +1,39 @@
+--- MPlayer-1.1.1.orig/ffmpeg/libavcodec/h264_cabac.c	2013-05-05 20:11:42.000000000 +0200
++++ MPlayer-1.1.1/ffmpeg/libavcodec/h264_cabac.c	2014-03-27 12:24:39.544699747 +0100
+@@ -39,10 +39,6 @@
+ #include "h264_mvpred.h"
+ #include "golomb.h"
+ 
+-#if ARCH_X86
+-#include "x86/h264_i386.h"
+-#endif
+-
+ //#undef NDEBUG
+ #include <assert.h>
+ 
+@@ -1652,17 +1648,6 @@ decode_cabac_residual_internal(H264Conte
+             index[coeff_count++] = last;\
+         }
+         const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
+-#if ARCH_X86 && HAVE_7REGS
+-        coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index,
+-                                                 last_coeff_ctx_base, sig_off);
+-    } else {
+-        if (is_dc && chroma422) { // dc 422
+-            DECODE_SIGNIFICANCE(7, sig_coeff_offset_dc[last], sig_coeff_offset_dc[last]);
+-        } else {
+-            coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index,
+-                                                 last_coeff_ctx_base-significant_coeff_ctx_base);
+-        }
+-#else
+         DECODE_SIGNIFICANCE( 63, sig_off[last], ff_h264_last_coeff_flag_offset_8x8[last] );
+     } else {
+         if (is_dc && chroma422) { // dc 422
+@@ -1670,7 +1655,6 @@ decode_cabac_residual_internal(H264Conte
+         } else {
+             DECODE_SIGNIFICANCE(max_coeff - 1, last, last);
+         }
+-#endif
+     }
+     assert(coeff_count > 0);
+ 

package/mysql/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
 PKG_VERSION:=		5.6.17
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		82114fa7c13fa3ca897b34666577d9f4
 PKG_DESCR:=		MySQL client library
 PKG_SECTION:=		db
@@ -36,6 +36,9 @@ host-build:
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 		${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE)
 
+pre-configure:
+	$(SED) "s#@@STAGING_DIR@@#${STAGING_TARGET_DIR}#" ${WRKBUILD}/scripts/mysql_config.sh
+
 mysql-hostinstall:
 	$(INSTALL_BIN) ${WRKBUILD}/extra/comp_err \
 		$(STAGING_HOST_DIR)/usr/bin

package/mysql/patches/patch-scripts_mysql_config_sh

@@ -0,0 +1,20 @@
+--- mysql-5.6.17.orig/scripts/mysql_config.sh	2014-03-14 20:07:28.000000000 +0100
++++ mysql-5.6.17/scripts/mysql_config.sh	2014-04-29 21:45:14.000000000 +0200
+@@ -83,7 +83,7 @@ execdir='@libexecdir@'
+ bindir='@bindir@'
+ 
+ # If installed, search for the compiled in directory first (might be "lib64")
+-pkglibdir='@pkglibdir@'
++pkglibdir='@@STAGING_DIR@@@pkglibdir@'
+ pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
+ fix_path pkglibdir $pkglibdir_rel lib/mysql lib
+ 
+@@ -91,7 +91,7 @@ plugindir='@pkgplugindir@'
+ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
+ fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
+ 
+-pkgincludedir='@pkgincludedir@'
++pkgincludedir='@@STAGING_DIR@@@pkgincludedir@'
+ if [ -f "$basedir/include/mysql/mysql.h" ]; then
+   pkgincludedir="$basedir/include/mysql"
+ elif [ -f "$basedir/include/mysql.h" ]; then

package/ntfs-3g/Makefile

@@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ntfs-3g
 PKG_VERSION:=		2014.2.15
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f11d563816249d730a00498983485f3a
-PKG_DESCR:=		ntfs filesystem driver
+PKG_DESCR:=		ntfs filesystem driver using fuse
 PKG_SECTION:=		fs
 PKG_DEPENDS:=		kmod-fuse-fs
 PKG_URL:=		http://tuxera.com
@@ -26,6 +26,6 @@ CONFIGURE_ARGS+=	--disable-ldconfig \
 ntfs-3g-install:
 	${INSTALL_DIR} ${IDIR_NTFS_3G}/bin
 	${INSTALL_BIN} ${WRKINST}/bin/ntfs-3g ${IDIR_NTFS_3G}/bin
-	cd ${WRKINST}/bin && ln -sf ntfs-3g mount.ntfs-3g
+	cd ${IDIR_NTFS_3G}/bin && ln -sf ntfs-3g mount.ntfs-3g
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/openjdk7/Makefile

@@ -4,26 +4,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		openjdk7
-PKG_VERSION:=		2.4.5
+PKG_VERSION:=		2.4.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6dcc544657ade213d01017354a6f9858
+PKG_MD5SUM:=		f6b28633b9978fadc724247cfc264ff0
 PKG_DESCR:=		OpenJDK 7 Java VM
 PKG_SECTION:=		lang
 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 nss
+PKG_BUILDDEP+=		classpath-host jamvm-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_BUILDDEP+=		libpng giflib gtk+ glib fontconfig
+HOST_BUILDDEP:=		ant-host cups-host
 PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi libgcc cups
 PKG_DEPENDS+=		libfreetype libxrender libx11 libxext libpthread nss libjpeg-turbo
 PKG_DEPENDS+=		libpng giflib libgtk glib fontconfig
 PKG_URL:=		http://openjdk.org/
 PKG_SITES:=		http://icedtea.classpath.org/download/source/
 
-DISTFILES:=		icedtea-$(PKG_VERSION).tar.gz
+DISTFILES:=		icedtea-$(PKG_VERSION).tar.xz
 WRKDIST=		${WRKDIR}/icedtea-${PKG_VERSION}
 
 GCJ_VER:=		4.8.2
@@ -88,7 +89,7 @@ CONFIGURE_ARGS+=	$(CONFIGURE_COMMON)
 CONFIGURE_ARGS+=	--disable-bootstrap
 
 CONFIGURE_ENV+=		LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
-MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin \
+MAKE_ENV+=		ALT_COMPILER_PATH=$(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin \
 			ALT_OPENWIN_HOME=$(STAGING_TARGET_DIR)/usr/ \
 			ALT_CUPS_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
 			ALT_FREETYPE_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
@@ -122,7 +123,7 @@ HOST_CONFIGURE_ARGS+=\
 		--with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \
 		--with-java=$(STAGING_HOST_DIR)/usr/bin/java \
 		--with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \
-		--with-ecj-jar=${STAGING_HOST_DIR}/usr/share/java/ecj.jar \
+		--with-ecj-jar=${DL_DIR}/ecj.jar \
 		--without-hotspot-build \
                 --disable-system-zlib \
                 --disable-system-jpeg \

package/openjdk7/patches/mips64el.patch

@@ -1,15 +0,0 @@
-diff -Nur icedtea-2.3.9.orig/configure icedtea-2.3.9/configure
---- icedtea-2.3.9.orig/configure	2013-04-21 22:48:30.000000000 +0200
-+++ icedtea-2.3.9/configure	2013-05-13 12:43:02.000000000 +0200
-@@ -7159,6 +7159,11 @@
-       INSTALL_ARCH_DIR=mipsel
-       JRE_ARCH_DIR=mipsel
-        ;;
-+    mips64el)
-+      BUILD_ARCH_DIR=mipsel
-+      INSTALL_ARCH_DIR=mipsel
-+      JRE_ARCH_DIR=mipsel
-+       ;;
-     powerpc)
-       BUILD_ARCH_DIR=ppc
-       INSTALL_ARCH_DIR=ppc

package/openswan/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openswan
-PKG_VERSION:=		2.6.38
+PKG_VERSION:=		2.6.41
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		13073eb5314b83a31be88e4117e8bbcd
+PKG_MD5SUM:=		da2e8b02ecc30a408cc5766767fef84f
 PKG_DESCR:=		IPsec software
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		ip libgmp libpthread kmod-net-key kmod-xfrm-user

package/openswan/patches/patch-Makefile_inc

@@ -1,5 +1,5 @@
---- openswan-2.6.37.orig/Makefile.inc	2011-10-28 23:11:53.000000000 +0200
-+++ openswan-2.6.37/Makefile.inc	2011-12-01 17:30:31.000000000 +0100
+--- openswan-2.6.41.orig/Makefile.inc	2014-02-21 21:46:57.000000000 +0100
++++ openswan-2.6.41/Makefile.inc	2014-03-12 18:39:50.906115397 +0100
 @@ -169,7 +169,7 @@ INSTALL=install
  # how backup names are composed.
  # Note that the install procedures will never overwrite an existing config
@@ -9,7 +9,20 @@
  INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
  INSTMANFLAGS=
  INSTCONFFLAGS=
-@@ -279,12 +279,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
+@@ -191,10 +191,10 @@ BISONOSFLAGS=
+ #Example for a cross compile:
+ #USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib
+ GCC_LINT ?= -DGCC_LINT
+-USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT)
++USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT)
+ # on fedora/rhel
+ #USERCOMPILE?=-g -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4  -m64 -mtune=generic -fPIE -pie -DSUPPORT_BROKEN_ANDROID_ICS
+-KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
++KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
+ # Additional debugging for developers (warning: can crash openswan!)
+ #USERCOMPILE?=-g -DLEAK_DETECTIVE -lefence
+ # You can also run this before starting openswan on glibc systems:
+@@ -283,12 +283,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
  # Note you need a locally running bind9 nameserver with lwres{} enabled
  # to use this, or have the "lwres" package installed and running.
  # This only affects conns that use DNS for keys in lookups.
@@ -23,4 +36,4 @@
 +USE_DYNAMICDNS?=false
  
  # Do we want all the configuration files like ipsec.conf and ipsec.secrets
- # and any certificates to be in a single directory defined by 
+ # and any certificates to be in a single directory defined by

package/openswan/patches/patch-Makefile_top

@@ -1,11 +0,0 @@
---- openswan-2.6.38.orig/Makefile.top	2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/Makefile.top	2012-07-25 18:17:21.000000000 +0200
-@@ -26,7 +26,7 @@ ERRCHECK=${MAKEUTILS}/errcheck
- KVUTIL=${MAKEUTILS}/kernelversion
- KVSHORTUTIL=${MAKEUTILS}/kernelversion-short
- 
--SUBDIRS?=lib programs testing
-+SUBDIRS?=lib programs
- 
- clean::
- 	-(cd ${OPENSWANSRCDIR} && $(MAKE) modclean && $(MAKE) mod26clean)

package/openswan/patches/patch-lib_libopenswan_alg_info_c

@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.38.orig/lib/libopenswan/alg_info.c	2012-03-23 22:33:43.000000000 +0100
-+++ openswan-2.6.38/lib/libopenswan/alg_info.c	2012-07-25 18:17:21.000000000 +0200
-@@ -778,7 +778,7 @@ alg_info_discover_pfsgroup_hack(struct a
-     static char err_buf[256];
-     int ret;
-     
--    pfs_name=index(esp_buf, ';');
-+    pfs_name=strchr(esp_buf, ';');
-     
-     if(pfs_name) {
- 	*pfs_name='\0';

package/samba/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		samba
 PKG_VERSION:=		3.6.23
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		2f7aee1dc5d31aefcb364600915b31dc
 PKG_DESCR:=		NetBIOS/SMB file and print server
 PKG_SECTION:=		net/fs
@@ -14,6 +14,8 @@ PKG_DEPENDS:=		samba-lib libuuid libpopt
 PKG_URL:=		http://www.samba.org/
 PKG_SITES:=		http://samba.org/samba/ftp/stable/
 
+PKG_CFLINE_SAMBA:=	select ADK_KERNEL_INOTIFY_USER
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		SAMBA SAMBA_CLIENT SAMBA_PASSWD SAMBA_LIB

package/samba/files/smb.conf

@@ -1,12 +1,12 @@
 [global]
- syslog = 3
+ syslog = 2
  syslog only = yes
- log level = 2
+ log level = 1
  workgroup = OpenADK
  server string = OpenADK Samba Server
  security = user
  encrypt passwords = yes
- guest account = root
+ guest account = nobody
  local master = yes
  name resolve order = hosts bcast
  pid directory = /var/run/samba

package/samba/files/swat.postinst

@@ -1,6 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_service swat 901/tcp
-grep -qe '^swat	' -e '^#swat	' $IPKG_INSTROOT/etc/inetd.conf 2>&- || \
-    echo '#swat	stream	tcp	nowait.400	root	/usr/bin/swat	swat' \
-    >>$IPKG_INSTROOT/etc/inetd.conf

package/screen/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		screen
-PKG_VERSION:=		4.0.3
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		8506fd205028a96c741e4037de6e3c42
+PKG_VERSION:=		4.2.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		419a0594e2b25039239af8b90eda7d92
 PKG_DESCR:=		window manager for the terminal session
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libncurses libelf

package/screen/patches/patch-configure

@@ -1,564 +1,29 @@
---- screen-4.0.3.orig/configure	2003-12-05 14:46:53.000000000 +0100
-+++ screen-4.0.3/configure	2014-02-19 08:18:45.000000000 +0100
-@@ -124,7 +124,7 @@ done
+--- screen-4.2.1.orig/configure	2014-04-26 12:58:46.000000000 +0200
++++ screen-4.2.1/configure	2014-05-01 13:04:48.000000000 +0200
+@@ -414,7 +414,7 @@ as_fn_error ()
+     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
    fi
-   if test ! -f "$as_myself"; then
-     { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
--   { (exit 1); exit 1; }; }
-+    }
-   fi
-   case $CONFIG_SHELL in
-   '')
-@@ -174,7 +174,7 @@ done
-     ' >$as_me.lineno &&
-   chmod +x $as_me.lineno ||
-     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
--   { (exit 1); exit 1; }; }
-+    }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-@@ -397,7 +397,7 @@ do
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-     eval "enable_$ac_feature=no" ;;
- 
-@@ -406,7 +406,7 @@ do
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-     case $ac_option in
-       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-@@ -588,7 +588,7 @@ do
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_package=`echo $ac_package| sed 's/-/_/g'`
-     case $ac_option in
-       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-@@ -601,7 +601,7 @@ do
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_package=`echo $ac_package | sed 's/-/_/g'`
-     eval "with_$ac_package=no" ;;
- 
-@@ -625,7 +625,7 @@ do
- 
-   -*) { echo "$as_me: error: unrecognized option: $ac_option
- Try \`$0 --help' for more information." >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ;;
- 
-   *=*)
-@@ -633,7 +633,7 @@ Try \`$0 --help' for more information."
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-     eval "$ac_envvar='$ac_optarg'"
-     export $ac_envvar ;;
-@@ -652,7 +652,7 @@ done
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-   { echo "$as_me: error: missing argument to $ac_option" >&2
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- # Be sure to have absolute paths.
-@@ -662,7 +662,7 @@ do
-   case $ac_val in
-     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+    };;
-   esac
- done
- 
-@@ -674,7 +674,7 @@ do
-   case $ac_val in
-     [\\/$]* | ?:[\\/]* ) ;;
-     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+    };;
-   esac
- done
- 
-@@ -728,15 +728,15 @@ fi
- if test ! -r $srcdir/$ac_unique_file; then
-   if test "$ac_srcdir_defaulted" = yes; then
-     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
--   { (exit 1); exit 1; }; }
-+    }
-   else
-     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
--   { (exit 1); exit 1; }; }
-+    }
-   fi
- fi
- (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-   { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
--   { (exit 1); exit 1; }; }
-+    }
- srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
- ac_env_build_alias_set=${build_alias+set}
- ac_env_build_alias_value=$build_alias
-@@ -1243,7 +1243,7 @@ if $ac_cache_corrupted; then
- echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-   { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
+   $as_echo "$as_me: error: $2" >&2
+-  as_fn_exit $as_status
++  # as_fn_exit $as_status
+ } # as_fn_error
  
- ac_ext=c
-@@ -1734,7 +1734,7 @@ test -z "$CC" && { { echo "$as_me:$LINEN
- See \`config.log' for more details." >&5
- echo "$as_me: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- 
- # Provide some information about the compiler.
- echo "$as_me:$LINENO:" \
-@@ -1856,7 +1856,7 @@ See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-     fi
-   fi
- fi
-@@ -1898,7 +1898,7 @@ else
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- rm -f conftest$ac_cv_exeext
-@@ -1950,7 +1950,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
-@@ -2514,7 +2514,7 @@ else
- See \`config.log' for more details." >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- ac_ext=c
-@@ -2704,7 +2704,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -2753,7 +2753,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -2790,7 +2790,7 @@ echo "$ac_compile" 1>&6
- 
- { { echo "$as_me:$LINENO: error: Can't run the compiler - sorry" >&5
- echo "$as_me: error: Can't run the compiler - sorry" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-@@ -2800,7 +2800,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -2830,7 +2830,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   (exit $ac_status); }; }; then
-   { { echo "$as_me:$LINENO: error: Your compiler does not set the exit status - sorry" >&5
- echo "$as_me: error: Your compiler does not set the exit status - sorry" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
-@@ -2900,7 +2900,7 @@ done
- if test -z "$ac_aux_dir"; then
-   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
- echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- ac_config_guess="$SHELL $ac_aux_dir/config.guess"
- ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-@@ -3335,6 +3335,11 @@ _ACEOF
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+@@ -5941,8 +5941,6 @@ else
  fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
-+# always SYSV
-+cat >>confdefs.h <<\_ACEOF
-+#define SYSV 1
-+_ACEOF
-+
- { echo "$as_me:$LINENO: checking for sequent/ptx..." >&5
- echo "$as_me: checking for sequent/ptx..." >&6;}
- cat >conftest.$ac_ext <<_ACEOF
-@@ -4149,7 +4154,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { echo "$as_me:$LINENO: error: !!! no select - no screen" >&5
- echo "$as_me: error: !!! no select - no screen" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
-@@ -4163,7 +4168,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4272,7 +4277,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4365,7 +4370,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4460,7 +4465,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4562,7 +4567,7 @@ elif test -n "$sock"; then
- else
-   { { echo "$as_me:$LINENO: error: you have neither usable sockets nor usable pipes -> no screen" >&5
- echo "$as_me: error: you have neither usable sockets nor usable pipes -> no screen" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- 
-@@ -4573,7 +4578,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4898,7 +4903,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { echo "$as_me:$LINENO: error: !!! no tgetent - no screen" >&5
- echo "$as_me: error: !!! no tgetent - no screen" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-@@ -4915,7 +4920,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -5008,50 +5013,6 @@ _ACEOF
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for SVR4 ptys..." >&5
--echo "$as_me: checking for SVR4 ptys..." >&6;}
--sysvr4ptys=
--if test -c /dev/ptmx ; then
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--ptsname(0);grantpt(0);unlockpt(0);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  cat >>confdefs.h <<\_ACEOF
--#define HAVE_SVR4_PTYS 1
--_ACEOF
--
--sysvr4ptys=1
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
- 
- 
- for ac_func in getpt
-@@ -5359,7 +5320,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -6206,7 +6167,7 @@ echo "$as_me: checking for avenrun symbo
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -6482,7 +6443,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -6598,8 +6559,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
- LIBS="$oldlibs"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
 -test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
 -test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
  oldlibs="$LIBS"
  LIBS="$LIBS -lsun"
- { echo "$as_me:$LINENO: checking IRIX sun library..." >&5
-@@ -7004,7 +6963,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7056,7 +7015,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7110,7 +7069,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7158,6 +7117,11 @@ fi
- rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-+# always use memcpy
-+cat >>confdefs.h <<\_ACEOF
-+#define USEMEMCPY 1
-+_ACEOF
-+
- echo "$as_me:$LINENO: checking long file names" >&5
- echo $ECHO_N "checking long file names... $ECHO_C" >&6
- (echo 1 > /tmp/conftest9012345) 2>/dev/null
-@@ -7951,7 +7915,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7982,7 +7946,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- ( exit $ac_status )
- { { echo "$as_me:$LINENO: error: Can't run the compiler - internal error. Sorry." >&5
- echo "$as_me: error: Can't run the compiler - internal error. Sorry." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-@@ -8251,7 +8215,7 @@ done
-   if test ! -f "$as_myself"; then
-     { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
- echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking IRIX sun library..." >&5
+@@ -7023,7 +7021,7 @@ as_fn_error ()
+     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
    fi
-   case $CONFIG_SHELL in
-   '')
-@@ -8302,7 +8266,7 @@ done
-   chmod +x $as_me.lineno ||
-     { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
- echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-@@ -8494,7 +8458,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; };;
-+    };;
-   --help | --hel | -h )
-     echo "$ac_cs_usage"; exit 0 ;;
-   --debug | --d* | -d )
-@@ -8516,7 +8480,7 @@ Try \`$0 --help' for more information."
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; } ;;
-+    } ;;
- 
-   *) ac_config_targets="$ac_config_targets $1" ;;
- 
-@@ -8555,7 +8519,7 @@ do
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--   { (exit 1); exit 1; }; };;
-+    };;
-   esac
- done
- 
-@@ -8750,7 +8714,7 @@ echo X"$as_dir" |
-     test ! -n "$as_dirs" || mkdir $as_dirs
-   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
- echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
-+    }; }
- 
-   ac_builddir=.
+   $as_echo "$as_me: error: $2" >&2
+-  as_fn_exit $as_status
++  # as_fn_exit $as_status
+ } # as_fn_error
  
-@@ -8816,7 +8780,7 @@ echo "$as_me: creating $ac_file" >&6;}
-          # Absolute (can't be DOS-style, as IFS=:)
-          test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          echo $f;;
-       *) # Relative
-          if test -f "$f"; then
-@@ -8829,7 +8793,7 @@ echo "$as_me: error: cannot find input f
-            # /dev/null tree
-            { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-@@ -8907,7 +8871,7 @@ echo "$as_me: creating $ac_file" >&6;}
-          # Absolute (can't be DOS-style, as IFS=:)
-          test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          echo $f;;
-       *) # Relative
-          if test -f "$f"; then
-@@ -8920,7 +8884,7 @@ echo "$as_me: error: cannot find input f
-            # /dev/null tree
-            { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-@@ -9073,7 +9037,7 @@ echo X"$as_dir" |
-     test ! -n "$as_dirs" || mkdir $as_dirs
-   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
- echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
-+    }; }
  
-       rm -f $ac_file
-       mv $tmp/config.h $ac_file

package/screen/patches/patch-process_c

@@ -1,15 +0,0 @@
---- screen-4.0.3.orig/process.c	2003-09-18 14:53:54.000000000 +0200
-+++ screen-4.0.3/process.c	2014-02-19 08:27:28.000000000 +0100
-@@ -35,12 +35,6 @@
- 
- 
- #include "config.h"
--
--/* for solaris 2.1, Unixware (SVR4.2) and possibly others: */
--#ifdef SVR4
--# include <sys/stropts.h>
--#endif
--
- #include "screen.h"
- #include "extern.h"
- #include "logfile.h"

package/screen/patches/patch-pty_c

@@ -1,14 +1,15 @@
---- screen-4.0.3.orig/pty.c	2003-09-08 16:26:18.000000000 +0200
-+++ screen-4.0.3/pty.c	2014-02-19 08:26:17.000000000 +0100
-@@ -33,11 +33,6 @@
- # include <sys/ioctl.h>
+--- screen-4.2.1.orig/pty.c	2014-04-26 12:58:35.000000000 +0200
++++ screen-4.2.1/pty.c	2014-05-01 13:04:48.000000000 +0200
+@@ -39,9 +39,9 @@
  #endif
  
--/* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
+ /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
+-#ifdef HAVE_STROPTS_H
 -# include <sys/stropts.h>
 -#endif
--
++//#ifdef HAVE_STROPTS_H
++//# include <sys/stropts.h>
++//#endif
+ 
  #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
  # include <sys/ttold.h>
- #endif

package/screen/patches/patch-sched_h

@@ -1,7 +1,7 @@
---- screen-4.0.3.orig/sched.h	2002-01-08 16:42:43.000000000 +0100
-+++ screen-4.0.3/sched.h	2008-10-08 13:33:43.000000000 +0200
-@@ -22,6 +22,11 @@
-  * $Id: sched.h,v 1.1.1.1 1993/06/16 23:51:13 jnweiger Exp $ FAU
+--- screen-4.2.1.orig/sched.h	2014-04-26 12:58:35.000000000 +0200
++++ screen-4.2.1/sched.h	2014-05-01 13:04:48.000000000 +0200
+@@ -27,6 +27,11 @@
+  * $Id$ GNU
   */
  
 +#ifndef __SCHED_H
@@ -12,7 +12,7 @@
  struct event
  {
    struct event *next;
-@@ -41,3 +46,5 @@ struct event
+@@ -46,3 +51,5 @@ struct event
  #define EV_READ		1
  #define EV_WRITE	2
  #define EV_ALWAYS	3

package/screen/patches/patch-screen_c

@@ -1,13 +0,0 @@
---- screen-4.0.3.orig/screen.c	2003-09-08 16:26:41.000000000 +0200
-+++ screen-4.0.3/screen.c	2014-02-19 08:27:10.000000000 +0100
-@@ -50,10 +50,6 @@
- 
- #include "config.h"
- 
--#ifdef SVR4
--# include <sys/stropts.h>
--#endif
--
- #if defined(SYSV) && !defined(ISC)
- # include <sys/utsname.h>
- #endif

package/screen/patches/patch-tty_sh

@@ -1,13 +0,0 @@
---- screen-4.0.3.orig/tty.sh	2003-09-08 16:24:25.000000000 +0200
-+++ screen-4.0.3/tty.sh	2014-02-19 08:40:44.000000000 +0100
-@@ -76,10 +76,6 @@ exit 0
- #endif
- 
- #include "config.h"
--#ifdef SVR4
--#include <sys/stropts.h>	/* for I_POP */
--#endif
--
- #include "screen.h"
- #include "extern.h"
- 

package/section.lst

@@ -1,5 +1,6 @@
-base	Base System
 boot	Boot Loaders
+base	Base System and Libraries
+core	Basic System commands
 browser	Browser / Editor / Pager
 editor	Browser / Editor / Pager
 pager	Browser / Editor / Pager

package/uclibc/Config.in.manual

@@ -1,5 +1,5 @@
 config ADK_PACKAGE_UCLIBC
-	prompt "uClibc................. embedded C library"
+	prompt "uClibc............... embedded C library"
 	bool
 	default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY
 	default n

package/util-linux/Makefile

@@ -4,47 +4,53 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		util-linux
-PKG_VERSION:=		2.23.2
-PKG_RELEASE:=		6
-PKG_MD5SUM:=		b39fde897334a4858bb2098edcce5b3f
-PKG_DESCR:=		Linux utilities (meta-package)
-PKG_SECTION:=		utils
-PKG_DEPENDS:=		mount fdisk sfdisk swap-utils losetup mount mcookie
-PKG_BUILDDEP:=		ncurses
-PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.23/
+PKG_VERSION:=		2.24.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		3f191727a0d28f7204b755cf1b6ea0aa
+PKG_DESCR:=		basic Linux utilities (also provided by busybox)
+PKG_SECTION:=		core
+PKG_BUILDDEP:=		ncurses pam
+PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.24/
 PKG_NOPARALLEL:=	1
 PKG_OPTS:=		dev
+PKG_MULTI:=		1
 
 PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_SUBPKGS:=		UTIL_LINUX FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT
-PKG_SUBPKGS+=		LIBUUID LIBBLKID LIBMOUNT
-PKGSD_LIBUUID:=		UUID library
+PKG_SUBPKGS+=		LIBUUID LIBBLKID LIBMOUNT SU CFDISK
+PKGSD_LIBUUID:=		uuid library
 PKGSC_LIBUUID:=		libs
-PKGSD_LIBBLKID:=	BLKID library
+PKGSD_LIBBLKID:=	blkid library
 PKGSC_LIBBLKID:=	libs
-PKGSD_LIBMOUNT:=	Mount library
+PKGSD_LIBMOUNT:=	mount library
 PKGSC_LIBMOUNT:=	libs
-PKGSD_FDISK:=		Partition table manipulation utility
-PKGSC_FDISK:=		fs
-PKGSD_SFDISK:=		Scriptable Partition table manipulation utility
+PKGSD_FDISK:=		partition table manipulation utility
+PKGSC_FDISK:=		core
+PKGSD_SFDISK:=		scriptable partition table manipulation utility
 PKGSC_SFDISK:=		fs
-PKGSD_SWAP_UTILS:=	Swap space management utilities
+PKGSD_CFDISK:=		partition table manipulation utility
+PKGSC_CFDISK:=		fs
+PKGSD_SU:=		switch user utility
+PKGSC_SU:=		core
+PKGSD_SWAP_UTILS:=	swap space management utilities
 PKGSS_SWAP_UTILS:=	libblkid
-PKGSC_SWAP_UTILS:=	fs
-PKGSD_LOSETUP:=		Loop devices management utilities
+PKGSC_SWAP_UTILS:=	core
+PKGSD_LOSETUP:=		loop devices management utilities
 PKGSS_LOSETUP:=		kmod-blk-dev-loop
 PKGSD_MOUNT:=		mount/umount utilities
-PKGSS_MOUNT:=		libblkid libmount libuuid
-PKGSC_MOUNT:=		fs
-PKGSD_MCOOKIE:=		Generate magic cookies for xauth
+PKGSS_MOUNT:=		libblkid libmount libuuid libncurses
+PKGSC_MOUNT:=		core
+PKGSD_MCOOKIE:=		generate magic cookies for xauth
 PKGSC_MCOOKIE:=		x11/apps
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,UTIL_LINUX,util-linux,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FDISK},${PKGSC_FDISK}))
+$(eval $(call PKG_template,CFDISK,cfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CFDISK},${PKGSC_CFDISK}))
 $(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SFDISK},${PKGSC_SFDISK}))
+$(eval $(call PKG_template,SU,su,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SU},${PKGSD_SU},${PKGSC_SU}))
 $(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP_UTILS},${PKGSD_SWAP_UTILS},${PKGSC_SWAP_UTILS}))
 $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKG_SECTION}))
 $(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MOUNT},${PKGSD_MOUNT},${PKGSC_MOUNT}))
@@ -59,7 +65,7 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--disable-schedutils \
 			--disable-cramfs \
 			--disable-login \
-			--disable-su \
+			--enable-su \
 			--enable-libuuid \
 			--enable-libblkid \
 			--enable-libmount \
@@ -69,12 +75,14 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
 TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -ltinfo
 
-util-linux-install:
-
 fdisk-install:
 	${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin
 	${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin
 
+cfdisk-install:
+	${INSTALL_DIR} ${IDIR_CFDISK}/usr/sbin
+	${CP} ${WRKINST}/sbin/cfdisk ${IDIR_FDISK}/usr/sbin
+
 sfdisk-install:
 	${INSTALL_DIR} ${IDIR_SFDISK}/usr/sbin
 	${CP} ${WRKINST}/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin

package/util-linux/patches/patch-fdisks_cfdisk_c

@@ -1,13 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/fdisks/cfdisk.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/fdisks/cfdisk.c	2013-08-14 12:42:25.000000000 +0200
-@@ -325,7 +325,7 @@ int num_parts = 0;
- int logical = 0;
- long long logical_sectors[MAXIMUM_PARTS];
- 
--__sighandler_t old_SIGINT, old_SIGTERM;
-+sighandler_t old_SIGINT, old_SIGTERM;
- 
- int arrow_cursor = FALSE;
- int display_units = MEGABYTES;

package/util-linux/patches/patch-fdisks_fdisksunlabel_c

@@ -1,30 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/fdisks/fdisksunlabel.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/fdisks/fdisksunlabel.c	2013-08-14 12:38:12.000000000 +0200
-@@ -383,9 +383,11 @@ static void fetch_sun(struct fdisk_conte
- 	}
- }
- 
--static int verify_sun_cmp(int *a, int *b, void *data)
-+static void* cmp_data;
-+static int verify_sun_cmp(const void *pa, const void *pb)
- {
--    unsigned int *verify_sun_starts = (unsigned int *) data;
-+    const int *a = pa, *b = pb;
-+    unsigned int *verify_sun_starts = (unsigned int *) cmp_data;	
- 
-     if (*a == -1)
- 	    return 1;
-@@ -449,9 +451,8 @@ static int sun_verify_disklabel(struct f
-         else
-             array[i] = -1;
-     }
--    qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
--	  (int (*)(const void *,const void *,void *)) verify_sun_cmp,
--	  verify_sun_starts);
-+    cmp_data = verify_sun_starts;
-+    qsort(array,ARRAY_SIZE(array),sizeof(array[0]), verify_sun_cmp);
- 
-     if (array[0] == -1) {
- 	fdisk_info(cxt, _("No partitions defined"));

package/util-linux/patches/patch-include_ttyutils_h

@@ -1,12 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/include/ttyutils.h	2013-07-15 10:25:46.000000000 +0200
-+++ util-linux-2.23.2/include/ttyutils.h	2013-08-14 12:31:25.000000000 +0200
-@@ -10,6 +10,7 @@
- #include <stdlib.h>
- #include <termios.h>
- #include <limits.h>
-+#include <sys/ttydefaults.h>
- #ifdef HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
- #endif

package/util-linux/patches/patch-lib_fileutils_c

@@ -1,14 +0,0 @@
---- util-linux-2.23.2.orig/lib/fileutils.c	2013-06-13 09:46:10.000000000 +0200
-+++ util-linux-2.23.2/lib/fileutils.c	2013-08-14 11:58:47.000000000 +0200
-@@ -37,7 +37,11 @@ int xmkstemp(char **tmpname, char *dir)
- 		xasprintf(&localtmp, "%s/%s.XXXXXX", _PATH_TMP,
- 			  program_invocation_short_name);
- 	old_mode = umask(077);
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 	fd = mkostemp(localtmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+#else
-+	fd = mkstemp(localtmp);
-+#endif
- 	umask(old_mode);
- 	if (fd == -1) {
- 		free(localtmp);

package/util-linux/patches/patch-libblkid_blkid_pc_in

@@ -1,12 +0,0 @@
---- util-linux-2.23.2.orig/libblkid/blkid.pc.in	2013-02-27 17:46:29.000000000 +0100
-+++ util-linux-2.23.2/libblkid/blkid.pc.in	2013-10-28 12:08:14.000000000 +0100
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@usrlib_execdir@
--includedir=@includedir@
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
- 
- Name: blkid
- Description: Block device id library

package/util-linux/patches/patch-libblkid_src_save_c

@@ -1,14 +0,0 @@
---- util-linux-2.23.2.orig/libblkid/src/save.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/libblkid/src/save.c	2013-08-14 11:59:06.000000000 +0200
-@@ -110,7 +110,11 @@ int blkid_flush_cache(blkid_cache cache)
- 		tmp = malloc(strlen(filename) + 8);
- 		if (tmp) {
- 			sprintf(tmp, "%s-XXXXXX", filename);
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 			fd = mkostemp(tmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+#else
-+			fd = mkstemp(tmp);
-+#endif
- 			if (fd >= 0) {
- 				if (fchmod(fd, 0644) != 0)
- 					DBG(SAVE, blkid_debug("%s: fchmod failed", filename));

package/util-linux/patches/patch-libmount_src_utils_c

@@ -1,14 +0,0 @@
---- util-linux-2.23.2.orig/libmount/src/utils.c	2013-07-30 11:15:27.000000000 +0200
-+++ util-linux-2.23.2/libmount/src/utils.c	2013-08-14 11:58:25.000000000 +0200
-@@ -842,7 +842,11 @@ int mnt_open_uniq_filename(const char *f
- 	 */
- 	oldmode = umask(S_IRGRP|S_IWGRP|S_IXGRP|
- 			S_IROTH|S_IWOTH|S_IXOTH);
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 	fd = mkostemp(n, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+#else
-+	fd = mkstemp(n);
-+#endif
- 	umask(oldmode);
- 
- 	if (fd >= 0 && name)

package/util-linux/patches/patch-libuuid_uuid_pc_in

@@ -1,13 +0,0 @@
---- util-linux-2.23.2.orig/libuuid/uuid.pc.in	2013-02-27 17:46:29.883020734 +0100
-+++ util-linux-2.23.2/libuuid/uuid.pc.in	2013-12-17 17:07:37.935403478 +0100
-@@ -1,7 +1,7 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@usrlib_execdir@
--includedir=@includedir@
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
- 
- Name: uuid
- Description: Universally unique id library

package/util-linux/patches/patch-term-utils_setterm_c

@@ -1,13 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/term-utils/setterm.c	2013-06-13 09:46:10.000000000 +0200
-+++ util-linux-2.23.2/term-utils/setterm.c	2013-08-14 12:47:43.000000000 +0200
-@@ -123,7 +123,7 @@
- #include "nls.h"
- #include "closestream.h"
- 
--#if __GNU_LIBRARY__ < 5
-+#if defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 5
- #ifndef __alpha__
- # include <linux/unistd.h>
- #define __NR_klogctl __NR_syslog

package/util-linux/patches/patch-term-utils_ttymsg_c

@@ -1,12 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/term-utils/ttymsg.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/term-utils/ttymsg.c	2013-08-14 12:50:50.000000000 +0200
-@@ -41,6 +41,7 @@
-   */
- 
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/uio.h>
- #include <signal.h>
- #include <fcntl.h>

package/util-linux/patches/patch-text-utils_hexdump_h

@@ -1,12 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/text-utils/hexdump.h	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/text-utils/hexdump.h	2013-08-14 12:44:31.000000000 +0200
-@@ -33,6 +33,7 @@
-  *	@(#)hexdump.h	5.4 (Berkeley) 6/1/90
-  */
- 
-+#include <sys/types.h>
- typedef struct _pr {
- 	struct _pr *nextpr;		/* next print unit */
- #define	F_ADDRESS	0x001		/* print offset */

package/util-linux/patches/patch-text-utils_pg_c

@@ -1,13 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/text-utils/pg.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/text-utils/pg.c	2013-08-14 12:44:55.000000000 +0200
-@@ -37,7 +37,7 @@
- #ifndef	TIOCGWINSZ
- # include <sys/ioctl.h>
- #endif
--#include <sys/termios.h>
-+#include <termios.h>
- #include <fcntl.h>
- #include <regex.h>
- #include <stdio.h>

package/uvd/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		uvd
 PKG_VERSION:=		0.1
 PKG_RELEASE:=		2
 PKG_DESCR:=		udp server for version information
-PKG_SECTION:=		base
+PKG_SECTION:=		misc
 PKG_URL:=		http://openadk.org/
 
 NO_DISTFILES:=		1

package/vala/Makefile

@@ -0,0 +1,31 @@
+# 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:=		vala
+PKG_VERSION:=		0.24.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		beddeff9c06d3c278988b237da0e7401
+PKG_DESCR:=		compiler for the GObject type system
+PKG_SECTION:=		lang
+PKG_BUILDDEP:=		glib
+HOST_BUILDDEP:=		glib-host
+PKG_URL:=		https://wiki.gnome.org/Vala
+PKG_SITES:=		http://download.gnome.org/sources/vala/0.24/
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,VALA,vala,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,VALA,vala,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+HOST_STYLE:=		auto
+
+vala-install:
+	$(INSTALL_DIR) $(IDIR_VALA)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/valac \
+		$(IDIR_VALA)/usr/bin
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk

package/webkitgtk/Makefile

@@ -0,0 +1,43 @@
+# 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:=		webkitgtk
+PKG_VERSION:=		2.4.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c759bf11fe4cadd1268630f16a97f7b9
+PKG_DESCR:=		web browser engine
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		glib icu4c zlib libwebp libgtk libsoup
+PKG_DEPENDS+=		libsecret libxt
+PKG_DEPENDS+=		gst-plugins-base gstreamer
+PKG_BUILDDEP:=		glib icu4c zlib libwebp gtk+
+PKG_BUILDDEP+=		libsoup libsecret libXt
+PKG_BUILDDEP+=		gst-plugins-base gstreamer
+PKG_URL:=		http://www.webkitgtk.org/
+PKG_SITES:=		http://webkitgtk.org/releases/
+PKG_OPTS:=		dev
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,WEBKITGTK,webkitgtk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+MAKE_FILE:=		GNUmakefile
+CONFIGURE_ENV+=		AR_FLAGS="cr"
+CONFIGURE_ARGS+=	--with-gtk=2.0 \
+			--disable-webkit2 \
+			--disable-geolocation
+
+pre-build:
+	mkdir -p $(WRKBUILD)/DerivedSources/{webkit,webkitdom,InjectedBundle,Platform}
+	mkdir -p $(WRKBUILD)/DerivedSources/WebKit2/webkit2gtk/webkit2
+
+webkitgtk-install:
+	$(INSTALL_DIR) $(IDIR_WEBKITGTK)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/webkitgtk*.so* \
+		$(IDIR_WEBKITGTK)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/xbmc/Makefile

@@ -37,6 +37,9 @@ PKG_LIBC_DEPENDS:=	glibc
 
 WRKDIST=		$(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-Frodo
 
+DIFF_IGNOREFILES:=	configure missing depcomp install-sh INSTALL \
+			aclocal.m4 config.h.in */Makefile.in
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/xorg-server/Makefile

@@ -31,7 +31,7 @@ PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI WITH_KDRIVE
 PKGFS_WITH_DRI:=		mesalib
-PKGFD_WITH_DRI:=		enable DRI/DRI2 support
+PKGFD_WITH_DRI:=		enable DRI support
 PKGFB_WITH_DRI:=		xf86driproto glproto MesaLib
 PKGFD_WITH_KDRIVE:=		Build Kdrive Xfbdev server
 
@@ -78,6 +78,8 @@ CONFIGURE_ARGS+=	--enable-dga \
 			--disable-xcsecurity \
 			--disable-xvfb \
 			--disable-xvmc \
+			--disable-selective-werror \
+			--disable-strict-compilation \
 			--with-xkb-output=/tmp \
 			--with-os-vendor=OpenADK \
 			--with-vendor-web="http://openadk.org"
@@ -109,8 +111,10 @@ xorg-server-install:
 	${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin
 	${CP} ${WRKINST}/usr/lib/xorg/modules/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
 	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
+endif
 	${CP} ${WRKINST}/usr/lib/xorg/modules/multimedia/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
 ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)

package/xorg-server/patches/patch-hw_kdrive_linux_linux_c

@@ -0,0 +1,13 @@
+--- xorg-server-1.15.0.orig/hw/kdrive/linux/linux.c	2013-12-27 18:38:52.000000000 +0100
++++ xorg-server-1.15.0/hw/kdrive/linux/linux.c	2014-03-21 12:51:06.774068258 +0100
+@@ -66,8 +66,8 @@ static void
+ LinuxCheckChown(const char *file)
+ {
+     struct stat st;
+-    __uid_t u;
+-    __gid_t g;
++    uid_t u;
++    gid_t g;
+ 
+     if (stat(file, &st) < 0)
+         return;

package/xorg-server/patches/patch-hw_xfree86_common_compiler_h

@@ -1,7 +1,63 @@
 from alpinelinux
 
 --- xorg-server-1.15.0.orig/hw/xfree86/common/compiler.h	2013-12-15 08:48:09.000000000 +0100
-+++ xorg-server-1.15.0/hw/xfree86/common/compiler.h	2014-03-14 23:25:52.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/common/compiler.h	2014-03-21 12:53:48.834417415 +0100
+@@ -727,26 +727,26 @@ xf86WriteMmio32LeNB(__volatile__ void *b
+ #define PORT_SIZE short
+ #endif
+ 
+-_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
++_X_EXPORT volatile unsigned char *ioBase;  /* Memory mapped I/O port area */
+ 
+ static __inline__ void
+ outb(unsigned PORT_SIZE port, unsigned char val)
+ {
+-    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) =
+         val;
+ }
+ 
+ static __inline__ void
+ outw(unsigned PORT_SIZE port, unsigned short val)
+ {
+-    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) =
+         val;
+ }
+ 
+ static __inline__ void
+ outl(unsigned PORT_SIZE port, unsigned int val)
+ {
+-    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) =
+         val;
+ }
+ 
+@@ -754,21 +754,21 @@ static __inline__ unsigned int
+ inb(unsigned PORT_SIZE port)
+ {
+     return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
+-                                        IOPortBase);
++                                        ioBase);
+ }
+ 
+ static __inline__ unsigned int
+ inw(unsigned PORT_SIZE port)
+ {
+     return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
+-                                         IOPortBase);
++                                         ioBase);
+ }
+ 
+ static __inline__ unsigned int
+ inl(unsigned PORT_SIZE port)
+ {
+     return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
+-                                       IOPortBase);
++                                       ioBase);
+ }
+ 
+ #if defined(__mips__)
 @@ -995,7 +995,7 @@ inl(unsigned short port)
      return xf86ReadMmio32Le((void *) ioBase, port);
  }

package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_h

@@ -0,0 +1,18 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/common/xf86VGAarbiter.h	2013-12-15 08:48:09.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/common/xf86VGAarbiter.h	2014-03-21 17:00:39.953676328 +0100
+@@ -30,6 +30,7 @@
+ #include "misc.h"
+ #include "xf86.h"
+ 
++#ifdef XSERVER_LIBPCIACCESS
+ /* Functions */
+ extern void xf86VGAarbiterInit(void);
+ extern void xf86VGAarbiterFini(void);
+@@ -41,6 +42,7 @@ extern void xf86VGAarbiterUnlock(ScrnInf
+ /* allow a driver to remove itself from arbiter - really should be
+  * done in the kernel though */
+ extern _X_EXPORT void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn, int rsrc);
++#endif
+ 
+ /* DRI and arbiter are really not possible together,
+  * you really want to remove the card from arbitration if you can */

package/xorg-server/patches/patch-hw_xfree86_dri_dri_c

@@ -0,0 +1,18 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/dri/dri.c	2013-12-27 18:38:52.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/dri/dri.c	2014-03-21 16:18:51.934149666 +0100
+@@ -37,6 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include <xorg-config.h>
+ #endif
+ 
++#include "xf86VGAarbiter.h"
+ #include "xf86.h"
+ #include <sys/time.h>
+ #include <unistd.h>
+@@ -68,7 +69,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #include "mipointer.h"
+ #include "xf86_OSproc.h"
+ #include "inputstr.h"
+-#include "xf86VGAarbiter.h"
+ #include "xf86Extensions.h"
+ 
+ static int DRIEntPrivIndex = -1;

package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h

@@ -0,0 +1,11 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/dri/sarea.h	2013-12-15 08:48:09.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/dri/sarea.h	2014-03-21 12:54:54.486559308 +0100
+@@ -43,6 +43,8 @@
+ #define SAREA_MAX 			0x2000
+ #elif defined(__ia64__)
+ #define SAREA_MAX			0x10000 /* 64kB */
++#elif defined(__mips__)
++#define SAREA_MAX			0x4000
+ #else
+ /* Intel 830M driver needs at least 8k SAREA */
+ #define SAREA_MAX			0x2000