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

77 files changed, 550 insertions, 1110 deletions

diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile
index 72327170a..80be5a41b 100644
--- a/package/adk-test-tools/Makefile
+++ b/package/adk-test-tools/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		adk-test-tools
 PKG_VERSION:=		0.1
-PKG_RELEASE:=		5
+PKG_RELEASE:=		6
 PKG_DESCR:=		helper tools and scripts for adk-test-framework
 PKG_SECTION:=		misc
 PKG_URL:=		http://openadk.org/
diff --git a/package/adk-test-tools/files/test.init b/package/adk-test-tools/files/test.init
index e33bece47..773986dca 100755
--- a/package/adk-test-tools/files/test.init
+++ b/package/adk-test-tools/files/test.init
@@ -2,6 +2,8 @@
 #PKG adk-test-tools
 #INIT 90
 [[ $1 = autostart ]] || exit 0
+echo "Setting time via network ..."
+rdate -nv pool.ntp.org
 echo "Starting test script ..."
 grep shell /proc/cmdline > /dev/null 2&>1
 if [ $? -eq 0 ];then
diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile
index 1341e8c5b..a33a8c115 100644
--- a/package/conntrack-tools/Makefile
+++ b/package/conntrack-tools/Makefile
@@ -4,28 +4,35 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		conntrack-tools
-PKG_VERSION:=		1.4.1
+PKG_VERSION:=		1.4.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3cc4703d883c6f07085e29bdc993222b
-PKG_DESCR:=		Connection tracking userspace tools
+PKG_MD5SUM:=		b1f9d006e7bf000a77395ff7cd3fac16
+PKG_DESCR:=		connection tracking userspace tools
 PKG_SECTION:=		firewall
 PKG_DEPENDS:=		libtirpc libnetfilter_queue libnetfilter-conntrack libnetfilter-cttimeout libnetfilter-cthelper libmnl
 PKG_BUILDDEP:=		libtirpc libnetfilter_queue libnetfilter_conntrack libnetfilter_cttimeout libnetfilter_cthelper libmnl
 PKG_URL:=		http://conntrack-tools.netfilter.org/
 PKG_SITES:=		http://www.netfilter.org/projects/conntrack-tools/files/
 
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_SUBPKGS:=		CONNTRACK CONNTRACKD
+PKGSD_CONNTRACK:=	client utility
+PKGSD_CONNTRACKD:=	daemon
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
 
-TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/tirpc
+TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/tirpc -D_GNU_SOURCE
 
-$(eval $(call PKG_template,CONNTRACK_TOOLS,conntrack-tools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CONNTRACK,conntrack,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CONNTRACK},${PKG_SECTION}))
+$(eval $(call PKG_template,CONNTRACKD,conntrackd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CONNTRACKD},${PKG_SECTION}))
 
-conntrack-tools-install:
-	$(INSTALL_DIR) $(IDIR_CONNTRACK_TOOLS)/usr/sbin
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/conntrack{,d} $(IDIR_CONNTRACK_TOOLS)/usr/sbin
+conntrack-install:
+	$(INSTALL_DIR) $(IDIR_CONNTRACK)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/conntrack $(IDIR_CONNTRACK)/usr/sbin
+
+conntrackd-install:
+	$(INSTALL_DIR) $(IDIR_CONNTRACKD)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/conntrackd $(IDIR_CONNTRACKD)/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/conntrack-tools/patches/patch-include_bitops_h b/package/conntrack-tools/patches/patch-include_bitops_h
new file mode 100644
index 000000000..9dfb08e1e
--- /dev/null
+++ b/package/conntrack-tools/patches/patch-include_bitops_h
@@ -0,0 +1,41 @@
+--- conntrack-tools-1.4.2.orig/include/bitops.h	2013-02-24 23:23:57.000000000 +0100
++++ conntrack-tools-1.4.2/include/bitops.h	2014-04-05 09:39:37.219463608 +0200
+@@ -3,32 +3,32 @@
+ 
+ #include <stdlib.h>
+ 
+-static inline void set_bit_u32(int nr, u_int32_t *addr)
++static inline void set_bit_u32(int nr, uint32_t *addr)
+ {
+ 	addr[nr >> 5] |= (1UL << (nr & 31));
+ }
+ 
+-static inline void unset_bit_u32(int nr, u_int32_t *addr)
++static inline void unset_bit_u32(int nr, uint32_t *addr)
+ {
+ 	addr[nr >> 5] &= ~(1UL << (nr & 31));
+ }
+ 
+-static inline int test_bit_u32(int nr, const u_int32_t *addr)
++static inline int test_bit_u32(int nr, const uint32_t *addr)
+ {
+ 	return ((1UL << (nr & 31)) & (addr[nr >> 5])) != 0;
+ }
+ 
+-static inline void set_bit_u16(int nr, u_int16_t *addr)
++static inline void set_bit_u16(int nr, uint16_t *addr)
+ {
+ 	addr[nr >> 4] |= (1UL << (nr & 15));
+ }
+ 
+-static inline void unset_bit_u16(int nr, u_int16_t *addr)
++static inline void unset_bit_u16(int nr, uint16_t *addr)
+ {
+ 	addr[nr >> 4] &= ~(1UL << (nr & 15));
+ }
+ 
+-static inline int test_bit_u16(int nr, const u_int16_t *addr)
++static inline int test_bit_u16(int nr, const uint16_t *addr)
+ {
+ 	return ((1UL << (nr & 15)) & (addr[nr >> 4])) != 0;
+ }
diff --git a/package/conntrack-tools/patches/patch-include_mcast_h b/package/conntrack-tools/patches/patch-include_mcast_h
new file mode 100644
index 000000000..0f352ce0c
--- /dev/null
+++ b/package/conntrack-tools/patches/patch-include_mcast_h
@@ -0,0 +1,10 @@
+--- conntrack-tools-1.4.2.orig/include/mcast.h	2013-02-24 23:23:57.000000000 +0100
++++ conntrack-tools-1.4.2/include/mcast.h	2014-04-05 09:37:11.363340860 +0200
+@@ -2,6 +2,7 @@
+ #define _MCAST_H_
+ 
+ #include <stdint.h>
++#include <sys/select.h>
+ #include <netinet/in.h>
+ #include <net/if.h>
+ 
diff --git a/package/conntrack-tools/patches/patch-include_tcp_h b/package/conntrack-tools/patches/patch-include_tcp_h
new file mode 100644
index 000000000..4dd4d3202
--- /dev/null
+++ b/package/conntrack-tools/patches/patch-include_tcp_h
@@ -0,0 +1,10 @@
+--- conntrack-tools-1.4.2.orig/include/tcp.h	2013-02-24 23:23:57.000000000 +0100
++++ conntrack-tools-1.4.2/include/tcp.h	2014-04-05 09:40:10.923493847 +0200
+@@ -2,6 +2,7 @@
+ #define _TCP_H_
+ 
+ #include <stdint.h>
++#include <sys/select.h>
+ #include <netinet/in.h>
+ 
+ struct tcp_conf {
diff --git a/package/conntrack-tools/patches/patch-include_udp_h b/package/conntrack-tools/patches/patch-include_udp_h
new file mode 100644
index 000000000..1f28a87fa
--- /dev/null
+++ b/package/conntrack-tools/patches/patch-include_udp_h
@@ -0,0 +1,10 @@
+--- conntrack-tools-1.4.2.orig/include/udp.h	2013-02-24 23:23:57.000000000 +0100
++++ conntrack-tools-1.4.2/include/udp.h	2014-04-05 09:38:04.015383617 +0200
+@@ -2,6 +2,7 @@
+ #define _UDP_H_
+ 
+ #include <stdint.h>
++#include <sys/select.h>
+ #include <netinet/in.h>
+ 
+ struct udp_conf {
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 7a03fcd9e..e2661d148 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
-PKG_VERSION:=		7.28.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		cbdc0a79bdf6e657dd387c3d88d802e3
-PKG_DESCR:=		a client-side URL transfer tool
+PKG_VERSION:=		7.36.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		643a7030b27449e76413d501d4b8eb57
+PKG_DESCR:=		client-side URL transfer tool
 PKG_SECTION:=		www
 PKG_DEPENDS:=		libcurl
 PKG_BUILDDEP:=		zlib
@@ -58,7 +58,6 @@ CONFIGURE_ARGS+=	--with-gnutls="${STAGING_TARGET_DIR}/usr" \
 			--without-axtls
 endif
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
 CONFIGURE_ARGS+=	--disable-thread \
 			--enable-cookies \
@@ -67,17 +66,24 @@ CONFIGURE_ARGS+=	--disable-thread \
 			--enable-file \
 			--enable-ftp \
 			--enable-http \
+			--enable-proxy \
+			--disable-symbol-hiding \
 			--disable-ares \
 			--disable-dict \
 			--disable-gopher \
 			--disable-ldap \
+			--disable-smtp \
+			--disable-imap \
+			--disable-ldaps \
 			--disable-manual \
 			--disable-sspi \
 			--disable-telnet \
 			--disable-verbose \
+			--without-libssh2 \
+			--without-librtmp \
+			--without-libidn \
 			--with-random="/dev/urandom" \
-			--with-ca-bundle="/etc/ssl/cert.pem" \
-			--without-libidn
+			--with-ca-bundle="/etc/ssl/cert.pem"
 
 ifneq (${ADK_PACKAGE_CURL_WITH_IPV6},)
 CONFIGURE_ARGS+=	--enable-ipv6
diff --git a/package/curl/patches/patch-ltmain_sh b/package/curl/patches/patch-ltmain_sh
deleted file mode 100644
index 07db5c668..000000000
--- a/package/curl/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- curl-7.28.0.orig/ltmain.sh	2012-08-16 19:20:36.000000000 +0200
-+++ curl-7.28.0/ltmain.sh	2012-10-14 14:00:11.000000000 +0200
-@@ -5853,7 +5853,7 @@ func_mode_link ()
-       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/curl/patches/patch-src_tool_operate_c b/package/curl/patches/patch-src_tool_operate_c
new file mode 100644
index 000000000..eb1a3d52b
--- /dev/null
+++ b/package/curl/patches/patch-src_tool_operate_c
@@ -0,0 +1,13 @@
+--- curl-7.36.0.orig/src/tool_operate.c	2014-03-25 11:36:28.000000000 +0100
++++ curl-7.36.0/src/tool_operate.c	2014-04-02 14:59:00.000000000 +0200
+@@ -1794,8 +1794,10 @@ CURLcode operate(struct GlobalConfig *co
+       if(res == PARAM_HELP_REQUESTED)
+         tool_help();
+       /* Check if we were asked for the manual */
++#ifdef USE_MANUAL
+       else if(res == PARAM_MANUAL_REQUESTED)
+         hugehelp();
++#endif
+       /* Check if we were asked for the version information */
+       else if(res == PARAM_VERSION_INFO_REQUESTED)
+         tool_version_info();
diff --git a/package/glibc/files/libc.so.sh4 b/package/glibc/files/libc.so.sh4
new file mode 100644
index 000000000..eae5be42d
--- /dev/null
+++ b/package/glibc/files/libc.so.sh4
@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-sh-linux)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )
diff --git a/package/grub/Makefile b/package/grub/Makefile
index cfe17a227..663d02d72 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -4,37 +4,50 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		grub
-PKG_VERSION:=		1.98
+PKG_VERSION:=		2.00
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c0bcf60e524739bb64e3a2d4e3732a59
+PKG_MD5SUM:=		e927540b6eda8b024fb0391eeaa4091c
 PKG_DESCR:=		GRUB2 bootloader (source package)
 PKG_SECTION:=		boot
+PKG_BUILDDEP:=		bison-host
 PKG_URL:=		http://www.gnu.org/software/grub
-PKG_SITES:=		ftp://alpha.gnu.org/gnu/grub/
+PKG_SITES:=		ftp://ftp.gnu.org/gnu/grub/
 
-PKG_HOST_DEPENDS:=	linux
-PKG_ARCH_DEPENDS:=	x86 x86_64
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips
 PKG_NOPARALLEL:=	1
 
+PKG_CHOICES_GRUB:=	PC EFI
+PKGCD_PC:=		build for PC BIOS
+PKGCD_EFI:=		build for EFI
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GRUB,grub,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_PACKAGE_GRUB_PC),y)
+GRUB_ARCH:=		i386-pc
+CONFIGURE_ARGS+=	--with-platform=pc
+endif
+ifeq ($(ADK_PACKAGE_GRUB_EFI),y)
+GRUB_ARCH:=		x86_64-efi
+CONFIGURE_ARGS+=	--with-platform=efi
+endif
+
 ifeq ($(ADK_STATIC),y)
 TARGET_CFLAGS+=         -static
 TARGET_LDFLAGS+=        -static
 endif
 
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s  CPPFLAGS_FOR_BUILD="-I./include"
-CONFIGURE_ARGS+=	--disable-efiemu \
-			--disable-grub-mkfont \
-			--disable-grub-fstest
+CONFIGURE_ARGS+=	--disable-grub-mkfont
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
 grub-install:
-	${INSTALL_DIR} $(IDIR_GRUB)/usr/{sbin,lib,bin}
+	${INSTALL_DIR} $(IDIR_GRUB)/usr/{sbin,bin}
+	${INSTALL_DIR} $(IDIR_GRUB)/usr/lib/grub/${GRUB_ARCH}/
 	${INSTALL_DIR} $(IDIR_GRUB)/etc
 	${CP} ${WRKINST}/etc/grub.d $(IDIR_GRUB)/etc
-	${CP} ${WRKINST}/usr/lib/* $(IDIR_GRUB)/usr/lib
+	${CP} ${WRKINST}/usr/lib/grub/${GRUB_ARCH}/*{mod,lst,img} \
+		$(IDIR_GRUB)/usr/lib/grub/${GRUB_ARCH}/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/* $(IDIR_GRUB)/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/* $(IDIR_GRUB)/usr/sbin
 
diff --git a/package/grub/patches/patch-conf_common_mk b/package/grub/patches/patch-conf_common_mk
deleted file mode 100644
index fec7cd1dd..000000000
--- a/package/grub/patches/patch-conf_common_mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- grub-1.98.orig/conf/common.mk	2010-03-06 21:52:26.000000000 +0100
-+++ grub-1.98/conf/common.mk	2012-02-22 13:20:42.022360300 +0100
-@@ -11159,7 +11159,7 @@ trigtables.c: gentrigtables
- 	./gentrigtables > $@
- DISTCLEANFILES += trigtables.c
- gentrigtables: gentrigtables.c
--	$(CC) -o $@ $^ $(CPPFLAGS) -lm
-+	$(CC_FOR_BUILD) -o $@ $^ $(CPPFLAGS_FOR_BUILD) -lm
- DISTCLEANFILES += gentrigtables
- 
- pkglib_MODULES += setjmp.mod
diff --git a/package/grub/patches/patch-configure b/package/grub/patches/patch-configure
new file mode 100644
index 000000000..a3920a1c1
--- /dev/null
+++ b/package/grub/patches/patch-configure
@@ -0,0 +1,11 @@
+--- grub-2.00.orig/configure	2012-06-26 13:59:16.000000000 +0200
++++ grub-2.00/configure	2014-04-06 20:34:33.000000000 +0200
+@@ -3880,7 +3882,7 @@ TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(t
+ 
+ case "$target_cpu" in
+   i[3456]86)	target_cpu=i386 ;;
+-  amd64)	target_cpu=x86_64 ;;
++  amd64|x86_64)	target_cpu=x86_64 ;;
+   sparc)	target_cpu=sparc64 ;;
+   mipsel|mips64el)
+                 target_cpu=mipsel;
diff --git a/package/grub/patches/patch-grub-core_gnulib_stdio_in_h b/package/grub/patches/patch-grub-core_gnulib_stdio_in_h
new file mode 100644
index 000000000..79ab772ad
--- /dev/null
+++ b/package/grub/patches/patch-grub-core_gnulib_stdio_in_h
@@ -0,0 +1,14 @@
+--- grub-2.00.orig/grub-core/gnulib/stdio.in.h	2010-12-01 15:45:43.000000000 +0100
++++ grub-2.00/grub-core/gnulib/stdio.in.h	2014-04-05 10:02:52.000000000 +0200
+@@ -137,11 +137,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not
+                  "use gnulib module fflush for portable POSIX compliance");
+ #endif
+ 
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.