Update for 2014.05-rc3

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

CHANGES

@@ -1,3 +1,19 @@
+2014.05-rc3, Released May 28th, 2014
+
+	Minor fixes.
+
+	Updated/fixed packages: acl, attr, connman, dosfstools,
+	dropbear, dvb-apps, exim, flite, gdb, httping, hwdata,
+	lesstif, libnss, libv4l, lttng-babeltrace, midori, monit,
+	mplayer, php, python2, rdesktop, rpi-userland, ruby, samba,
+	samba4, slang, xbmc
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#7100: license info for package 'acl' missing
+	#7106: license info for package 'attr' missing
+	#7112: license info for package 'hwdata'
+
 2014.05-rc2, Released May 21st, 2014
 
 	Fixes all over the tree.

Config.in

@@ -186,7 +186,7 @@ config BR2_BACKUP_SITE
 
 config BR2_KERNEL_MIRROR
 	string "Kernel.org mirror"
-	default "http://www.kernel.org/pub"
+	default "https://www.kernel.org/pub"
 	help
 	  kernel.org is mirrored on a number of servers around the world.
 	  The following allows you to select your preferred mirror.

Makefile

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

docs/contribute.html

@@ -2,38 +2,31 @@
 
 <h2>Contribute</h2>
 
-Buildroot is an open source project and if you want to contribute, here a few
-pointers to get you started.
+<p>Buildroot is an open source project and you are very welcome to contribute to
+it.<br />
+There are many different ways to contribute:</p>
 
-<p>Don't forget to look at <a href="./support.html">Support</a> if you need any
-help.
-And thanks for your help !</p>
+<ul>
+<li>Reproducing, analyzing and fixing bugs from our
+    <a href="https://bugs.buildroot.org/">bug tracker</a></li>
+<li>Analyzing and fixing <a href="http://autobuild.buildroot.org/">
+    autobuild failures</a></li>
+<li>Reviewing and testing patches sent by other developers. See the
+    <a href="http://lists.busybox.net/mailman/listinfo/buildroot">mailing list
+    </a> or <a href="http://patchwork.ozlabs.org/project/buildroot/list/">
+    patchwork</a>.</li>
+<li>Working on items from the
+    <a href="http://www.elinux.org/Buildroot#Todo_list">TODO list</a></li>
+<li>Submitting your own patches through the
+    <a href="http://lists.busybox.net/mailman/listinfo/buildroot">mailing list
+    </a></li>
+</ul>
 
-<h3>Autobuilders</h3>
+<p>For more details on these topics, check out the
+<a href="http://buildroot.uclibc.org/downloads/manual/manual.html#_contributing_to_buildroot">
+Contributing to buildroot</a> chapter in the Buildroot manual. Thanks for your help!</p>
 
-The <a href="http://autobuild.buildroot.org/">Autobuilders</a> are used to test
-Buildroot with a lot of differents settings (toolchains, various packages, etc)
-on all the supported platforms.
-
-<p>But despite our best effort, sometimes it fails.</p>
-<p>That's where you can help ! Look at a package that fails and try to fix it !</p>
-
-<h3>Wiki</h3>
-
-Have a look at the <a href="http://elinux.org/Buildroot">eLinux Wiki</a> a todo
-list is available there, which can help you find out what you could do to help
-Buildroot.
-
-<h3>Patchwork</h3>
-
-<a href="http://patchwork.ozlabs.org/project/buildroot/list/">Patchwork</a>
-is a patch tracking system, if you submit a patch, it will appear here.
-
-<p>You can have a look at a patch that interests you and test it on your machine,
-if it succeeds, you can send a <a
-  href="http://buildroot.org/downloads/manual/manual.html#_reviewing_testing_patches">"Tested-by"</a>,
-if it fails, you can also send a mail on the <a
-  href="http://buildroot.org/downloads/manual/manual.html#_mailing_list">mailing
-  list</a> and report what has happened to you.</p>
+<p>If you need any support yourself, have a look at <a href="./support.html">
+Support</a>.</p>
 
 <!--#include file="footer.html" -->

docs/docs.html

@@ -34,7 +34,7 @@ help:</p>
   <li>On the <a href="irc://freenode.net/#buildroot">Buildroot IRC
   channel</a>, <code>#buildroot</code> on Freenode</li>
 
-  <li>On our <a href="https://bugs.uclibc.org">bugtracker</a>.</li>
+  <li>On our <a href="https://bugs.buildroot.org">bugtracker</a>.</li>
 
   <li>Through the various companies offering commercial Buildroot
   support.</li>

docs/download.html

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

docs/header.html

@@ -47,7 +47,8 @@
               <li><a href="/contribute.html">Contribute</a></li>
               <li><a href="/sponsors.html">Sponsors</a></li>
             </ul>
-            <a class="gplus" href="https://plus.google.com/100084591154899263420/posts"><img src="images/gplus.png" height="28" width="28"></a>
+            <a class="gplus" href="https://plus.google.com/100084591154899263420/posts">
+            <img src="images/gplus.png" height="28" width="28" alt="Google+" /></a>
           </div><!--/.nav-collapse -->
         </div>
       </div>

docs/index.html

@@ -2,7 +2,8 @@
 
 <div class="hero-unit">
   <div class="row-fluid">
-    <img src="images/logo.png" height="170" width="170" style="float: right;"/>
+    <img src="images/logo.png" height="170" width="170" style="float: right;"
+        alt="Buildroot logo" />
     <div class="span8">
       <h1>Buildroot<br/><small>Making Embedded Linux Easy</small></h1>
       <p>Buildroot is a simple, efficient and easy-to-use tool to generate

docs/js/buildroot.js

@@ -36,7 +36,7 @@ function load_activity(feedurl, divid) {
 
 function initialize() {
   load_activity("http://rss.gmane.org/topics/excerpts/gmane.comp.lib.uclibc.buildroot", "mailing-list-activity");
-  load_activity("http://git.uclibc.org/buildroot/atom/?h=master", "commit-activity");
+  load_activity("http://git.buildroot.org/buildroot/atom/?h=master", "commit-activity");
 }
 
 function google_analytics() {

docs/manual/manual.txt

@@ -7,6 +7,11 @@
 Buildroot usage and documentation by Thomas Petazzoni. Contributions
 from Karsten Kruse, Ned Ludd, Martin Herren and others.
 
+The Buildroot manual is licensed under the GNU General Public License,
+version 2. Refer to file
+http://git.buildroot.org/buildroot/tree/COPYING[COPYING] in the Buildroot
+sources for the full text of this license.
+
 Buildroot {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {localdate}
 {localtime} from git revision {sys:git rev-parse --short HEAD}
 

docs/news.html

@@ -6,6 +6,18 @@
 
 <ul>
 
+  <li><b>28 May 2014 -- 2014.05-rc3 released</b>
+
+    <p>Release candidate 3 is out with more cleanups and build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2014.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-2014.05-rc3.tar.bz2">2014.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>21 May 2014 -- 2014.05-rc2 released</b>
 
     <p>Another week, another release candidate with more cleanups and

docs/support.html

@@ -2,32 +2,31 @@
 
 <h2>Support</h2>
 
-You can get support for Buildroot through three main channels:
+<p>You can get support for Buildroot through three main channels:</p>
 
 <h3>IRC</h3>
-The Buildroot IRC is <a href="irc://freenode.net/#buildroot">#buildroot</a>.
-The channel #buildroot is hosted on Freenode <a href="http://webchat.freenode.net">WebChat</a>.
-
+<p>The Buildroot IRC channel is <a href="irc://freenode.net/#buildroot">
+#buildroot</a>, hosted on Freenode. If you do not have an IRC client, you can
+use the <a href="http://webchat.freenode.net">Freenode web interface</a>.
 When asking for help on IRC, share relevant logs or pieces of code using a code
-sharing website.
+sharing website.</p>
 
 <h3>Mailing List Information</h3>
-The <a href="/lists/buildroot/">mailing list</a> is for discussion and
+<p>The <a href="/lists/buildroot/">mailing list</a> is for discussion and
 development.  You can subscribe by visiting
 <a href="http://lists.busybox.net/mailman/listinfo/buildroot">this page</a>.
 Only subscribers to the Buildroot mailing list are allowed to post
-to this list.
-<p>
-The list is also available through <a
+to this list.</p>
+
+<p>The list is also available through <a
 href="http://gmane.org">Gmane</a> at <a href="http://dir.gmane.org/gmane.comp.lib.uclibc.buildroot">gmane.comp.lib.uclibc.buildroot</a>.
-<p>
+</p>
 
 <h4>Search the List Archives</h4>
-Please search the mailing list archives before asking questions on the mailing
+<p>Please search the mailing list archives before asking questions on the mailing
 list, since there is a good chance someone else has asked the same question
 before.  Checking the archives is a great way to avoid annoying everyone on the
-list with frequently asked questions...
-<p>
+list with frequently asked questions...</p>
 
 <form method="get" action="http://search.gmane.org/">
   <input type="text" name="query">
@@ -37,9 +36,10 @@ list with frequently asked questions...
 
 <h3>Bug Tracker</h3>
 
-If you encounter any problems while using Buildroot, you can use the <a href="https://bugs.uclibc.org/">Bug Tracker</a>
-to post your bugs and/or participate to find solutions to existing problems.
+<p>If you encounter any problem while using Buildroot, you can use the
+<a href="https://bugs.buildroot.org/">Bug Tracker</a> to post your bugs and/or
+participate to find solutions to existing problems.</p>
 
-Note: Patch are only accepted through the mailing list.
+<p>Note: patches are only accepted through the mailing list.</p>
 
 <!--#include file="footer.html" -->

package/acl/acl.mk

@@ -10,6 +10,8 @@ ACL_SITE = http://download.savannah.gnu.org/releases/acl
 ACL_INSTALL_STAGING = YES
 ACL_DEPENDENCIES = attr
 ACL_CONF_OPT = --enable-gettext=no
+ACL_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
+ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
 
 # While the configuration system uses autoconf, the Makefiles are
 # hand-written and do not use automake. Therefore, we have to hack

package/attr/attr.mk

@@ -9,6 +9,8 @@ ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz
 ATTR_SITE = http://download.savannah.gnu.org/releases/attr
 ATTR_INSTALL_STAGING = YES
 ATTR_CONF_OPT = --enable-gettext=no
+ATTR_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
+ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
 
 # While the configuration system uses autoconf, the Makefiles are
 # hand-written and do not use automake. Therefore, we have to hack

package/connman/Config.in

@@ -15,7 +15,7 @@ config BR2_PACKAGE_CONNMAN
 	  managing internet connections within embedded devices running
 	  the Linux operating system.
 
-	  For more information, see http://connman.net/
+	  For more information, see https://01.org/connman
 
 if BR2_PACKAGE_CONNMAN
 

package/dosfstools/dosfstools.mk

@@ -9,14 +9,13 @@ DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
 DOSFSTOOLS_SITE = http://daniel-baumann.ch/files/software/dosfstools
 DOSFSTOOLS_LICENSE = GPLv3+
 DOSFSTOOLS_LICENSE_FILES = COPYING
-DOSFSTOOLS_LDFLAGS = $(TARGET_LDFLAGS)
 
 # Avoid target dosfstools dependencies, no host-libiconv
 HOST_DOSFSTOOLS_DEPENDENCIES =
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
 DOSFSTOOLS_DEPENDENCIES += libiconv
-DOSFSTOOLS_LDFLAGS += -liconv
+DOSFSTOOLS_LDLIBS += -liconv
 endif
 
 FATLABEL_BINARY = fatlabel
@@ -24,8 +23,7 @@ FSCK_FAT_BINARY = fsck.fat
 MKFS_FAT_BINARY = mkfs.fat
 
 define DOSFSTOOLS_BUILD_CMDS
-	$(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" \
-		LDFLAGS="$(DOSFSTOOLS_LDFLAGS)" -C $(@D)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) LDLIBS="$(DOSFSTOOLS_LDLIBS)" -C $(@D)
 endef
 
 DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_FATLABEL)+=$(FATLABEL_BINARY)

package/dropbear/S50dropbear

@@ -10,10 +10,6 @@ start() {
 	DROPBEAR_ARGS="$DROPBEAR_ARGS -R"
 
 	echo -n "Starting dropbear sshd: "
-	# Make sure dropbear directory exists
-	if [ ! -d /etc/dropbear ] ; then
-		mkdir -p /etc/dropbear
-	fi
 	umask 077
 	start-stop-daemon -S -q -p /var/run/dropbear.pid \
 		--exec /usr/sbin/dropbear -- $DROPBEAR_ARGS

package/dropbear/dropbear.mk

@@ -85,6 +85,7 @@ define DROPBEAR_INSTALL_TARGET_CMDS
 	for f in $(DROPBEAR_TARGET_BINS); do \
 		ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/$$f ; \
 	done
+	mkdir -p $(TARGET_DIR)/etc/dropbear
 endef
 
 $(eval $(autotools-package))

package/dvb-apps/dvb-apps.mk

@@ -10,17 +10,15 @@ DVB_APPS_SITE_METHOD = hg
 DVB_APPS_LICENSE = GPLv2 GPLv2+ LGPLv2.1+
 DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL
 
-DVB_APPS_LDFLAGS = $(TARGET_LDFLAGS)
-
 ifeq ($(BR2_ENABLE_LOCALE),)
 DVB_APPS_DEPENDENCIES = libiconv
-DVB_APPS_LDFLAGS += -liconv
+DVB_APPS_LDLIBS += -liconv
 endif
 
 DVB_APPS_INSTALL_STAGING = YES
 
 define DVB_APPS_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(DVB_APPS_LDFLAGS)" \
+	$(TARGET_CONFIGURE_OPTS) LDLIBS="$(DVB_APPS_LDLIBS)" \
 		$(MAKE) -C $(@D) CROSS_ROOT=$(STAGING_DIR) V=1
 endef
 

package/exim/exim.mk

@@ -49,15 +49,22 @@ define EXIM_CONFIGURE_CMDS
 	$(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS))
 endef
 
+# exim needs a bit of love to build statically
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+EXIM_STATIC_FLAGS = LFLAGS="-pthread --static"
+endif
+
 # "The -j (parallel) flag must not be used with make"
 # (http://www.exim.org/exim-html-current/doc/html/spec_html/ch04.html)
 define EXIM_BUILD_CMDS
-	build=br $(MAKE1) -C $(@D)
+	build=br $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS)
 endef
 
+# Need to replicate the LFLAGS in install, as exim still wants to build
+# something when installing...
 define EXIM_INSTALL_TARGET_CMDS
 	DESTDIR=$(TARGET_DIR) INSTALL_ARG="-no_chown -no_symlink" build=br \
-	  $(MAKE1) -C $(@D) install
+	  $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) install
 	chmod u+s $(TARGET_DIR)/usr/sbin/exim
 endef
 

package/flite/flite-0002-fix-alsa-static.patch

@@ -0,0 +1,19 @@
+Use pkg-config to determine alsa link flags. This fixes static linking.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+
+diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in
+--- flite-1.4-release.orig/configure.in	2009-08-14 23:46:38.000000000 +0300
++++ flite-1.4-release/configure.in	2014-04-30 18:52:33.253297236 +0300
+@@ -275,7 +275,10 @@
+                 #endif],
+               [AUDIODRIVER="alsa"
+ 	       AUDIODEFS=-DCST_AUDIO_ALSA
+-               AUDIOLIBS=-lasound])
++               AUDIOLIBS=`pkg-config --libs alsa`
++               if test "$shared" = false; then
++                   AUDIOLIBS=`pkg-config --libs --static alsa`
++               fi])
+ AC_CHECK_HEADER(mmsystem.h,
+ 	      [AUDIODRIVER="wince"
+ 	       AUDIODEFS=-DCST_AUDIO_WINCE

package/flite/flite.mk

@@ -11,6 +11,9 @@ FLITE_LICENSE = BSD-4c
 FLITE_LICENSE_FILES = COPYING
 
 FLITE_INSTALL_STAGING = YES
+# Patching configure.in
+FLITE_AUTORECONF = YES
+FLITE_DEPENDENCIES = host-pkgconf
 
 # Sadly, Flite does not support parallel build, especially when building its
 # shared libraries.

package/gdb/Config.in.host

@@ -40,8 +40,6 @@ endif
 config BR2_GDB_VERSION
 	string
 	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
-	default "6.6a"     if BR2_GDB_VERSION_6_6 || \
-	                      (!BR2_PACKAGE_HOST_GDB && BR2_bfin)
 	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 || \
                                    (!BR2_PACKAGE_HOST_GDB && BR2_avr32)
 	default "arc-4.8-R3" if BR2_arc

package/gdb/gdb.mk

@@ -50,11 +50,7 @@ GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH
 HOST_GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH
 endif
 
-HOST_GDB_CONF_ENV = \
-	ac_cv_prog_MAKEINFO=missing
-
 GDB_CONF_ENV = \
-	ac_cv_prog_MAKEINFO=missing \
 	ac_cv_type_uintptr_t=yes \
 	gt_cv_func_gettext_libintl=yes \
 	ac_cv_func_dcgettext=yes \
@@ -119,6 +115,10 @@ HOST_GDB_CONF_OPT = \
 
 ifeq ($(GDB_FROM_GIT),y)
 HOST_GDB_DEPENDENCIES += host-texinfo
+else
+# don't generate documentation
+GDB_CONF_ENV += ac_cv_prog_MAKEINFO=missing
+HOST_GDB_CONF_ENV += ac_cv_prog_MAKEINFO=missing
 endif
 
 # legacy $arch-linux-gdb symlink

package/httping/httping.mk

@@ -9,9 +9,12 @@ HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz
 HTTPING_SITE = http://www.vanheusden.com/httping
 HTTPING_LICENSE = GPLv2
 HTTPING_LICENSE_FILES = license.txt
-HTTPING_LDFLAGS = $(if $(BR2_NEEDS_GETTEXT),-lintl) $(TARGET_LDFLAGS)
+HTTPING_LDFLAGS = $(TARGET_LDFLAGS) \
+	$(if $(BR2_NEEDS_GETTEXT),-lintl) \
+	$(if $(BR2_PACKAGE_LIBICONV),-liconv)
 HTTPING_DEPENDENCIES = host-gettext \
 	$(if $(BR2_NEEDS_GETTEXT),gettext) \
+	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_FFTW),fftw)
 HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \

package/hwdata/hwdata.mk

@@ -8,6 +8,8 @@ HWDATA_VERSION = 0.230
 HWDATA_SOURCE = hwdata_$(HWDATA_VERSION).orig.tar.gz
 HWDATA_PATCH = hwdata_$(HWDATA_VERSION)-1.diff.gz
 HWDATA_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/h/hwdata/
+HWDATA_LICENSE = GPLv2+ or XFree86 1.0 license
+HWDATA_LICENSE_FILES = COPYING LICENSE
 
 define HWDATA_INSTALL_TARGET_CMDS
 	install -D -m 644 $(@D)/pci.ids $(TARGET_DIR)/usr/share/hwdata/pci.ids

package/lesstif/Config.in

@@ -4,6 +4,7 @@ config BR2_PACKAGE_LESSTIF
 	select BR2_PACKAGE_XLIB_LIBXT
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_FREETYPE
+	depends on BR2_USE_MMU # fork()
 	help
 	  lesstif is the Hungry Programmers' version of OSF/Motif
 

package/libnss/Config.in

@@ -6,7 +6,6 @@ config BR2_PACKAGE_LIBNSS
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr
-	depends on !BR2_MIPS_NABI32
 	help
 	  Network Security Services (NSS) is a set of libraries designed
 	  to support development of security-enabled client and server
@@ -19,4 +18,3 @@ config BR2_PACKAGE_LIBNSS
 comment "libnss needs a toolchain w/ largefile, threads"
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_MIPS_NABI32

package/libnss/libnss.mk

@@ -30,8 +30,12 @@ LIBNSS_BUILD_VARS = MOZILLA_CLIENT=1 \
 		OS_TEST="$(ARCH)"
 
 ifeq ($(BR2_ARCH_IS_64),y)
+# MIPS64 n32 is treated as a 32-bit architecture by libnss.
+# See: https://bugzilla.mozilla.org/show_bug.cgi?id=1010730
+ifeq ($(BR2_MIPS_NABI32),)
 LIBNSS_BUILD_VARS += USE_64=1
 endif
+endif
 
 
 define LIBNSS_BUILD_CMDS

package/libv4l/Config.in

@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBV4L
 	bool "libv4l"
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_JPEG
 	help
 	  libv4l is an accompanying collection of libraries that adds a thin
@@ -61,3 +62,4 @@ endif
 
 comment "libv4l needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU

package/lttng-babeltrace/Config.in

@@ -8,6 +8,7 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
 	depends on BR2_LARGEFILE # util-linux
+	depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC # posix_fallocate
 	help
 	  Babeltrace is part of the LTTng 2.x project.
 
@@ -25,7 +26,8 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 
 	  http://lttng.org
 
-comment "lttng-babeltrace needs a toolchain w/ wchar, threads, largefile"
+comment "lttng-babeltrace needs a uclibc snapshot or (e)glib toolchain w/ wchar, threads, largefile"
 	depends on BR2_PACKAGE_LTTNG_TOOLS
 	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_UCLIBC_VERSION_SNAPSHOT || !BR2_TOOLCHAIN_USES_GLIBC

package/midori/midori.mk

@@ -14,6 +14,7 @@ MIDORI_DEPENDENCIES = \
 	host-intltool \
 	host-pkgconf \
 	host-vala \
+	host-python \
 	libgtk2 \
 	libsexy \
 	webkit \
@@ -30,18 +31,18 @@ define MIDORI_CONFIGURE_CMDS
 	$(MIDORI_WITHOUT_X11)
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_OPTS)	\
-		./waf configure			\
+		$(HOST_DIR)/usr/bin/python2 ./waf configure \
 		--prefix=/usr			\
 		--disable-libnotify		\
        )
 endef
 
 define MIDORI_BUILD_CMDS
-       (cd $(@D); ./waf build -j $(PARALLEL_JOBS))
+       (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS))
 endef
 
 define MIDORI_INSTALL_TARGET_CMDS
-       (cd $(@D); ./waf --destdir=$(TARGET_DIR) install)
+       (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) install)
 endef
 
 $(eval $(generic-package))

package/monit/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_MONIT
 	bool "monit"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  Monit is a free open source utility for managing and
 	  monitoring, processes, programs, files, directories and
@@ -11,4 +12,5 @@ config BR2_PACKAGE_MONIT
 	  http://mmonit.com/monit/
 
 comment "monit needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS

package/mplayer/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MPLAYER
 	bool "mplayer"
 	# Those architectures are not supported by MPlayer
-	depends on !(BR2_arc || BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
+	depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
 			|| BR2_microblaze || BR2_aarch64 || BR2_nios2)
 	# Broken support for <ARMv5
 	depends on !(BR2_arm920t || BR2_arm920t || BR2_arm922t || BR2_fa526 \
@@ -29,6 +29,6 @@ config BR2_PACKAGE_MPLAYER_MENCODER
 endif
 
 comment "mplayer needs a toolchain w/ largefile"
-	depends on !(BR2_arc || BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
+	depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
 			|| BR2_microblaze || BR2_aarch64 || BR2_nios2)
 	depends on !BR2_LARGEFILE

package/mplayer/mplayer-0004-add-arc-support.patch

@@ -0,0 +1,13 @@
+--- mplayer-1.1/configure	2013-12-03 00:32:10.815571460 -0800
++++ mplayer-1.1-arc/configure	2013-11-29 00:34:29.238297709 -0800
+@@ -2492,6 +2492,10 @@
+   generic)
+     arch='generic'
+     ;;
++  arc)
++    arch='arc'
++    iproc='arc'
++    ;;
+ 
+   *)
+     echo "The architecture of your CPU ($host_arch) is not supported by this configure script"

package/newt/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_NEWT
 	bool "newt"
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU # slang
 	select BR2_PACKAGE_SLANG
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
@@ -10,4 +11,5 @@ config BR2_PACKAGE_NEWT
 	  http://www.redhat.com/
 
 comment "newt needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR

package/opencv/Config.in

@@ -189,12 +189,14 @@ config BR2_PACKAGE_OPENCV_WITH_V4L
 	bool "v4l support"
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # libv4l fork
 	select BR2_PACKAGE_LIBV4L
 	help
 	  Enable Video 4 Linux support.
 
 comment "v4l support needs a toolchain w/ largefile, threads"
 	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU
 
 comment "Install options"
 

package/php/php-01-no-iconv-search.patch

@@ -1,32 +1,65 @@
-Just assume ICONV_DIR is fine since we pass the correct parameters
-to configure.
-Otherwise configure will try to guess on absolute directories and
-sometimes messes up on some weird edge conditions.
+Tweak PHP_SETUP_ICONV from aclocal/acinclude.m4 to not
+PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use
+test instead of AC_TRY_LINK to find headers which is bad,
+specially when adding /usr and /usr/local to the mix.
+Do basically the same with ext/iconv/config.m4 by tweaking
+PHP_ICONV_H_PATH which, again, uses test and absolute paths.
+And all this directly in configure since autoreconf isn't
+happy with php.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-diff -Nura php-5.3.27.orig/configure php-5.3.27/configure
---- php-5.3.27.orig/configure	2013-11-26 09:33:30.874253800 -0300
-+++ php-5.3.27/configure	2013-11-26 09:41:41.495363637 -0300
-@@ -48212,20 +48212,7 @@
+diff -Nura php-5.5.11.orig/configure php-5.5.11/configure
+--- php-5.5.11.orig/configure	2014-04-16 14:55:52.300838499 -0300
++++ php-5.5.11/configure	2014-04-22 21:54:01.499097295 -0300
+@@ -45751,12 +45751,6 @@
+   if test -n "$unique" && test "`eval $cmd`" = "" ; then
+     eval "INCLUDEPATH$unique=set"
  
- 
-   if test "$iconv_avail" != "no"; then
--    if test -z "$ICONV_DIR"; then
--      for i in /usr/local /usr; do
--        if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
--          PHP_ICONV_PREFIX="$i"
--          break
--        fi
--      done
--      if test -z "$PHP_ICONV_PREFIX"; then
--        PHP_ICONV_PREFIX="/usr"
+-      if test ""; then
+-        INCLUDES="-I$ai_p $INCLUDES"
+-      else
+-        INCLUDES="$INCLUDES -I$ai_p"
 -      fi
--    else
--      PHP_ICONV_PREFIX="$ICONV_DIR"
--    fi
 -
-+    PHP_ICONV_PREFIX="$ICONV_DIR"
-     CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
-     LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
+   fi
  
+   fi
+@@ -45786,14 +45780,7 @@
+       PHP_ICONV_PREFIX="$ICONV_DIR"
+     fi
+ 
+-    CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
+-    LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
+-
+-    if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
+-      PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
+-    else
+-      PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
+-    fi
++      PHP_ICONV_H_PATH="iconv.h"
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
+ $as_echo_n "checking if iconv is glibc's... " >&6; }
+@@ -46191,8 +46178,6 @@
+   ext_builddir=ext/iconv
+   ext_srcdir=$abs_srcdir/ext/iconv
+ 
+-  ac_extra=`echo "-I\"$PHP_ICONV_PREFIX/include\""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
+-
+   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+     PHP_ICONV_SHARED=no
+ 
+@@ -97419,12 +97404,6 @@
+   if test -n "$unique" && test "`eval $cmd`" = "" ; then
+     eval "INCLUDEPATH$unique=set"
+ 
+-      if test ""; then
+-        INCLUDES="-I$ai_p $INCLUDES"
+-      else
+-        INCLUDES="$INCLUDES -I$ai_p"
+-      fi
+-
+   fi
+ 
+   fi

package/python/python-110-optional-db.patch

@@ -70,7 +70,7 @@ Index: b/configure.ac
 +	AS_HELP_STRING([--disable-bsddb], [disable BerkeyleyDB]),
 +	[ if test "$enableval" = "no"; then
 +    	     BSDDB=no
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bsddb"
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bsddb"
 +  	  else
 +	     BSDDB=yes
 +  	  fi], [ BSDDB=yes ])

package/rdesktop/rdesktop.mk

@@ -4,11 +4,20 @@
 #
 ################################################################################
 
-RDESKTOP_VERSION = 1.5.0
+RDESKTOP_VERSION = 1.8.2
 RDESKTOP_SITE = http://downloads.sourceforge.net/project/rdesktop/rdesktop/$(RDESKTOP_VERSION)
-RDESKTOP_DEPENDENCIES = openssl xlib_libX11 xlib_libXt
-RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr
-RDESKTOP_LICENSE = GPLv2+ with exceptions
+RDESKTOP_DEPENDENCIES = host-pkgconf openssl xlib_libX11 xlib_libXt \
+	$(if $(BR2_PACKAGE_ALSA_LIB_PCM),alsa-lib) \
+	$(if $(BR2_PACKAGE_LIBAO),libao) \
+	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate)
+RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr --disable-credssp
+RDESKTOP_LICENSE = GPLv3+
 RDESKTOP_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_PCSC_LITE),y)
+RDESKTOP_DEPENDENCIES += pcsc-lite
+else
+RDESKTOP_CONF_OPT += --disable-smartcard
+endif
+
 $(eval $(autotools-package))

package/rpi-userland/rpi-userland.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = eccb81050afd177da1923404b366c6226f29bfe0
+RPI_USERLAND_VERSION = 4855a45b118cb7b97b83e5160551db9813487c91
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE

package/ruby/ruby.mk

@@ -12,7 +12,8 @@ HOST_RUBY_DEPENDENCIES = host-pkgconf
 RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
 RUBY_MAKE = $(MAKE1)
 RUBY_CONF_OPT = --disable-install-doc --disable-rpath
-HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline
+HOST_RUBY_CONF_OPT = --disable-install-doc \
+	--with-out-ext=curses,openssl,readline
 RUBY_LICENSE = Ruby or BSD-2c, BSD-3c, others
 RUBY_LICENSE_FILES = LEGAL COPYING BSDL
 

package/samba/Config.in

@@ -2,8 +2,8 @@ config BR2_PACKAGE_SAMBA
 	bool "samba"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
-	# binary too large, relocations don't fit
-	depends on !BR2_avr32
+	depends on !BR2_avr32 # binary too large, relocations don't fit
+	depends on !BR2_nios2 # binary too large, relocations don't fit
 	select BR2_PACKAGE_POPT
 	help
 	  Provides secure, stable and fast file and print services

package/samba4/Config.in

@@ -7,6 +7,7 @@ config BR2_PACKAGE_SAMBA4
 	depends on BR2_LARGEFILE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # talloc python threads
 	depends on !BR2_avr32 # bad toolchain
+	depends on !BR2_nios2 # binary too large, relocations don't fit
 	select BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_PYTHON

package/slang/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SLANG
 	bool "slang"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Multi-platform console display library.
 

package/tz/tz.mk

@@ -27,6 +27,11 @@ define TZ_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc
 	cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc
 	if [ -n "$(TZ_LOCALTIME)" ]; then                               \
+	    if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) ]; then \
+	        printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
+	               "$(TZDATA_LOCALTIME)";                           \
+	        exit 1;                                                 \
+	    fi;                                                         \
 	    cd $(TARGET_DIR)/etc;                                       \
 	    ln -sf ../usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) TZ; \
 	fi

package/tzdata/tzdata.mk

@@ -44,6 +44,11 @@ define TZDATA_INSTALL_TARGET_CMDS
 	    ln -sfn "$${zone}" "$${zone##*/}";  \
 	done
 	if [ -n "$(TZDATA_LOCALTIME)" ]; then                           \
+	    if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/$(TZDATA_LOCALTIME) ]; then \
+	        printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
+	               "$(TZDATA_LOCALTIME)";                           \
+	        exit 1;                                                 \
+	    fi;                                                         \
 	    cd $(TARGET_DIR)/etc;                                       \
 	    ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) localtime; \
 	    echo "$(TZDATA_LOCALTIME)" >timezone;                       \

package/xbmc/Config.in

@@ -39,6 +39,7 @@ menuconfig BR2_PACKAGE_XBMC
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_PCRE_UCP
 	select BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_PYTHON_BSDDB
 	select BR2_PACKAGE_PYTHON_BZIP2