Update for 2009.05-rc1, add CHANGES

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

.defconfig

@@ -1,64 +1,54 @@
 #
 # Automatically generated make config: don't edit
+# Mon Feb 18 09:11:56 2008
 #
 BR2_HAVE_DOT_CONFIG=y
+# BR2_alpha is not set
 # BR2_arm is not set
 # BR2_armeb is not set
+# BR2_avr32 is not set
 # BR2_cris is not set
+# BR2_ia64 is not set
 BR2_i386=y
 # BR2_m68k is not set
 # BR2_mips is not set
 # BR2_mipsel is not set
+# BR2_nios2 is not set
 # BR2_powerpc is not set
 # BR2_sh is not set
+# BR2_sh64 is not set
 # BR2_sparc is not set
-BR2_ARCH="i386"
-BR2_WGET="wget --passive-ftp"
+# BR2_sparc64 is not set
+# BR2_x86_64 is not set
+# BR2_x86_i386 is not set
+# BR2_x86_i486 is not set
+# BR2_x86_i586 is not set
+BR2_x86_i686=y
+# BR2_x86_pentiumpro is not set
+# BR2_x86_pentium_mmx is not set
+# BR2_x86_pentium_m is not set
+# BR2_x86_pentium2 is not set
+# BR2_x86_pentium3 is not set
+# BR2_x86_pentium4 is not set
+# BR2_x86_prescott is not set
+# BR2_x86_nocona is not set
+# BR2_x86_core2 is not set
+# BR2_x86_k6 is not set
+# BR2_x86_k6_2 is not set
+# BR2_x86_athlon is not set
+# BR2_x86_athlon_4 is not set
+# BR2_x86_opteron is not set
+# BR2_x86_opteron_sse3 is not set
+# BR2_x86_barcelona is not set
+# BR2_x86_geode is not set
+# BR2_x86_c3 is not set
+# BR2_x86_winchip_c6 is not set
+# BR2_x86_winchip2 is not set
+BR2_ARCH="i686"
+BR2_ENDIAN="LITTLE"
+BR2_GCC_TARGET_TUNE="i686"
+BR2_GCC_TARGET_ARCH="i686"
 
 #
-# Toolchain Options
+# Target options
 #
-BR2_KERNEL_HEADERS_2_6_19_2=y
-BR2_DEFAULT_KERNEL_HEADERS="2.6.19.2"
-# BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_0_9_28_1=y
-# BR2_ENABLE_LOCALE is not set
-# BR2_BINUTILS_VERSION_2_14_90_0_8 is not set
-# BR2_BINUTILS_VERSION_2_15 is not set
-# BR2_BINUTILS_VERSION_2_15_94_0_2_2 is not set
-# BR2_BINUTILS_VERSION_2_16_1 is not set
-# BR2_BINUTILS_VERSION_2_16_90_0_3 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_5 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_6 is not set
-# BR2_BINUTILS_VERSION_2_16_91_0_7 is not set
-BR2_BINUTILS_VERSION_2_17=y
-# BR2_BINUTILS_VERSION_2_17_50_0_2 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_3 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_4 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_5 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_6 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_7 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_8 is not set
-# BR2_BINUTILS_VERSION_2_17_50_0_9 is not set
-# BR2_BINUTILS_VERSION is not set
-# BR2_GCC_VERSION_3_3_5 is not set
-# BR2_GCC_VERSION_3_3_6 is not set
-# BR2_GCC_VERSION_3_4_2 is not set
-# BR2_GCC_VERSION_3_4_3 is not set
-# BR2_GCC_VERSION_3_4_4 is not set
-# BR2_GCC_VERSION_3_4_5 is not set
-# BR2_GCC_VERSION_3_4_6 is not set
-# BR2_GCC_VERSION_4_0_0 is not set
-# BR2_GCC_VERSION_4_0_1 is not set
-# BR2_GCC_VERSION_4_0_2 is not set
-# BR2_GCC_VERSION_4_0_3 is not set
-# BR2_GCC_VERSION_4_1_0 is not set
-BR2_GCC_VERSION_4_1_1=y
-BR2_GCC_USE_SJLJ_EXCEPTIONS="--enable-sjlj-exceptions"
-BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-# BR2_INSTALL_LIBSTDCPP is not set
-# BR2_PACKAGE_GDB is not set
-# BR2_PACKAGE_GDB_SERVER is not set
-# BR2_ENABLE_MULTILIB is not set
-BR2_LARGEFILE=y
-BR2_TARGET_OPTIMIZATION="-Os -pipe"

.gitignore

@@ -0,0 +1,10 @@
+/build_*
+/project_*
+/toolchain_*
+/binaries/*
+/.auto.deps
+/.config.cmd
+/.config.old
+/.config
+*.depend
+*.o

CHANGES

@@ -0,0 +1,66 @@
+2009.05-rc1, Released May 5th, 2009:
+
+	Fixes all over the tree, further conversion of packages to
+	Makefile.autotools.in and we now build host versions of
+	packages where needed for build time dependencies instead of
+	relying on the correct versions being available on the build
+	host. Ancient toolchain / busybox versions have furthermore
+	been removed as announced in the 2009.02 release notes.
+
+	New packages: flac, gob2, lzop, taglib, wpa_supplicant
+
+	Updated packages: avahi, bind, binutils, busybox, dbus, dbus-glib,
+	directfb, dnsmasq, freetype, gcc, gmp, gstreamer, iptables, kernel
+	headers, kexec, libglib2, libpng, libsndfile, lua, mpfr, ntfs-3g,
+	openssl, php, qtopia4, rsync, samba, sqlite, tar, uboot, uclibc,
+	util-linux, xorg7, xerces
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#5,#77,#141,#143: Convert php package to Makefile.autotools.in
+         and a ton of other improvements
+	#19: page.h missing by util-linux
+	#37: update libglib2 to version 2.18.4
+	#61: tslib puts staging_dir into pkgconfig file
+	#69: tar refuses to build
+	#71,#175: ./wchar.h:41:12: error: empty filename in #include
+	#73: Bump openssl package to the latest version
+	#81: New package wpa_supplicant
+	#99: new package: flac
+	#101: update gstreamer packages
+	#105,#313: menuconfig segfaults on tinyx if wchar is not
+         selected
+	#107: convert libvorbis to Makefile.autotools.in
+	#109: Make pppd package avoid bsd err
+	#111: binutils 2.17 fails to build when texinfo >= 4.10
+	#133: Modify ncurses5-config to get correct include path
+	#137: Bump php to version 5.2.9
+	#139: Bump sqlite to 3.6.11 and convert to
+         Makefile.autotools.in
+	#145: Bump bind package to 9.5.1-P1 (security)
+	#147: buildroot toolchain fails to build w/binutils-2.19.1
+	#151: openssl package trivial fixes
+	#161: vim fails on patching with errors in configure.patch
+	#169: blackbox-0.70.1 does not build
+	#177: xdriver_xf86-input-keyboard does not build
+	#179: Upgrade dropbear to Makefile.autotools.in
+	#181: Update to Xorg 7.4
+	#187: ntfs-3g: could not build cross
+	#191: alsa-lib ARM binaries always built with EABI
+	#213: Bump wpa_supplicant package to version 0.6.9
+	#217: Bump openssl package to 0.9.8k (security)
+	#219: Toolchain build fails on m4
+	#225: m4 macros are out of place
+	#233: make ipv6 optional in iptables
+	#237: ncftp: convert to Makefile.autotools.in
+	#239: ntfs-3g: convert to Makefile.autotools.in
+	#245: lzop: new package
+	#271: Bump bind package to 9.5.1-P2 (security)
+	#277: Bump sqlite package to 3.6.16
+	#279: update libglib2 to version 2.20.1
+	#281: update DirectFB to version 1.2.8
+	#283: add taglib
+	#285: compilation of samba fails if IPV6 support is missing
+	#293: update samba to version 3.3.3
+	#299: add shared-mime-info package
+	#307: make openssl package respect build flags

Config.in

@@ -6,205 +6,12 @@ config BR2_HAVE_DOT_CONFIG
 	bool
 	default y
 
-choice
-	prompt "Target Architecture"
-	default BR2_i386
-	help
-	  Select the target architecture family to build for.
-
-config BR2_alpha
-	bool "alpha"
-config BR2_arm
-	bool "arm"
-config BR2_armeb
-	bool "armeb"
-config BR2_avr32
-	bool "avr32"
-config BR2_cris
-	bool "cris"
-config BR2_i386
-	bool "i386"
-config BR2_m68k
-	bool "m68k"
-config BR2_mips
-	bool "mips"
-config BR2_mipsel
-	bool "mipsel"
-config BR2_nios2
-	bool "nios2"
-config BR2_powerpc
-	bool "powerpc"
-config BR2_sh
-	bool "superh"
-config BR2_sh64
-	bool "superh64"
-config BR2_sparc
-	bool "sparc"
-config BR2_x86_64
-	bool "x86_64"
-endchoice
-
-#
-# Keep the variants separate, there's no need to clutter everything else.
-# sh is fairly "special" in this regard, as virtually everyone else has
-# things kept down to a _sensible_ number of target variants. No such
-# luck for sh..
-#
-choice
-	prompt "Target Architecture Variant"
-	depends BR2_arm || BR2_armeb
-	default BR2_generic_arm
-	help
-	  Specific CPU variant to use
-
-config BR2_generic_arm
-	bool "generic_arm"
-config BR2_arm610
-	bool "arm610"
-config BR2_arm710
-	bool "arm710"
-config BR2_arm720t
-	bool "arm720t"
-config BR2_arm920t
-	bool "arm920t"
-config BR2_arm922t
-	bool "arm922t"
-config BR2_arm926t
-	bool "arm926t"
-config BR2_arm1136jf_s
-	bool "arm1136jf_s"
-config BR2_arm1176jz_s
-	bool "arm1176jz-s"
-config BR2_arm1176jzf_s
-	bool "arm1176jzf-s"
-config BR2_sa110
-	bool "sa110"
-config BR2_sa1100
-	bool "sa1100"
-config BR2_xscale
-	bool "xscale"
-config BR2_iwmmxt
-	bool "iwmmxt"
-endchoice
-
-config BR2_ARM_TYPE
+config BR2_VERSION
 	string
-	default ARM610		if BR2_arm610
-	default ARM710		if BR2_arm710
-	default ARM720T		if BR2_arm720t
-	default ARM920T		if BR2_arm920t
-	default ARM922T		if BR2_arm922t
-	default ARM926T		if BR2_arm926t
-	default ARM1136JF_S 	if BR2_arm1136jf_s
-	default ARM1176JZ_S	if BR2_arm1176jz_s
-	default ARM1176JZF_S	if BR2_arm1176jzf_s
-	default ARM_SA110	if BR2_sa110
-	default ARM_SA1100	if BR2_sa1100
-	default ARM_XSCALE	if BR2_xscale
-	default ARM_IWMMXT	if BR2_iwmmxt
-	default GENERIC_ARM	if BR2_generic_arm
+	default "2009.05-rc1"
 
-choice
-	prompt "Target ABI"
-	depends BR2_arm || BR2_armeb
-	default BR2_ARM_OABI
-	help
-	  Application Binary Interface to use
-
-config BR2_ARM_OABI
-	bool "OABI"
-config BR2_ARM_EABI
-	bool "EABI"
-endchoice
-
-choice
-	prompt "Target Architecture Variant"
-	depends BR2_avr32
-config BR2_ap7000
-	bool "AP7000"
-config BR2_ap7010
-	bool "AP7010"
-config BR2_ap7020
-	bool "AP7020"
-endchoice
-
-
-choice
-	prompt "Target Architecture Variant"
-	depends BR2_sh
-	default BR2_sh4
-	help
-	  Specific CPU variant to use
-
-config BR2_sh2a_nofpueb
-	bool "sh2a_nofpueb"
-config BR2_sh2eb
-	bool "sh2eb"
-config BR2_sh3
-	bool "sh3"
-config BR2_sh3eb
-	bool "sh3eb"
-config BR2_sh4
-	bool "sh4"
-config BR2_sh4eb
-	bool "sh4eb"
-endchoice
-
-#
-# gcc builds libstdc++ differently depending on the
-# host tuplet given to it, so let people choose
-#
-choice
-	prompt "Target Architecture Variant"
-	depends BR2_i386
-	default BR2_x86_i686
-	help
-	  Specific CPU variant to use
-
-config BR2_x86_i386
-	bool "i386"
-config BR2_x86_i486
-	bool "i486"
-config BR2_x86_i586
-	bool "i586"
-config BR2_x86_i686
-	bool "i686"
-endchoice
-
-config BR2_ARCH
-	string
-	default "alpha"		if BR2_alpha
-	default "arm"		if BR2_arm
-	default "armeb"		if BR2_armeb
-	default "avr32"		if BR2_avr32
-	default "cris"		if BR2_cris
-	default "i386"		if BR2_x86_i386
-	default "i486"		if BR2_x86_i486
-	default "i586"		if BR2_x86_i586
-	default "i686"		if BR2_x86_i686
-	default "m68k"		if BR2_m68k
-	default "mips"		if BR2_mips
-	default "mipsel"	if BR2_mipsel
-	default "nios2"		if BR2_nios2
-	default "powerpc"	if BR2_powerpc
-	default "sh2a_nofpueb"	if BR2_sh2a_nofpueb
-	default "sh2eb"		if BR2_sh2eb
-	default "sh3"		if BR2_sh3
-	default "sh3eb"		if BR2_sh3eb
-	default "sh4"		if BR2_sh4
-	default "sh4eb"		if BR2_sh4eb
-	default "sh64"		if BR2_sh64
-	default "sparc"		if BR2_sparc
-	default "x86_64"	if BR2_x86_64
-
-config BR2_ENDIAN
-	string
-	default "LITTLE" if BR2_arm || BR2_cris || BR2_i386 || BR2_mipsel || \
-	                    BR2_sh3 || BR2_sh4 || BR2_x86_64 || BR2_nios2 || \
-			    BR2_sh64
-	default "BIG"    if BR2_alpha || BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || \
-	                    BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \
-	                    BR2_sh3eb || BR2_sh4eb || BR2_sparc
+source "target/Config.in.arch"
+source "target/device/Config.in"
 
 menu "Build options"
 
@@ -212,10 +19,18 @@ config BR2_WGET
 	string "Wget command"
 	default "wget --passive-ftp -nd"
 
-config BR2_SVN
-	string "Subversion (svn) checkout command"
+config BR2_SVN_CO
+	string "Subversion (svn) command to download source tree"
 	default "svn co"
 
+config BR2_SVN_UP
+	string "Subversion (svn) command to update source tree"
+	default "svn up"
+
+config BR2_GIT
+	string "Git command to download source tree"
+	default "git clone"
+
 config BR2_ZCAT
 	string "zcat command"
 	default "gzip -d -c"
@@ -249,45 +64,20 @@ config BR2_DL_DIR
 	default "$(BASE_DIR)/dl"
 	help
 	  Directory to store all the source files that we need to fetch.
+	  If the Linux shell environment has defined the BUILDROOT_DL_DIR
+	  environment variable, then this overrides this configuration item.
 
-config BR2_SOURCEFORGE_MIRROR
-	string "Sourceforge mirror site"
-	default "easynews"
+	  The default is $(BASE_DIR)/dl
+
+config BR2_COPYTO
+	string "Copy result to..."
+	default ""
 	help
-	  Sourceforge has a system of mirror sites.  Some sites may be closer
-	  to your location, and sometimes mirror sites go down and are no longer
-	  available.  This option allows you to select your preferred Sourceforge
-	  mirror site.
+	  Setting this variable will (eventually) override 
+	  any other copyto configurations in buildroot.
 
-	  The list of mirrors is available here:
-	  http://prdownloads.sourceforge.net/index-sf.html?download
+source	"target/device/Config.in.mirrors"
 
-config BR2_ATMEL_MIRROR
-	depends BR2_avr32 || BR2_arm
-	string "Atmel AVR32/AT91 download site"
-	default "ftp://at91dist:distrib@81.80.104.162/AT91_Third_Party_Design_Flow/Linux_Host/"
-	help
-	  Unofficial site for AVR32/AT91 Buildroot patches, or your local mirror.
-	  Atmel does not currently support buildroot, but this site makes
-	  available neccessary patches and prepatched packages useful
-	  to extend a buildroot for AVR32 or AT91 ARM based boards.
-	  Issues with contents of this server needs to be highlighted
-	  on the buildroot mailing list and
-	  should not be addressed directly to Atmel
-	  Atmel provides support for their AVR32 chips on 
-	  http://avr32linux.org/ or http://www.avrfreaks.net/
-	  Atmel provides support for AT91 chips on www.at91.com.
-	  Commercial AT91 Linux support is through www.timesys.com
-	  Community  AT91 Linux support is through http://maxim.org.za/AT91_26.html
-
-config BR2_AT91_PATCH_MIRROR
-	depends BR2_arm
-	string "Atmel AT91 Linux Patch download site"
-	default "http://maxim.org.za/AT91RM9200/2.6/"
-	help
-	  Patches for the AT91 generated by the Linux community
-	  usually ends up here, courtesy of Andrew Victor
-	  
 config BR2_STAGING_DIR
 	string "Toolchain and header file location?"
 	default "$(BUILD_DIR)/staging_dir"
@@ -301,6 +91,13 @@ config BR2_STAGING_DIR
 	  Most people will leave this set to the default value of
 	  "$(BUILD_DIR)/staging_dir".
 
+config BR2_FPU_SUFFIX
+	bool "Add '_nofpu' suffix for softfloat toolchains"
+	help
+	  If the toolchain is configured to use softfloat, then
+	  the "_nofpu" suffix will be added to the toolchain build
+	  directory name and to any rootfs image name
+
 config BR2_TOPDIR_PREFIX
 	string "Custom build dir prefix"
 	default ""
@@ -317,7 +114,7 @@ config BR2_TOPDIR_SUFFIX
 	  Add a custom string to the end of the build directories.
 
 	  build_ARCH -> build_ARCH_[SUFFIX]
-	  toolchain_build_ARCH -> toolchain_build_ARCH_[SUFFIX] 
+	  toolchain_build_ARCH -> toolchain_build_ARCH_[SUFFIX]
 
 config BR2_GNU_BUILD_SUFFIX
 	string "GNU build hostname suffix"
@@ -348,6 +145,7 @@ config BR2_GNU_TARGET_SUFFIX
 	  Default options are:
 	      linux-uclibcgnueabi for ARM EABI
 	      linux-uclibc for the rest
+	      gnuhurd-uclibc for the hurd
 
 config BR2_JLEVEL
 	int "Number of jobs to run simultaneously"
@@ -357,7 +155,6 @@ config BR2_JLEVEL
 
 config BR2_PREFER_IMA
 	bool "prefer IMA compiles"
-	default n
 	help
 	  Where possible, compile package with Inter Module Analysis.
 	  This potentially uses alot of system resources on your compile
@@ -369,10 +166,196 @@ config BR2_PREFER_IMA
 
 config BR2_DEPRECATED
 	bool "Show packages that are deprecated or obsolete"
-	default n
 	help
 	  This option hides outdated/obsolete versions of packages.
 
+config BR2_RECENT
+	bool "Show packages that are of the latest major version"
+	default y
+	help
+	  This option show recent versions of packages.
+
+config BR2_CONFIG_CACHE
+	bool "Use a central configure cache file"
+	help
+	  This determines if a central config cache is used by
+	  packages, reducing the configure time for packages as each
+	  one caches its findings.
+
+config BR2_ENABLE_DEBUG
+	bool "build packages with debugging symbols"
+	select BR2_PACKAGE_GDB_SERVER
+	help
+	  Build packages with debugging symbols
+	  enabled
+
+if BR2_ENABLE_DEBUG
+choice
+	prompt "gcc debug level"
+	default BR2_DEBUG_2
+	help
+	  Set the debug level for gcc
+
+config BR2_DEBUG_1
+	bool "debug level 1"
+	help
+	  Debug level 1 produces minimal information, enough
+	  for making backtraces in parts of the program that
+	  you don't plan to debug. This includes descriptions
+	  of functions and external variables, but no information
+	  about local variables and no line numbers.
+
+config BR2_DEBUG_2
+	bool "debug level 2"
+	help
+	  The default gcc debug level is 2
+
+config BR2_DEBUG_3
+	bool "debug level 3"
+	help
+	  Level 3 includes extra information, such as all the
+	  macro definitions present in the program. Some debuggers
+	  support macro expansion when you use -g3.
+endchoice
+endif
+
+choice
+	prompt "strip"
+	default BR2_STRIP_strip
+	help
+	  Select whether to strip binaries and libraries for the target
+	  or not.
+	  strip   is the normal strip command
+	  sstrip  is a strip that discards more than the normal strip
+	  none    do not strip (only for debugging!)
+
+config BR2_STRIP_strip
+	bool "strip"
+	depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT
+	help
+	  strip   is the normal strip command
+
+config BR2_STRIP_sstrip
+	bool "sstrip"
+	select BR2_PACKAGE_SSTRIP_HOST
+	depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT
+	help
+	  sstrip  is a strip that discards more than the normal strip
+
+config BR2_STRIP_none
+	bool "none"
+	help
+	  none    do not strip (only for debugging!)
+endchoice
+
+choice
+	prompt "gcc optimization level"
+	default BR2_OPTIMIZE_S
+	help
+	  Set the optimization level for gcc
+
+config BR2_OPTIMIZE_0
+	bool "optimization level 0"
+	depends on !BR2_PACKAGE_LINUX
+	help
+	  Do not optimize. This is the default.
+
+config BR2_OPTIMIZE_1
+	bool "optimization level 1"
+	depends on !BR2_PACKAGE_LINUX
+	help
+	  Optimize. Optimizing compilation takes somewhat more time,
+	  and a lot more memory for a large function. With -O, the
+	  compiler tries to reduce code size and execution time,
+	  without performing any optimizations that take a great deal
+	  of compilation time. -O turns on the following optimization
+	  flags: -fdefer-pop -fdelayed-branch -fguess-branch-probability
+	  -fcprop-registers -floop-optimize -fif-conversion
+	  -fif-conversion2 -ftree-ccp -ftree-dce -ftree-dominator-opts
+	  -ftree-dse -ftree-ter -ftree-lrs -ftree-sra -ftree-copyrename
+	  -ftree-fre -ftree-ch -funit-at-a-time -fmerge-constants
+	  -O also turns on -fomit-frame-pointer on machines where doing
+	  so does not interfere with debugging.
+
+config BR2_OPTIMIZE_2
+	bool "optimization level 2"
+	help
+	  Optimize even more. GCC performs nearly all supported optimizations
+	  that do not involve a space-speed tradeoff. The compiler does not
+	  perform loop unrolling or function inlining when you specify -O2.
+	  As compared to -O, this option increases both compilation time and
+	  the performance of the generated code. -O2 turns on all optimization
+	  flags specified by -O. It also turns on the following optimization
+	  flags: -fthread-jumps -fcrossjumping -foptimize-sibling-calls
+	  -fcse-follow-jumps -fcse-skip-blocks -fgcse  -fgcse-lm
+	  -fexpensive-optimizations -fstrength-reduce -frerun-cse-after-loop
+	  -frerun-loop-opt -fcaller-saves -fpeephole2 -fschedule-insns
+	  -fschedule-insns2 -fsched-interblock -fsched-spec -fregmove
+	  -fstrict-aliasing -fdelete-null-pointer-checks -freorder-blocks
+	  -freorder-functions -falign-functions -falign-jumps -falign-loops
+	  -falign-labels -ftree-vrp -ftree-pre
+	  Please note the warning under -fgcse about invoking -O2 on programs
+	  that use computed gotos.
+
+config BR2_OPTIMIZE_3
+	bool "optimization level 3"
+	help
+	  Optimize yet more. -O3 turns on all optimizations specified by -O2
+	  and also turns on the -finline-functions, -funswitch-loops and
+	  -fgcse-after-reload options.
+
+config BR2_OPTIMIZE_S
+	bool "optimize for size"
+	help
+	  Optimize for size. -Os enables all -O2 optimizations that do not
+	  typically increase code size. It also performs further optimizations
+	  designed to reduce code size. -Os disables the following optimization
+	  flags: -falign-functions -falign-jumps -falign-loops -falign-labels
+	  -freorder-blocks -freorder-blocks-and-partition -fprefetch-loop-arrays
+	  -ftree-vect-loop-version
+
+endchoice
+
+config BR2_PREFER_STATIC_LIB
+	bool "prefer static libraries"
+	help
+	  Where possible, build and use static libraries for the target.
+	  This potentially increases your code size and should only be
+	  used if you know what you do.
+	  The default is to build dynamic libraries and use those on
+	  the target filesystem.
+
+	  WARNING: This is highly experimental at the moment.
+
+config BR2_HAVE_MANPAGES
+	bool "manpages on the target"
+	help
+	  Leave the manpages on the target.
+	  If you say n here, your target will not contain any
+	  manpage.
+
+config BR2_HAVE_INFOPAGES
+	bool "infopages on the target"
+	help
+	  Leave the infopages on the target.
+	  If you say n here, your target will not contain any
+	  infopage.
+
+config BR2_HAVE_DOCUMENTATION
+	bool "documentation on the target"
+	help
+	  Leave the documentation on the target.
+	  If you say n here, your target will not contain any
+	  documentation.
+
+config BR2_HAVE_DEVFILES
+	bool "development files in target filesystem"
+	help
+	  Install headers and static libraries in the
+	  target filesystem
+
+source package/gnuconfig/Config.in
+
 endmenu
 
 source "toolchain/Config.in"

Makefile

@@ -1,6 +1,7 @@
 # Makefile for buildroot2
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 2006-2009 by the Buildroot developers <buildroot@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,40 +23,201 @@
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
 TOPDIR=./
-CONFIG_CONFIG_IN = Config.in
-CONFIG_DEFCONFIG = .defconfig
-CONFIG = package/config
+CONFIG_CONFIG_IN=Config.in
+CONFIG_DEFCONFIG=.defconfig
+CONFIG=package/config
+DATE:=$(shell date +%Y%m%d)
 
-noconfig_targets := menuconfig config oldconfig randconfig \
-	defconfig allyesconfig allnoconfig release tags    \
+noconfig_targets:=menuconfig config oldconfig randconfig \
+	defconfig allyesconfig allnoconfig release tags \
+	source-check help
 
-#	$(shell find . -name *_defconfig |sed 's/.*\///')
 
-# Pull in the user's configuration file
-ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
--include $(TOPDIR).config
+# Use shell variables, if defined
+ifneq ($(BUILDROOT_LOCAL),)
+BR2_LOCAL:=$(BUILDROOT_LOCAL)
+else
+BR2_LOCAL:=$(TOPDIR)/local
 endif
 
-ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
+# Variables for use in Make constructs
+comma:=,
+empty:=
+space:=$(empty) $(empty)
+
+# $(shell find . -name *_defconfig |sed 's/.*\///')
+# Pull in the user's configuration file
+ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
+ifeq ($(BOARD),)
+# if "make BOARD=xyz" command
+-include .config
+else
+# if "make" command
+-include $(BR2_LOCAL)/$(BOARD)/$(BOARD).config
+endif
+endif
+
+# Override BR2_DL_DIR if shell variable defined
+ifneq ($(BUILDROOT_DL_DIR),)
+BR2_DL_DIR:=$(BUILDROOT_DL_DIR)
+endif
+LOCAL:=$(BR2_LOCAL)
+
+# To put more focus on warnings, be less verbose as default
+# Use 'make V=1' to see the full commands
+ifdef V
+  ifeq ("$(origin V)", "command line")
+    KBUILD_VERBOSE=$(V)
+  endif
+endif
+ifndef KBUILD_VERBOSE
+  KBUILD_VERBOSE=0
+endif
+
+ifeq ($(KBUILD_VERBOSE),1)
+  quiet=
+  Q=
+ifndef VERBOSE
+  VERBOSE=1
+endif
+else
+  quiet=quiet_
+  Q=@
+endif
+
+# we want bash as shell
+SHELL:=$(shell if [ -x "$$BASH" ]; then echo $$BASH; \
+	else if [ -x /bin/bash ]; then echo /bin/bash; \
+	else echo sh; fi; fi)
+
+# kconfig uses CONFIG_SHELL
+CONFIG_SHELL:=$(SHELL)
+
+export SHELL CONFIG_SHELL quiet Q KBUILD_VERBOSE VERBOSE
+
+ifndef HOSTAR
+HOSTAR:=ar
+endif
+ifndef HOSTAS
+HOSTAS:=as
+endif
+ifndef HOSTCC
+HOSTCC:=gcc
+else
+endif
+ifndef HOSTCXX
+HOSTCXX:=g++
+endif
+ifndef HOSTFC
+HOSTFC:=gfortran
+endif
+ifndef HOSTCPP
+HOSTCPP:=cpp
+endif
+ifndef HOSTLD
+HOSTLD:=ld
+endif
+ifndef HOSTLN
+HOSTLN:=ln
+endif
+ifndef HOSTNM
+HOSTNM:=nm
+endif
+HOSTAR:=$(shell which $(HOSTAR) || type -p $(HOSTAR) || echo ar)
+HOSTAS:=$(shell which $(HOSTAS) || type -p $(HOSTAS) || echo as)
+HOSTCC:=$(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
+HOSTCXX:=$(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
+HOSTFC:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo || which g77 || type -p g77 || echo gfortran)
+HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
+HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
+HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
+HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
+
+ifndef CFLAGS_FOR_BUILD
+CFLAGS_FOR_BUILD:=-g -O2
+endif
+ifndef CXXFLAGS_FOR_BUILD
+CXXFLAGS_FOR_BUILD:=-g -O2
+endif
+ifndef FCFLAGS_FOR_BUILD
+FCFLAGS_FOR_BUILD:=-g -O2
+endif
+export HOSTAR HOSTAS HOSTCC HOSTCXX HOSTFC HOSTLD
+
+
+ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
 # cc-option
-# Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586)
+# Usage: cflags-y+=$(call cc-option, -march=winchip-c6, -march=i586)
 # sets -march=winchip-c6 if supported else falls back to -march=i586
 # without checking the latter.
-cc-option = $(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
+cc-option=$(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
 	> /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
 
 #############################################################
 #
+# Hide troublesome environment variables from sub processes
+#
+#############################################################
+unexport CROSS_COMPILE
+unexport ARCH
+
+#############################################################
+#
+# Setup the proper filename extensions for the host
+#
+##############################################################
+ifneq ($(findstring linux,$(BR2_GNU_BUILD_SUFFIX)),)
+HOST_EXEEXT:=
+HOST_LIBEXT:=.a
+HOST_SHREXT:=.so
+endif
+ifneq ($(findstring apple,$(BR2_GNU_BUILD_SUFFIX)),)
+HOST_EXEEXT:=
+HOST_LIBEXT:=.a
+HOST_SHREXT:=.dylib
+endif
+ifneq ($(findstring cygwin,$(BR2_GNU_BUILD_SUFFIX)),)
+HOST_EXEEXT:=.exe
+HOST_LIBEXT:=.lib
+HOST_SHREXT:=.dll
+HOST_LOADLIBES="-lcurses -lintl"
+export HOST_LOADLIBES
+endif
+ifneq ($(findstring mingw,$(BR2_GNU_BUILD_SUFFIX)),)
+HOST_EXEEXT:=.exe
+HOST_LIBEXT:=.lib
+HOST_SHREXT:=.dll
+endif
+
+# The preferred type of libs we build for the target
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+LIBTGTEXT=.a
+#PREFERRED_LIB_FLAGS:=--disable-shared --enable-static
+else
+LIBTGTEXT=.so
+#PREFERRED_LIB_FLAGS:=--disable-static --enable-shared
+endif
+PREFERRED_LIB_FLAGS:=--enable-static --enable-shared
+
+##############################################################
+#
 # The list of stuff to build for the target toolchain
 # along with the packages to build for the target.
 #
 ##############################################################
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TARGETS:=uclibc-configured binutils gcc uclibc-target-utils
+ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers
 else
-TARGETS:=uclibc
+BASE_TARGETS:=uclibc
 endif
+TARGETS:=
+
+# setup our paths
+include project/Makefile.in
+
+BR2_DEPENDS_DIR=$(PROJECT_BUILD_DIR)/buildroot-config
+
 include toolchain/Makefile.in
 include package/Makefile.in
 
@@ -66,32 +228,78 @@ include package/Makefile.in
 #
 #############################################################
 
-
-
-all:   world
+all: world
 
 # In this section, we need .config
 include .config.cmd
 
+include project/*.mk
+
 # 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.
+ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+# avoid pulling in external toolchain which is broken for toplvl parallel builds
+# Explicit ordering:
+include toolchain/dependencies/dependencies.mk
+include toolchain/binutils/binutils.mk
+include toolchain/ccache/ccache.mk
+include toolchain/elf2flt/elf2flt.mk
+include toolchain/gcc/gcc-uclibc-3.x.mk
+include toolchain/gcc/gcc-uclibc-4.x.mk
+include toolchain/gdb/gdb.mk
+include toolchain/kernel-headers/kernel-headers.mk
+include toolchain/mklibs/mklibs.mk
+include toolchain/sstrip/sstrip.mk
+include toolchain/uClibc/uclibc.mk
+else
 include toolchain/*/*.mk
+endif
+
+ifeq ($(BR2_PACKAGE_LINUX),y)
+TARGETS+=linux26-modules
+endif
+
 include package/*/*.mk
 
+TARGETS+=target-finalize
+
+ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
+TARGETS+=target-purgelocales
+endif
+
 # target stuff is last so it can override anything else
 include target/Makefile.in
 
+TARGETS+=erase-fakeroots
+
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
-TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
+TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS))
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
+TARGETS_ALL:=$(patsubst %,__real_tgt_%,$(TARGETS))
+# all targets depend on the crosscompiler and it's prerequisites
+$(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %
 
-world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
-dirs: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR)
+$(BR2_DEPENDS_DIR): .config
+	rm -rf $@
+	mkdir -p $(@D)
+	cp -dpRf $(CONFIG)/buildroot-config $@
 
-.PHONY: all world dirs clean dirclean distclean source $(TARGETS) \
+dirs: $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
+	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \
+	$(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
+
+$(BASE_TARGETS): dirs
+
+world: dependencies dirs target-host-info $(BASE_TARGETS) $(TARGETS_ALL)
+
+
+.PHONY: all world dirs clean dirclean distclean source \
+	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
-	$(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR)
+	$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
+	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \
+	$(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
 
 #############################################################
 #
@@ -99,50 +307,107 @@ dirs: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR)
 # dependencies anywhere else
 #
 #############################################################
-$(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR):
+$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(HOST_DIR) $(PROJECT_BUILD_DIR) \
+	$(PROJECT_BUILD_DIR)/autotools-stamps $(BINARIES_DIR) $(STAMP_DIR):
 	@mkdir -p $@
 
 $(STAGING_DIR):
 	@mkdir -p $(STAGING_DIR)/bin
 	@mkdir -p $(STAGING_DIR)/lib
-	@mkdir -p $(STAGING_DIR)/include
-	@mkdir -p $(STAGING_DIR)/usr
-	@mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)
-	@ln -snf ../include $(STAGING_DIR)/usr/include
+ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
+	@mkdir -p $(STAGING_DIR)/usr/lib
+else
+ifneq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+	@ln -snf . $(STAGING_DIR)/usr
+	@mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)
 	@ln -snf ../lib $(STAGING_DIR)/usr/lib
-	@ln -snf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
+	@ln -snf ../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib
+endif
+endif
+	@mkdir -p $(STAGING_DIR)/usr/include
 
-$(TARGET_DIR):
+$(PROJECT_BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
-	if [ -d "$(TARGET_SKELETON)" ] ; then \
-		cp -fa $(TARGET_SKELETON)/* $(TARGET_DIR)/; \
-	fi;
-	touch $(STAGING_DIR)/.fakeroot.00000
-	-find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
-	-find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
+	if ! [ -d "$(TARGET_DIR)/bin" ]; then \
+		if [ -d "$(TARGET_SKELETON)" ]; then \
+			cp -fa $(TARGET_SKELETON)/* $(TARGET_DIR)/; \
+		fi; \
+		touch $(STAGING_DIR)/.fakeroot.00000; \
+	fi
+	-find $(TARGET_DIR) -type d -name CVS -o -name .svn -print0 | xargs -0 rm -rf
+	-find $(TARGET_DIR) -type f -name .empty -print0 | xargs -0 rm -rf
+	touch $@
+
+$(TARGET_DIR): $(PROJECT_BUILD_DIR)/.root
+
+erase-fakeroots:
+	rm -f $(PROJECT_BUILD_DIR)/.fakeroot*
+
+target-finalize:
+ifeq ($(BR2_HAVE_DEVFILES),y)
+	( scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) )
+else
+	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/pkgconfig
+	find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
+	find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
+endif
+ifneq ($(BR2_HAVE_MANPAGES),y)
+	rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/man
+endif
+ifneq ($(BR2_HAVE_INFOPAGES),y)
+	rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info
+endif
+	find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
+	$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
+
+ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
+LOCALE_WHITELIST=$(PROJECT_BUILD_DIR)/locales.nopurge
+LOCALE_NOPURGE=$(strip $(subst ",,$(BR2_ENABLE_LOCALE_WHITELIST)))
+#"))
+
+target-purgelocales:
+	rm -f $(LOCALE_WHITELIST)
+	for i in $(LOCALE_NOPURGE); do echo $$i >> $(LOCALE_WHITELIST); done
+
+	for dir in $(wildcard $(addprefix $(TARGET_DIR),/usr/share/locale /usr/share/X11/locale /usr/man /usr/share/man)); \
+	do \
+		for lang in $$(cd $$dir; ls .|grep -v man); \
+		do \
+			grep -qx $$lang $(LOCALE_WHITELIST) || rm -rf $$dir/$$lang; \
+		done; \
+	done
+endif
 
 source: $(TARGETS_SOURCE) $(HOST_SOURCE)
 
+_source-check:
+	$(MAKE) SPIDER=--spider source
+
+external-deps:
+	@$(MAKE) -Bs BR2_WGET=$(TOPDIR)/toolchain/wget-show-external-deps.sh \
+		SPIDER=--spider source
+
 #############################################################
 #
 # Cleanup and misc junk
 #
 #############################################################
 clean: $(TARGETS_CLEAN)
-	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE)
+	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
 
 dirclean: $(TARGETS_DIRCLEAN)
-	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE)
+	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
 
 distclean:
 ifeq ($(DL_DIR),$(BASE_DIR)/dl)
 	rm -rf $(DL_DIR)
 endif
-	rm -rf $(BUILD_DIR) $(LINUX_KERNEL) $(IMAGE)
+	rm -rf $(TOOL_BUILD_DIR) $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR) \
+	.config.cmd
 	$(MAKE) -C $(CONFIG) clean
 
 sourceball:
-	rm -rf $(BUILD_DIR)
+	rm -rf $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR)
 	set -e; \
 	cd ..; \
 	rm -f buildroot.tar.bz2; \
@@ -150,50 +415,78 @@ sourceball:
 	bzip2 -9 buildroot.tar; \
 
 
-else # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
+else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
 all: menuconfig
 
 # configuration
 # ---------------------------------------------------------------------------
 
+HOSTCFLAGS=$(CFLAGS_FOR_BUILD)
+export HOSTCFLAGS
+
 $(CONFIG)/conf:
-	$(MAKE) -C $(CONFIG) conf
-	-@if [ ! -f .config ] ; then \
+	@mkdir -p $(CONFIG)/buildroot-config
+	$(MAKE) CC="$(HOSTCC)" -C $(CONFIG) conf
+	-@if [ ! -f .config ]; then \
 		cp $(CONFIG_DEFCONFIG) .config; \
 	fi
 $(CONFIG)/mconf:
-	$(MAKE) -C $(CONFIG) ncurses conf mconf
-	-@if [ ! -f .config ] ; then \
+	@mkdir -p $(CONFIG)/buildroot-config
+	$(MAKE) CC="$(HOSTCC)" -C $(CONFIG) conf mconf
+	-@if [ ! -f .config ]; then \
 		cp $(CONFIG_DEFCONFIG) .config; \
 	fi
 
 menuconfig: $(CONFIG)/mconf
-	@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
+	@mkdir -p $(CONFIG)/buildroot-config
+	@if ! KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		$(CONFIG)/mconf $(CONFIG_CONFIG_IN); then \
+		test -f .config.cmd || rm -f .config; \
+	fi
 
 config: $(CONFIG)/conf
-	@$(CONFIG)/conf $(CONFIG_CONFIG_IN)
+	@mkdir -p $(CONFIG)/buildroot-config
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		$(CONFIG)/conf $(CONFIG_CONFIG_IN)
 
 oldconfig: $(CONFIG)/conf
-	@$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
+	@mkdir -p $(CONFIG)/buildroot-config
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
 
 randconfig: $(CONFIG)/conf
-	@$(CONFIG)/conf -r $(CONFIG_CONFIG_IN)
+	@mkdir -p $(CONFIG)/buildroot-config
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		$(CONFIG)/conf -r $(CONFIG_CONFIG_IN)
 
 allyesconfig: $(CONFIG)/conf
-	#@$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
+	cat $(CONFIG_DEFCONFIG) > .config
+	@mkdir -p $(CONFIG)/buildroot-config
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
 	#sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config
-	@$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
 
 allnoconfig: $(CONFIG)/conf
-	@$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)
+	@mkdir -p $(CONFIG)/buildroot-config
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)
 
 defconfig: $(CONFIG)/conf
-	@$(CONFIG)/conf -d $(CONFIG_CONFIG_IN)
+	@mkdir -p $(CONFIG)/buildroot-config
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		$(CONFIG)/conf -d $(CONFIG_CONFIG_IN)
 
-%_defconfig: $(CONFIG)/conf
-	cp $(shell find . -name $@) .config
-	@$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
+# check if download URLs are outdated
+source-check: allyesconfig
+	$(MAKE) _source-check
 
 #############################################################
 #
@@ -201,15 +494,70 @@ defconfig: $(CONFIG)/conf
 #
 #############################################################
 clean:
-	rm -f .config .config.old .config.cmd .tmpconfig.h
-	- $(MAKE) -C $(CONFIG) clean
+	rm -f .config .config.old .config.cmd .tmpconfig.h .lognr.*
+	-$(MAKE) -C $(CONFIG) clean
 
 distclean: clean
 	rm -rf sources/*
 
-endif # ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
+
+endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
+
+flush:
+	rm -f $(PROJECT_BUILD_DIR)/tgt-config.cache
+
+%_defconfig: $(CONFIG)/conf
+	cp $(shell find ./target/ -name $@) .config
+	-@$(MAKE) oldconfig
+
+update:
+	cp .config $(BOARD_PATH)/$(PROJECT)_defconfig
+
+configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config
+
+prepatch:	gcc-patched binutils-patched gdb-patched uclibc-patched
+
+.lognr.$(PROJECT):
+	@echo "0" > .lognr.$(PROJECT)
+
+log:	.lognr.$(PROJECT)
+	@expr `cat .lognr.$(PROJECT)` + 1 > .lognr.$(PROJECT)	
+	@echo Creating $(PROJECT)-`cat .lognr.$(PROJECT)`.log
+	@$(MAKE) > $(PROJECT)-`cat .lognr.$(PROJECT)`.log 2>&1
+
+
+cross: $(BASE_TARGETS)
+
+help:
+	@echo 'Cleaning:'
+	@echo '  clean                  - delete temporary files created by build'
+	@echo '  distclean              - delete all non-source files (including .config)'
+	@echo
+	@echo 'Build:'
+	@echo '  all                    - make world'
+	@echo
+	@echo 'Configuration:'
+	@echo '  menuconfig             - interactive curses-based configurator'
+	@echo '  oldconfig              - resolve any unresolved symbols in .config'
+	@echo '  configured             - make {uclibc/busybox/linux26}-config'
+	@echo '  saveconfig             - save current configuration under local/<project>'
+	@echo '  getconfig              - restore saved configuration from local/<project>'
+	@echo
+	@echo 'Miscellaneous:'
+	@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
+	@echo 'See docs/README and docs/buildroot.html for further details'
+	@echo
+
+release: distclean
+	OUT=buildroot-$$(grep -A2 BR2_VERSION $(CONFIG_CONFIG_IN)|grep default|cut -f2 -d\"); \
+	rm -rf ../$$OUT*; cp -al . ../$$OUT; cd ..; \
+	tar cfz $$OUT.tar.gz --exclude .svn --exclude .git --exclude \*~ $$OUT; \
+	rm -rf $$OUT
 
 .PHONY: dummy subdirs release distclean clean config oldconfig \
-	menuconfig tags check test depend defconfig
-
+	menuconfig tags check test depend defconfig help
 

TODO

@@ -0,0 +1,14 @@
+Buildroot2 TODOs
+
+- fix packages/Makefile.autotools.in to use a package-imposed patchdir
+  (Ivan Kuten)
+- convert all packages that use autoconf to use the infrastructure of
+  packages/Makefile.autotools.in
+- fix setting of flags for packages
+
+- stabilize for a 0.10.0 release
+
+- think about using a common --config-cache for configure
+  Should take care of expanding TARGET_CONFIGURE_ARGS for cross compiles
+  to working presets.
+

docs/Glibc_vs_uClibc.html

@@ -0,0 +1,240 @@
+<!--#include file="header.html" -->
+
+<h2>uClibc vs. glibc</h2>
+
+<p>
+  uClibc and Glibc are not the same -- there are a number of differences which
+  may or may not cause you problems.  This document attempts to list these 
+  differences and, when completed, will contain a full list of all relevant 
+  differences. 
+  <br><br></p>
+ <ol>
+  <li>uClibc is smaller than glibc.  We attempt to maintain a glibc compatible
+  interface, allowing applications that compile with glibc to easily compile with
+  uClibc.  However, we do not include _everything_ that glibc includes, and
+  therefore some applications may not compile.  If this happens to you, please
+  report the failure to the uclibc mailing list, with detailed error messages.
+  </li><br>
+  <li>uClibc is much more configurable then glibc.  This means that a developer
+  may have compiled uClibc in such a way that significant amounts of
+  functionality have been omitted.
+  </li><br>
+  <li>uClibc does not even attempt to ensure binary compatibility across releases.
+  When a new version of uClibc is released, you may or may not need to recompile
+  all your binaries.
+  </li><br>
+  <li><ul><li> malloc(0) in glibc returns a valid pointer to something(!?!?) while in
+  uClibc calling malloc(0) returns a NULL.  The behavior of malloc(0) is listed
+  as implementation-defined by SuSv3, so both libraries are equally correct.
+  This difference also applies to realloc(NULL, 0).  I personally feel glibc's
+  behavior is not particularly safe.  To enable glibc behavior, one has to
+  explicitly enable the MALLOC_GLIBC_COMPAT option.
+  </li><br><li>
+  glibc's malloc() implementation has behavior that is tunable via the
+  MALLOC_CHECK_ environment variable.  This is primarily used to provide extra
+  malloc debugging features.  These extended malloc debugging features are not
+  available within uClibc.  There are many good malloc debugging libraries
+  available for Linux (dmalloc, electric fence, valgrind, etc) that work much
+  better than the glibc extended malloc debugging.  So our omitting this
+  functionality from uClibc is not a great loss.
+  </li><br>
+  </ul></li>
+  <li>uClibc does not provide a database library (libdb).
+  </li><br>
+  <li>uClibc does not support NSS (/lib/libnss_*), which allows glibc to easily
+  support various methods of authentication and DNS resolution.  uClibc only
+  supports flat password files and shadow password files for storing
+  authentication information.  If you need something more complex than this,
+  you can compile and install pam.
+  </li><br>
+  <li>uClibc's libresolv is only a stub.  Some, but not all of the functionality
+  provided by glibc's libresolv is provided internal to uClibc.  Other functions
+  are not at all implemented.
+  </li><br>
+  <li>libnsl provides support for Network Information Service (NIS) which was
+  originally called "Yellow Pages" or "YP", which is an extension of RPC invented
+  by Sun to share Unix password files over the network.  I personally think NIS
+  is an evil abomination and should not be used.  These days, using ldap is much
+  more effective mechanism for doing the same thing.  uClibc provides a stub
+  libnsl, but has no actual support for Network Information Service (NIS).
+  We therefore, also do not provide any of the headers files provided by glibc
+  under /usr/include/rpcsvc.
+  </li><br>
+  <li>uClibc's locale support is not 100% complete yet.  We are working on it.
+  </li><br>
+  <li>uClibc's math library only supports long double as inlines, and even
+  then the long double support is quite limited.  Also, very few of the
+  float math functions are implemented.  Stick with double and you should
+  be just fine.
+  </li><br>
+  <li>uClibc's libcrypt does not support the reentrant crypt_r, setkey_r and
+  encrypt_r, since these are not required by SuSv3.
+  </li><br>
+  <li>uClibc directly uses kernel types to define most opaque data types.
+  </li><br>
+  <li>uClibc directly uses the linux kernel's arch specific 'stuct stat'.
+  </li><br>
+  <li>uClibc's librt library currently lacks all aio routines, all clock
+    routines, and all shm routines (only the timer routines and the mq
+    routines are implemented). 
+   </li><br>
+</ol> 
+<hr>
+<h3>Manuel's Notes</h3>
+
+  Some general comments...<br>
+  <p>
+  The intended target for all my uClibc code is ANSI/ISO C99 and SUSv3
+  compliance.  While some glibc extensions are present, many will eventually
+  be configurable.  Also, even when present, the glibc-like extensions may
+  differ slightly or be more restrictive than the native glibc counterparts.
+  They are primarily meant to be porting _aides_ and not necessarily
+  drop-in replacements.
+  </p><br>
+Now for some details...<br><br>
+
+<u>time functions</u><br>
+<ol>
+<li>Leap seconds are not supported.</li><br>
+<li>/etc/timezone and the whole zoneinfo directory tree are not supported.
+   To set the timezone, set the TZ environment variable as specified in
+   http://www.opengroup.org/onlinepubs/007904975/basedefs/xbd_chap08.html
+   or you may also create an /etc/TZ file of a single line, ending with a
+   newline, containing the TZ setting.  For example
+   echo CST6CDT > /etc/TZ
+</li><br>
+<li>Currently, locale specific eras and alternate digits are not supported.
+   They are on my TODO list.
+</li>
+</ol><br>
+<u>wide char support</u><br>
+<ol>
+<li>The only multibyte encoding currently supported is UTF-8.  The various
+   ISO-8859-* encodings are (optionally) supported.  The internal
+   representation of wchar's is assumed to be 31 bit unicode values in
+   native endian representation.  Also, the underlying char encoding is
+   assumed to match ASCII in the range 0-0x7f.
+</li>
+<li>In the next iteration of locale support, I plan to add support for
+   (at least some) other multibyte encodings.
+</li>
+</ol>
+<u>locale support</u><br>
+<ol>
+<li>The target for support is SUSv3 locale functionality.  While nl_langinfo
+   has been extended, similar to glibc, it only returns values for related
+   locale entries.
+</li>
+<li>Currently, all SUSv3 libc locale functionality should be implemented
+   except for wcsftime and collating item support in regex.
+</li>
+</ol>
+<u>stdio</u><br>
+<ol>
+<li>Conversion of large magnitude floating-point values by printf suffers a loss
+   of precision due to the algorithm used.
+</li><br>
+<li>uClibc's printf is much stricter than glibcs, especially regarding positional
+   args.  The entire format string is parsed first and an error is returned if
+   a problem is detected.  In locales other than C, the format string is checked
+   to be a valid multibyte sequence as well.  Also, currently at most 10 positional
+   args are allowed (although this is configurable).
+</li><br>
+<li>BUFSIZ is configurable, but no attempt is made at automatic tuning of internal
+   buffer sizes for stdio streams.  In fact, the stdio code in general sacrifices
+   sophistication/performace for minimal size.
+</li><br>
+<li>uClibc allows glibc-like custom printf functions.  However, while not
+   currently checked, the specifier must be <= 0x7f.
+</li><br>
+<li>uClibc allows glibc-like custom streams.  However, no in-buffer seeking is
+   done.
+</li><br>
+<li>The functions fcloseall() and __fpending() can behave differently than their
+   glibc counterparts.
+</li><br>
+<li>uClibc's setvbuf is more restrictive about when it can be called than glibc's
+   is.  The standards specify that setvbuf must occur before any other operations
+   take place on the stream.
+</li><br>
+<li>Right now, %m is not handled properly by printf when the format uses positional
+   args.
+</li><br>
+<li>The FILEs created by glibc's fmemopen(), open_memstream(), and fopencookie()
+   are not capable of wide orientation.  The corresponding uClibc routines do
+   not have this limitation.
+</li><br>
+<li>For scanf, the C99 standard states "The fscanf function returns the value of
+    the macro EOF if an input failure occurs before any conversion."  But glibc's
+    scanf does not respect conversions for which assignment was surpressed, even
+    though the standard states that the value is converted but not stored.
+</li></ol><br>
+<hr><h3>Glibc bugs</h3><br>
+glibc bugs that Ulrich Drepper has refused to acknowledge or comment on
+  ( <a href="http://sources.redhat.com/ml/libc-alpha/2003-09/">http://sources.redhat.com/ml/libc-alpha/2003-09/</a> )
+<br>
+<ol>
+<li>The C99 standard says that for printf, a %s conversion makes no special
+   provisions for multibyte characters.  SUSv3 is even more clear, stating
+   that bytes are written and a specified precision is in bytes.  Yet glibc
+   treats the arg as a multibyte string when a precision is specified and
+   not otherwise.
+</li><br>
+<li>Both C99 and C89 state that the %c conversion for scanf reads the exact
+   number of bytes specified by the optional field width (or 1 if not specified).
+   uClibc complies with the standard.  There is an argument that perhaps the
+   specified width should be treated as an upper bound, based on some historical
+   use.  However, such behavior should be mentioned in the Conformance document.
+</li><br>
+<li>glibc's scanf is broken regarding some numeric patterns.  Some invalid
+   strings are accepted as valid ("0x.p", "1e", digit grouped strings).
+   In spite of my posting examples clearly illustrating the bugs, they remain
+   unacknowledged by the glibc developers.
+</li><br>
+<li>glibc's scanf seems to require a 'p' exponent for hexadecimal float strings.
+   According to the standard, this is optional.
+</li><br>
+<li>C99 requires that once an EOF is encountered, the stream should be treated
+   as if at end-of-file even if more data becomes available.  Further reading
+   can be attempted by clearing the EOF flag though, via clearerr() or a file
+   positioning function.  For details concerning the original change, see
+   Defect Report #141.  glibc is currently non-compliant, and the developers
+   did not comment when I asked for their official position on this issue.
+</li><br>
+<li>glibc's collation routines and/or localedef are broken regarding implicit
+   and explicit UNDEFINED rules.
+</li><br></ol>
+More to follow as I think of it...
+<br><br><hr>
+<h3>Profiling:</h3>
+<p>
+uClibc no longer supports 'gcc -fprofile-arcs  -pg' style profiling, which
+causes your application to generate a 'gmon.out' file that can then be analyzed
+by 'gprof'.  Not only does this require explicit extra support in uClibc, it
+requires that you rebuild everything with profiling support.  There is both a
+size and performance penalty to profiling your applications this way, as well
+as Heisenberg effects, where the act of measuring changes what is measured.
+</p>
+<p>
+There exist a number of less invasive alternatives that do not require you to
+specially instrument your application, and recompile and relink everything.
+</p><p>
+The OProfile system-wide profiler is an excellent alternative:
+      <a href="http://oprofile.sourceforge.net/">http://oprofile.sourceforge.net/</a>
+</p><p>
+Many people have had good results using the combination of Valgrind
+to generate profiling information and KCachegrind for analysis:
+      <a href="http://developer.kde.org/~sewardj/">http://developer.kde.org/~sewardj/</a>
+      <a href="http://kcachegrind.sourceforge.net/">http://kcachegrind.sourceforge.net/</a>
+</p><p>
+Prospect is another alternative based on OProfile:
+      <a href="http://prospect.sourceforge.net/">http://prospect.sourceforge.net/</a>
+</p><p>
+And the Linux Trace Toolkit (LTT) is also a fine tool:
+    <a href="http://www.opersys.com/LTT/">http://www.opersys.com/LTT/</a>
+</p><p>
+FunctionCheck:
+	<a href="http://www710.univ-lyon1.fr/~yperret/fnccheck/">http://www710.univ-lyon1.fr/~yperret/fnccheck/</a>
+</p>
+
+<!--#include file="footer.html" -->

docs/README

@@ -1,6 +1,6 @@
 To build and use the buildroot stuff, do the following:
 
-1) run 'make'
+1) run 'make menuconfig'
 2) select the packages you wish to compile
 3) run 'make'
 4) wait while it compiles
@@ -26,13 +26,27 @@ and your toplevel .config to a machine that has an internet-connection
 and issue "make source" there, then copy the content of your dl/ dir to
 the build-host.
 
+Building out-of-tree:
+=====================
+
+Buildroot supports building out of tree with a syntax similar
+to the Linux kernel. To use it, add O=<directory> to the
+make command line, E.G.:
+
+$ make O=/tmp/build
+
+And all the output files will be located under /tmp/build.
+
 More finegrained configuration:
 ===============================
 
 You can specify a config-file for uClibc:
 $ make UCLIBC_CONFIG_FILE=/my/uClibc.config
 
-To use a non-standart host-compiler (if you do not have 'gcc'),
+And you can specify a config-file for busybox:
+$ make BUSYBOX_CONFIG_FILE=/my/busybox.config
+
+To use a non-standard host-compiler (if you do not have 'gcc'),
 make sure that the compiler is in your PATH and that the library paths are
 setup properly, if your compiler is built dynamically:
 $ make HOSTCC=gcc-4.3.orig HOSTCXX=gcc-4.3-mine
@@ -43,6 +57,5 @@ $ make HOSTCC=gcc-4.3 linux26-menuconfig
 $ make HOSTCC=gcc-4.3 uclibc-menuconfig
 $ make HOSTCC=gcc-4.3 busybox-menuconfig
 
-Please feed suggestions, bug reports, insults, and bribes back to:
-	Erik Andersen <andersen@codepoet.org>
-or the buildroot mailing list.
+Please feed suggestions, bug reports, insults, and bribes back to the
+buildroot mailing list: buildroot@uclibc.org

docs/README.diskimage

@@ -0,0 +1,37 @@
+# Sample for i386 to create a 6MB disk-image
+
+# create an image file
+dd if=/dev/zero bs=512 count=$((6*1024*1024/512)) of=img
+# create a partition (optional)
+echo -e "n\np\n1\n\nw\n" | \
+  ~/src/busybox/busybox fdisk -C 16065 -H 255 -S 63 ./img
+# as root, associate the image with a look-device:
+# The offset of 512 comes from the the layout of the image. See
+# ~/src/busybox/busybox fdisk -C 16065 -H 255 -S 63 -l ./img for the start
+# block and multiply this with the block size (==512).
+~/src/busybox/busybox losetup -o 512 /dev/loop/0 /path/to/the/img
+# create some filesystem on it, for example ext2
+mkfs.ext2 -m0 -Lslash /dev/loop/0
+# mount it and copy your stuff to it
+~/src/busybox/busybox mount -oloop,rw /dev/loop/0 /media/l0
+~/src/busybox/busybox mkdir -p /media/l0/boot/grub
+~/src/busybox/busybox cp -a project_build_i386/root/boot/grub/stage? /media/l0/boot/grub/
+~/src/busybox/busybox cp -a project_build_i386/root/boot/bzImage /media/l0/boot/
+~/src/busybox/busybox cat > /media/l0/boot/grub/menu.lst <<EOF
+title=GNU/Linux
+root (hd0,0)
+kernel /boot/bzImage
+EOF
+# finally unmount the dist and disassociate the loopdev
+~/src/busybox/busybox umount /media/l0
+~/src/busybox/busybox losetup -d /dev/loop/0
+# now install grub from the chroot
+~/src/busybox/busybox losetup /dev/loop/0 /path/to/the/img
+project_build_i386/root/usr/sbin/grub --device-map=/dev/null
+device (hd0) img
+geometry (hd0) 16065 255 63
+root (hd0,0)
+setup (hd0)
+quit
+# finally boot the thing
+/opt/qemu-trunk_ggi-2.2.2/bin/qemu -snapshot -hda img -boot c

docs/TESTING.html

@@ -0,0 +1,67 @@
+<!--#include file="header.html" -->
+
+<h2>Testing Buildroot for an Architecture</h2>
+
+<p>
+<h4>scripts/mkpkg script</h4>
+If you want to test the build of a single package you can use the mkpkg script.
+</p>
+<p>
+<li>$ scripts/mkpkg PACKAGE</li> 
+</p>
+<p>
+Will make the board, and save the result in a log file.
+The log file resides in
+<li>$ log/OK/PACKAGE.log.OK</li> 
+</p>
+<p>
+if the build succeeds and in
+<li>$ log/OK/PACKAGE.log.FAIL</li>
+</p>
+<p>
+if it cannot complete.
+</p>
+
+<p>
+By creating an alias
+<li>alias mk=scripts/mkpkg</li>
+</p>
+<p>
+it is enough to type
+<li>$ mk PACKAGE</li> 
+</p>
+<p>
+mkpkg will only print out the <h4>{PACKAGE}......OK</h4> or <h4>{PACKAGE}......FAIL</h4>
+depending on success or failure making it easy to get an overview
+of the status of this specific architecture.
+</p>
+<p>
+It is recommended to build a simple board before running the test
+to get some basic things done.
+</p>
+<p>
+<h4>scripts/buildall.sh script</h4>
+</p>
+<p>
+By running this script you will run scripts/mkpkg on
+a lot of the packages available in Buildroot.
+</p>
+<p>
+You need to run the script while in the TOP directory.
+I.E: Where you typically run make.
+</p>
+<p>
+There are a few lacking, for no very good reason,
+but these can be easily added.
+</p>
+<p>
+Note that some packages will not build properly
+if you do not enable them using makeconfig.
+</p>
+<p>
+Examples are:
+<li>freetype</li>
+<li>socat</li>
+</p>
+
+<!--#include file="footer.html" -->

docs/U-boot.html

@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Buildroot - U-boot extensions in 2009.01-rc1</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="stylesheet.css" />
+</head>
+
+<body>
+	<div class="main">
+	<div class="titre">
+	<a name="top" id="top"></a>
+	<h1>U-boot extensions in 2009.01-rc1</h1>
+	</div>
+
+	<p><a href="http://buildroot.net/">U-Boot</a>
+	usage and documentation by Ulf Samuelsson.
+	</p>
+
+	<p><small>$LastChangedDate: 2008-12-16 10:00:11 +0100 (tis, 16 dec 2008) $</small></p>
+	<ul>
+		<li><a href="#about">About U-Boot</a></li>
+		<li><a href="#at91rm9200dk">Board Support for AT91RM9200DK</a></li>
+		<li><a href="#at91rm9200ek">Board Support for AT91RM9200EK</a></li>
+		<li><a href="#at91sam9g20ek">Board Support for AT91SAM9G20EK</a></li>
+		<li><a href="#Minicom extensions">X-Modem/Raw extensions to minicom</a></li>
+		<li><a href="#cmd_factory">New Command: factory</a></li>
+		<li><a href="#cmd_os">New Command: os</a></li>
+		<li><a href="#cmd_fs">New Command: fs</a></li>
+		<li><a href="#cmd_setargs">New Command: setargs</a></li>
+		<li><a href="#cmd_led">New Command: led</a></li>
+		<li><a href="#cmd_mux">New Command: mux</a></li>
+		<li><a href="#cmd_ethinit">New Command: ethinit</a></li>
+		<li><a href="#environment">Special environment variables</a></li>
+	</ul>
+	<h2><a name="about" id="about"></a>About U-boot</h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	U-Boot is an open source bootloader ported to a multitude of processors.
+	See (<a href="http://www.denx.de/wiki/U-Boot/WebHome">U-Boot Home</a>)
+	for documentation for vanilla U-Boot. This document only describes
+	changes compared to the vanilla u-boot.
+	</p>
+
+	<h2><a name="at91rm9200dk" id="at91rm9200dk"></a>Board support for at91rm9200dk</h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	"at91rm9200dk" is updated to use a linux like API for gpio.
+	A new target "at91rm9200dk_df" is defined to support boot from dataflash.
+	</p>
+
+	<h2><a name="at91rm9200ek" id="at91rm9200ek"></a>Board support for at91rm9200ek</h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	The "at91rm9200ek" BSP supports booting from a parallel flash.
+	The "at91rm9200df" BSP supports a generic target booting from dataflash.
+	</p>
+
+	<h2><a name="#at91sam9g20ek" id="#at91sam9g20ek"></a>Board support for at91sam9g20ek</h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	The "at91sam9g20ek" target with dataflash(card) and NAND boot support.
+	</p>
+
+	<h2><a name="minicom_extensions" id="minicom_extensions"></a>Minicom extensions </h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	"sx-at91" is a reliable X-Modem application allowing download to the at91rm9200
+	based board
+	</p>
+	<p>
+	"raw-at91" is a download application which will download binary data using minicom.
+	Typically used to download an environment script.
+	</p>
+
+	<h2><a name="cmd_factory" id="cmd_factory"></a>New command: factory</h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	<h3><code>factory</code></h3>
+	</p>
+
+	<p>
+	"factory" will set a selected set of environment variables 
+	back to the compile time default. The following will give some
+	hints on capabilities, but is not yet complete.
+	</p>
+
+	<p>
+	It will generate a set of scripts which will facilitate downloading
+	the kernel and root file system using tftp and will also
+	add commands to store into and retrieve from flash
+	</p>
+
+	<h2><a name="cmd_os" id="cmd_os"></a>New command: os</h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	<h3><code>os<code></h3>
+	</p>
+	<p>
+	"os" computes a new name for the linux kernel
+	</p>
+
+	<h2><a name="cmd_fs" id="cmd_fs"></a>New command: fs</h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	<h3><code>fs<code></h3>
+	</p>
+	<p>
+	"fs" computes a new name for the file system
+	</p>
+
+	<h2><a name="cmd_setargs" id="cmd_setargs"></a>New command: setargs</h2>
+	<a href="#top"><small>[TOP]</small></a>
+	<p>
+	<h3><code>setargs<code></h3>
+	</p>
+	<p>
+	"setargs" will create new bootcmd/bootargs combination from
+	kernel name, filesystem name, and rootfs type.
+	</p>
+
+	<h2><a name="cmd_led" id="cmd_led"></a>New command: led</h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	<h3><code>led [green | yellow | red | all ]  [ on | off ]<code></h3>
+	</p>
+
+	<p>
+	"led" will turn on or off the specified (coloured) led
+	</p>
+
+	<h2><a name="cmd_mux" id="cmd_mux"></a>New command: mux</h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	<h3><code>mux [spi | mmc ]<code></h3>
+	</p>
+
+	<p>
+	"mux" will select how to use the flash card connector on the 
+	at91rm9200dk or at91rm9200ek
+	</p>
+
+	<h2><a name="cmd_ethinit" id="cmd_ethinit"></a>New command: ethinit</h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	<h3><code>ethinit<code></h3>
+	</p>
+
+	<p>
+	"ethinit" can be used to delay the boot of linux, until a valid network
+	connection has been established. This is useful if the machine is NFS mounting
+	the root file system and both this machine and the NFS server are powering up
+	simultaneously. The NFS server could take a lot longer to boot, and waiting
+	for this to boot may be neccessary for proper operation.
+	</p>
+
+	<h2><a name="environment" id="environment"></a>Special environment variables</h2>
+	<a href="#top"><small>[TOP]</small></a>
+
+	<p>
+	<h3><code>rd<code></h3>
+	</p>
+	<p>
+	rd contains the name of the current root file system
+	It is autmatically generated from <bold>ver</bold> and <bold>rd-1</bold>, <bold>rd-2</bold> etc.
+	The "fs-date" is added at the end.
+	</p>
+
+	<p>
+	<h3><code>ver<code></h3>
+	</p>
+	<p>
+	You can handle a number of different root fs by defining <code>ver</code>.
+	When running <code>fs</code> rd will be assigned from one of:
+	<ul><code>rd-1, rd2, rd-3 ...<code></ul>
+	</p>
+	<p>
+	By defining <code>ver</code> to a number you will
+	select the appropriate disk name 
+	</p>
+
+	<p>
+	<h3><code>fs-date<code></h3>
+	</p>
+	<p>
+	"date" part of the root file system name
+	</p>
+
+	<p>
+	<h3><code>linux<code></h3>
+	</p>
+	<p>
+	linux contains the name of the current kernel.
+	</p>
+	<p>
+	It is generated from several environment variables when <code>os</code> is run
+	</p>
+	<p>
+	A typical name would be "at91sam9263ek-linux-2.6.28-20090105.gz"
+	</p>
+
+	<p>
+	<h3><code>hostname<code></h3>
+	</p>
+	<p>
+	"name" part of the kernel file name
+	</p>
+
+	<p>
+	<h3><code>kernel-version<code></h3>
+	</p>
+	<p>
+	"version" part of the kernel file name
+	</p>
+
+	<p>
+	<h3><code>kernel-date<code></h3>
+	</p>
+	<p>
+	"date" part of the kernel file name
+	</p>
+
+	<p>
+	<h3><code>fstype [ ram | flash ]<code></h3>
+	<p>
+	You can have several file system types.
+	bootargs is created depending on fstype..
+	</p>
+
+	<a href="#top"><small>[TOP]</small></a>
+
+	</div>
+<!--
+	<a href="http://validator.w3.org/check?uri=referer"><img
+	border="0" height="31" width="88"
+	src="images/valid-html401.png"
+	alt="Valid HTML"></img></a>
+-->
+
+</body>
+</html>

docs/about.html

@@ -3,22 +3,28 @@
 
 <!-- Begin Introduction section -->
 
-<h3>buildroot: making Embedded Linux easy</h3>
+<h3>Buildroot: making Embedded Linux easy</h3>
 
+<div align="center">
+<a href="images/menuconfig.png">
+ <img src="images/menuconfig_small.png" width="340" height="220"
+ alt="Buildroot menuconfig" border="0">
+</a>
+</div>
 
-Buildroot is a set of Makefiles and patches that makes it easy generate a
+Buildroot is a set of Makefiles and patches that makes it easy to generate a
 cross-compilation toolchain and root filesystem for your target Linux
 system using the <a href= "http://www.uclibc.org/">uClibc C library</a>.
 Buildroot is useful mainly for people working with small or embedded
 systems.  Embedded systems often use processors that are not the regular
 x86 processors everyone is used to using on their PC. It can be PowerPC
 processors, MIPS processors, ARM processors, etc.  And to be extra safe,
-you do not need to be root to build or run buildroot.
+you do not need to be root to build or run Buildroot.
 
 <p>
 
-buildroot is maintained by <a href=
-"http://codepoet.org/andersen/erik/erik.html">Erik Andersen</a>, and
+Buildroot is maintained by <a href=
+"mailto:jacmet@uclibc.org">Peter Korsgaard</a>, and
 licensed under the
 <a href="http://www.gnu.org/copyleft/lgpl.html">GNU LIBRARY GENERAL PUBLIC LICENSE</a>.
 

docs/copyright.txt

@@ -1,6 +1,7 @@
 
 The code and graphics on this website (and it's mirror sites, if any) are
-Copyright (c) 1999-2005 by Erik Andersen.  All rights reserved.
+Copyright (c) 1999-2005 by Erik Andersen, 2006-2009 The Buildroot
+developers. All rights reserved.
 
 Documents on this Web site including their graphical elements, design, and
 layout are protected by trade dress and other laws and MAY BE COPIED OR

docs/developer.html

@@ -1,63 +1,46 @@
 <!--#include file="header.html" -->
 
 
-<h3>Subversion Read/Write Access</h3>
+<h3>Developer Access</h3>
 
-If you want to be able to commit things to Subversion, first contribute some
-stuff to show you are serious.  Then, very nicely ask <a
-href="mailto:andersen@codepoet.org">Erik Andersen</a> if he will set you up
-with an commit access to the Subversion repository.  To access Subversion, you
-will want to add the following to set up your environment:
+Because we use Git for version control, you don't need developer (ssh)
+access on uclibc.org to contribute to Buildroot, but you can request
+it if needed.
 
 <p>
 
-To obtain commit access, you will need to demonstrate you are serious by
-submitting a few good patches first.  Then, you will need to select a username
-to use when committing changes to SVN, you will need to send me the username
-you have selected, you must send me your preferred contact email address, and
-finally, you must send me an ssh version 2 DSA key with 1024 bits (the default)
-or more.  If you do not currently have an ssh version 2 DSA key, you can
-generate a key using the command<pre>ssh-keygen -t dsa</pre>  This will
-create the files <pre>/home/&lt;USERNAME&gt;/ssh/id_dsa
-/home/&lt;USERNAME&gt;/.ssh/id_dsa.pub</pre>  You must then send the content
-of 'id_dsa.pub' to me so I can setup your account.  The content of 'id_dsa'
-should of course be kept secret.
+To obtain developer access, you will need to demonstrate you are
+serious by submitting a few good patches first.  Then, you will need
+to select a username to use when logging in, you will need to send me
+the username you have selected, you must send me your preferred
+contact email address, and finally, you must send me an ssh version 2
+DSA key with 1024 bits (the default) or more.  If you do not currently
+have an ssh version 2 DSA key, you can generate a key using the
+command<pre>ssh-keygen -t dsa</pre> This will create the
+files <pre>/home/&lt;USERNAME&gt;/ssh/id_dsa
+/home/&lt;USERNAME&gt;/.ssh/id_dsa.pub</pre> It is recommended that
+you generate a key with a "passphrase" for security reasons.
+
+<p>
+Make the file known to the system by running
+
+<pre>ssh-add ~/.ssh/id_dsa</pre>
+
+You must then send the content of 'id_dsa.pub' to me so I can setup your account.
+The content of 'id_dsa' should of course be kept secret.
 
 <p>
 
-Note that if you would prefer to keep your communications with me
-private, you can encrypt your email using my
-<a href="http://www.codepoet.org/andersen/erik/gpg.asc">public key</a>.
+Once you have an account, you can use it to store Git
+repositories. Simply put them in subdirectories of your ~/git, and
+touch ~/git/<repo>/git-daemon-export-ok, after which the hourly
+cronjob will pick them up and show them in cgit. They are also
+available though git-daemon:
 
-<p>
-
-Once you are setup with an account, you will need to use your account to
-checkout a copy of buildroot from Subversion:
-
-<pre>
-svn list svn+ssh://username@svn.uclibc.org/svn/trunk/buildroot</pre>
-<br>
-It goes without saying you must change <em>username</em> to your own
-username...
-<p>
-
-You can then enter the newly checked out buildroot directory, make changes, check
-your changes, diff your changes, revert your changes, and and commit your
-changes usine commands such as:
-
-<pre>
-svn diff
-svn status
-svn revert
-svn commit</pre>
-
-<p>
-
-For additional detail on how to use Subversion, please visit the
-<a href="http://subversion.tigris.org/">the Subversion website</a>.
-You might also want to read online or buy a copy of <a
-href="http://svnbook.red-bean.com/">the Subversion Book</a>...
+<pre>git clone git://git.buildroot.net/~&lt;USERNAME&gt/git/&lt;REPO&gt;</pre>
 
+For additional detail on how to use Git, please visit the
+<a href="http://git-scm.org/">the Git website</a>.
 
 <!--#include file="footer.html" -->
 

docs/download.html

@@ -6,25 +6,24 @@
 
 <p>
 
-The best way to obtain and update your own copy of buildroot is to fetch the
-latest version using <a href="subversion.html">Subversion</a>.  You can also
-obtain <a href= "downloads/snapshots/">Daily Snapshots</a> of the latest
-buildroot source tree but cannot or do not wish to use Subversion (svn).
+The latest release can always be dowloaded from
+<a href="/downloads/">http://buildroot.net/downloads/</a>.
+
+<p>
+
+You can also obtain <a href="/downloads/snapshots/">Daily
+Snapshots</a> of the latest Buildroot source tree if you want to to
+follow development, but cannot or do not wish to use Git.
 
 <ul>
 	<li> Click here to <a href="downloads/snapshots/">Daily Snapshots</a>.
 	</li>
 
-	<li> Click here to <a href="/cgi-bin/viewcvs.cgi/trunk/buildroot/">browse the source tree</a>.
+	<li> Click here to <a href="http://sources.busybox.net/index.py/trunk/buildroot/">browse the source tree</a>.
 	</li>
 
-	<li>Anonymous <a href="subversion.html">Subversion access</a> is available.
+	<li>Anonymous <a href="git.html">Git access</a> is available.
 	</li>
-
-	<li>For those that are actively contributing obtaining
-		<a href="developer.html">Subversion read/write access</a> is also possible.
-	</li>
-
 </ul>
 
 <!--#include file="footer.html" -->

docs/footer.html

@@ -9,11 +9,11 @@
 
     <p>
     <font face="arial, helvetica, sans-serif" size="-1">
-	<a HREF="/copyright.txt">Copyright &copy; 1999-2005 Erik Andersen</a>
+	<a HREF="/copyright.txt">Copyright &copy; 1999-2009 Erik Andersen</a>
 	<br>
 	Mail all comments, insults, suggestions and bribes to
 	<br>
-	Erik Andersen <A HREF="mailto:andersen@codepoet.org">andersen@codepoet.org</A><BR>
+	The Buildroot developers <A HREF="mailto:buildroot@uclibc.org">buildroot@uclibc.org</A><BR>
     </font>
 
   </body>

docs/git.html

@@ -0,0 +1,38 @@
+<!--#include file="header.html" -->
+
+
+<h3>Git Access</h3>
+
+The buildroot repository can be browsed online through cgit at
+<a href="http://git.buildroot.net/buildroot">http://git.buildroot.net/buildroot</a>.
+To grab a copy of the repository use
+
+<pre>
+git clone git://git.buildroot.net/buildroot</pre>
+
+Or if you're behind a firewall blocking git:
+
+<pre>
+git clone http://git.buildroot.net/buildroot</pre>
+
+<p>
+
+If you are not already familiar with using Git, we recommend you visit <a
+href="http://git-scm.org">the Git website</a>.
+
+<p>
+
+Once you've checked out a copy of the source tree, you can update your source
+tree at any time so it is in sync with the latest and greatest by entering your
+buildroot directory and running the command:
+
+<pre>
+git pull</pre>
+
+Because you've only been granted anonymous access to the tree, you won't be
+able to commit any changes. Changes can be submitted for inclusion by posting
+them to the buildroot mailing list or to the <a
+href="http://bugs.uclibc.org/">Bug and Patch Tracking System</a>.
+
+<!--#include file="footer.html" -->
+

docs/header.html

@@ -27,27 +27,15 @@
 
 
 <tr>
-<td>
-    <div class="c3">
-      <table border="0" cellspacing="1" cellpadding="2">
-        <tr>
-          <td class="c1">BUILDROOT</td>
-        </tr>
-      </table>
-    </div>
-
-  <a href="/"><IMG SRC="images/busybox1.png" alt="Buildroot" border="0"></a><BR>
-</td>
-</tr>
-
-<tr>
-
 <td valign="TOP">
+  <a href="/"><IMG SRC="images/logo_small.png" alt="Buildroot"
+  border="0" width="200" height="100"></a><BR>
+
     <br><a href="/about.html">About</a>
     <br><a href="/news.html">Latest News</a>
     <br><a href="/download.html">Download</a>
-    <br><a href="/cgi-bin/viewcvs.cgi/trunk/buildroot/">Browse Source</a>
-    <br><a href="/subversion.html">Accessing Source</a>
+    <br><a href="http://git.buildroot.net/buildroot">Browse Source</a>
+    <br><a href="/git.html">Accessing Source</a>
     <br><a href="http://bugs.uclibc.org/">Bug Tracking</a>
     <br><a href="/docs.html">Documentation</a>
     <br><a href="/lists.html">Mailing Lists</a>

docs/index.html

@@ -1 +1 @@
-<!--#include file="news.html" -->
+<!--#include file="about.html" -->

docs/lists.html

@@ -5,10 +5,12 @@
 <h3>Mailing List Information</h3>
 Buildroot has a <a href="/lists/buildroot/">mailing list</a> for discussion and
 development.  You can subscribe by visiting
-<a href="/mailman/listinfo/buildroot">this page</a>.
+<a href="http://lists.busybox.net/mailman/listinfo/buildroot">this page</a>.
 Only subscribers to the Buildroot mailing list are allowed to post
 to this list.
-
+<p>
+The list is also available through <a
+href="http://gmane.org">Gmane</a> at <a href="http://dir.gmane.org/gmane.comp.lib.uclibc.buildroot">gmane.comp.lib.uclibc.buildroot</a>.
 <p>
 
 <h3>Search the List Archives</h3>

docs/news.html

@@ -1,8 +1,84 @@
 <!--#include file="header.html" -->
 
+<h3>News</h3>
+
+<p>
 
 <ul>
 
+  <li><b>3 May 2009 -- Moved to git</b>
+
+    <p>We've moved the source code from <a
+    href="http://subversion.tigris.org">Subversion</a> to <a
+    href="http://git-scm.org">Git</a>. You can browse the repo online
+    <a href="http://git.buildroot.net/buildroot">here</a>, and clone
+    the repo using:
+    <pre>git clone git://git.buildroot.net/buildroot</pre>
+    See the <a href="/git.html">Git Access</a> page for more details.
+    </p>
+
+  <li><b>27 March 2009 -- new Logo</b>
+
+    <p>We have a <a href="images/logo.png">logo</a>! We have so far
+    been using the <a href="http://busybox.net">Busybox</a> logo on
+    the website, as the website was a copy of the <a
+    href="http://busybox.net">Busybox</a> one - But not anymore, we
+    now have a shiny new logo of our own.</p>
+
+  <li><b>12 February 2009 -- 2009.02 released</b>
+    <p>The stable 2009.02 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2009-February/025974.html">announcement</a>
+    for more details, and go to the <a href="/downloads/">downloads page</a>
+    to pick up the <a href="/downloads/buildroot-2009.02.tar.bz2">2009.02
+    release</a>.</p>
+
+  <li><b>9 February 2009 -- 2009.02-rc4 released</b>
+    <p>We had more than 50 changes since RC3, several of them
+    toolchain related, so decided to make a RC4 as well. This is
+    very much expected to be the final release candidate, so give it
+    a good test and expect a final 2009.02 release this week unless
+    critical issues are found.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.02-rc4.tar.bz2">2009.02-rc4
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="http://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>31 January 2009 -- 2009.02-rc3 released</b>
+      <p>RC3 is out with more cleanups and bug fixes. Unless big issues
+    are found, expect this to be the last release candidate before the
+    release - So give it a good test.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.02-rc3.tar.bz2">2009.02-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="http://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>23 January 2009 -- 2009.02-rc2 released</b>
+    <p>Another week, another release candidate with a bunch of
+    cleanups and build fixes.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.02-rc2.tar.bz2">2009.02-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="http://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>16 January 2009 -- Release candidate and new maintainer</b>
+    <p>It has been a long time coming, but we finally have a new
+    release candidate! - And a new maintainer to match (Peter Korsgaard).</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.02-rc1.tar.bz2">2009.02-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="http://bugs.uclibc.org">bug tracker</a>. The plan is to
+    release 2009.02 in time for <a
+    href="http://www.fosdem.org/2009/">FOSDEM</a>.</p>
+
   <li><b>16 July 2006 -- Buildroot mailing list</b>
     <p>Buildroot now has its own <a href=lists.html>mailing list</a>.</p>
 

docs/patches.html

@@ -0,0 +1,43 @@
+<!--#include file="header.html" -->
+
+<h2>Buildroot patch structure</h2>
+
+<p>
+<h4>Keeping track of applied patches</h4>
+Whenever a patch is applied to a source code directory in buildroot, a text file named .applied_patches_list is created inside that source directory. 
+This file contains a list of all the patch filenames that were applied to that source code, just for reference. 
+</p>
+
+<p>
+<h4>Linux kernel patches</h4>
+The Linux kernel has several patch levels available for it in the buildroot patch system. 
+Buildroot first downloads the chosen kernel source from the mirror site, followed by any selected minor patch.
+Buildroot then extracts the kernel source from the compressed file and applies the minor patch, if one was chosen.
+After extracting the source and applying the official minor patch, buildroot looks for more patches in the following locations and in the order shown:
+
+<ol>
+<li> a custom, user downloaded kernel patch can be located in $(DL_DIR) and the filename is stored as $(LINUX26_BSP_PATCH) </li>
+<li> Atmel keeps their official kernel patches in target/device/Atmel/Linux/kernel-patches with subdirectories for each kernel release. 
+They also keep any board-specific patches in $(BR2_BOARD_PATH) </li>
+<li> globally available patches are kept in toolchain/kernel-headers </li>
+<li> IPMI (<a href="http://www.intel.com/design/servers/ipmi/ipmi.htm">Intelligent Platform Management Interface</a>) 
+kernel patches are kept in toolchain/kernel-headers/ipmi </li>
+<li> LZMA kernel compression support patches are kept in toolchain/kernel-headers/lzma </li>
+<li> <a href="http://www.realtimelinuxfoundation.org/downloads/downloads.html">Real-time Linux kernel</a> patches are kept in $(LINUX_RT_SOURCE) </li>
+<li> <a href="http://www.openswan.org/">Openswan</a> kernel patches are kept in package/openswan </li>
+</ol>
+</p>
+ 
+ <p>
+ <h4>Package source patches</h4>
+ Any patches for the Linux programs supported by buildroot are kept in that program's corresponding package/ directory.
+ </p>
+ 
+ <p>
+ <h4>How the patching is done</h4>
+Patches are applied in buildroot by running a shell script called toolchain/patch-kernel.sh with three arguments. The first argument is the target directory
+where the source code to be patched is saved. The second argument is the directory where the patch is saved. The third argument is the filename pattern
+to match when looking in the patch directory. The third argument can include wildcards to select multiple patch files. 
+</p>
+
+<!--#include file="footer.html" -->

docs/subversion.html

@@ -1,40 +0,0 @@
-<!--#include file="header.html" -->
-
-
-<h3>Anonymous Subversion Access</h3>
-
-We allow anonymous (read-only) Subversion (svn) access to everyone.  To
-grab a copy of the latest version of buildroot using anonymous svn access:
-
-<pre>
-svn co svn://uclibc.org/trunk/buildroot</pre>
-
-
-<p>
-
-If you are not already familiar with using Subversion, I recommend you visit <a
-href="http://subversion.tigris.org/">the Subversion website</a>.  You might
-also want to read online or buy a copy of <a
-href="http://svnbook.red-bean.com/">the Subversion Book</a>.  If you are
-already comfortable with using CVS, you may want to skip ahead to the <a
-href="http://svnbook.red-bean.com/en/1.1/apa.html">Subversion for CVS Users</a>
-part of the Subversion Book.
-
-<p>
-
-Once you've checked out a copy of the source tree, you can update your source
-tree at any time so it is in sync with the latest and greatest by entering your
-buildroot directory and running the command:
-
-<pre>
-svn update</pre>
-
-Because you've only been granted anonymous access to the tree, you won't be
-able to commit any changes. Changes can be submitted for inclusion by posting
-them to the buildroot mailing list or to the <a
-href="http://bugs.uclibc.org/">Bug and Patch Tracking System</a>.
-For those that are actively contributing <a
-href="developer.html">Subversion commit access</a> can be made available.
-
-<!--#include file="footer.html" -->
-

package/Config.in

@@ -1,19 +1,14 @@
 menu "Package Selection for the target"
 
-
-comment "The default minimal system"
 source "package/busybox/Config.in"
 
-
 comment "The minimum needed to build a uClibc development system"
+
+if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/bash/Config.in"
 source "package/bzip2/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/coreutils/Config.in"
-endif
 source "package/diffutils/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-source "package/ed/Config.in"
 source "package/findutils/Config.in"
 endif
 source "package/flex/Config.in"
@@ -39,91 +34,105 @@ source "toolchain/ccache/Config.in.2"
 source "package/cvs/Config.in"
 source "package/distcc/Config.in"
 source "package/dmalloc/Config.in"
-source "package/expat/Config.in"
 source "package/fakeroot/Config.in"
 source "package/gettext/Config.in"
 source "package/gmp/Config.in"
+source "package/gperf/Config.in"
 source "package/mpfr/Config.in"
 source "package/libtool/Config.in"
 source "package/m4/Config.in"
 source "package/mpatrol/Config.in"
-source "package/pkgconfig/Config.in"
+source "package/oprofile/Config.in"
+source "package/pkg-config/Config.in"
 source "package/readline/Config.in"
 source "package/valgrind/Config.in"
-source "package/xerces/Config.in"
+source "package/pcre/Config.in"
 
 comment "Other stuff"
 source "package/at/Config.in"
+source "package/beecrypt/Config.in"
 source "package/berkeleydb/Config.in"
 source "package/bsdiff/Config.in"
+if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+source "package/bootutils/Config.in"
+endif
+source "package/cups/Config.in"
 source "package/customize/Config.in"
+if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/dash/Config.in"
+endif
 source "package/file/Config.in"
+source "package/gamin/Config.in"
+source "package/icu/Config.in"
 source "package/kexec/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/less/Config.in"
 endif
+source "package/libconfig/Config.in"
+source "package/libconfuse/Config.in"
+source "package/libdaemon/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
 source "package/libfloat/Config.in"
+source "package/libgcrypt/Config.in"
+source "package/libgpg-error/Config.in"
+source "package/libiconv/Config.in"
+source "package/libidn/Config.in"
 source "package/liblockfile/Config.in"
+source "package/liboil/Config.in"
 source "package/libsysfs/Config.in"
 source "package/lockfile-progs/Config.in"
+source "package/logrotate/Config.in"
 source "package/lsof/Config.in"
 source "package/ltp-testsuite/Config.in"
 source "package/ltrace/Config.in"
-source "package/ltt/Config.in"
-source "package/microcom/Config.in"
+source "package/memstat/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/module-init-tools/Config.in"
 source "package/modutils/Config.in"
 endif
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-# busybox has an editor..
-source "package/nano/Config.in"
-endif
-source "package/portage/Config.in"
+source "package/ng-spice-rework/Config.in"
+source "package/popt/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/procps/Config.in"
 endif
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/psmisc/Config.in"
 endif
-source "package/sqlite/Config.in"
+source "package/screen/Config.in"
+source "package/shared-mime-info/Config.in"
+source "package/startup-notification/Config.in"
 source "package/strace/Config.in"
 source "package/sudo/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/sysklogd/Config.in"
 # busybox has init and the runit stuff
 source "package/sysvinit/Config.in"
-endif
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-source "package/tinylogin/Config.in"
-endif
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-# busybox has an editor..
-source "package/uemacs/Config.in"
-endif
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/util-linux/Config.in"
-endif
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/which/Config.in"
 endif
 
-menuconfig BR2_NETWORK_SUPPORT
-	bool "Networking"
-	default y
-	help
-	  Support for networking and related packages
+source "package/database/Config.in"
 
-if BR2_NETWORK_SUPPORT
+if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+# busybox has an editor
+
+# text editors
+source "package/editors/Config.in"
+
+endif
+
+menu "Networking"
+
+comment "Networking applications"
 source "package/argus/Config.in"
 source "package/avahi/Config.in"
+source "package/axel/Config.in"
+if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/boa/Config.in"
+endif
 source "package/bind/Config.in"
-source "package/bridge/Config.in"
-source "package/curl/Config.in"
+source "package/bridge-utils/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/dhcp/Config.in"
 endif
@@ -132,20 +141,38 @@ source "package/dropbear/Config.in"
 source "package/ethtool/Config.in"
 source "package/haserl/Config.in"
 source "package/hostap/Config.in"
+source "package/ifplugd/Config.in"
+#source "package/irda-utils/Config.in"
 source "package/iperf/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipsec-tools/Config.in"
 source "package/iptables/Config.in"
+source "package/kismet/Config.in"
 source "package/l2tp/Config.in"
 source "package/libcgi/Config.in"
 source "package/libcgicc/Config.in"
+source "package/libcurl/Config.in"
+source "package/libdnet/Config.in"
+source "package/libeXosip2/Config.in"
+source "package/libosip2/Config.in"
 source "package/libpcap/Config.in"
+source "package/libsoup/Config.in"
+source "package/libupnp/Config.in"
+if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/lighttpd/Config.in"
+endif
 source "package/links/Config.in"
 source "package/lrzsz/Config.in"
+source "package/mdnsresponder/Config.in"
+if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+source "package/microcom/Config.in"
+endif
+source "package/mii-diag/Config.in"
 source "package/mrouted/Config.in"
+source "package/mutt/Config.in"
 source "package/nbd/Config.in"
 source "package/ncftp/Config.in"
+source "package/neon/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/netcat/Config.in"
 endif
@@ -155,6 +182,7 @@ source "package/netplug/Config.in"
 source "package/netsnmp/Config.in"
 source "package/nfs-utils/Config.in"
 source "package/ntp/Config.in"
+source "package/olsr/Config.in"
 source "package/openntpd/Config.in"
 source "package/openssh/Config.in"
 source "package/openssl/Config.in"
@@ -162,7 +190,11 @@ source "package/openvpn/Config.in"
 source "package/openswan/Config.in"
 source "package/portmap/Config.in"
 source "package/pppd/Config.in"
+source "package/radvd/Config.in"
+source "package/rp-pppoe/Config.in"
+source "package/pptp-linux/Config.in"
 source "package/proftpd/Config.in"
+source "package/quagga/Config.in"
 source "package/rsync/Config.in"
 source "package/samba/Config.in"
 source "package/socat/Config.in"
@@ -171,51 +203,62 @@ source "package/tcpdump/Config.in"
 source "package/tftpd/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/thttpd/Config.in"
+source "package/tinyhttpd/Config.in"
 endif
 source "package/tn5250/Config.in"
 source "package/ttcp/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-source "package/udhcp/Config.in"
-endif
+#if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+# ATTENTION! This was merged into busybox!
+#source "package/udhcp/Config.in"
+#endif
+source "package/udpcast/Config.in"
+source "package/vpnc/Config.in"
+source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"
+source "package/webif/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/wget/Config.in"
 endif
 source "package/wireless-tools/Config.in"
+source "package/wpa_supplicant/Config.in"
 
-endif
+endmenu
 
-menuconfig BR2_BLOCKDEV_SUPPORT
-	bool "Hardware handling / blockdevices and filesystem maintenance"
-	default y
-	help
-	  Support for hardware handling and maintenance, block devices,
-	  filesystem creation and maintenance.
-
-if BR2_BLOCKDEV_SUPPORT
+menu "Hardware handling / blockdevices and filesystem maintenance"
 source "package/acpid/Config.in"
 source "package/dbus/Config.in"
 source "package/dbus-glib/Config.in"
+source "package/dbus-python/Config.in"
+source "package/devmem2/Config.in"
 source "package/dm/Config.in"
 source "package/dmraid/Config.in"
 source "package/e2fsprogs/Config.in"
+source "package/eeprog/Config.in"
+source "package/fconfig/Config.in"
+source "package/fis/Config.in"
+source "package/fuse/Config.in"
+source "package/gadgetfs-test/Config.in"
 source "package/hal/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/hdparm/Config.in"
 source "package/hotplug/Config.in"
 endif
 source "package/hwdata/Config.in"
+source "package/i2c-tools/Config.in"
+source "package/input-tools/Config.in"
 source "package/iostat/Config.in"
+source "package/libaio/Config.in"
 source "package/libraw1394/Config.in"
 source "package/libusb/Config.in"
+source "package/lm-sensors/Config.in"
 source "package/lvm2/Config.in"
 source "package/mdadm/Config.in"
 source "package/memtester/Config.in"
 source "package/mkdosfs/Config.in"
 source "package/mtd/Config.in"
+source "package/ntfs-3g/Config.in"
 source "package/pciutils/Config.in"
 source "package/pcmcia/Config.in"
-source "package/raidtools/Config.in"
 source "package/setserial/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 # busybox has fdisk
@@ -230,31 +273,12 @@ source "package/usbmount/Config.in"
 source "package/usbutils/Config.in"
 source "package/wipe/Config.in"
 source "package/xfsprogs/Config.in"
-endif
+endmenu
 
-menuconfig BR2_AUDIO_SUPPORT
-	bool "Audio libraries and applications"
-	default y
-	help
-	  Support for audio libraries and applications
+# Audio/Video support
+source "package/multimedia/Config.in"
 
-if BR2_AUDIO_SUPPORT
-source "package/asterisk/Config.in"
-source "package/libid3tag/Config.in"
-source "package/libmad/Config.in"
-source "package/libsndfile/Config.in"
-source "package/madplay/Config.in"
-source "package/mpg123/Config.in"
-endif
-
-menuconfig BR2_GRAPHIC_SUPPORT
-	bool "Graphic libraries and applications (graphic/text)"
-	default y
-	help
-	  Support for graphic libraries, X Window system and related
-	  packages, graphical toolkits, etc.
-
-if BR2_GRAPHIC_SUPPORT
+menu "Graphic libraries and applications (graphic/text)"
 comment "text rendering libraries"
 source "package/ncurses/Config.in"
 source "package/newt/Config.in"
@@ -265,66 +289,160 @@ source "package/dialog/Config.in"
 
 comment "graphic libraries"
 source "package/directfb/Config.in"
+source "package/directfb-examples/Config.in"
+source "package/fbdump/Config.in"
+source "package/imagemagick/Config.in"
 source "package/jpeg/Config.in"
+source "package/libart/Config.in"
 source "package/libpng/Config.in"
+source "package/libungif/Config.in"
+source "package/linux-fusion/Config.in"
+source "package/lite/Config.in"
+source "package/pixman/Config.in"
+source "package/sawman/Config.in"
 source "package/sdl/Config.in"
+source "package/sdl_image/Config.in"
+source "package/sdl_mixer/Config.in"
+source "package/sdl_net/Config.in"
+source "package/sdl_ttf/Config.in"
 source "package/tiff/Config.in"
 
+comment "busybox graphic applications"
+comment "--> May be broken in busybox"
+source "package/fbv/Config.in"
+source "package/fbset/Config.in"
+
 comment "other GUIs"
-source "package/qte/Config.in"
 source "package/qtopia4/Config.in"
 
 #source "package/microwin/Config.in"
 
-comment "X Window System server"
-source "package/xorg/Config.in"
-source "package/tinyx/Config.in"
+
+choice
+	prompt "X Window System server"
+	default BR2_PACKAGE_XSERVER_none
+	help
+	  Select the X Window System server to use
+
+config BR2_PACKAGE_XSERVER_none
+	bool "none"
+config BR2_PACKAGE_XSERVER_xorg
+	bool "modular xorg"
+	depends on BR2_USE_WCHAR && BR2_LARGEFILE # && BR2_ENABLE_LOCALE
+# depending on BR2_ENABLE_LOCALE gives a recursion error with dbus
+config BR2_PACKAGE_XSERVER_tinyx
+	bool "tinyx"
+	depends on BR2_USE_WCHAR
+endchoice
+
+comment "xorg requires a toolchain with LOCALE, LARGEFILE and WCHAR support"
+	depends on !(BR2_USE_WCHAR && BR2_LARGEFILE && BR2_ENABLE_LOCALE)
+comment "tinyx requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
+
+config BR2_X11_PREFIX
+	string
+	default "/usr/X11R6"	if BR2_PACKAGE_XSERVER_xorg
+	default "/usr"		if BR2_PACKAGE_XSERVER_tinyx
+	help
+	  X11 apps root location
+
+if !BR2_PACKAGE_XSERVER_none
+source "package/x11r7/Config.in"
+endif
+
 comment "X libraries and helper libraries"
+#XXX: maybe some of these should depend on !BR2_PACKAGE_XSERVER_none
 source "package/atk/Config.in"
 source "package/cairo/Config.in"
 source "package/pango/Config.in"
+source "package/libdrm/Config.in"
+source "package/liberation/Config.in"
+source "package/libglade/Config.in"
 source "package/libglib12/Config.in"
 source "package/libglib2/Config.in"
 source "package/libgtk12/Config.in"
 source "package/libgtk2/Config.in"
 source "package/gtk2-engines/Config.in"
+source "package/gtk2-themes/Config.in"
+source "package/libsexy/Config.in"
+source "package/fltk/Config.in"
+source "package/openmotif/Config.in"
 source "package/fontconfig/Config.in"
 source "package/freetype/Config.in"
+source "package/tslib/Config.in"
+source "package/webkit/Config.in"
+
 comment "X Window managers"
+source "package/matchbox/Config.in"
 source "package/metacity/Config.in"
+source "package/blackbox/Config.in"
+
 comment "X applications"
+source "package/alsamixergui/Config.in"
 source "package/dillo/Config.in"
+source "package/docker/Config.in"
+source "package/gqview/Config.in"
+source "package/gmpc/Config.in"
+source "package/gob2/Config.in"
+source "package/gtkperf/Config.in"
+source "package/leafpad/Config.in"
+source "package/midori/Config.in"
+source "package/pcmanfm/Config.in"
 source "package/rdesktop/Config.in"
 source "package/rxvt/Config.in"
+source "package/sylpheed/Config.in"
+source "package/synergy/Config.in"
+source "package/torsmo/Config.in"
+source "package/x11vnc/Config.in"
+source "package/xpdf/Config.in"
+source "package/xstroke/Config.in"
+source "package/xvkbd/Config.in"
+endmenu
 
-endif
+menu "Compressors / decompressors"
 
-menuconfig BR2_COMPRESSOR_SUPPORT
-	bool "Compressors / decompressors"
-	default y
-	help
-	  Support for compressors and decompressors like lzo, lzma, bzip2
-
-if BR2_COMPRESSOR_SUPPORT
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/gzip/Config.in"
 endif
 source "package/lzo/Config.in"
+source "package/lzop/Config.in"
 source "package/lzma/Config.in"
 source "package/zlib/Config.in"
+endmenu
+
+menu "Package managers"
+
+source "package/ipkg/Config.in"
+source "package/portage/Config.in"
+if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+source "package/rpm/Config.in"
 endif
+endmenu
 
-menuconfig BR2_SCRIPTING_SUPPORT
-	bool "Interpreter languages / Scripting"
-	default y
-	help
-	  Support for scripting languages, interpreter languages.
+menu "Interpreter languages / Scripting"
 
-if BR2_SCRIPTING_SUPPORT
+source "package/lua/Config.in"
 source "package/microperl/Config.in"
 source "package/python/Config.in"
 source "package/ruby/Config.in"
 source "package/tcl/Config.in"
-endif
+source "package/php/Config.in"
+endmenu
+
+menu "XML handling"
+
+source "package/expat/Config.in"
+source "package/ezxml/Config.in"
+source "package/libxml2/Config.in"
+source "package/libxslt/Config.in"
+source "package/xerces/Config.in"
+endmenu
+
+# java support
+source "package/java/Config.in"
+
+# various games packages
+source "package/games/Config.in"
 
 endmenu

package/Makefile.autotools.in

@@ -0,0 +1,458 @@
+################################################################################
+#
+# Makefile.autotools.in --
+#
+# Implicit and Generated Rules for easily creating autotools-compatible
+# buildroot packages
+#
+## Example minimal makefile for a package named 'foo'
+#
+# | FOO_VERSION = 1.0
+# | FOO_SOURCE = foo-$(FOO_VERSION).tar.gz
+# | FOO_SITE = http://www.libfoo.org/dist
+# | $(eval $(call AUTOTARGETS,package,foo))
+#
+## The following targets can be called from the shell:
+#
+# foo, foo-source, foo-patch, foo-configure, foo-build, foo-install,
+# foo-install-target, foo-install-staging, foo-uninstall, foo-clean,
+# foo-dirclean
+#
+## The following variables which can be (re)defined in the package makefile:
+#
+# FOO_VERSION [mandatory]
+#	version string of the package
+# FOO_SOURCE [default foo-$(FOO_VERSION).tar.gz]
+#	file name of the package source
+# FOO_SITE [default sourceforge project "foo"]
+#	URL under wich $(FOO_SOURCE) can be found
+# FOO_DEPENDENCIES [default empty]
+#	list of (package) targets that must be built before foo
+# FOO_AUTORECONF [YES/NO, default NO]
+#	run <autoreconf> before <configure>
+# FOO_LIBTOOL_PATCH [YES/NO, default YES]
+#	Do you want the standard buildroot patch applied to ltmain.sh? (libtool)
+# FOO_USE_CONFIG_CACHE [YES/NO default $(BR2_CONFIG_CACHE)]
+#   Do you wany to use the central configure cache file? See BR2_CONFIG_CACHE.
+# FOO_CONF_ENV [default empty]
+#	environment passed to the <configure> script
+# FOO_CONF_OPT [default empty]
+#	arguments passed to the <configure> script
+# FOO_MAKE [default $(MAKE)]
+#	command to use to execute <make>
+# FOO_MAKE_ENV [default empty]
+#	environment passed to all calls to <make> in the package source
+#	directory
+# FOO_MAKE_OPT [default empty]
+#	arguments passed to <make> while building
+# FOO_INSTALL_STAGING [YES/NO, default NO]
+#	install the package to the staging directory
+# FOO_INSTALL_TARGET [YES/NO, default YES]
+#	install the package to the target directory
+# FOO_INSTALL_STAGING_OPT [default DESTDIR=$(STAGING_DIR) install]
+#	arguments passed to <make> while installing to the staging directory
+# FOO_INSTALL_TARGET_OPT [default DESTDIR=$(TARGET_DIR) install-exec/install-strip]
+#	arguments passed to <make> while installing to the target directory
+# FOO_CLEAN_OPT [default clean]
+#	arguments passed to <make> while installing to the staging directory
+# FOO_UNINSTALL_STAGING_OPT  [default DESTDIR=$(STAGING_DIR) uninstall]
+#	arguments passed to <make> while uninstalling from the staging
+#	directory
+# FOO_UNINSTALL_TARGET_OPT [default DESTDIR=$(TARGET_DIR) uninstall]
+#	arguments passed to <make> while uninstalling from the target
+#	directory
+# FOO_SUBDIR [default empty]
+#	relative path in the package source from which to run configure and
+#	make
+# FOO_DIR_PREFIX [default empty]
+#	toplevel relative path to package *.mk file and corresponding patches
+#
+## The following variables contain hook target names
+## by default they do nothing, they can be overriden in package makefiles
+#
+# FOO_HOOK_POST_EXTRACT, FOO_HOOK_POST_CONFIGURE,
+# FOO_HOOK_POST_BUILD, FOO_HOOK_POST_INSTALL
+#
+## The following variables contain targets that can be overriden
+#
+# FOO_TARGET_INSTALL_TARGET FOO_TARGET_INSTALL_STAGING FOO_TARGET_BUILD
+# FOO_TARGET_CONFIGURE FOO_TARGET_PATCH FOO_TARGET_EXTRACT FOO_TARGET_SOURCE
+# FOO_TARGET_UNINSTALL FOO_TARGET_CLEAN FOO_TARGET_DIRCLEAN
+#
+# E.g. if your package has a no <configure> script you can place the following
+# in your package makefile:
+#
+# | $(FOO_TARGET_INSTALL):
+# |	touch $@
+#
+## The following variables are defined automatically and can be used in
+## overriden targets:
+#
+# PKG
+#	is always the current package name ("foo" in the example)
+# FOO_DIR
+#	the directory in which the package source is extracted.
+#	the base name will always be foo-$(FOO_VERSION), no matter what the
+#	archive name or the directory-in-archive name are.
+# MESSAGE
+#	macro that outputs a pretty message to stdout, e.g. use
+#	$(call MESSAGE,"Hello World")
+#	in a target.
+#
+# Caveats:
+# - the 'eval' line (final line in the example) must be placed
+#   after all variable settings, but before all target re-definition
+#   (including hooks)
+################################################################################
+
+# UPPERCASE Macro -- transform its argument to uppercase and replace dots and
+# hyphens to underscores
+UPPERCASE = $(shell echo $(1) | tr "a-z.-" "A-Z__")
+
+# Define extrators for different archive suffixes
+INFLATE.bz2 = $(BZCAT)
+INFLATE.gz  = $(ZCAT)
+INFLATE.tbz = $(BZCAT)
+INFLATE.tgz = $(ZCAT)
+INFLATE.tar = cat
+
+# MESSAGE Macro -- display a message in bold type
+MESSAGE = @echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
+TERM_BOLD := $(shell tput smso)
+TERM_RESET := $(shell tput rmso)
+
+################################################################################
+# DOWNLOAD -- Download helper. Will try to download source from:
+# 1) BR2_PRIMARY_SITE if enabled
+# 2) Download site
+# 3) BR2_BACKUP_SITE if enabled
+#
+# Argument 1 is the source location
+# Argument 2 is the source filename
+#
+# E.G. use like this:
+# $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE))
+################################################################################
+
+# support make source-check/external-deps
+ifneq ($(SPIDER),)
+DOWNLOAD=$(WGET) -P $(DL_DIR) $(1)/$(2)
+else
+define DOWNLOAD
+	$(Q)test -e $(DL_DIR)/$(2) || \
+	for site in $(strip $(subst ",,$(BR2_PRIMARY_SITE))) $(1) $(strip $(subst ",,$(BR2_BACKUP_SITE))); \
+	do $(WGET) -P $(DL_DIR) $$site/$(2) && exit; done
+endef
+endif
+
+# Utility programs used to build packages
+TAR ?= tar
+#ACLOCAL_STAGING_DIR ?= $(STAGING_DIR)/usr/share/aclocal
+#ACLOCAL ?= aclocal -I $(ACLOCAL_STAGING_DIR)
+#AUTORECONF ?= autoreconf -v -i -f -I $(ACLOCAL_STAGING_DIR)
+#	ACLOCAL="$(ACLOCAL)"
+
+# Automatically detect tar --strip-path/components option
+TAR_STRIP_COMPONENTS := $(shell $(TAR) --help | grep strip-path > /dev/null ; if test $$? = 0 ; then echo '--strip-path' ; else echo '--strip-components' ; fi)
+
+################################################################################
+# Implicit targets -- produce a stamp file for each step of a package build
+################################################################################
+
+# Retrieve and unpack the archive
+$(BUILD_DIR)/%/.stamp_downloaded:
+# support make source-check/external-deps
+ifeq ($(SPIDER),)
+	$(call MESSAGE,"Downloading")
+endif
+	$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE))
+	$(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH)))
+ifeq ($(SPIDER),)
+	$(Q)mkdir -p $(@D)
+	$(Q)touch $@
+endif
+
+# Retrieve and unpack the archive
+$(BUILD_DIR)/%/.stamp_extracted:
+	$(call MESSAGE,"Extracting")
+	$(Q)mkdir -p $(@D)
+	$(Q)$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
+	$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
+# some packages have messed up permissions inside
+	$(Q)chmod -R ug+rw $(@D)
+	$(Q)touch $@
+
+# Fix libtool support if required by the package
+$(BUILD_DIR)/%/.stamp_libtool_patch:
+	$(call MESSAGE,"Patching libtool")
+# if the package uses libtool, patch it for cross-compiling in buildroot
+	$(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES"; then \
+	for i in `find $(@D) -name ltmain.sh`; do \
+		toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \
+		done \
+	fi
+	$(Q)touch $@
+
+# Patch
+# XXX: FIXME: This has to be done differently and path-independent, i.e. use
+# XXX: FIXME: the dir-part of the stem as base-dir (instead of hardcoding
+# XXX: FIXME: "package/".
+$(BUILD_DIR)/%/.stamp_patched: NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
+$(BUILD_DIR)/%/.stamp_patched:
+	$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)")
+	$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
+	$(Q)( \
+	if test -d $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME); then \
+	  if test "$(wildcard $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER)*.patch*)"; then \
+	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \
+	  else \
+	    toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME) $($(PKG)_NAME)\*.patch $($(PKG)_NAME)\*.patch.$(ARCH) || exit 1; \
+	    if test -d $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER); then \
+	      toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(PKG)_NAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \
+	    fi; \
+	  fi; \
+	fi; \
+	)
+ifeq ($(BR2_UPDATE_CONFIG),y)
+	$(Q)(for file in config.guess config.sub; do \
+		for i in $$(find $(@D) -name $$file); do \
+			cp package/gnuconfig/$$file $$i; \
+		done; \
+	done)
+endif
+	$(Q)touch $@
+
+# Running autoreconf
+$(BUILD_DIR)/%/.stamp_autoconfigured:
+	$(call MESSAGE,"Running autoreconf")
+	$(Q)cd $(@D)/$($(PKG)_SUBDIR) && $(AUTORECONF)
+# if the package uses libtool, patch it for cross-compiling in buildroot
+	$(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES"; then \
+		for i in `find $(@D)/$($(PKG)_SUBDIR) -name ltmain.sh`; do \
+		toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \
+		done \
+	fi
+	$(Q)touch $@
+
+# Configuring
+$(BUILD_DIR)/%/.stamp_configured:
+	$(call MESSAGE,"Configuring")
+	cd $(@D)/$($(PKG)_SUBDIR) && rm -f config.cache && \
+	$(TARGET_CONFIGURE_OPTS) \
+	$(TARGET_CONFIGURE_ARGS) \
+	$(TARGET_CONFIGURE_ENV) \
+	$($(PKG)_CONF_ENV) \
+	$(if $(THIS_SRCDIR),$(THIS_SRCDIR)/,./)configure \
+		$(if $(filter YES,$($(PKG)_USE_CONFIG_CACHE)),--cache-file="$(PROJECT_BUILD_DIR)/tgt-config.cache",) \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--sysconfdir=/etc \
+		$(DISABLE_DOCUMENTATION) \
+		$(DISABLE_NLS) \
+		$(DISABLE_LARGEFILE) \
+		$(QUIET) $($(PKG)_CONF_OPT)
+	$(Q)touch $@
+
+# Build
+$(BUILD_DIR)/%/.stamp_built:
+	$(call MESSAGE,"Building")
+	PATH=$(TARGET_PATH) $($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$(Q)touch $@
+
+# Install to staging dir
+$(BUILD_DIR)/%/.stamp_staging_installed:
+	$(call MESSAGE,'Installing to host (staging directory)')
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+#	toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr"
+	for i in $$(find $(STAGING_DIR)/usr/lib/ -name "*.la"); do \
+		cp $$i $$i~; \
+		$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$i; \
+	done
+	touch $@
+
+# Install to target dir
+$(PROJECT_BUILD_DIR)/autotools-stamps/%_target_installed:
+	$(call MESSAGE,"Installing to target")
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $($(PKG)_DIR)/$($(PKG)_SUBDIR)
+	$(if $(BR2_HAVE_MANPAGES),,for d in man share/man; do \
+		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
+	done)
+	$(if $(BR2_HAVE_INFOPAGES),,for d in info share/info; do \
+		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
+	done)
+	$(if $(BR2_HAVE_DOCUMENTATION),,for d in doc share/doc; do \
+		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
+	done)
+	touch $@
+
+$(BUILD_DIR)/%/.stamp_cleaned:
+	$(call MESSAGE,"Cleaning up")
+	-$($(PKG)_MAKE_ENV) $($(PKG)_MAKE)  $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	rm -f $(@D)/.stamp_built
+
+$(BUILD_DIR)/%/.stamp_uninstalled:
+	$(call MESSAGE,"Uninstalling")
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	rm -f $(@D)/.stamp_staging_installed
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	rm -f $($(PKG)_TARGET_INSTALL_TARGET) $($(PKG)_HOOK_POST_INSTALL)
+
+$(BUILD_DIR)/%/.stamp_dircleaned:
+	rm -Rf $(@D)
+
+
+################################################################################
+# AUTOTARGETS -- the target generator macro; define a set of human-readable
+# make targets, stamps, and default per-package variables.
+# Argument 1 is the package directory prefix.
+# Argument 2 is the (lowercase) package name.
+################################################################################
+
+define AUTOTARGETS
+$(call AUTOTARGETS_INNER,$(2),$(call UPPERCASE,$(2)),$(1))
+endef
+
+# AUTOTARGETS_INNER -- does the job for AUTOTARGETS; argument 1 is the
+# lowercase package name, argument 2 the uppercase package name,
+# argument 3 the package directory prefix
+define AUTOTARGETS_INNER
+
+# define package-specific variables to default values
+$(2)_NAME			=  $(1)
+$(2)_VERSION			?= undefined
+$(2)_DIR			=  $$(BUILD_DIR)/$(1)-$$($(2)_VERSION)
+$(2)_SOURCE			?= $(1)-$$($(2)_VERSION).tar.gz
+$(2)_SITE			?= \
+	http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/$(1)
+$(2)_DEPENDENCIES		?=
+$(2)_AUTORECONF			?= NO
+$(2)_LIBTOOL_PATCH		?= YES
+$(2)_USE_CONFIG_CACHE   ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
+$(2)_CONF_ENV			?=
+$(2)_CONF_OPT			?=
+$(2)_MAKE			?= $(MAKE)
+$(2)_MAKE_ENV			?=
+$(2)_MAKE_OPT			?=
+$(2)_INSTALL_STAGING		?= NO
+$(2)_INSTALL_TARGET		?= YES
+$(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
+ifeq ($(BR2_ENABLE_DEBUG),y)
+$(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install-exec
+else
+$(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install-strip
+endif
+$(2)_CLEAN_OPT			?= clean
+$(2)_UNINSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) uninstall
+$(2)_UNINSTALL_TARGET_OPT	?= DESTDIR=$$(TARGET_DIR)  uninstall
+$(2)_SUBDIR			?=
+$(2)_DIR_PREFIX			=  $(if $(3),$(3),$(TOP_SRCDIR)/package)
+
+
+# define sub-target stamps
+# targets which affect $(TARGET_DIR) must use a unique stamp for each $(PROJECT)
+$(2)_TARGET_INSTALL_TARGET =	$(PROJECT_BUILD_DIR)/autotools-stamps/$(1)_target_installed
+$(2)_TARGET_INSTALL_STAGING =	$$($(2)_DIR)/.stamp_staging_installed
+$(2)_TARGET_BUILD =		$$($(2)_DIR)/.stamp_built
+$(2)_TARGET_CONFIGURE =		$$($(2)_DIR)/.stamp_configured
+$(2)_TARGET_AUTORECONF =	$$($(2)_DIR)/.stamp_autoconfigured
+$(2)_TARGET_LIBTOOL_PATCH =	$$($(2)_DIR)/.stamp_libtool_patch
+$(2)_TARGET_PATCH =		$$($(2)_DIR)/.stamp_patched
+$(2)_TARGET_EXTRACT =		$$($(2)_DIR)/.stamp_extracted
+$(2)_TARGET_SOURCE =		$$($(2)_DIR)/.stamp_downloaded
+$(2)_TARGET_UNINSTALL =		$$($(2)_DIR)/.stamp_uninstalled
+$(2)_TARGET_CLEAN =		$$($(2)_DIR)/.stamp_cleaned
+$(2)_TARGET_DIRCLEAN =		$$($(2)_DIR)/.stamp_dircleaned
+
+$(2)_HOOK_POST_EXTRACT =	$$($(2)_DIR)/.stamp_hook_post_extract
+$(2)_HOOK_POST_CONFIGURE =	$$($(2)_DIR)/.stamp_hook_post_configure
+$(2)_HOOK_POST_BUILD =		$$($(2)_DIR)/.stamp_hook_post_build
+$(2)_HOOK_POST_INSTALL =	$(PROJECT_BUILD_DIR)/autotools-stamps/$(1)_hook_post_install
+
+# human-friendly targets and target sequencing
+$(1):			$(1)-install
+$(1)-install:		$(1)-install-staging $(1)-install-target \
+			$$($(2)_HOOK_POST_INSTALL)
+
+ifeq ($$($(2)_INSTALL_TARGET),YES)
+$(1)-install-target:	$(1)-build $$($(2)_TARGET_INSTALL_TARGET)
+else
+$(1)-install-target:
+endif
+
+ifeq ($$($(2)_INSTALL_STAGING),YES)
+$(1)-install-staging:	$(1)-build $$($(2)_TARGET_INSTALL_STAGING)
+else
+$(1)-install-staging:
+endif
+
+$(1)-build:		$(1)-configure \
+			$$($(2)_TARGET_BUILD) \
+			$$($(2)_HOOK_POST_BUILD)
+
+$(1)-configure:		$(1)-autoreconf \
+			$$($(2)_TARGET_CONFIGURE) \
+			$$($(2)_HOOK_POST_CONFIGURE)
+
+ifeq ($$($(2)_AUTORECONF),YES)
+$(1)-autoreconf:	$(1)-patch $$($(2)_TARGET_AUTORECONF)
+$(2)_DEPENDENCIES += host-automake host-autoconf host-libtool
+else
+$(1)-autoreconf:	$(1)-patch
+endif
+
+$(1)-patch:		$(1)-extract $$($(2)_TARGET_PATCH)
+
+$(1)-extract:		$(1)-depends \
+			$$($(2)_TARGET_EXTRACT) \
+			$$($(2)_HOOK_POST_EXTRACT) \
+			$$($(2)_TARGET_LIBTOOL_PATCH)
+
+$(1)-depends:		$(1)-source $$($(2)_DEPENDENCIES)
+
+$(1)-source:		$$($(2)_TARGET_SOURCE)
+
+# non-build targets
+$(1)-uninstall:	$(1)-configure $$($(2)_TARGET_UNINSTALL)
+
+$(1)-clean:		$(1)-uninstall \
+			$$($(2)_TARGET_CLEAN)
+
+$(1)-dirclean:		$$($(2)_TARGET_DIRCLEAN)
+
+# define the PKG variable for all targets, containing the
+# uppercase package variable prefix
+$$($(2)_TARGET_INSTALL_TARGET):		PKG=$(2)
+$$($(2)_TARGET_INSTALL_STAGING):	PKG=$(2)
+$$($(2)_TARGET_BUILD):			PKG=$(2)
+$$($(2)_TARGET_CONFIGURE):		PKG=$(2)
+$$($(2)_TARGET_LIBTOOL_PATCH):	PKG=$(2)
+$$($(2)_TARGET_AUTORECONF):		PKG=$(2)
+$$($(2)_TARGET_PATCH):			PKG=$(2)
+$$($(2)_TARGET_EXTRACT):		PKG=$(2)
+$$($(2)_TARGET_SOURCE):			PKG=$(2)
+$$($(2)_TARGET_UNINSTALL):		PKG=$(2)
+$$($(2)_TARGET_CLEAN):			PKG=$(2)
+$$($(2)_TARGET_DIRCLEAN):		PKG=$(2)
+$$($(2)_HOOK_POST_EXTRACT):		PKG=$(2)
+$$($(2)_HOOK_POST_CONFIGURE):	PKG=$(2)
+$$($(2)_HOOK_POST_BUILD):		PKG=$(2)
+$$($(2)_HOOK_POST_INSTALL):		PKG=$(2)
+
+# define hook targets
+# default hook behaviour: do nothing
+$$($(2)_HOOK_POST_EXTRACT):
+$$($(2)_HOOK_POST_CONFIGURE):
+$$($(2)_HOOK_POST_BUILD):
+$$($(2)_HOOK_POST_INSTALL):
+
+# add package to the general list of targets if requested by the buildroot
+# configuration
+ifeq ($$(BR2_PACKAGE_$(2)),y)
+TARGETS += $(1)
+endif
+endef
+
+# :mode=makefile:

package/Makefile.in

@@ -1,89 +1,198 @@
 ifndef MAKE
-MAKE=make
+MAKE:=make
 endif
-MAKE1:=$(MAKE) MAKE="$(firstword $(MAKE)) -j1"
-MAKE:=$(MAKE) -j$(BR2_JLEVEL)
+ifndef HOSTMAKE
+HOSTMAKE=$(MAKE)
+endif
+HOSTMAKE :=$(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)
 
-# Strip off the annoying quoting
-ARCH:=$(strip $(subst ",, $(BR2_ARCH)))
-#"))
-WGET:=$(strip $(subst ",, $(BR2_WGET)))
-#"))
-SVN:=$(strip $(subst ",, $(BR2_SVN)))
-#"))
-ZCAT:=$(strip $(subst ",, $(BR2_ZCAT)))
-#"))
-BZCAT:=$(strip $(subst ",, $(BR2_BZCAT)))
-#"))
-TAR_OPTIONS=$(subst ",, $(BR2_TAR_OPTIONS)) -xf
-#")
+MAKE1:=$(HOSTMAKE) -j1
+MAKE:=$(HOSTMAKE) -j$(BR2_JLEVEL)
+
+ifeq ($(BR2_OPTIMIZE_0),y)
+TARGET_OPTIMIZATION+=-O0
+endif
+ifeq ($(BR2_OPTIMIZE_1),y)
+TARGET_OPTIMIZATION+=-O1
+endif
+ifeq ($(BR2_OPTIMIZE_2),y)
+TARGET_OPTIMIZATION+=-O2
+endif
+ifeq ($(BR2_OPTIMIZE_3),y)
+TARGET_OPTIMIZATION+=-O3
+endif
+ifeq ($(BR2_OPTIMIZE_S),y)
+TARGET_OPTIMIZATION+=-Os
+endif
+ifeq ($(BR2_DEBUG_1),y)
+TARGET_DEBUGGING=-g1
+endif
+ifeq ($(BR2_DEBUG_2),y)
+TARGET_DEBUGGING=-g2
+endif
+ifeq ($(BR2_DEBUG_3),y)
+TARGET_DEBUGGING=-g3
+endif
 
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
+#########################################################################
+ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \
+	-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
+ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
+TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
+TARGET_LDFLAGS+= $(BR2_SYSROOT)
+endif
+
+CC_TARGET_TUNE_:=$(strip $(subst ",,$(BR2_GCC_TARGET_TUNE)))
+#"))
+CC_TARGET_ARCH_:=$(strip $(subst ",,$(BR2_GCC_TARGET_ARCH)))
+#"))
+CC_TARGET_ABI_:=$(strip $(subst ",,$(BR2_GCC_TARGET_ABI)))
+#"))
+ifneq ($(CC_TARGET_TUNE_),)
+TARGET_CFLAGS+=-mtune=$(CC_TARGET_TUNE_)
+endif
+ifneq ($(CC_TARGET_ARCH_),)
+TARGET_CFLAGS+=-march=$(CC_TARGET_ARCH_)
+endif
+ifneq ($(CC_TARGET_ABI_),)
+TARGET_CFLAGS+=-mabi=$(CC_TARGET_ABI_)
+endif
+
+ifneq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_x86_64),y)
+TARGET_CFLAGS+=-fPIC -DPIC
+endif # PIC for dynamic objects on x86_64
+endif
+
+ifeq ($(BR2_SOFT_FLOAT),y)
+TARGET_CFLAGS+=-msoft-float
+endif
+
+ifeq ($(BR2_VFP_FLOAT),y)
+TARGET_CFLAGS+=-mfpu=vfp
+endif
+
+# enable VIS for v9a and v9b
+ifeq ($(findstring y,$(BR2_sparc_v9a)$(BR2_sparc64_v9a)$(BR2_sparc_v9b)$(BR2_sparc64_v9b)),y)
+TARGET_CFLAGS+=-mvis
+endif
+
+ifeq ($(findstring yy,$(BR2_mips)$(BR2_MIPS_ABI64)),yy)
+TARGET_CFLAGS+=-fno-pic -mno-abicalls
+endif
+
+ifeq ($(BR2_LARGEFILE),y)
+TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+endif
+
+TARGET_CXXFLAGS=$(TARGET_CFLAGS)
+
+# else it's an external toolchain
+#########################################################################
 else
-TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include -I$(TOOLCHAIN_EXTERNAL_PATH)/$(TOOLCHAIN_EXTERNAL_PREFIX)/include
-TARGET_LDFLAGS=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
+TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) --sysroot $(STAGING_DIR)/
+TARGET_CXXFLAGS=$(TARGET_CFLAGS)
+TARGET_LDFLAGS=--sysroot $(STAGING_DIR)/
 endif
-HOSTCC:=gcc
-HOSTCXX:=g++
-
-BASE_DIR:=${shell pwd}
-
-TOPDIR_PREFIX:=$(strip $(subst ",, $(BR2_TOPDIR_PREFIX)))_
-#"))
-TOPDIR_SUFFIX:=_$(strip $(subst ",, $(BR2_TOPDIR_SUFFIX)))
-#"))
-ifeq ($(TOPDIR_PREFIX),_)
-TOPDIR_PREFIX:=
-endif
-ifeq ($(TOPDIR_SUFFIX),_)
-TOPDIR_SUFFIX:=
+#########################################################################
+#ifeq ($(BR2_ROOTFS_SUFFIX),)
+ROOTFS_SUFFIX:=$(strip $(subst ",, $(BR2_ROOTFS_SUFFIX)))
+ifeq ($(ROOTFS_SUFFIX),)
+ROOTFS_SUFFIX:=
+else
+XXXX=xxxx
+ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
 endif
 
-DL_DIR=$(strip $(subst ",, $(BR2_DL_DIR)))
-#"))
-ifeq ($(DL_DIR),)
-DL_DIR:=$(BASE_DIR)/dl
+ifeq ($(strip $(subst ",, $(BR2_FPU_SUFFIX))),y)
+COND_ARCH_FPU_SUFFIX:=$(ARCH_FPU_SUFFIX)
+else
+COND_ARCH_FPU_SUFFIX:=
 endif
-#PATCH_DIR=$(BASE_DIR)/sources/patches
-BUILD_DIR:=$(BASE_DIR)/$(TOPDIR_PREFIX)build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
-TARGET_DIR:=$(BUILD_DIR)/root
 
-GNU_TARGET_SUFFIX:=-$(strip $(subst ",, $(BR2_GNU_TARGET_SUFFIX)))
-#"))
-
-STAGING_DIR:=$(strip $(subst ",, $(BR2_STAGING_DIR)))
-#"))
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
+ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
 
 # Quotes are needed for spaces et al in path components.
-TARGET_PATH="$(STAGING_DIR)/bin:$(TOOL_BUILD_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
-IMAGE:=$(BASE_DIR)/rootfs.$(ARCH)$(ARCH_FPU_SUFFIX)
-REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
+TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
 GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
-KERNEL_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)-
-TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)-
+REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
+TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
+KERNEL_CROSS=$(TARGET_CROSS)
 else
 TOOLCHAIN_EXTERNAL_PREFIX:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PREFIX)))
 #"))
 TOOLCHAIN_EXTERNAL_PATH:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PATH)))
 #"))
-TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX)
-TARGET_PATH="$(STAGING_DIR)/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
-IMAGE:=$(BASE_DIR)/rootfs.$(TOOLCHAIN_EXTERNAL_PREFIX)
+#TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX)
+TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
+TARGET_PATH="$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
+#IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX)
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
+
 REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
 GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
 KERNEL_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 endif
+TARGET_AR=$(TARGET_CROSS)ar
+TARGET_AS=$(TARGET_CROSS)as
 TARGET_CC=$(TARGET_CROSS)gcc
+TARGET_CPP=$(TARGET_CROSS)cpp
 TARGET_CXX=$(TARGET_CROSS)g++
+ifeq ($(BR2_GCC_VERSION_3_4_6),y)
+TARGET_FC=$(TARGET_CROSS)g77
+else
+TARGET_FC=$(TARGET_CROSS)gfortran
+endif
+TARGET_LD=$(TARGET_CROSS)ld
+TARGET_NM=$(TARGET_CROSS)nm
 TARGET_RANLIB=$(TARGET_CROSS)ranlib
-STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
+TARGET_OBJCOPY=$(TARGET_CROSS)objcopy
+TARGET_OBJDUMP=$(TARGET_CROSS)objdump
+ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+TARGET_LDCONFIG=/sbin/ldconfig
+else
+TARGET_LDCONFIG=$(TARGET_CROSS)ldconfig
+endif
+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)
+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)
+endif
+ifeq ($(BR2_STRIP_none),y)
+TARGET_STRIP=true -Not_stripping
+STRIPCMD=$(TARGET_STRIP)
+endif
 INSTALL=/usr/bin/install
+FLEX:=$(shell which flex || type -p flex)
+BISON:=$(shell which bison || type -p bison)
 
+HOST_CFLAGS   += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include
+HOST_CXXFLAGS += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include
+HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib
+HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH)
+
+# hostcc version as an integer - E.G. 4.3.2 => 432
+HOSTCC_VERSION:=$(shell $(HOSTCC) --version | \
+	sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p')
 
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
 	-e 's/sparc.*/sparc/' \
@@ -99,22 +208,149 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
 	)
 GNU_HOST_NAME:=$(HOST_ARCH)-$(subst ",,$(BR2_GNU_BUILD_SUFFIX))
 #")
-TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
-		AR=$(TARGET_CROSS)ar \
-		AS=$(TARGET_CROSS)as \
-		LD=$(TARGET_CROSS)ld \
-		NM=$(TARGET_CROSS)nm \
-		CC=$(TARGET_CROSS)gcc \
-		GCC=$(TARGET_CROSS)gcc \
-		CXX=$(TARGET_CROSS)g++ \
-		CPP=$(TARGET_CROSS)cpp \
-		RANLIB=$(TARGET_CROSS)ranlib \
-		STRIP=$(TARGET_CROSS)strip \
-		OBJCOPY=$(TARGET_CROSS)objcopy \
-		CC_FOR_BUILD="$(HOSTCC)" \
-		PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
-		PKG_CONFIG=$(STAGING_DIR)/usr/bin/pkg-config
 
+AUTO_CONFIGURE_TARGET=\
+	$(TARGET_CONFIGURE_OPTS) \
+	$(TARGET_CONFIGURE_ARGS) \
+	$(TARGET_CONFIGURE_ENV) \
+	$(if $(THIS_SRCDIR),$(THIS_SRCDIR)/,./)configure \
+		$(if $(BR2_CONFIG_CACHE),--cache-file="$(PROJECT_BUILD_DIR)/tgt-config.cache",) \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME)
+
+TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
+		AR="$(TARGET_AR)" \
+		AS="$(TARGET_AS)" \
+		LD="$(TARGET_LD)" \
+		NM="$(TARGET_NM)" \
+		CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
+		GCC="$(TARGET_CC) $(TARGET_CFLAGS)" \
+		CPP="$(TARGET_CPP) $(TARGET_CFLAGS)" \
+		CXX="$(TARGET_CXX) $(TARGET_CXXFLAGS)" \
+		FC="$(TARGET_FC) $(TARGET_FCFLAGS)" \
+		RANLIB="$(TARGET_RANLIB)" \
+		STRIP="$(TARGET_STRIP)" \
+		OBJCOPY="$(TARGET_OBJCOPY)" \
+		AR_FOR_BUILD="$(HOSTAR)" \
+		AS_FOR_BUILD="$(HOSTAS)" \
+		CC_FOR_BUILD="$(HOSTCC)" \
+		GCC_FOR_BUILD="$(HOSTCC)" \
+		CXX_FOR_BUILD="$(HOSTCXX)" \
+		FC_FOR_BUILD="$(HOSTFC)" \
+		LD_FOR_BUILD="$(HOSTLD)" \
+		CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
+		CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
+		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
+		FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \
+		AR_FOR_TARGET="$(TARGET_AR)" \
+		AS_FOR_TARGET="$(TARGET_AS)" \
+		CC_FOR_TARGET="$(TARGET_CC)" \
+		LD_FOR_TARGET="$(TARGET_LD)" \
+		NM_FOR_TARGET="$(TARGET_NM)" \
+		DEFAULT_ASSEMBLER="$(TARGET_AS)" \
+		DEFAULT_LINKER="$(TARGET_LD)" \
+		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
+		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig$(PKG_CONFIG_PATH)" \
+		STAGING_DIR="$(STAGING_DIR)"
+
+TARGET_CONFIGURE_ENV=\
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CXXFLAGS="$(TARGET_CXXFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FCFLAGS="$(TARGET_FCFLAGS)" \
+
+HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
+		AR="$(HOSTAR)" \
+		AS="$(HOSTAS)" \
+		LD="$(HOSTLD) $(HOST_LDFLAGS)" \
+		NM="$(HOSTNM)" \
+		CC="$(HOSTCC) $(HOST_CFLAGS)" \
+		GCC="$(HOSTCC) $(HOST_CFLAGS)" \
+		CXX="$(HOSTCXX) $(HOST_CXXFLAGS)" \
+		CPP="$(HOSTCPP) $(HOST_CFLAGS)" \
+		AR_FOR_BUILD="$(HOSTAR)" \
+		AS_FOR_BUILD="$(HOSTAS)" \
+		CC_FOR_BUILD="$(HOSTCC)" \
+		GCC_FOR_BUILD="$(HOSTCC)" \
+		CXX_FOR_BUILD="$(HOSTCXX)" \
+		LD_FOR_BUILD="$(HOSTLD)" \
+		FC_FOR_BUILD="$(HOSTFC)" \
+		CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
+		CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
+		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
+		FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \
+		AR_FOR_TARGET="$(TARGET_AR)" \
+		AS_FOR_TARGET="$(TARGET_AS)" \
+		CC_FOR_TARGET="$(TARGET_CC)" \
+		LD_FOR_TARGET="$(TARGET_LD)" \
+		NM_FOR_TARGET="$(TARGET_NM)" \
+		RANLIB_FOR_TARGET="$(TARGET_RANLIB)" \
+		STRIP_FOR_TARGET="$(TARGET_STRIP)" \
+		OBJCOPY_FOR_TARGET="$(TARGET_OBJCOPY)" \
+		OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
+		DEFAULT_ASSEMBLER="$(TARGET_AS)" \
+		DEFAULT_LINKER="$(TARGET_LD)" \
+		ORIGINAL_AS_FOR_TARGET="$(TARGET_AS)" \
+		ORIGINAL_LD_FOR_TARGET="$(TARGET_LD)" \
+		ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
+		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
+		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+		PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig$(PKG_CONFIG_PATH)"
+
+HOST_MAKE_ENV=PATH=$(HOST_PATH)
+
+#######################################################################
+# settings we need to pass to configure
+
+# does unaligned access trap?
+BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=yes
+ifeq ($(BR2_i386),y)
+BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
+endif
+ifeq ($(BR2_x86_64),y)
+BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
+endif
+ifeq ($(BR2_m68k),y)
+BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
+endif
+ifeq ($(BR2_powerpc)$(BR2_ENDIAN),yBIG)
+BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
+endif
+
+ifeq ($(BR2_ENDIAN),"BIG")
+BR2_AC_CV_C_BIGENDIAN=ac_cv_c_bigendian=yes
+else
+BR2_AC_CV_C_BIGENDIAN=ac_cv_c_bigendian=no
+endif
+
+# XXX: FIXME: We would need to grab MALLOC_GLIBC_COMPAT from the uClibc.config
+# Including it doesn't seem wise, grepping is ugly.. Suggestions?
+# Does malloc return live pointer for malloc(0) ?
+ifeq ($(MALLOC_GLIBC_COMPAT),y)
+BR2_AC_CV_FUNC_MALLOC_0_NONNULL=ac_cv_func_malloc_0_nonnull=yes \
+				gl_cv_func_malloc_0_nonnull=yes \
+				ac_cv_func_realloc_0_nonnull=yes
+else
+BR2_AC_CV_FUNC_MALLOC_0_NONNULL=ac_cv_func_malloc_0_nonnull=no \
+				gl_cv_func_malloc_0_nonnull=no \
+				ac_cv_func_realloc_0_nonnull=no
+endif
+
+
+TARGET_CONFIGURE_ARGS= \
+	$(BR2_AC_CV_TRAP_CHECK) \
+	ac_cv_func_mmap_fixed_mapped=yes \
+	ac_cv_func_memcmp_working=yes \
+	ac_cv_have_decl_malloc=yes \
+	gl_cv_func_malloc_0_nonnull=yes \
+	ac_cv_func_malloc_0_nonnull=yes \
+	ac_cv_func_calloc_0_nonnull=yes \
+	ac_cv_func_realloc_0_nonnull=yes \
+	$(BR2_AC_CV_C_BIGENDIAN)
+
+#######################################################################
 
 ifeq ($(BR2_ENABLE_LOCALE),y)
 DISABLE_NLS:=
@@ -126,20 +362,42 @@ ifneq ($(BR2_LARGEFILE),y)
 DISABLE_LARGEFILE= --disable-largefile
 endif
 
-ifeq ($(BR2_INSTALL_LIBSTDCPP),)
-TARGET_CONFIGURE_OPTS+=CXX=""
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
+DISABLE_DOCUMENTATION=--without-html-dir --disable-gtk-doc
 endif
 
+ifneq ($(BR2_INET_IPV6),y)
+DISABLE_IPV6= --disable-ipv6
+endif
+
+ifneq ($(BR2_GCC_CROSS_CXX),y)
+TARGET_CONFIGURE_OPTS+=CXX=false
+endif
+
+ifeq ($(BR2_ENABLE_DEBUG),y)
+ENABLE_DEBUG:=--enable-debug
+else
+ENABLE_DEBUG:=
+endif
+
+
 # X Windowing system
 
 XSERVER:=
-ifeq ($(strip $(BR2_PACKAGE_TINYX)),y)
+ifeq ($(BR2_PACKAGE_TINYX),y)
 XSERVER+=tinyx
 endif
-ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
+ifeq ($(BR2_PACKAGE_XORG),y)
 XSERVER+=xorg
 endif
-ifeq ($(strip $(BR2_PACKAGE_XGGI)),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
+XSERVER+=xserver_xorg-server
+endif
+ifeq ($(BR2_PACKAGE_XGGI),y)
 XSERVER+=xggi
 endif
 
+X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX)))
+#"))
+
+include package/Makefile.autotools.in

package/acpid/Config.in

@@ -1,7 +1,6 @@
 config BR2_PACKAGE_ACPID
 	bool "acpid"
 	depends on BR2_x86_64 || BR2_i386
-	default n
 	help
 	  Advanced Configuration and Power Interface event daemon.
 

package/acpid/acpid-sign-warning.patch

@@ -1,11 +0,0 @@
---- acpid-1.0.4/ud_socket.c
-+++ acpid-1.0.4/ud_socket.c
-@@ -58,7 +58,7 @@ ud_accept(int listenfd, struct ucred *cr
- 	while (1) {
- 		int newsock = 0;
- 		struct sockaddr_un cliaddr;
--		int len = sizeof(struct sockaddr_un);
-+		socklen_t len = sizeof(struct sockaddr_un);
- 
- 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
- 		if (newsock < 0) {

package/acpid/acpid-socket-path.patch

@@ -1,11 +0,0 @@
---- acpid-1.0.4/acpid.h
-+++ acpid-1.0.4/acpid.h
-@@ -32,7 +32,7 @@
- #define ACPI_EVENTFILE		ACPI_PROCDIR "/event"
- #define ACPI_CONFDIR		"/etc/acpi/events"
- #define ACPI_LOGFILE		"/var/log/acpid"
--#define ACPI_SOCKETFILE		"/var/run/acpid.socket"
-+#define ACPI_SOCKETFILE		"/tmp/acpid.socket"
- #define ACPI_SOCKETMODE		0666
- #define ACPI_MAX_ERRS		5
- 

package/acpid/acpid.mk

@@ -3,22 +3,23 @@
 # acpid
 #
 #############################################################
-ACPID_DIR=$(BUILD_DIR)/acpid-1.0.4
-ACPID_SOURCE=acpid_1.0.4-1.tar.gz
-ACPID_SITE=http://ftp.debian.org/debian/pool/main/a/acpid
+ACPID_VERSION:=1.0.8
+ACPID_DIR=$(BUILD_DIR)/acpid-$(ACPID_VERSION)
+ACPID_SOURCE=acpid_$(ACPID_VERSION).orig.tar.gz
+ACPID_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/acpid
 
 $(DL_DIR)/$(ACPID_SOURCE):
-	$(WGET) -P $(DL_DIR) $(ACPID_SITE)/$(ACPID_SOURCE)
+	$(call DOWNLOAD,$(ACPID_SITE),$(ACPID_SOURCE))
 
 $(ACPID_DIR)/.unpacked: $(DL_DIR)/$(ACPID_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(ACPID_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	toolchain/patch-kernel.sh $(ACPID_DIR) package/acpid/ acpid\*.patch
+	toolchain/patch-kernel.sh $(ACPID_DIR) package/acpid/ acpid-$(ACPID_VERSION)\*.patch
 	touch $(ACPID_DIR)/.unpacked
 
 $(ACPID_DIR)/acpid: $(ACPID_DIR)/.unpacked
 	$(MAKE) CC=$(TARGET_CC) -C $(ACPID_DIR)
-	$(STRIP) -s $(ACPID_DIR)/acpid
-	$(STRIP) -s $(ACPID_DIR)/acpi_listen
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpid
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $(ACPID_DIR)/acpi_listen
 	touch -c $(ACPID_DIR)/acpid $(ACPID_DIR)/acpi_listen
 
 $(TARGET_DIR)/usr/sbin/acpid: $(ACPID_DIR)/acpid
@@ -32,7 +33,7 @@ acpid: $(TARGET_DIR)/usr/sbin/acpid
 acpid-source: $(DL_DIR)/$(ACPID_SOURCE)
 
 acpid-clean:
-	-make -C $(ACPID_DIR) clean
+	-$(MAKE) -C $(ACPID_DIR) clean
 
 acpid-dirclean:
 	rm -rf $(ACPID_DIR)
@@ -42,6 +43,6 @@ acpid-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_PACKAGE_ACPID)),y)
+ifeq ($(BR2_PACKAGE_ACPID),y)
 TARGETS+=acpid
 endif

package/alsamixergui/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_ALSAMIXERGUI
+	select BR2_PACKAGE_FLTK
+	bool "alsamixergui"
+	help
+	  A nice GUI mixer for Alsa using fltk
+
+	  http://www.iua.upf.es/~mdeboer/projects/alsamixergui/

package/alsamixergui/alsamixergui.mk

@@ -0,0 +1,18 @@
+#############################################################
+#
+# alsamixergui
+#
+#############################################################
+ALSAMIXERGUI_VERSION = 0.9.0rc2-1
+ALSAMIXERGUI_SOURCE = alsamixergui_$(ALSAMIXERGUI_VERSION).orig.tar.gz
+ALSAMIXERGUI_SITE = http://snapshot.debian.net/archive/2008/03/19/debian/pool/main/a/alsamixergui
+ALSAMIXERGUI_AUTORECONF = YES
+ALSAMIXERGUI_INSTALL_STAGING = NO
+ALSAMIXERGUI_INSTALL_TARGET = YES
+
+ALSAMIXERGUI_CONF_OPT = LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lstdc++ -lX11"
+
+ALSAMIXERGUI_DEPENDENCIES = uclibc fltk
+
+$(eval $(call AUTOTARGETS,package,alsamixergui))
+

package/alsamixergui/alsamixergui_0.9.0rc2-1-7.patch

@@ -0,0 +1,40 @@
+--- a/configure.in
++++ b/configure.in
+@@ -11,7 +11,10 @@
+ AC_PROG_LN_S
+ 
+ dnl Checks for libraries.
+-AC_CHECK_LIB(fltk,numericsort,,AC_MSG_ERROR("missing fltk"))
++AC_CHECK_LIB(fltk,numericsort,,
++AC_CHECK_LIB(fltk,fl_numericsort,,
++AC_MSG_ERROR("missing fltk"))
++)
+ AM_PATH_ALSA(0.9.0)
+ 
+ dnl Checks for header files.
+--- a/src/alsamixer.cxx	2007-10-21 12:39:11.000000000 -0400
++++ b/src/alsamixer.cxx	2007-10-21 12:49:10.000000000 -0400
+@@ -2081,8 +2081,8 @@ static void
+ mixer_signal_handler (int signal)
+ {
+   if (signal != SIGSEGV)
+-    mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0);
+-  else
++  //  mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0);
++  //else
+     {
+       fprintf (stderr, "\nSegmentation fault.\n");
+       _exit (11);
+--- a/src/alsamixer.cxx	2006-01-16 12:41:54.000000000 -0600
++++ b/src/alsamixer.cxx	2006-01-16 12:45:44.000000000 -0600
+@@ -653,8 +653,8 @@
+     if (vleft >= 0 && vright >= 0) {
+       if (joined) {
+ #ifdef ALSAMIXER_GUI
+-	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST; 
+-	snd_mixer_selem_channel_id_t(int(chn)++))
++	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST;
++	snd_mixer_selem_channel_id_t(int(chn)+1))
+ #else
+ 	for (chn = 0; chn < SND_MIXER_SCHN_LAST; chn++)
+ #endif

package/argus/Config.in

@@ -1,9 +1,10 @@
+comment "argus has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_ARGUS
+
 config BR2_PACKAGE_ARGUS
 	bool "argus"
-	default n
 	select BR2_PACKAGE_LIBPCAP
 	help
 	  A Real Time Flow Monitor-based audit engine.
 
 	  http://qosient.com/argus/
-

package/argus/argus.mk

@@ -3,37 +3,20 @@
 # argus
 #
 #############################################################
-ARGUS_VER:=3.0.0.rc.34
-ARGUS_SOURCE:=argus_$(ARGUS_VER).orig.tar.gz
-ARGUS_PATCH:=argus_$(ARGUS_VER)-1.diff.gz
-ARGUS_SITE:=ftp://ftp.debian.org/debian/pool/main/a/argus/
-ARGUS_DIR:=$(BUILD_DIR)/argus-$(ARGUS_VER)
+ARGUS_VERSION:=3.0.0.rc.34
+ARGUS_SOURCE:=argus_$(ARGUS_VERSION).orig.tar.gz
+ARGUS_PATCH:=argus_$(ARGUS_VERSION)-1.diff.gz
+ARGUS_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/argus/
+ARGUS_DIR:=$(BUILD_DIR)/argus-$(ARGUS_VERSION)
 ARGUS_CAT:=$(ZCAT)
 ARGUS_BINARY:=bin/argus
 ARGUS_TARGET_BINARY:=usr/sbin/argus
 
-ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=yes
-ifeq ($(BR2_i386),y)
-ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
-endif
-ifeq ($(BR2_x86_64),y)
-ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
-endif
-ifeq ($(BR2_m68k),y)
-ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
-endif
-ifeq ($(BR2_s390),y)
-ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
-endif
-ifeq ($(BR2_powerpc)$(BR2_ENDIAN),yBIG)
-ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
-endif
-
 $(DL_DIR)/$(ARGUS_SOURCE):
-	$(WGET) -P $(DL_DIR) $(ARGUS_SITE)/$(ARGUS_SOURCE)
+	$(call DOWNLOAD,$(ARGUS_SITE),$(ARGUS_SOURCE))
 
 $(DL_DIR)/$(ARGUS_PATCH):
-	$(WGET) -P $(DL_DIR) $(ARGUS_SITE)/$(ARGUS_PATCH)
+	$(call DOWNLOAD,$(ARGUS_SITE),$(ARGUS_PATCH))
 
 argus-source: $(DL_DIR)/$(ARGUS_SOURCE) $(DL_DIR)/$(ARGUS_PATCH)
 
@@ -43,32 +26,30 @@ $(ARGUS_DIR)/.unpacked: $(DL_DIR)/$(ARGUS_SOURCE) $(DL_DIR)/$(ARGUS_PATCH)
 ifneq ($(ARGUS_PATCH),)
 	(cd $(ARGUS_DIR) && $(ARGUS_CAT) $(DL_DIR)/$(ARGUS_PATCH) | patch -p1)
 	if [ -d $(ARGUS_DIR)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(ARGUS_DIR) $(ARGUS_DIR)/debian/patches \*.patch ; \
+		toolchain/patch-kernel.sh $(ARGUS_DIR) $(ARGUS_DIR)/debian/patches \*.patch; \
 	fi
 endif
-	touch $(ARGUS_DIR)/.unpacked
+	touch $@
 
 $(ARGUS_DIR)/.configured: $(ARGUS_DIR)/.unpacked
 	(cd $(ARGUS_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		$(ARGUS_TRAP_CHECK) \
+		$(TARGET_CONFIGURE_ARGS) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
 		$(DISABLE_LARGEFILE) \
-	);
-	touch $(ARGUS_DIR)/.configured
+	)
+	touch $@
 
 $(ARGUS_DIR)/$(ARGUS_BINARY): $(ARGUS_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(ARGUS_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(ARGUS_DIR)
 
 $(TARGET_DIR)/$(ARGUS_TARGET_BINARY): $(ARGUS_DIR)/$(ARGUS_BINARY)
 	cp -dpf $(ARGUS_DIR)/$(ARGUS_BINARY) $@
-	$(STRIP) -s $@
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
 
 argus: uclibc libpcap $(TARGET_DIR)/$(ARGUS_TARGET_BINARY)
 
@@ -83,6 +64,6 @@ argus-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_PACKAGE_ARGUS)),y)
+ifeq ($(BR2_PACKAGE_ARGUS),y)
 TARGETS+=argus
 endif

package/asterisk/Config.in

@@ -1,10 +0,0 @@
-config BR2_PACKAGE_ASTERISK
-	bool "asterisk"
-	default n
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_MPG123
-	help
-		Asterisk - the Open Source PBX
-

package/asterisk/asterisk.mk

@@ -1,66 +0,0 @@
-#############################################################
-#
-# asterisk
-#
-##############################################################
-ASTERISK_VERSION := 1.2.0-beta1
-ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
-ASTERISK_SITE := ftp://ftp.digium.com/pub/asterisk/old-releases
-ASTERISK_DIR := $(BUILD_DIR)/asterisk-$(ASTERISK_VERSION)
-ASTERISK_BINARY := asterisk
-ASTERISK_TARGET_BINARY := usr/sbin/asterisk
-
-$(DL_DIR)/$(ASTERISK_SOURCE):
-	$(WGET) -P $(DL_DIR) $(ASTERISK_SITE)/$(ASTERISK_SOURCE)
-
-$(ASTERISK_DIR)/.source: $(DL_DIR)/$(ASTERISK_SOURCE)
-	$(ZCAT) $(DL_DIR)/$(ASTERISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk\*.patch
-	touch $(ASTERISK_DIR)/.source
-
-$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.source
-	touch $(ASTERISK_DIR)/.configured
-
-$(ASTERISK_DIR)/$(ASTERISK_BINARY): $(ASTERISK_DIR)/.configured
-	$(MAKE1) -C $(ASTERISK_DIR) CROSS_ARCH=Linux CROSS_COMPILE=$(TARGET_CROSS) CROSS_COMPILE_BIN=$(STAGING_DIR)/bin/ CROSS_COMPILE_TARGET=$(STAGING_DIR) CROSS_PROC=$(OPTIMIZE_FOR_CPU) OPTIMIZE="$(TARGET_OPTIMIZATION)" OPTIONS=-DLOW_MEMORY DEBUG= $(TARGET_CONFIGURE_OPTS)
-
-$(TARGET_DIR)/$(ASTERISK_TARGET_BINARY): $(ASTERISK_DIR)/$(ASTERISK_BINARY)
-	$(MAKE) -C $(ASTERISK_DIR) CROSS_ARCH=Linux CROSS_COMPILE=$(TARGET_CROSS) CROSS_COMPILE_BIN=$(TARGET_CC) CROSS_COMPILE_TARGET=$(STAGING_DIR) CROSS_PROC=$(OPTIMIZE_FOR_CPU) OPTIMIZE="$(TARGET_OPTIMIZATION)" OPTIONS=-DLOW_MEMORY DEBUG= $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) install
-	$(STRIP) $(TARGET_DIR)/usr/sbin/asterisk
-	$(STRIP) $(TARGET_DIR)/usr/sbin/stereorize
-	$(STRIP) $(TARGET_DIR)/usr/sbin/streamplayer
-	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/asterisk/modules/*.so
-	$(INSTALL) -m 755 $(ASTERISK_DIR)/contrib/init.d/rc.debian.asterisk $(TARGET_DIR)/etc/init.d/S60asterisk
-	mv $(TARGET_DIR)/usr/include/asterisk $(STAGING_DIR)/include/
-	rm -Rf $(TARGET_DIR)/usr/share/man
-	rm -f $(TARGET_DIR)/usr/sbin/safe_asterisk
-	rm -f $(TARGET_DIR)/usr/sbin/autosupport
-	rm -f $(TARGET_DIR)/usr/sbin/astgenkey
-	touch -c $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY)
-
-asterisk: uclibc ncurses zlib openssl mpg123 $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY)
-
-asterisk-source: $(DL_DIR)/$(ASTERISK_SOURCE)
-
-asterisk-clean:
-	rm -Rf $(STAGING_DIR)/include/asterisk
-	rm -Rf $(TARGET_DIR)/etc/asterisk
-	rm -Rf $(TARGET_DIR)/usr/lib/asterisk
-	rm -Rf $(TARGET_DIR)/var/lib/asterisk
-	rm -Rf $(TARGET_DIR)/var/spool/asterisk
-	rm -f $(TARGET_DIR)/etc/init.d/S60asterisk
-	rm -f $(TARGET_DIR)/usr/sbin/stereorize
-	rm -f $(TARGET_DIR)/usr/sbin/streamplayer
-	-$(MAKE) -C $(ASTERISK_DIR) clean
-
-asterisk-dirclean:
-	rm -rf $(ASTERISK_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_ASTERISK)),y)
-TARGETS+=asterisk
-endif

package/asterisk/asterisk_no_res_ninit.patch

@@ -1,12 +0,0 @@
-diff -ur /tmp/asterisk-1.2.0-beta1/dns.c asterisk-1.2.0-beta1/dns.c
---- /tmp/asterisk-1.2.0-beta1/dns.c	2005-08-14 04:23:33.000000000 +0200
-+++ asterisk-1.2.0-beta1/dns.c	2005-08-31 09:42:36.000000000 +0200
-@@ -157,7 +157,7 @@
- 	return 0;
- }
- 
--#if defined(res_ninit)
-+#if (defined(res_ninit) && !defined(__UCLIBC__))
- #define HAS_RES_NINIT
- #else
- AST_MUTEX_DEFINE_STATIC(res_lock);

package/at/Config.in

@@ -1,6 +1,5 @@
 config BR2_PACKAGE_AT
 	bool "at"
-	default n
 	help
 	 At and batch read shell commands from standard input and
 	 store them as jobs to be scheduled for execution in the

package/at/at.mk

@@ -3,16 +3,16 @@
 # at
 #
 #############################################################
-AT_VER:=3.1.10
-AT_SOURCE:=at_$(AT_VER).tar.gz
-AT_SITE:=http://ftp.debian.org/debian/pool/main/a/at
-AT_DIR:=$(BUILD_DIR)/at-$(AT_VER)
+AT_VERSION:=3.1.10
+AT_SOURCE:=at_$(AT_VERSION).tar.gz
+AT_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/at
+AT_DIR:=$(BUILD_DIR)/at-$(AT_VERSION)
 AT_CAT:=$(ZCAT)
-AT_TARGET_BINARY:=usr/bin/at
+AT_TARGET_SCRIPT:=etc/init.d/S99at
 AT_BINARY:=at
 
 $(DL_DIR)/$(AT_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(AT_SITE)/$(AT_SOURCE)
+	 $(call DOWNLOAD,$(AT_SITE),$(AT_SOURCE))
 
 at-source: $(DL_DIR)/$(AT_SOURCE)
 
@@ -24,8 +24,7 @@ $(AT_DIR)/.unpacked: $(DL_DIR)/$(AT_SOURCE)
 $(AT_DIR)/.configured: $(AT_DIR)/.unpacked
 	(cd $(AT_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
+		$(TARGET_CONFIGURE_ARGS) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -39,35 +38,40 @@ $(AT_DIR)/.configured: $(AT_DIR)/.unpacked
 		--with-atspool=/var/lib/atspool \
 		--with-daemon_username=at \
 		--with-daemon_groupname=at \
-	);
+	)
 	touch $@
 
 $(AT_DIR)/$(AT_BINARY): $(AT_DIR)/.configured
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(AT_DIR)
-	touch -c $(AT_DIR)/$(AT_BINARY)
+	touch $@
 
-$(TARGET_DIR)/$(AT_TARGET_BINARY): $(AT_DIR)/$(AT_BINARY)
+$(TARGET_DIR)/$(AT_TARGET_SCRIPT): $(AT_DIR)/$(AT_BINARY)
 	# Use fakeroot to pretend to do 'make install' as root
-	echo "$(MAKE) DAEMON_USERNAME=root DAEMON_GROUPNAME=root " \
-		"$(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(AT_DIR) install" \
-		> $(STAGING_DIR)/.fakeroot.at
-	echo "rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/doc/at" >> $(STAGING_DIR)/.fakeroot.at
-	$(INSTALL) -m 0755 -D $(AT_DIR)/debian/rc $(TARGET_DIR)/etc/init.d/S99at
-	touch -c $(TARGET_DIR)/$(AT_TARGET_BINARY)
+	echo '$(MAKE) DAEMON_USERNAME=root DAEMON_GROUPNAME=root ' \
+	 '$(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(AT_DIR) install' \
+		> $(PROJECT_BUILD_DIR)/.fakeroot.at
+ifneq ($(BR2_HAVE_MANPAGES),y)
+	echo 'rm -rf $(TARGET_DIR)/usr/man' >> $(PROJECT_BUILD_DIR)/.fakeroot.at
+endif
+	echo 'rm -rf $(TARGET_DIR)/usr/doc/at' >> $(PROJECT_BUILD_DIR)/.fakeroot.at
+	$(INSTALL) -m 0755 -D $(AT_DIR)/debian/rc $(TARGET_DIR)/$(AT_TARGET_SCRIPT)
 
-at: uclibc host-fakeroot $(TARGET_DIR)/$(AT_TARGET_BINARY)
+at: uclibc host-fakeroot $(TARGET_DIR)/$(AT_TARGET_SCRIPT)
 
 at-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AT_DIR) uninstall
+	-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AT_DIR) uninstall
+	rm -f $(TARGET_DIR)/$(AT_TARGET_SCRIPT) $(TARGET_DIR)/etc/init.d/S99at
 	-$(MAKE) -C $(AT_DIR) clean
 
 at-dirclean:
 	rm -rf $(AT_DIR)
+
+.PHONY: at
 #############################################################
 #
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_PACKAGE_AT)),y)
+ifeq ($(BR2_PACKAGE_AT),y)
 TARGETS+=at
 endif

package/atk/Config.in

@@ -1,6 +1,5 @@
 config BR2_PACKAGE_ATK
 	bool "atk"
-	default n
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  The ATK accessibility toolkit, needed to build GTK+-2.x.

package/atk/atk.mk

@@ -3,149 +3,102 @@
 # atk
 #
 #############################################################
-ATK_VERSION:=1.9.1
-ATK_SOURCE:=atk-$(ATK_VERSION).tar.bz2
-ATK_SITE:=ftp://ftp.gtk.org/pub/gtk/v2.10/dependencies
-ATK_CAT:=$(BZCAT)
-ATK_DIR:=$(BUILD_DIR)/atk-$(ATK_VERSION)
-ATK_BINARY:=libatk-1.0.a
+ATK_VERSION = 1.22.0
+ATK_SOURCE = atk-$(ATK_VERSION).tar.bz2
+ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/1.22/
+ATK_INSTALL_STAGING = YES
+ATK_INSTALL_TARGET = YES
+ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
-ifeq ($(BR2_ENDIAN),"BIG")
-ATK_BE:=yes
+ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
+		glib_cv_stack_grows=no glib_cv_uscore=no \
+		ac_cv_func_strtod=yes ac_fsusage_space=yes \
+		fu_cv_sys_stat_statfs2_bsize=yes ac_cv_func_closedir_void=no \
+		ac_cv_func_getloadavg=no ac_cv_lib_util_getloadavg=no \
+		ac_cv_lib_getloadavg_getloadavg=no ac_cv_func_getgroups=yes \
+		ac_cv_func_getgroups_works=yes ac_cv_func_chown_works=yes \
+		ac_cv_have_decl_euidaccess=no ac_cv_func_euidaccess=no \
+		ac_cv_have_decl_strnlen=yes ac_cv_func_strnlen_working=yes \
+		ac_cv_func_lstat_dereferences_slashed_symlink=yes ac_cv_func_lstat_empty_string_bug=no \
+		ac_cv_func_stat_empty_string_bug=no vb_cv_func_rename_trailing_slash_bug=no \
+		ac_cv_have_decl_nanosleep=yes jm_cv_func_nanosleep_works=yes \
+		gl_cv_func_working_utimes=yes ac_cv_func_utime_null=yes \
+		ac_cv_have_decl_strerror_r=yes ac_cv_func_strerror_r_char_p=no \
+		jm_cv_func_svid_putenv=yes ac_cv_func_getcwd_null=yes \
+		ac_cv_func_getdelim=yes ac_cv_func_mkstemp=yes \
+		utils_cv_func_mkstemp_limitations=no utils_cv_func_mkdir_trailing_slash_bug=no \
+		ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes \
+		gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes \
+		ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes \
+		jm_cv_func_gettimeofday_clobber=no gl_cv_func_working_readdir=yes \
+		jm_ac_cv_func_link_follows_symlink=no utils_cv_localtime_cache=no \
+		ac_cv_struct_st_mtim_nsec=no gl_cv_func_tzset_clobber=no \
+		gl_cv_func_getcwd_null=yes gl_cv_func_getcwd_path_max=yes \
+		ac_cv_func_fnmatch_gnu=yes am_getline_needs_run_time_check=no \
+		am_cv_func_working_getline=yes gl_cv_func_mkdir_trailing_slash_bug=no \
+		gl_cv_func_mkstemp_limitations=no ac_cv_func_working_mktime=yes \
+		jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \
+		gl_cv_c_restrict=no ac_cv_prog_F77=no
+
+ATK_CONF_OPT =  --enable-shared \
+		--enable-static
+		--disable-glibtest --enable-explicit-deps=no \
+		--disable-debug
+
+ifneq ($(BR2_PACKAGE_XSERVER_none),y)
+ATK_CONF_OPT += --with-x \
+		--x-includes=$(STAGING_DIR)/usr/include/X11 \
+		--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
 else
-ATK_BE:=no
+ATK_CONF_OPT += --without-x
 endif
 
+ATK_DEPENDENCIES = libglib2 host-pkgconfig
+
+$(eval $(call AUTOTARGETS,package,atk))
+
+# atk for the host
+ATK_HOST_DIR:=$(BUILD_DIR)/atk-$(ATK_VERSION)-host
+
 $(DL_DIR)/$(ATK_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(ATK_SITE)/$(ATK_SOURCE)
+	$(call DOWNLOAD,$(ATK_SITE),$(ATK_SOURCE))
 
-atk-source: $(DL_DIR)/$(ATK_SOURCE)
+$(STAMP_DIR)/host_atk_unpacked: $(DL_DIR)/$(ATK_SOURCE)
+	mkdir -p $(ATK_HOST_DIR)
+	$(INFLATE$(suffix $(ATK_SOURCE))) $< | \
+		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(ATK_HOST_DIR) $(TAR_OPTIONS) -
+	touch $@
 
-$(ATK_DIR)/.unpacked: $(DL_DIR)/$(ATK_SOURCE)
-	$(ATK_CAT) $(DL_DIR)/$(ATK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ATK_DIR) package/atk/ \*.patch*
-	$(CONFIG_UPDATE) $(ATK_DIR)
-	touch $(ATK_DIR)/.unpacked
-
-$(ATK_DIR)/.configured: $(ATK_DIR)/.unpacked
-	(cd $(ATK_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		ac_cv_c_bigendian=$(ATK_BE) \
-		ac_cv_func_posix_getpwuid_r=yes \
-		glib_cv_stack_grows=no \
-		glib_cv_uscore=no \
-		ac_cv_func_strtod=yes \
-		ac_fsusage_space=yes \
-		fu_cv_sys_stat_statfs2_bsize=yes \
-		ac_cv_func_closedir_void=no \
-		ac_cv_func_getloadavg=no \
-		ac_cv_lib_util_getloadavg=no \
-		ac_cv_lib_getloadavg_getloadavg=no \
-		ac_cv_func_getgroups=yes \
-		ac_cv_func_getgroups_works=yes \
-		ac_cv_func_chown_works=yes \
-		ac_cv_have_decl_euidaccess=no \
-		ac_cv_func_euidaccess=no \
-		ac_cv_have_decl_strnlen=yes \
-		ac_cv_func_strnlen_working=yes \
-		ac_cv_func_lstat_dereferences_slashed_symlink=yes \
-		ac_cv_func_lstat_empty_string_bug=no \
-		ac_cv_func_stat_empty_string_bug=no \
-		vb_cv_func_rename_trailing_slash_bug=no \
-		ac_cv_have_decl_nanosleep=yes \
-		jm_cv_func_nanosleep_works=yes \
-		gl_cv_func_working_utimes=yes \
-		ac_cv_func_utime_null=yes \
-		ac_cv_have_decl_strerror_r=yes \
-		ac_cv_func_strerror_r_char_p=no \
-		jm_cv_func_svid_putenv=yes \
-		ac_cv_func_getcwd_null=yes \
-		ac_cv_func_getdelim=yes \
-		ac_cv_func_mkstemp=yes \
-		utils_cv_func_mkstemp_limitations=no \
-		utils_cv_func_mkdir_trailing_slash_bug=no \
-		ac_cv_func_memcmp_working=yes \
-		ac_cv_have_decl_malloc=yes \
-		gl_cv_func_malloc_0_nonnull=yes \
-		ac_cv_func_malloc_0_nonnull=yes \
-		ac_cv_func_calloc_0_nonnull=yes \
-		ac_cv_func_realloc_0_nonnull=yes \
-		jm_cv_func_gettimeofday_clobber=no \
-		gl_cv_func_working_readdir=yes \
-		jm_ac_cv_func_link_follows_symlink=no \
-		utils_cv_localtime_cache=no \
-		ac_cv_struct_st_mtim_nsec=no \
-		gl_cv_func_tzset_clobber=no \
-		gl_cv_func_getcwd_null=yes \
-		gl_cv_func_getcwd_path_max=yes \
-		ac_cv_func_fnmatch_gnu=yes \
-		am_getline_needs_run_time_check=no \
-		am_cv_func_working_getline=yes \
-		gl_cv_func_mkdir_trailing_slash_bug=no \
-		gl_cv_func_mkstemp_limitations=no \
-		ac_cv_func_working_mktime=yes \
-		jm_cv_func_working_re_compile_pattern=yes \
-		ac_use_included_regex=no \
-		gl_cv_c_restrict=no \
-		ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
+$(STAMP_DIR)/host_atk_configured: $(STAMP_DIR)/host_atk_unpacked $(STAMP_DIR)/host_libglib2_installed $(STAMP_DIR)/host_pkgconfig_installed
+	(cd $(ATK_HOST_DIR); rm -rf config.cache; \
+		$(HOST_CONFIGURE_OPTS) \
+		CFLAGS="$(HOST_CFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS)" \
 		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(REAL_GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--includedir=/include \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
+		--prefix="$(HOST_DIR)/usr" \
+		--sysconfdir="$(HOST_DIR)/etc" \
 		--enable-shared \
-		--enable-static \
-		--with-x \
-		--x-includes=$(STAGING_DIR)/usr/X11R6/include \
-		--x-libraries=$(STAGING_DIR)/usr/X11R6/lib \
+		--disable-static \
 		--disable-glibtest \
-		--enable-explicit-deps=no \
-		--disable-debug \
-	);
-	touch $(ATK_DIR)/.configured
+	)
+	touch $@
 
-$(ATK_DIR)/atk/.libs/$(ATK_BINARY): $(ATK_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(ATK_DIR)
-	touch -c $(ATK_DIR)/atk/.libs/$(ATK_BINARY)
+$(STAMP_DIR)/host_atk_compiled: $(STAMP_DIR)/host_atk_configured
+	$(HOST_MAKE_ENV) $(MAKE) -C $(ATK_HOST_DIR)
+	touch $@
 
-$(STAGING_DIR)/lib/$(ATK_BINARY): $(ATK_DIR)/atk/.libs/$(ATK_BINARY)
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(ATK_DIR) install
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libatk-1.0.la
-	touch -c $(STAGING_DIR)/lib/$(ATK_BINARY)
+$(STAMP_DIR)/host_atk_installed: $(STAMP_DIR)/host_atk_compiled
+	$(HOST_MAKE_ENV) $(MAKE) -C $(ATK_HOST_DIR) install
+	touch $@
 
-$(TARGET_DIR)/lib/libatk-1.0.so.0: $(STAGING_DIR)/lib/$(ATK_BINARY)
-	cp -a $(STAGING_DIR)/lib/libatk-1.0.so $(TARGET_DIR)/lib/
-	cp -a $(STAGING_DIR)/lib/libatk-1.0.so.0* $(TARGET_DIR)/lib/
-	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libatk-1.0.so.0.*
-	touch -c $(TARGET_DIR)/lib/libatk-1.0.so.0
+host-atk: $(STAMP_DIR)/host_atk_installed
 
-atk: libglib2 pkgconfig $(TARGET_DIR)/lib/libatk-1.0.so.0
+host-atk-source: atk-source
 
-atk-clean:
-	rm -f $(TARGET_DIR)/lib/$(ATK_BINARY)
-	-$(MAKE) -C $(ATK_DIR) clean
+host-atk-clean:
+	rm -f $(addprefix $(STAMP_DIR)/host_atk_,unpacked configured compiled installed)
+	-$(MAKE) -C $(ATK_HOST_DIR) uninstall
+	-$(MAKE) -C $(ATK_HOST_DIR) clean
 
-atk-dirclean:
-	rm -rf $(ATK_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_ATK)),y)
-TARGETS+=atk
-endif
+host-atk-dirclean:
+	rm -rf $(ATK_HOST_DIR)

package/atk/libdir-la.patch

@@ -1,77 +0,0 @@
---- atk-1.9.1/ltmain.sh.orig	2004-11-23 09:19:19.000000000 -0700
-+++ atk-1.9.1/ltmain.sh	2007-01-13 14:36:53.000000000 -0700
-@@ -231,8 +231,9 @@
- 	# line option must be used.
- 	if test -z "$tagname"; then
- 	  $echo "$modename: unable to infer tagged configuration"
--	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit $EXIT_FAILURE
-+	  $echo "$modename: defaulting to \`CC'"
-+	  $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+#	  exit $EXIT_FAILURE
- #        else
- #          $echo "$modename: using $tagname tagged configuration"
- 	fi
-@@ -2279,8 +2280,14 @@
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
--	    dir="$libdir"
--	    absdir="$libdir"
-+            # Adding 'libdir' from the .la file to our library search paths
-+            # breaks crosscompilation horribly.  We cheat here and don't add
-+            # it, instead adding the path where we found the .la.  -CL
-+	    dir="$abs_ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	    #dir="$libdir"
-+	    #absdir="$libdir"
- 	  fi
- 	else
- 	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-@@ -2754,6 +2761,16 @@
- 		esac
- 		if grep "^installed=no" $deplib > /dev/null; then
- 		  path="$absdir/$objdir"
-+#		This interferes with crosscompilation. -CL
-+#		else
-+#		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+#		  if test -z "$libdir"; then
-+#		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+#		    exit 1
-+#		  fi
-+#		  if test "$absdir" != "$libdir"; then
-+#		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+#		  fi
- 		else
- 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		  if test -z "$libdir"; then
-@@ -5141,6 +5158,10 @@
- 	    # Replace all uninstalled libtool libraries with the installed ones
- 	    newdependency_libs=
- 	    for deplib in $dependency_libs; do
-+              # Replacing uninstalled with installed can easily break crosscompilation,
-+              # since the installed path is generally the wrong architecture.  -CL
-+              newdependency_libs="$newdependency_libs $deplib"
-+              continue
- 	      case $deplib in
- 	      *.la)
- 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5459,10 +5480,13 @@
- 	  # At present, this check doesn't affect windows .dll's that
- 	  # are installed into $libdir/../bin (currently, that works fine)
- 	  # but it's something to keep an eye on.
--	  if test "$inst_prefix_dir" = "$destdir"; then
--	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--	    exit $EXIT_FAILURE
--	  fi
-+	  #
-+	  # This breaks install into our staging area.  -PB
-+	  # 
-+	  # if test "$inst_prefix_dir" = "$destdir"; then
-+	  #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	  #   exit $EXIT_FAILURE
-+	  # fi
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.

package/autoconf/Config.in

@@ -1,8 +1,8 @@
 config BR2_PACKAGE_AUTOCONF
 	bool "autoconf"
-	default n
+	select BR2_PACKAGE_MICROPERL
 	help
-	  Extensible program for developing configure scripts.  These 
+	  Extensible program for developing configure scripts.  These
 	  scripts handle all the mundane system/feature detection.
 
 	  http://www.gnu.org/software/autoconf/

package/autoconf/autoconf.mk

@@ -3,81 +3,63 @@
 # autoconf
 #
 #############################################################
-AUTOCONF_VER:=2.61
-AUTOCONF_SOURCE:=autoconf-$(AUTOCONF_VER).tar.bz2
-AUTOCONF_SITE:=http://ftp.gnu.org/pub/gnu/autoconf
-AUTOCONF_CAT:=$(BZCAT)
-AUTOCONF_DIR:=$(BUILD_DIR)/autoconf-$(AUTOCONF_VER)
-AUTOCONF_BINARY:=autoconf
-AUTOCONF_TARGET_BINARY:=usr/bin/autoconf
+AUTOCONF_VERSION = 2.63
+AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.bz2
+AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
+
+ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff
+AUTOCONF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+endif
+
+AUTOCONF_CONF_ENV = EMACS="no"
+
+AUTOCONF_DEPENDENCIES = uclibc microperl
+
+$(eval $(call AUTOTARGETS,package,autoconf))
+
+# autoconf for the host
+AUTOCONF_HOST_DIR:=$(BUILD_DIR)/autoconf-$(AUTOCONF_VERSION)-host
+
+# variables used by other packages
+AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
+AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"
 
 $(DL_DIR)/$(AUTOCONF_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(AUTOCONF_SITE)/$(AUTOCONF_SOURCE)
+	$(call DOWNLOAD,$(AUTOCONF_SITE),$(AUTOCONF_SOURCE))
 
-autoconf-source: $(DL_DIR)/$(AUTOCONF_SOURCE)
-
-$(AUTOCONF_DIR)/.unpacked: $(DL_DIR)/$(AUTOCONF_SOURCE)
-	$(AUTOCONF_CAT) $(DL_DIR)/$(AUTOCONF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+$(STAMP_DIR)/host_autoconf_unpacked: $(DL_DIR)/$(AUTOCONF_SOURCE)
+	mkdir -p $(AUTOCONF_HOST_DIR)
+	$(INFLATE$(suffix $(AUTOCONF_SOURCE))) $< | \
+		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(AUTOCONF_HOST_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(AUTOCONF_HOST_DIR) package/autoconf/ \*.patch
 	touch $@
 
-$(AUTOCONF_DIR)/.configured: $(AUTOCONF_DIR)/.unpacked
-	(cd $(AUTOCONF_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) EMACS="no" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
+$(STAMP_DIR)/host_autoconf_configured: $(STAMP_DIR)/host_autoconf_unpacked $(STAMP_DIR)/host_m4_installed  $(STAMP_DIR)/host_libtool_installed
+	(cd $(AUTOCONF_HOST_DIR); rm -rf config.cache; \
+		$(HOST_CONFIGURE_OPTS) \
+		CFLAGS="$(HOST_CFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS)" \
 		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-	);
+		--prefix="$(HOST_DIR)/usr" \
+		--sysconfdir="$(HOST_DIR)/etc" \
+		--disable-static \
+	)
 	touch $@
 
-$(AUTOCONF_DIR)/bin/$(AUTOCONF_BINARY): $(AUTOCONF_DIR)/.configured
-	$(MAKE1) -C $(AUTOCONF_DIR)
+$(STAMP_DIR)/host_autoconf_compiled: $(STAMP_DIR)/host_autoconf_configured
+	$(MAKE) -C $(AUTOCONF_HOST_DIR)
+	touch $@
 
-$(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY): $(AUTOCONF_DIR)/bin/$(AUTOCONF_BINARY)
-	$(MAKE) \
-	    prefix=$(TARGET_DIR)/usr \
-	    exec_prefix=$(TARGET_DIR)/usr \
-	    bindir=$(TARGET_DIR)/usr/bin \
-	    sbindir=$(TARGET_DIR)/usr/sbin \
-	    libexecdir=$(TARGET_DIR)/usr/lib \
-	    datadir=$(TARGET_DIR)/usr/share \
-	    sysconfdir=$(TARGET_DIR)/etc \
-	    localstatedir=$(TARGET_DIR)/var \
-	    libdir=$(TARGET_DIR)/usr/lib \
-	    infodir=$(TARGET_DIR)/usr/info \
-	    mandir=$(TARGET_DIR)/usr/man \
-	    includedir=$(TARGET_DIR)/usr/include \
-	    -C $(AUTOCONF_DIR) install;
-	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
-		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+$(STAMP_DIR)/host_autoconf_installed: $(STAMP_DIR)/host_autoconf_compiled
+	$(MAKE) -C $(AUTOCONF_HOST_DIR) install
+	touch $@
 
-autoconf: uclibc $(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY)
+host-autoconf: $(STAMP_DIR)/host_autoconf_installed
 
-autoconf-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AUTOCONF_DIR) uninstall
-	-$(MAKE) -C $(AUTOCONF_DIR) clean
+host-autoconf-clean:
+	rm -f $(addprefix $(STAMP_DIR)/host_autoconf_,unpacked configured compiled installed)
+	-$(MAKE) -C $(AUTOCONF_HOST_DIR) uninstall
+	-$(MAKE) -C $(AUTOCONF_HOST_DIR) clean
 
-autoconf-dirclean:
-	rm -rf $(AUTOCONF_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_AUTOCONF)),y)
-TARGETS+=autoconf
-endif
+host-autoconf-dirclean:
+	rm -rf $(AUTOCONF_HOST_DIR)

package/automake/Config.in

@@ -1,8 +1,9 @@
 config BR2_PACKAGE_AUTOMAKE
 	bool "automake"
-	default n
+	select BR2_PACKAGE_AUTOCONF
+	select BR2_PACKAGE_MICROPERL
 	help
-	  Tool for automatically generating Makefile's for input to 
+	  Tool for automatically generating Makefile's for input to
 	  configure scripts (made by autoconf).
 
 	  http://www.gnu.org/software/automake/

package/automake/automake.mk

@@ -3,85 +3,63 @@
 # automake
 #
 #############################################################
-AUTOMAKE_VER:=1.10
-AUTOMAKE_SOURCE:=automake-$(AUTOMAKE_VER).tar.bz2
-AUTOMAKE_SITE:=http://ftp.gnu.org/pub/gnu/automake
-AUTOMAKE_CAT:=$(BZCAT)
-AUTOMAKE_DIR:=$(BUILD_DIR)/automake-$(AUTOMAKE_VER)
-AUTOMAKE_BINARY:=automake
-AUTOMAKE_TARGET_BINARY:=usr/bin/automake
+AUTOMAKE_VERSION = 1.10
+AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
+AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
+
+ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff
+AUTOMAKE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+endif
+
+AUTOMAKE_DEPENDENCIES = uclibc autoconf microperl
+
+$(eval $(call AUTOTARGETS,package,automake))
+
+# automake for the host
+AUTOMAKE_HOST_DIR:=$(BUILD_DIR)/automake-$(AUTOMAKE_VERSION)-host
+
+# variables used by other packages
+AUTOMAKE:=$(HOST_DIR)/usr/bin/automake
+ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
+ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
 
 $(DL_DIR)/$(AUTOMAKE_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(AUTOMAKE_SITE)/$(AUTOMAKE_SOURCE)
+	$(call DOWNLOAD,$(AUTOMAKE_SITE),$(AUTOMAKE_SOURCE))
 
-automake-source: $(DL_DIR)/$(AUTOMAKE_SOURCE)
-
-$(AUTOMAKE_DIR)/.unpacked: $(DL_DIR)/$(AUTOMAKE_SOURCE)
-	$(AUTOMAKE_CAT) $(DL_DIR)/$(AUTOMAKE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(CONFIG_UPDATE) $(AUTOMAKE_DIR)
+$(STAMP_DIR)/host_automake_unpacked: $(DL_DIR)/$(AUTOMAKE_SOURCE)
+	mkdir -p $(AUTOMAKE_HOST_DIR)
+	$(INFLATE$(suffix $(AUTOMAKE_SOURCE))) $< | \
+		$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(AUTOMAKE_HOST_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(AUTOMAKE_HOST_DIR) package/automake/ \*.patch
 	touch $@
 
-$(AUTOMAKE_DIR)/.configured: $(AUTOMAKE_DIR)/.unpacked
-	(cd $(AUTOMAKE_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		WANT_AUTOCONF=2.5 \
+$(STAMP_DIR)/host_automake_configured: $(STAMP_DIR)/host_automake_unpacked $(STAMP_DIR)/host_autoconf_installed
+	(cd $(AUTOMAKE_HOST_DIR); rm -rf config.cache; \
+		$(HOST_CONFIGURE_OPTS) \
+		CFLAGS="$(HOST_CFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS)" \
 		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-	);
+		--prefix="$(HOST_DIR)/usr" \
+		--sysconfdir="$(HOST_DIR)/etc" \
+		--disable-static \
+	)
 	touch $@
 
-$(AUTOMAKE_DIR)/$(AUTOMAKE_BINARY): $(AUTOMAKE_DIR)/.configured
-	$(MAKE) -C $(AUTOMAKE_DIR)
-	touch -c $(AUTOMAKE_DIR)/$(AUTOMAKE_BINARY)
+$(STAMP_DIR)/host_automake_compiled: $(STAMP_DIR)/host_automake_configured
+	$(MAKE) -C $(AUTOMAKE_HOST_DIR)
+	touch $@
 
-$(TARGET_DIR)/$(AUTOMAKE_TARGET_BINARY): $(AUTOMAKE_DIR)/$(AUTOMAKE_BINARY)
-	$(MAKE) \
-	    prefix=$(TARGET_DIR)/usr \
-	    exec_prefix=$(TARGET_DIR)/usr \
-	    bindir=$(TARGET_DIR)/usr/bin \
-	    sbindir=$(TARGET_DIR)/usr/sbin \
-	    libexecdir=$(TARGET_DIR)/usr/lib \
-	    datadir=$(TARGET_DIR)/usr/share \
-	    sysconfdir=$(TARGET_DIR)/etc \
-	    localstatedir=$(TARGET_DIR)/var \
-	    libdir=$(TARGET_DIR)/usr/lib \
-	    infodir=$(TARGET_DIR)/usr/info \
-	    mandir=$(TARGET_DIR)/usr/man \
-	    includedir=$(TARGET_DIR)/usr/include \
-	    -C $(AUTOMAKE_DIR) install
-	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
-		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
-	touch -c $(TARGET_DIR)/$(AUTOMAKE_TARGET_BINARY)
+$(STAMP_DIR)/host_automake_installed: $(STAMP_DIR)/host_automake_compiled
+	$(MAKE) -C $(AUTOMAKE_HOST_DIR) install
+	mkdir -p $(STAGING_DIR)/usr/share/aclocal
+	touch $@
 
-automake: uclibc $(TARGET_DIR)/$(AUTOMAKE_TARGET_BINARY)
+host-automake: $(STAMP_DIR)/host_automake_installed
 
-automake-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AUTOMAKE_DIR) uninstall
-	-$(MAKE) -C $(AUTOMAKE_DIR) clean
+host-automake-clean:
+	rm -f $(addprefix $(STAMP_DIR)/host_automake_,unpacked configured compiled installed)
+	-$(MAKE) -C $(AUTOMAKE_HOST_DIR) uninstall
+	-$(MAKE) -C $(AUTOMAKE_HOST_DIR) clean
 
-automake-dirclean:
-	rm -rf $(AUTOMAKE_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_AUTOMAKE)),y)
-TARGETS+=automake
-endif
+host-automake-dirclean:
+	rm -rf $(AUTOMAKE_HOST_DIR)

package/avahi/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_AVAHI
 	bool "avahi"
-	default n
+	select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
 	help
 	  Avahi is a system which facilitates service
 	  discovery on a local network.
@@ -8,9 +9,10 @@ config BR2_PACKAGE_AVAHI
 	  http://www.avahi.org/
 
 config BR2_PACKAGE_AVAHI_AUTOIPD
-	bool "  IPv4LL network address configuration daemon"
+	bool "IPv4LL network address configuration daemon"
 	default y
 	depends on BR2_PACKAGE_AVAHI
+	select BR2_PACKAGE_LIBDAEMON
 	help
 	  Avahi-autoipd implements IPv4LL, "Dynamic Configuration of
 	  IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for
@@ -20,9 +22,9 @@ config BR2_PACKAGE_AVAHI_AUTOIPD
 	  lack a DHCP server.
 
 config BR2_PACKAGE_AVAHI_DAEMON
-	bool "  mDNS/DNS-SD daemon"
-	default n
+	bool "mDNS/DNS-SD daemon"
 	depends on BR2_PACKAGE_AVAHI
+	select BR2_PACKAGE_LIBDAEMON
 	select BR2_PACKAGE_EXPAT
 	help
 	  The Avahi mDNS/DNS-SD daemon implementing Apple's ZeroConf

package/avahi/avahi-ipv6only.patch

@@ -0,0 +1,19 @@
+diff -urpN avahi-0.6.22.orig/avahi-core/socket.c avahi-0.6.22/avahi-core/socket.c
+--- avahi-0.6.22.orig/avahi-core/socket.c	2007-12-16 22:03:08.000000000 +0100
++++ avahi-0.6.22/avahi-core/socket.c	2008-03-31 17:13:24.000000000 +0200
+@@ -394,13 +394,13 @@ int avahi_open_socket_ipv6(int no_reuse)
+         avahi_log_warn("IPV6_UNICAST_HOPS failed: %s", strerror(errno));
+         goto fail;
+     }
+-
++#ifdef IPV6_V6ONLY
+     yes = 1;
+     if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) {
+         avahi_log_warn("IPV6_V6ONLY failed: %s", strerror(errno));
+         goto fail;
+     }
+-
++#endif
+     yes = 1;
+     if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {
+         avahi_log_warn("IPV6_MULTICAST_LOOP failed: %s", strerror(errno));

package/avahi/avahi.mk

@@ -4,55 +4,19 @@
 #
 #############################################################
 #
-# This program is free software; you can redistribute it 
-# and/or modify it under the terms of the GNU Lesser General 
-# Public License as published by the Free Software Foundation; 
-# either version 2.1 of the License, or (at your option) any 
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU Lesser General
+# Public License as published by the Free Software Foundation
+# either version 2.1 of the License, or (at your option) any
 # later version.
 
-AVAHI_VER:=0.6.18
-AVAHI_DIR:=$(BUILD_DIR)/avahi-$(AVAHI_VER)
-AVAHI_SITE:=http://www.avahi.org/download/
-AVAHI_SOURCE:=avahi-$(AVAHI_VER).tar.gz
-AVAHI_CAT:=$(ZCAT)
+AVAHI_VERSION = 0.6.23
+AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz
+AVAHI_SITE = http://www.avahi.org/download/
+AVAHI_INSTALL_STAGING = YES
+AVAHI_INSTALL_TARGET = YES
 
-AVAHI_TARGETS:=
-
-ifeq ($(strip $(BR2_PACKAGE_AVAHI_AUTOIPD)),y)
-AVAHI_TARGETS+=$(TARGET_DIR)/usr/sbin/avahi-autoipd
-endif
-
-ifeq ($(strip $(BR2_PACKAGE_AVAHI_DAEMON)),y)
-AVAHI_TARGETS+=$(TARGET_DIR)/usr/sbin/avahi-daemon
-AVAHI_DISABLE_EXPAT:=
-# depend on the exact library file instead of expat so avahi isn't always
-# considered out-of-date
-AVAHI_EXPAT_DEP:=$(STAGING_DIR)/lib/libexpat.so.1
-else
-AVAHI_DISABLE_EXPAT:=--disable-expat
-AVAHI_EXPAT_DEP:=
-endif
-
-$(DL_DIR)/$(AVAHI_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(AVAHI_SITE)/$(AVAHI_SOURCE)
-
-avahi-source: $(DL_DIR)/$(AVAHI_SOURCE)
-
-$(AVAHI_DIR)/.unpacked: $(DL_DIR)/$(AVAHI_SOURCE)
-	$(AVAHI_CAT) $(DL_DIR)/$(AVAHI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(AVAHI_DIR) package/avahi/ \*.patch
-	touch $(AVAHI_DIR)/.unpacked
-
-$(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP)
-	(cd $(AVAHI_DIR) && rm -rf config.cache && autoconf)
-	( \
-		cd $(AVAHI_DIR) && \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		LIBDAEMON_CFLAGS="-I$(STAGING_DIR)/include" \
-		LIBDAEMON_LIBS="-L$(STAGING_DIR)/lib -ldaemon" \
-		ac_cv_func_strtod=yes \
+AVAHI_CONF_ENV = ac_cv_func_strtod=yes \
 		ac_fsusage_space=yes \
 		fu_cv_sys_stat_statfs2_bsize=yes \
 		ac_cv_func_closedir_void=no \
@@ -105,101 +69,90 @@ $(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP)
 		ac_cv_func_working_mktime=yes \
 		jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no \
-		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(REAL_GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--includedir=/include \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
-		--disable-glib \
+		avahi_cv_sys_cxx_works=yes
+
+AVAHI_CONF_OPT = --localstatedir=/var \
 		--disable-qt3 \
 		--disable-qt4 \
-		--disable-gtk \
-		--disable-dbus \
-		$(AVAHI_DISABLE_EXPAT) \
 		--disable-gdbm \
-		--disable-python \
 		--disable-python-dbus \
 		--disable-pygtk \
 		--disable-mono \
 		--disable-monodoc \
 		--disable-stack-protector \
 		--with-distro=none \
+		$(if $(BR2_HAVE_MANPAGES),--enable,--disable)-manpages \
+		$(if $(BR2_PACKAGE_AVAHI_AUTOIPD),--enable,--disable)-autoipd \
 		--with-avahi-user=default \
 		--with-avahi-group=default \
 		--with-autoipd-user=default \
-		--with-autoipd-group=default \
-	);
-	touch $(AVAHI_DIR)/.configured
+		--with-autoipd-group=default
 
-$(AVAHI_DIR)/.compiled: $(AVAHI_DIR)/.configured
-	$(MAKE) -C $(AVAHI_DIR)
-	touch $(AVAHI_DIR)/.compiled
+AVAHI_DEPENDENCIES = $(if $(BR2_PACKAGE_GETTEXT),gettext)
 
-$(STAGING_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.compiled
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-autoipd install
-	touch -c $@
-
-$(TARGET_DIR)/usr/sbin/avahi-autoipd: $(STAGING_DIR)/usr/sbin/avahi-autoipd
-	cp $^ $@
-	mkdir -p $(TARGET_DIR)/etc/avahi
-	mkdir -p $(TARGET_DIR)/var/lib
-	ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
-	cp -af $(STAGING_DIR)/etc/avahi/avahi-autoipd.action $(TARGET_DIR)/etc/avahi/
-	cp -af $(BASE_DIR)/package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script
-	cp -af $(BASE_DIR)/package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
-	chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
-	$(STRIP) --strip-unneeded $@
-
-$(STAGING_DIR)/usr/lib/libavahi-common.so: $(AVAHI_DIR)/.compiled
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-common install
-	touch -c $@
-
-$(STAGING_DIR)/usr/lib/libavahi-core.so: $(AVAHI_DIR)/.compiled $(STAGING_DIR)/usr/lib/libavahi-common.so
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-core install
-	touch -c $@
-
-$(STAGING_DIR)/usr/sbin/avahi-daemon: $(AVAHI_DIR)/.compiled $(STAGING_DIR)/usr/lib/libavahi-core.so $(STAGING_DIR)/usr/lib/libavahi-common.so
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(AVAHI_DIR)/avahi-daemon install
-	touch -c $@
-
-$(TARGET_DIR)/usr/sbin/avahi-daemon: $(STAGING_DIR)/usr/sbin/avahi-daemon
-	cp $^ $@
-	cp -dpf $(STAGING_DIR)/lib/libavahi-*.so* $(TARGET_DIR)/usr/lib/
-	mkdir -p $(TARGET_DIR)/etc/avahi/services
-	cp -af $(BASE_DIR)/package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
-	$(STRIP) --strip-unneeded $@
-	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libavahi-*.so*
-
-avahi: uclibc busybox libdaemon $(AVAHI_TARGETS)
-
-avahi-clean:
-	$(MAKE) -C $(AVAHI_DIR) distclean
-	rm -rf $(TARGET_DIR)/etc/avahi
-	rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
-	rm -f $(TARGET_DIR)/etc/init.d/S*avahi*
-	rm -f $(TARGET_DIR)/usr/sbin/avahi-*
-
-avahi-dirclean:
-	rm -rf $(AVAHI_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_AVAHI)),y)
-TARGETS+=avahi
+ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
+AVAHI_DEPENDENCIES += libdaemon
+else
+AVAHI_CONF_OPT += --disable-libdaemon
 endif
+
+ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
+AVAHI_DEPENDENCIES += expat
+AVAHI_CONF_OPT += --with-xml=expat
+else
+AVAHI_CONF_OPT += --with-xml=none
+endif
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+AVAHI_DEPENDENCIES += dbus
+else
+AVAHI_CONF_OPT += --disable-dbus
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+AVAHI_DEPENDENCIES += libglib2
+else
+AVAHI_CONF_OPT += --disable-glib --disable-gobject
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGLADE),y)
+AVAHI_DEPENDENCIES += libglade
+else
+AVAHI_CONF_OPT += --disable-gtk
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+AVAHI_CONF_ENV += am_cv_pathless_PYTHON=python \
+		am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \
+		am_cv_python_version=$(PYTHON_VERSION) \
+		am_cv_python_platform=linux2 \
+		am_cv_python_pythondir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
+		am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
+		py_cv_mod_socket_=yes
+
+AVAHI_DEPENDENCIES += libpython
+AVAHI_CONF_OPT += --enable-python
+else
+AVAHI_CONF_OPT += --disable-python
+endif
+
+ifeq ($(BR2_PACKAGE_LIBINTL),y)
+AVAHI_DEPENDENCIES += libintl
+AVAHI_MAKE_OPT = LIBS=-lintl
+endif
+
+$(eval $(call AUTOTARGETS,package,avahi))
+
+$(AVAHI_HOOK_POST_INSTALL):
+	rm -rf $(TARGET_DIR)/etc/init.d/avahi-*
+ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y)
+	rm -rf $(TARGET_DIR)/etc/dhcp3/
+	$(INSTALL) -D -m 0755 package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script
+	$(INSTALL) -m 0755 package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
+	rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
+	ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
+endif
+ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
+	$(INSTALL) -m 0755 package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
+endif
+	touch $@

package/avahi/libdir-la.patch

@@ -1,77 +0,0 @@
---- avahi/ltmain.sh.orig	2004-11-23 09:19:19.000000000 -0700
-+++ avahi/ltmain.sh	2007-01-13 14:36:53.000000000 -0700
-@@ -231,8 +231,9 @@
- 	# line option must be used.
- 	if test -z "$tagname"; then
- 	  $echo "$modename: unable to infer tagged configuration"
--	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit $EXIT_FAILURE
-+	  $echo "$modename: defaulting to \`CC'"
-+	  $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+#	  exit $EXIT_FAILURE
- #        else
- #          $echo "$modename: using $tagname tagged configuration"
- 	fi
-@@ -2279,8 +2280,14 @@
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
--	    dir="$libdir"
--	    absdir="$libdir"
-+            # Adding 'libdir' from the .la file to our library search paths
-+            # breaks crosscompilation horribly.  We cheat here and don't add
-+            # it, instead adding the path where we found the .la.  -CL
-+	    dir="$abs_ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	    #dir="$libdir"
-+	    #absdir="$libdir"
- 	  fi
- 	else
- 	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-@@ -2754,6 +2761,16 @@
- 		esac
- 		if grep "^installed=no" $deplib > /dev/null; then
- 		  path="$absdir/$objdir"
-+#		This interferes with crosscompilation. -CL
-+#		else
-+#		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+#		  if test -z "$libdir"; then
-+#		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+#		    exit 1
-+#		  fi
-+#		  if test "$absdir" != "$libdir"; then
-+#		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+#		  fi
- 		else
- 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		  if test -z "$libdir"; then
-@@ -5141,6 +5158,10 @@
- 	    # Replace all uninstalled libtool libraries with the installed ones
- 	    newdependency_libs=
- 	    for deplib in $dependency_libs; do
-+              # Replacing uninstalled with installed can easily break crosscompilation,
-+              # since the installed path is generally the wrong architecture.  -CL
-+              newdependency_libs="$newdependency_libs $deplib"
-+              continue
- 	      case $deplib in
- 	      *.la)
- 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-@@ -5459,10 +5480,13 @@
- 	  # At present, this check doesn't affect windows .dll's that
- 	  # are installed into $libdir/../bin (currently, that works fine)
- 	  # but it's something to keep an eye on.
--	  if test "$inst_prefix_dir" = "$destdir"; then
--	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--	    exit $EXIT_FAILURE
--	  fi
-+	  #
-+	  # This breaks install into our staging area.  -PB
-+	  # 
-+	  # if test "$inst_prefix_dir" = "$destdir"; then
-+	  #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	  #   exit $EXIT_FAILURE
-+	  # fi
- 
- 	  if test -n "$inst_prefix_dir"; then
- 	    # Stick the inst_prefix_dir data into the link command.

package/avahi/uclibc.patch

@@ -1,19 +0,0 @@
-diff -urN avahi-0.6.14-orig/avahi-core/socket.c avahi-0.6.14/avahi-core/socket.c
---- avahi-0.6.14-orig/avahi-core/socket.c	2006-08-31 10:18:03.000000000 -0700
-+++ avahi-0.6.14/avahi-core/socket.c	2006-09-21 19:01:31.000000000 -0700
-@@ -394,13 +394,13 @@
-         avahi_log_warn("IPV6_UNICAST_HOPS failed: %s", strerror(errno));
-         goto fail;
-     }
--    
-+#ifdef IPV6_V6ONLY
-     yes = 1;
-     if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) {
-         avahi_log_warn("IPV6_V6ONLY failed: %s", strerror(errno));
-         goto fail;
-     }
--
-+#endif
-     yes = 1;
-     if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {
-         avahi_log_warn("IPV6_MULTICAST_LOOP failed: %s", strerror(errno));

package/axel/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_AXEL
+	bool "axel"
+	help
+	  HTTP/FTP download accelerator.
+
+	  http://axel.alioth.debian.org/

package/axel/axel.mk

@@ -0,0 +1,55 @@
+#############################################################
+#
+# axel
+#
+#############################################################
+AXEL_VERSION:=1.1
+AXEL_SOURCE:=axel-$(AXEL_VERSION).tar.gz
+AXEL_SITE:=http://alioth.debian.org/frs/download.php/2287
+AXEL_CAT:=$(ZCAT)
+AXEL_DIR:=$(BUILD_DIR)/axel-$(AXEL_VERSION)
+AXEL_BINARY:=axel
+AXEL_TARGET_BINARY:=usr/bin/axel
+
+$(DL_DIR)/$(AXEL_SOURCE):
+	 $(call DOWNLOAD,$(AXEL_SITE),$(AXEL_SOURCE))
+
+axel-source: $(DL_DIR)/$(AXEL_SOURCE)
+
+$(AXEL_DIR)/.unpacked: $(DL_DIR)/$(AXEL_SOURCE)
+	$(AXEL_CAT) $(DL_DIR)/$(AXEL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	#toolchain/patch-kernel.sh $(AXEL_DIR) package/axel axel\*.patch
+	touch $@
+
+$(AXEL_DIR)/Makefile.settings: $(AXEL_DIR)/.unpacked
+	(cd $(AXEL_DIR); \
+		./configure --i18n=0 --prefix=/usr \
+	)
+	touch $@
+
+$(AXEL_DIR)/$(AXEL_BINARY): $(AXEL_DIR)/Makefile.settings
+	$(MAKE) CC="$(TARGET_CC)" STRIP="$(TARGET_STRIP)" -C $(AXEL_DIR)
+
+$(TARGET_DIR)/$(AXEL_TARGET_BINARY): $(AXEL_DIR)/$(AXEL_BINARY)
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-bin
+ifeq ($(BR2_HAVE_MANPAGES),y)
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-man
+endif
+
+axel: uclibc $(TARGET_DIR)/$(AXEL_TARGET_BINARY)
+
+axel-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) uninstall
+	-$(MAKE) -C $(AXEL_DIR) clean
+
+axel-dirclean:
+	rm -rf $(AXEL_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_PACKAGE_AXEL),y)
+TARGETS+=axel
+endif

package/bash/Config.in

@@ -1,6 +1,5 @@
 config BR2_PACKAGE_BASH
 	bool "bash"
-	default n
 	select BR2_PACKAGE_NCURSES
 	help
 	  The standard GNU Bourne again shell.

package/bash/bash.mk

@@ -3,23 +3,24 @@
 # bash
 #
 #############################################################
-BASH_VER:=3.2
-BASH_SOURCE:=bash-$(BASH_VER).tar.gz
-BASH_SITE:=http://ftp.gnu.org/pub/gnu/bash
+BASH_VERSION:=3.2
+BASH_SOURCE:=bash-$(BASH_VERSION).tar.gz
+BASH_SITE:=$(BR2_GNU_MIRROR)/bash
 BASH_CAT:=$(ZCAT)
-BASH_DIR:=$(BUILD_DIR)/bash-$(BASH_VER)
+BASH_DIR:=$(BUILD_DIR)/bash-$(BASH_VERSION)
 BASH_BINARY:=bash
 BASH_TARGET_BINARY:=bin/bash
 
 $(DL_DIR)/$(BASH_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(BASH_SITE)/$(BASH_SOURCE)
+	 $(call DOWNLOAD,$(BASH_SITE),$(BASH_SOURCE))
 
 bash-source: $(DL_DIR)/$(BASH_SOURCE)
 
 bash-unpacked: $(BASH_DIR)/.unpacked
+
 $(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE)
 	$(BASH_CAT) $(DL_DIR)/$(BASH_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(BASH_DIR) package/bash/ bash??-*
+	toolchain/patch-kernel.sh $(BASH_DIR) package/bash/ bash??-\*
 	# This is broken when -lintl is added to LIBS
 	$(SED) 's,LIBS_FOR_BUILD =.*,LIBS_FOR_BUILD =,g' \
 		$(BASH_DIR)/builtins/Makefile.in
@@ -29,13 +30,22 @@ $(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE)
 	touch $@
 
 $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
-	#		bash_cv_have_mbstate_t=yes
+	# bash_cv_have_mbstate_t=yes
 	(cd $(BASH_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
+		$(TARGET_CONFIGURE_ARGS) \
 		CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
 		ac_cv_func_setvbuf_reversed=no \
+		ac_cv_have_decl_sys_siglist=yes \
+		bash_cv_job_control_missing=present \
+		bash_cv_sys_named_pipes=present \
+		bash_cv_unusable_rtsigs=no \
+		bash_cv_func_ctype_nonascii=yes \
+		bash_cv_decl_under_sys_siglist=yes \
+		bash_cv_ulimit_maxfds=yes \
+		bash_cv_getcwd_malloc=yes \
+		bash_cv_func_sigsetjmp=present \
+		bash_cv_printf_a_format=yes \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -49,38 +59,49 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--includedir=/usr/include \
 		$(DISABLE_NLS) \
 		$(DISABLE_LARGEFILE) \
 		--with-curses \
 		--enable-alias \
 		--without-bash-malloc \
-	);
+		$(ENABLE_DEBUG) \
+	)
 	touch $@
 
 $(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)
+	$(MAKE1) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR)
 
 $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
+	mkdir -p $(TARGET_DIR)/bin
 	$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) install
 	rm -f $(TARGET_DIR)/bin/bash*
-	-mkdir $(TARGET_DIR)/bin
 	mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/
 	(cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh)
-	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
-		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+ifneq ($(BR2_HAVE_INFOPAGES),y)
+	rm -rf $(TARGET_DIR)/usr/share/info
+endif
+ifneq ($(BR2_HAVE_MANPAGES),y)
+	rm -rf $(TARGET_DIR)/usr/share/man
+endif
+	rm -rf $(TARGET_DIR)/share/locale
+	rm -rf $(TARGET_DIR)/usr/share/doc
 
-#If both bash and busybox are selected, make certain bash wins
-#the fight over who gets to own the /bin/sh symlink
+# If both bash and busybox are selected, make certain bash wins
+# the fight over who gets to own the /bin/sh symlink.
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 bash: ncurses uclibc busybox $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 else
 bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 endif
 
+# If both bash and busybox are selected, the /bin/sh symlink
+# may need to be reinstated by the clean targets.
 bash-clean:
-	$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
+	-$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
+	rm -f $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 	-$(MAKE1) -C $(BASH_DIR) clean
 
 bash-dirclean:
@@ -91,6 +112,6 @@ bash-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_PACKAGE_BASH)),y)
+ifeq ($(BR2_PACKAGE_BASH),y)
 TARGETS+=bash
 endif

package/bash/bash32-010

@@ -0,0 +1,207 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-010
+
+Bug-Reported-by:	Ryan Waldron <rew@erebor.com>
+Bug-Reference-ID:	<20070119065603.546D011E9C@kansas.erebor.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-01/msg00059.html
+
+Bug-Description:
+
+The glibc implementation of regcomp/regexec does not allow backslashes to
+escape "ordinary" pattern characters when matching.  Bash used backslashes
+to quote all characters when the pattern argument to the [[ special
+command's =~ operator was quoted.  This caused the match to fail on Linux
+and other systems using GNU libc.
+
+Patch:
+
+*** ../bash-3.2.9/pathexp.h	Sat Feb 19 17:23:18 2005
+--- bash-3.2/pathexp.h	Wed Jan 31 22:53:16 2007
+***************
+*** 1,5 ****
+  /* pathexp.h -- The shell interface to the globbing library. */
+  
+! /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+--- 1,5 ----
+  /* pathexp.h -- The shell interface to the globbing library. */
+  
+! /* Copyright (C) 1987-2007 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+***************
+*** 33,36 ****
+--- 33,37 ----
+  #define QGLOB_CVTNULL	0x01	/* convert QUOTED_NULL strings to '\0' */
+  #define QGLOB_FILENAME	0x02	/* do correct quoting for matching filenames */
++ #define QGLOB_REGEXP	0x04	/* quote an ERE for regcomp/regexec */
+  
+  #if defined (EXTENDED_GLOB)
+*** ../bash-3.2.9/pathexp.c	Mon May  6 13:43:05 2002
+--- bash-3.2/pathexp.c	Mon Feb 26 16:59:23 2007
+***************
+*** 1,5 ****
+  /* pathexp.c -- The shell interface to the globbing library. */
+  
+! /* Copyright (C) 1995-2002 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+--- 1,5 ----
+  /* pathexp.c -- The shell interface to the globbing library. */
+  
+! /* Copyright (C) 1995-2007 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+***************
+*** 111,114 ****
+--- 111,141 ----
+  }
+  
++ /* Return 1 if C is a character that is `special' in a POSIX ERE and needs to
++    be quoted to match itself. */
++ static inline int
++ ere_char (c)
++      int c;
++ {
++   switch (c)
++     {
++     case '.':
++     case '[':
++     case '\\':
++     case '(':
++     case ')':
++     case '*':
++     case '+':
++     case '?':
++     case '{':
++     case '|':
++     case '^':
++     case '$':
++       return 1;
++     default: 
++       return 0;
++     }
++   return (0);
++ }
++ 
+  /* PATHNAME can contain characters prefixed by CTLESC; this indicates
+     that the character is to be quoted.  We quote it here in the style
+***************
+*** 143,146 ****
+--- 170,175 ----
+  	  if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/')
+  	    continue;
++ 	  if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
++ 	    continue;
+  	  temp[j++] = '\\';
+  	  i++;
+*** ../bash-3.2.9/subst.c	Tue Nov  7 16:14:41 2006
+--- bash-3.2/subst.c	Wed Jan 31 23:09:58 2007
+***************
+*** 5,9 ****
+       beauty, but, hey, you're alright.'' */
+  
+! /* Copyright (C) 1987-2006 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+--- 5,9 ----
+       beauty, but, hey, you're alright.'' */
+  
+! /* Copyright (C) 1987-2007 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+***************
+*** 2647,2655 ****
+  /* This needs better error handling. */
+  /* Expand W for use as an argument to a unary or binary operator in a
+!    [[...]] expression.  If SPECIAL is nonzero, this is the rhs argument
+     to the != or == operator, and should be treated as a pattern.  In
+!    this case, we quote the string specially for the globbing code.  The
+!    caller is responsible for removing the backslashes if the unquoted
+!    words is needed later. */   
+  char *
+  cond_expand_word (w, special)
+--- 2647,2656 ----
+  /* This needs better error handling. */
+  /* Expand W for use as an argument to a unary or binary operator in a
+!    [[...]] expression.  If SPECIAL is 1, this is the rhs argument
+     to the != or == operator, and should be treated as a pattern.  In
+!    this case, we quote the string specially for the globbing code.  If
+!    SPECIAL is 2, this is an rhs argument for the =~ operator, and should
+!    be quoted appropriately for regcomp/regexec.  The caller is responsible
+!    for removing the backslashes if the unquoted word is needed later. */   
+  char *
+  cond_expand_word (w, special)
+***************
+*** 2659,2662 ****
+--- 2660,2664 ----
+    char *r, *p;
+    WORD_LIST *l;
++   int qflags;
+  
+    if (w->word == 0 || w->word[0] == '\0')
+***************
+*** 2673,2678 ****
+        else
+  	{
+  	  p = string_list (l);
+! 	  r = quote_string_for_globbing (p, QGLOB_CVTNULL);
+  	  free (p);
+  	}
+--- 2675,2683 ----
+        else
+  	{
++ 	  qflags = QGLOB_CVTNULL;
++ 	  if (special == 2)
++ 	    qflags |= QGLOB_REGEXP;
+  	  p = string_list (l);
+! 	  r = quote_string_for_globbing (p, qflags);
+  	  free (p);
+  	}
+*** ../bash-3.2.9/execute_cmd.c	Sat Aug 26 00:23:17 2006
+--- bash-3.2/execute_cmd.c	Wed Jan 31 23:12:06 2007
+***************
+*** 1,5 ****
+  /* execute_cmd.c -- Execute a COMMAND structure. */
+  
+! /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+--- 1,5 ----
+  /* execute_cmd.c -- Execute a COMMAND structure. */
+  
+! /* Copyright (C) 1987-2007 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+***************
+*** 2547,2551 ****
+        if (arg1 == 0)
+  	arg1 = nullstr;
+!       arg2 = cond_expand_word (cond->right->op, patmatch||rmatch);
+        if (arg2 == 0)
+  	arg2 = nullstr;
+--- 2547,2551 ----
+        if (arg1 == 0)
+  	arg1 = nullstr;
+!       arg2 = cond_expand_word (cond->right->op, rmatch ? 2 : (patmatch ? 1 : 0));
+        if (arg2 == 0)
+  	arg2 = nullstr;
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 9
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 10
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-011

@@ -0,0 +1,138 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-011
+
+Bug-Reported-by: Petr Sumbera <Petr.Sumbera@Sun.COM>
+Bug-Reference-ID: <45AF5F4B.1020800@sun.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-01/msg00049.html
+
+Bug-Description:
+
+Under certain circumstances (loopback mounts), the bash getcwd does not
+return correct results.  This patch allows the use of the Solaris libc
+getcwd even though it doesn't dynamically allocate memory.
+
+Run `touch configure' to make sure make doesn't try to run autoconf.
+Then run configure with whatever options you like.
+
+Patch:
+
+*** ../bash-3.2-patched/configure.in	Tue Sep 26 11:05:45 2006
+--- bash-3.2/configure.in	Wed Jan 31 09:48:00 2007
+***************
+*** 6,10 ****
+  dnl Process this file with autoconf to produce a configure script.
+  
+! # Copyright (C) 1987-2006 Free Software Foundation, Inc.
+  
+  # This program is free software; you can redistribute it and/or modify
+--- 6,10 ----
+  dnl Process this file with autoconf to produce a configure script.
+  
+! # Copyright (C) 1987-2007 Free Software Foundation, Inc.
+  
+  # This program is free software; you can redistribute it and/or modify
+***************
+*** 992,996 ****
+  sco3.2*)	LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
+  sunos4*)	LOCAL_CFLAGS=-DSunOS4 ;;
+! solaris2.5*)	LOCAL_CFLAGS=-DSunOS5 ;;
+  lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+  linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
+--- 992,997 ----
+  sco3.2*)	LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
+  sunos4*)	LOCAL_CFLAGS=-DSunOS4 ;;
+! solaris2.5*)	LOCAL_CFLAGS="-DSunOS5 -DSOLARIS" ;;
+! solaris2*)	LOCAL_CFLAGS=-DSOLARIS ;;
+  lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+  linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
+*** ../bash-3.2-patched/config-bot.h	Tue Sep 12 16:43:04 2006
+--- bash-3.2/config-bot.h	Tue Mar  6 10:41:31 2007
+***************
+*** 2,6 ****
+  /* modify settings or make new ones based on what autoconf tells us. */
+  
+! /* Copyright (C) 1989-2002 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+--- 2,6 ----
+  /* modify settings or make new ones based on what autoconf tells us. */
+  
+! /* Copyright (C) 1989-2007 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+***************
+*** 71,77 ****
+  #endif
+  
+! /* If we have a getcwd(3), but it calls popen(), #undef HAVE_GETCWD so
+!    the replacement in getcwd.c will be built. */
+! #if defined (HAVE_GETCWD) && defined (GETCWD_BROKEN)
+  #  undef HAVE_GETCWD
+  #endif
+--- 71,79 ----
+  #endif
+  
+! /* If we have a getcwd(3), but one that does not dynamically allocate memory,
+!    #undef HAVE_GETCWD so the replacement in getcwd.c will be built.  We do
+!    not do this on Solaris, because their implementation of loopback mounts
+!    breaks the traditional file system assumptions that getcwd uses. */
+! #if defined (HAVE_GETCWD) && defined (GETCWD_BROKEN) && !defined (SOLARIS)
+  #  undef HAVE_GETCWD
+  #endif
+*** ../bash-3.2-patched/builtins/common.c	Thu Jul 27 09:39:51 2006
+--- bash-3.2/builtins/common.c	Tue Mar  6 10:43:27 2007
+***************
+*** 1,3 ****
+! /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+--- 1,3 ----
+! /* Copyright (C) 1987-2007 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+***************
+*** 476,480 ****
+--- 476,484 ----
+    if (the_current_working_directory == 0)
+      {
++ #if defined (GETCWD_BROKEN)
++       the_current_working_directory = getcwd (0, PATH_MAX);
++ #else
+        the_current_working_directory = getcwd (0, 0);
++ #endif
+        if (the_current_working_directory == 0)
+  	{
+*** ../bash-3.2-patched/configure	Tue Sep 26 11:06:01 2006
+--- bash-3.2/configure	Tue Mar  6 10:59:20 2007
+***************
+*** 27317,27321 ****
+  sco3.2*)	LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
+  sunos4*)	LOCAL_CFLAGS=-DSunOS4 ;;
+! solaris2.5*)	LOCAL_CFLAGS=-DSunOS5 ;;
+  lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+  linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
+--- 27317,27322 ----
+  sco3.2*)	LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
+  sunos4*)	LOCAL_CFLAGS=-DSunOS4 ;;
+! solaris2.5*)	LOCAL_CFLAGS="-DSunOS5 -DSOLARIS" ;;
+! solaris2*)	LOCAL_CFLAGS=-DSOLARIS ;;
+  lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+  linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 10
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 11
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-012

@@ -0,0 +1,96 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-012
+
+Bug-Reported-by: John Wyman <JohnWyman@celink.com>
+Bug-Reference-ID: <5E7DEFC094C35044B87FAE761D9F0EE20143A3B7@exchange2k.celink.com>
+Bug-Reference-URL: 
+
+Bug-Description:
+
+Some systems (AIX 4.x) don't implement the PRI_xxx macros correctly,
+causing syntax errors when attempting to compile bash on those systems.
+This patch adds support for the PRI_MACROS_BROKEN define.
+
+You will need to re-run `configure' after applying the patch.  Run
+`touch configure' so make doesn't try to run autoconf.
+
+Patch:
+
+*** ../bash-3.2.11/config.h.in	Tue Sep 12 16:00:54 2006
+--- bash-3.2/config.h.in	Tue Mar  6 11:17:55 2007
+***************
+*** 1,5 ****
+  /* config.h -- Configuration file for bash. */
+  
+! /* Copyright (C) 1987-2006 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+--- 1,5 ----
+  /* config.h -- Configuration file for bash. */
+  
+! /* Copyright (C) 1987-2007 Free Software Foundation, Inc.
+  
+     This file is part of GNU Bash, the Bourne Again SHell.
+***************
+*** 414,417 ****
+--- 414,419 ----
+  #undef HAVE_DECL_STRTOLD
+  
++ #undef PRI_MACROS_BROKEN
++ 
+  #undef STRTOLD_BROKEN
+  
+***************
+*** 1007,1010 ****
+--- 1009,1015 ----
+  #undef HAVE_DCGETTEXT
+  
++ /* Define if you have the `localeconv' function. */
++ #undef HAVE_LOCALECONV
++ 
+  /* Define if your system has a working `malloc' function. */
+  /* #undef HAVE_MALLOC */
+*** ../bash-3.2.11/builtins/printf.def	Mon Nov 13 08:58:52 2006
+--- bash-3.2/builtins/printf.def	Sun Feb  4 13:58:59 2007
+***************
+*** 2,6 ****
+  It implements the builtin "printf" in Bash.
+  
+! Copyright (C) 1997-2005 Free Software Foundation, Inc.
+  
+  This file is part of GNU Bash, the Bourne Again SHell.
+--- 2,6 ----
+  It implements the builtin "printf" in Bash.
+  
+! Copyright (C) 1997-2007 Free Software Foundation, Inc.
+  
+  This file is part of GNU Bash, the Bourne Again SHell.
+***************
+*** 71,74 ****
+--- 71,78 ----
+  #include "common.h"
+  
++ #if defined (PRI_MACROS_BROKEN)
++ #  undef PRIdMAX
++ #endif
++ 
+  #if !defined (PRIdMAX)
+  #  if HAVE_LONG_LONG
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 11
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 12
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-013

@@ -0,0 +1,65 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-013
+
+Bug-Reported-by: Magnus Svensson <msvensson@mysql.com>
+Bug-Reference-ID: <45BDC44D.80609@mysql.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2007-01/msg00002.html
+
+Bug-Description:
+
+Readline neglects to reallocate the array it uses to keep track of wrapped
+screen lines when increasing its size.  This will eventually result in
+segmentation faults when given sufficiently long input.
+
+Patch:
+
+*** ../bash-3.2-patched/lib/readline/display.c	Thu Sep 14 14:20:12 2006
+--- bash-3.2/lib/readline/display.c	Fri Feb  2 20:23:17 2007
+***************
+*** 561,574 ****
+--- 561,586 ----
+        wrap_offset = prompt_invis_chars_first_line = 0;
+      }
+  
++ #if defined (HANDLE_MULTIBYTE)
+  #define CHECK_INV_LBREAKS() \
+        do { \
+  	if (newlines >= (inv_lbsize - 2)) \
+  	  { \
+  	    inv_lbsize *= 2; \
+  	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
++ 	    _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
+  	  } \
+        } while (0)
++ #else
++ #define CHECK_INV_LBREAKS() \
++       do { \
++ 	if (newlines >= (inv_lbsize - 2)) \
++ 	  { \
++ 	    inv_lbsize *= 2; \
++ 	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
++ 	  } \
++       } while (0)
++ #endif /* HANDLE_MULTIBYTE */
+  
+  #if defined (HANDLE_MULTIBYTE)	  
+  #define CHECK_LPOS() \
+
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 12
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 13
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-014

@@ -0,0 +1,307 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-014
+
+Bug-Reported-by: Brett Stahlman <brettstahlman@comcast.net>
+Bug-Reference-ID: <000701c72d29$a227e0e0$5ec7cf47@computerroom>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-12/msg00065.html
+
+Bug-Description:
+
+Bash mishandles word splitting under certain circumstances when IFS is
+null (IFS=).  Constructs affected include ${param/pat/sub} and others
+when expanding arrays (array[@]).
+
+Patch:
+
+*** ../bash-3.2-patched/array.c	Wed Jun  1 16:39:22 2005
+--- bash-3.2/array.c	Mon Jan 15 22:58:00 2007
+***************
+*** 121,125 ****
+  }
+  
+- #ifdef INCLUDE_UNUSED
+  /*
+   * Make and return a new array composed of the elements in array A from
+--- 121,124 ----
+***************
+*** 142,146 ****
+  		n = array_create_element (element_index(p), element_value(p));
+  		ADD_BEFORE(a->head, n);
+! 		mi = element_index(ae);
+  	}
+  	a->num_elements = i;
+--- 141,145 ----
+  		n = array_create_element (element_index(p), element_value(p));
+  		ADD_BEFORE(a->head, n);
+! 		mi = element_index(n);
+  	}
+  	a->num_elements = i;
+***************
+*** 148,152 ****
+  	return a;
+  }
+- #endif
+  
+  /*
+--- 147,150 ----
+***************
+*** 301,304 ****
+--- 299,319 ----
+  }
+  
++ ARRAY	*
++ array_quote_escapes(array)
++ ARRAY	*array;
++ {
++ 	ARRAY_ELEMENT	*a;
++ 	char	*t;
++ 
++ 	if (array == 0 || array_head(array) == 0 || array_empty(array))
++ 		return (ARRAY *)NULL;
++ 	for (a = element_forw(array->head); a != array->head; a = element_forw(a)) {
++ 		t = quote_escapes (a->value);
++ 		FREE(a->value);
++ 		a->value = t;
++ 	}
++ 	return array;
++ }
++ 
+  /*
+   * Return a string whose elements are the members of array A beginning at
+***************
+*** 312,318 ****
+  int	starsub, quoted;
+  {
+  	ARRAY_ELEMENT	*h, *p;
+  	arrayind_t	i;
+! 	char		*ifs, sep[2];
+  
+  	p = a ? array_head (a) : 0;
+--- 327,334 ----
+  int	starsub, quoted;
+  {
++ 	ARRAY		*a2;
+  	ARRAY_ELEMENT	*h, *p;
+  	arrayind_t	i;
+! 	char		*ifs, sep[2], *t;
+  
+  	p = a ? array_head (a) : 0;
+***************
+*** 337,340 ****
+--- 353,363 ----
+  		;
+  
++ 	a2 = array_slice(a, h, p);
++ 
++ 	if (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT))
++ 		array_quote(a2);
++ 	else
++ 		array_quote_escapes(a2);
++ 
+  	if (starsub && (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT))) {
+  		ifs = getifs();
+***************
+*** 344,348 ****
+  	sep[1] = '\0';
+  
+! 	return (array_to_string_internal (h, p, sep, quoted));
+  }
+  
+--- 367,374 ----
+  	sep[1] = '\0';
+  
+! 	t = array_to_string (a2, sep, 0);
+! 	array_dispose(a2);
+! 
+! 	return t;
+  }
+  
+***************
+*** 368,372 ****
+  
+  	if (mflags & MATCH_QUOTED)
+! 		array_quote (a2);
+  	if (mflags & MATCH_STARSUB) {
+  		ifs = getifs();
+--- 394,400 ----
+  
+  	if (mflags & MATCH_QUOTED)
+! 		array_quote(a2);
+! 	else
+! 		array_quote_escapes(a2);
+  	if (mflags & MATCH_STARSUB) {
+  		ifs = getifs();
+*** ../bash-3.2-patched/array.h	Sun Jun  1 15:50:30 2003
+--- bash-3.2/array.h	Mon Jan 15 22:35:35 2007
+***************
+*** 56,59 ****
+--- 56,60 ----
+  extern int	array_shift_element __P((ARRAY *, char *));
+  extern ARRAY	*array_quote __P((ARRAY *));
++ extern ARRAY	*array_quote_escapes __P((ARRAY *));
+  
+  extern char	*array_subrange __P((ARRAY *, arrayind_t, arrayind_t, int, int));
+*** ../bash-3.2-patched/subst.c	Fri Mar  2 16:20:50 2007
+--- bash-3.2/subst.c	Tue Mar  6 11:40:55 2007
+***************
+*** 1888,1892 ****
+--- 1889,1899 ----
+  #endif
+  
++   /* XXX -- why call quote_list if ifs == 0?  we can get away without doing
++      it now that quote_escapes quotes spaces */
++ #if 0
+    tlist = ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || (ifs && *ifs == 0))
++ #else
++   tlist = (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
++ #endif
+  		? quote_list (list)
+  		: list_quote_escapes (list);
+***************
+*** 2922,2926 ****
+  /* Quote escape characters in string s, but no other characters.  This is
+     used to protect CTLESC and CTLNUL in variable values from the rest of
+!    the word expansion process after the variable is expanded. */
+  char *
+  quote_escapes (string)
+--- 2935,2944 ----
+  /* Quote escape characters in string s, but no other characters.  This is
+     used to protect CTLESC and CTLNUL in variable values from the rest of
+!    the word expansion process after the variable is expanded.  If IFS is
+!    null, we quote spaces as well, just in case we split on spaces later
+!    (in the case of unquoted $@, we will eventually attempt to split the
+!    entire word on spaces).  Corresponding code exists in dequote_escapes.
+!    Even if we don't end up splitting on spaces, quoting spaces is not a
+!    problem. */
+  char *
+  quote_escapes (string)
+***************
+*** 2930,2933 ****
+--- 2948,2952 ----
+    size_t slen;
+    char *result, *send;
++   int quote_spaces;
+    DECLARE_MBSTATE; 
+  
+***************
+*** 2935,2938 ****
+--- 2954,2958 ----
+    send = string + slen;
+  
++   quote_spaces = (ifs_value && *ifs_value == 0);
+    t = result = (char *)xmalloc ((slen * 2) + 1);
+    s = string;
+***************
+*** 2940,2944 ****
+    while (*s)
+      {
+!       if (*s == CTLESC || *s == CTLNUL)
+  	*t++ = CTLESC;
+        COPY_CHAR_P (t, s, send);
+--- 2960,2964 ----
+    while (*s)
+      {
+!       if (*s == CTLESC || *s == CTLNUL || (quote_spaces && *s == ' '))
+  	*t++ = CTLESC;
+        COPY_CHAR_P (t, s, send);
+***************
+*** 2982,2985 ****
+--- 3002,3006 ----
+    size_t slen;
+    char *result, *send;
++   int quote_spaces;
+    DECLARE_MBSTATE;
+  
+***************
+*** 2996,3002 ****
+      return (strcpy (result, s));
+  
+    while (*s)
+      {
+!       if (*s == CTLESC && (s[1] == CTLESC || s[1] == CTLNUL))
+  	{
+  	  s++;
+--- 3017,3024 ----
+      return (strcpy (result, s));
+  
++   quote_spaces = (ifs_value && *ifs_value == 0);
+    while (*s)
+      {
+!       if (*s == CTLESC && (s[1] == CTLESC || s[1] == CTLNUL || (quote_spaces && s[1] == ' ')))
+  	{
+  	  s++;
+***************
+*** 4462,4466 ****
+        RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE);
+  
+!       if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || c == CTLESC || c == CTLNUL)
+  	istring[istring_index++] = CTLESC;
+  
+--- 4498,4510 ----
+        RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE);
+  
+!       /* This is essentially quote_string inline */
+!       if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) /* || c == CTLESC || c == CTLNUL */)
+! 	istring[istring_index++] = CTLESC;
+!       /* Escape CTLESC and CTLNUL in the output to protect those characters
+! 	 from the rest of the word expansions (word splitting and globbing.)
+! 	 This is essentially quote_escapes inline. */
+!       else if (c == CTLESC)
+! 	istring[istring_index++] = CTLESC;
+!       else if (c == CTLNUL || (c == ' ' && (ifs_value && *ifs_value == 0)))
+  	istring[istring_index++] = CTLESC;
+  
+***************
+*** 5552,5555 ****
+--- 5610,5616 ----
+  	 rely on array_subrange to understand how to deal with them). */
+        tt = array_subrange (array_cell (v), e1, e2, starsub, quoted);
++ #if 0
++       /* array_subrange now calls array_quote_escapes as appropriate, so the
++ 	 caller no longer needs to. */
+        if ((quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) == 0)
+  	{
+***************
+*** 5558,5561 ****
+--- 5619,5623 ----
+  	}
+        else
++ #endif
+  	temp = tt;
+        break;
+***************
+*** 5808,5811 ****
+--- 5870,5876 ----
+      case VT_ARRAYVAR:
+        temp = array_patsub (array_cell (v), p, rep, mflags);
++ #if 0
++       /* Don't need to do this anymore; array_patsub calls array_quote_escapes
++ 	 as appropriate before adding the space separators. */
+        if (temp && (mflags & MATCH_QUOTED) == 0)
+  	{
+***************
+*** 5814,5817 ****
+--- 5879,5883 ----
+  	  temp = tt;
+  	}
++ #endif
+        break;
+  #endif
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 13
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 14
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-015

@@ -0,0 +1,95 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-015
+
+Bug-Reported-by:
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+Under certain circumstances, when using FIFOs for process substitution,
+bash fails to unlink the FIFOs.  This leaves open file descriptors that
+can cause the shell to hang and litters the file system.
+
+Patch:
+
+*** ../bash-3.2-patched/execute_cmd.c	Fri Mar  2 16:20:50 2007
+--- bash-3.2/execute_cmd.c	Wed Jan 31 23:12:06 2007
+***************
+*** 3051,3054 ****
+--- 3051,3059 ----
+      command_line = savestring (the_printed_command_except_trap);
+  
++ #if defined (PROCESS_SUBSTITUTION)
++   if ((subshell_environment & SUBSHELL_COMSUB) && (simple_command->flags & CMD_NO_FORK) && fifos_pending() > 0)
++     simple_command->flags &= ~CMD_NO_FORK;
++ #endif
++ 
+    execute_disk_command (words, simple_command->redirects, command_line,
+  			pipe_in, pipe_out, async, fds_to_close,
+*** ../bash-3.2-patched/subst.c	Fri Mar  2 16:20:50 2007
+--- bash-3.2/subst.c	Tue Mar  6 11:40:55 2007
+***************
+*** 4129,4132 ****
+--- 4151,4160 ----
+  }
+  
++ int
++ fifos_pending ()
++ {
++   return nfifo;
++ }
++ 
+  static char *
+  make_named_pipe ()
+***************
+*** 4178,4181 ****
+--- 4206,4215 ----
+  }
+  
++ int
++ fifos_pending ()
++ {
++   return 0;	/* used for cleanup; not needed with /dev/fd */
++ }
++ 
+  void
+  unlink_fifo_list ()
+***************
+*** 4671,4674 ****
+--- 4719,4725 ----
+        last_command_exit_value = rc;
+        rc = run_exit_trap ();
++ #if defined (PROCESS_SUBSTITUTION)
++       unlink_fifo_list ();
++ #endif
+        exit (rc);
+      }
+*** ../bash-3.2-patched/subst.h	Tue Sep 19 08:34:41 2006
+--- bash-3.2/subst.h	Wed Jan 10 09:46:47 2007
+***************
+*** 223,226 ****
+--- 223,227 ----
+  extern char *pat_subst __P((char *, char *, char *, int));
+  
++ extern int fifos_pending __P((void));
+  extern void unlink_fifo_list __P((void));
+
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 14
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 15
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-016

@@ -0,0 +1,52 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-016
+
+Bug-Reported-by: Peter Volkov <torre_cremata@mail.ru>
+Bug-Reference-ID: <1171795523.8021.18.camel@localhost>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-02/msg00054.html
+
+Bug-Description:
+
+When moving the cursor, bash sometimes misplaces the cursor when the prompt
+contains two or more multibyte characters.  The particular circumstance that
+uncovered the problem was having the (multibyte) current directory name in
+the prompt string.
+
+Patch:
+
+*** ../bash-3.2/lib/readline/display.c	Fri Jan 19 13:34:50 2007
+--- bash-3.2/lib/readline/display.c	Sat Mar 10 17:25:44 2007
+***************
+*** 1745,1749 ****
+      {
+        dpos = _rl_col_width (data, 0, new);
+!       if (dpos > prompt_last_invisible)		/* XXX - don't use woff here */
+  	{
+  	  dpos -= woff;
+--- 1745,1752 ----
+      {
+        dpos = _rl_col_width (data, 0, new);
+!       /* Use NEW when comparing against the last invisible character in the
+! 	 prompt string, since they're both buffer indices and DPOS is a
+! 	 desired display position. */
+!       if (new > prompt_last_invisible)		/* XXX - don't use woff here */
+  	{
+  	  dpos -= woff;
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 15
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 16
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-017

@@ -0,0 +1,85 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-017
+
+Bug-Reported-by: Peter Volkov <torre_cremata@mail.ru>
+Bug-Reference-ID: <1173636022.7039.36.camel@localhost>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00039.html
+
+Bug-Description:
+
+When restoring the original prompt after finishing an incremental search,
+bash sometimes places the cursor incorrectly if the primary prompt contains
+invisible characters.
+
+Patch:
+
+*** ../bash-3.2.16/lib/readline/display.c	Fri Apr 20 13:30:16 2007
+--- bash-3.2/lib/readline/display.c	Fri Apr 20 15:17:01 2007
+***************
+*** 1599,1604 ****
+  	  if (temp > 0)
+  	    {
+  	      _rl_output_some_chars (nfd, temp);
+! 	      _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
+  	    }
+  	}
+--- 1599,1618 ----
+  	  if (temp > 0)
+  	    {
++ 	      /* If nfd begins at the prompt, or before the invisible
++ 		 characters in the prompt, we need to adjust _rl_last_c_pos
++ 		 in a multibyte locale to account for the wrap offset and
++ 		 set cpos_adjusted accordingly. */
+  	      _rl_output_some_chars (nfd, temp);
+! 	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+! 		{
+!                   _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+!                   if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
+! 		    {
+! 		      _rl_last_c_pos -= wrap_offset;
+! 		      cpos_adjusted = 1;
+! 		    }
+! 		}
+!               else
+!                 _rl_last_c_pos += temp;
+  	    }
+  	}
+***************
+*** 1608,1613 ****
+--- 1622,1639 ----
+  	  if (temp > 0)
+  	    {
++ 	      /* If nfd begins at the prompt, or before the invisible
++ 		 characters in the prompt, we need to adjust _rl_last_c_pos
++ 		 in a multibyte locale to account for the wrap offset and
++ 		 set cpos_adjusted accordingly. */
+  	      _rl_output_some_chars (nfd, temp);
+  	      _rl_last_c_pos += col_temp;		/* XXX */
++ 	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
++ 		{
++ 		  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
++ 		    {
++ 		      _rl_last_c_pos -= wrap_offset;
++ 		      cpos_adjusted = 1;
++ 		    }
++ 		}
+  	    }
+  	  lendiff = (oe - old) - (ne - new);
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 16
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 17
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-018

@@ -0,0 +1,98 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-018
+
+Bug-Reported-by:	osicka@post.cz
+Bug-Reference-ID:	<228.177-19682-1132061412-1179356692@post.cz>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-05/msg00061.html
+
+Bug-Description:
+
+In certain cases, bash can lose the saved status of a background job, though
+it should still be reported by `wait'.  Bash can also loop infinitely after
+creating and waiting for 4096 jobs.
+
+Patch:
+
+*** ../bash-20070510/jobs.c	Thu Mar  8 16:05:50 2007
+--- bash-3.2/jobs.c	Fri May 18 11:40:14 2007
+***************
+*** 784,792 ****
+      {
+        old = js.j_firstj++;
+        while (js.j_firstj != old)
+  	{
+  	  if (js.j_firstj >= js.j_jobslots)
+  	    js.j_firstj = 0;
+! 	  if (jobs[js.j_firstj])
+  	    break;
+  	  js.j_firstj++;
+--- 784,794 ----
+      {
+        old = js.j_firstj++;
++       if (old >= js.j_jobslots)
++ 	old = js.j_jobslots - 1;
+        while (js.j_firstj != old)
+  	{
+  	  if (js.j_firstj >= js.j_jobslots)
+  	    js.j_firstj = 0;
+! 	  if (jobs[js.j_firstj] || js.j_firstj == old)	/* needed if old == 0 */
+  	    break;
+  	  js.j_firstj++;
+***************
+*** 798,806 ****
+      {
+        old = js.j_lastj--;
+        while (js.j_lastj != old)
+  	{
+  	  if (js.j_lastj < 0)
+  	    js.j_lastj = js.j_jobslots - 1;
+! 	  if (jobs[js.j_lastj])
+  	    break;
+  	  js.j_lastj--;
+--- 800,810 ----
+      {
+        old = js.j_lastj--;
++       if (old < 0)
++ 	old = 0;
+        while (js.j_lastj != old)
+  	{
+  	  if (js.j_lastj < 0)
+  	    js.j_lastj = js.j_jobslots - 1;
+! 	  if (jobs[js.j_lastj] || js.j_lastj == old)	/* needed if old == js.j_jobslots */
+  	    break;
+  	  js.j_lastj--;
+***************
+*** 964,968 ****
+    realloc_jobs_list ();
+  
+!   return (js.j_lastj);
+  }
+  
+--- 975,983 ----
+    realloc_jobs_list ();
+  
+! #ifdef DEBUG
+!   itrace("compact_jobs_list: returning %d", (js.j_lastj || jobs[js.j_lastj]) ? js.j_lastj + 1 : 0);
+! #endif
+! 
+!   return ((js.j_lastj || jobs[js.j_lastj]) ? js.j_lastj + 1 : 0);
+  }
+  
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 17
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 18
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-019

@@ -0,0 +1,343 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-019
+
+Bug-Reported-by:	Thomas Loeber <ifp@loeber1.de>
+Bug-Reference-ID:	<200703082223.08919.ifp@loeber1.de>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00036.html
+
+Bug-Description:
+
+When rl_read_key returns -1, indicating that bash's controlling terminal
+has been invalidated for some reason (e.g., receiving a SIGHUP), the error
+status was not reported correctly to the caller.  This could cause input
+loops. 
+
+Patch:
+
+*** ../bash-3.2-patched/lib/readline/complete.c	Fri Jul 28 11:35:49 2006
+--- bash-3.2/lib/readline/complete.c	Tue Mar 13 08:50:16 2007
+***************
+*** 429,433 ****
+        if (c == 'n' || c == 'N' || c == RUBOUT)
+  	return (0);
+!       if (c == ABORT_CHAR)
+  	_rl_abort_internal ();
+        if (for_pager && (c == NEWLINE || c == RETURN))
+--- 440,444 ----
+        if (c == 'n' || c == 'N' || c == RUBOUT)
+  	return (0);
+!       if (c == ABORT_CHAR || c < 0)
+  	_rl_abort_internal ();
+        if (for_pager && (c == NEWLINE || c == RETURN))
+*** ../bash-3.2-patched/lib/readline/input.c	Wed Aug 16 15:15:16 2006
+--- bash-3.2/lib/readline/input.c	Wed May  2 16:07:59 2007
+***************
+*** 514,518 ****
+       int size;
+  {
+!   int mb_len = 0;
+    size_t mbchar_bytes_length;
+    wchar_t wc;
+--- 522,526 ----
+       int size;
+  {
+!   int mb_len, c;
+    size_t mbchar_bytes_length;
+    wchar_t wc;
+***************
+*** 521,531 ****
+    memset(&ps, 0, sizeof (mbstate_t));
+    memset(&ps_back, 0, sizeof (mbstate_t));
+!   
+    while (mb_len < size)
+      {
+        RL_SETSTATE(RL_STATE_MOREINPUT);
+!       mbchar[mb_len++] = rl_read_key ();
+        RL_UNSETSTATE(RL_STATE_MOREINPUT);
+  
+        mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
+        if (mbchar_bytes_length == (size_t)(-1))
+--- 529,545 ----
+    memset(&ps, 0, sizeof (mbstate_t));
+    memset(&ps_back, 0, sizeof (mbstate_t));
+! 
+!   mb_len = 0;  
+    while (mb_len < size)
+      {
+        RL_SETSTATE(RL_STATE_MOREINPUT);
+!       c = rl_read_key ();
+        RL_UNSETSTATE(RL_STATE_MOREINPUT);
+  
++       if (c < 0)
++ 	break;
++ 
++       mbchar[mb_len++] = c;
++ 
+        mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
+        if (mbchar_bytes_length == (size_t)(-1))
+***************
+*** 565,569 ****
+    c = first;
+    memset (mb, 0, mlen);
+!   for (i = 0; i < mlen; i++)
+      {
+        mb[i] = (char)c;
+--- 579,583 ----
+    c = first;
+    memset (mb, 0, mlen);
+!   for (i = 0; c >= 0 && i < mlen; i++)
+      {
+        mb[i] = (char)c;
+*** ../bash-3.2-patched/lib/readline/isearch.c	Mon Dec 26 17:18:53 2005
+--- bash-3.2/lib/readline/isearch.c	Fri Mar  9 14:30:59 2007
+***************
+*** 328,333 ****
+  
+    f = (rl_command_func_t *)NULL;
+!  
+!  /* Translate the keys we do something with to opcodes. */
+    if (c >= 0 && _rl_keymap[c].type == ISFUNC)
+      {
+--- 328,340 ----
+  
+    f = (rl_command_func_t *)NULL;
+! 
+!   if (c < 0)
+!     {
+!       cxt->sflags |= SF_FAILED;
+!       cxt->history_pos = cxt->last_found_line;
+!       return -1;
+!     }
+! 
+!   /* Translate the keys we do something with to opcodes. */
+    if (c >= 0 && _rl_keymap[c].type == ISFUNC)
+      {
+*** ../bash-3.2-patched/lib/readline/misc.c	Mon Dec 26 17:20:46 2005
+--- bash-3.2/lib/readline/misc.c	Fri Mar  9 14:44:11 2007
+***************
+*** 147,150 ****
+--- 147,152 ----
+  	  rl_clear_message ();
+  	  RL_UNSETSTATE(RL_STATE_NUMERICARG);
++ 	  if (key < 0)
++ 	    return -1;
+  	  return (_rl_dispatch (key, _rl_keymap));
+  	}
+*** ../bash-3.2-patched/lib/readline/readline.c	Wed Aug 16 15:00:36 2006
+--- bash-3.2/lib/readline/readline.c	Fri Mar  9 14:47:24 2007
+***************
+*** 646,649 ****
+--- 669,677 ----
+      {
+        nkey = _rl_subseq_getchar (cxt->okey);
++       if (nkey < 0)
++ 	{
++ 	  _rl_abort_internal ();
++ 	  return -1;
++ 	}
+        r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
+        cxt->flags |= KSEQ_DISPATCHED;
+*** ../bash-3.2-patched/lib/readline/text.c	Fri Jul 28 11:55:27 2006
+--- bash-3.2/lib/readline/text.c	Sun Mar 25 13:41:38 2007
+***************
+*** 858,861 ****
+--- 864,870 ----
+    RL_UNSETSTATE(RL_STATE_MOREINPUT);
+  
++   if (c < 0)
++     return -1;
++ 
+  #if defined (HANDLE_SIGNALS)
+    if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
+***************
+*** 1521,1524 ****
+--- 1530,1536 ----
+    mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX);
+  
++   if (mb_len <= 0)
++     return -1;
++ 
+    if (count < 0)
+      return (_rl_char_search_internal (-count, bdir, mbchar, mb_len));
+***************
+*** 1537,1540 ****
+--- 1549,1555 ----
+    RL_UNSETSTATE(RL_STATE_MOREINPUT);
+  
++   if (c < 0)
++     return -1;
++ 
+    if (count < 0)
+      return (_rl_char_search_internal (-count, bdir, c));
+*** ../bash-3.2-patched/lib/readline/vi_mode.c	Sat Jul 29 16:42:28 2006
+--- bash-3.2/lib/readline/vi_mode.c	Fri Mar  9 15:02:11 2007
+***************
+*** 887,890 ****
+--- 887,897 ----
+    c = rl_read_key ();
+    RL_UNSETSTATE(RL_STATE_MOREINPUT);
++ 
++   if (c < 0)
++     {
++       *nextkey = 0;
++       return -1;
++     }
++ 
+    *nextkey = c;
+  
+***************
+*** 903,906 ****
+--- 910,918 ----
+  	  c = rl_read_key ();	/* real command */
+  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
++ 	  if (c < 0)
++ 	    {
++ 	      *nextkey = 0;
++ 	      return -1;
++ 	    }
+  	  *nextkey = c;
+  	}
+***************
+*** 1225,1236 ****
+       _rl_callback_generic_arg *data;
+  {
+  #if defined (HANDLE_MULTIBYTE)
+!   _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
+  #else
+    RL_SETSTATE(RL_STATE_MOREINPUT);
+!   _rl_vi_last_search_char = rl_read_key ();
+    RL_UNSETSTATE(RL_STATE_MOREINPUT);
+  #endif
+  
+    _rl_callback_func = 0;
+    _rl_want_redisplay = 1;
+--- 1243,1262 ----
+       _rl_callback_generic_arg *data;
+  {
++   int c;
+  #if defined (HANDLE_MULTIBYTE)
+!   c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
+  #else
+    RL_SETSTATE(RL_STATE_MOREINPUT);
+!   c = rl_read_key ();
+    RL_UNSETSTATE(RL_STATE_MOREINPUT);
+  #endif
+  
++   if (c <= 0)
++     return -1;
++ 
++ #if !defined (HANDLE_MULTIBYTE)
++   _rl_vi_last_search_char = c;
++ #endif
++ 
+    _rl_callback_func = 0;
+    _rl_want_redisplay = 1;
+***************
+*** 1248,1251 ****
+--- 1274,1278 ----
+       int count, key;
+  {
++   int c;
+  #if defined (HANDLE_MULTIBYTE)
+    static char *target;
+***************
+*** 1294,1302 ****
+  	{
+  #if defined (HANDLE_MULTIBYTE)
+! 	  _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
+  #else
+  	  RL_SETSTATE(RL_STATE_MOREINPUT);
+! 	  _rl_vi_last_search_char = rl_read_key ();
+  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
+  #endif
+  	}
+--- 1321,1335 ----
+  	{
+  #if defined (HANDLE_MULTIBYTE)
+! 	  c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
+! 	  if (c <= 0)
+! 	    return -1;
+! 	  _rl_vi_last_search_mblen = c;
+  #else
+  	  RL_SETSTATE(RL_STATE_MOREINPUT);
+! 	  c = rl_read_key ();
+  	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
++ 	  if (c < 0)
++ 	    return -1;
++ 	  _rl_vi_last_search_char = c;
+  #endif
+  	}
+***************
+*** 1468,1471 ****
+--- 1501,1507 ----
+    RL_UNSETSTATE(RL_STATE_MOREINPUT);
+  
++   if (c < 0)
++     return -1;
++ 
+  #if defined (HANDLE_MULTIBYTE)
+    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+***************
+*** 1486,1489 ****
+--- 1522,1528 ----
+    _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
+  
++   if (c < 0)
++     return -1;
++ 
+    _rl_callback_func = 0;
+    _rl_want_redisplay = 1;
+***************
+*** 1517,1520 ****
+--- 1556,1562 ----
+      _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
+  
++   if (c < 0)
++     return -1;
++ 
+    return (_rl_vi_change_char (count, c, mb));
+  }
+***************
+*** 1651,1655 ****
+    RL_UNSETSTATE(RL_STATE_MOREINPUT);
+  
+!   if (ch < 'a' || ch > 'z')
+      {
+        rl_ding ();
+--- 1693,1697 ----
+    RL_UNSETSTATE(RL_STATE_MOREINPUT);
+  
+!   if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
+      {
+        rl_ding ();
+***************
+*** 1703,1707 ****
+        return 0;
+      }
+!   else if (ch < 'a' || ch > 'z')
+      {
+        rl_ding ();
+--- 1745,1749 ----
+        return 0;
+      }
+!   else if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
+      {
+        rl_ding ();
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 18
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 19
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-020

@@ -0,0 +1,183 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-020
+
+Bug-Reported-by:	Ian A Watson <WATSON_IAN_A@LILLY.COM>
+Bug-Reference-ID:	<OFEC551808.69D02C7F-ON8525729A.0045708D-8525729A.0046150B@EliLilly.lilly.com>
+Bug-Reference-URL:
+
+Bug-Description:
+
+In some cases of error processing, a jump back to the top-level processing
+loop from a builtin command  would leave the shell in an inconsistent state.
+
+Patch:
+
+*** ../bash-3.2-patched/sig.c	Wed Jan 25 14:57:59 2006
+--- bash-3.2/sig.c	Sat Mar 10 11:11:30 2007
+***************
+*** 351,354 ****
+--- 351,373 ----
+  #undef XHANDLER
+  
++ /* Run some of the cleanups that should be performed when we run
++    jump_to_top_level from a builtin command context.  XXX - might want to
++    also call reset_parser here. */
++ void
++ top_level_cleanup ()
++ {
++   /* Clean up string parser environment. */
++   while (parse_and_execute_level)
++     parse_and_execute_cleanup ();
++ 
++ #if defined (PROCESS_SUBSTITUTION)
++   unlink_fifo_list ();
++ #endif /* PROCESS_SUBSTITUTION */
++ 
++   run_unwind_protects ();
++   loop_level = continuing = breaking = 0;
++   return_catch_flag = 0;
++ }
++ 
+  /* What to do when we've been interrupted, and it is safe to handle it. */
+  void
+*** ../bash-3.2-patched/sig.h	Wed Jan 25 14:50:27 2006
+--- bash-3.2/sig.h	Sat Mar 10 11:14:18 2007
+***************
+*** 122,125 ****
+--- 122,126 ----
+  extern void initialize_terminating_signals __P((void));
+  extern void reset_terminating_signals __P((void));
++ extern void top_level_cleanup __P((void));
+  extern void throw_to_top_level __P((void));
+  extern void jump_to_top_level __P((int)) __attribute__((__noreturn__));
+*** ../bash-3.2-patched/builtins/common.c	Tue Apr  3 16:47:13 2007
+--- bash-3.2/builtins/common.c	Mon Apr 30 15:01:33 2007
+***************
+*** 132,135 ****
+--- 132,136 ----
+      {
+        builtin_error (_("too many arguments"));
++       top_level_cleanup ();
+        jump_to_top_level (DISCARD);
+      }
+***************
+*** 396,400 ****
+  	    throw_to_top_level ();
+  	  else
+! 	    jump_to_top_level (DISCARD);
+  	}
+        no_args (list->next);
+--- 410,417 ----
+  	    throw_to_top_level ();
+  	  else
+! 	    {
+! 	      top_level_cleanup ();
+! 	      jump_to_top_level (DISCARD);
+! 	    }
+  	}
+        no_args (list->next);
+*** ../bash-3.2-patched/subst.c	Tue Apr  3 16:47:19 2007
+--- bash-3.2/subst.c	Tue Jul 17 09:45:11 2007
+***************
+*** 1279,1283 ****
+        if (no_longjmp_on_fatal_error == 0)
+  	{			/* { */
+! 	  report_error ("bad substitution: no closing `%s' in %s", "}", string);
+  	  last_command_exit_value = EXECUTION_FAILURE;
+  	  exp_jump_to_top_level (DISCARD);
+--- 1290,1294 ----
+        if (no_longjmp_on_fatal_error == 0)
+  	{			/* { */
+! 	  report_error (_("bad substitution: no closing `%s' in %s"), "}", string);
+  	  last_command_exit_value = EXECUTION_FAILURE;
+  	  exp_jump_to_top_level (DISCARD);
+***************
+*** 7662,7665 ****
+--- 7706,7711 ----
+    expand_no_split_dollar_star = 0;	/* XXX */
+    expanding_redir = 0;
++ 
++   top_level_cleanup ();			/* from sig.c */
+  
+    jump_to_top_level (v);
+***************
+*** 7880,7884 ****
+  	    {
+  	      report_error (_("no match: %s"), tlist->word->word);
+! 	      jump_to_top_level (DISCARD);
+  	    }
+  	  else if (allow_null_glob_expansion == 0)
+--- 7927,7931 ----
+  	    {
+  	      report_error (_("no match: %s"), tlist->word->word);
+! 	      exp_jump_to_top_level (DISCARD);
+  	    }
+  	  else if (allow_null_glob_expansion == 0)
+*** ../bash-3.2-patched/arrayfunc.c	Thu Jul 27 09:37:59 2006
+--- bash-3.2/arrayfunc.c	Thu May 31 11:55:46 2007
+***************
+*** 619,622 ****
+--- 619,624 ----
+      {
+        last_command_exit_value = EXECUTION_FAILURE;
++ 
++       top_level_cleanup ();      
+        jump_to_top_level (DISCARD);
+      }
+*** ../bash-3.2-patched/expr.c	Wed Dec 28 17:47:03 2005
+--- bash-3.2/expr.c	Tue Apr 24 14:17:59 2007
+***************
+*** 930,933 ****
+--- 930,934 ----
+  	{
+  	  expr_unwind ();
++ 	  top_level_cleanup ();
+  	  jump_to_top_level (DISCARD);
+  	}
+*** ../bash-3.2-patched/variables.c	Fri Sep  8 13:33:32 2006
+--- bash-3.2/variables.c	Tue Jul 17 09:54:59 2007
+***************
+*** 1822,1830 ****
+  	  lval = evalexp (oval, &expok);	/* ksh93 seems to do this */
+  	  if (expok == 0)
+! 	    jump_to_top_level (DISCARD);
+  	}
+        rval = evalexp (value, &expok);
+        if (expok == 0)
+! 	jump_to_top_level (DISCARD);
+        if (flags & ASS_APPEND)
+  	rval += lval;
+--- 1855,1869 ----
+  	  lval = evalexp (oval, &expok);	/* ksh93 seems to do this */
+  	  if (expok == 0)
+! 	    {
+! 	      top_level_cleanup ();
+! 	      jump_to_top_level (DISCARD);
+! 	    }
+  	}
+        rval = evalexp (value, &expok);
+        if (expok == 0)
+! 	{
+! 	  top_level_cleanup ();
+! 	  jump_to_top_level (DISCARD);
+! 	}
+        if (flags & ASS_APPEND)
+  	rval += lval;
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 19
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 20
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-021

@@ -0,0 +1,72 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-021
+
+Bug-Reported-by:	BAGSHAW Paul RD-TECH-REN <paul.bagshaw@orange-ftgroup.com>
+Bug-Reference-ID:	<941BA0BF46DB8F4983FF7C8AFE800BC205EA7D4B@ftrdmel3.rd.francetelecom.fr>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00065.html
+
+Bug-Description:
+
+When the parser read a backslash-escaped character that would be treated
+internally as an escape, it would double the number of escape characters.
+
+Patch:
+
+*** ../bash-3.2-patched/parse.y	Mon Oct 30 17:22:00 2006
+--- bash-3.2/parse.y	Sat Mar 24 17:13:20 2007
+***************
+*** 3377,3381 ****
+  	{
+  	  pass_next_character = 0;
+! 	  goto got_character;
+  	}
+  
+--- 3377,3381 ----
+  	{
+  	  pass_next_character = 0;
+! 	  goto got_escaped_character;
+  	}
+  
+***************
+*** 3651,3660 ****
+      got_character:
+  
+-       all_digit_token &= DIGIT (character);
+-       dollar_present |= character == '$';
+- 
+        if (character == CTLESC || character == CTLNUL)
+  	token[token_index++] = CTLESC;
+  
+        token[token_index++] = character;
+  
+--- 3651,3662 ----
+      got_character:
+  
+        if (character == CTLESC || character == CTLNUL)
+  	token[token_index++] = CTLESC;
+  
++     got_escaped_character:
++ 
++       all_digit_token &= DIGIT (character);
++       dollar_present |= character == '$';
++ 
+        token[token_index++] = character;
+  
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 20
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 21
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-022

@@ -0,0 +1,126 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-022
+
+Bug-Reported-by:	Chet Ramey <chet.ramey@cwru.edu>
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+POSIX specifies that the `read' builtin invoked from an interative shell
+must prompt with $PS2 when a line is continued using a backslash while
+reading from a terminal.
+
+Patch:
+
+*** ../bash-3.2-patched/builtins/read.def	Tue Sep 19 08:45:48 2006
+--- bash-3.2/builtins/read.def	Thu May 24 16:03:30 2007
+***************
+*** 128,133 ****
+  {
+    register char *varname;
+!   int size, i, nr, pass_next, saw_escape, eof, opt, retval, code;
+!   int input_is_tty, input_is_pipe, unbuffered_read;
+    int raw, edit, nchars, silent, have_timeout, fd;
+    unsigned int tmout;
+--- 131,136 ----
+  {
+    register char *varname;
+!   int size, i, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
+!   int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
+    int raw, edit, nchars, silent, have_timeout, fd;
+    unsigned int tmout;
+***************
+*** 135,139 ****
+    char c;
+    char *input_string, *orig_input_string, *ifs_chars, *prompt, *arrayname;
+!   char *e, *t, *t1;
+    struct stat tsb;
+    SHELL_VAR *var;
+--- 138,142 ----
+    char c;
+    char *input_string, *orig_input_string, *ifs_chars, *prompt, *arrayname;
+!   char *e, *t, *t1, *ps2;
+    struct stat tsb;
+    SHELL_VAR *var;
+***************
+*** 149,152 ****
+--- 152,156 ----
+    USE_VAR(i);
+    USE_VAR(pass_next);
++   USE_VAR(print_ps2);
+    USE_VAR(saw_escape);
+    USE_VAR(input_is_pipe);
+***************
+*** 164,167 ****
+--- 168,172 ----
+  #endif
+    USE_VAR(list);
++   USE_VAR(ps2);
+  
+    i = 0;		/* Index into the string that we are reading. */
+***************
+*** 387,391 ****
+  #endif
+  
+!   for (eof = retval = 0;;)
+      {
+  #if defined (READLINE)
+--- 394,399 ----
+  #endif
+  
+!   ps2 = 0;
+!   for (print_ps2 = eof = retval = 0;;)
+      {
+  #if defined (READLINE)
+***************
+*** 413,416 ****
+--- 421,433 ----
+  #endif
+  
++       if (print_ps2)
++ 	{
++ 	  if (ps2 == 0)
++ 	    ps2 = get_string_value ("PS2");
++ 	  fprintf (stderr, "%s", ps2 ? ps2 : "");
++ 	  fflush (stderr);
++ 	  print_ps2 = 0;
++ 	}
++ 
+        if (unbuffered_read)
+  	retval = zread (fd, &c, 1);
+***************
+*** 441,445 ****
+  	  pass_next = 0;
+  	  if (c == '\n')
+! 	    i--;		/* back up over the CTLESC */
+  	  else
+  	    goto add_char;
+--- 458,466 ----
+  	  pass_next = 0;
+  	  if (c == '\n')
+! 	    {
+! 	      i--;		/* back up over the CTLESC */
+! 	      if (interactive && input_is_tty && raw == 0)
+! 		print_ps2 = 1;
+! 	    }
+  	  else
+  	    goto add_char;
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 21
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 22
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-023

@@ -0,0 +1,51 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-023
+
+Bug-Reported-by:	Chet Ramey <chet.ramey@cwru.edu>
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+When an error occurs during the pattern removal word expansion, the shell
+can free unallocated memory or free memory multiple times.
+
+Patch:
+
+*** ../bash-3.2-patched/subst.c	Tue Apr  3 16:47:19 2007
+--- bash-3.2/subst.c	Tue Jul 17 09:45:11 2007
+***************
+*** 3975,3979 ****
+      patstr++;
+  
+!   pattern = getpattern (patstr, quoted, 1);
+  
+    temp1 = (char *)NULL;		/* shut up gcc */
+--- 4008,4016 ----
+      patstr++;
+  
+!   /* Need to pass getpattern newly-allocated memory in case of expansion --
+!      the expansion code will free the passed string on an error. */
+!   temp1 = savestring (patstr);
+!   pattern = getpattern (temp1, quoted, 1);
+!   free (temp1);
+  
+    temp1 = (char *)NULL;		/* shut up gcc */
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 22
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 23
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-024

@@ -0,0 +1,77 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-024
+
+Bug-Reported-by:	Peter Volkov <torre_cremata@mail.ru>
+Bug-Reference-ID:	<1178376645.9063.25.camel@localhost>
+Bug-Reference-URL:	http://bugs.gentoo.org/177095
+
+Bug-Description:
+
+The readline display code miscalculated the screen position when performing
+a redisplay in which the new text occupies more screen space that the old,
+but takes fewer bytes to do so (e.g., when replacing a shorter string
+containing multibyte characters with a longer one containing only ASCII).
+
+Patch:
+
+*** ../bash-3.2-patched/lib/readline/display.c	Thu Apr 26 11:38:22 2007
+--- bash-3.2/lib/readline/display.c	Thu Jul 12 23:10:10 2007
+***************
+*** 1519,1527 ****
+        /* Non-zero if we're increasing the number of lines. */
+        int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
+        /* Sometimes it is cheaper to print the characters rather than
+  	 use the terminal's capabilities.  If we're growing the number
+  	 of lines, make sure we actually cause the new line to wrap
+  	 around on auto-wrapping terminals. */
+!       if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
+  	{
+  	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
+--- 1568,1596 ----
+        /* Non-zero if we're increasing the number of lines. */
+        int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
++       /* If col_lendiff is > 0, implying that the new string takes up more
++ 	 screen real estate than the old, but lendiff is < 0, meaning that it
++ 	 takes fewer bytes, we need to just output the characters starting
++ 	 from the first difference.  These will overwrite what is on the
++ 	 display, so there's no reason to do a smart update.  This can really
++ 	 only happen in a multibyte environment. */
++       if (lendiff < 0)
++ 	{
++ 	  _rl_output_some_chars (nfd, temp);
++ 	  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
++ 	  /* If nfd begins before any invisible characters in the prompt,
++ 	     adjust _rl_last_c_pos to account for wrap_offset and set
++ 	     cpos_adjusted to let the caller know. */
++ 	  if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
++ 	    {
++ 	      _rl_last_c_pos -= wrap_offset;
++ 	      cpos_adjusted = 1;
++ 	    }
++ 	  return;
++ 	}
+        /* Sometimes it is cheaper to print the characters rather than
+  	 use the terminal's capabilities.  If we're growing the number
+  	 of lines, make sure we actually cause the new line to wrap
+  	 around on auto-wrapping terminals. */
+!       else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
+  	{
+  	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
+*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 23
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 24
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-025

@@ -0,0 +1,79 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-025
+
+Bug-Reported-by:	Tom Bjorkholm <tom.bjorkholm@ericsson.com>
+Bug-Reference-ID:	<AEA1A32F001C6B4F98614B5B80D7647D01C075E9@esealmw115.eemea.ericsson.se>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-readline/2007-04/msg00004.html
+
+Bug-Description:
+
+An off-by-one error in readline's input buffering caused readline to drop
+each 511th character of buffered input (e.g., when pasting a large amount
+of data into a terminal window).
+
+Patch:
+
+*** bash-3.2-patched/lib/readline/input.c	Wed Aug 16 15:15:16 2006
+--- bash-3.2/lib/readline/input.c	Tue Jul 17 09:24:21 2007
+***************
+*** 134,139 ****
+  
+    *key = ibuffer[pop_index++];
+! 
+    if (pop_index >= ibuffer_len)
+      pop_index = 0;
+  
+--- 134,142 ----
+  
+    *key = ibuffer[pop_index++];
+! #if 0
+    if (pop_index >= ibuffer_len)
++ #else
++   if (pop_index > ibuffer_len)
++ #endif
+      pop_index = 0;
+  
+***************
+*** 251,255 ****
+  	{
+  	  k = (*rl_getc_function) (rl_instream);
+! 	  rl_stuff_char (k);
+  	  if (k == NEWLINE || k == RETURN)
+  	    break;
+--- 254,259 ----
+  	{
+  	  k = (*rl_getc_function) (rl_instream);
+! 	  if (rl_stuff_char (k) == 0)
+! 	    break;			/* some problem; no more room */
+  	  if (k == NEWLINE || k == RETURN)
+  	    break;
+***************
+*** 374,378 ****
+--- 378,386 ----
+      }
+    ibuffer[push_index++] = key;
++ #if 0
+    if (push_index >= ibuffer_len)
++ #else
++   if (push_index > ibuffer_len)
++ #endif
+      push_index = 0;
+  
+*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 24
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 25
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-026

@@ -0,0 +1,82 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-026
+
+Bug-Reported-by:	Chet Ramey <chet.ramey@case.edu>
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+This keeps the Apple linker from attempting to link bash against Apple's
+readline library "replacement" rather than the one shipped with bash.  It
+extends the configure workaround to Mac OS X Leopard (10.5).
+
+As a side effect, the patch updates the copyright date displayed in the
+version string.
+
+You must re-run configure after applying the patch, and before rebuilding
+bash.
+
+Patch:
+
+*** bash-3.2-patched/configure.in	2007-03-06 11:07:38.000000000 -0500
+--- bash-3.2/configure.in	2007-11-23 15:37:41.000000000 -0500
+***************
+*** 519,523 ****
+  		# dynamic version
+  		case "${host_os}" in
+! 		darwin8*)	READLINE_LIB='${READLINE_LIBRARY}' ;;
+  		*)		READLINE_LIB=-lreadline ;;
+  		esac
+--- 519,523 ----
+  		# dynamic version
+  		case "${host_os}" in
+! 		darwin[[89]]*)	READLINE_LIB='${READLINE_LIBRARY}' ;;
+  		*)		READLINE_LIB=-lreadline ;;
+  		esac
+*** bash-3.2-patched/configure	2007-03-24 14:51:22.000000000 -0400
+--- bash-3.2/configure	2007-11-23 15:46:15.000000000 -0500
+***************
+*** 4872,4876 ****
+  		# dynamic version
+  		case "${host_os}" in
+! 		darwin8*)	READLINE_LIB='${READLINE_LIBRARY}' ;;
+  		*)		READLINE_LIB=-lreadline ;;
+  		esac
+--- 4872,4876 ----
+  		# dynamic version
+  		case "${host_os}" in
+! 		darwin[89]*)	READLINE_LIB='${READLINE_LIBRARY}' ;;
+  		*)		READLINE_LIB=-lreadline ;;
+  		esac
+*** bash-3.2-patched/version.c	2005-05-16 11:58:34.000000000 -0400
+--- bash-3.2/version.c	2007-11-23 16:03:40.000000000 -0500
+***************
+*** 80,83 ****
+    printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE);
+    if (extended)
+!     printf (_("Copyright (C) 2005 Free Software Foundation, Inc.\n"));
+  }
+--- 80,83 ----
+    printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE);
+    if (extended)
+!     printf (_("Copyright (C) 2007 Free Software Foundation, Inc.\n"));
+  }
+*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 25
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 26
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-027

@@ -0,0 +1,85 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-027
+
+Bug-Reported-by:	dAniel hAhler <ubuntu@thequod.de>
+Bug-Reference-ID:	<4702ED8A.5000503@thequod.de>
+Bug-Reference-URL:	https://bugs.launchpad.net/ubuntu/+source/bash/+bug/119938
+
+Bug-Description:
+
+When updating the display after displaying, for instance, a list of possible
+completions, readline will place the cursor at the wrong position if the
+prompt contains invisible characters and a newline.
+
+Patch:
+
+*** bash-3.2.25/lib/readline/display.c	Mon Aug  6 14:26:29 2007
+--- bash-3.2/lib/readline/display.c	Wed Oct 10 22:43:58 2007
+***************
+*** 1049,1053 ****
+  	      else
+  		tx = nleft;
+! 	      if (_rl_last_c_pos > tx)
+  		{
+  	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
+--- 1049,1053 ----
+  	      else
+  		tx = nleft;
+! 	      if (tx >= 0 && _rl_last_c_pos > tx)
+  		{
+  	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
+***************
+*** 1205,1209 ****
+  {
+    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
+!   int temp, lendiff, wsatend, od, nd;
+    int current_invis_chars;
+    int col_lendiff, col_temp;
+--- 1205,1209 ----
+  {
+    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
+!   int temp, lendiff, wsatend, od, nd, o_cpos;
+    int current_invis_chars;
+    int col_lendiff, col_temp;
+***************
+*** 1466,1469 ****
+--- 1466,1471 ----
+      }
+  
++   o_cpos = _rl_last_c_pos;
++ 
+    /* When this function returns, _rl_last_c_pos is correct, and an absolute
+       cursor postion in multibyte mode, but a buffer index when not in a
+***************
+*** 1475,1479 ****
+       invisible characters in the prompt string.  Let's see if setting this when
+       we make sure we're at the end of the drawn prompt string works. */
+!   if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars)
+      cpos_adjusted = 1;
+  #endif
+--- 1477,1483 ----
+       invisible characters in the prompt string.  Let's see if setting this when
+       we make sure we're at the end of the drawn prompt string works. */
+!   if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
+!       (_rl_last_c_pos > 0 || o_cpos > 0) &&
+!       _rl_last_c_pos == prompt_physical_chars)
+      cpos_adjusted = 1;
+  #endif
+*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 26
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 27
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-028

@@ -0,0 +1,60 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-028
+
+Bug-Reported-by:	dAniel hAhler <ubuntu@thequod.de>
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+Under some circumstances, readline will incorrectly display a prompt string
+containing invisible characters after the final newline.
+
+Patch:
+
+*** bash-3.2-patched/lib/readline/display.c	2007-08-25 13:47:08.000000000 -0400
+--- bash-3.2/lib/readline/display.c	2007-11-10 17:51:29.000000000 -0500
+***************
+*** 392,396 ****
+        local_prompt = expand_prompt (p, &prompt_visible_length,
+  				       &prompt_last_invisible,
+! 				       (int *)NULL,
+  				       &prompt_physical_chars);
+        c = *t; *t = '\0';
+--- 420,424 ----
+        local_prompt = expand_prompt (p, &prompt_visible_length,
+  				       &prompt_last_invisible,
+! 				       &prompt_invis_chars_first_line,
+  				       &prompt_physical_chars);
+        c = *t; *t = '\0';
+***************
+*** 399,403 ****
+        local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
+  						   (int *)NULL,
+! 						   &prompt_invis_chars_first_line,
+  						   (int *)NULL);
+        *t = c;
+--- 427,431 ----
+        local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
+  						   (int *)NULL,
+! 						   (int *)NULL,
+  						   (int *)NULL);
+        *t = c;
+*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 27
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 28
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-029

@@ -0,0 +1,52 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-029
+
+Bug-Reported-by:	Tomas Janousek <tjanouse@redhat.com>
+Bug-Reference-ID:	<20071102104034.GA26893@redhat.com>
+Bug-Reference-URL:	https://bugzilla.redhat.com/show_bug.cgi?id=286861
+
+Bug-Description:
+
+When the bash arithmetic expression evaluator has temporarily turned off
+evalation, such as when parsing a pre- or post-decrement or -increment
+operator, and an error occurs, evaluation is not re-enabled.
+
+Patch:
+
+*** bash-3.2-patched/expr.c	2007-08-25 13:47:05.000000000 -0400
+--- bash-3.2/expr.c	2007-10-18 08:08:44.000000000 -0400
+***************
+*** 287,290 ****
+--- 287,292 ----
+      }
+    free (expr_stack[expr_depth]);	/* free the allocated EXPR_CONTEXT */
++ 
++   noeval = 0;	/* XXX */
+  }
+  
+***************
+*** 320,323 ****
+--- 322,326 ----
+  
+    val = 0;
++   noeval = 0;
+  
+    FASTCOPY (evalbuf, oevalbuf, sizeof (evalbuf));
+*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 28
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 29
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-030

@@ -0,0 +1,50 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-030
+
+Bug-Reported-by:	Paul Eggert <eggert@cs.ucla.edu> Andreas Schwab <schwab@suse.de>
+Bug-Reference-ID:	<877il0nu84.fsf_-_@penguin.cs.ucla.edu> <m28x5gparz.fsf@igel.home>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-11/msg00023.html http://lists.gnu.org/archive/html/bug-bash/2007-11/msg00022.htmlhttp://lists.gnu.org/archive/html/bug-bash/2007-11/msg00022.html
+
+Bug-Description:
+
+If redirections attached to a compound command fail, bash does not set the
+command's exit status correctly.  This only happens when the command is the
+first in a sequential list.
+
+Patch:
+
+*** bash-3.2-patched/execute_cmd.c	2007-03-24 14:51:05.000000000 -0400
+--- bash-3.2/execute_cmd.c	2007-11-05 22:31:14.000000000 -0500
+***************
+*** 615,619 ****
+        redirection_undo_list = (REDIRECT *)NULL;
+        dispose_exec_redirects ();
+!       return (EXECUTION_FAILURE);
+      }
+  
+--- 620,624 ----
+        redirection_undo_list = (REDIRECT *)NULL;
+        dispose_exec_redirects ();
+!       return (last_command_exit_value = EXECUTION_FAILURE);
+      }
+
+*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 29
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 30
+  
+  #endif /* _PATCHLEVEL_H_ */
+
+  

package/bash/bash32-031

@@ -0,0 +1,62 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-031
+
+Bug-Reported-by:	Miroslav Lichvar <mlichvar@redhat.com>
+Bug-Reference-ID:	Fri, 02 Nov 2007 14:07:45 +0100
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-readline/2007-11/msg00000.html
+
+Bug-Description:
+
+In certain cases when outputting characters at the end of the line,
+e.g., when displaying the prompt string, readline positions the cursor
+incorrectly if the prompt string contains invisible characters and the
+text being drawn begins before the last invisible character in the line.
+
+Patch:
+
+*** bash-3.2-patched/lib/readline/display.c	2007-08-25 13:47:08.000000000 -0400
+--- bash-3.2/lib/readline/display.c	2007-11-10 17:51:29.000000000 -0500
+***************
+*** 1566,1574 ****
+  	  else
+  	    {
+- 	      /* We have horizontal scrolling and we are not inserting at
+- 		 the end.  We have invisible characters in this line.  This
+- 		 is a dumb update. */
+  	      _rl_output_some_chars (nfd, temp);
+  	      _rl_last_c_pos += col_temp;
+  	      return;
+  	    }
+--- 1619,1632 ----
+  	  else
+  	    {
+  	      _rl_output_some_chars (nfd, temp);
+  	      _rl_last_c_pos += col_temp;
++ 	      /* If nfd begins before any invisible characters in the prompt,
++ 		 adjust _rl_last_c_pos to account for wrap_offset and set
++ 		 cpos_adjusted to let the caller know. */
++ 	      if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
++ 		{
++ 		  _rl_last_c_pos -= wrap_offset;
++ 		  cpos_adjusted = 1;
++ 		}
+  	      return;
+  	    }
+*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 30
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 31
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-032

@@ -0,0 +1,47 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-032
+
+Bug-Reported-by:	Uwe Doering <gemini@geminix.org>
+Bug-Reference-ID:	<46F3DD72.2090801@geminix.org>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-09/msg00102.html
+
+Bug-Description:
+
+There is an off-by-one error in the code that buffers characters received
+very quickly in succession, causing characters to be dropped.
+
+Patch:
+
+*** bash-3.2-patched/lib/readline/input.c	2007-08-25 13:47:10.000000000 -0400
+--- bash-3.2/lib/readline/input.c	2007-10-12 22:55:25.000000000 -0400
+***************
+*** 155,159 ****
+        pop_index--;
+        if (pop_index < 0)
+! 	pop_index = ibuffer_len - 1;
+        ibuffer[pop_index] = key;
+        return (1);
+--- 155,159 ----
+        pop_index--;
+        if (pop_index < 0)
+! 	pop_index = ibuffer_len;
+        ibuffer[pop_index] = key;
+        return (1);
+*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 31
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 32
+  
+  #endif /* _PATCHLEVEL_H_ */

package/bash/bash32-033

@@ -0,0 +1,88 @@
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-033
+
+Bug-Reported-by:	Christophe Martin <schplurtz@free.fr>
+Bug-Reference-ID:	<465ABA4A.3030805@free.fr>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2007-05/msg00104.html
+
+Bug-Description:
+
+References made within a function to an uninitialized local array variable
+using the [*] subscript in a double-quoted string  can result in spurious
+ASCII 127 characters in the expanded value.
+
+Patch:
+
+*** bash-3.2-patched/arrayfunc.c	2007-08-25 13:47:05.000000000 -0400
+--- bash-3.2/arrayfunc.c	2007-05-31 11:55:46.000000000 -0400
+***************
+*** 723,727 ****
+      {
+        if (rtype)
+! 	*rtype = 1;
+        if (allow_all == 0)
+  	{
+--- 723,727 ----
+      {
+        if (rtype)
+! 	*rtype = (t[0] == '*') ? 1 : 2;
+        if (allow_all == 0)
+  	{
+*** bash-3.2-patched/subst.c	2007-08-25 13:47:08.000000000 -0400
+--- bash-3.2/subst.c	2007-11-14 15:43:00.000000000 -0500
+***************
+*** 4908,4915 ****
+    intmax_t arg_index;
+    SHELL_VAR *var;
+!   int atype;
+  
+    ret = 0;
+    temp = 0;
+  
+    /* Handle multiple digit arguments, as in ${11}. */  
+--- 4973,4981 ----
+    intmax_t arg_index;
+    SHELL_VAR *var;
+!   int atype, rflags;
+  
+    ret = 0;
+    temp = 0;
++   rflags = 0;
+  
+    /* Handle multiple digit arguments, as in ${11}. */  
+***************
+*** 4944,4947 ****
+--- 5010,5015 ----
+   		  ? quote_string (temp)
+   		  : quote_escapes (temp);
++       else if (atype == 1 && temp && QUOTED_NULL (temp) && (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)))
++ 	rflags |= W_HASQUOTEDNULL;
+      }
+  #endif
+***************
+*** 4971,4974 ****
+--- 5039,5043 ----
+        ret = alloc_word_desc ();
+        ret->word = temp;
++       ret->flags |= rflags;
+      }
+    return ret;
+*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
+--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 32
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 33
+  
+  #endif /* _PATCHLEVEL_H_ */
+

package/bash/bash32-remove-bzero-dependancy.patch

@@ -0,0 +1,64 @@
+diff -upr bash-3.2.orig/config.h.in bash-3.2/config.h.in
+--- bash-3.2.orig/config.h.in	2006-09-12 22:00:54.000000000 +0200
++++ bash-3.2/config.h.in	2007-08-08 14:15:12.000000000 +0200
+@@ -504,9 +504,6 @@
+ /* Define if you have the bcopy function.  */
+ #undef HAVE_BCOPY
+ 
+-/* Define if you have the bzero function.  */
+-#undef HAVE_BZERO
+-
+ /* Define if you have the confstr function.  */
+ #undef HAVE_CONFSTR
+ 
+diff -upr bash-3.2.orig/configure.in bash-3.2/configure.in
+--- bash-3.2.orig/configure.in	2006-09-26 17:05:45.000000000 +0200
++++ bash-3.2/configure.in	2007-08-08 14:14:36.000000000 +0200
+@@ -702,7 +702,7 @@ AC_CHECK_FUNCS(dup2 eaccess fcntl getdta
+ AC_REPLACE_FUNCS(rename)
+ 
+ dnl checks for c library functions
+-AC_CHECK_FUNCS(bcopy bzero confstr fnmatch \
++AC_CHECK_FUNCS(bcopy confstr fnmatch \
+ 		getaddrinfo gethostbyname getservbyname getservent inet_aton \
+ 		memmove pathconf putenv raise regcomp regexec \
+ 		setenv setlinebuf setlocale setvbuf siginterrupt strchr \
+diff -upr bash-3.2.orig/CWRU/misc/sigstat.c bash-3.2/CWRU/misc/sigstat.c
+--- bash-3.2.orig/CWRU/misc/sigstat.c	2002-04-17 19:41:40.000000000 +0200
++++ bash-3.2/CWRU/misc/sigstat.c	2007-08-08 14:11:36.000000000 +0200
+@@ -86,7 +86,7 @@ int	sig;
+ init_signames()
+ {
+ 	register int i;
+-	bzero(signames, sizeof(signames));
++	memset(signames, 0, sizeof(signames));
+ 
+ #if defined (SIGHUP)		/* hangup */
+   	signames[SIGHUP] = "SIGHUP";
+diff -upr bash-3.2.orig/lib/sh/oslib.c bash-3.2/lib/sh/oslib.c
+--- bash-3.2.orig/lib/sh/oslib.c	2001-12-06 19:26:21.000000000 +0100
++++ bash-3.2/lib/sh/oslib.c	2007-08-08 14:11:44.000000000 +0200
+@@ -170,23 +170,6 @@ bcopy (s,d,n)
+ }
+ #endif /* !HAVE_BCOPY */
+ 
+-#if !defined (HAVE_BZERO)
+-#  if defined (bzero)
+-#    undef bzero
+-#  endif
+-void
+-bzero (s, n)
+-     char *s;
+-     int n;
+-{
+-  register int i;
+-  register char *r;
+-
+-  for (i = 0, r = s; i < n; i++)
+-    *r++ = '\0';
+-}
+-#endif
+-
+ #if !defined (HAVE_GETHOSTNAME)
+ #  if defined (HAVE_UNAME)
+ #    include <sys/utsname.h>

package/beecrypt/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_BEECRYPT
+	bool "beecrypt"
+	help
+	  Beecrypt is a general-purpose cryptography library.
+
+	  http://beecrypt.sf.net

package/beecrypt/beecrypt-4.1.2_no-cxx-glue.patch

@@ -0,0 +1,12 @@
+diff -ru beecrypt-4.1.2_vanilla/Makefile.am beecrypt-4.1.2_disable-cxxglue/Makefile.am
+--- beecrypt-4.1.2_vanilla/Makefile.am	2004-12-22 07:06:31.000000000 +0000
++++ beecrypt-4.1.2_disable-cxxglue/Makefile.am	2008-03-21 23:24:51.000000000 +0000
+@@ -49,7 +49,7 @@
+ 
+ libalt_LTLIBRARIES = libbeecrypt.la
+ 
+-libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c cppglue.cxx
++libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c
+ libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS)
+ libbeecrypt_la_LIBADD = aesopt.lo blowfishopt.lo mpopt.lo sha1opt.lo
+ libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE)

package/beecrypt/beecrypt.mk

@@ -0,0 +1,18 @@
+#############################################################
+#
+# beecrypt
+#
+#############################################################
+BEECRYPT_VERSION = 4.1.2
+BEECRYPT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/beecrypt
+BEECRYPT_AUTORECONF = YES
+BEECRYPT_INSTALL_STAGING = YES
+
+BEECRYPT_CONF_OPT =  --without-cplusplus \
+		--without-java \
+		--without-python  \
+		--disable-rpath
+
+BEECRYPT_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package,beecrypt))

package/berkeleydb/Config.in

@@ -1,8 +1,7 @@
 config BR2_PACKAGE_BERKELEYDB
 	bool "berkeleydb"
-	default n
 	help
-	  The Berkeley database.  A very common library for database 
+	  The Berkeley database.  A very common library for database
 	  applications.
 
 	  http://www.sleepycat.com/products/db.shtml

package/berkeleydb/berkeleydb.mk

@@ -3,27 +3,26 @@
 # berkeley db
 #
 #############################################################
-DB_VER:=4.3.29
-DB_SO_VER:=4.3
+DB_VERSION:=4.3.29
+DB_SO_VERSION:=4.3
 DB_SITE:=ftp://ftp.sleepycat.com/releases
-DB_SOURCE:=db-$(DB_VER).NC.tar.gz
-DB_DIR:=$(BUILD_DIR)/db-$(DB_VER).NC
-DB_SHARLIB:=libdb-$(DB_SO_VER).so
+DB_SOURCE:=db-$(DB_VERSION).NC.tar.gz
+DB_DIR:=$(BUILD_DIR)/db-$(DB_VERSION).NC
+DB_SHARLIB:=libdb-$(DB_SO_VERSION).so
 
 $(DL_DIR)/$(DB_SOURCE):
-	$(WGET) -P $(DL_DIR) $(DB_SITE)/$(DB_SOURCE)
+	$(call DOWNLOAD,$(DB_SITE),$(DB_SOURCE))
 
 berkeleydb-source: $(DL_DIR)/$(DB_SOURCE)
 
 $(DB_DIR)/.dist: $(DL_DIR)/$(DB_SOURCE)
 	$(ZCAT) $(DL_DIR)/$(DB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(DB_DIR)/.dist
+	touch $@
 
 $(DB_DIR)/.configured: $(DB_DIR)/.dist
 	(cd $(DB_DIR)/build_unix; rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
+		$(TARGET_CONFIGURE_ARGS) \
 		../dist/configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -37,9 +36,9 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
+		--includedir=/usr/include \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
 		--with-gnu-ld \
 		--enable-shared \
 		--disable-cxx \
@@ -48,10 +47,10 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
 		--disable-tcl \
 		--disable-compat185 \
 		--with-pic \
-                $(DISABLE_LARGEFILE) \
-	);
+		$(DISABLE_LARGEFILE) \
+	)
 	$(SED) 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile
-	touch $(DB_DIR)/.configured
+	touch $@
 
 $(DB_DIR)/build_unix/.libs/$(DB_SHARLIB): $(DB_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) -C $(DB_DIR)/build_unix
@@ -60,26 +59,32 @@ $(STAGING_DIR)/lib/$(DB_SHARLIB): $(DB_DIR)/build_unix/.libs/$(DB_SHARLIB)
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DB_DIR)/build_unix install
 	chmod a-x $(STAGING_DIR)/lib/libdb*so*
 	rm -f $(STAGING_DIR)/bin/db_*
-	rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/info \
-		$(STAGING_DIR)/man $(STAGING_DIR)/share/doc
+ifneq ($(BR2_HAVE_INFOPAGES),y)
+	rm -rf $(STAGING_DIR)/usr/share/info
+endif
+ifneq ($(BR2_HAVE_MANPAGES),y)
+	rm -rf $(STAGING_DIR)/usr/share/man
+endif
+	rm -rf $(STAGING_DIR)/share/locale
+	rm -rf $(STAGING_DIR)/usr/share/doc
 
 $(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB)
 	rm -rf $(TARGET_DIR)/lib/libdb*
-	cp -a $(STAGING_DIR)/lib/libdb*so*  $(TARGET_DIR)/lib/
-	rm -f $(TARGET_DIR)/lib/libdb.so $(TARGET_DIR)/lib/libdb.la $(TARGET_DIR)/lib/libdb.a
+	cp -a $(STAGING_DIR)/lib/libdb*so* $(TARGET_DIR)/lib/
+	rm -f $(addprefix $(TARGET_DIR)/lib/,libdb.so libdb.la libdb.a)
 	(cd $(TARGET_DIR)/usr/lib; ln -fs /lib/$(DB_SHARLIB) libdb.so)
-	-$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libdb*so*
+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libdb*so*
 
-$(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-$(DB_SO_VER).a
-	cp -dpf $(STAGING_DIR)/include/db.h $(TARGET_DIR)/usr/include/
+$(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-$(DB_SO_VERSION).a
+	cp -dpf $(STAGING_DIR)/usr/include/db.h $(TARGET_DIR)/usr/include/
 	cp -dpf $(STAGING_DIR)/lib/libdb*.a $(TARGET_DIR)/usr/lib/
 	cp -dpf $(STAGING_DIR)/lib/libdb*.la $(TARGET_DIR)/usr/lib/
-	touch -c $(TARGET_DIR)/usr/lib/libdb.a
+	touch -c $@
 
 berkeleydb-headers: $(TARGET_DIR)/usr/lib/libdb.a
 
 berkeleydb-clean:
-	$(MAKE) -C $(DB_DIR)/build_unix clean
+	-$(MAKE) -C $(DB_DIR)/build_unix clean
 
 berkeleydb-dirclean:
 	rm -rf $(DB_DIR)
@@ -91,6 +96,6 @@ berkeleydb: uclibc $(TARGET_DIR)/lib/$(DB_SHARLIB)
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(strip $(BR2_PACKAGE_BERKELEYDB)),y)
+ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
 TARGETS+=berkeleydb
 endif

package/bind/Config.in

@@ -1,6 +1,9 @@
+comment "bind has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_BIND
+
 config BR2_PACKAGE_BIND
 	bool "bind"
-	default n
+	depends on BR2_LARGEFILE
 	help
 	  BIND (Berkeley Internet Name Domain) is an implementation of
 	  the Domain Name System (DNS) protocols and provides an openly
@@ -9,7 +12,7 @@ config BR2_PACKAGE_BIND
 
 	    * a Domain Name System server (named)
 	    * a Domain Name System resolver library
-	    * tools for verifying the proper operation of the DNS server 
+	    * tools for verifying the proper operation of the DNS server
 
 	  The BIND DNS Server is used on the vast majority of name
 	  serving machines on the Internet, providing a robust and
@@ -17,6 +20,15 @@ config BR2_PACKAGE_BIND
 	  architecture can be built. The resolver library included in
 	  the BIND distribution provides the standard APIs for
 	  translation between domain names and Internet addresses and is
-	  intended to be linked with applications requiring name service. 
+	  intended to be linked with applications requiring name service.
 
 	  http://www.isc.org/sw/bind/
+
+config BR2_PACKAGE_BIND_TOOLS
+	bool "Install tools"
+	depends on BR2_PACKAGE_BIND
+	help
+	  Install tools (host, nslookup, dig, nsupdate)
+
+comment "bind requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE

package/bind/bind-cross-fix.patch

@@ -1,11 +0,0 @@
---- bind-9.3.2/lib/dns/Makefile.in
-+++ bind-9.3.2/lib/dns/Makefile.in
-@@ -156,7 +156,7 @@
- 	./gen -s ${srcdir} > code.h
- 
- gen: gen.c
--	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
-+	cc ${ALL_CFLAGS} -o $@ ${srcdir}/gen.c
- 
- rbtdb64.@O@: rbtdb.c
- 

package/bind/bind-cross.patch

@@ -0,0 +1,14 @@
+diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Makefile.in
+--- bind-9.5.1-P1/lib/dns/Makefile.in	2007-09-11 22:09:08.000000000 -0300
++++ bind-9.5.1-P1.gencross/lib/dns/Makefile.in	2009-03-04 16:35:23.000000000 -0200
+@@ -160,8 +160,8 @@
+ 	./gen -s ${srcdir} > code.h
+ 
+ gen: gen.c
+-	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
+-	${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
++	${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \
++	${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c
+ 
+ rbtdb64.@O@: rbtdb.c
+ 

package/bind/bind-susv3-legacy.patch

@@ -0,0 +1,23 @@
+diff -Nura bind-9.5.1-P1/lib/isc/unix/ifiter_ioctl.c bind-9.5.1-P1.nosusv3/lib/isc/unix/ifiter_ioctl.c
+--- bind-9.5.1-P1/lib/isc/unix/ifiter_ioctl.c	2007-08-30 03:02:28.000000000 -0300
++++ bind-9.5.1-P1.nosusv3/lib/isc/unix/ifiter_ioctl.c	2009-03-04 16:31:20.000000000 -0200
+@@ -17,6 +17,8 @@
+ 
+ /* $Id: ifiter_ioctl.c,v 1.58 2007/08/30 06:02:28 marka Exp $ */
+ 
++#include <string.h>
++
+ /*! \file
+  * \brief
+  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
+@@ -479,8 +481,8 @@
+ 	for (i = 0; i < 16; i++) {
+ 		unsigned char byte;
+ 		static const char hex[] = "0123456789abcdef";
+-		byte = ((index(hex, address[i * 2]) - hex) << 4) |
+-		       (index(hex, address[i * 2 + 1]) - hex);
++		byte = ((strchr(hex, address[i * 2]) - hex) << 4) |
++			(strchr(hex, address[i * 2 + 1]) - hex);
+ 		addr6.s6_addr[i] = byte;
+ 	}
+ 	iter->current.af = AF_INET6;

package/bind/bind.mk

@@ -3,100 +3,46 @@
 # bind
 #
 #############################################################
-BIND_VER:=9.3.2
-BIND_SOURCE:=bind-$(BIND_VER).tar.gz
-BIND_SITE:=ftp://ftp.isc.org/isc/bind9/$(BIND_VER)
-BIND_DIR1:=$(TOOL_BUILD_DIR)/bind-$(BIND_VER)
-BIND_DIR2:=$(BUILD_DIR)/bind-$(BIND_VER)
-BIND_CAT:=$(ZCAT)
-BIND_BINARY:=bin/named/named
-BIND_TARGET_BINARY:=usr/sbin/named
-
-$(DL_DIR)/$(BIND_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(BIND_SITE)/$(BIND_SOURCE)
-
-bind-source: $(DL_DIR)/$(BIND_SOURCE)
-
-#############################################################
-#
-# build bind for use on the target system
-#
-#############################################################
-$(BIND_DIR2)/.unpacked: $(DL_DIR)/$(BIND_SOURCE)
-	$(BIND_CAT) $(DL_DIR)/$(BIND_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(BIND_DIR2) package/bind/ bind\*.patch
-	touch  $(BIND_DIR2)/.unpacked
-
-$(BIND_DIR2)/Makefile: $(BIND_DIR2)/.unpacked
-	(cd $(BIND_DIR2); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--libdir=/lib \
-		--includedir=/include \
+BIND_VERSION = 9.5.1-P2
+BIND_SOURCE = bind-$(BIND_VERSION).tar.gz
+BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
+BIND_LIBTOOL_PATCH = NO
+BIND_DEPENDENCIES = uclibc
+BIND_INSTALL_STAGING = NO
+BIND_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone
+BIND_TARGET_SBINS += named-compilezone rndc rndc-confgen
+BIND_TARGET_SBINS += dnssec-keygen dnssec-signzone
+BIND_TARGET_BINS = dig host nslookup nsupdate
+BIND_TARGET_LIBS = libbind9.* libdns.* libisccc.* libisccfg.* libisc.* liblwres.*
+BIND_CONF_ENV =	BUILD_CC="$(TARGET_CC)" \
+		BUILD_CFLAGS="$(TARGET_CFLAGS)"
+BIND_CONF_OPT =	$(DISABLE_IPV6) \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--without-openssl \
-		--with-randomdev=/dev/random \
-		--enable-ipv6 \
-		--with-libtool \
+		--with-randomdev=/dev/urandom \
+		--with-openssl=no \
+		--with-libxml2=no \
 		--with-pic \
-	);
+		--with-libtool \
+		--disable-epoll \
+		--disable-threads
 
-$(BIND_DIR2)/$(BIND_BINARY): $(BIND_DIR2)/Makefile
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -j1 -C $(BIND_DIR2)
-	touch -c $(BIND_DIR2)/$(BIND_BINARY)
+$(eval $(call AUTOTARGETS,package,bind))
 
-#############################################################
-#
-# install bind binaries
-#
-#############################################################
-$(TARGET_DIR)/$(BIND_TARGET_BINARY): $(BIND_DIR2)/$(BIND_BINARY)
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -j1 MAKEDEFS="INSTALL_DATA=true" \
-		DESTDIR=$(TARGET_DIR) -C $(BIND_DIR2)/bin install
-	cd $(TARGET_DIR)/usr/man; rmdir --ignore-fail-on-non-empty man8 man5 `pwd`
-	$(INSTALL) -m 0755 -D package/bind/bind.sysvinit $(TARGET_DIR)/etc/init.d/S81named
-
-bind-bin: $(TARGET_DIR)/$(BIND_TARGET_BINARY) bind-lib
-
-#############################################################
-#
-# install bind libraries
-#
-#############################################################
-$(STAGING_DIR)/lib/libdns.so: $(BIND_DIR2)/$(BIND_BINARY)
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -j1 DESTDIR=$(STAGING_DIR) -C $(BIND_DIR2)/lib install
-
-$(TARGET_DIR)/lib/libdns.so: $(STAGING_DIR)/lib/libdns.so
-	mkdir -p $(TARGET_DIR)/lib
-	cd $(STAGING_DIR)/lib; \
-	    cp -a libdns*so* libisc*so* libbind9*so* \
-	    liblwres*so* $(TARGET_DIR)/lib
-
-bind-lib: $(STAGING_DIR)/lib/libdns.so $(TARGET_DIR)/lib/libdns.so
-
-bind: uclibc bind-bin bind-lib
-
-bind-clean:
-	-$(MAKE) -C $(BIND_DIR2) clean
-
-bind-dirclean:
-	rm -rf $(BIND_DIR2)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_BIND)),y)
-TARGETS+=bind
+$(BIND_HOOK_POST_INSTALL):
+	rm -f $(TARGET_DIR)/usr/bin/isc-config.sh
+ifneq ($(BR2_PACKAGE_BIND_TOOLS),y)
+	rm -rf $(addprefix $(TARGET_DIR)/usr/bin/, $(BIND_TARGET_BINS))
 endif
+	$(INSTALL) -m 0755 -D package/bind/bind.sysvinit $(TARGET_DIR)/etc/init.d/S81named
+	touch $@
+
+$(BIND_TARGET_UNINSTALL):
+	$(call MESSAGE,"Uninstalling")
+	rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/, $(BIND_TARGET_SBINS))
+	rm -rf $(addprefix $(TARGET_DIR)/usr/bin/, $(BIND_TARGET_BINS))
+	rm -rf $(addprefix $(TARGET_DIR)/usr/lib/, $(BIND_TARGET_LIBS))
+	rm -f $(TARGET_DIR)/etc/init.d/S81named
+	rm -f $(BIND_TARGET_INSTALL_TARGET) $(BIND_HOOK_POST_INSTALL)
 

package/bison/Config.in

@@ -1,9 +1,8 @@
 config BR2_PACKAGE_BISON
 	bool "bison"
-	default n
 	help
-	  General-purpose parser generator that converts a 
-	  grammar description for an LALR context-free grammar into a C 
+	  General-purpose parser generator that converts a
+	  grammar description for an LALR context-free grammar into a C
 	  program to parse that grammar.
 
 	  http://www.gnu.org/software/bison/