Update for 2010.11

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

.gitignore

@@ -7,5 +7,8 @@
 /.config
 *.depend
 *.o
+/*.patch
+/*.diff
 *.orig
+*.rej
 *~

CHANGES

@@ -1,3 +1,40 @@
+2010.11, Released November 30th, 2010:
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: libgcrypt, qt, squid, sysstat, tcpdump,
+	xserver-xorg
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#2773: squid with openssl support needs openssl on the host
+	#2857: OBJDUMP definition is missing from TARGET_CONFIGURE_OPTS
+
+2010.11-rc2, Released November 25th, 2010:
+
+	Fixes all over the tree.
+
+	Add support for LEON Sparc architecture variants. Fix make
+	source/external-deps for host packages.
+
+	Updated/fixed packages: bash, bind, busybox, dialog, gpsd,
+	libglib2, libcurl, libmad, lrzsz, midori, module-init-tools,
+	mtd-utils, openssh, openssl, pciutils, php, qt, sqlite,
+	sysstat, webkit, zlib
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#759:  Sysstat build broken without libintl
+	#2479: host-module-init-tools 3.11 fails to build
+	#2725: Buildroot overrides kernel config
+	#2785: mtd-utils build fails due to missing libmtd
+	#2791: Added PHP-Process Control to the PHP-Package
+	#2797: pciutils dependencies on zlib not taken into account
+	#2809: failed to compile libglib2
+	#2821: [PATCH] Patch for JavaScriptCore in QtWebKit module
+	#2827: qt-4.7.0-pthread_getattr_np.patch invalid for qt 4.6...
+	#2833: Failed to compile webkit without X11
+
 2010.11-rc1, Released November 8th, 2010:
 
 	Fixes all over the tree and new features.

Makefile

@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2010.11-rc1
+export BR2_VERSION:=2010.11
 
 # This top-level Makefile can *not* be executed in parallel
 .NOTPARALLEL:
@@ -75,7 +75,6 @@ EXTRAMAKEARGS = O=$(O)
 NEED_WRAPPER=y
 endif
 
-# $(shell find . -name *_defconfig |sed 's/.*\///')
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 -include $(CONFIG_DIR)/.config
@@ -289,9 +288,6 @@ include package/Makefile.in
 
 all: world
 
-# In this section, we need .config
--include $(CONFIG_DIR)/.config.cmd
-
 # We also need the various per-package makefiles, which also add
 # each selected package to TARGETS if that package was selected
 # in the .config file.
@@ -323,6 +319,25 @@ TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS))
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
 TARGETS_ALL:=$(patsubst %,__real_tgt_%,$(TARGETS))
+
+# host-* dependencies have to be handled specially, as those aren't
+# visible in Kconfig and hence not added to a variable like TARGETS.
+# instead, find all the host-* targets listed in each <PKG>_DEPENDENCIES
+# variable for each enabled target.
+# Notice: this only works for newstyle gentargets/autotargets packages
+TARGETS_HOST_DEPS = $(sort $(filter host-%,$(foreach dep,\
+		$(addsuffix _DEPENDENCIES,$(call UPPERCASE,$(TARGETS))),\
+		$($(dep)))))
+# Host packages can in turn have their own dependencies. Likewise find
+# all the package names listed in the HOST_<PKG>_DEPENDENCIES for each
+# host package found above. Ideally this should be done recursively until
+# no more packages are found, but that's hard to do in make, so limit to
+# 1 level for now.
+HOST_DEPS = $(sort $(foreach dep,\
+		$(addsuffix _DEPENDENCIES,$(call UPPERCASE,$(TARGETS_HOST_DEPS))),\
+		$($(dep))))
+HOST_SOURCE += $(addsuffix -source,$(sort $(TARGETS_HOST_DEPS) $(HOST_DEPS)))
+
 # all targets depend on the crosscompiler and it's prerequisites
 $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
 
@@ -401,8 +416,13 @@ ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 	rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info
 	rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc
 	rm -rf $(TARGET_DIR)/usr/share/gtk-doc
+	-rmdir $(TARGET_DIR)/usr/share 2>/dev/null
 endif
-	find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
+	find $(TARGET_DIR) -type f -perm +111 '!' -name 'libthread_db*.so*' | \
+		xargs $(STRIPCMD) 2>/dev/null || true
+	find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \
+		xargs -r $(KSTRIPCMD) || true
+
 	mkdir -p $(TARGET_DIR)/etc
 	# Mandatory configuration file and auxilliary cache directory
 	# for recent versions of ldconfig
@@ -443,7 +463,7 @@ _source-check:
 	$(MAKE) DL_MODE=SOURCE_CHECK $(EXTRAMAKEARGS) source
 
 external-deps:
-	@$(MAKE) -Bs DL_MODE=SHOW_EXTERNAL_DEPS $(EXTRAMAKEARGS) source
+	@$(MAKE) -Bs DL_MODE=SHOW_EXTERNAL_DEPS $(EXTRAMAKEARGS) source | sort -u
 
 show-targets:
 	@echo $(TARGETS)
@@ -470,28 +490,19 @@ COMMON_CONFIG_ENV = \
 
 xconfig: $(BUILD_DIR)/buildroot-config/qconf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@if ! $(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN); then \
-		test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \
-	fi
+	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)
 
 gconfig: $(BUILD_DIR)/buildroot-config/gconf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@if ! $(COMMON_CONFIG_ENV) srctree=$(TOPDIR) \
-		$< $(CONFIG_CONFIG_IN); then \
-		test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \
-	fi
+	@$(COMMON_CONFIG_ENV) srctree=$(TOPDIR) $< $(CONFIG_CONFIG_IN)
 
 menuconfig: $(BUILD_DIR)/buildroot-config/mconf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@if ! $(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN); then \
-		test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \
-	fi
+	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)
 
 nconfig: $(BUILD_DIR)/buildroot-config/nconf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@if ! $(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN); then \
-		test -f $(CONFIG_DIR)/.config.cmd || rm -f $(CONFIG_DIR)/.config; \
-	fi
+	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)
 
 config: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
@@ -584,10 +595,7 @@ endif
 ifeq ($(O),output)
 	rm -rf $(O)
 endif
-	rm -rf $(CONFIG_DIR)/.config $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/.config.cmd $(CONFIG_DIR)/.auto.deps
-
-flush:
-	rm -f $(BUILD_DIR)/tgt-config.cache $(BUILD_DIR)/host-config.cache
+	rm -rf $(CONFIG_DIR)/.config $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/.auto.deps
 
 configured: dirs kernel-headers uclibc-config busybox-config linux26-config
 
@@ -621,7 +629,6 @@ help:
 	@echo '  source                 - download all sources needed for offline-build'
 	@echo '  source-check           - check all packages for valid download URLs'
 	@echo '  external-deps          - list external packages used'
-	@echo '  flush                  - flush configuration cache'
 	@echo
 	@$(foreach b, $(notdir $(wildcard $(TOPDIR)/configs/*_defconfig)), \
 	  printf "  %-35s - Build for %s\\n" $(b) $(b:_defconfig=);)

boot/syslinux/Config.in

@@ -1,6 +1,6 @@
 config BR2_TARGET_SYSLINUX
 	bool "syslinux"
-	depends on BR2_i386
+	depends on BR2_i386 || BR2_x86_64
 	help
 	  The syslinux bootloader for x86 systems.
 	  This includes: syslinux, pxelinux, extlinux.

docs/buildroot.html

@@ -32,6 +32,7 @@
       <li><a href="#downloaded_packages">Location of downloaded packages</a></li>
       <li><a href="#add_packages">Adding new packages to Buildroot</a></li>
       <li><a href="#board_support">Creating your own board support</a></li>
+      <li><a href="#faq">Frequently asked questions</a></li>
       <li><a href="#links">Resources</a></li>
     </ul>
 
@@ -182,18 +183,23 @@
  $ make
 </pre>
 
+    <p>You <b>should never</b> use <code>make -jN</code> with
+    Buildroot: it does not support <i>top-level parallel
+    make</i>. Instead, use the <code>BR2_JLEVEL</code> option to tell
+    Buildroot to run each package compilation with <pre>make
+    -jN</pre>.</p>
+
     <p>This command will generally perform the following steps:</p>
     <ul>
       <li>Download source files (as required)</li>
-      <li>Configure cross-compile toolchain</li>
-      <li>Build/install cross-compile toolchain</li>
+      <li>Configure, build and install the cross-compiling toolchain
+      if an internal toolchain is used, or import a toolchain if an
+      external toolchain is used</li>
       <li>Build/install selected target packages</li>
-      <li>Build a kernel image</li>
+      <li>Build a kernel image, if selected</li>
+      <li>Build a bootloader image, if selected</li>
       <li>Create a root filesystem in selected formats</li>
     </ul>
-    <p>Some of the above steps might not be performed if they are not
-    selected in the Buildroot configuration.
-   </p>
 
     <p>Buildroot output is stored in a single directory, <code>output/</code>.
     This directory contains several subdirectories:</p>
@@ -330,19 +336,14 @@
       completely rebuild your toolchain and tools, these changes will be
       lost.</li>
 
-      <li>Customize the target filesystem skeleton available under <code>
-      fs/skeleton/</code>. You can customize configuration files or other
-      stuff here. However, the full file hierarchy is not yet present
-      because it's created during the compilation process. Therefore, you
-      can't do everything on this target filesystem skeleton, but changes to
-      it do remain even if you completely rebuild the cross-compilation
-      toolchain and the tools. <br /> You can also customize the <code>
-      target/generic/device_table.txt</code> file, which is used by the
-      tools that generate the target filesystem image to properly set
-      permissions and create device nodes.<br /> These customizations are
-      deployed into <code>output/target/</code> just before the actual image
-      is made. Simply rebuilding the image by running make should propagate
-      any new changes to the image.</li>
+      <li>Create your own <i>target skeleton</i>. You can start with
+      the default skeleton available under <code>fs/skeleton</code>
+      and then customize it to suit your
+      needs. The <code>BR2_ROOTFS_SKELETON_CUSTOM</code>
+      and <code>BR2_ROOTFS_SKELETON_CUSTOM_PATH</code> will allow you
+      to specify the location of your custom skeleton. At build time,
+      the contents of the skeleton are copied to output/target before
+      any package installation.</li>
 
       <li>Add support for your own target in Buildroot, so that you
       have your own target skeleton (see <a href="#board_support">this
@@ -671,12 +672,9 @@ endif
     then to use <code>ARCH-linux-gcc</code>, <code>ARCH-linux-objdump</code>,
     <code>ARCH-linux-ld</code>, etc.</p>
 
-    <p><b>Important</b>: do not try to move a gcc-3.x toolchain to another
-    directory &mdash; it won't work because there are some hardcoded paths
-    in the gcc-3.x configuration. If you are using a current gcc-4.x, it is
-    possible to relocate the toolchain &mdash; but then <code>--sysroot</code>
-    must be passed every time the compiler is called to tell where the
-    libraries and header files are.</p>
+    <p>It is possible to relocate the toolchain &mdash; but
+    then <code>--sysroot</code> must be passed every time the compiler
+    is called to tell where the libraries and header files are.</p>
 
     <p>It is also possible to generate the Buildroot toolchain in a
     directory other than <code>output/staging</code> by using the <code>
@@ -713,13 +711,22 @@ endif
 
     <h2 id="external_toolchain">Using an external toolchain</h2>
 
-    <p>It might be useful not to use the toolchain generated by
-    Buildroot, for example if you already have a toolchain that is known
-    to work for your specific CPU, or if the toolchain generation feature
-    of Buildroot is not sufficiently flexible for you (for example if you
-    need to generate a system with <i>glibc</i> instead of
-    <i>uClibc</i>). Buildroot supports using an <i>external
-    toolchain</i>.</p>
+    <p>Using an already existing toolchain is useful for different
+    reasons:</p>
+
+    <ul>
+      <li>you already have a toolchain that is known to work for your
+	specific CPU</li>
+      <li>you want to speed up the Buildroot build process by skipping
+      the long toolchain build part</li>
+      <li>the toolchain generation feature of Buildroot is not
+	sufficiently flexible for you (for example if you need to
+	generate a system with <i>glibc</i> instead of
+	<i>uClibc</i>)</li>
+    </ul>
+
+    <p>Buildroot supports using existing toolchains through a
+    mechanism called <i>external toolchain</i>.</p>
 
     <p>To enable the use of an external toolchain, go to the
     <code>Toolchain</code> menu, and :</p>
@@ -727,6 +734,17 @@ endif
     <ul>
       <li>Select the <code>External binary toolchain</code> toolchain
       type</li>
+      <li>Select the appropriate <code>External toolchain C
+      library</code></li>
+      <li>Select the appropriate values for <code>Enable large
+      file</code>, <code>Enable IPv6</code>, <code>Enable
+      RPC</code>, <code>Enable toolchain
+      locale/i18n</code>, <code>Enable WCHAR</code>, <code>Enable
+      program invocation</code>, <code>Build/install c++ compiler and
+      libstdc++</code>, according to the configuration of your
+      external toolchain. Buildroot will check those values at the
+      beginning of the compilation process and will tell you if you
+      used incorrect values.</li>
       <li>Adjust the <code>External toolchain path</code>
       appropriately. It should be set to a path where a bin/ directory
       contains your cross-compiling tools</li>
@@ -735,18 +753,12 @@ endif
       correspond to your cross-compiling tools</li>
     </ul>
 
-    <p>If you are using an external toolchain based on <i>uClibc</i>, the
-    <code>Core C library from the external toolchain</code> and
-    <code>Libraries to copy from the external toolchain</code> options
-    should already have correct values. However, if your external
-    toolchain is based on <i>glibc</i>, you'll have to change these values
-    according to your cross-compiling toolchain.</p>
-
-    <p>To generate external toolchains, we recommend using
-    <a href="http://ymorin.is-a-geek.org/dokuwiki/projects/crosstool">Crosstool-NG</a>.
-    It allows generating toolchains based on <i>uClibc</i>, <i>glibc</i>
-    and <i>eglibc</i> for a wide range of architectures and has good
-    community support.</p>
+    <p>Our external toolchain support has been tested with toolchains
+    from CodeSourcery, toolchains generated
+    by <a href="http://ymorin.is-a-geek.org/dokuwiki/projects/crosstool">Crosstool-NG</a>,
+    and toolchains generated by Buildroot itself. In general, all
+    toolchains that support the <i>sysroot</i> feature should
+    work. If not, do not hesitate to contact the developers.</p>
 
     <h2 id="add_packages">Adding new packages to Buildroot</h2>
 
@@ -981,9 +993,12 @@ $(eval $(call GENTARGETS,package,libfoo,host))
     <code>libfoo</code>) :</p>
 
     <ul>
-      <li><code>LIBFOO_VERSION</code>, mandatory, must contain the version
-      of the package. Note that if <code>HOST_LIBFOO_VERSION</code> doesn't
-      exist, it is assumed to be the same as <code>LIBFOO_VERSION</code>.<br/>
+      <li><code>LIBFOO_VERSION</code>, mandatory, must contain the
+      version of the package. Note that
+      if <code>HOST_LIBFOO_VERSION</code> doesn't exist, it is assumed
+      to be the same as <code>LIBFOO_VERSION</code>. It can also be a
+      Subversion or Git branch or tag, for packages that are fetched
+      directly from their revision control system.<br/>
       Example: <code>LIBFOO_VERSION = 0.1.2</code></li>
 
       <li><code>LIBFOO_SOURCE</code> may contain the name of the tarball of
@@ -1002,13 +1017,38 @@ $(eval $(call GENTARGETS,package,libfoo,host))
       in the package directory inside Buildroot will be applied to the
       package after extraction.</li>
 
-      <li><code>LIBFOO_SITE</code> may contain the Internet location of the
-      tarball of the package. If <code>HOST_LIBFOO_SITE</code> is not
-      specified, it defaults to <code>LIBFOO_SITE</code>. If none are
-      specified, then the location is assumed to be
+      <li><code>LIBFOO_SITE</code> may contain the Internet location
+      of the package. It can either be the HTTP or FTP location of a
+      tarball, or the URL of a Git or Subversion repository
+      (see <code>LIBFOO_SITE_METHOD</code>
+      below). If <code>HOST_LIBFOO_SITE</code> is not specified, it
+      defaults to <code>LIBFOO_SITE</code>. If none are specified,
+      then the location is assumed to be
       <code>http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/packagename</code>.
-      <br/>Example:
-      <code>LIBFOO_SITE=http://www.libfoosoftware.org/libfoo</code>.</li>
+      <br/>Examples:<br/>
+      <code>LIBFOO_SITE=http://www.libfoosoftware.org/libfoo</code><br/>
+      <code>LIBFOO_SITE=http://svn.xiph.org/trunk/Tremor/</code></li>
+
+      <li><code>LIBFOO_SITE_METHOD</code> may contain the method to
+      fetch the package source code. It can either
+      be <code>WGET</code> (for normal FTP/HTTP downloads of
+      tarballs), <code>SVN</code> or <code>GIT</code>. When not
+      specified, it is guessed from the URL given
+      in <code>LIBFOO_SITE</code>: <code>git://</code>
+      and <code>svn://</code> URLs will use the <code>GIT</code>
+      and <code>SVN</code> methods respectively. All other URL-types
+      will use the <code>WGET</code> method. So for example, in the
+      case of a package whose source code is available through
+      Subversion repository on HTTP, one <i>must</i>
+      specifiy <code>LIBFOO_SITE_METHOD=SVN</code>. For <code>SVN</code>
+      and <code>GIT</code> methods, what Buildroot does is a
+      checkout/clone of the repository which is then tarballed and
+      stored into the download cache. Next builds will not
+      checkout/clone again, but will use the tarball
+      directly. When <code>HOST_LIBFOO_SITE_METHOD</code> is not
+      specified, it defaults to the value
+      of <code>LIBFOO_SITE_METHOD</code>. See <code>package/multimedia/tremor/</code>
+      for an example.</li>
 
       <li><code>LIBFOO_DEPENDENCIES</code> lists the dependencies (in terms
       of package name) that are required for the current target package to
@@ -1554,6 +1594,49 @@ LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP
     <p>If you package software that might be useful for other people, don't
     forget to send a patch to Buildroot developers!</p>
 
+    <h2 id="faq">Frequently asked questions</h2>
+
+    <ul>
+      <li><a href="#faq-boot-hangs">The boot hangs
+      after <code>Starting network...</code></a></li>
+      <li><a href="#module-init-tools-doesnt-build">module-init-tools
+      fails to build with <code>cannot find -lc</code></a></li>
+    </ul>
+
+    <h3 id="faq-boot-hangs">The boot hangs after <code>Starting
+    network...</code></h3>
+
+    <p>If the boot process seems to hang after the following messages
+    (messages not necessarly exactly similar, depending on the list of
+    packages selected):</p>
+
+    <pre>Freeing init memory: 3972K
+Initializing random number generator... done.
+Starting network...
+Starting dropbear sshd: generating rsa key... generating dsa key... OK</pre>
+
+    <p>then it means that your system is running, but didn't start a
+    shell on the serial console. In order to have the system start a
+    shell on your serial console, you have to go in the Buildroot
+    configuration, <code>Target options</code>, enable <code>Generic
+    serial port config</code>, and select the serial port and speed
+    you would like to use for the shell. This will automatically tune
+    the <code>/etc/inittab</code> file of the generated system so that
+    a shell starts on the correct serial port.</p>
+
+    <h3 id="module-init-tools-doesnt-build">module-init-tools
+      fails to build with <code>cannot find -lc</code></h3>
+
+    <p>If the build of <i>module-init-tools</i> for the host fails
+    with:</p>
+
+    <pre>/usr/bin/ld: cannot find -lc </pre>
+
+    <p>then probably you are running a Fedora (or similar)
+    distribution, and you should install the <code>glibc-static</code>
+    package. This is because the <i>module-init-tools</i> build
+    process wants to link statically against the C library.</p>
+
     <h2 id="links">Resources</h2>
 
     <p>To learn more about Buildroot you can visit these websites:</p>

docs/download.html

@@ -6,22 +6,22 @@
 
 <p>
 
-The latest stable release is <b>2010.08</b>, which can be downloaded
+The latest stable release is <b>2010.11</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2010.08.tar.gz">buildroot-2010.08.tar.gz</a>
+<a href="/downloads/buildroot-2010.11.tar.gz">buildroot-2010.11.tar.gz</a>
 or
-<a href="/downloads/buildroot-2010.08.tar.bz2">buildroot-2010.08.tar.bz2</a>.
+<a href="/downloads/buildroot-2010.11.tar.bz2">buildroot-2010.11.tar.bz2</a>.
 <p>
-
-The latest release candidate is <b>2010.11-rc1</b>, which can be
+<!--
+The latest release candidate is <b>2010.11-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2010.11-rc1.tar.gz">buildroot-2010.11-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2010.11-rc2.tar.gz">buildroot-2010.11-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2010.11-rc1.tar.bz2">buildroot-2010.11-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2010.11-rc2.tar.bz2">buildroot-2010.11-rc2.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 

docs/news.html

@@ -5,6 +5,40 @@
 <p>
 
 <ul>
+  <li><b>30 November 2010 -- 2010.11 released</b>
+
+    <p>The stable 2010.11 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2010.11">CHANGES</a>
+    file for more details,
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2010.11.tar.bz2">2010.11 release</a>.</p>
+
+  <li><b>25 November 2010 -- 2010.11-rc2 released</b>
+
+    <p>RC2 is out with more cleanups and bugfixes, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2010.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-2010.11-rc2.tar.bz2">2010.11-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>8 November 2010 -- 2010.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=2010.11_rc1">CHANGES</a>
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2010-November/038645.html">announcement</a>.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2010.11-rc1.tar.bz2">2010.11-rc1
+    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>28 September 2010 - Buildroot Developer Day</b>
 

fs/common.mk

@@ -36,7 +36,10 @@ ROOTFS_DEVICE_TABLE = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE))
 
 define ROOTFS_TARGET_INTERNAL
 
-$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
+# extra deps
+$(eval ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma))
+
+$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
 	@$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
 	$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
 	rm -f $(FAKEROOT_SCRIPT)
@@ -61,13 +64,13 @@ ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZMA),y)
 	$(LZMA) -9 -c $$@ > $$@.lzma
 endif
 
-$(1)-root-show-depends:
-	@echo $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
+rootfs-$(1)-show-depends:
+	@echo $(ROOTFS_$(2)_DEPENDENCIES)
 
-$(1)-root: $(BINARIES_DIR)/rootfs.$(1) $(ROOTFS_$(2)_POST_TARGETS)
+rootfs-$(1): $(BINARIES_DIR)/rootfs.$(1) $(ROOTFS_$(2)_POST_TARGETS)
 
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
-TARGETS += $(1)-root
+TARGETS += rootfs-$(1)
 endif
 endef
 

fs/initramfs/initramfs.mk

@@ -8,7 +8,7 @@
 
 define ROOTFS_INITRAMFS_INIT_SYMLINK
 	if [ ! -e $(TARGET_DIR)/init ]; then \
-		ln -s sbin/init $(TARGET_DIR)/init; \
+		ln -sf sbin/init $(TARGET_DIR)/init; \
 	fi
 endef
 
@@ -20,4 +20,4 @@ endef
 
 ROOTFS_INITRAMFS_POST_TARGETS += linux26-rebuild-with-initramfs
 
-$(eval $(call ROOTFS_TARGET,initramfs))
+$(eval $(call ROOTFS_TARGET,initramfs))

fs/iso9660/iso9660.mk

@@ -15,7 +15,7 @@ ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y)
 ISO9660_OPTS+=-U
 endif
 
-$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 ext2-root grub
+$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 rootfs-ext2 grub
 	@$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
 	mkdir -p $(ISO9660_TARGET_DIR)
 	mkdir -p $(ISO9660_TARGET_DIR)/boot/grub
@@ -37,7 +37,7 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 ext2-root grub
 	-@rm -f $(FAKEROOT_SCRIPT)
 	-@rm -rf $(ISO9660_TARGET_DIR)
 
-iso9660-root: $(BINARIES_DIR)/rootfs.iso9660
+rootfs-iso9660: $(BINARIES_DIR)/rootfs.iso9660
 
 #############################################################
 #
@@ -45,5 +45,5 @@ iso9660-root: $(BINARIES_DIR)/rootfs.iso9660
 #
 #############################################################
 ifeq ($(BR2_TARGET_ROOTFS_ISO9660),y)
-TARGETS+=iso9660-root
+TARGETS+=rootfs-iso9660
 endif

linux/Config.in

@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_2_6_36
 
 config BR2_LINUX_KERNEL_2_6_36
-	bool "2.6.36"
+	bool "2.6.36.1"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
 	string "Kernel version"
 	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
-	default "2.6.36"
+	default "2.6.36.1"
 
 config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 	string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "2.6.36" if BR2_LINUX_KERNEL_2_6_36
+	default "2.6.36.1" if BR2_LINUX_KERNEL_2_6_36
 	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

@@ -147,7 +147,7 @@ $(LINUX26_DIR)/.stamp_initramfs_rebuilt: $(LINUX26_DIR)/.stamp_installed $(BINAR
 	@$(call MESSAGE,"Rebuilding kernel with initramfs")
 	# Remove the previously generated initramfs which was empty,
 	# to make sure the kernel will actually regenerate it.
-	$(RM) -f $(@D)/usr/initramfs_data.cpio.*
+	$(RM) -f $(@D)/usr/initramfs_data.cpio*
 	# Build the kernel.
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) $(LINUX26_IMAGE_NAME)
 	# Copy the kernel image to its final destination

package/Makefile.in

@@ -146,23 +146,22 @@ ifeq ($(BR2_STRIP_strip),y)
 STRIP_DISCARD_ALL:=--discard-all
 STRIP_STRIP_UNNEEDED:=--strip-unneeded
 STRIP_STRIP_ALL:=--strip-all
-REMOVE_SECTION_COMMENT:=--remove-section=.comment
-REMOVE_SECTION_NOTE:=--remove-section=.note
 TARGET_STRIP=$(TARGET_CROSS)strip
-STRIPCMD=$(TARGET_CROSS)strip $(REMOVE_SECTION_COMMENT) $(REMOVE_SECTION_NOTE)
+STRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
+KSTRIPCMD=$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
 endif
 ifeq ($(BR2_STRIP_sstrip),y)
 STRIP_DISCARD_ALL:=
 STRIP_STRIP_UNNEEDED:=
 STRIP_STRIP_ALL:=
-REMOVE_SECTION_COMMENT:=
-REMOVE_SECTION_NOTE:=
 TARGET_STRIP=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip
 STRIPCMD=$(TARGET_STRIP)
+KSTRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note --strip-unneeded
 endif
 ifeq ($(BR2_STRIP_none),y)
 TARGET_STRIP=true
 STRIPCMD=$(TARGET_STRIP)
+KSTRIPCMD=$(TARGET_STRIP)
 endif
 INSTALL:=$(shell which install || type -p install)
 FLEX:=$(shell which flex || type -p flex)
@@ -192,6 +191,7 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		RANLIB="$(TARGET_RANLIB)" \
 		STRIP="$(TARGET_STRIP)" \
 		OBJCOPY="$(TARGET_OBJCOPY)" \
+		OBJDUMP="$(TARGET_OBJDUMP)" \
 		AR_FOR_BUILD="$(HOSTAR)" \
 		AS_FOR_BUILD="$(HOSTAS)" \
 		CC_FOR_BUILD="$(HOSTCC)" \

package/bash/bash-4.1-008.patch

@@ -0,0 +1,49 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-008
+
+Bug-Reported-by:	Dennis van Dok <dvandok@gmail.com>
+Bug-Reference-ID:	<4BBF2501.5050703@gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-04/msg00038.html
+
+Bug-Description:
+
+When declaring an associative array and implicitly assigning a value
+to element "0", bash does not correctly allocate memory, leading to
+a segmentation violation when that element or the array itself is
+unset.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/builtins/declare.def	2009-11-25 19:42:00.000000000 -0500
+--- ./builtins/declare.def	2010-05-30 18:25:21.000000000 -0400
+***************
+*** 513,517 ****
+  	      /* let bind_{array,assoc}_variable take care of this. */
+  	      if (assoc_p (var))
+! 		bind_assoc_variable (var, name, "0", value, aflags);
+  	      else
+  		bind_array_variable (name, 0, value, aflags);
+--- 519,523 ----
+  	      /* let bind_{array,assoc}_variable take care of this. */
+  	      if (assoc_p (var))
+! 		bind_assoc_variable (var, name, savestring ("0"), value, aflags);
+  	      else
+  		bind_array_variable (name, 0, value, aflags);
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 7
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash-4.1-009.patch

@@ -0,0 +1,48 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.1
+Patch-ID:	bash41-009
+
+Bug-Reported-by:	Tomas Trnka <tomastrnka@gmx.com>
+Bug-Reference-ID:	<201003242030.02166.tomastrnka@gmx.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00090.html
+
+Bug-Description:
+
+An arriving SIGCHLD will interrupt `slow' system calls such as write(2) to
+or read(2) from a terminal.  This results in an error message and truncated
+input or output.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/sig.c	Fri Aug 14 16:31:52 2009
+--- ./sig.c	Fri Mar 26 22:34:11 2010
+***************
+*** 655,660 ****
+--- 655,663 ----
+      act.sa_flags |= SA_INTERRUPT;	/* XXX */
+    else
+      act.sa_flags |= SA_RESTART;		/* XXX */
++ #else
++   if (sig == SIGCHLD)
++     act.sa_flags |= SA_RESTART;
+  #endif
+    sigemptyset (&act.sa_mask);
+    sigemptyset (&oact.sa_mask);
+*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400
+--- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 8
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 9
+  
+  #endif /* _PATCHLEVEL_H_ */
+

package/bash/bash-4.1-mkbuiltins-cross.patch

@@ -0,0 +1,31 @@
+Let mkbuiltins use config.h even if cross compiling
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ builtins/mkbuiltins.c |    9 ---------
+ 1 files changed, 0 insertions(+), 9 deletions(-)
+
+diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c
+index cdd45e4..1349093 100644
+--- a/builtins/mkbuiltins.c
++++ b/builtins/mkbuiltins.c
+@@ -19,16 +19,7 @@
+    along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+-#if !defined (CROSS_COMPILING) 
+ #  include <config.h>
+-#else	/* CROSS_COMPILING */
+-/* A conservative set of defines based on POSIX/SUS3/XPG6 */
+-#  define HAVE_UNISTD_H
+-#  define HAVE_STRING_H
+-#  define HAVE_STDLIB_H
+-
+-#  define HAVE_RENAME
+-#endif /* CROSS_COMPILING */
+ 
+ #if defined (HAVE_UNISTD_H)
+ #  ifdef _MINIX
+-- 
+1.7.2.2
+

package/bind/bind.mk

@@ -4,10 +4,8 @@
 #
 #############################################################
 
-BIND_VERSION = 9.5.2-P2
+BIND_VERSION = 9.5.2-P4
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
-BIND_LIBTOOL_PATCH = NO
-BIND_INSTALL_STAGING = NO
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone
 BIND_TARGET_SBINS += named-compilezone rndc rndc-confgen
 BIND_TARGET_SBINS += dnssec-keygen dnssec-signzone

package/busybox/Config.in

@@ -45,7 +45,7 @@ config BR2_BUSYBOX_VERSION
 	default "1.14.4"	if BR2_BUSYBOX_VERSION_1_14_X
 	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X
 	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X
-	default "1.17.3"	if BR2_BUSYBOX_VERSION_1_17_X
+	default "1.17.4"	if BR2_BUSYBOX_VERSION_1_17_X
 
 config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 	bool "Run BusyBox's own full installation"

package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch

@@ -1,12 +0,0 @@
-diff -urpN busybox-1.17.3/networking/dnsd.c busybox-1.17.3-dnsd/networking/dnsd.c
---- busybox-1.17.3/networking/dnsd.c	2010-10-09 21:57:14.000000000 +0200
-+++ busybox-1.17.3-dnsd/networking/dnsd.c	2010-10-29 00:37:43.066043841 +0200
-@@ -388,7 +388,7 @@ static int process_packet(struct dns_ent
- 	query_len = strlen(query_string) + 1;
- 	/* may be unaligned! */
- 	unaligned_type_class = (void *)(query_string + query_len);
--	query_len += sizeof(unaligned_type_class);
-+	query_len += sizeof(*unaligned_type_class);
- 	/* where to append answer block */
- 	answb = (void *)(unaligned_type_class + 1);
- 

package/busybox/busybox-1.17.3/busybox-1.17.3-iproute.patch

@@ -1,13 +0,0 @@
-diff -urpN busybox-1.17.3/networking/libiproute/iproute.c busybox-1.17.3-iproute/networking/libiproute/iproute.c
---- busybox-1.17.3/networking/libiproute/iproute.c	2010-10-09 21:57:14.000000000 +0200
-+++ busybox-1.17.3-iproute/networking/libiproute/iproute.c	2010-11-04 09:13:06.307919550 +0100
-@@ -791,8 +791,8 @@ static int iproute_get(char **argv)
- 				}
- 				req.r.rtm_dst_len = addr.bitlen;
- 			}
--			argv++;
- 		}
-+		argv++;
- 	}
- 
- 	if (req.r.rtm_dst_len == 0) {

package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch

@@ -1,12 +0,0 @@
-diff -urpN busybox-1.17.3/coreutils/sort.c busybox-1.17.3-sort/coreutils/sort.c
---- busybox-1.17.3/coreutils/sort.c	2010-10-09 21:57:13.000000000 +0200
-+++ busybox-1.17.3-sort/coreutils/sort.c	2010-10-20 15:17:35.320293543 +0200
-@@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, cha
- #if ENABLE_FEATURE_SORT_BIG
- 	/* Open output file _after_ we read all input ones */
- 	if (option_mask32 & FLAG_o)
--		xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO);
-+		xmove_fd(xopen3(str_o, O_WRONLY|O_CREAT|O_TRUNC, 0666), STDOUT_FILENO);
- #endif
- 	flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
- 	for (i = 0; i < linecount; i++)

package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch

@@ -1,12 +0,0 @@
-diff -urpN busybox-1.17.3/libbb/unicode.c busybox-1.17.3-unicode/libbb/unicode.c
---- busybox-1.17.3/libbb/unicode.c	2010-10-09 21:58:13.000000000 +0200
-+++ busybox-1.17.3-unicode/libbb/unicode.c	2010-10-29 00:48:36.951494079 +0200
-@@ -1006,7 +1006,7 @@ static char* FAST_FUNC unicode_conv_to_p
- 			}
- 		}
- 		if (stats)
--			stats->byte_count = stats->unicode_count = (d - dst);
-+			stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst);
- 		return dst;
- 	}
- 

package/dialog/Config.in

@@ -1,10 +1,10 @@
 config BR2_PACKAGE_DIALOG
-    bool "dialog"
-    select BR2_PACKAGE_NCURSES
-    help
-	dialog - display dialog boxes from shell scripts
-
-	This application provides a method of displaying several different
-	types of dialog boxes from shell scripts.  This allows a developer
-	of a script to interact with the user in a much friendlier manner.
+	bool "dialog"
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	help
+	  dialog - display dialog boxes from shell scripts
 
+	  This application provides a method of displaying several different
+	  types of dialog boxes from shell scripts.  This allows a developer
+	  of a script to interact with the user in a much friendlier manner.

package/dialog/dialog.mk

@@ -7,8 +7,13 @@ DIALOG_VERSION:=1.1-20100428
 DIALOG_SOURCE:=dialog-$(DIALOG_VERSION).tgz
 DIALOG_SITE:=ftp://invisible-island.net/dialog
 DIALOG_CONF_OPT = --with-ncurses
+DIALOG_CONF_ENV = ac_cv_path_NCURSES_CONFIG=true LIBS=-lncurses
 DIALOG_DEPENDENCIES = ncurses
 
+ifneq ($(BR2_ENABLE_LOCALE),y)
+DIALOG_DEPENDENCIES+=libiconv
+endif
+
 define DIALOG_INSTALL_TARGET_CMDS
 	install -c $(@D)/dialog $(TARGET_DIR)/usr/bin/dialog
 endef

package/gpsd/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_GPSD
 	bool "gpsd"
 	help
-	 gpsd is a service daemon that monitors one or more GPSes or AIS
+	  gpsd is a service daemon that monitors one or more GPSes or AIS
 	  receivers attached to a host computer through serial or USB ports,
 	  making all data on the location/course/velocity of the sensors
 	  available to be queried on TCP port 2947 of the host computer.
@@ -18,26 +18,21 @@ menu "Features"
 
 config BR2_PACKAGE_GPSD_TIMING
 	bool "latency timing support"
-	default y
 
 config BR2_PACKAGE_GPSD_CLIENT_DEBUG
 	bool "client debugging support"
-	default y
 
 config BR2_PACKAGE_GPSD_OLDSTYLE
 	bool "oldstyle (pre-JSON) protocol support"
-	default y
 
 config BR2_PACKAGE_GPSD_PROFILING
 	bool "profiling support"
 
 config BR2_PACKAGE_GPSD_NTP_SHM
 	bool "NTP time hinting support"
-	default y
 
 config BR2_PACKAGE_GPSD_PPS
 	bool "PPS time syncing support"
-	default y
 
 config BR2_PACKAGE_GPSD_PPS_ON_CTS
 	bool "PPS pulse on CTS rather than DCD"
@@ -99,61 +94,51 @@ menu "Protocols"
 
 config BR2_PACKAGE_GPSD_ASHTECH
 	bool "Ashtech"
-	default y
 	help
 	  Ashtech support
 
 config BR2_PACKAGE_GPSD_AIVDM
 	bool "Aivdm"
-	default y
 	help
 	  Aivdm support
 
 config BR2_PACKAGE_GPSD_EARTHMATE
 	bool "Earthmate"
-	default y
 	help
 	  DeLorme EarthMate Zodiac support
 
 config BR2_PACKAGE_GPSD_EVERMORE
 	bool "EverMore"
-	default y
 	help
 	  EverMore binary support
 
 config BR2_PACKAGE_GPSD_FV18
 	bool "FV-18"
-	default y
 	help
 	  San Jose Navigation FV-18 support
 
 config BR2_PACKAGE_GPSD_GARMIN
 	bool "Garmin (kernel)"
-	default y
 	help
 	  Garmin kernel driver support
 
 config BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT
 	bool "Garmin (simple text)"
-	default n
 	help
 	  Garmin Simple Text support
 
 config BR2_PACKAGE_GPSD_GPSCLOCK
 	bool "GPSClock"
-	default y
 	help
 	  GPSClock support
 
 config BR2_PACKAGE_GPSD_ITRAX
 	bool "iTrax"
-	default y
 	help
 	  iTrax support
 
-config BR2_PACKAGE_MTK3301
+config BR2_PACKAGE_GPSD_MTK3301
 	bool "MTK-3301"
-	default y
 	help
 	  Mediatek MTK-3301 support
 
@@ -165,73 +150,61 @@ config BR2_PACKAGE_GPSD_NMEA
 
 config BR2_PACKAGE_GPSD_NTRIP
 	bool "NTRIP"
-	default y
 	help
 	  NTRIP support
 
 config BR2_PACKAGE_GPSD_NAVCOM
 	bool "Navcom"
-	default y
 	help
 	  Navcom binary support
 
 config BR2_PACKAGE_GPSD_OCEANSERVER
 	bool "OceanServer"
-	default y
 	help
 	  OceanServer Digital Compass support
 
 config BR2_PACKAGE_GPSD_ONCORE
 	bool "OnCore"
-	default y
 	help
 	  OnCore support
 
 config BR2_PACKAGE_GPSD_RTCM104V2
 	bool "RTCM104 v2"
-	default y
 	help
 	  RTCM104 v2 support
 
 config BR2_PACKAGE_GPSD_RTCM104V3
 	bool "RTCM104 v3"
-	default y
 	help
 	  RTCM104 v3 support
 
 config BR2_PACKAGE_GPSD_SIRF
 	bool "SiRF"
-	default y
 	help
 	  SiRF binary support
 
 config BR2_PACKAGE_GPSD_SUPERSTAR2
 	bool "SuperStarII"
-	default y
 	help
 	  Novatel SuperStarII binary support
 
 config BR2_PACKAGE_GPSD_TRIMBLE_TSIP
 	bool "Trimble TSIP"
-	default y
 	help
 	  Trimble TSIP support
 
 config BR2_PACKAGE_GPSD_TRIPMATE
 	bool "TripMate"
-	default y
 	help
 	  Delorme TripMate support
 
 config BR2_PACKAGE_GPSD_TRUE_NORTH
 	bool "True North Technologies"
-	default n
 	help
 	  True North Technologies support
 
 config BR2_PACKAGE_GPSD_UBX
 	bool "UBX"
-	default y
 	help
 	  uBlox UBX binary support
 

package/gpsd/gpsd.mk

@@ -9,7 +9,6 @@ GPSD_SITE = http://download.berlios.de/gpsd
 GPSD_INSTALL_STAGING = YES
 GPSD_CONF_OPT = --disable-static
 GPSD_LIBTOOL_PATCH = NO
-GPSD_USE_CONFIG_CACHE = NO
 GPSD_TARGET_BINS = cgps gpsctl gpsdecode gpsmon gpspipe gpxlogger lcdgps
 
 # Build libgpsmm if we've got C++
@@ -19,6 +18,15 @@ else
 	GPSD_CONF_OPT += --disable-libgpsmm
 endif
 
+# Enable or disable Qt binding
+ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
+	GPSD_CONF_ENV += QMAKE="$(QT_QMAKE)"
+	GPSD_CONF_OPT += --enable-libQgpsmm
+	GPSD_DEPENDENCIES += qt host-pkg-config
+else
+	GPSD_CONF_OPT += --disable-libQgpsmm
+endif
+
 # If libusb is available build it before so the package can use it
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 	GPSD_DEPENDENCIES += libusb

package/libcurl/libcurl.mk

@@ -3,12 +3,11 @@
 # libcurl
 #
 #############################################################
-LIBCURL_VERSION = 7.21.0
+LIBCURL_VERSION = 7.21.2
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download/
 LIBCURL_INSTALL_STAGING = YES
 LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols
-LIBCURL_LIBTOOL_PATCH = NO
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBCURL_DEPENDENCIES += openssl

package/libgcrypt/libgcrypt.mk

@@ -3,11 +3,11 @@
 # libgcrypt
 #
 #############################################################
-LIBGCRYPT_VERSION:=1.4.5
-LIBGCRYPT_SOURCE:=libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
-LIBGCRYPT_SITE:=ftp://ftp.gnupg.org/gcrypt/libgcrypt
+
+LIBGCRYPT_VERSION = 1.4.6
+LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
+LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt
 LIBGCRYPT_INSTALL_STAGING = YES
-LIBGCRYPT_INSTALL_TARGET = YES
 
 LIBGCRYPT_CONF_ENV = \
 	ac_cv_sys_symbol_underscore=no

package/lrzsz/lrzsz.mk

@@ -33,16 +33,17 @@ endef
 
 define LRZSZ_BUILD_HOOKS
 	$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(@D)
-	$(STRIPCMD) $(@D)/src/lrz $(@D)/src/lsz
 endef
 
 define LRZSZ_INSTALL_TARGET_CMDS
 	cp $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz
 	cp $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz
+	ln -s rz $(TARGET_DIR)/usr/bin/lrz
+	ln -s sz $(TARGET_DIR)/usr/bin/lsz
 endef
 
 define LRZSZ_CLEAN_CMDS
-	rm -f $(TARGET_DIR)/usr/bin/rz
+	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,rz sz lrz lsz)
 	-$(MAKE) -C $(@D) clean
 endef
 

package/makedevs/makedevs.mk

@@ -18,6 +18,7 @@ $(TARGET_DIR)/usr/bin/makedevs: $(MAKEDEVS_DIR)/makedevs
 	$(INSTALL) -m 755 $^ $@
 
 makedevs: $(TARGET_DIR)/usr/bin/makedevs
+makedevs-source:
 
 HOST_MAKEDEVS_DIR=$(BUILD_DIR)/host-makedevs
 
@@ -32,4 +33,5 @@ $(HOST_MAKEDEVS_DIR)/makedevs: $(HOST_MAKEDEVS_DIR)/makedevs.c
 $(HOST_DIR)/usr/bin/makedevs: $(HOST_MAKEDEVS_DIR)/makedevs
 	$(INSTALL) -m 755 $^ $@
 
-host-makedevs: $(HOST_DIR)/usr/bin/makedevs
+host-makedevs: $(HOST_DIR)/usr/bin/makedevs
+host-makedevs-source:

package/midori/midori.mk

@@ -4,19 +4,26 @@
 #
 #############################################################
 
-MIDORI_VERSION = 0.2.6
+MIDORI_VERSION = 0.2.9
 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
 MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.2/
-MIDORI_INSTALL_STAGING = NO
 MIDORI_INSTALL_TARGET = YES
 
 MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2
 
+ifneq ($(BR2_PACKAGE_XORG7),y)
+define MIDORI_WITHOUT_X11
+	$(SED) "s/check_pkg ('x11')/#check_pkg ('x11')/" $(@D)/wscript
+endef
+endif
+
 define MIDORI_CONFIGURE_CMDS
-       (cd $(@D); \
-               $(TARGET_CONFIGURE_OPTS)        \
-               ./waf configure                 \
-               --prefix=/usr                   \
+	$(MIDORI_WITHOUT_X11)
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS)	\
+		./waf configure			\
+		--prefix=/usr			\
+		--disable-vala			\
        )
 endef
 

package/module-init-tools/module-init-tools.mk

@@ -3,7 +3,7 @@
 # module-init-tools
 #
 #############################################################
-MODULE_INIT_TOOLS_VERSION=3.11
+MODULE_INIT_TOOLS_VERSION=3.12
 MODULE_INIT_TOOLS_SOURCE=module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2
 MODULE_INIT_TOOLS_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/
 MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''

package/mtd/mtd.mk

@@ -68,14 +68,12 @@ MTD_MAKE_COMMON_FLAGS = \
 	$(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \
 	WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1
 
-ifneq ($(MTD_TARGETS_y),)
 define MTD_TARGETS_BUILD
 	$(MAKE1) $(MTD_MAKE_COMMON_FLAGS) \
 		BUILDDIR=$(@D) \
 		-C $(@D) \
-		$(addprefix $(@D)/, $(MTD_TARGETS_y))
+		$(addprefix $(@D)/, lib/libmtd.a $(MTD_TARGETS_y))
 endef
-endif
 
 ifneq ($(MTD_TARGETS_UBI_y),)
 define MTD_TARGETS_UBI_BUILD

package/multimedia/libmad/libmad-0.15.1b-mips-h-constraint-removal.patch

@@ -0,0 +1,72 @@
+http://patchwork.openembedded.org/patch/921/
+
+diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h
+--- libmad-0.15.1b-orig/fixed.h	2004-02-17 12:32:03.000000000 +1030
++++ libmad-0.15.1b/fixed.h	2009-08-05 10:46:30.000000000 +0930
+@@ -299,6 +299,23 @@
+ 
+ # elif defined(FPM_MIPS)
+ 
++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
++#if defined (__GNUC__) && defined (__GNUC_MINOR__)
++#define __GNUC_PREREQ(maj, min) \
++	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
++#else
++#define __GNUC_PREREQ(maj, min)  0
++#endif
++
++#if __GNUC_PREREQ(4,4)
++  typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
++# define MAD_F_MLX(hi, lo, x, y) \
++   do { \
++      u64_di_t __ll = (u64_di_t) (x) * (y); \
++      hi = __ll >> 32; \
++      lo = __ll; \
++   } while (0) 
++#else
+ /*
+  * This MIPS version is fast and accurate; the disposition of the least
+  * significant bit depends on OPT_ACCURACY via mad_f_scale64().
+@@ -328,6 +345,7 @@
+ 	 : "%r" ((x) >> 12), "r" ((y) >> 16))
+ #  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
+ # endif
++#endif /* __GNU_PREREQ(4,4) */
+ 
+ # if defined(OPT_SPEED)
+ #  define mad_f_scale64(hi, lo)  \
+diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h
+--- libmad-0.15.1b-orig/mad.h	2004-02-17 13:25:44.000000000 +1030
++++ libmad-0.15.1b/mad.h	2009-08-05 10:42:40.000000000 +0930
+@@ -344,6 +344,23 @@
+ 
+ # elif defined(FPM_MIPS)
+ 
++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
++#if defined (__GNUC__) && defined (__GNUC_MINOR__)
++#define __GNUC_PREREQ(maj, min) \
++	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
++#else
++#define __GNUC_PREREQ(maj, min)  0
++#endif
++
++#if __GNUC_PREREQ(4,4)
++  typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
++# define MAD_F_MLX(hi, lo, x, y) \
++   do { \
++      u64_di_t __ll = (u64_di_t) (x) * (y); \
++      hi = __ll >> 32; \
++      lo = __ll; \
++   } while (0) 
++#else
+ /*
+  * This MIPS version is fast and accurate; the disposition of the least
+  * significant bit depends on OPT_ACCURACY via mad_f_scale64().
+@@ -373,6 +390,7 @@
+ 	 : "%r" ((x) >> 12), "r" ((y) >> 16))
+ #  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
+ # endif
++#endif /* __GNU_PREREQ(4,4) */
+ 
+ # if defined(OPT_SPEED)
+ #  define mad_f_scale64(hi, lo)  \

package/openssh/openssh-drop-SUSv3-legacy.patch

@@ -0,0 +1,441 @@
+Drop SUSv3 legacy fuctions
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ auth2-jpake.c             |   24 ++++++++++++------------
+ channels.c                |    6 +++---
+ clientloop.c              |    4 ++--
+ jpake.c                   |    6 +++---
+ monitor.c                 |   18 +++++++++---------
+ openbsd-compat/port-tun.c |    4 ++--
+ schnorr.c                 |    6 +++---
+ session.c                 |    2 +-
+ sftp-client.c             |    2 +-
+ ssh-keygen.c              |    2 +-
+ ssh.c                     |    8 ++++----
+ sshconnect2.c             |   22 +++++++++++-----------
+ 12 files changed, 52 insertions(+), 52 deletions(-)
+
+diff --git a/auth2-jpake.c b/auth2-jpake.c
+index 5de5506..b34d696 100644
+--- a/auth2-jpake.c
++++ b/auth2-jpake.c
+@@ -173,7 +173,7 @@ derive_rawsalt(const char *username, u_char *rawsalt, u_int len)
+ 		fatal("%s: not enough bytes for rawsalt (want %u have %u)",
+ 		    __func__, len, digest_len);
+ 	memcpy(rawsalt, digest, len);
+-	bzero(digest, digest_len);
++	memset(digest, 0, digest_len);
+ 	xfree(digest);
+ }
+ 
+@@ -198,10 +198,10 @@ makesalt(u_int want, const char *user)
+ 		fatal("%s: want %u", __func__, want);
+ 
+ 	derive_rawsalt(user, rawsalt, sizeof(rawsalt));
+-	bzero(ret, sizeof(ret));
++	memset(ret, 0, sizeof(ret));
+ 	for (i = 0; i < want; i++)
+ 		ret[i] = pw_encode64(rawsalt[i]);
+-	bzero(rawsalt, sizeof(rawsalt));
++	memset(rawsalt, 0, sizeof(rawsalt));
+ 
+ 	return ret;
+ }
+@@ -355,7 +355,7 @@ auth2_jpake_get_pwdata(Authctxt *authctxt, BIGNUM **s,
+ 	debug3("%s: scheme = %s", __func__, *hash_scheme);
+ 	JPAKE_DEBUG_BN((*s, "%s: s = ", __func__));
+ #endif
+-	bzero(secret, secret_len);
++	memset(secret, 0, secret_len);
+ 	xfree(secret);
+ }
+ 
+@@ -396,12 +396,12 @@ auth2_jpake_start(Authctxt *authctxt)
+ 	packet_send();
+ 	packet_write_wait();
+ 
+-	bzero(hash_scheme, strlen(hash_scheme));
+-	bzero(salt, strlen(salt));
++	memset(hash_scheme, 0, strlen(hash_scheme));
++	memset(salt, 0, strlen(salt));
+ 	xfree(hash_scheme);
+ 	xfree(salt);
+-	bzero(x3_proof, x3_proof_len);
+-	bzero(x4_proof, x4_proof_len);
++	memset(x3_proof, 0, x3_proof_len);
++	memset(x4_proof, 0, x4_proof_len);
+ 	xfree(x3_proof);
+ 	xfree(x4_proof);
+ 
+@@ -448,8 +448,8 @@ input_userauth_jpake_client_step1(int type, u_int32_t seq, void *ctxt)
+ 	    &pctx->b,
+ 	    &x4_s_proof, &x4_s_proof_len));
+ 
+-	bzero(x1_proof, x1_proof_len);
+-	bzero(x2_proof, x2_proof_len);
++	memset(x1_proof, 0, x1_proof_len);
++	memset(x2_proof, 0, x2_proof_len);
+ 	xfree(x1_proof);
+ 	xfree(x2_proof);
+ 
+@@ -463,7 +463,7 @@ input_userauth_jpake_client_step1(int type, u_int32_t seq, void *ctxt)
+ 	packet_send();
+ 	packet_write_wait();
+ 
+-	bzero(x4_s_proof, x4_s_proof_len);
++	memset(x4_s_proof, 0, x4_s_proof_len);
+ 	xfree(x4_s_proof);
+ 
+ 	/* Expect step 2 packet from peer */
+@@ -504,7 +504,7 @@ input_userauth_jpake_client_step2(int type, u_int32_t seq, void *ctxt)
+ 	    &pctx->k,
+ 	    &pctx->h_k_sid_sessid, &pctx->h_k_sid_sessid_len));
+ 
+-	bzero(x2_s_proof, x2_s_proof_len);
++	memset(x2_s_proof, 0, x2_s_proof_len);
+ 	xfree(x2_s_proof);
+ 
+ 	if (!use_privsep)
+diff --git a/channels.c b/channels.c
+index 1cd5004..89dcfc6 100644
+--- a/channels.c
++++ b/channels.c
+@@ -418,7 +418,7 @@ channel_free(Channel *c)
+ 		if (cc->abandon_cb != NULL)
+ 			cc->abandon_cb(c, cc->ctx);
+ 		TAILQ_REMOVE(&c->status_confirms, cc, entry);
+-		bzero(cc, sizeof(*cc));
++		memset(cc, 0, sizeof(*cc));
+ 		xfree(cc);
+ 	}
+ 	if (c->filter_cleanup != NULL && c->filter_ctx != NULL)
+@@ -2625,7 +2625,7 @@ channel_input_status_confirm(int type, u_int32_t seq, void *ctxt)
+ 		return;
+ 	cc->cb(type, c, cc->ctx);
+ 	TAILQ_REMOVE(&c->status_confirms, cc, entry);
+-	bzero(cc, sizeof(*cc));
++	memset(cc, 0, sizeof(*cc));
+ 	xfree(cc);
+ }
+ 
+@@ -3128,7 +3128,7 @@ channel_connect_ctx_free(struct channel_connect *cctx)
+ 	xfree(cctx->host);
+ 	if (cctx->aitop)
+ 		freeaddrinfo(cctx->aitop);
+-	bzero(cctx, sizeof(*cctx));
++	memset(cctx, 0, sizeof(*cctx));
+ 	cctx->host = NULL;
+ 	cctx->ai = cctx->aitop = NULL;
+ }
+diff --git a/clientloop.c b/clientloop.c
+index de79793..2d08690 100644
+--- a/clientloop.c
++++ b/clientloop.c
+@@ -533,7 +533,7 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
+ 		gc->cb(type, seq, gc->ctx);
+ 	if (--gc->ref_count <= 0) {
+ 		TAILQ_REMOVE(&global_confirms, gc, entry);
+-		bzero(gc, sizeof(*gc));
++		memset(gc, 0, sizeof(*gc));
+ 		xfree(gc);
+ 	}
+ 
+@@ -823,7 +823,7 @@ process_cmdline(void)
+ 	int cancel_port;
+ 	Forward fwd;
+ 
+-	bzero(&fwd, sizeof(fwd));
++	memset(&fwd, 0, sizeof(fwd));
+ 	fwd.listen_host = fwd.connect_host = NULL;
+ 
+ 	leave_raw_mode(force_tty_flag);
+diff --git a/jpake.c b/jpake.c
+index cdf65f5..73ba954 100644
+--- a/jpake.c
++++ b/jpake.c
+@@ -104,7 +104,7 @@ jpake_free(struct jpake_ctx *pctx)
+ #define JPAKE_BUF_CLEAR_FREE(v, l)		\
+ 	do {					\
+ 		if ((v) != NULL) {		\
+-			bzero((v), (l));	\
++			memset((v), 0, (l));	\
+ 			xfree(v);		\
+ 			(v) = NULL;		\
+ 			(l) = 0;		\
+@@ -132,7 +132,7 @@ jpake_free(struct jpake_ctx *pctx)
+ #undef JPAKE_BN_CLEAR_FREE
+ #undef JPAKE_BUF_CLEAR_FREE
+ 
+-	bzero(pctx, sizeof(pctx));
++	memset(pctx, 0, sizeof(pctx));
+ 	xfree(pctx);
+ }
+ 
+@@ -437,7 +437,7 @@ jpake_check_confirm(const BIGNUM *k,
+ 	else if (timingsafe_bcmp(peer_confirm_hash, expected_confirm_hash,
+ 	    expected_confirm_hash_len) == 0)
+ 		success = 1;
+-	bzero(expected_confirm_hash, expected_confirm_hash_len);
++	memset(expected_confirm_hash, 0, expected_confirm_hash_len);
+ 	xfree(expected_confirm_hash);
+ 	debug3("%s: success = %d", __func__, success);
+ 	return success;
+diff --git a/monitor.c b/monitor.c
+index 9eb4e35..0e85b7a 100644
+--- a/monitor.c
++++ b/monitor.c
+@@ -2028,8 +2028,8 @@ mm_answer_jpake_step1(int sock, Buffer *m)
+ 	debug3("%s: sending step1", __func__);
+ 	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP1, m);
+ 
+-	bzero(x3_proof, x3_proof_len);
+-	bzero(x4_proof, x4_proof_len);
++	memset(x3_proof, 0, x3_proof_len);
++	memset(x4_proof, 0, x4_proof_len);
+ 	xfree(x3_proof);
+ 	xfree(x4_proof);
+ 
+@@ -2058,8 +2058,8 @@ mm_answer_jpake_get_pwdata(int sock, Buffer *m)
+ 	debug3("%s: sending pwdata", __func__);
+ 	mm_request_send(sock, MONITOR_ANS_JPAKE_GET_PWDATA, m);
+ 
+-	bzero(hash_scheme, strlen(hash_scheme));
+-	bzero(salt, strlen(salt));
++	memset(hash_scheme, 0, strlen(hash_scheme));
++	memset(salt, 0, strlen(salt));
+ 	xfree(hash_scheme);
+ 	xfree(salt);
+ 
+@@ -2098,8 +2098,8 @@ mm_answer_jpake_step2(int sock, Buffer *m)
+ 
+ 	JPAKE_DEBUG_CTX((pctx, "step2 done in %s", __func__));
+ 
+-	bzero(x1_proof, x1_proof_len);
+-	bzero(x2_proof, x2_proof_len);
++	memset(x1_proof, 0, x1_proof_len);
++	memset(x2_proof, 0, x2_proof_len);
+ 	xfree(x1_proof);
+ 	xfree(x2_proof);
+ 
+@@ -2111,7 +2111,7 @@ mm_answer_jpake_step2(int sock, Buffer *m)
+ 	debug3("%s: sending step2", __func__);
+ 	mm_request_send(sock, MONITOR_ANS_JPAKE_STEP2, m);
+ 
+-	bzero(x4_s_proof, x4_s_proof_len);
++	memset(x4_s_proof, 0, x4_s_proof_len);
+ 	xfree(x4_s_proof);
+ 
+ 	monitor_permit(mon_dispatch, MONITOR_REQ_JPAKE_KEY_CONFIRM, 1);
+@@ -2145,7 +2145,7 @@ mm_answer_jpake_key_confirm(int sock, Buffer *m)
+ 
+ 	JPAKE_DEBUG_CTX((pctx, "key_confirm done in %s", __func__));
+ 
+-	bzero(x2_s_proof, x2_s_proof_len);
++	memset(x2_s_proof, 0, x2_s_proof_len);
+ 	buffer_clear(m);
+ 
+ 	/* pctx->k is sensitive, not sent */
+@@ -2179,7 +2179,7 @@ mm_answer_jpake_check_confirm(int sock, Buffer *m)
+ 
+ 	JPAKE_DEBUG_CTX((pctx, "check_confirm done in %s", __func__));
+ 
+-	bzero(peer_confirm_hash, peer_confirm_hash_len);
++	memset(peer_confirm_hash, 0, peer_confirm_hash_len);
+ 	xfree(peer_confirm_hash);
+ 
+ 	buffer_clear(m);
+diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c
+index 0d756f7..98332ae 100644
+--- a/openbsd-compat/port-tun.c
++++ b/openbsd-compat/port-tun.c
+@@ -67,7 +67,7 @@ sys_tun_open(int tun, int mode)
+ 		return (-1);
+ 	}
+ 
+-	bzero(&ifr, sizeof(ifr));	
++	memset(&ifr, 0, sizeof(ifr));	
+ 
+ 	if (mode == SSH_TUNMODE_ETHERNET) {
+ 		ifr.ifr_flags = IFF_TAP;
+@@ -215,7 +215,7 @@ sys_tun_infilter(struct Channel *c, char *buf, int len)
+ 	if (len <= 0 || len > (int)(sizeof(rbuf) - sizeof(*af)))
+ 		return (-1);
+ 	ptr = (char *)&rbuf[0];
+-	bcopy(buf, ptr + sizeof(u_int32_t), len);
++	memmove(ptr + sizeof(u_int32_t), buf, len);
+ 	len += sizeof(u_int32_t);
+ 	af = (u_int32_t *)ptr;
+ 
+diff --git a/schnorr.c b/schnorr.c
+index c17ff32..ec4e41b 100644
+--- a/schnorr.c
++++ b/schnorr.c
+@@ -101,7 +101,7 @@ schnorr_hash(const BIGNUM *p, const BIGNUM *q, const BIGNUM *g,
+ 	SCHNORR_DEBUG_BN((h, "%s: h = ", __func__));
+  out:
+ 	buffer_free(&b);
+-	bzero(digest, digest_len);
++	memset(digest, 0, digest_len);
+ 	xfree(digest);
+ 	digest_len = 0;
+ 	if (success == 0)
+@@ -451,7 +451,7 @@ hash_buffer(const u_char *buf, u_int len, const EVP_MD *md,
+ 	success = 0;
+  out:
+ 	EVP_MD_CTX_cleanup(&evp_md_ctx);
+-	bzero(digest, sizeof(digest));
++	memset(digest, 0, sizeof(digest));
+ 	digest_len = 0;
+ 	return success;
+ }
+@@ -544,7 +544,7 @@ modp_group_free(struct modp_group *grp)
+ 		BN_clear_free(grp->p);
+ 	if (grp->q != NULL)
+ 		BN_clear_free(grp->q);
+-	bzero(grp, sizeof(*grp));
++	memset(grp, 0, sizeof(*grp));
+ 	xfree(grp);
+ }
+ 
+diff --git a/session.c b/session.c
+index 71e4fbe..70c51f2 100644
+--- a/session.c
++++ b/session.c
+@@ -1895,7 +1895,7 @@ session_unused(int id)
+ 		fatal("%s: insane session id %d (max %d nalloc %d)",
+ 		    __func__, id, options.max_sessions, sessions_nalloc);
+ 	}
+-	bzero(&sessions[id], sizeof(*sessions));
++	memset(&sessions[id], 0, sizeof(*sessions));
+ 	sessions[id].self = id;
+ 	sessions[id].used = 0;
+ 	sessions[id].chanid = -1;
+diff --git a/sftp-client.c b/sftp-client.c
+index 9dab477..0815b41 100644
+--- a/sftp-client.c
++++ b/sftp-client.c
+@@ -289,7 +289,7 @@ get_decode_statvfs(int fd, struct sftp_statvfs *st, u_int expected_id,
+ 		    SSH2_FXP_EXTENDED_REPLY, type);
+ 	}
+ 
+-	bzero(st, sizeof(*st));
++	memset(st, 0, sizeof(*st));
+ 	st->f_bsize = buffer_get_int64(&msg);
+ 	st->f_frsize = buffer_get_int64(&msg);
+ 	st->f_blocks = buffer_get_int64(&msg);
+diff --git a/ssh-keygen.c b/ssh-keygen.c
+index d90b1df..d78837a 100644
+--- a/ssh-keygen.c
++++ b/ssh-keygen.c
+@@ -1503,7 +1503,7 @@ parse_absolute_time(const char *s)
+ 		fatal("Invalid certificate time format %s", s);
+ 	}
+ 
+-	bzero(&tm, sizeof(tm));
++	memset(&tm, 0, sizeof(tm));
+ 	if (strptime(buf, fmt, &tm) == NULL)
+ 		fatal("Invalid certificate time %s", s);
+ 	if ((tt = mktime(&tm)) < 0)
+diff --git a/ssh.c b/ssh.c
+index 4419f76..52a8b5e 100644
+--- a/ssh.c
++++ b/ssh.c
+@@ -1436,8 +1436,8 @@ load_public_identity_files(void)
+ #endif /* PKCS11 */
+ 
+ 	n_ids = 0;
+-	bzero(identity_files, sizeof(identity_files));
+-	bzero(identity_keys, sizeof(identity_keys));
++	memset(identity_files, 0, sizeof(identity_files));
++	memset(identity_keys, 0, sizeof(identity_keys));
+ 
+ #ifdef ENABLE_PKCS11
+ 	if (options.pkcs11_provider != NULL &&
+@@ -1511,8 +1511,8 @@ load_public_identity_files(void)
+ 	memcpy(options.identity_files, identity_files, sizeof(identity_files));
+ 	memcpy(options.identity_keys, identity_keys, sizeof(identity_keys));
+ 
+-	bzero(pwname, strlen(pwname));
++	memset(pwname, 0, strlen(pwname));
+ 	xfree(pwname);
+-	bzero(pwdir, strlen(pwdir));
++	memset(pwdir, 0, strlen(pwdir));
+ 	xfree(pwdir);
+ }
+diff --git a/sshconnect2.c b/sshconnect2.c
+index 4c379ae..b5502c2 100644
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -948,14 +948,14 @@ jpake_password_to_secret(Authctxt *authctxt, const char *crypt_scheme,
+ 	    &secret, &secret_len) != 0)
+ 		fatal("%s: hash_buffer", __func__);
+ 
+-	bzero(password, strlen(password));
+-	bzero(crypted, strlen(crypted));
++	memset(password, 0, strlen(password));
++	memset(crypted, 0, strlen(crypted));
+ 	xfree(password);
+ 	xfree(crypted);
+ 
+ 	if ((ret = BN_bin2bn(secret, secret_len, NULL)) == NULL)
+ 		fatal("%s: BN_bin2bn (secret)", __func__);
+-	bzero(secret, secret_len);
++	memset(secret, 0, secret_len);
+ 	xfree(secret);
+ 
+ 	return ret;
+@@ -992,8 +992,8 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
+ 
+ 	/* Obtain password and derive secret */
+ 	pctx->s = jpake_password_to_secret(authctxt, crypt_scheme, salt);
+-	bzero(crypt_scheme, strlen(crypt_scheme));
+-	bzero(salt, strlen(salt));
++	memset(crypt_scheme, 0, strlen(crypt_scheme));
++	memset(salt, 0, strlen(salt));
+ 	xfree(crypt_scheme);
+ 	xfree(salt);
+ 	JPAKE_DEBUG_BN((pctx->s, "%s: s = ", __func__));
+@@ -1008,8 +1008,8 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
+ 	    &pctx->a,
+ 	    &x2_s_proof, &x2_s_proof_len);
+ 
+-	bzero(x3_proof, x3_proof_len);
+-	bzero(x4_proof, x4_proof_len);
++	memset(x3_proof, 0, x3_proof_len);
++	memset(x4_proof, 0, x4_proof_len);
+ 	xfree(x3_proof);
+ 	xfree(x4_proof);
+ 
+@@ -1021,7 +1021,7 @@ input_userauth_jpake_server_step1(int type, u_int32_t seq, void *ctxt)
+ 	packet_put_string(x2_s_proof, x2_s_proof_len);
+ 	packet_send();
+ 
+-	bzero(x2_s_proof, x2_s_proof_len);
++	memset(x2_s_proof, 0, x2_s_proof_len);
+ 	xfree(x2_s_proof);
+ 
+ 	/* Expect step 2 packet from peer */
+@@ -1061,7 +1061,7 @@ input_userauth_jpake_server_step2(int type, u_int32_t seq, void *ctxt)
+ 	    &pctx->k,
+ 	    &pctx->h_k_cid_sessid, &pctx->h_k_cid_sessid_len);
+ 
+-	bzero(x4_s_proof, x4_s_proof_len);
++	memset(x4_s_proof, 0, x4_s_proof_len);
+ 	xfree(x4_s_proof);
+ 
+ 	JPAKE_DEBUG_CTX((pctx, "confirm sending in %s", __func__));
+@@ -1725,8 +1725,8 @@ userauth_jpake(Authctxt *authctxt)
+ 	packet_put_string(x2_proof, x2_proof_len);
+ 	packet_send();
+ 
+-	bzero(x1_proof, x1_proof_len);
+-	bzero(x2_proof, x2_proof_len);
++	memset(x1_proof, 0, x1_proof_len);
++	memset(x2_proof, 0, x2_proof_len);
+ 	xfree(x1_proof);
+ 	xfree(x2_proof);
+ 
+-- 
+1.7.2.2
+

package/openssh/openssh.002-SUSv-legacy.patch

@@ -1,21 +0,0 @@
-diff -rdup openssh-4.6p1.oorig/openbsd-compat/port-tun.c openssh-4.6p1/openbsd-compat/port-tun.c
---- openssh-4.6p1.oorig/openbsd-compat/port-tun.c	2006-09-02 07:32:40.000000000 +0200
-+++ openssh-4.6p1/openbsd-compat/port-tun.c	2007-06-28 16:08:42.000000000 +0200
-@@ -66,7 +66,7 @@ sys_tun_open(int tun, int mode)
- 		return (-1);
- 	}
- 
--	bzero(&ifr, sizeof(ifr));	
-+	memset(&ifr, 0, sizeof(ifr));
- 
- 	if (mode == SSH_TUNMODE_ETHERNET) {
- 		ifr.ifr_flags = IFF_TAP;
-@@ -212,7 +212,7 @@ sys_tun_infilter(struct Channel *c, char
- 	if (len <= 0 || len > (int)(sizeof(rbuf) - sizeof(*af)))
- 		return (-1);
- 	ptr = (char *)&rbuf[0];
--	bcopy(buf, ptr + sizeof(u_int32_t), len);
-+	memmove(ptr + sizeof(u_int32_t), buf, len);
- 	len += sizeof(u_int32_t);
- 	af = (u_int32_t *)ptr;
- 

package/openssh/openssh.mk

@@ -3,12 +3,12 @@
 # openssh
 #
 #############################################################
-OPENSSH_VERSION=5.1p1
-OPENSSH_SITE=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 
+OPENSSH_VERSION = 5.6p1
+OPENSSH_SITE = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)"
 OPENSSH_CONF_OPT = --libexecdir=/usr/lib --disable-lastlog --disable-utmp \
-		--disable-utmpx --disable-wtmp --disable-wtmpx --without-x
+		--disable-utmpx --disable-wtmp --disable-wtmpx --disable-strip
 
 OPENSSH_DEPENDENCIES = zlib openssl
 

package/openssh/openssh.patch

@@ -1,37 +0,0 @@
---- openssh-3.6.1p1/Makefile.in.orig	2003-03-20 17:34:34.000000000 -0700
-+++ openssh-3.6.1p1/Makefile.in	2003-04-25 17:09:00.000000000 -0600
-@@ -27,7 +27,7 @@
- RAND_HELPER=$(libexecdir)/ssh-rand-helper
- PRIVSEP_PATH=@PRIVSEP_PATH@
- SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
--STRIP_OPT=@STRIP_OPT@
-+STRIP_OPT=
- 
- PATHS= -DSSHDIR=\"$(sysconfdir)\" \
- 	-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
-
---- openssh-4.6p1.oorig/sshd_config	2006-07-24 06:06:47.000000000 +0200
-+++ openssh-4.6p1/sshd_config	2007-06-28 15:58:49.000000000 +0200
-@@ -83,9 +83,11 @@
- #AllowTcpForwarding yes
- #GatewayPorts no
- #X11Forwarding no
-+X11Forwarding yes
- #X11DisplayOffset 10
- #X11UseLocalhost yes
- #PrintMotd yes
-+PrintMotd no
- #PrintLastLog yes
- #TCPKeepAlive yes
- #UseLogin no
-@@ -102,8 +104,12 @@
- # no default banner path
- #Banner none
- 
-+ClientAliveInterval 15
-+ClientAliveCountMax 4
-+AcceptEnv LANG LC_*
-+
- # override default of no subsystems
- Subsystem	sftp	/usr/libexec/sftp-server
- 

package/openssl/openssl-r19998.patch

@@ -0,0 +1,16 @@
+Index: openssl/ssl/t1_lib.c
+RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
+rcsdiff -q -kk '-r1.64.2.15' '-r1.64.2.16' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null
+--- t1_lib.c	2010/11/16 13:26:24	1.64.2.15
++++ t1_lib.c	2010/11/16 22:41:07	1.64.2.16
+@@ -779,8 +779,8 @@
+ 				{
+ 				if(s->session->tlsext_ecpointformatlist)
+ 					{
+-					*al = TLS1_AD_DECODE_ERROR;
+-					return 0;
++					OPENSSL_free(s->session->tlsext_ecpointformatlist);
++					s->session->tlsext_ecpointformatlist = NULL;
+ 					}
+ 				s->session->tlsext_ecpointformatlist_length = 0;
+ 				if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)

package/openssl/openssl.mk

@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.0a
+OPENSSL_VERSION = 1.0.0b
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib

package/pciutils/pciutils.mk

@@ -8,6 +8,7 @@ PCIUTILS_VERSION = 3.1.7
 PCIUTILS_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 	PCIUTILS_ZLIB=yes
+	PCIUTILS_DEPENDENCIES += zlib
 else
 	PCIUTILS_ZLIB=no
 endif

package/php/Config.ext

@@ -103,6 +103,11 @@ config BR2_PACKAGE_PHP_EXT_PCRE
 	help
 	  Perl Compatible Regular Expressions support
 
+config BR2_PACKAGE_PHP_EXT_PCNTL
+	bool "PCNTL"
+	help
+	  Process Control Support
+
 config BR2_PACKAGE_PHP_EXT_SYSVMSG
 	bool "sysvmsg - System V Message queue"
 	help

package/php/php.mk

@@ -106,6 +106,10 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y)
 	PHP_DEPENDENCIES += ncurses
 endif
 
+ifeq ($(BR2_PACKAGE_PHP_EXT_PCNTL),y)
+	PHP_CONF_OPT += --enable-pcntl
+endif
+
 ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y)
 	PHP_CONF_OPT += --enable-sysvmsg
 endif

package/qt/Config.in

@@ -335,12 +335,16 @@ config BR2_PACKAGE_QT_NETWORK
 
 config BR2_PACKAGE_QT_WEBKIT
 	bool "WebKit Module"
+	depends on BR2_PACKAGE_QT_SHARED
+	depends on BR2_PACKAGE_QT_GUI_MODULE
 	depends on BR2_PACKAGE_QT_NETWORK
-	select BR2_PACKAGE_QT_JAVASCRIPTCORE
 	help
 	  Build the WebKit module.
 	  If unsure, say n.
 
+comment "WebKit needs shared library/gui/network support"
+	depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK)
+
 config BR2_PACKAGE_QT_JAVASCRIPTCORE
 	bool "JavaScriptCore JIT compiler"
 	help
@@ -366,7 +370,6 @@ config BR2_PACKAGE_QT_OPENSSL
 config BR2_PACKAGE_QT_SCRIPT
 	bool "Script Module"
 	default y
-	select BR2_PACKAGE_QT_JAVASCRIPTCORE
 	help
 	  Build the Qt Script module.
 	  if unsure, say y.

package/qt/qt-4.7.1-pthread_getattr_np_webkit.patch

@@ -0,0 +1,67 @@
+--- a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2010-09-10 11:05:22.000000000 +0200
++++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	2010-11-15 16:39:53.000000000 +0100
+@@ -70,6 +70,18 @@
+ #endif
+ #include <unistd.h>
+
++#if defined(__UCLIBC__)
++// versions of uClibc 0.9.31 and below do not have
++// pthread_getattr_np or pthread_attr_getstack.
++#if __UCLIBC_MAJOR__ == 0 && \
++    (__UCLIBC_MINOR__ < 9 || \
++    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 31))
++#define UCLIBC_USE_PROC_SELF_MAPS 1
++#include <stdio_ext.h>
++extern int* __libc_stack_end;
++#endif
++#endif
++
+ #if OS(SOLARIS)
+ #include <thread.h>
+ #else
+@@ -580,6 +592,37 @@
+     get_thread_info(find_thread(NULL), &threadInfo);
+     return threadInfo.stack_end;
+ #elif OS(UNIX)
++#ifdef UCLIBC_USE_PROC_SELF_MAPS
++    // Read /proc/self/maps and locate the line whose address
++    // range contains __libc_stack_end.
++    FILE* file = fopen("/proc/self/maps", "r");
++    if (!file)
++        return 0;
++    __fsetlocking(file, FSETLOCKING_BYCALLER);
++    char* line = 0;
++    size_t lineLen = 0;
++    while (!feof_unlocked(file)) {
++        if (getdelim(&line, &lineLen, '\n', file) <= 0)
++            break;
++
++        long from;
++        long to;
++        if (sscanf (line, "%lx-%lx", &from, &to) != 2)
++            continue;
++        if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) {
++            fclose(file);
++            free(line);
++#ifdef _STACK_GROWS_UP
++            return (void *)from;
++#else
++            return (void *)to;
++#endif
++        }
++    }
++    fclose(file);
++    free(line);
++    return 0;
++#else
+     AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
+     MutexLocker locker(mutex);
+     static void* stackBase = 0;
+@@ -603,6 +646,7 @@
+         stackThread = thread;
+     }
+     return static_cast<char*>(stackBase) + stackSize;
++#endif
+ #elif OS(WINCE)
+     AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
+     MutexLocker locker(mutex);

package/qt/qt.mk

@@ -12,7 +12,7 @@
 #
 ######################################################################
 
-QT_VERSION:=4.7.0
+QT_VERSION:=4.7.1
 QT_SOURCE:=qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 QT_SITE:=http://get.qt.nokia.com/qt/source
 QT_CAT:=$(ZCAT)

package/rng-tools/rng-tools.mk

@@ -7,7 +7,6 @@
 RNG_TOOLS_VERSION = 3
 RNG_TOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/gkernel
 RNG_TOOLS_CONF_ENV = LIBS="-largp"
-RNG_TOOLS_USE_CONFIG_CACHE = NO
 RNG_TOOLS_DEPENDENCIES = argp-standalone
 
 $(eval $(call AUTOTARGETS,package,rng-tools))

package/sqlite/sqlite.mk

@@ -4,11 +4,10 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3.6.23.1
+SQLITE_VERSION = 3.7.3
 SQLITE_SOURCE = sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES
-SQLITE_LIBTOOL_PATCH = NO
 
 ifneq ($(BR2_LARGEFILE),y)
 # the sqlite configure script fails to define SQLITE_DISABLE_LFS when

package/squid/Config.in

@@ -1,9 +1,11 @@
-comment "Squid requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "Squid requires a toolchain with C++ and IPv6 support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6
 
 config BR2_PACKAGE_SQUID
 	bool "squid"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INET_IPV6
+	select BR2_PACKAGE_LIBCAP
 	help
 	  Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more.
 

package/squid/squid-cross-compile.patch

@@ -1,31 +1,65 @@
-diff -Nura squid-3.0.STABLE17/configure.in squid-3.0.STABLE17.cross/configure.in
---- squid-3.0.STABLE17/configure.in	2009-07-26 09:24:48.000000000 -0300
-+++ squid-3.0.STABLE17.cross/configure.in	2009-07-30 11:54:28.000000000 -0300
-@@ -1895,6 +1895,10 @@
+diff -Nura squid-3.1.8.orig/configure.in squid-3.1.8/configure.in
+--- squid-3.1.8.orig/configure.in	2010-09-04 00:26:52.000000000 -0300
++++ squid-3.1.8/configure.in	2010-09-06 10:12:09.036622139 -0300
+@@ -366,7 +366,7 @@
+ 
+ dnl Nasty hack to get autoconf 2.64 on Linux to run.
+ dnl all other uses of RUN_IFELSE are wrapped inside CACHE_CHECK which breaks on 2.64
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(int argc, char **argv) { return 0; } ]])],[],[],[:])
++dnl AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(int argc, char **argv) { return 0; } ]])],[],[],[:])
+ 
+ dnl This is a developer only option.. developers know how to set defines
+ dnl
+@@ -1802,7 +1802,7 @@
+     AC_MSG_NOTICE([Negotiate auth helpers built: $NEGOTIATE_AUTH_HELPERS])
+ fi
+ AC_SUBST(NEGOTIATE_AUTH_HELPERS)
+-AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
++dnl AC_CONFIG_SUBDIRS(helpers/negotiate_auth/squid_kerb_auth)
+ 
+ dnl Select digest auth scheme helpers to build
+ if test -n "$AUTH_MODULE_digest"; then
+@@ -2115,6 +2115,18 @@
  	;;
  esac
  
 +dnl Define CXX_FOR_BUILD
 +CXX_FOR_BUILD="$CXX_FOR_BUILD"
 +AC_SUBST(CXX_FOR_BUILD)
++
++dnl Define CXXFLAGS_FOR_BUILD
++CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD"
++AC_SUBST(CXXFLAGS_FOR_BUILD)
++
++dnl Define LDFLAGS_FOR_BUILD
++LDFLAGS_FOR_BUILD="$LDFLAGS_FOR_BUILD"
++AC_SUBST(LDFLAGS_FOR_BUILD)
 +
  dnl Check for programs
  AC_PROG_CPP
  AC_PROG_INSTALL
-diff -Nura squid-3.0.STABLE17/src/Makefile.am squid-3.0.STABLE17.cross/src/Makefile.am
---- squid-3.0.STABLE17/src/Makefile.am	2009-07-26 09:24:46.000000000 -0300
-+++ squid-3.0.STABLE17.cross/src/Makefile.am	2009-07-30 11:55:08.000000000 -0300
-@@ -1034,6 +1034,13 @@
- squid.conf.default: cf_parser.h
+diff -Nura squid-3.1.8.orig/src/Makefile.am squid-3.1.8/src/Makefile.am
+--- squid-3.1.8.orig/src/Makefile.am	2010-09-04 00:25:57.000000000 -0300
++++ squid-3.1.8/src/Makefile.am	2010-09-06 10:11:27.319774138 -0300
+@@ -195,8 +195,6 @@
+ cf_gen_SOURCES = cf_gen.cc
+ nodist_cf_gen_HEADER = cf_gen_defines.cci
+ cf_gen_LDADD= \
+-	../compat/libcompat.la \
+-	-L../lib -lmiscutil \
+ 	$(EPOLL_LIBS) \
+ 	$(MINGW_LIBS) \
+ 	$(XTRA_LIBS)
+@@ -752,6 +750,12 @@
+ squid.conf.default squid.conf.documented: cf_parser.cci
  	true
  
-+CXX_FOR_BUILD ?= @CXX_FOR_BUILD@
++cf_gen$(EXEEXT): $(cf_gen_OBJECTS) $(cf_gen_DEPENDENCIES)
++	$(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc \
++		$(top_srcdir)/lib/util.c \
++		$(top_srcdir)/compat/assert.cc \
++		$(cf_gen_LDADD) $(LIBS) ${INCLUDES}
 +
-+cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
-+	$(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc \
-+		$(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \
-+		-DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES}
-+
- cf_parser.h: cf.data cf_gen$(EXEEXT)
+ cf_parser.cci: cf.data cf_gen$(EXEEXT)
  	./cf_gen cf.data $(srcdir)/cf.data.depend
  

package/squid/squid-susv3-legacy.patch

@@ -1,49 +0,0 @@
-[PATCH]  replace susv3 legacy functions with modern equivalents
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/ESIVarState.cc     |    6 +++---
- src/HttpHeaderTools.cc |    2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-Index: squid-3.0.STABLE21/src/ESIVarState.cc
-===================================================================
---- squid-3.0.STABLE21.orig/src/ESIVarState.cc
-+++ squid-3.0.STABLE21/src/ESIVarState.cc
-@@ -207,7 +207,7 @@ ESIVariableUserAgent::getProductVersion 
- {
-     char const *t;
-     int len;
--    t = index (s,'/');
-+    t = strchr (s,'/');
- 
-     if (!t || !*(++t))
-         return xstrdup ("");
-@@ -382,12 +382,12 @@ ESIVariableUserAgent::ESIVariableUserAge
- 
-         if ((t = strstr (s, "MSIE"))) {
-             browser = ESI_BROWSER_MSIE;
--            t = index (t, ' ');
-+            t = strchr (t, ' ');
- 
-             if (!t)
-                 browserversion = xstrdup ("");
-             else {
--                t1 = index (t, ';');
-+                t1 = strchr (t, ';');
- 
-                 if (!t1)
-                     browserversion = xstrdup (t + 1);
-Index: squid-3.0.STABLE21/src/HttpHeaderTools.cc
-===================================================================
---- squid-3.0.STABLE21.orig/src/HttpHeaderTools.cc
-+++ squid-3.0.STABLE21/src/HttpHeaderTools.cc
-@@ -357,7 +357,7 @@ httpHeaderParseQuotedString (const char 
-     pos = start + 1;
- 
-     while (1) {
--        if (!(end = index (pos,'"'))) {
-+        if (!(end = strchr (pos,'"'))) {
-             debugs(66, 2, "failed to parse a quoted-string header field near '" << start << "'");
-             return 0;
-         }

package/squid/squid.mk

@@ -4,20 +4,21 @@
 #
 #############################################################
 
-SQUID_VERSION = 3.0.STABLE21
-SQUID_SOURCE = squid-$(SQUID_VERSION).tar.bz2
-SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.0
+SQUID_VERSION = 3.1.9
+SQUID_SITE = http://www.squid-cache.org/Versions/v3/3.1
+SQUID_DEPENDENCIES = libcap host-libcap
 SQUID_AUTORECONF = YES
-SQUID_LIBTOOL_PATCH = NO
 SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
 			ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \
 			ac_cv_func_strnstr=no
-SQUID_CONF_OPT =	--disable-wccp --disable-wccp2 \
-			--disable-htcp --disable-snmp \
-			--enable-linux-netfilter \
-			--enable-storeio=ufs,diskd,aufs,null \
+SQUID_CONF_OPT =	--enable-wccp --enable-wccpv2 --enable-async-io=8 \
+			--enable-htcp --enable-snmp --enable-linux-netfilter \
 			--enable-removal-policies="lru,heap" \
-			--with-aufs-threads=24 --with-filedescriptors=1024
+			--with-filedescriptors=1024 --disable-ident-lookups \
+			--enable-auth="digest" \
+			--enable-digest-auth-helpers="password" \
+			--enable-external-acl-helpers="ip_user"
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	SQUID_CONF_OPT += --enable-ssl
 	SQUID_DEPENDENCIES += openssl
@@ -28,8 +29,6 @@ define SQUID_CLEANUP_TARGET
 		RunCache RunAccel)
 	rm -f $(addprefix $(TARGET_DIR)/etc/, \
 		cachemgr.conf mime.conf.default squid.conf.default)
-	rm -f $(TARGET_DIR)/usr/libexec/cachemgr.cgi
-	rm -f $(TARGET_DIR)/usr/share/mib.txt
 endef
 
 SQUID_POST_INSTALL_TARGET_HOOKS += SQUID_CLEANUP_TARGET

package/sysstat/Config.in

@@ -1,5 +1,7 @@
 config BR2_PACKAGE_SYSSTAT
 	bool "sysstat"
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
           The sysstat utilities are a collection of performance
           monitoring tools for Linux. These include sar, sadf, mpstat,

package/sysstat/sysstat.mk

@@ -4,19 +4,20 @@
 #
 #############################################################
 
-SYSSTAT_VERSION = 9.1.5
+SYSSTAT_VERSION = 9.1.6
 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.bz2
 SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard/
-SYSSTAT_AUTORECONF = NO
-SYSSTAT_LIBTOOL_PATCH = NO
-SYSSTAT_INSTALL_STAGING = NO
-SYSSTAT_INSTALL_TARGET = YES
+SYSSTAT_CONF_OPT = --disable-man-group --disable-sensors
 
-SYSSTAT_CONF_OPT = --disable-man-group
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
 SYSSTAT_CONF_OPT += --disable-documentation
 endif
 
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+SYSSTAT_DEPENDENCIES += gettext libintl
+SYSSTAT_MAKE_OPT += CFLAGS+=-lintl
+endif
+
 # The isag tool is a post processing script that depends on tcl/tk
 # among other things. So we don't install it.
 SYSSTAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install

package/tcpdump/tcpdump.mk

@@ -14,4 +14,11 @@ TCPDUMP_CONF_OPT:=--without-crypto \
 		$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
 TCPDUMP_DEPENDENCIES:=zlib libpcap
 
+# make install installs an unneeded extra copy of the tcpdump binary
+define TCPDUMP_REMOVE_DUPLICATED_BINARY
+	rm -f $(TARGET_DIR)/usr/sbin/tcpdump.$(TCPDUMP_VERSION)
+endef
+
+TCPDUMP_POST_INSTALL_TARGET_HOOKS += TCPDUMP_REMOVE_DUPLICATED_BINARY
+
 $(eval $(call AUTOTARGETS,package,tcpdump))

package/webkit/Config.in

@@ -4,7 +4,7 @@ config BR2_PACKAGE_WEBKIT
 	depends on BR2_USE_WCHAR
 	depends on BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_ICU
-	select BR2_PACKAGE_CURL
+	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBXSLT
 	select BR2_PACKAGE_SQLITE

package/webkit/webkit-1.2.3-fix-compilation-on-DirectFB.patch

@@ -0,0 +1,144 @@
+From 91a2bf4c3a21720a27223ba293ba90f58c349959 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin@gmail.com>
+Date: Sun, 11 Apr 2010 14:38:57 +0200
+Subject: [PATCH] Fix compilation with DirectFB
+
+Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
+---
+ GNUmakefile.am                        |    2 ++
+ WebCore/plugins/PluginView.h          |    6 +++---
+ WebCore/plugins/gtk/PluginViewGtk.cpp |   17 ++++++++---------
+ 3 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/GNUmakefile.am b/GNUmakefile.am
+index 3bdfe53..8626bbb 100644
+--- a/GNUmakefile.am
++++ b/GNUmakefile.am
+@@ -122,8 +122,10 @@ corekit_cppflags += \
+ 
+ # For the Gtk port we want to use XP_UNIX both in X11 and Mac
+ if !TARGET_WIN32
++if !TARGET_DIRECTFB
+ corekit_cppflags += -DXP_UNIX
+ endif
++endif
+ 
+ # Default compiler flags
+ global_cflags += \
+diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
+index 21a25f6..8116864 100644
+--- a/WebCore/plugins/PluginView.h
++++ b/WebCore/plugins/PluginView.h
+@@ -22,7 +22,7 @@
+  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef PluginView_h
+@@ -312,7 +312,7 @@ namespace WebCore {
+         bool m_haveInitialized;
+         bool m_isWaitingToStart;
+ 
+-#if defined(XP_UNIX)
++#if defined(XP_UNIX) || PLATFORM(DIRECTFB)
+         bool m_needsXEmbed;
+ #endif
+ 
+@@ -340,7 +340,7 @@ public:
+ 
+ private:
+ 
+-#if defined(XP_UNIX) || OS(SYMBIAN)
++#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(DIRECTFB)
+         void setNPWindowIfNeeded();
+ #elif defined(XP_MACOSX)
+         NP_CGContext m_npCgContext;
+diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
+index 8de63e0..039a845 100644
+--- a/WebCore/plugins/gtk/PluginViewGtk.cpp
++++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
+@@ -23,7 +23,7 @@
+  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #include "config.h"
+@@ -45,6 +45,7 @@
+ #include "Image.h"
+ #include "KeyboardEvent.h"
+ #include "MouseEvent.h"
++#include "NotImplemented.h"
+ #include "Page.h"
+ #include "PlatformKeyboardEvent.h"
+ #include "PlatformMouseEvent.h"
+@@ -137,7 +138,7 @@ void PluginView::updatePluginWidget()
+     if (!m_isWindowed) {
+         if (m_drawable)
+             XFreePixmap(GDK_DISPLAY(), m_drawable);
+-            
++
+         m_drawable = XCreatePixmap(GDK_DISPLAY(), getRootWindow(m_parentFrame.get()),
+                                    m_windowRect.width(), m_windowRect.height(),
+                                    ((NPSetWindowCallbackStruct*)m_npWindow.ws_info)->depth);
+@@ -571,7 +572,7 @@ NPError PluginView::handlePostReadFile(Vector<char>& buffer, uint32 len, const c
+ 
+     //FIXME - read the file data into buffer
+     FILE* fileHandle = fopen((filename.utf8()).data(), "r");
+-    
++
+     if (fileHandle == 0)
+         return NPERR_FILE_NOT_FOUND;
+ 
+@@ -706,6 +707,7 @@ void PluginView::forceRedraw()
+         gtk_widget_queue_draw(m_parentFrame->view()->hostWindow()->platformPageClient());
+ }
+ 
++#if defined(XP_UNIX)
+ static Display* getPluginDisplay()
+ {
+     // The plugin toolkit might have a different X connection open.  Since we're
+@@ -713,14 +715,9 @@ static Display* getPluginDisplay()
+     // plugins, so we can return that.  We might want to add other implementations here
+     // later.
+ 
+-#if defined(XP_UNIX)
+     return GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+-#else
+-    return 0;
+-#endif
+ }
+ 
+-#if defined(XP_UNIX)
+ static void getVisualAndColormap(int depth, Visual** visual, Colormap* colormap)
+ {
+     *visual = 0;
+@@ -794,9 +791,9 @@ bool PluginView::platformStart()
+     }
+ 
+     if (m_isWindowed) {
+-#if defined(XP_UNIX)
+         GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
+ 
++#if defined(XP_UNIX)
+         if (m_needsXEmbed) {
+             // If our parent is not anchored the startup process will
+             // fail miserably for XEmbed plugins a bit later on when
+@@ -817,7 +814,9 @@ bool PluginView::platformStart()
+ #endif
+     } else {
+         setPlatformWidget(0);
++#if defined(XP_UNIX)
+         m_pluginDisplay = getPluginDisplay();
++#endif
+     }
+ 
+     show();
+-- 
+1.7.0.4
+

package/webkit/webkit.mk

@@ -10,7 +10,7 @@ WEBKIT_SITE = http://www.webkitgtk.org
 WEBKIT_INSTALL_STAGING = YES
 WEBKIT_LIBTOOL_PATCH = NO
 
-WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt	\
+WEBKIT_DEPENDENCIES = host-flex host-gperf icu libcurl libxml2 libxslt	\
 			libgtk2 sqlite enchant libsoup jpeg libgail
 
 WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

@@ -60,7 +60,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
 		--disable-xnest --disable-xephyr --disable-xvfb \
 		--with-builder-addr=buildroot@uclibc.org \
-		CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" \
+		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
 		--with-fontdir=/usr/share/fonts/X11/
 
 ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)

package/zlib/zlib.mk

@@ -10,7 +10,7 @@ ZLIB_INSTALL_STAGING=YES
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 ZLIB_PIC :=
-ZLIB_SHARED :=
+ZLIB_SHARED := --static
 else
 ZLIB_PIC := -fPIC
 ZLIB_SHARED := --shared
@@ -24,8 +24,6 @@ define ZLIB_CONFIGURE_CMDS
 		./configure \
 		$(ZLIB_SHARED) \
 		--prefix=/usr \
-		--libdir=$(STAGING_DIR)/usr/lib \
-		--includedir=$(STAGING_DIR)/usr/include \
 	)
 endef
 
@@ -42,42 +40,40 @@ define HOST_ZLIB_CONFIGURE_CMDS
 endef
 
 define ZLIB_BUILD_CMDS
-	$(MAKE1) -C $(@D) all libz.a
+	$(MAKE1) -C $(@D)
 endef
 
 define HOST_ZLIB_BUILD_CMDS
-	$(MAKE1) -C $(@D) all libz.a
+	$(MAKE1) -C $(@D)
 endef
 
 define ZLIB_INSTALL_STAGING_CMDS
-	$(INSTALL) -D $(@D)/libz.a $(STAGING_DIR)/usr/lib/libz.a
-	$(INSTALL) -D $(@D)/zlib.h $(STAGING_DIR)/usr/include/zlib.h
-	$(INSTALL) $(@D)/zconf.h $(STAGING_DIR)/usr/include/
-	cp -dpf $(@D)/libz.so* $(STAGING_DIR)/usr/lib/
+	$(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
+define ZLIB_INSTALL_TARGET_CMDS
+	$(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) install
 endef
 
 define HOST_ZLIB_INSTALL_CMDS
-	$(INSTALL) -D $(@D)/libz.a $(HOST_DIR)/usr/lib/libz.a
-	$(INSTALL) -D $(@D)/zlib.h $(HOST_DIR)/usr/include/zlib.h
-	$(INSTALL) $(@D)/zconf.h $(HOST_DIR)/usr/include/
-	cp -dpf $(@D)/libz.so* $(HOST_DIR)/usr/lib/
+	$(MAKE1) -C $(@D) install
 endef
 
-ifeq ($(BR2_HAVE_DEVFILES),y)
-define ZLIB_INSTALL_TARGET_HEADERS
-	$(INSTALL) -D $(@D)/zlib.h $(TARGET_DIR)/usr/include/zlib.h
-	$(INSTALL) $(@D)/zconf.h $(TARGET_DIR)/usr/include/
+define ZLIB_CLEAN_CMDS
+	-$(MAKE1) -C $(@D) clean
 endef
-endif
 
-define ZLIB_INSTALL_TARGET_CMDS
-	mkdir -p $(TARGET_DIR)/usr/lib
-	cp -dpf $(@D)/libz.so* $(TARGET_DIR)/usr/lib
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libz.so*
-	$(INSTALL) -D $(@D)/libz.a $(TARGET_DIR)/usr/lib/libz.a
-	$(ZLIB_INSTALL_TARGET_HEADERS)
+define ZLIB_UNINSTALL_STAGING_CMDS
+	$(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) uninstall
+endef
+
+define ZLIB_UNINSTALL_TARGET_CMDS
+	$(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) uninstall
+endef
+
+define HOST_ZLIB_UNINSTALL_TARGET_CMDS
+	$(MAKE1) -C $(@D) uninstall
 endef
 
 $(eval $(call GENTARGETS,package,zlib))
 $(eval $(call GENTARGETS,package,zlib,host))
-

target/Config.in.arch

@@ -263,11 +263,13 @@ config BR2_x86_barcelona
 config BR2_x86_geode
 	bool "geode"
 config BR2_x86_c3
-	bool "cyrix 3 (MMX + 3dNOW!)"
+	bool "Via/Cyrix C3 (Samuel/Ezra cores)"
+config BR2_x86_c32
+	bool "Via C3-2 (Nehemiah cores)"
 config BR2_x86_winchip_c6
-	bool "IDT winchip C6 (i486 + slow MMX)"
+	bool "IDT Winchip C6"
 config BR2_x86_winchip2
-	bool "IDT winchip2 (i486 +MMX +SSE)"
+	bool "IDT Winchip 2"
 endchoice
 
 choice
@@ -304,6 +306,15 @@ config BR2_sparc_cypress
 	bool "cypress"
 config BR2_sparc_v8
 	bool "v8"
+comment "LEON SPARC needs gcc = 4.4.x"
+config BR2_sparc_sparchfleon
+	bool "hfleon"
+config BR2_sparc_sparchfleonv8
+	bool "hfleonv8"
+config BR2_sparc_sparcsfleon
+	bool "sfleon"
+config BR2_sparc_sparcsfleonv8
+	bool "sfleonv8"
 config BR2_sparc_supersparc
 	bool "supersparc"
 config BR2_sparc_sparclite
@@ -320,20 +331,13 @@ config BR2_sparc_sparclet
 	bool "sparclet"
 config BR2_sparc_tsc701
 	bool "tsc701"
-config BR2_sparc_v9
-	bool "v9"
-config BR2_sparc_v9a
-	bool "v9a"
-config BR2_sparc_v9b
-	bool "v9b"
-config BR2_sparc_ultrasparc
-	bool "ultrasparc"
-config BR2_sparc_ultrasparc3
-	bool "ultrasparc3"
-config BR2_sparc_niagara
-	bool "niagara"
 endchoice
 
+config BR2_SPARC_TYPE
+	string
+	default V7	if BR2_sparc_v7 || BR2_sparc_cypress || BR2_sparc_sparclite || BR2_sparc_f930 || BR2_sparc_f934 || BR2_sparc_sparclite86x || BR2_sparc_sparclet || BR2_sparc_tsc701 || BR2_sparc_sparchfleon || BR2_sparc_sparcsfleon
+	default V8	if BR2_sparc_v8 || BR2_sparc_supersparc || BR2_sparc_hypersparc || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleonv8
+
 choice
 	prompt "Target Architecture Variant"
 	depends on BR2_xtensa
@@ -445,6 +449,10 @@ config BR2_ARCH
 	default "i586"		if BR2_x86_i586
 	default "i586"		if BR2_x86_pentium_mmx
 	default "i586"		if BR2_x86_geode
+	default "i586"		if BR2_x86_c3
+	default "i686"		if BR2_x86_c32
+	default "i586"		if BR2_x86_winchip_c6
+	default "i586"		if BR2_x86_winchip2
 	default "i686"		if BR2_x86_i686
 	default "i686"		if BR2_x86_pentium2
 	default "i686"		if BR2_x86_pentium3
@@ -508,6 +516,7 @@ config BR2_GCC_TARGET_TUNE
 	default winchip-c6	if BR2_x86_winchip_c6
 	default winchip2	if BR2_x86_winchip2
 	default c3		if BR2_x86_c3
+	default c3-2		if BR2_x86_c32
 	default geode		if BR2_x86_geode
 	default generic		if BR2_x86_64_generic
 	default nocona		if BR2_x86_64_nocona
@@ -621,6 +630,7 @@ config BR2_GCC_TARGET_ARCH
 	default winchip-c6	if BR2_x86_winchip_c6
 	default winchip2	if BR2_x86_winchip2
 	default c3		if BR2_x86_c3
+	default c3-2		if BR2_x86_c32
 	default geode		if BR2_x86_geode
 	default armv4t		if BR2_arm7tdmi
 	default armv3		if BR2_arm610
@@ -666,3 +676,9 @@ config BR2_GCC_TARGET_ABI
 	default ibmlongdouble	if BR2_powerpc && BR2_PPC_ABI_ibmlongdouble
 	default ieeelongdouble	if BR2_powerpc && BR2_PPC_ABI_ieeelongdouble
 
+config BR2_GCC_TARGET_CPU
+	string
+	default sparchfleon	if BR2_sparc_sparchfleon
+	default sparchfleonv8	if BR2_sparc_sparchfleonv8
+	default sparcsfleon	if BR2_sparc_sparcsfleon
+	default sparcsfleonv8	if BR2_sparc_sparcsfleonv8

toolchain/gcc/4.4.5/950-sparc-leon.patch

@@ -0,0 +1,239 @@
+diff -Naurb gcc-4.4.2.ori/gcc/config/sparc/leon.md gcc-4.4.2/gcc/config/sparc/leon.md
+--- gcc-4.4.2.ori/gcc/config/sparc/leon.md	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.4.2/gcc/config/sparc/leon.md	2010-10-19 11:56:58.000000000 +0200
+@@ -0,0 +1,56 @@
++;; Scheduling description for Leon.
++;;   Copyright (C) 2010 Free Software Foundation, Inc.
++;;
++;; This file is part of GCC.
++;;
++;; GCC is free software; you can redistribute it and/or modify
++;; it under the terms of the GNU General Public License as published by
++;; the Free Software Foundation; either version 3, or (at your option)
++;; any later version.
++;;
++;; GCC is distributed in the hope that it will be useful,
++;; but WITHOUT ANY WARRANTY; without even the implied warranty of
++;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++;; GNU General Public License for more details.
++;;
++;; You should have received a copy of the GNU General Public License
++;; along with GCC; see the file COPYING3.  If not see
++;; <http://www.gnu.org/licenses/>.
++
++
++(define_automaton "leon")
++
++(define_cpu_unit "leon_memory, leon_fpalu" "leon")
++(define_cpu_unit "leon_fpmds" "leon")
++(define_cpu_unit "write_buf" "leon")
++
++(define_insn_reservation "leon_load" 1
++  (and (eq_attr "cpu" "leon")
++    (eq_attr "type" "load,sload,fpload"))
++  "leon_memory")
++
++(define_insn_reservation "leon_store" 1
++  (and (eq_attr "cpu" "leon")
++    (eq_attr "type" "store,fpstore"))
++  "leon_memory+write_buf")
++  
++(define_insn_reservation "leon_fp_alu" 1
++  (and (eq_attr "cpu" "leon")
++    (eq_attr "type" "fp,fpmove"))
++  "leon_fpalu, nothing")
++
++(define_insn_reservation "leon_fp_mult" 1
++  (and (eq_attr "cpu" "leon")
++    (eq_attr "type" "fpmul"))
++  "leon_fpmds, nothing")
++
++(define_insn_reservation "leon_fp_div" 16
++  (and (eq_attr "cpu" "leon")
++    (eq_attr "type" "fpdivs,fpdivd"))
++  "leon_fpmds, nothing*15")
++
++(define_insn_reservation "leon_fp_sqrt" 23
++  (and (eq_attr "cpu" "leon")
++    (eq_attr "type" "fpsqrts,fpsqrtd"))
++  "leon_fpmds, nothing*21")
++
+diff -Naurb gcc-4.4.2.ori/gcc/config/sparc/sparc.c gcc-4.4.2/gcc/config/sparc/sparc.c
+--- gcc-4.4.2.ori/gcc/config/sparc/sparc.c	2010-10-19 11:55:17.000000000 +0200
++++ gcc-4.4.2/gcc/config/sparc/sparc.c	2010-10-19 11:56:58.000000000 +0200
+@@ -246,6 +246,30 @@
+   0, /* shift penalty */
+ };
+ 
++static const
++struct processor_costs leon_costs = {
++  COSTS_N_INSNS (1), /* int load */
++  COSTS_N_INSNS (1), /* int signed load */
++  COSTS_N_INSNS (1), /* int zeroed load */
++  COSTS_N_INSNS (1), /* float load */
++  COSTS_N_INSNS (1), /* fmov, fneg, fabs */
++  COSTS_N_INSNS (1), /* fadd, fsub */
++  COSTS_N_INSNS (1), /* fcmp */
++  COSTS_N_INSNS (1), /* fmov, fmovr */
++  COSTS_N_INSNS (1), /* fmul */
++  COSTS_N_INSNS (15), /* fdivs */
++  COSTS_N_INSNS (15), /* fdivd */
++  COSTS_N_INSNS (23), /* fsqrts */
++  COSTS_N_INSNS (23), /* fsqrtd */
++  COSTS_N_INSNS (5), /* imul */
++  COSTS_N_INSNS (5), /* imulX */
++  0, /* imul bit factor */
++  COSTS_N_INSNS (5), /* idiv */
++  COSTS_N_INSNS (5), /* idivX */
++  COSTS_N_INSNS (1), /* movcc/movr */
++  0, /* shift penalty */
++};
++
+ const struct processor_costs *sparc_costs = &cypress_costs;
+ 
+ #ifdef HAVE_AS_RELAX_OPTION
+@@ -651,6 +675,10 @@
+     { TARGET_CPU_ultrasparc3, "ultrasparc3" },
+     { TARGET_CPU_niagara, "niagara" },
+     { TARGET_CPU_niagara2, "niagara2" },
++    { TARGET_CPU_sparchfleon, "sparchfleon" },
++    { TARGET_CPU_sparchfleonv8, "sparchfleonv8" },
++    { TARGET_CPU_sparcsfleon, "sparcsfleon" },
++    { TARGET_CPU_sparcsfleonv8, "sparcsfleonv8" },
+     { 0, 0 }
+   };
+   const struct cpu_default *def;
+@@ -689,6 +717,11 @@
+     /* UltraSPARC T1 */
+     { "niagara", PROCESSOR_NIAGARA, MASK_ISA, MASK_V9|MASK_DEPRECATED_V8_INSNS},
+     { "niagara2", PROCESSOR_NIAGARA, MASK_ISA, MASK_V9},
++    /* SPARC-LEON */
++    { "sparchfleon",   PROCESSOR_LEON, MASK_ISA, MASK_FPU },
++    { "sparchfleonv8", PROCESSOR_LEON, MASK_ISA & ~(MASK_V8), MASK_V8|MASK_FPU },
++    { "sparcsfleon",   PROCESSOR_LEON, MASK_ISA | MASK_FPU, 0 },
++    { "sparcsfleonv8", PROCESSOR_LEON, (MASK_ISA | MASK_FPU) & ~(MASK_V8), MASK_V8 },
+     { 0, 0, 0, 0 }
+   };
+   const struct cpu_table *cpu;
+@@ -855,6 +888,9 @@
+     case PROCESSOR_NIAGARA2:
+       sparc_costs = &niagara2_costs;
+       break;
++    case PROCESSOR_LEON:
++      sparc_costs = &leon_costs;
++      break;
+     };
+ 
+ #ifdef TARGET_DEFAULT_LONG_DOUBLE_128
+diff -Naurb gcc-4.4.2.ori/gcc/config/sparc/sparc.h gcc-4.4.2/gcc/config/sparc/sparc.h
+--- gcc-4.4.2.ori/gcc/config/sparc/sparc.h	2010-10-19 11:55:17.000000000 +0200
++++ gcc-4.4.2/gcc/config/sparc/sparc.h	2010-10-19 11:56:58.000000000 +0200
+@@ -243,6 +243,10 @@
+ #define TARGET_CPU_ultrasparc3	9
+ #define TARGET_CPU_niagara	10
+ #define TARGET_CPU_niagara2	11
++#define TARGET_CPU_sparchfleon  12
++#define TARGET_CPU_sparchfleonv8 13
++#define TARGET_CPU_sparcsfleon  14
++#define TARGET_CPU_sparcsfleonv8 15
+ 
+ #if TARGET_CPU_DEFAULT == TARGET_CPU_v9 \
+  || TARGET_CPU_DEFAULT == TARGET_CPU_ultrasparc \
+@@ -299,6 +303,26 @@
+ #define ASM_CPU32_DEFAULT_SPEC "-Asparclite"
+ #endif
+ 
++#if TARGET_CPU_DEFAULT == TARGET_CPU_sparchfleon
++#define CPP_CPU32_DEFAULT_SPEC "-Dsparcleon"
++#define ASM_CPU32_DEFAULT_SPEC ""
++#endif
++
++#if TARGET_CPU_DEFAULT == TARGET_CPU_sparcsfleon
++#define CPP_CPU32_DEFAULT_SPEC "-Dsparcleon -D_SOFT_FLOAT"
++#define ASM_CPU32_DEFAULT_SPEC ""
++#endif
++
++#if TARGET_CPU_DEFAULT == TARGET_CPU_sparchfleonv8
++#define CPP_CPU32_DEFAULT_SPEC "-Dsparcleon -D__sparc_v8__ "
++#define ASM_CPU32_DEFAULT_SPEC ""
++#endif
++
++#if TARGET_CPU_DEFAULT == TARGET_CPU_sparcsfleonv8
++#define CPP_CPU32_DEFAULT_SPEC "-Dsparcleon -D__sparc_v8__ -D_SOFT_FLOAT"
++#define ASM_CPU32_DEFAULT_SPEC ""
++#endif
++
+ #if TARGET_CPU_DEFAULT == TARGET_CPU_supersparc
+ #define CPP_CPU32_DEFAULT_SPEC "-D__supersparc__ -D__sparc_v8__"
+ #define ASM_CPU32_DEFAULT_SPEC ""
+@@ -369,6 +393,10 @@
+ %{mcpu=ultrasparc3:-D__sparc_v9__} \
+ %{mcpu=niagara:-D__sparc_v9__} \
+ %{mcpu=niagara2:-D__sparc_v9__} \
++%{mcpu=sparchfleon:-Dsparcleon} \
++%{mcpu=sparchfleonv8:-Dsparcleon -D__sparc_v8__} \
++%{mcpu=sparcsfleon:-Dsparcleon -D_SOFT_FLOAT} \
++%{mcpu=sparcsfleonv8:-Dsparcleon -D_SOFT_FLOAT -D__sparc_v8__} \
+ %{!mcpu*:%{!mcypress:%{!msparclite:%{!mf930:%{!mf934:%{!mv8:%{!msupersparc:%(cpp_cpu_default)}}}}}}} \
+ "
+ #define CPP_ARCH32_SPEC ""
+@@ -533,6 +561,7 @@
+   PROCESSOR_V7,
+   PROCESSOR_CYPRESS,
+   PROCESSOR_V8,
++  PROCESSOR_LEON,
+   PROCESSOR_SUPERSPARC,
+   PROCESSOR_SPARCLITE,
+   PROCESSOR_F930,
+diff -Naurb gcc-4.4.2.ori/gcc/config/sparc/sparc.md gcc-4.4.2/gcc/config/sparc/sparc.md
+--- gcc-4.4.2.ori/gcc/config/sparc/sparc.md	2010-10-19 11:55:17.000000000 +0200
++++ gcc-4.4.2/gcc/config/sparc/sparc.md	2010-10-19 11:56:58.000000000 +0200
+@@ -89,6 +89,7 @@
+   "v7,
+    cypress,
+    v8,
++   leon,
+    supersparc,
+    sparclite,f930,f934,
+    hypersparc,sparclite86x,
+@@ -320,6 +321,7 @@
+ (include "ultra3.md")
+ (include "niagara.md")
+ (include "niagara2.md")
++(include "leon.md")
+ 
+ 
+ ;; Operand and operator predicates and constraints
+diff -Naurb gcc-4.4.2.ori/gcc/config/sparc/t-leon gcc-4.4.2/gcc/config/sparc/t-leon
+--- gcc-4.4.2.ori/gcc/config/sparc/t-leon	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.4.2/gcc/config/sparc/t-leon	2010-10-19 11:56:58.000000000 +0200
+@@ -0,0 +1,16 @@
++# configuration file for LEON cpu
++
++LIB1ASMSRC = sparc/lb1spc.asm
++LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3
++
++# We want fine grained libraries, so use the new code to build the
++# floating point emulation libraries.
++FPBIT = fp-bit.c
++DPBIT = dp-bit.c
++
++dp-bit.c: $(srcdir)/config/fp-bit.c
++	cat $(srcdir)/config/fp-bit.c > dp-bit.c
++
++fp-bit.c: $(srcdir)/config/fp-bit.c
++	echo '#define FLOAT' > fp-bit.c
++	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
+diff -Naurb gcc-4.4.2.ori/gcc/config.gcc gcc-4.4.2/gcc/config.gcc
+--- gcc-4.4.2.ori/gcc/config.gcc	2010-10-19 11:55:17.000000000 +0200
++++ gcc-4.4.2/gcc/config.gcc	2010-10-19 11:56:11.000000000 +0200
+@@ -2978,6 +2978,9 @@
+ 			| v9 | ultrasparc | ultrasparc3 | niagara | niagara2)
+ 				# OK
+ 				;;
++			sparchfleon | sparcsfleon | sparchfleonv8 | sparcsfleonv8 | leon)
++				tmake_file="${tmake_file} sparc/t-leon"
++				;;
+ 			*)
+ 				echo "Unknown cpu used in --with-$which=$val" 1>&2
+ 				exit 1

toolchain/gcc/Config.in

@@ -4,7 +4,8 @@ comment "GCC Options"
 
 choice
 	prompt "GCC compiler Version"
-	default BR2_GCC_VERSION_4_3_X if !BR2_avr32
+	default BR2_GCC_VERSION_4_3_X if !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+	default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8
 	default BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 if BR2_avr32
 	help
 	  Select the version of gcc you wish to use.
@@ -14,11 +15,11 @@ choice
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
 	config BR2_GCC_VERSION_4_2_4
-		depends on !BR2_avr32
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc 4.2.4"
 
 	config BR2_GCC_VERSION_4_3_X
-		depends on !BR2_avr32
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc 4.3.x"
 
 	config BR2_GCC_VERSION_4_4_X
@@ -26,11 +27,11 @@ choice
 		bool "gcc 4.4.x"
 
 	config BR2_GCC_VERSION_4_5_X
-		depends on !BR2_avr32
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc 4.5.x"
 
 	config BR2_GCC_VERSION_SNAP
-		depends on !BR2_avr32
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
 		bool "gcc snapshot"
 endchoice
 

toolchain/gcc/Makefile.in

@@ -37,6 +37,9 @@ endif
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
 GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI)
 endif
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
+GCC_WITH_CPU:=--with-cpu=$(BR2_GCC_TARGET_CPU)
+endif
 
 # AVR32 GCC configuration
 ifeq ($(BR2_avr32),y)

toolchain/gcc/gcc-uclibc-4.x.mk

@@ -229,7 +229,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		$(THREADS) \
 		$(GCC_DECIMAL_FLOAT) \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
+		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_GCC1_CONFIG_OPTIONS) \
 		$(QUIET) \
@@ -306,7 +306,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched
 		$(MULTILIB) \
 		$(GCC_DECIMAL_FLOAT) \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
+		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_GCC2_CONFIG_OPTIONS) \
 		$(QUIET) \
@@ -382,7 +382,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 		$(THREADS) \
 		$(GCC_DECIMAL_FLOAT) \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
+		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_GCC2_CONFIG_OPTIONS) \
@@ -516,7 +516,7 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared
 		$(THREADS) \
 		$(GCC_DECIMAL_FLOAT) \
 		$(SOFT_FLOAT_CONFIG_OPTION) \
-		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) \
+		$(GCC_WITH_ABI) $(GCC_WITH_ARCH) $(GCC_WITH_TUNE) $(GCC_WITH_CPU) \
 		$(DISABLE_LARGEFILE) \
 		$(EXTRA_GCC_CONFIG_OPTIONS) \
 		$(EXTRA_TARGET_GCC_CONFIG_OPTIONS) \

toolchain/gdb/gdb.mk

@@ -97,7 +97,6 @@ $(GDB_TARGET_DIR)/gdb/gdb: $(GDB_TARGET_DIR)/.configured
 	gdb_cv_var_elf=yes \
 	$(MAKE) CC="$(TARGET_CC)" MT_CFLAGS="$(TARGET_CFLAGS)" \
 		-C $(GDB_TARGET_DIR)
-	$(STRIPCMD) $(GDB_TARGET_DIR)/gdb/gdb
 
 $(TARGET_DIR)/usr/bin/gdb: $(GDB_TARGET_DIR)/gdb/gdb
 	install -c -D $(GDB_TARGET_DIR)/gdb/gdb $(TARGET_DIR)/usr/bin/gdb
@@ -152,7 +151,6 @@ $(GDB_SERVER_DIR)/.configured: $(GDB_DIR)/.unpacked
 $(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured
 	$(MAKE) CC="$(TARGET_CC)" MT_CFLAGS="$(TARGET_CFLAGS)" \
 		-C $(GDB_SERVER_DIR)
-	$(STRIPCMD) $(GDB_SERVER_DIR)/gdbserver
 
 $(TARGET_DIR)/usr/bin/gdbserver: $(GDB_SERVER_DIR)/gdbserver
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
@@ -164,6 +162,8 @@ endif
 
 gdbserver: $(TARGET_DIR)/usr/bin/gdbserver
 
+gdbserver-source: $(DL_DIR)/$(GDB_SOURCE)
+
 gdbserver-clean:
 	-$(MAKE) -C $(GDB_SERVER_DIR) clean
 
@@ -211,6 +211,8 @@ $(TARGET_CROSS)gdb: $(GDB_HOST_DIR)/gdb/gdb
 
 gdbhost: $(TARGET_CROSS)gdb
 
+gdbhost-source: $(DL_DIR)/$(GDB_SOURCE)
+
 gdbhost-clean:
 	-$(MAKE) -C $(GDB_HOST_DIR) clean
 

toolchain/kernel-headers/Config.in

@@ -59,10 +59,10 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	default "2.6.30.10"	if BR2_KERNEL_HEADERS_2_6_30
 	default "2.6.31.14"	if BR2_KERNEL_HEADERS_2_6_31
-	default "2.6.32.25"	if BR2_KERNEL_HEADERS_2_6_32
+	default "2.6.32.26"	if BR2_KERNEL_HEADERS_2_6_32
 	default "2.6.33.7"	if BR2_KERNEL_HEADERS_2_6_33
 	default "2.6.34.7"	if BR2_KERNEL_HEADERS_2_6_34
-	default "2.6.35.8"	if BR2_KERNEL_HEADERS_2_6_35
-	default "2.6.36"	if BR2_KERNEL_HEADERS_2_6_36
+	default "2.6.35.9"	if BR2_KERNEL_HEADERS_2_6_35
+	default "2.6.36.1"	if BR2_KERNEL_HEADERS_2_6_36
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

toolchain/toolchain-crosstool-ng/001-no-cvs.patch

@@ -0,0 +1,15 @@
+Remove dependency on cvs.
+
+cvs is used to retrieve newlib, which is not supported
+under Buildroot, so cvs is not required.
+
+--- crosstool-ng-1.8.0/configure.orig	2010-11-27 15:43:52.000000000 +0000
++++ crosstool-ng-1.8.0/configure	2010-11-27 15:44:10.000000000 +0000
+@@ -359,7 +359,6 @@
+              err="'libtool' 1.5.26 or above was not found"
+ has_or_abort prog=stat
+ has_or_abort prog="aria2c curl wget"
+-has_or_abort prog=cvs
+ has_or_abort prog=patch
+ has_or_abort prog=tar
+ has_or_abort prog=gzip

toolchain/toolchain-crosstool-ng/crosstool-ng.mk

@@ -28,7 +28,7 @@ CTNG_UCLIBC_CONFIG_FILE := $(TOPDIR)/toolchain/toolchain-crosstool-ng/uClibc.con
 # to calling ct-ng.
 # $1: the set of arguments to pass to ct-ng
 define ctng
-$(CTNG_DIR)/ct-ng -C $(CTNG_DIR) --no-print-directory $(1)
+PATH=$(HOST_PATH) $(CTNG_DIR)/ct-ng -C $(CTNG_DIR) --no-print-directory $(1)
 endef
 
 #-----------------------------------------------------------------------------
@@ -76,6 +76,8 @@ $(STAMP_DIR)/ct-ng-toolchain-installed: $(STAMP_DIR)/ct-ng-toolchain-built
 
 #-----------------------------------------------------------------------------
 # Building the toolchain
+# Note: $(STAMP_DIR)/ct-ng-toolchain-built can have more dependencies,
+#       depending on the selected C library. Those deps are added later
 
 $(STAMP_DIR)/ct-ng-toolchain-built: $(CTNG_DIR)/.config
 	$(Q)$(call ctng,build.$(BR2_JLEVEL))
@@ -85,15 +87,57 @@ $(STAMP_DIR)/ct-ng-toolchain-built: $(CTNG_DIR)/.config
 #-----------------------------------------------------------------------------
 # Configuring the toolchain
 
-# Note: a lot of the following tricks would become unneeded if one day
-# buildroot and crosstool-NG had matching options, especially for the
-# target description: arch name, bitness, endianness...
+#--------------
+# We push BR options down to CT-NG, munging the default configuration
+# with sed expressions.
+# - first one for non-path options
+# - second for path options (because they have no prompt, they
+#                            always get set to the default value)
+# - third for C library .config (if it has one, eg. uClibc)
+CTNG_FIX_DOT_CONFIG_SED       :=
+CTNG_FIX_DOT_CONFIG_PATHS_SED :=
+CTNG_FIX_DOT_CONFIG_LIBC_SED  :=
 
-# Note-2: missing conformity check between BR's .config and libc features.
-# Use check_uclibc or check_glibc.
+#--------------
+# A few generic functions
+
+# Munge a config file, given a sed expression
+# $1: the .config file to munge
+# $2: the sed expression to apply
+define ctng-fix-dot-config
+	$(Q)sed -r -e '$(2)' $(1) >$(1).sed
+	$(Q)cmp $(1) $(1).sed >/dev/null 2>&1 && rm -f $(1).sed || mv -f $(1).sed $(1)
+endef
+
+# This function checks the .config did actually change
+# If not changed, then current .config will be touched with reference to the
+# stamp file. If the configuration did change, nothing is done.
+# $1: the current .config to check
+# $2: the time-stamped .config file
+define ctng-check-config-changed
+	$(Q)old_md5="$$( grep -v -E '^(#|$$)' $(2) 2>/dev/null  \
+	                 |md5sum                                \
+	                 |cut -d ' ' -f 1                       \
+	               )";                                      \
+	    new_md5="$$( grep -v -E '^(#|$$)' $(1) 2>/dev/null  \
+	                 |md5sum                                \
+	                 |cut -d ' ' -f 1                       \
+	               )";                                      \
+	    if [ $${old_md5} = $${new_md5} -a -f $(2) ]; then   \
+	        touch -r $(2) $(1);                             \
+	    fi
+endef
 
 #--------------
 # Massage BR2_ARCH so that it matches CT-NG's ARCH
+#
+# Note: a lot of the following tricks would become unneeded if one day
+# buildroot and crosstool-NG had matching options, especially for the
+# target description: arch name, bitness, endianness...
+#
+# Note-2: missing conformity check between BR's .config and libc features.
+# Use check_uclibc or check_glibc.
+
 # Defaults:
 CTNG_ARCH   := $(CTNG_BR2_ARCH)
 CTNG_ENDIAN :=
@@ -151,8 +195,6 @@ endif
 # with BR2 config options.
 # Known missing: arch variant & options, floating point (HW/SW), uClibc/eglibc config...
 #
-
-CTNG_FIX_DOT_CONFIG_SED :=
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_INSTALL_DIR_RO)=y:\# \1 is not set:;
 CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_ARCH_[BL]E).*:\# \2 is not set:;
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_ENDIAN)) is not set:\1=y:;
@@ -173,22 +215,70 @@ endif
 
 #--------------
 # And the specials for paths
-CTNG_FIX_DOT_CONFIG_PATHS_SED :=
 CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_PREFIX_DIR)=.*:\1="$(TOOLCHAIN_DIR)":;
 CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_LOCAL_TARBALLS_DIR)=.*:\1="$(DL_DIR)":;
 CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_SYSROOT_DIR_PREFIX)=.*:\1="":;
+
+#--------------
+# uClibc specific options
 ifeq ($(BR2_TOOLCHAIN_CTNG_uClibc),y)
-CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_LIBC_UCLIBC_CONFIG_FILE)=.*:\1="$(CTNG_UCLIBC_CONFIG_FILE)":;
+
+# Handle the locales option
+ifneq ($(call qstrip,$(BR2_ENABLE_LOCALE)),)
+CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_LOCALES) is not set:\1=y\n\# CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA is not set:;
+CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA)=.*:\# \1 is not set:;
+else
+CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES)=.*:\# \1 is not set:;
 endif
 
+# Handle the wide-char option
+ifneq ($(call qstrip,$(BR2_USE_WCHAR)),)
+CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_WCHAR) is not set:\1=y:;
+else
+CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_WCHAR)=.*:\# \1 is not set:;
+endif
+
+# Handle the LFS option
+ifneq ($(call qstrip,$(BR2_LARGEFILE)),)
+CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_LFS) is not set:\1=y:;
+else
+CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_LFS)=.*:\# \1 is not set:;
+endif
+
+# Handle the IPv6 option
+ifneq ($(call qstrip,$(BR2_INET_IPV6)),)
+CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_IPV6) is not set:\1=y:;
+else
+CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_IPV6)=.*:\# \1 is not set:;
+endif
+
+# Handle the RPC option
+ifneq ($(call qstrip,$(BR2_INET_RPC)),)
+CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_RPC) is not set:\1=y\nUCLIBC_HAS_FULL_RPC=y\nUCLIBC_HAS_REENTRANT_RPC=y:;
+CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_FULL_RPC) is not set:\1=y:;
+CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_REENTRANT_RPC) is not set:\1=y:;
+else
+CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_RPC)=.*:\# \1 is not set:;
+endif
+
+# Instruct CT-NG's .config where to find the uClibc's .config
+CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_LIBC_UCLIBC_CONFIG_FILE)=.*:\1="$(CTNG_DIR)/libc.config":;
+
+# And add this to the toolchain build dependency
+$(STAMP_DIR)/ct-ng-toolchain-built: $(CTNG_DIR)/libc.config
+
+# And here is how we get this uClibc's .config
+$(CTNG_DIR)/libc.config: $(CTNG_UCLIBC_CONFIG_FILE) $(CONFIG_DIR)/.config
+	-$(Q)cp -a $@ $@.timestamp
+	$(Q)cp -f $< $@
+	$(call ctng-fix-dot-config,$@,$(CTNG_FIX_DOT_CONFIG_LIBC_SED))
+	$(call ctng-check-config-changed,$@,$@.timestamp)
+	$(Q)rm -f $@.timestamp
+
+endif # LIBC is uClibc
+
 #--------------
 # Small functions to shoe-horn the above into crosstool-NG's .config
-# $1: the .config file to munge
-# $2: the sed expression to apply
-define ctng-fix-dot-config
-	$(Q)sed -r -e '$(2)' $(1) >$(1).sed
-	$(Q)cmp $(1) $(1).sed >/dev/null 2>&1 && rm -f $(1).sed || mv -f $(1).sed $(1)
-endef
 
 # Function to update the .config
 # We first munge the .config to shoe-horn defaults, then we push that unto
@@ -207,32 +297,18 @@ define ctng-oldconfig
 	$(call ctng-fix-dot-config,$(1),$(CTNG_FIX_DOT_CONFIG_PATHS_SED))
 endef
 
-# This function checks the confguration of the toolchain did actually change
-# If not changed, then current .config will be touched with reference to the
-# stamp file. If the configuration did change, nothing is done.
-# $1: the current .config to check
-# $2: the time-stamped .config file
-define ctng-check-config-changed
-	$(Q)old_md5="$$( grep -v -E '^(#|$$)' $(2) 2>/dev/null  \
-	                 |md5sum                                \
-	                 |cut -d ' ' -f 1                       \
-	               )";                                      \
-	    new_md5="$$( grep -v -E '^(#|$$)' $(1) 2>/dev/null  \
-	                 |md5sum                                \
-	                 |cut -d ' ' -f 1                       \
-	               )";                                      \
-	    if [ $${old_md5} = $${new_md5} -a -f $(2) ]; then   \
-	        touch -r $(2) $(1);                             \
-	    fi
-endef
-
 # Default configuration
 # Depends on top-level .config because it has options we have to shoe-horn
 # into crosstool-NG's .config
 # Only copy the original .config file if we don't have one already
+# We need to call oldconfig twice in a row to ensure the options
+# are correctly set ( eg. if an option is new, then the initial sed
+# can't do anything about it ) Ideally, this should go in oldconfig
+# itself, but it's much easier to handle here.
 $(CTNG_DIR)/.config: $(CTNG_CONFIG_FILE) $(CTNG_DIR)/ct-ng $(CONFIG_DIR)/.config
 	$(Q)[ -f $@ ] && cp -a $@ $@.timestamp || cp -f $< $@
 	$(call ctng-oldconfig,$@)
+	$(call ctng-oldconfig,$@)
 	$(call ctng-check-config-changed,$@,$@.timestamp)
 	$(Q)rm -f $@.timestamp
 
@@ -267,8 +343,16 @@ $(CTNG_DIR)/.patched: $(CTNG_DIR)/.unpacked
 	                              \*.patch.$(ARCH)
 	$(Q)touch $@
 
+# Use order-only dependencies on host-* as they
+# are virtual targets with no rules, and so are
+# considered always remade. But we do not want
+# to reconfigure and rebuild ct-ng every time
+# we need to run it...
+$(CTNG_DIR)/.configured: | host-gawk        \
+                           host-automake
+
 $(CTNG_DIR)/.configured: $(CTNG_DIR)/.patched
-	$(Q)cd $(CTNG_DIR) && ./configure --local
+	$(Q)cd $(CTNG_DIR) && PATH=$(HOST_PATH) ./configure --local
 	$(Q)touch $@
 
 $(CTNG_DIR)/ct-ng: $(CTNG_DIR)/.configured

toolchain/toolchain-external/Config.in

@@ -14,9 +14,9 @@ config BR2_TOOLCHAIN_EXTERNAL_GLIBC
 endchoice
 
 config BR2_TOOLCHAIN_EXTERNAL_STRIP
-        bool
-        default y
-        prompt "Strip shared libraries"
+	bool
+	default y
+	prompt "Strip shared libraries"
 	help
 	  Strip shared libraries copied from the external toolchain.
 endif

toolchain/uClibc/uClibc-0.9.31-powerpc-ptrace-fix.patch

@@ -0,0 +1,62 @@
+[PATCH] powerpc: add PTRACE_EVENT_ defines needed by ltrace
+
+Equivalent to the common version and kernel headers.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ libc/sysdeps/linux/powerpc/sys/ptrace.h |   41 +++++++++++++++++++++++++++++++-
+ 1 file changed, 40 insertions(+), 1 deletion(-)
+
+Index: uClibc-0.9.31/libc/sysdeps/linux/powerpc/sys/ptrace.h
+===================================================================
+--- uClibc-0.9.31.orig/libc/sysdeps/linux/powerpc/sys/ptrace.h
++++ uClibc-0.9.31/libc/sysdeps/linux/powerpc/sys/ptrace.h
+@@ -79,8 +79,47 @@ enum __ptrace_request
+ #define PT_DETACH PTRACE_DETACH
+ 
+   /* Continue and stop at the next (return from) syscall.  */
+-  PTRACE_SYSCALL = 24
++  PTRACE_SYSCALL = 24,
+ #define PT_SYSCALL PTRACE_SYSCALL
++
++  /* Set ptrace filter options.  */
++  PTRACE_SETOPTIONS = 0x4200,
++#define PT_SETOPTIONS PTRACE_SETOPTIONS
++
++  /* Get last ptrace message.  */
++  PTRACE_GETEVENTMSG = 0x4201,
++#define PT_GETEVENTMSG PTRACE_GETEVENTMSG
++
++  /* Get siginfo for process.  */
++  PTRACE_GETSIGINFO = 0x4202,
++#define PT_GETSIGINFO PTRACE_GETSIGINFO
++
++  /* Set new siginfo for process.  */
++  PTRACE_SETSIGINFO = 0x4203
++#define PT_SETSIGINFO PTRACE_SETSIGINFO
++};
++
++
++/* Options set using PTRACE_SETOPTIONS.  */
++enum __ptrace_setoptions {
++  PTRACE_O_TRACESYSGOOD	= 0x00000001,
++  PTRACE_O_TRACEFORK	= 0x00000002,
++  PTRACE_O_TRACEVFORK   = 0x00000004,
++  PTRACE_O_TRACECLONE	= 0x00000008,
++  PTRACE_O_TRACEEXEC	= 0x00000010,
++  PTRACE_O_TRACEVFORKDONE = 0x00000020,
++  PTRACE_O_TRACEEXIT	= 0x00000040,
++  PTRACE_O_MASK		= 0x0000007f
++};
++
++/* Wait extended result codes for the above trace options.  */
++enum __ptrace_eventcodes {
++  PTRACE_EVENT_FORK	= 1,
++  PTRACE_EVENT_VFORK	= 2,
++  PTRACE_EVENT_CLONE	= 3,
++  PTRACE_EVENT_EXEC	= 4,
++  PTRACE_EVENT_VFORK_DONE = 5,
++  PTRACE_EVENT_EXIT	= 6
+ };
+ 
+ /* Perform process tracing functions.  REQUEST is one of the values

toolchain/uClibc/uClibc-snapshot.config

@@ -107,7 +107,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 # COMPAT_ATEXIT is not set
 UCLIBC_SUSV3_LEGACY=y
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
-# UCLIBC_SUSV4_LEGACY is not set
+UCLIBC_SUSV4_LEGACY=y
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
@@ -115,7 +115,7 @@ UCLIBC_HAS_PTY=y
 ASSUME_DEVPTS=y
 UNIX98PTY_ONLY=y
 UCLIBC_HAS_GETPT=y
-# UCLIBC_HAS_LIBUTIL is not set
+UCLIBC_HAS_LIBUTIL=y
 UCLIBC_HAS_TM_EXTENSIONS=y
 UCLIBC_HAS_TZ_CACHING=y
 UCLIBC_HAS_TZ_FILE=y
@@ -160,8 +160,8 @@ UCLIBC_USE_NETLINK=y
 # UCLIBC_HAS_BSD_RES_CLOSE is not set
 UCLIBC_HAS_COMPAT_RES_STATE=y
 # UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
-# UCLIBC_HAS_LIBRESOLV_STUB is not set
-# UCLIBC_HAS_LIBNSL_STUB is not set
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBNSL_STUB=y
 
 #
 # String and Stdio Support
@@ -183,6 +183,7 @@ UCLIBC_HAS_XLOCALE=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 # UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+# USE_OLD_VFPRINTF is not set
 UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
 UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
 # UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
@@ -219,6 +220,7 @@ UCLIBC_HAS_FNMATCH=y
 # UCLIBC_HAS_FNMATCH_OLD is not set
 # UCLIBC_HAS_WORDEXP is not set
 # UCLIBC_HAS_NFTW is not set
+# UCLIBC_HAS_FTW is not set
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 # UCLIBC_HAS_UTMPX is not set