Update for 2013.02-rc3

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

CHANGES

@@ -1,3 +1,31 @@
+2013.02-rc3, Released February 26th, 2013
+
+	Minor fixes.
+
+	Updated/fixed packages: conntrack-tools, dialog,
+	enlightenment, haserl, keyutils, libfif, libmad,
+	linux-firmware, linux-fusion, matchbox-desktop, matchbox-wm,
+	ruby, spawn-fcgi, vtun
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#5960: fusion.ko driver does not install to target rootfs
+
+2013.02-rc2, Released February 19th, 2013
+
+	Fixes all over the tree.
+
+	Various manual updates and fixes.
+
+	Updated/fixed packages: busybox, collectd, gesftpserver,
+	glib-networking, gnutls, inotify-tools, libcurl, libffi,
+	libglib2, libtorrent, libvorbis, neard, network-manager,
+	ntfs-3g, openssl, qt, rpi-userland, rtorrent, thttpd, vim.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#5906: collectd client headers not exported
+
 2013.02-rc1, Released February 10th, 2013
 
 	Toolchain: Crosstool-ng 1.17.0, default to GCC 4.6.3, target

Makefile

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

configs/qemu_arm_nuri_defconfig

@@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y

configs/qemu_arm_versatile_defconfig

@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.7.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

configs/qemu_arm_vexpress_defconfig

@@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y

configs/qemu_microblazebe_mmu_defconfig

@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.7.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y

configs/qemu_microblazeel_mmu_defconfig

@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.7.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y

configs/qemu_mips64_malta_defconfig

@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y

configs/qemu_mips_malta_defconfig

@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y

configs/qemu_mipsel_malta_defconfig

@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y

configs/qemu_ppc_g3beige_defconfig

@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.7.config"
 BR2_LINUX_KERNEL_VMLINUX=y

configs/qemu_ppc_mpc8544ds_defconfig

@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 

configs/qemu_ppc_virtex_ml507_defconfig

@@ -15,7 +15,7 @@ BR2_SOFT_FLOAT=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
 BR2_LINUX_KERNEL_VMLINUX=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y

configs/qemu_sparc_ss10_defconfig

@@ -12,6 +12,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

configs/qemu_x86_64_defconfig

@@ -15,6 +15,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.7.config"

configs/qemu_x86_defconfig

@@ -16,6 +16,6 @@ BR2_KERNEL_HEADERS_3_7=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.7.config"

docs/download.html

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

docs/manual/adding-packages-autotools.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Infrastructure for autotools-based packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/manual/adding-packages-cmake.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Infrastructure for CMake-based packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/manual/adding-packages-conclusion.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Conclusion
 ~~~~~~~~~~

docs/manual/adding-packages-directory.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Package directory
 ~~~~~~~~~~~~~~~~~

docs/manual/adding-packages-generic.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Infrastructure for packages with specific build systems
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/manual/adding-packages-gettext.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Gettext integration and interaction with packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/manual/adding-packages-tips.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Tips and tricks
 ~~~~~~~~~~~~~~~

docs/manual/adding-packages.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[adding-packages]]
 Adding new packages to Buildroot

docs/manual/advanced.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Advanced usage
 --------------

docs/manual/appendix.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Appendix
 ========

docs/manual/beyond-buildroot.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Beyond Buildroot
 ================

docs/manual/ccache-support.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[ccache]]
 Using +ccache+ in Buildroot

docs/manual/common-usage.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Daily use
 ---------

docs/manual/configure.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[configure]]
 Details on Buildroot configuration

docs/manual/contribute.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Contibuting to Buildroot
 ========================

docs/manual/customize-busybox-config.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[busybox-custom]]
 Customizing the Busybox configuration

docs/manual/customize-kernel-config.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[kernel-custom]]
 Customizing the Linux kernel configuration

docs/manual/customize-rootfs.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[rootfs-custom]]
 Customizing the generated target filesystem

docs/manual/customize-store.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*-
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[customize-store]]
 Storing the configuration

docs/manual/customize-toolchain.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[toolchain-custom]]
 Customizing the toolchain

docs/manual/customize-uclibc-config.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[uclibc-custom]]
 Customizing the uClibc configuration

docs/manual/customize.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Customization
 -------------

docs/manual/developer-guide.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Developer Guidelines
 ====================

docs/manual/download-infra.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[download-infra]]
 

docs/manual/download-location.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Location of downloaded packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/manual/eclipse-integration.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Integration with Eclipse
 ------------------------

docs/manual/faq-troubleshooting.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Frequently Asked Questions & Troubleshooting
 ============================================

docs/manual/get-involved.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Getting involved
 ================

docs/manual/getting.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[getting-buildroot]]
 Getting Buildroot

docs/manual/going-further.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Going further in Buildroot's innards
 ====================================

docs/manual/how-buildroot-works.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 How Buildroot works
 -------------------

docs/manual/introduction.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 About Buildroot
 ===============

docs/manual/legal-notice.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[legal-info]]
 

docs/manual/make-tips.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[make-tips]]
 'make' tips

docs/manual/makedev-syntax.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[makedev-syntax]]
 Makedev syntax documentation

docs/manual/manual.mk

@@ -18,7 +18,7 @@ $(1): $(1)-$(3)
 $(1)-$(3): $$(O)/docs/$(1)/$(1).$(4)
 
 $$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
-	@echo "Generating $(5) $(1)..."
+	@$(call MESSAGE,"Generating $(5) $(1)...")
 	$(Q)mkdir -p $$(@D)
 	$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
 	  -D $$(@D) $$<

docs/manual/manual.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 The Buildroot user manual
 =========================

docs/manual/package-make-target.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[pkg-build-steps]]
 

docs/manual/patch-policy.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[patch-policy]]
 
@@ -33,7 +34,7 @@ Most patches are provided within Buildroot, in the package
 directory; these typically aim to fix cross-compilation, libc support,
 or other such issues.
 
-These patch files should be named +<packagename>-*.patch+.
+These patch files should be named +<packagename>-<description>.patch+.
 
 A +series+ file, as used by +quilt+, may also be added in the
 package directory. In that case, the +series+ file defines the patch
@@ -55,9 +56,8 @@ How patches are applied
 * If a +series+ file exists in the package directory, then patches are
   applied according to the +series+ file;
 +
-* Otherwise, patch files matching `<packagename>-*.patch` or
-  `<packagename>-*.patch.<arch>` (where +<arch>+ is the architecture
-  name) are applied following the +ls+ command order.
+* Otherwise, patch files matching `<packagename>-*.patch` are applied
+  following the +ls+ command order.
 
 . Run the +<packagename>_POST_PATCH_HOOKS+ commands if defined.
 

docs/manual/prerequisite.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[requirement]]
 System requirements

docs/manual/rebuilding-packages.txt

@@ -1,4 +1,5 @@
-// -*- mode:doc -*- ;
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 [[full-rebuild]]
 Understanding when a full rebuild is necessary

docs/manual/starting-up.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Starting up
 ===========

docs/manual/using-buildroot-toolchain.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Using the generated toolchain outside Buildroot
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/manual/using.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Using Buildroot
 ---------------

docs/manual/working-with.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Working with Buildroot
 ======================

docs/manual/writing-rules.txt

@@ -1,4 +1,5 @@
 // -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
 
 Coding style
 ------------

docs/news.html

@@ -5,12 +5,39 @@
 <p>
 
 <ul>
+  <li><b>26 February 2013 -- 2013.02-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.02_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.02-rc3.tar.bz2">2013.02-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>19 February 2013 -- 2013.02-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=2013.02_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-2013.02-rc2.tar.bz2">2013.02-rc2
+    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>10 February 2013 -- 2013.02-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=2013.02_rc1">CHANGES</a>
-    file for details.</p>
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2013-February/067148.html">announcement</a>.</p>
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2013.02-rc1.tar.bz2">2013.02-rc1

linux/Config.in

@@ -21,7 +21,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_3_7
-	bool "3.7.6"
+	bool "3.7.8"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.7.6" if BR2_LINUX_KERNEL_3_7
+	default "3.7.8" if BR2_LINUX_KERNEL_3_7
 	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
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

linux/linux.mk

@@ -198,6 +198,13 @@ define LINUX_INSTALL_DTB
 		$(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
 		$(BINARIES_DIR)/
 endef
+define LINUX_INSTALL_DTB_TARGET
+	# dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1
+	cp $(addprefix \
+		$(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \
+		$(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
+		$(TARGET_DIR)/boot/
+endef
 endif
 endif
 
@@ -234,6 +241,7 @@ endef
 ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),y)
 define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET
 	install -m 0644 -D $(LINUX_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
+	$(LINUX_INSTALL_DTB_TARGET)
 endef
 endif
 

package/Config.in

@@ -633,6 +633,7 @@ source "package/dnsmasq/Config.in"
 source "package/dropbear/Config.in"
 source "package/ebtables/Config.in"
 source "package/ethtool/Config.in"
+source "package/gesftpserver/Config.in"
 source "package/heirloom-mailx/Config.in"
 source "package/hiawatha/Config.in"
 source "package/hostapd/Config.in"
@@ -649,7 +650,6 @@ source "package/ipsec-tools/Config.in"
 source "package/ipset/Config.in"
 source "package/iptables/Config.in"
 source "package/iw/Config.in"
-source "package/gesftpserver/Config.in"
 source "package/kismet/Config.in"
 source "package/lighttpd/Config.in"
 source "package/links/Config.in"

package/busybox/Config.in

@@ -64,12 +64,14 @@ config BR2_PACKAGE_BUSYBOX_WATCHDOG
 if BR2_PACKAGE_BUSYBOX_WATCHDOG
 
 config BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD
-	int "Delay between reset"
+	string "Delay between reset"
 	default "5"
 	help
 	  Select the number of seconds between each
 	  reset of the watchdog (default 5)
 
+	  Use ms suffix to specify milliseconds (e.g. 500ms)
+
 endif
 
 endif

package/busybox/busybox.mk

@@ -168,7 +168,7 @@ define BUSYBOX_INSTALL_WATCHDOG_SCRIPT
 	[ -f $(TARGET_DIR)/etc/init.d/S15watchdog ] || \
 		install -D -m 0755 package/busybox/S15watchdog \
 			$(TARGET_DIR)/etc/init.d/S15watchdog && \
-		sed -i s/PERIOD/$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD)/ \
+		sed -i s/PERIOD/$(call qstrip,$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD))/ \
 			$(TARGET_DIR)/etc/init.d/S15watchdog
 endef
 endif

package/collectd/collectd.mk

@@ -8,6 +8,7 @@ COLLECTD_VERSION = 5.1.2
 COLLECTD_SITE = http://collectd.org/files
 COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
+COLLECTD_INSTALL_STAGING = YES
 COLLECTD_LICENSE = GPLv2 LGPLv2.1
 COLLECTD_LICENSE_FILES = COPYING
 

package/conntrack-tools/Config.in

@@ -2,6 +2,7 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 	bool "conntrack-tools"
 	depends on BR2_INET_IPV6
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
 	select BR2_PACKAGE_LIBNETFILTER_CTHELPER
 	select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT

package/dialog/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_DIALOG
 	bool "dialog"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # fork()
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help

package/enlightenment/enlightenment.mk

@@ -28,6 +28,13 @@ ENLIGHTENMENT_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 			 --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
 			 --disable-rpath
 
+# alsa backend needs mixer support
+ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
+ENLIGHTENMENT_DEPENDENCIES += alsa-lib
+else
+ENLIGHTENMENT_CONF_ENV += enable_alsa=no
+endif
+
 ifeq ($(BR2_HAVE_DOCUMENTATION),)
 define ENLIGHTENMENT_REMOVE_DOCUMENTATION
 	rm -rf $(TARGET_DIR)/usr/share/enlightenment/doc/

package/gesftpserver/Config.in

@@ -3,6 +3,7 @@ config BR2_PACKAGE_GESFTPSERVER
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	help
 	  Green End SFTP Server
 

package/glib-networking/glib-networking.mk

@@ -5,8 +5,8 @@
 #############################################################
 
 GLIB_NETWORKING_MAJOR_VERSION = 2.30
-GLIB_NETWORLING_MINOR_VERSION = 2
-GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORLING_MINOR_VERSION)
+GLIB_NETWORKING_MINOR_VERSION = 2
+GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORKING_MINOR_VERSION)
 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_MAJOR_VERSION)
 GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
 

package/gnutls/gnutls.mk

@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GNUTLS_VERSION = 3.1.7
+GNUTLS_VERSION = 3.1.8
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1
 GNUTLS_LICENSE = GPLv3+ LGPLv3

package/haserl/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_HASERL
 	bool "haserl"
+	depends on BR2_USE_MMU # fork()
 	help
 	  Haserl is a small cgi wrapper that enables shell scripts to be
 	  embedded into html documents. It is intended for environments

package/inotify-tools/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_INOTIFY_TOOLS
 	bool "inotify-tools"
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_MMU # fork()
 	help
 	  inotify-tools is a C library and a set of command-line
 	  programs for Linux providing a simple interface to inotify.

package/keyutils/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_KEYUTILS
 	bool "keyutils"
 	depends on !BR2_avr32 && !BR2_microblaze
+	depends on BR2_USE_MMU # fork()
 	help
 	  These tools are used to control the key management system
 	  built into the Linux kernel.

package/libcurl/Config.in

@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBCURL
 	bool "libcurl"
-	depends on BR2_USE_MMU # Uses fork()
 	help
 	  cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
 	  and Dict servers, using any of the supported protocols.

package/libcurl/libcurl-cve-2013-0249.patch

@@ -0,0 +1,65 @@
+From ee45a34907ffeb5fd95b0513040d8491d565b663 Mon Sep 17 00:00:00 2001
+From: Eldar Zaitov <kyprizel@volema.com>
+Date: Wed, 30 Jan 2013 23:22:27 +0100
+Subject: [PATCH] Curl_sasl_create_digest_md5_message: fix buffer overflow
+
+When negotiating SASL DIGEST-MD5 authentication, the function
+Curl_sasl_create_digest_md5_message() uses the data provided from the
+server without doing the proper length checks and that data is then
+appended to a local fixed-size buffer on the stack.
+
+This vulnerability can be exploited by someone who is in control of a
+server that a libcurl based program is accessing with POP3, SMTP or
+IMAP. For applications that accept user provided URLs, it is also
+thinkable that a malicious user would feed an application with a URL to
+a server hosting code targetting this flaw.
+
+Bug: http://curl.haxx.se/docs/adv_20130206.html
+---
+ lib/curl_sasl.c |   23 ++++++-----------------
+ 1 file changed, 6 insertions(+), 17 deletions(-)
+
+diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
+index 57116b6..d07387d 100644
+--- a/lib/curl_sasl.c
++++ b/lib/curl_sasl.c
+@@ -346,9 +346,7 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
+     snprintf(&HA1_hex[2 * i], 3, "%02x", digest[i]);
+ 
+   /* Prepare the URL string */
+-  strcpy(uri, service);
+-  strcat(uri, "/");
+-  strcat(uri, realm);
++  snprintf(uri, sizeof(uri), "%s/%s", service, realm);
+ 
+   /* Calculate H(A2) */
+   ctxt = Curl_MD5_init(Curl_DIGEST_MD5);
+@@ -392,20 +390,11 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
+   for(i = 0; i < MD5_DIGEST_LEN; i++)
+     snprintf(&resp_hash_hex[2 * i], 3, "%02x", digest[i]);
+ 
+-  strcpy(response, "username=\"");
+-  strcat(response, userp);
+-  strcat(response, "\",realm=\"");
+-  strcat(response, realm);
+-  strcat(response, "\",nonce=\"");
+-  strcat(response, nonce);
+-  strcat(response, "\",cnonce=\"");
+-  strcat(response, cnonce);
+-  strcat(response, "\",nc=");
+-  strcat(response, nonceCount);
+-  strcat(response, ",digest-uri=\"");
+-  strcat(response, uri);
+-  strcat(response, "\",response=");
+-  strcat(response, resp_hash_hex);
++  snprintf(response, sizeof(response),
++           "username=\"%s\",realm=\"%s\",nonce=\"%s\","
++           "cnonce=\"%s\",nc=\"%s\",digest-uri=\"%s\",response=%s",
++           userp, realm, nonce,
++           cnonce, nonceCount, uri, resp_hash_hex);
+ 
+   /* Base64 encode the reply */
+   return Curl_base64_encode(data, response, 0, outptr, outlen);
+-- 
+1.7.10.4
+

package/libcurl/libcurl.mk

@@ -10,7 +10,13 @@ LIBCURL_SITE = http://curl.haxx.se/download
 LIBCURL_LICENSE = ICS
 LIBCURL_LICENSE_FILES = COPYING
 LIBCURL_INSTALL_STAGING = YES
-LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols
+
+# We disable NTLM support because it uses fork(), which doesn't work
+# on non-MMU platforms. Moreover, this authentication method is
+# probably almost never used. See
+# http://curl.haxx.se/docs/manpage.html#--ntlm.
+LIBCURL_CONF_OPT = --disable-verbose --disable-manual \
+	--enable-hidden-symbols --disable-ntlm-wb
 LIBCURL_CONFIG_SCRIPTS = curl-config
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)

package/libffi/libffi-002-fix-ppc-nofpr.patch

@@ -0,0 +1,29 @@
+From: Gilles Talis <gilles.talis@gmail.com>
+
+On PPC, if __NO_FPRS__ is defined, fparg_count and NUM_FPR_ARG_REGISTERS
+are not defined, thus must not be used.
+
+Signed-off-by: Gilles Talis <gilles.talis@gmail.com>
+---
+ src/powerpc/ffi.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/powerpc/ffi.c b/src/powerpc/ffi.c
+index f3a96a1..9c69584 100644
+--- a/src/powerpc/ffi.c
++++ b/src/powerpc/ffi.c
+@@ -376,9 +376,10 @@ ffi_prep_args_SYSV (extended_cif *ecif, unsigned *const stack)
+      with the number found in ffi_prep_cif_machdep().  However, intarg_count
+      is incremeneted whenever we place an FP arg on the stack, so account for
+      that before our assert test.  */
++#ifndef __NO_FPRS__
+   if (fparg_count > NUM_FPR_ARG_REGISTERS)
+     intarg_count -= fparg_count - NUM_FPR_ARG_REGISTERS;
+-#ifndef __NO_FPRS__
++
+   FFI_ASSERT (fpr_base.u
+ 	      <= stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS);
+ #endif
+-- 
+1.7.10.4
+

package/libffi/libffi.mk

@@ -4,15 +4,11 @@
 #
 #############################################################
 
-LIBFFI_VERSION = bcc0c28001b6d427d5cd8037d2e3c892babc6b4c
-LIBFFI_SITE    = http://github.com/atgreen/libffi/tarball/$(LIBFFI_VERSION)
+LIBFFI_VERSION = 3.0.12
+LIBFFI_SITE    = ftp://sourceware.org/pub/libffi/
 LIBFFI_LICENSE = MIT
 LIBFFI_LICENSE_FILES = LICENSE
 LIBFFI_INSTALL_STAGING = YES
-
-# We're using a version from Git which strangely bundles a generated
-# configure script, but it's broken (doesn't generate the libffi.pc
-# file).
 LIBFFI_AUTORECONF = YES
 
 # Newer CS MIPS toolchains use a different (compact) eh_frame format
@@ -22,13 +18,11 @@ LIBFFI_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh"
 endif
 
 # Move the headers to the usual location, and adjust the .pc file
-# accordingly. For some reason, the libffi build system forgets to
-# install the .pc file, so we do it manually.
+# accordingly.
 define LIBFFI_MOVE_STAGING_HEADERS
 	mv $(STAGING_DIR)/usr/lib/libffi-*/include/*.h $(STAGING_DIR)/usr/include/
-	$(INSTALL) -D -m 0644 $(@D)/libffi.pc $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
-	$(SED) '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
-	$(SED) '/^Cflags:.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
+	$(SED) '/^includedir.*/d' -e '/^Cflags:.*/d' \
+		$(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc
 	rm -rf $(TARGET_DIR)/usr/lib/libffi-*
 endef
 
@@ -43,18 +37,7 @@ endef
 
 LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS
 
-# We're using a version from Git which strangely bundles a generated
-# configure script, but it's broken (doesn't generate the libffi.pc
-# file).
 HOST_LIBFFI_AUTORECONF = YES
 
-# For some reason, the libffi build system forgets to install the .pc
-# file, so we do it manually.
-define HOST_LIBFFI_INSTALL_PC_FILE
-	$(INSTALL) -D $(@D)/libffi.pc $(HOST_DIR)/usr/lib/pkgconfig/libffi.pc
-endef
-
-HOST_LIBFFI_POST_INSTALL_HOOKS += HOST_LIBFFI_INSTALL_PC_FILE
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/libglib2/libglib2.mk

@@ -45,12 +45,17 @@ LIBGLIB2_CONF_ENV = \
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
 # old uClibc versions don't provide qsort_r
-ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
+ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no
 else
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes
 endif
 
+# old toolchains don't have working inotify support
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
+LIBGLIB2_CONF_ENV += ac_cv_header_sys_inotify_h=no
+endif
+
 HOST_LIBGLIB2_CONF_OPT = \
 		--disable-gtk-doc \
 		--enable-debug=no \

package/libmad/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBMAD
 	bool "libmad"
+	select BR2_PACKAGE_LIBMAD_ASO if BR2_avr32
 	help
 	  High-quality MPEG audio decoder.  All computations are performed
 	  with fixed-point integer arithmetic, making it ideal for systems

package/libtorrent/Config.in

@@ -1,11 +1,12 @@
 config BR2_PACKAGE_LIBTORRENT
 	bool "libtorrent"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBSIGC
 	help
 	  BitTorrent library written in C++ for *nix
 
 	  http://libtorrent.rakshasa.no/
 
-comment "libtorrent requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "libtorrent requires a toolchain with C++ and threads support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

package/libvorbis/libvorbis.mk

@@ -6,7 +6,7 @@
 
 LIBVORBIS_VERSION = 1.3.3
 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz
-LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE)
+LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/
 LIBVORBIS_INSTALL_STAGING = YES
 LIBVORBIS_CONF_OPT = --disable-oggtest
 LIBVORBIS_DEPENDENCIES = host-pkgconf libogg

package/linux-firmware/linux-firmware.mk

@@ -3,8 +3,9 @@
 # linux-firmware
 #
 #############################################################
+
 LINUX_FIRMWARE_VERSION = 65a5163b8bb77bd7759efa3ca780867fcaed89b0
-LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 LINUX_FIRMWARE_SITE_METHOD = git
 
 # rt2501/rt61

package/linux-fusion/linux-fusion.mk

@@ -3,7 +3,7 @@
 # linux-fusion
 #
 #############################################################
-LINUX_FUSION_VERSION = 8.10.4
+LINUX_FUSION_VERSION = 9.0.0
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
 LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_INSTALL_STAGING = YES

package/matchbox/Config.in

@@ -19,6 +19,7 @@ config BR2_PACKAGE_MATCHBOX_PANEL
 config BR2_PACKAGE_MATCHBOX_DESKTOP
 	bool "Matchbox Desktop"
 	depends on BR2_PACKAGE_MATCHBOX
+	select BR2_PACKAGE_ZLIB
 	help
 	  A PDA style application launcher or 'item browser'.
 

package/matchbox/matchbox-desktop/matchbox-desktop.mk

@@ -10,7 +10,7 @@ MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2
 MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR)
 MATCHBOX_DESKTOP_LICENSE = GPLv2+
 MATCHBOX_DESKTOP_LICENSE_FILES = COPYING
-MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib
+MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib
 MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
 
 # The bundled configure script does not properly replace LIBADD_DL, so

package/matchbox/matchbox-wm/matchbox-wm-defaulttheme.patch

@@ -0,0 +1,47 @@
+[PATCH] fix mbtheme build issue when png support is disabled
+
+DEFAULTTHEME{,NAME} is not defined when png support is disabled, leading
+to compile errors in mbtheme.c:
+
+mbtheme.c: In function 'show_parse_error':
+mbtheme.c:2422:28: error: 'DEFAULTTHEME' undeclared (first use in this function)
+mbtheme.c:2422:28: note: each undeclared identifier is reported only once for each function it appears in
+mbtheme.c: In function 'mbtheme_init':
+mbtheme.c:2448:30: error: 'DEFAULTTHEME' undeclared (first use in this function)
+mbtheme.c:2470:25: error: 'DEFAULTTHEMENAME' undeclared (first use in this function)
+
+Fix it by unconditionally defining them as the values used are the same
+in png / !png cases anyway.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/structs.h |    9 ---------
+ 1 file changed, 9 deletions(-)
+
+Index: matchbox-window-manager-1.2/src/structs.h
+===================================================================
+--- matchbox-window-manager-1.2.orig/src/structs.h
++++ matchbox-window-manager-1.2/src/structs.h
+@@ -81,8 +81,6 @@
+ 
+ #define GENERIC_ICON        PKGDATADIR "/mbnoapp.xpm"
+ 
+-#ifdef MB_HAVE_PNG
+-
+ #define DEFAULT_THEME       DATADIR "/themes/Default/matchbox/theme.xml"
+ 
+ #define DEFAULTTHEME       DATADIR "/themes/Default/matchbox/theme.xml"
+@@ -91,13 +89,6 @@
+ 
+ #define DEFAULTTHEMENAME  "Default"
+ 
+-#else
+-
+-#define DEFAULT_THEME       DATADIR "/themes/Default/matchbox/theme.xml"
+-#define DEFAULT_THEME_NAME  "Default"
+-
+-#endif
+-
+ #define CONFDEFAULTS       PKGDATADIR "/defaults"
+ 
+ /* Simple Macros  */

package/neard/neard-fix-missing-linux-nfc-header.patch

@@ -8,17 +8,26 @@ As a workaround until all reasonable toolchains get this header
 included, add a configure check in neard to test whether this header
 is available or not, and if not, use our own private copy of it.
 
+Since symbols from the v3.7 kernel header are used, but linux/nfc.h
+already exists since the v3.1 kernel, check for one of the most
+recently added symbols: NFC_LLCP_RAW_HEADER_SIZE.
+
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 
 Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -88,6 +88,8 @@
+@@ -88,6 +88,12 @@
  AC_SUBST(NETLINK_CFLAGS)
  AC_SUBST(NETLINK_LIBS)
  
-+AC_CHECK_HEADER(linux/nfc.h, [AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], [], [#include <sys/socket.h>])
++AC_TRY_COMPILE([
++#include <sys/socket.h>
++#include <linux/nfc.h>
++	], [int err[NFC_LLCP_RAW_HEADER_SIZE-2];],
++	[AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], [])
 +
  AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],
  					[enable test/example scripts]),

package/network-manager/network-manager.mk

@@ -8,7 +8,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.bz2
 NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/
 NETWORK_MANAGER_INSTALL_STAGING = YES
 NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \
-	libgcrypt wireless_tools util-linux
+	libgcrypt wireless_tools util-linux host-intltool
 
 NETWORK_MANAGER_CONF_ENV = \
 	ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config

package/ntfs-3g/Config.in

@@ -2,6 +2,7 @@ config BR2_PACKAGE_NTFS_3G
 	bool "ntfs-3g"
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU
 	help
 	  The NTFS-3G driver is an open source, freely available
 	  read/write NTFS driver for Linux, FreeBSD, Mac OS X, NetBSD,

package/openssl/openssl.mk

@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.1d
+OPENSSL_VERSION = 1.0.1e
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_LICENSE = OpenSSL or SSLeay
 OPENSSL_LICENSE_FILES = LICENSE

package/qt/qt.mk

@@ -416,10 +416,10 @@ else
 QT_CONFIGURE_OPTS += -no-declarative
 endif
 
-# ccache and precompiled headers don't play well together
-ifeq ($(BR2_CCACHE),y)
+# -no-pch is needed to workaround the issue described at
+# http://comments.gmane.org/gmane.comp.lib.qt.devel/5933.
+# In addition, ccache and precompiled headers don't play well together
 QT_CONFIGURE_OPTS += -no-pch
-endif
 
 # x86x86fix
 # Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux

package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch

@@ -1,69 +0,0 @@
-From 93ae1bcd8005216baf7361ba860b53a2cf2e0401 Mon Sep 17 00:00:00 2001
-From: Floris Bos <bos@je-eigen-domein.nl>
-Date: Sun, 25 Nov 2012 19:05:07 +0100
-Subject: [PATCH] Test for the existence of execinfo.h
-
-Previous code assumed that on Linux the execinfo.h functions are always available, which is a glibc extension.
-This change fixes building the library under buildroot, which uses uClibc by default
----
- interface/vcos/glibc/vcos_backtrace.c |    7 +++++--
- makefiles/cmake/arm-linux.cmake       |    4 ++++
- makefiles/cmake/cmake_config.h.in     |    3 +++
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/interface/vcos/glibc/vcos_backtrace.c b/interface/vcos/glibc/vcos_backtrace.c
-index 474a328..3bb8aa3 100644
---- a/interface/vcos/glibc/vcos_backtrace.c
-+++ b/interface/vcos/glibc/vcos_backtrace.c
-@@ -26,7 +26,10 @@
- */
- 
- #include <interface/vcos/vcos.h>
--#ifdef __linux__
-+#ifdef HAVE_CMAKE_CONFIG
-+#include "cmake_config.h"
-+#endif
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
- #endif
- #include <stdio.h>
-@@ -35,7 +38,7 @@
- 
- void vcos_backtrace_self(void)
- {
--#ifdef __linux__
-+#ifdef HAVE_EXECINFO_H
-    void *stack[64];
-    int depth = backtrace(stack, sizeof(stack)/sizeof(stack[0]));
-    char **names = backtrace_symbols(stack, depth);
-diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake
-index 89d8bbf..6f2114f 100644
---- a/makefiles/cmake/arm-linux.cmake
-+++ b/makefiles/cmake/arm-linux.cmake
-@@ -115,6 +115,10 @@ try_compile(HAVE_MTRACE
-             ${CMAKE_SOURCE_DIR}/makefiles/cmake/srcs/test-mtrace.c
-             OUTPUT_VARIABLE foo)
- 
-+# test for existence of execinfo.h header
-+include(CheckIncludeFile)
-+check_include_file(execinfo.h HAVE_EXECINFO_H)
-+
- add_definitions(-DHAVE_CMAKE_CONFIG)
- configure_file (
-     "makefiles/cmake/cmake_config.h.in"
-diff --git a/makefiles/cmake/cmake_config.h.in b/makefiles/cmake/cmake_config.h.in
-index 5f08ad5..080b8e8 100644
---- a/makefiles/cmake/cmake_config.h.in
-+++ b/makefiles/cmake/cmake_config.h.in
-@@ -8,5 +8,8 @@
- /** Do we have support for GLIBC mtrace() ? */
- #cmakedefine                    HAVE_MTRACE
- 
-+/** Do we have the execinfo.h include file ? */
-+#cmakedefine                    HAVE_EXECINFO_H
-+
- #endif
- 
--- 
-1.7.10
-

package/rpi-userland/rpi-userland.mk

@@ -4,7 +4,7 @@
 #
 #############################################################
 
-RPI_USERLAND_VERSION = 9852ce28826889e50c4d6786b942f51bccccac54
+RPI_USERLAND_VERSION = 5e9a740a88a889dfc8a18bb1b00c17e5dd9d0108
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILE = LICENCE