Update for 2014.11-rc2

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

CHANGES

@@ -1,3 +1,22 @@
+2014.11-rc2, Released November 21st, 2014
+
+	Fixes all over the tree.
+
+	Inittab tweaks for shutdown handling (busybox and sysvinit).
+
+	Updated/fixed packages: aircrack-ng, botan, canfestival,
+	clamav, coreutils, czmq, dbus, dovecot, duma, e2fsprogs,
+	erlang, gcc, iputils, libcap, libgcrypt, libmemcached,
+	libssh2, libunwind, libv4l, linux-headers, mesa3d-demos, mutt,
+	mysql, ndisc6, nodejs, omniorb, perl-cross, php,
+	python-tornado, python3, qemu, qt5base, qt5webkit, rpm,
+	rt-tests, ruby, schifra, sdl_sound, shairport-sync, sysvinit,
+	tstools, tzdata, wireshark, x264
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#7646: strftime on datetime not works on python3
+
 2014.11-rc1, Released November 12th, 2014
 
 	Fixes all over the tree and new features.

Makefile

@@ -28,7 +28,7 @@
 all:
 
 # Set and export the version string
-export BR2_VERSION := 2014.11-rc1
+export BR2_VERSION := 2014.11-rc2
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION = 3.81

docs/download.html

@@ -18,14 +18,14 @@ or
 
 <p>
 
-The latest release candidate is <b>2014.11-rc1</b>, which can be
+The latest release candidate is <b>2014.11-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2014.11-rc1.tar.gz">buildroot-2014.11-rc1.tar.gz</a>
-(<a href="/downloads/buildroot-2014.11-rc1.tar.gz.sign">PGP signature</a>)
+<a href="/downloads/buildroot-2014.11-rc2.tar.gz">buildroot-2014.11-rc2.tar.gz</a>
+(<a href="/downloads/buildroot-2014.11-rc2.tar.gz.sign">PGP signature</a>)
 or
-<a href="/downloads/buildroot-2014.11-rc1.tar.bz2">buildroot-2014.11-rc1.tar.bz2</a>
-(<a href="/downloads/buildroot-2014.11-rc1.tar.bz2.sign">PGP signature</a>).
+<a href="/downloads/buildroot-2014.11-rc2.tar.bz2">buildroot-2014.11-rc2.tar.bz2</a>
+(<a href="/downloads/buildroot-2014.11-rc2.tar.bz2.sign">PGP signature</a>).
 <p>
 
 This and earlier releases (and their PGP signatures) can always be downloaded from

docs/manual/resources.txt

@@ -60,7 +60,7 @@ project. Patches that have been sent to a mailing list are \'caught' by
 the system, and appear on a web page. Any comments posted that
 reference the patch are appended to the patch page too. For more
 information on Patchwork see
-http://jk.ozlabs.org/projects/patchwork[].
+http://jk.ozlabs.org/projects/patchwork/[].
 +
 Buildroot's Patchwork website is mainly for use by Buildroot's
 maintainer to ensure patches aren't missed. It is also used by Buildroot

docs/news.html

@@ -9,12 +9,42 @@
 
 <ul>
 
+  <li><b>21 November 2014 -- 2014.11-rc2 released</b>
+
+    <p>Another week, another release candidate with more cleanups and
+    build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2014.11-rc2">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2014.11-rc2.tar.bz2">2014.11-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="support.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>13 November 2014 -- Report from Buildroot Developers Meeting</b>
+
+    <p>A report from the recent
+    <a href="http://elinux.org/Buildroot:DeveloperDaysELCE2014">
+    Buildroot Developers Meeting</a> is now
+    <a href="http://lists.busybox.net/pipermail/buildroot/2014-October/109966.html">available</a>.</p>
+
+    <p>Once again, thanks to all the participants and to
+    <a href="http://www.mind.be">Mind</a> for sponsoring the event.</p>
+
+    <p>The next Developer Days will take place on February 2nd and 3rd
+    in Brussels, Belgium, right after <a
+    href="http://fosdem.org">FOSDEM</a>. See the <a
+    href="http://elinux.org/Buildroot:DeveloperDaysFOSDEM2015">wiki</a>
+    for more details.</p>
+
   <li><b>12 November 2014 -- 2014.11-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2014.11-rc1">CHANGES</a>
-    file for details.</p>
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2014-November/111946.html">announcement</a>.</p>
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2014.11-rc1.tar.bz2">2014.11-rc1

linux/Config.in

@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "3.17.2"
+	bool "3.17.3"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -104,7 +104,7 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.17.2" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "3.17.3" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION

package/aircrack-ng/aircrack-ng.mk

@@ -14,7 +14,7 @@ AIRCRACK_NG_MAKE_OPTS = unstable=true
 
 # Account for libpthread in static
 AIRCRACK_NG_LDFLAGS = $(TARGET_LDFLAGS) \
-	$(if $(BR2_PREFER_STATIC_LIB),-lpthread)
+	$(if $(BR2_PREFER_STATIC_LIB),-lpthread -lz)
 
 # libnl support has issues when building static
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
@@ -39,9 +39,10 @@ else
 	AIRCRACK_NG_MAKE_OPTS += pcre=false
 endif
 
+# Duplicate -lpthread, because it is also needed by sqlite
 ifeq ($(BR2_PACKAGE_SQLITE),y)
 	AIRCRACK_NG_DEPENDENCIES += sqlite
-	AIRCRACK_NG_MAKE_OPTS += sqlite=true LIBSQL="-lsqlite3"
+	AIRCRACK_NG_MAKE_OPTS += sqlite=true LIBSQL="-lsqlite3 $(if $(BR2_PREFER_STATIC_LIB),-lpthread)"
 else
 	AIRCRACK_NG_MAKE_OPTS += sqlite=false
 endif

package/botan/Config.in

@@ -10,11 +10,12 @@ config BR2_PACKAGE_BOTAN
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS
+	depends on !BR2_PREFER_STATIC_LIB # dlfcn.h
 	help
 	  Botan is a crypto library for C++
 
 	  http://botan.randombit.net
 
-comment "botan needs a toolchain w/ C++, threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+comment "botan needs a toolchain w/ C++, threads, dynamic library"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_PREFER_STATIC_LIB
 	depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS

package/canfestival/Config.in

@@ -2,14 +2,15 @@ config BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
 	bool
 	default y if BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm
 
-comment "canfestival needs a toolchain w/ threads"
+comment "canfestival needs a toolchain w/ threads and dynamic library"
 	depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
 
 config BR2_PACKAGE_CANFESTIVAL
 	bool "canfestival"
 	depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  CanFestival is an OpenSource CANOpen framework, licensed under
 	  LGPLv2.1 and GPLv2 for some drivers (virtual_kernel, lincan and

package/cdrkit/Config.in

@@ -4,6 +4,7 @@ config BR2_PACKAGE_CDRKIT
 	select BR2_PACKAGE_LIBCAP
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_MMU # fork
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libcap
 	bool "cdrkit"
 	help
 	  cdrkit is a suite of programs for recording CDs and DVDs,
@@ -12,6 +13,6 @@ config BR2_PACKAGE_CDRKIT
 
 	  http://www.cdrkit.org/
 
-comment "cdrkit needs a toolchain w/ largefile"
+comment "cdrkit needs a toolchain w/ largefile, headers >= 3.0"
 	depends on BR2_USE_MMU
-	depends on !BR2_LARGEFILE
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0

package/clamav/clamav-0003-backtrace-uClibc.patch

@@ -0,0 +1,22 @@
+mbox: do not use backtrace if using uClibc without backtrace support
+
+Since uClibc can be configured without support for backtrace, disable
+the backtrace if we are building with a uClibc that was built without
+backtrace.
+
+This is a bit hacky, and would greatly benefit from a test in ./configure
+instead, but does nicely as a quick fix for now.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+diff -durN clamav-0.98.4.orig/libclamav/mbox.c clamav-0.98.4/libclamav/mbox.c
+--- clamav-0.98.4.orig/libclamav/mbox.c	2014-05-21 17:25:05.000000000 +0200
++++ clamav-0.98.4/libclamav/mbox.c	2014-11-16 17:21:04.885383286 +0100
+@@ -83,7 +83,7 @@
+ #include <features.h>
+ #endif
+ 
+-#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1
++#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 && !defined(__UCLIBC__) || defined(__UCLIBC_HAS_BACKTRACE__)
+ #define HAVE_BACKTRACE
+ #endif
+ #endif

package/clamav/clamav.hash

@@ -1,2 +1,2 @@
-# From http://sourceforge.net/projects/clamav/files/clamav/0.98.4/
-sha1	f1003d04f34efb0aede05395d3c7cc22c944e4ef	clamav-0.98.4.tar.gz
+# From http://sourceforge.net/projects/clamav/files/clamav/0.98.5/
+sha1	5f5e45735819e3ca61610899b779172a5639f70f	clamav-0.98.5.tar.gz

package/clamav/clamav.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CLAMAV_VERSION = 0.98.4
+CLAMAV_VERSION = 0.98.5
 CLAMAV_SITE = http://sourceforge.net/projects/clamav/files/clamav/$(CLAMAV_VERSION)
 CLAMAV_LICENSE = GPLv2
 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
@@ -32,6 +32,10 @@ CLAMAV_CONF_OPTS = \
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
 CLAMAV_DEPENDENCIES += bzip2
+# autodetection gets confused if host has bzip2, so force it
+CLAMAV_CONF_ENV += \
+	ac_cv_libbz2_libs=-lbz2 \
+	ac_cv_libbz2_ltlibs=-lbz2
 else
 CLAMAV_CONF_OPTS += --disable-bzip2
 endif

package/coreutils/coreutils.mk

@@ -51,7 +51,8 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
 	gl_getline_needs_run_time_check=no \
 	gl_cv_have_proc_uptime=yes \
 	utils_cv_localtime_cache=no \
-	PERL=missing
+	PERL=missing \
+	MAKEINFO=true
 
 COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \
 	ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \
@@ -101,12 +102,12 @@ endif
 define COREUTILS_POST_INSTALL
 	# some things go in root rather than usr
 	for f in $(COREUTILS_BIN_PROGS); do \
-		mv $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f; \
+		mv -f $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f; \
 	done
 	# link for archaic shells
 	ln -fs test $(TARGET_DIR)/usr/bin/[
 	# gnu thinks chroot is in bin, debian thinks it's in sbin
-	mv $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin/chroot
+	mv -f $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin/chroot
 endef
 
 COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_POST_INSTALL

package/czmq/czmq.mk

@@ -18,6 +18,10 @@ CZMQ_LICENSE_FILES = LICENSE
 # host-python, so disable asciidoc entirely.
 CZMQ_CONF_ENV = ac_cv_prog_czmq_have_asciidoc=no
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+CZMQ_CONF_OPTS += LIBS=-lstdc++
+endif
+
 define CZMQ_CREATE_CONFIG_DIR
 	mkdir -p $(@D)/config
 endef

package/dbus/dbus.hash

@@ -0,0 +1,2 @@
+# Locally calculated after checking pgp signature
+sha256	10bf87fdb68815edd01d53885101dbcdd80dacad7198912cca61a4fa22dfaf8e	dbus-1.8.10.tar.gz

package/dbus/dbus.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DBUS_VERSION = 1.8.8
+DBUS_VERSION = 1.8.10
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
 DBUS_LICENSE = AFLv2.1 GPLv2+
 DBUS_LICENSE_FILES = COPYING

package/dovecot/0002-fix-static-build.patch

@@ -0,0 +1,24 @@
+Fix static build
+
+MODULE_SUFFIX is undefined when building statically; don't used it.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: sent upstream
+(http://dovecot.org/pipermail/dovecot/2014-November/098694.html)
+
+diff -Nuar dovecot-2.2.15-orig/src/lib/module-dir.c dovecot-2.2.15/src/lib/module-dir.c
+--- dovecot-2.2.15-orig/src/lib/module-dir.c	2014-10-18 00:10:15.000000000 +0300
++++ dovecot-2.2.15/src/lib/module-dir.c	2014-11-13 19:27:29.417786313 +0200
+@@ -621,7 +621,11 @@
+ 	if (*p == '_')
+ 		fname = p + 1;
+ 
++#ifdef MODULE_SUFFIX
+ 	p = strstr(fname, MODULE_SUFFIX);
++#else
++	p = NULL;
++#endif
+ 	if (p == NULL)
+ 		return fname;
+ 

package/duma/0002-no-tests.patch

@@ -0,0 +1,19 @@
+Do not build test programs
+
+Biulding test programs does not work when we want to do a static link,
+because duma.a redefines memcpy and strcpy, so the link fails.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN duma-2.5.15.orig/GNUmakefile duma-2.5.15/GNUmakefile
+--- duma-2.5.15.orig/GNUmakefile	2014-11-16 14:47:05.874448560 +0100
++++ duma-2.5.15/GNUmakefile	2014-11-16 14:54:50.792048921 +0100
+@@ -294,7 +294,7 @@
+ SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o
+ 
+ # Make all the top-level targets the makefile knows about.
+-all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
++all:	libduma.a $(DUMA_DYN_DEPS)
+ 
+ # Perform self tests on the program this makefile builds.
+ check test:

package/duma/duma.mk

@@ -25,11 +25,11 @@ define DUMA_BUILD_CMDS
 endef
 
 define DUMA_INSTALL_STAGING_CMDS
-	$(MAKE) prefix=$(STAGING_DIR)/usr install -C $(@D)
+	$(MAKE) OS=linux prefix=$(STAGING_DIR)/usr install -C $(@D)
 endef
 
 define DUMA_INSTALL_TARGET_CMDS
-	$(MAKE) prefix=$(TARGET_DIR)/usr install -C $(@D)
+	$(MAKE) OS=linux prefix=$(TARGET_DIR)/usr install -C $(@D)
 endef
 
 $(eval $(generic-package))

package/e2fsprogs/e2fsprogs.mk

@@ -29,6 +29,12 @@ ifeq ($(BR2_nios2),y)
 E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no
 endif
 
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+# util-linux libuuid pulls in libintl if needed, so ensure we also
+# link against it, otherwise static linking fails
+E2FSPROGS_CONF_ENV += LIBS=-lintl
+endif
+
 E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
 
 E2FSPROGS_MAKE_OPTS = \

package/erlang/erlang.mk

@@ -27,6 +27,8 @@ ERLANG_CONF_OPTS = --without-javac
 HOST_ERLANG_DEPENDENCIES = host-openssl
 HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR)/usr
 
+HOST_ERLANG_CONF_OPTS += --without-termcap
+
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 ERLANG_CONF_OPTS += --with-termcap
 ERLANG_DEPENDENCIES += ncurses

package/gcc/Config.in.host

@@ -30,7 +30,7 @@ choice
 		depends on !BR2_cortex_a7 && !BR2_cortex_a12 && \
 			!BR2_cortex_a15 && !BR2_fa526 && !BR2_pj4
 		# Broken or unsupported PPC cores
-		depends on !BR2_power8
+		depends on !BR2_powerpc_power8
 		# SPARC -mcpu=leon3 appeared in gcc 4.8.3
 		depends on !BR2_sparc_leon3
 		# Broken or unsupported X86 cores
@@ -49,7 +49,7 @@ choice
 		# Broken or unsupported ARM cores
 		depends on !BR2_cortex_a12 && !BR2_pj4
 		# Broken or unsupported PPC cores
-		depends on !BR2_power8
+		depends on !BR2_powerpc_power8
 		# SPARC -mcpu=leon3 appeared in gcc 4.8.3
 		depends on !BR2_sparc_leon3
 		# Broken or unsupported x86 cores
@@ -64,7 +64,7 @@ choice
 		# Broken or unsupported ARM cores
 		depends on !BR2_cortex_a12
 		# Broken or unsupported PPC cores
-		depends on !BR2_power8
+		depends on !BR2_powerpc_power8
 		select BR2_GCC_NEEDS_MPC
 		select BR2_GCC_SUPPORTS_GRAPHITE
 

package/iputils/0001-ping-ping6-Fix-hang-with-f-option.patch

@@ -0,0 +1,34 @@
+From 712fddacfb5c4a8a48d9c5debe1870bc051d836c Mon Sep 17 00:00:00 2001
+From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
+Date: Tue, 6 Nov 2012 02:44:12 +0900
+Subject: [PATCH] ping,ping6: Fix hang with -f option.
+
+Bug was introduced by commit 8feb586c4... (ping,ping6: Check return
+value of write(2) for stdout.).
+
+https://bugs.archlinux.org/task/32306
+
+Patch-by: Jan Synacek <jsynacek@redhat.com>
+Reported-by: Mohammad Alsaleh <msal@tormail.org>
+Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ ping_common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ping_common.h b/ping_common.h
+index d2a2b5c..6726e1b 100644
+--- a/ping_common.h
++++ b/ping_common.h
+@@ -140,7 +140,7 @@ static inline void write_stdout(const char *str, size_t len)
+ 	do {
+ 		cc = write(STDOUT_FILENO, str + o, len - o);
+ 		o += cc;
+-	} while (len >= o || cc < 0);
++	} while (len > o || cc < 0);
+ }
+ 
+ /*
+-- 
+2.1.3
+

package/iputils/Config.in

@@ -1,6 +1,6 @@
 config BR2_PACKAGE_IPUTILS
 	bool "iputils"
-	select BR2_OPENSSL if BR2_INET_IPV6
+	select BR2_PACKAGE_OPENSSL if BR2_INET_IPV6
 	depends on BR2_USE_MMU # fork()
 	# requires dn_comp (only available in since uclibc 0.9.33)
 	depends on !BR2_avr32

package/libcap/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBCAP
 	bool "libcap"
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # XATTR_NAME_CAPS
 	help
 	  This library implements the user-space interfaces to the
 	  POSIX 1003.1e capabilities available in Linux kernels. These
@@ -22,3 +23,6 @@ config BR2_PACKAGE_LIBCAP_TOOLS
 	  CONFIG_EXT2_FS_XATTR and CONFIG_EXT2_FS_SECURITY for ext2).
 
 endif
+
+comment "libcap needs a toolchain w/ headers >= 3.0"
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0

package/libgcrypt/Config.in

@@ -4,4 +4,4 @@ config BR2_PACKAGE_LIBGCRYPT
 	help
 	  LibGCrypt is GNU's basic cryptographic library.
 
-	  ftp://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/
+	  http://www.gnu.org/software/libgcrypt/

package/libmemcached/0002-disable-sanitizer.patch

@@ -0,0 +1,25 @@
+Disable sanitizer checks, they're busted.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libmemcached-1.0.18.orig/m4/ax_harden_compiler_flags.m4 libmemcached-1.0.18/m4/ax_harden_compiler_flags.m4
+--- libmemcached-1.0.18.orig/m4/ax_harden_compiler_flags.m4	2014-11-13 08:07:09.011614311 -0300
++++ libmemcached-1.0.18/m4/ax_harden_compiler_flags.m4	2014-11-13 08:07:52.406092440 -0300
+@@ -222,8 +222,6 @@
+ #         GCC 4.5 removed this.
+ #         _APPEND_COMPILE_FLAGS_ERROR([-Wunreachable-code])
+ 
+-          _SET_SANITIZE_FLAGS
+-
+           AS_IF([test "x$ax_enable_debug" = xno],
+             [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
+               [AS_IF([test "x${host_os}" != "xmingw"],
+@@ -337,8 +335,6 @@
+                 _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all])
+                 ])])])])
+ 
+-          _SET_SANITIZE_FLAGS
+-
+           AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
+                 [AX_APPEND_FLAG([-Werror])])
+           AC_LANG_POP([C++])

package/libmemcached/libmemcached.mk

@@ -13,7 +13,7 @@ LIBMEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' \
 LIBMEMCACHED_CONF_OPTS = --disable-dtrace
 LIBMEMCACHED_INSTALL_STAGING = YES
 LIBMEMCACHED_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBEVENT),libevent)
-# For libmemcached-01-disable-tests.patch
+# For 0001-disable-tests.patch and 0002-disable-sanitizer.patch
 LIBMEMCACHED_AUTORECONF = YES
 LIBMEMCACHED_LICENSE = BSD-3c
 LIBMEMCACHED_LICENSE_FILES = COPYING

package/libssh2/libssh2.mk

@@ -18,6 +18,9 @@ LIBSSH2_DEPENDENCIES += libgcrypt
 LIBSSH2_CONF_OPTS += --with-libgcrypt \
 	--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
 	--without-openssl
+# configure.ac forgets to link to dependent libraries of gcrypt breaking static
+# linking
+LIBSSH2_CONF_ENV += LIBS="$(shell $(STAGING_DIR)/usr/bin/libgcrypt-config --libs)"
 else
 LIBSSH2_DEPENDENCIES += openssl
 LIBSSH2_CONF_OPTS += --with-openssl \

package/libunwind/0003-Link-libunwind-to-libgcc_s-rather-than-libgcc.patch

@@ -0,0 +1,41 @@
+From f1684379dfaf8018d5d4c1945e292a56d0fab245 Mon Sep 17 00:00:00 2001
+From: Thierry Reding <treding@nvidia.com>
+Date: Fri, 27 Jun 2014 08:40:33 +0200
+Subject: [PATCH] Link libunwind to libgcc_s rather than libgcc
+
+For some architectures, -lgcc and -lgcc_s are not equivalent. On ARM for
+example, libgcc_s.so.1 contains some symbols needed by libunwind which
+are not present in libgcc.
+
+This causes the following link error when building the X.Org X server
+with libunwind support:
+
+	  CCLD     Xorg
+	/usr/lib/libunwind.so: undefined reference to `__aeabi_unwind_cpp_pr0'
+	/usr/lib/libunwind.so: undefined reference to `__aeabi_unwind_cpp_pr1'
+
+Linking against libgcc_s explicitly solves this problem.
+
+Signed-off-by: Thierry Reding <treding@nvidia.com>
+[yann.morin.1998@free.fr: backport to libunwind 1.1]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4e2fd23..a77cf01 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -258,7 +258,7 @@ else
+ 
+ if test x$GCC = xyes -a x$intel_compiler != xyes; then
+   CFLAGS="${CFLAGS} -fexceptions -Wall -Wsign-compare"
+-  LIBCRTS="-lgcc"
++  LIBCRTS="-lgcc_s"
+ fi
+ AC_MSG_RESULT([$intel_compiler])
+ 
+-- 
+1.9.1
+

package/libunwind/Config.in

@@ -12,5 +12,4 @@ config BR2_PACKAGE_LIBUNWIND
 comment "libunwind needs a uclibc snapshot or (e)glibc toolchain w/ threads"
 	depends on BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_mips64 || \
 		BR2_mips64el || BR2_powerpc || BR2_sh || BR2_sh64 || BR2_i386 || BR2_x86_64
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
-	depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC)
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC)

package/libv4l/Config.in

@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBV4L
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # media headers
 	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
@@ -28,6 +29,7 @@ config BR2_PACKAGE_LIBV4L_UTILS
 
 endif
 
-comment "libv4l needs a toolchain w/ largefile, threads and C++"
-	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+comment "libv4l needs a toolchain w/ largefile, threads and C++, headers >= 3.0"
 	depends on BR2_USE_MMU
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0

package/linux-headers/Config.in.host

@@ -165,12 +165,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.0.101"	if BR2_KERNEL_HEADERS_3_0
 	default "3.2.64"	if BR2_KERNEL_HEADERS_3_2
 	default "3.4.104"	if BR2_KERNEL_HEADERS_3_4
-	default "3.10.59"	if BR2_KERNEL_HEADERS_3_10
+	default "3.10.60"	if BR2_KERNEL_HEADERS_3_10
 	default "3.11.10"	if BR2_KERNEL_HEADERS_3_11
 	default "3.12.32"	if BR2_KERNEL_HEADERS_3_12
 	default "3.13.11"	if BR2_KERNEL_HEADERS_3_13
-	default "3.14.23"	if BR2_KERNEL_HEADERS_3_14
+	default "3.14.24"	if BR2_KERNEL_HEADERS_3_14
 	default "3.15.10"	if BR2_KERNEL_HEADERS_3_15
 	default "3.16.7"	if BR2_KERNEL_HEADERS_3_16
-	default "3.17.2"	if BR2_KERNEL_HEADERS_3_17
+	default "3.17.3"	if BR2_KERNEL_HEADERS_3_17
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

package/lxc/Config.in

@@ -7,6 +7,7 @@ config BR2_PACKAGE_LXC
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_avr32 # no timerfd
 	depends on !BR2_nios2 # the toolchain doesn't support setns syscall
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libcap
 	help
 	  Linux Containers (LXC), provides the ability to group and isolate
 	  of a set of processes in a jail by virtualizing and accounting the
@@ -14,8 +15,9 @@ config BR2_PACKAGE_LXC
 
 	  https://linuxcontainers.org/
 
-comment "lxc needs a toolchain w/ IPv6, threads, largefile"
+comment "lxc needs a toolchain w/ IPv6, threads, largefile, headers >= 3.0"
 	depends on BR2_USE_MMU
 	depends on !BR2_avr32 # no timerfd
 	depends on !BR2_nios2 # the toolchain doesn't support setns syscall
-	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE
+	depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS \
+                || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0

package/mesa3d-demos/Config.in

@@ -1,5 +1,7 @@
 config BR2_PACKAGE_MESA3D_DEMOS
 	bool "mesa3d-demos"
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \
 		|| BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG
 	help

package/mesa3d-demos/mesa3d-demos.mk

@@ -11,11 +11,11 @@ MESA3D_DEMOS_AUTORECONF = YES
 MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
 MESA3D_DEMOS_LICENSE = MIT
 
-ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
-MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu
-MESA3D_DEMOS_CONF_OPTS += --enable-gl
+ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)
+MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext
+MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11
 else
-MESA3D_DEMOS_CONF_OPTS += --disable-gl
+MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)

package/mutt/mutt.mk

@@ -41,4 +41,20 @@ else
 MUTT_CONF_OPTS += --without-ssl
 endif
 
+# Avoid running tests to check for:
+#  - target system is *BSD
+#  - C99 conformance (snprintf, vsnprintf)
+#  - behaviour of the regex library
+#  - if mail spool directory is world/group writable
+#  - we have a working libiconv
+MUTT_CONF_ENV += \
+	mutt_cv_bsdish=no \
+	mutt_cv_c99_snprintf=yes \
+	mutt_cv_c99_vsnprintf=yes \
+	mutt_cv_regex_broken=no \
+	mutt_cv_worldwrite=yes \
+	mutt_cv_groupwrite=yes \
+	mutt_cv_iconv_good=yes \
+	mutt_cv_iconv_nontrans=no
+
 $(eval $(autotools-package))

package/mysql/mysql.mk

@@ -43,7 +43,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_MYSQL_SERVER),y)
 MYSQL_DEPENDENCIES += host-mysql host-bison
-HOST_MYSQL_DEPENDENCIES = host-zlib
+HOST_MYSQL_DEPENDENCIES = host-zlib host-ncurses
 
 HOST_MYSQL_CONF_OPTS = \
 	--with-embedded-server \

package/ndisc6/ndisc6.mk

@@ -14,7 +14,7 @@ NDISC6_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 NDISC6_DEPENDENCIES += gettext
-NDISC6_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
+NDISC6_CONF_ENV += LIBS="-lintl"
 endif
 
 NDISC6_BIN_ += dnssort # perl script

package/nodejs/nodejs-0004-fix-build-error-without-OpenSSL-support.patch

@@ -0,0 +1,54 @@
+From d9acdddb42aef48a9504368019beb1ad91c9a0c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= <jkrause@posteo.de>
+Date: Mon, 17 Nov 2014 12:34:05 +0100
+Subject: [PATCH 1/1] src/node.cc: fix build error without OpenSSL support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Krause <jkrause@posteo.de>
+---
+ src/node.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/node.cc b/src/node.cc
+index 18c743f..cb77f08 100644
+--- a/src/node.cc
++++ b/src/node.cc
+@@ -82,7 +82,6 @@ typedef int mode_t;
+ #include "node_script.h"
+ #include "v8_typed_array.h"
+ 
+-#include "node_crypto.h"
+ #include "util.h"
+ 
+ using namespace v8;
+@@ -2544,8 +2543,10 @@ static void PrintHelp() {
+          "  --trace-deprecation  show stack traces on deprecations\n"
+          "  --v8-options         print v8 command line options\n"
+          "  --max-stack-size=val set max v8 stack size (bytes)\n"
++#if HAVE_OPENSSL
+          "  --enable-ssl2        enable ssl2\n"
+          "  --enable-ssl3        enable ssl3\n"
++#endif
+          "\n"
+          "Environment variables:\n"
+ #ifdef _WIN32
+@@ -2579,12 +2580,14 @@ static void ParseArgs(int argc, char **argv) {
+       p = 1 + strchr(arg, '=');
+       max_stack_size = atoi(p);
+       argv[i] = const_cast<char*>("");
++#if HAVE_OPENSSL
+     } else if (strcmp(arg, "--enable-ssl2") == 0) {
+       SSL2_ENABLE = true;
+       argv[i] = const_cast<char*>("");
+     } else if (strcmp(arg, "--enable-ssl3") == 0) {
+       SSL3_ENABLE = true;
+       argv[i] = const_cast<char*>("");
++#endif
+     } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
+       PrintHelp();
+       exit(0);
+-- 
+2.1.3
+

package/nodejs/nodejs.mk

@@ -75,8 +75,7 @@ define NODEJS_CONFIGURE_CMDS
 		--prefix=/usr \
 		--without-snapshot \
 		--shared-zlib \
-		$(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,\
-			--without-ssl --without-ssl2 --without-ssl3) \
+		$(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,--without-ssl) \
 		$(if $(BR2_PACKAGE_NODEJS_NPM),,--without-npm) \
 		--without-dtrace \
 		--without-etw \

package/omniorb/0001-uclinux-is-also-linux.patch

@@ -0,0 +1,19 @@
+uclinux is also linux
+
+Patch status: sent upstream
+(http://www.omniorb-support.com/pipermail/omniorb-list/2014-November/031628.html)
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+
+diff -Nuar omniORB-4.1.6-orig/configure.ac omniORB-4.1.6/configure.ac
+--- omniORB-4.1.6-orig/configure.ac	2011-06-25 00:37:28.000000000 +0300
++++ omniORB-4.1.6/configure.ac	2014-11-20 07:05:25.072634260 +0200
+@@ -183,6 +183,7 @@
+ 
+ case "$host" in
+   *-*-linux-*)   plat_name="Linux";    plat_def="__linux__";    os_v="2";;
++  *-*-uclinux-*) plat_name="Linux";    plat_def="__linux__";    os_v="2";;
+   *-*-cygwin*)   plat_name="Cygwin";   plat_def="__cygwin__";   os_v="1";;
+   *-*-solaris*)  plat_name="SunOS";    plat_def="__sunos__";    os_v="5";;
+   *-*-osf3*)     plat_name="OSF1";     plat_def="__osf1__";     os_v="3";;

package/omniorb/omniorb.mk

@@ -14,6 +14,9 @@ OMNIORB_DEPENDENCIES = host-omniorb
 HOST_OMNIORB_DEPENDENCIES = host-python
 OMNIORB_INSTALL_TARGET = YES
 
+# 0001-uclinux-is-also-linux.patch touches configure.ac
+OMNIORB_AUTORECONF = YES
+
 # omniorb is not python3 friendly, so force the python interpreter
 OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
 HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
@@ -41,6 +44,13 @@ ifeq ($(BR2_PACKAGE_OMNIORB_WITH_APPS),y)
 OMNIORB_POST_PATCH_HOOKS += OMNIORB_ENABLE_EXTRA_APPS
 endif
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+define OMNIORB_DISABLE_SHARED
+	echo "BuildSharedLibrary =" >> $(@D)/mk/beforeauto.mk
+endef
+OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_DISABLE_SHARED
+endif
+
 # omniORB is not completely cross-compile friendly and has some
 # assumptions where a couple host tools must be built and then
 # used by the target build.  The host tools generate code from

package/perl/perl.mk

@@ -12,7 +12,7 @@ PERL_LICENSE = Artistic or GPLv1+
 PERL_LICENSE_FILES = Artistic Copying README
 PERL_INSTALL_STAGING = YES
 
-PERL_CROSS_VERSION = 0.9.3
+PERL_CROSS_VERSION = 0.9.4
 PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).1
 # DO NOT refactor with the github helper (the result is not the same)
 PERL_CROSS_SITE = http://raw.github.com/arsv/perl-cross/releases

package/php/php.hash

@@ -1,2 +1,2 @@
 # From http://php.net/downloads.php
-md5	3984f32985842afebe5795457e26931f	php-5.5.18.tar.xz
+md5	c63dcfd8b318d12127ba6d39ecc8a444	php-5.5.19.tar.xz

package/php/php.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_VERSION = 5.5.18
+PHP_VERSION = 5.5.19
 PHP_SITE = http://www.php.net/distributions
 PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_INSTALL_STAGING = YES

package/python-tornado/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PYTHON_TORNADO
 	bool "python-tornado"
 	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_ZLIB
 	help
 	  Tornado is a Python web framework and asynchronous networking
 	  library, originally developed at FriendFeed.

package/python3/python3.mk

@@ -107,6 +107,12 @@ PYTHON3_CONF_ENV += \
 	ac_cv_file__dev_ptc=yes \
 	ac_cv_working_tzset=yes
 
+# uClibc is known to have a broken wcsftime() implementation, so tell
+# Python 3 to fall back to strftime() instead.
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
+PYTHON3_CONF_ENV += ac_cv_func_wcsftime=no
+endif
+
 PYTHON3_CONF_OPTS += \
 	--without-ensurepip	\
 	--without-cxx-main 	\

package/qemu/Config.in

@@ -54,6 +54,7 @@ comment "... or you can select emulator families to enable, below:"
 
 config BR2_PACKAGE_QEMU_SYSTEM
 	bool "Enable all systems emulation"
+	select BR2_PACKAGE_QEMU_FDT
 	help
 	  Say 'y' to build all system emulators/virtualisers that QEMU supports.
 
@@ -81,6 +82,15 @@ config BR2_PACKAGE_QEMU_SDL
 	  Say 'y' to enable the SDL frontend, that is, a graphical window
 	  presenting the VM's display.
 
+comment "Misc. features"
+
+config BR2_PACKAGE_QEMU_FDT
+        bool "Enable FDT"
+        select BR2_PACKAGE_DTC
+        help
+          Say 'y' here to have QEMU capable of constructing Device Trees,
+          and passing them to the VMs.
+
 endif # BR2_PACKAGE_QEMU_HAS_EMULS
 
 endif # BR2_PACKAGE_QEMU

package/qemu/qemu.mk

@@ -75,7 +75,7 @@ define HOST_QEMU_BUILD_CMDS
 endef
 
 define HOST_QEMU_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) install
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
 $(eval $(host-generic-package))
@@ -133,6 +133,13 @@ else
 QEMU_OPTS += --disable-sdl
 endif
 
+ifeq ($(BR2_PACKAGE_QEMU_FDT),y)
+QEMU_OPTS += --enable-fdt
+QEMU_DEPENDENCIES += dtc
+else
+QEMU_OPTS += --disable-fdt
+endif
+
 define QEMU_CONFIGURE_CMDS
 	( cd $(@D);                                     \
 		LIBS='$(QEMU_LIBS)'                     \
@@ -155,7 +162,6 @@ define QEMU_CONFIGURE_CMDS
 			--disable-brlapi                \
 			--disable-curses                \
 			--disable-curl                  \
-			--disable-fdt                   \
 			--disable-bluez                 \
 			--disable-guest-base            \
 			--disable-uuid                  \

package/qt5/qt5base/Config.in

@@ -37,9 +37,7 @@ config BR2_PACKAGE_QT5BASE_EXAMPLES
 	  If unsure, say N.
 
 config BR2_PACKAGE_QT5BASE_NETWORK
-	bool "network module"
-	help
-	  This options enables the Qt5Network library.
+       def_bool y
 
 config BR2_PACKAGE_QT5BASE_CONCURRENT
 	bool "concurrent module"
@@ -47,9 +45,7 @@ config BR2_PACKAGE_QT5BASE_CONCURRENT
 	  This options enables the Qt5Concurrent library.
 
 config BR2_PACKAGE_QT5BASE_SQL
-	bool "sql module"
-	help
-	  This options enables the Qt5Sql library.
+       def_bool y
 
 if BR2_PACKAGE_QT5BASE_SQL
 config BR2_PACKAGE_QT5BASE_MYSQL
@@ -101,14 +97,10 @@ endchoice
 endif
 
 config BR2_PACKAGE_QT5BASE_TEST
-	bool "test module"
-	help
-	  This options enables the Qt5Test library.
+	def_bool y
 
 config BR2_PACKAGE_QT5BASE_XML
-	bool "XML module"
-	help
-	  This options enables the Qt5Xml library.
+	def_bool y
 
 config BR2_PACKAGE_QT5BASE_GUI
 	bool "gui module"
@@ -209,10 +201,8 @@ config BR2_PACKAGE_QT5BASE_DEFAULT_QPA
 	  different platform at runtime with the -platform option.
 
 config BR2_PACKAGE_QT5BASE_PRINTSUPPORT
-	bool "print support module"
-	select BR2_PACKAGE_QT5BASE_WIDGETS
-	help
-	  This option enables the Qt5PrintSupport
+	depends on BR2_PACKAGE_QT5BASE_WIDGETS
+	def_bool y
 
 config BR2_PACKAGE_QT5BASE_FONTCONFIG
 	bool "fontconfig support"

package/qt5/qt5webkit/0002-Fix-build-failure-with-python3.patch

@@ -0,0 +1,31 @@
+Fetched from: https://codereview.qt-project.org/#/c/99784/
+
+From e9d00f6279f9cfefc5a3144d5953bb7934aed418 Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Thu, 13 Nov 2014 15:29:38 +0100
+Subject: [PATCH] Fix build failure with python3
+
+Task-number: QTBUG-33692
+Change-Id: I7a3bc6217110ce3a0bf5fee4b3b675dee39d8ac5
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ Source/JavaScriptCore/disassembler/udis86/itab.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/disassembler/udis86/itab.py b/Source/JavaScriptCore/disassembler/udis86/itab.py
+index 3d50ad0..90bd3e0 100644
+--- a/Source/JavaScriptCore/disassembler/udis86/itab.py
++++ b/Source/JavaScriptCore/disassembler/udis86/itab.py
+@@ -314,7 +314,7 @@ class UdItabGenerator( ud_opcode.UdOpcodeTables ):
+         self.ItabH.write( "\n" )
+ 
+         self.ItabH.write("\n/* itab entry operand definitions */\n");
+-        operands = self.OperandDict.keys()
++        operands = list( self.OperandDict.keys() )
+         operands.sort()
+         for o in operands:
+             self.ItabH.write("#define O_%-7s { %-12s %-8s }\n" %
+-- 
+2.1.3
+

package/rpm/Config.in

@@ -13,6 +13,7 @@ config BR2_PACKAGE_RPM
 	select BR2_PACKAGE_NEON_XML
 	select BR2_PACKAGE_NEON_ZLIB
 	select BR2_PACKAGE_NEON_SSL
+	select BR2_PACKAGE_ZLIB
 	help
 	  The RPM package management system.
 

package/rpm/rpm.mk

@@ -7,7 +7,7 @@
 RPM_VERSION_MAJOR = 5.2
 RPM_VERSION = $(RPM_VERSION_MAJOR).0
 RPM_SITE = http://rpm5.org/files/rpm/rpm-$(RPM_VERSION_MAJOR)
-RPM_DEPENDENCIES = zlib beecrypt neon popt
+RPM_DEPENDENCIES = zlib beecrypt neon popt openssl
 RPM_LICENSE = LGPLv2.1
 RPM_LICENSE_FILES = COPYING.LIB
 

package/rt-tests/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_RT_TESTS
 	bool "rt-tests"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  Set of utilities for testing the real-time behaviour of a
 	  Linux system.
@@ -27,3 +28,4 @@ comment "rt-tests may not work on MIPS with an external uClibc toolchain"
 
 comment "rt-tests needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU

package/ruby/ruby.hash

@@ -1,2 +1,2 @@
-# From https://www.ruby-lang.org/en/news/2014/10/27/ruby-2-1-4-released/
-sha256	bf9952cdeb3a0c6a5a27745c9b4c0e5e264e92b669b2b08efb363f5156549204	ruby-2.1.4.tar.gz
+# From https://www.ruby-lang.org/en/news/2014/11/13/ruby-2-1-5-is-released/
+sha256	4305cc6ceb094df55210d83548dcbeb5117d74eea25196a9b14fa268d354b100	ruby-2.1.5.tar.gz

package/ruby/ruby.mk

@@ -5,7 +5,7 @@
 ################################################################################
 
 RUBY_VERSION_MAJOR = 2.1
-RUBY_VERSION = $(RUBY_VERSION_MAJOR).4
+RUBY_VERSION = $(RUBY_VERSION_MAJOR).5
 RUBY_VERSION_EXT = 2.1.0
 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR)
 RUBY_DEPENDENCIES = host-pkgconf host-ruby

package/schifra/Config.in

@@ -1,6 +1,10 @@
 config BR2_PACKAGE_SCHIFRA
 	bool "schifra"
 	depends on BR2_INSTALL_LIBSTDCPP
+	# Upstream keep changing the tarball without doing new
+	# releases. This is not acceptable for Buildroot, as
+	# reproducible builds are very important.
+	depends on BR2_BROKEN
 	help
 	  Schifra is a very robust, highly optimized and extremely configurable
 	  Reed-Solomon error correcting code library for both software and IP
@@ -18,4 +22,5 @@ config BR2_PACKAGE_SCHIFRA_EXAMPLES
 endif
 
 comment "schifra needs a toolchain w/ C++"
+	depends on BR2_BROKEN
 	depends on !BR2_INSTALL_LIBSTDCPP

package/sdl_sound/0001-fix-constness.patch

@@ -0,0 +1,16 @@
+decoders/speex: fix constness of speex mode
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN sdl_sound-1.0.3.orig/decoders/speex.c sdl_sound-1.0.3/decoders/speex.c
+--- sdl_sound-1.0.3.orig/decoders/speex.c	2014-11-17 19:40:09.543553556 +0100
++++ sdl_sound-1.0.3/decoders/speex.c	2014-11-17 19:40:37.119864580 +0100
+@@ -124,7 +124,7 @@
+ 
+ static int process_header(speex_t *speex, Sound_Sample *sample)
+ {
+-    SpeexMode *mode;
++    const SpeexMode * mode;
+     SpeexHeader *hptr;
+     SpeexHeader header;
+     int enh_enabled = SPEEX_USE_PERCEPTUAL_ENHANCER;

package/shairport-sync/S99shairport-sync

@@ -1,12 +1,12 @@
 #! /bin/sh
 
 # Additional options that are passed to Shairport Sync
-OPTIONS=""
+OPTIONS="-d"
 
 case "$1" in
     start)
 	echo -n "Starting shairport-sync: "
-	start-stop-daemon -S -q -m -b -p /var/run/shairport-sync.pid --exec /usr/bin/shairport-sync -- $OPTIONS
+	start-stop-daemon -S -q -p /var/run/shairport-sync.pid --exec /usr/bin/shairport-sync -- $OPTIONS
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
 	;;
     stop)

package/squid/Config.in

@@ -1,7 +1,8 @@
-comment "squid needs a toolchain w/ C++, IPv6"
+comment "squid needs a toolchain w/ C++, IPv6, headers >= 3.0"
 	depends on BR2_USE_MMU
 	depends on !BR2_avr32 # toolchain too old
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6 \
+        || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
 
 config BR2_PACKAGE_SQUID
 	bool "squid"
@@ -9,6 +10,7 @@ config BR2_PACKAGE_SQUID
 	depends on BR2_INET_IPV6
 	# needs fork()
 	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libcap
 	select BR2_PACKAGE_LIBCAP
 	help
 	  Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more.

package/sysvinit/inittab

@@ -2,24 +2,26 @@
 #
 # This inittab is a basic inittab sample for sysvinit, which mimics
 # Buildroot's default inittab for BusyBox.
-id:1:initdefault:
+id:3:initdefault:
 
-proc::sysinit:/bin/mount -t proc proc /proc
-rwmo::sysinit:/bin/mount -o remount,rw /
-dpts::sysinit:/bin/mkdir -p /dev/pts
-dshm::sysinit:/bin/mkdir -p /dev/shm
-moun::sysinit:/bin/mount -a
-host::sysinit:/bin/hostname -F /etc/hostname
-init::sysinit:/etc/init.d/rcS
-
-1:1:respawn:/sbin/getty 38400 tty1
-2:1:respawn:/sbin/getty 38400 tty2
+si0::sysinit:/bin/mount -t proc proc /proc
+si1::sysinit:/bin/mount -o remount,rw /
+si2::sysinit:/bin/mkdir -p /dev/pts
+si3::sysinit:/bin/mkdir -p /dev/shm
+si4::sysinit:/bin/mount -a
+si5::sysinit:/bin/hostname -F /etc/hostname
+si6::sysinit:/etc/init.d/rcS
 
 # S0:1:respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL
 
 # Stuff to do for the 3-finger salute
-rebo::ctrlaltdel:/sbin/reboot
+ca::ctrlaltdel:/sbin/reboot
 
 # Stuff to do before rebooting
-umou:6:wait:/bin/umount -a -r
-swap:6:wait:/sbin/swapoff -a
+shd0:06:wait:/etc/init.d/rcK
+shd1:06:wait:/sbin/swapoff -a
+shd2:06:wait:/bin/umount -a -r
+
+# The usual halt or reboot actions
+hlt0:0:wait:/sbin/halt -dhp
+reb0:6:wait:/sbin/reboot

package/tstools/tstools-002-build-fix-parallel-build-failure.patch

@@ -1,331 +0,0 @@
-From 2fe4faa9d8eab6068976c7981bc166f576869b36 Mon Sep 17 00:00:00 2001
-From: Tzu-Jung Lee <tjlee@ambarella.com>
-Date: Sun, 28 Jul 2013 19:40:27 +0800
-Subject: [PATCH 1/1] build: fix parallel build failure
-
-This is back ported from recent upstream commit
-
-  0e8463ea1dc55f566a88bb3df29cf3d5f23cc326
-
-Once the upstream update the download page with more
-recent source tarball, this will no longer be needed.
-
-Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
----
- Makefile | 222 +++++++++++++++++++++++++++++++++------------------------------
- 1 file changed, 115 insertions(+), 107 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b79a573..ad7f163 100644
---- a/Makefile
-+++ b/Makefile
-@@ -67,67 +67,49 @@ LFS_FLAGS = -D_FILE_OFFSET_BITS=64
- # sort of thing (presumably Linux or BSD)
- ifeq ($(shell uname -s), Darwin)
- 	SYSTEM = "macosx"
--	ARCH_FLAGS = -arch ppc -arch i386
-+	ARCH_FLAGS =
-+	# If you're still building on a version of Mac OS X that supports powerpc,
-+	# then you may want to uncomment the next line. Obviously, this no longer
-+	# works in Lion, which doesn't support powerpc machines any more.
-+	#ARCH_FLAGS = -arch ppc -arch i386
- else
- 	SYSTEM = "other"
--	ARCH_FLAGS =
-+	ARCH_FLAGS = -fPIC
- endif
- 
- CFLAGS = $(WARNING_FLAGS) $(OPTIMISE_FLAGS) $(LFS_FLAGS) -I. $(PROFILE_FLAGS) $(ARCH_FLAGS)
--LDFLAGS = -g -lm $(PROFILE_FLAGS) $(ARCH_FLAGS)
-+LDFLAGS = -g $(PROFILE_FLAGS) $(ARCH_FLAGS) -lm
- 
- # Target directories
- OBJDIR = obj
- LIBDIR = lib
- BINDIR = bin
- 
--# All of our non-program source files
--SRCS = \
-- accessunit.c \
-- ac3.c \
-- adts.c \
-- avs.c \
-- bitdata.c \
-- es.c \
-- fmtx.c \
-- h222.c \
-- h262.c \
-- audio.c \
-- l2audio.c \
-- misc.c \
-- nalunit.c \
-- ps.c \
-- pes.c \
-- pidint.c \
-- ts.c \
-- tswrite.c \
-- pcap.c 
--
- # All of our non-program object modules
- OBJS = \
-- accessunit.o \
-- avs.o \
-- ac3.o \
-- adts.o \
-- bitdata.o \
-- es.o \
-- filter.o \
-- fmtx.o \
-- h222.o \
-- h262.o \
-- audio.o \
-- l2audio.o \
-- misc.o \
-- nalunit.o \
-- ps.o \
-- pes.o \
-- pidint.o \
-- reverse.o \
-- ts.o \
-- tswrite.o \
-- pcap.o \
-- ethernet.o \
-- ipv4.o
-+ $(OBJDIR)/accessunit.o \
-+ $(OBJDIR)/avs.o \
-+ $(OBJDIR)/ac3.o \
-+ $(OBJDIR)/adts.o \
-+ $(OBJDIR)/bitdata.o \
-+ $(OBJDIR)/es.o \
-+ $(OBJDIR)/filter.o \
-+ $(OBJDIR)/fmtx.o \
-+ $(OBJDIR)/h222.o \
-+ $(OBJDIR)/h262.o \
-+ $(OBJDIR)/audio.o \
-+ $(OBJDIR)/l2audio.o \
-+ $(OBJDIR)/misc.o \
-+ $(OBJDIR)/nalunit.o \
-+ $(OBJDIR)/ps.o \
-+ $(OBJDIR)/pes.o \
-+ $(OBJDIR)/pidint.o \
-+ $(OBJDIR)/reverse.o \
-+ $(OBJDIR)/ts.o \
-+ $(OBJDIR)/tswrite.o \
-+ $(OBJDIR)/pcap.o \
-+ $(OBJDIR)/ethernet.o \
-+ $(OBJDIR)/ipv4.o
- 
- # Our program object modules
- PROG_OBJS = \
-@@ -161,9 +143,14 @@ TEST_OBJS = \
-   $(OBJDIR)/test_es_unit_list.o
- 
- # Our library
--LIB = $(LIBDIR)/libtstools.a
--LIBOPTS = -L$(LIBDIR) -ltstools $(ARCH_FLAGS)
-+STATIC_LIB = $(LIBDIR)/libtstools.a
-+LIBOPTS = $(ARCH_FLAGS) $(STATIC_LIB)
- 
-+ifeq ($(shell uname -s), Darwin)
-+SHARED_LIB = $(LIBDIR)/libtstools.xxx
-+else
-+SHARED_LIB = $(LIBDIR)/libtstools.so
-+endif
- # All of our programs (except the testing ones)
- PROGS = \
-   $(BINDIR)/esfilter \
-@@ -197,7 +184,7 @@ TEST_PES_PROG = $(BINDIR)/test_pes
- TEST_PROGS = test_nal_unit_list test_es_unit_list
- 
- # ------------------------------------------------------------
--all:	$(BINDIR) $(LIBDIR) $(OBJDIR) $(PROGS)
-+all:	$(BINDIR) $(LIBDIR) $(OBJDIR) $(PROGS) $(SHARED_LIB)
- 
- # ts2ps is not yet an offical program, so for the moment build
- # it separately
-@@ -205,82 +192,97 @@ all:	$(BINDIR) $(LIBDIR) $(OBJDIR) $(PROGS)
- ts2ps:	$(TS2PS_PROG)
- 
- ifeq ($(shell uname -s), Darwin)
--# Try getting a library containing universal objects on Mac
--$(LIB): $(OBJS)
--	libtool -static $(OBJS) -o $(LIB)
-+# Make libraries containing universal objects on Mac
-+$(STATIC_LIB): $(OBJS)
-+	libtool -static $(OBJS) -o $(STATIC_LIB)
-+$(SHARED_LIB): $(OBJS)
-+	libtool -dynamic $(OBJS) -o $(SHARED_LIB)
- else
--$(LIB): $(LIB)($(OBJS))
-+$(STATIC_LIB): $(OBJS)
-+	rm -f $(STATIC_LIB)
-+	ar rc $(STATIC_LIB) $(OBJS)
-+
-+$(SHARED_LIB): $(OBJS)
-+	$(LD) -shared -o $(SHARED_LIB) $(OBJS) -lc
- endif
- 
--$(BINDIR)/esfilter:	$(OBJDIR)/esfilter.o $(LIB)
--		$(CC) $< -o $(BINDIR)/esfilter $(LDFLAGS) $(LIBOPTS)
-+# Build all of the utilities with the static library, so that they can
-+# be copied around, shared, etc., without having to think about it
-+
-+$(BINDIR)/esfilter:	$(OBJDIR)/esfilter.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/esfilter $(LIBOPTS) $(LDFLAGS)
-+
-+$(BINDIR)/ts2es:		$(OBJDIR)/ts2es.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/ts2es $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/ts2es:		$(OBJDIR)/ts2es.o $(LIB)
--		$(CC) $< -o $(BINDIR)/ts2es $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/es2ts:		$(OBJDIR)/es2ts.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/es2ts $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/es2ts:		$(OBJDIR)/es2ts.o $(LIB)
--		$(CC) $< -o $(BINDIR)/es2ts $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/esdots:		$(OBJDIR)/esdots.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/esdots $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/esdots:		$(OBJDIR)/esdots.o $(LIB)
--		$(CC) $< -o $(BINDIR)/esdots $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/esmerge:	$(OBJDIR)/esmerge.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/esmerge $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/esmerge:	$(OBJDIR)/esmerge.o $(LIB)
--		$(CC) $< -o $(BINDIR)/esmerge $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/esreport:	$(OBJDIR)/esreport.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/esreport $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/esreport:	$(OBJDIR)/esreport.o $(LIB)
--		$(CC) $< -o $(BINDIR)/esreport $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/esreverse:	$(OBJDIR)/esreverse.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/esreverse $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/esreverse:	$(OBJDIR)/esreverse.o $(LIB)
--		$(CC) $< -o $(BINDIR)/esreverse $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/stream_type:	$(OBJDIR)/stream_type.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/stream_type $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/stream_type:	$(OBJDIR)/stream_type.o $(LIB)
--		$(CC) $< -o $(BINDIR)/stream_type $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/psreport:	$(OBJDIR)/psreport.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/psreport $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/psreport:	$(OBJDIR)/psreport.o $(LIB)
--		$(CC) $< -o $(BINDIR)/psreport $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/psdots:	$(OBJDIR)/psdots.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/psdots $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/psdots:	$(OBJDIR)/psdots.o $(LIB)
--		$(CC) $< -o $(BINDIR)/psdots $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/ps2ts:		$(OBJDIR)/ps2ts.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/ps2ts $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/ps2ts:		$(OBJDIR)/ps2ts.o $(LIB)
--		$(CC) $< -o $(BINDIR)/ps2ts $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/tsinfo:		$(OBJDIR)/tsinfo.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/tsinfo $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/tsinfo:		$(OBJDIR)/tsinfo.o $(LIB)
--		$(CC) $< -o $(BINDIR)/tsinfo $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/tsreport:	$(OBJDIR)/tsreport.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/tsreport $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/tsreport:	$(OBJDIR)/tsreport.o $(LIB)
--		$(CC) $< -o $(BINDIR)/tsreport $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/tsserve:	$(OBJDIR)/tsserve.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/tsserve $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/tsserve:	$(OBJDIR)/tsserve.o $(LIB)
--		$(CC) $< -o $(BINDIR)/tsserve $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/tsplay:	$(OBJDIR)/tsplay.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/tsplay $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/tsplay:		$(OBJDIR)/tsplay.o $(LIB)
--		$(CC) $< -o $(BINDIR)/tsplay $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/test_ps:	$(OBJDIR)/test_ps.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/test_ps $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/test_ps:	$(OBJDIR)/test_ps.o $(LIB)
--		$(CC) $< -o $(BINDIR)/test_ps $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/ts2ps:		$(OBJDIR)/ts2ps.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/ts2ps $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/ts2ps:		$(OBJDIR)/ts2ps.o $(LIB)
--		$(CC) $< -o $(BINDIR)/ts2ps $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/ts_packet_insert:	$(OBJDIR)/ts_packet_insert.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/ts_packet_insert $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/ts_packet_insert:	$(OBJDIR)/ts_packet_insert.o $(LIB)
--		$(CC) $< -o $(BINDIR)/ts_packet_insert $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/m2ts2ts:		$(OBJDIR)/m2ts2ts.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/m2ts2ts $(LIBOPTS) $(LDFLAGS)
-+$(BINDIR)/pcapreport:	$(OBJDIR)/pcapreport.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/pcapreport $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/m2ts2ts:		$(OBJDIR)/m2ts2ts.o $(LIB)
--		$(CC) $< -o $(BINDIR)/m2ts2ts $(LDFLAGS) $(LIBOPTS)
--$(BINDIR)/pcapreport:	$(OBJDIR)/pcapreport.o $(LIB)
--		$(CC) $< -o $(BINDIR)/pcapreport $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/tsfilter:	$(OBJDIR)/tsfilter.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/tsfilter $(LIBOPTS) $(LDFLAGS)
-+$(BINDIR)/tsdvbsub:	$(OBJDIR)/tsdvbsub.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/tsdvbsub $(LIBOPTS) $(LDFLAGS)
- 
- 
- 
- 
--$(BINDIR)/test_pes:	$(OBJDIR)/test_pes.o $(LIB)
--		$(CC) $< -o $(BINDIR)/test_pes $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/test_pes:	$(OBJDIR)/test_pes.o $(STATIC_LIB)
-+		$(CC) $< -o $(BINDIR)/test_pes $(LIBOPTS) $(LDFLAGS)
- 
--$(BINDIR)/test_nal_unit_list: 	$(OBJDIR)/test_nal_unit_list.o $(LIB)
--			$(CC) $< -o $(BINDIR)/test_nal_unit_list $(LDFLAGS) $(LIBOPTS)
--$(BINDIR)/test_es_unit_list:  	$(OBJDIR)/test_es_unit_list.o $(LIB)
--			$(CC) $< -o $(BINDIR)/test_es_unit_list $(LDFLAGS) $(LIBOPTS)
-+$(BINDIR)/test_nal_unit_list: 	$(OBJDIR)/test_nal_unit_list.o $(STATIC_LIB)
-+			$(CC) $< -o $(BINDIR)/test_nal_unit_list $(LIBOPTS) $(LDFLAGS)
-+$(BINDIR)/test_es_unit_list:  	$(OBJDIR)/test_es_unit_list.o $(STATIC_LIB)
-+			$(CC) $< -o $(BINDIR)/test_es_unit_list $(LIBOPTS) $(LDFLAGS)
- 
- # Some header files depend upon others, so including one requires
- # the others as well
-@@ -299,14 +301,19 @@ REVERSE_H = reverse_fns.h reverse_defns.h
- FILTER_H = filter_fns.h filter_defns.h $(REVERSE_H)
- AUDIO_H = adts_fns.h l2audio_fns.h ac3_fns.h audio_fns.h audio_defns.h adts_defns.h
- 
--# Everyone depends upon the basic configuration file
--$(LIB)($(OBJS)) $(TEST_OBJS) $(PROG_OBJS): compat.h
-+# Everyone depends upon the basic configuration file, and I assert they all
-+# want (or may want) printing...
-+$(OBJS) $(TEST_OBJS) $(PROG_OBJS): compat.h
- 
- # Which library modules depend on which header files is complex, so
- # lets just be simple
--$(LIB)($(OBJS)): $(ACCESSUNIT_H) $(NALUNIT_H) $(TS_H) $(ES_H) $(PES_H) \
--                 misc_fns.h $(PS_H) $(H262_H) $(TSWRITE_H) $(AVS_H) \
--                 $(REVERSE_H) $(FILTER_H) $(AUDIO_H)
-+$(OBJS): \
-+                 $(ACCESSUNIT_H) $(NALUNIT_H) $(TS_H) $(ES_H) $(PES_H) \
-+                 misc_fns.h $(PS_H) $(H262_H) \
-+                 $(TSWRITE_H) $(AVS_H) $(REVERSE_H) $(FILTER_H) $(AUDIO_H)
-+
-+$(OBJDIR)/%.o: %.c
-+	$(CC) -c $< -o $@ $(CFLAGS)
- 
- $(OBJDIR)/es2ts.o:        es2ts.c $(ES_H) $(TS_H) misc_fns.h version.h
- 	$(CC) -c $< -o $@ $(CFLAGS)
-@@ -389,7 +396,8 @@ objclean:
- .PHONY: clean
- clean: objclean
- 	-rm -f $(PROGS)
--	-rm -f $(LIB)
-+	-rm -f $(STATIC_LIB)
-+	-rm -f $(SHARED_LIB)
- 	-rm -f $(PROG_OBJS)
- 
- .PHONY: distclean
--- 
-1.8.3.2
-

package/tstools/tstools.mk

@@ -11,7 +11,7 @@ TSTOOLS_LICENSE = MPL v1.1
 
 define TSTOOLS_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) LD="$(TARGET_CC)" $(TARGET_MAKE_ENV) \
-		$(MAKE) -C $(@D)
+		$(MAKE1) -C $(@D)
 endef
 
 define TSTOOLS_INSTALL_TARGET_CMDS

package/tzdata/tzdata.mk

@@ -26,8 +26,8 @@ TZDATA_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME))
 TZDATA_EXTRACT_CMDS =
 
 define TZDATA_INSTALL_TARGET_CMDS
-	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share
-	cp -a $(HOST_DIR)/usr/share/zoneinfo $(TARGET_DIR)/usr/share/zoneinfo
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/zoneinfo
+	cp -a $(HOST_DIR)/usr/share/zoneinfo/* $(TARGET_DIR)/usr/share/zoneinfo
 	cd $(TARGET_DIR)/usr/share/zoneinfo;    \
 	for zone in posix/*; do                 \
 	    ln -sfn "$${zone}" "$${zone##*/}";  \
@@ -59,7 +59,7 @@ define HOST_TZDATA_BUILD_CMDS
 endef
 
 define HOST_TZDATA_INSTALL_CMDS
-	mkdir -p $(HOST_DIR)/usr/share/zoneinfo
+	$(INSTALL) -d -m 0755 $(HOST_DIR)/usr/share/zoneinfo
 	cp -a $(@D)/_output/* $(@D)/*.tab $(HOST_DIR)/usr/share/zoneinfo
 endef
 

package/wireshark/wireshark.hash

@@ -1,3 +1,3 @@
-# From https://www.wireshark.org/download/SIGNATURES-1.12.1.txt
-md5	14b3e3d8979d1eb27ff085bb5f400e67	wireshark-1.12.1.tar.bz2
-sha1	e1508ea25ccf077c5a7fa2af3b88f3ae199f77fb	wireshark-1.12.1.tar.bz2
+# From https://www.wireshark.org/download/SIGNATURES-1.12.2.txt
+md5	2f2a16be8b087227cb17733c72288ae4	wireshark-1.12.2.tar.bz2
+sha1	0598fe285725f97045d7d08e6bde04686044b335	wireshark-1.12.2.tar.bz2

package/wireshark/wireshark.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIRESHARK_VERSION = 1.12.1
+WIRESHARK_VERSION = 1.12.2
 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
 WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
 WIRESHARK_LICENSE = wireshark license

package/x264/x264.mk

@@ -42,6 +42,7 @@ define X264_CONFIGURE_CMDS
 		--cross-prefix="$(TARGET_CROSS)" \
 		--disable-ffms \
 		--enable-static \
+		--disable-opencl \
 		$(X264_CONF_OPTS) \
 	)
 endef

system/skeleton/etc/inittab

@@ -30,7 +30,6 @@ null::sysinit:/bin/hostname -F /etc/hostname
 ::ctrlaltdel:/sbin/reboot
 
 # Stuff to do before rebooting
-null::shutdown:/etc/init.d/rcK
-null::shutdown:/bin/umount -a -r
-null::shutdown:/sbin/swapoff -a
-
+::shutdown:/etc/init.d/rcK
+::shutdown:/sbin/swapoff -a
+::shutdown:/bin/umount -a -r