Update for 2013.05-rc3

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

CHANGES

@@ -1,3 +1,12 @@
+2013.05-rc3, Released May 25th, 2013:
+
+	Minor fixes.
+
+	Updated/fixed packages: aircrack-ng, bellagio, boost, crda,
+	dvb-apps, flot, libatomic_ops, libeXosip2, libosip2, libxml2,
+	mongrel2, poco, portaudio, pptp-linux, tvheadend, urg, weston,
+	wireshark
+
 2013.05-rc2, Released May 15th, 2013:
 
 	Fixes all over the tree.

Makefile

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

docs/download.html

@@ -14,12 +14,12 @@ or
 <a href="/downloads/buildroot-2013.02.tar.bz2">buildroot-2013.02.tar.bz2</a>.
 
 <p>
-The latest release candidate is <b>2013.05-rc2</b>, which can be
+The latest release candidate is <b>2013.05-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2013.05-rc2.tar.gz">buildroot-2013.05-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2013.05-rc3.tar.gz">buildroot-2013.05-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2013.05-rc2.tar.bz2">buildroot-2013.05-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2013.05-rc3.tar.bz2">buildroot-2013.05-rc3.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from

docs/news.html

@@ -5,6 +5,19 @@
 <p>
 
 <ul>
+  <li><b>25 May 2013 -- 2013.05-rc3 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=2013.05_rc3">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2013.05-rc3.tar.bz2">2013.05-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>15 May 2013 -- 2013.05-rc2 released</b>
 
     <p>Another week, another release candidate with more cleanups and

package/aircrack-ng/aircrack-ng.mk

@@ -20,7 +20,7 @@ else
 	AIRCRACK_NG_MAKE_OPTS = sqlite=false
 endif
 
-AIRCRACK_NG_LDFLAGS = -lz \
+AIRCRACK_NG_LDFLAGS = $(TARGET_LDFLAGS) -lz \
 	$(if $(BR2_PREFER_STATIC_LIB),-ldl -lpthread)
 
 define AIRCRACK_NG_BUILD_CMDS

package/boost/Config.in

@@ -23,6 +23,8 @@ config BR2_PACKAGE_BOOST_CHRONO
 
 config BR2_PACKAGE_BOOST_CONTEXT
 	bool "boost-context"
+	depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel \
+			|| BR2_powerpc || BR2_sparc || BR2_x86_64)
 
 config BR2_PACKAGE_BOOST_DATE_TIME
 	bool "boost-date_time"

package/crda/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CRDA
 	bool "crda"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBNL
 	# regdb is a runtime dependency
@@ -13,3 +14,6 @@ config BR2_PACKAGE_CRDA
 	  may operate within for a given location.
 
 	  http://linuxwireless.org/en/developers/Regulatory/CRDA
+
+comment "crda requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

package/dvb-apps/Config.in

@@ -8,12 +8,13 @@ config BR2_PACKAGE_DVB_APPS
 
 if BR2_PACKAGE_DVB_APPS
 
-comment "dvb-apps utils needs LARGEFILE support in the toolchain"
-	depends on !BR2_LARGEFILE
+comment "dvb-apps utils needs a toolchain with LARGEFILE and THREADS support"
+	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_DVB_APPS_UTILS
 	bool "dvb-apps utilities"
 	depends on BR2_LARGEFILE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  A small number of DVB test and utility programs,

package/flot/Config.in

@@ -25,11 +25,32 @@ config BR2_PACKAGE_FLOT_CANVAS
 	help
 	  Flot plugin to render axis tick labels directly to the canvas
 
+config BR2_PACKAGE_FLOT_CATEGORIES
+	bool "categories"
+	help
+	  Flot plugin for plotting textual data or categories
+
+config BR2_PACKAGE_FLOT_CROSSHAIR
+	bool "crosshair"
+	help
+	  Flot plugin for showing crosshairs when the mouse hovers
+	  over the plot
+
+config BR2_PACKAGE_FLOT_ERRORBARS
+	bool "errorbars"
+	help
+	  Flot plugin for plotting error bars
+
 config BR2_PACKAGE_FLOT_FILLBETWEEN
 	bool "fillbetween"
 	help
 	  Flot plugin for computing bottoms for filled line and bar charts
 
+config BR2_PACKAGE_FLOT_IMAGE
+	bool "image"
+	help
+	  Flot plugin for plotting images
+
 config BR2_PACKAGE_FLOT_NAVIGATE
 	bool "navigate"
 	help
@@ -66,4 +87,9 @@ config BR2_PACKAGE_FLOT_THRESHOLD
 	help
 	  Flot plugin for thresholding data
 
+config BR2_PACKAGE_FLOT_TIME
+	bool "time"
+	help
+	  Flot plugin for handling time axes
+
 endif

package/flot/flot.mk

@@ -4,7 +4,11 @@ FLOT_LICENSE = MIT
 FLOT_LICENSE_FILES = LICENSE.txt
 FLOT_FILES = jquery.flot $(addprefix jquery.flot.,\
 	$(if $(BR2_PACKAGE_FLOT_CANVAS),canvas) \
+	$(if $(BR2_PACKAGE_FLOT_CATEGORIES),categories) \
+	$(if $(BR2_PACKAGE_FLOT_CROSSHAIR),crosshair) \
+	$(if $(BR2_PACKAGE_FLOT_ERRORBARS),errorbars) \
 	$(if $(BR2_PACKAGE_FLOT_FILLBETWEEN),fillbetween) \
+	$(if $(BR2_PACKAGE_FLOT_IMAGE),image) \
 	$(if $(BR2_PACKAGE_FLOT_NAVIGATE),navigate) \
 	$(if $(BR2_PACKAGE_FLOT_PIE),pie) \
 	$(if $(BR2_PACKAGE_FLOT_RESIZE),resize) \
@@ -12,6 +16,7 @@ FLOT_FILES = jquery.flot $(addprefix jquery.flot.,\
 	$(if $(BR2_PACKAGE_FLOT_STACK),stack) \
 	$(if $(BR2_PACKAGE_FLOT_SYMBOL),symbol) \
 	$(if $(BR2_PACKAGE_FLOT_THRESHOLD),threshold) \
+	$(if $(BR2_PACKAGE_FLOT_TIME),time) \
 	)
 
 define FLOT_INSTALL_TARGET_CMDS

package/libatomic_ops/libatomic_ops-nothread-build-failure-fix.patch

@@ -0,0 +1,41 @@
+From 7e940ce34ff4de254d460344f1a1a486a14fb045 Mon Sep 17 00:00:00 2001
+From: Gilles Talis <gilles.talis@gmail.com>
+Date: Wed, 22 May 2013 16:21:26 -0700
+Subject: [PATCH] Fix build failure seen when using toolchain without threads support
+
+Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
+---
+ src/atomic_ops.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/atomic_ops.c b/src/atomic_ops.c
+index b6731a2..5769643 100644
+--- a/src/atomic_ops.c
++++ b/src/atomic_ops.c
+@@ -48,7 +48,9 @@
+ 
+ #undef AO_REQUIRE_CAS
+ 
++#if defined(AO_USE_PTHREAD_DEFS)
+ #include <pthread.h>
++#endif
+ 
+ #ifndef AO_USE_NO_SIGNALS
+ # include <signal.h>
+@@ -72,11 +74,13 @@
+ # include "atomic_ops/sysdeps/standard_ao_double_t.h"
+ #endif
+ 
++#if defined(AO_USE_PTHREAD_DEFS)
+ /*
+  * Lock for pthreads-based implementation.
+  */
+ 
+ pthread_mutex_t AO_pt_lock = PTHREAD_MUTEX_INITIALIZER;
++#endif
+ 
+ /*
+  * Out of line compare-and-swap emulation based on test and set.
+-- 
+1.7.4.1
+

package/libeXosip2/libeXosip2.mk

@@ -7,6 +7,8 @@
 LIBEXOSIP2_VERSION = 3.6.0
 LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip/
 LIBEXOSIP2_INSTALL_STAGING = YES
+LIBEXOSIP2_LICENSE = GPLv2+
+LIBEXOSIP2_LICENSE_FILES = COPYING
 
 LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
 
@@ -17,4 +19,7 @@ else
 LIBEXOSIP2_CONF_OPT += --disable-openssl
 endif
 
+LIBEXOSIP2_CONF_OPT += \
+	--enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no)
+
 $(eval $(autotools-package))

package/libosip2/libosip2.mk

@@ -7,5 +7,10 @@
 LIBOSIP2_VERSION = 3.6.0
 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip
 LIBOSIP2_INSTALL_STAGING = YES
+LIBOSIP2_LICENSE = LGPLv2.1+
+LIBOSIP2_LICENSE_FILES = COPYING
+
+LIBOSIP2_CONF_OPT = \
+	--enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no)
 
 $(eval $(autotools-package))

package/libxml2/libxml2.mk

@@ -34,6 +34,21 @@ else
 HOST_LIBXML2_CONF_OPT += --without-python
 endif
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LIBXML2_DEPENDENCIES += zlib
+LIBXML2_CONF_OPT += --with-zlib
+else
+LIBXML2_CONF_OPT += --without-zlib
+endif
+
+LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
+ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y)
+LIBXML2_CONF_OPT += --with-iconv
+else
+LIBXML2_CONF_OPT += --without-iconv
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 

package/mongrel2/Config.in

@@ -6,6 +6,13 @@ config BR2_PACKAGE_MONGREL2
 	depends on BR2_INET_IPV6 # zeromq
 	depends on BR2_LARGEFILE # zeromq -> util-linux
 	depends on BR2_USE_WCHAR # zeromq -> util-linux
+	# {get,make,swap}context functions present in
+	# {e,}glibc and in uClibc's master branch. Source has arm workaround
+	depends on BR2_UCLIBC_VERSION_SNAPSHOT || \
+		BR2_TOOLCHAIN_EXTERNAL_GLIBC || \
+		BR2_TOOLCHAIN_CTNG_eglibc || \
+		BR2_TOOLCHAIN_CTNG_glibc || \
+		BR2_arm
 	help
 	  Mongrel2 is an application, language, and network architecture
 	  agnostic web server that focuses on web applications using

package/multimedia/bellagio/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_BELLAGIO
 	bool "bellagio"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Bellagio is an opensource implementation of the
 	  OpenMAX IL API.
@@ -14,5 +15,5 @@ config BR2_PACKAGE_BELLAGIO
 
 	  http://omxil.sourceforge.net/
 
-comment "bellagio requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "bellagio requires a toolchain with C++ and threads support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

package/multimedia/bellagio/bellagio.mk

@@ -8,5 +8,7 @@ BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz
 BELLAGIO_SITE = http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%20$(BELLAGIO_VERSION)
 BELLAGIO_AUTORECONF = YES
 BELLAGIO_INSTALL_STAGING = YES
+BELLAGIO_LICENSE = LGPLv2.1+
+BELLAGIO_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

package/poco/Config.in

@@ -3,6 +3,7 @@ config BR2_PACKAGE_POCO
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !(BR2_aarch64 || BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_PCRE
 	help
@@ -61,3 +62,4 @@ endif # BR2_PACKAGE_POCO
 comment "poco requires a toolchain with WCHAR, threads, and C++ support"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
 		|| !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !(BR2_aarch64 || BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel || BR2_xtensa)

package/portaudio/Config.in

@@ -1,5 +1,9 @@
+comment "portaudio needs a toolchain threads support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_PORTAUDIO
 	bool "portaudio"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  PortAudio is a free, cross-platform, open-source,
 	  audio I/O library.

package/portaudio/portaudio.mk

@@ -9,6 +9,8 @@ PORTAUDIO_SITE = http://www.portaudio.com/archives
 PORTAUDIO_SOURCE = pa_stable_$(PORTAUDIO_VERSION).tgz
 PORTAUDIO_INSTALL_STAGING = YES
 PORTAUDIO_MAKE = $(MAKE1)
+PORTAUDIO_LICENSE = portaudio license (MIT-like plus special clause)
+PORTAUDIO_LICENSE_FILES = LICENSE.txt
 
 PORTAUDIO_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_PORTAUDIO_WITH_ALSA),alsa-lib)

package/pptp-linux/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PPTP_LINUX
 	bool "pptp-linux"
+	depends on BR2_USE_MMU # fork()
 	help
 	  An implementation of the Point-to-point protocol client.
 

package/pptp-linux/pptp-linux.mk

@@ -8,6 +8,8 @@ PPTP_LINUX_VERSION = 1.7.2
 PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION)
 PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz
 PPTP_LINUX_MAKE = $(MAKE1)
+PPTP_LINUX_LICENSE = GPLv2+
+PPTP_LINUX_LICENSE_FILES = COPYING
 
 define PPTP_LINUX_BUILD_CMDS
 	$(MAKE) -C $(@D) OPTIMIZE= DEBUG= \

package/tvheadend/Config.in

@@ -1,9 +1,10 @@
-comment "tvheadend requires a toolchain with LARGEFILE and IPv6 support"
-    depends on !BR2_LARGEFILE || !BR2_INET_IPV6
+comment "tvheadend needs a toolchain with LARGEFILE, IPv6 and THREADS support"
+    depends on !BR2_LARGEFILE || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_TVHEADEND
 	bool "tvheadend"
 	depends on BR2_LARGEFILE && BR2_INET_IPV6
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# tvheadend requires an atomic_add operation. Either you have
 	# a gcc >= 4.3 toolchain and it uses the gcc intrinsics, or it
 	# has special code for x86, x86-64, PPC and ARM. So in the

package/urg/urg-select-h.patch

@@ -0,0 +1,11 @@
+--- urg-0.8.18/src/c/connection/serial_ctrl_lin.c	2010-11-22 01:48:01.000000000 +0000
++++ urg-0.8.18.mod/src/c/connection/serial_ctrl_lin.c	2013-05-21 20:56:35.822025969 +0100
+@@ -17,7 +17,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
+-
++#include <sys/select.h>
+ //#include <ctype.h>
+ 
+ enum {

package/weston/weston.mk

@@ -10,7 +10,8 @@ WESTON_SOURCE = weston-$(WAYLAND_VERSION).tar.xz
 WESTON_LICENSE = MIT
 WESTON_LICENSE_FILES = COPYING
 
-WESTON_DEPENDENCIES = wayland libxkbcommon pixman libpng jpeg mtdev udev
+WESTON_DEPENDENCIES = wayland libxkbcommon pixman libpng \
+	jpeg mtdev udev cairo
 WESTON_CONF_OPT = \
 	--disable-egl \
 	--disable-xwayland \

package/wireshark/Config.in

@@ -3,6 +3,7 @@ config BR2_PACKAGE_WIRESHARK
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBGLIB2
+	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_WCHAR # glib2
 	help
 	  Network traffic sniffer and protocol decoder. Currently only tshark,

package/wireshark/wireshark-dont-include-prefix.patch

@@ -1,41 +0,0 @@
-configure.in: don't add the build host's /usr/include and /usr/lib to the 
-search path of include files and libraries. This is not what you want when 
-cross compiling.
-
-Sent upstream as https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7926.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-diff -Nuar wireshark-1.8.3.orig/configure.in wireshark-1.8.3/configure.in
---- wireshark-1.8.3.orig/configure.in	2012-08-15 23:33:32.000000000 +0300
-+++ wireshark-1.8.3/configure.in	2012-10-28 10:07:54.864388531 +0200
-@@ -635,29 +635,6 @@
- AC_SUBST(CORESERVICES_FRAMEWORKS)
- AC_SUBST(LAUNCHSERVICES_FRAMEWORKS)
- 
--#
--# If using $prefix we add "$prefix/include" to the include search path
--# and "$prefix/lib" to the library search path.
--#
--if test "x$prefix" != "x" ; then
--	AC_MSG_CHECKING(whether to use $prefix for headers and libraries)
--	if test -d $prefix/include ; then
--		AC_MSG_RESULT(yes)
--		#
--		# Arrange that we search for header files in "$prefix/include", as
--		# various packages we use may have been installed under "$prefix/include".
--		#
--		CPPFLAGS="$CPPFLAGS -I$prefix/include"
--
--		#
--		# Arrange that we search for libraries in "$prefix/lib".
--		#
--		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
--	else
--		AC_MSG_RESULT(no)
--	fi
--fi
--
- dnl Look in /usr/local for header files and libraries ?
- dnl XXX FIXME don't include /usr/local if it is already in the system
- dnl search path as this causes gcc 3.2 on Linux to complain about a change

package/wireshark/wireshark.mk

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

support/scripts/graph-depends

@@ -170,6 +170,7 @@ TARGET_EXCEPTIONS = [
     "target-generic-hostname",
     "target-root-passwd",
     "target-post-image",
+    "target-purgelocales",
 ]
 
 # In full mode, start with the result of get_targets() to get the main