Merge remote branch 'origin/next' into arm-port

Conflicts:
	config/rootfiles/common/i586/gcc
	lfs/binutils
	lfs/cleanup-toolchain
	lfs/coreutils
	lfs/gcc
	lfs/glibc
	lfs/groff
	src/pakfire/pakfire.conf
	src/patches/gcc-4.1.2-specs-1.patch

diff --combined config/rootfiles/common/i586/gcc
index f8f2b801811eba6a40691620af0b689982c7d12d,cde9e4f424244dc4fb9b61a493064316b9cd300c..cde9e4f424244dc4fb9b61a493064316b9cd300c
--- 1/config/rootfiles/common/i586/gcc
--- 2/config/rootfiles/common/gcc
+++ b/config/rootfiles/common/i586/gcc
@@@ -6,259 -6,494 +6,494 @@@
  #usr/bin/gcc
  #usr/bin/gccbug
  #usr/bin/gcov
- #usr/bin/BUILDTARGET-c++
- #usr/bin/BUILDTARGET-g++
- #usr/bin/BUILDTARGET-gcc
- #usr/bin/BUILDTARGET-gcc-4.0.4
+ #usr/bin/i586-pc-linux-gnu-c++
+ #usr/bin/i586-pc-linux-gnu-g++
+ #usr/bin/i586-pc-linux-gnu-gcc
+ #usr/bin/i586-pc-linux-gnu-gcc-4.1.2
  #usr/include/c++
- #usr/include/c++/4.0.4
- #usr/include/c++/4.0.4/algorithm
- #usr/include/c++/4.0.4/backward
- #usr/include/c++/4.0.4/backward/algo.h
- #usr/include/c++/4.0.4/backward/algobase.h
- #usr/include/c++/4.0.4/backward/alloc.h
- #usr/include/c++/4.0.4/backward/backward_warning.h
- #usr/include/c++/4.0.4/backward/bvector.h
- #usr/include/c++/4.0.4/backward/complex.h
- #usr/include/c++/4.0.4/backward/defalloc.h
- #usr/include/c++/4.0.4/backward/deque.h
- #usr/include/c++/4.0.4/backward/fstream.h
- #usr/include/c++/4.0.4/backward/function.h
- #usr/include/c++/4.0.4/backward/hash_map.h
- #usr/include/c++/4.0.4/backward/hash_set.h
- #usr/include/c++/4.0.4/backward/hashtable.h
- #usr/include/c++/4.0.4/backward/heap.h
- #usr/include/c++/4.0.4/backward/iomanip.h
- #usr/include/c++/4.0.4/backward/iostream.h
- #usr/include/c++/4.0.4/backward/istream.h
- #usr/include/c++/4.0.4/backward/iterator.h
- #usr/include/c++/4.0.4/backward/list.h
- #usr/include/c++/4.0.4/backward/map.h
- #usr/include/c++/4.0.4/backward/multimap.h
- #usr/include/c++/4.0.4/backward/multiset.h
- #usr/include/c++/4.0.4/backward/new.h
- #usr/include/c++/4.0.4/backward/ostream.h
- #usr/include/c++/4.0.4/backward/pair.h
- #usr/include/c++/4.0.4/backward/queue.h
- #usr/include/c++/4.0.4/backward/rope.h
- #usr/include/c++/4.0.4/backward/set.h
- #usr/include/c++/4.0.4/backward/slist.h
- #usr/include/c++/4.0.4/backward/stack.h
- #usr/include/c++/4.0.4/backward/stream.h
- #usr/include/c++/4.0.4/backward/streambuf.h
- #usr/include/c++/4.0.4/backward/strstream
- #usr/include/c++/4.0.4/backward/tempbuf.h
- #usr/include/c++/4.0.4/backward/tree.h
- #usr/include/c++/4.0.4/backward/vector.h
- #usr/include/c++/4.0.4/bits
- #usr/include/c++/4.0.4/bits/allocator.h
- #usr/include/c++/4.0.4/bits/atomicity.h
- #usr/include/c++/4.0.4/bits/basic_ios.h
- #usr/include/c++/4.0.4/bits/basic_ios.tcc
- #usr/include/c++/4.0.4/bits/basic_string.h
- #usr/include/c++/4.0.4/bits/basic_string.tcc
- #usr/include/c++/4.0.4/bits/boost_concept_check.h
- #usr/include/c++/4.0.4/bits/char_traits.h
- #usr/include/c++/4.0.4/bits/cmath.tcc
- #usr/include/c++/4.0.4/bits/codecvt.h
- #usr/include/c++/4.0.4/bits/concept_check.h
- #usr/include/c++/4.0.4/bits/concurrence.h
- #usr/include/c++/4.0.4/bits/cpp_type_traits.h
- #usr/include/c++/4.0.4/bits/deque.tcc
- #usr/include/c++/4.0.4/bits/fstream.tcc
- #usr/include/c++/4.0.4/bits/functexcept.h
- #usr/include/c++/4.0.4/bits/gslice.h
- #usr/include/c++/4.0.4/bits/gslice_array.h
- #usr/include/c++/4.0.4/bits/indirect_array.h
- #usr/include/c++/4.0.4/bits/ios_base.h
- #usr/include/c++/4.0.4/bits/istream.tcc
- #usr/include/c++/4.0.4/bits/list.tcc
- #usr/include/c++/4.0.4/bits/locale_classes.h
- #usr/include/c++/4.0.4/bits/locale_facets.h
- #usr/include/c++/4.0.4/bits/locale_facets.tcc
- #usr/include/c++/4.0.4/bits/localefwd.h
- #usr/include/c++/4.0.4/bits/mask_array.h
- #usr/include/c++/4.0.4/bits/ostream.tcc
- #usr/include/c++/4.0.4/bits/postypes.h
- #usr/include/c++/4.0.4/bits/slice_array.h
- #usr/include/c++/4.0.4/bits/sstream.tcc
- #usr/include/c++/4.0.4/bits/stl_algo.h
- #usr/include/c++/4.0.4/bits/stl_algobase.h
- #usr/include/c++/4.0.4/bits/stl_bvector.h
- #usr/include/c++/4.0.4/bits/stl_construct.h
- #usr/include/c++/4.0.4/bits/stl_deque.h
- #usr/include/c++/4.0.4/bits/stl_function.h
- #usr/include/c++/4.0.4/bits/stl_heap.h
- #usr/include/c++/4.0.4/bits/stl_iterator.h
- #usr/include/c++/4.0.4/bits/stl_iterator_base_funcs.h
- #usr/include/c++/4.0.4/bits/stl_iterator_base_types.h
- #usr/include/c++/4.0.4/bits/stl_list.h
- #usr/include/c++/4.0.4/bits/stl_map.h
- #usr/include/c++/4.0.4/bits/stl_multimap.h
- #usr/include/c++/4.0.4/bits/stl_multiset.h
- #usr/include/c++/4.0.4/bits/stl_numeric.h
- #usr/include/c++/4.0.4/bits/stl_pair.h
- #usr/include/c++/4.0.4/bits/stl_queue.h
- #usr/include/c++/4.0.4/bits/stl_raw_storage_iter.h
- #usr/include/c++/4.0.4/bits/stl_relops.h
- #usr/include/c++/4.0.4/bits/stl_set.h
- #usr/include/c++/4.0.4/bits/stl_stack.h
- #usr/include/c++/4.0.4/bits/stl_tempbuf.h
- #usr/include/c++/4.0.4/bits/stl_tree.h
- #usr/include/c++/4.0.4/bits/stl_uninitialized.h
- #usr/include/c++/4.0.4/bits/stl_vector.h
- #usr/include/c++/4.0.4/bits/stream_iterator.h
- #usr/include/c++/4.0.4/bits/streambuf.tcc
- #usr/include/c++/4.0.4/bits/streambuf_iterator.h
- #usr/include/c++/4.0.4/bits/stringfwd.h
- #usr/include/c++/4.0.4/bits/valarray_after.h
- #usr/include/c++/4.0.4/bits/valarray_array.h
- #usr/include/c++/4.0.4/bits/valarray_array.tcc
- #usr/include/c++/4.0.4/bits/valarray_before.h
- #usr/include/c++/4.0.4/bits/vector.tcc
- #usr/include/c++/4.0.4/bitset
- #usr/include/c++/4.0.4/cassert
- #usr/include/c++/4.0.4/cctype
- #usr/include/c++/4.0.4/cerrno
- #usr/include/c++/4.0.4/cfloat
- #usr/include/c++/4.0.4/ciso646
- #usr/include/c++/4.0.4/climits
- #usr/include/c++/4.0.4/clocale
- #usr/include/c++/4.0.4/cmath
- #usr/include/c++/4.0.4/complex
- #usr/include/c++/4.0.4/csetjmp
- #usr/include/c++/4.0.4/csignal
- #usr/include/c++/4.0.4/cstdarg
- #usr/include/c++/4.0.4/cstddef
- #usr/include/c++/4.0.4/cstdio
- #usr/include/c++/4.0.4/cstdlib
- #usr/include/c++/4.0.4/cstring
- #usr/include/c++/4.0.4/ctime
- #usr/include/c++/4.0.4/cwchar
- #usr/include/c++/4.0.4/cwctype
- #usr/include/c++/4.0.4/cxxabi.h
- #usr/include/c++/4.0.4/debug
- #usr/include/c++/4.0.4/debug/bitset
- #usr/include/c++/4.0.4/debug/debug.h
- #usr/include/c++/4.0.4/debug/deque
- #usr/include/c++/4.0.4/debug/formatter.h
- #usr/include/c++/4.0.4/debug/hash_map
- #usr/include/c++/4.0.4/debug/hash_map.h
- #usr/include/c++/4.0.4/debug/hash_multimap.h
- #usr/include/c++/4.0.4/debug/hash_multiset.h
- #usr/include/c++/4.0.4/debug/hash_set
- #usr/include/c++/4.0.4/debug/hash_set.h
- #usr/include/c++/4.0.4/debug/list
- #usr/include/c++/4.0.4/debug/map
- #usr/include/c++/4.0.4/debug/map.h
- #usr/include/c++/4.0.4/debug/multimap.h
- #usr/include/c++/4.0.4/debug/multiset.h
- #usr/include/c++/4.0.4/debug/safe_base.h
- #usr/include/c++/4.0.4/debug/safe_iterator.h
- #usr/include/c++/4.0.4/debug/safe_iterator.tcc
- #usr/include/c++/4.0.4/debug/safe_sequence.h
- #usr/include/c++/4.0.4/debug/set
- #usr/include/c++/4.0.4/debug/set.h
- #usr/include/c++/4.0.4/debug/string
- #usr/include/c++/4.0.4/debug/vector
- #usr/include/c++/4.0.4/deque
- #usr/include/c++/4.0.4/exception
- #usr/include/c++/4.0.4/exception_defines.h
- #usr/include/c++/4.0.4/ext
- #usr/include/c++/4.0.4/ext/algorithm
- #usr/include/c++/4.0.4/ext/array_allocator.h
- #usr/include/c++/4.0.4/ext/bitmap_allocator.h
- #usr/include/c++/4.0.4/ext/codecvt_specializations.h
- #usr/include/c++/4.0.4/ext/debug_allocator.h
- #usr/include/c++/4.0.4/ext/functional
- #usr/include/c++/4.0.4/ext/hash_fun.h
- #usr/include/c++/4.0.4/ext/hash_map
- #usr/include/c++/4.0.4/ext/hash_set
- #usr/include/c++/4.0.4/ext/hashtable.h
- #usr/include/c++/4.0.4/ext/iterator
- #usr/include/c++/4.0.4/ext/malloc_allocator.h
- #usr/include/c++/4.0.4/ext/memory
- #usr/include/c++/4.0.4/ext/mt_allocator.h
- #usr/include/c++/4.0.4/ext/new_allocator.h
- #usr/include/c++/4.0.4/ext/numeric
- #usr/include/c++/4.0.4/ext/pod_char_traits.h
- #usr/include/c++/4.0.4/ext/pool_allocator.h
- #usr/include/c++/4.0.4/ext/rb_tree
- #usr/include/c++/4.0.4/ext/rope
- #usr/include/c++/4.0.4/ext/ropeimpl.h
- #usr/include/c++/4.0.4/ext/slist
- #usr/include/c++/4.0.4/ext/stdio_filebuf.h
- #usr/include/c++/4.0.4/ext/stdio_sync_filebuf.h
- #usr/include/c++/4.0.4/fstream
- #usr/include/c++/4.0.4/functional
- #usr/include/c++/4.0.4/BUILDTARGET
- #usr/include/c++/4.0.4/BUILDTARGET/bits
- #usr/include/c++/4.0.4/BUILDTARGET/bits/atomic_word.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/basic_file.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/c++allocator.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/c++config.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/c++io.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/c++locale.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/ctype_base.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/ctype_inline.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/ctype_noninline.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/cxxabi_tweaks.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/gthr-default.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/gthr-posix.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/gthr-single.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/gthr-tpf.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/gthr.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/messages_members.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/os_defines.h
- #usr/include/c++/4.0.4/BUILDTARGET/bits/stdc++.h.gch
- #usr/include/c++/4.0.4/BUILDTARGET/bits/stdc++.h.gch/O0g.gch
- #usr/include/c++/4.0.4/BUILDTARGET/bits/stdc++.h.gch/O2g.gch
- #usr/include/c++/4.0.4/BUILDTARGET/bits/time_members.h
- #usr/include/c++/4.0.4/iomanip
- #usr/include/c++/4.0.4/ios
- #usr/include/c++/4.0.4/iosfwd
- #usr/include/c++/4.0.4/iostream
- #usr/include/c++/4.0.4/istream
- #usr/include/c++/4.0.4/iterator
- #usr/include/c++/4.0.4/limits
- #usr/include/c++/4.0.4/list
- #usr/include/c++/4.0.4/locale
- #usr/include/c++/4.0.4/map
- #usr/include/c++/4.0.4/memory
- #usr/include/c++/4.0.4/new
- #usr/include/c++/4.0.4/numeric
- #usr/include/c++/4.0.4/ostream
- #usr/include/c++/4.0.4/queue
- #usr/include/c++/4.0.4/set
- #usr/include/c++/4.0.4/sstream
- #usr/include/c++/4.0.4/stack
- #usr/include/c++/4.0.4/stdexcept
- #usr/include/c++/4.0.4/streambuf
- #usr/include/c++/4.0.4/string
- #usr/include/c++/4.0.4/tr1
- #usr/include/c++/4.0.4/tr1/array
- #usr/include/c++/4.0.4/tr1/bind_iterate.h
- #usr/include/c++/4.0.4/tr1/bind_repeat.h
- #usr/include/c++/4.0.4/tr1/boost_shared_ptr.h
- #usr/include/c++/4.0.4/tr1/functional
- #usr/include/c++/4.0.4/tr1/functional_iterate.h
- #usr/include/c++/4.0.4/tr1/hashtable
- #usr/include/c++/4.0.4/tr1/memory
- #usr/include/c++/4.0.4/tr1/mu_iterate.h
- #usr/include/c++/4.0.4/tr1/ref_fwd.h
- #usr/include/c++/4.0.4/tr1/ref_wrap_iterate.h
- #usr/include/c++/4.0.4/tr1/repeat.h
- #usr/include/c++/4.0.4/tr1/tuple
- #usr/include/c++/4.0.4/tr1/tuple_iterate.h
- #usr/include/c++/4.0.4/tr1/type_traits
- #usr/include/c++/4.0.4/tr1/type_traits_fwd.h
- #usr/include/c++/4.0.4/tr1/unordered_map
- #usr/include/c++/4.0.4/tr1/unordered_set
- #usr/include/c++/4.0.4/tr1/utility
- #usr/include/c++/4.0.4/typeinfo
- #usr/include/c++/4.0.4/utility
- #usr/include/c++/4.0.4/valarray
- #usr/include/c++/4.0.4/vector
+ #usr/include/c++/4.1.2
+ #usr/include/c++/4.1.2/algorithm
+ #usr/include/c++/4.1.2/backward
+ #usr/include/c++/4.1.2/backward/algo.h
+ #usr/include/c++/4.1.2/backward/algobase.h
+ #usr/include/c++/4.1.2/backward/alloc.h
+ #usr/include/c++/4.1.2/backward/backward_warning.h
+ #usr/include/c++/4.1.2/backward/bvector.h
+ #usr/include/c++/4.1.2/backward/complex.h
+ #usr/include/c++/4.1.2/backward/defalloc.h
+ #usr/include/c++/4.1.2/backward/deque.h
+ #usr/include/c++/4.1.2/backward/fstream.h
+ #usr/include/c++/4.1.2/backward/function.h
+ #usr/include/c++/4.1.2/backward/hash_map.h
+ #usr/include/c++/4.1.2/backward/hash_set.h
+ #usr/include/c++/4.1.2/backward/hashtable.h
+ #usr/include/c++/4.1.2/backward/heap.h
+ #usr/include/c++/4.1.2/backward/iomanip.h
+ #usr/include/c++/4.1.2/backward/iostream.h
+ #usr/include/c++/4.1.2/backward/istream.h
+ #usr/include/c++/4.1.2/backward/iterator.h
+ #usr/include/c++/4.1.2/backward/list.h
+ #usr/include/c++/4.1.2/backward/map.h
+ #usr/include/c++/4.1.2/backward/multimap.h
+ #usr/include/c++/4.1.2/backward/multiset.h
+ #usr/include/c++/4.1.2/backward/new.h
+ #usr/include/c++/4.1.2/backward/ostream.h
+ #usr/include/c++/4.1.2/backward/pair.h
+ #usr/include/c++/4.1.2/backward/queue.h
+ #usr/include/c++/4.1.2/backward/rope.h
+ #usr/include/c++/4.1.2/backward/set.h
+ #usr/include/c++/4.1.2/backward/slist.h
+ #usr/include/c++/4.1.2/backward/stack.h
+ #usr/include/c++/4.1.2/backward/stream.h
+ #usr/include/c++/4.1.2/backward/streambuf.h
+ #usr/include/c++/4.1.2/backward/strstream
+ #usr/include/c++/4.1.2/backward/tempbuf.h
+ #usr/include/c++/4.1.2/backward/tree.h
+ #usr/include/c++/4.1.2/backward/vector.h
+ #usr/include/c++/4.1.2/bits
+ #usr/include/c++/4.1.2/bits/allocator.h
+ #usr/include/c++/4.1.2/bits/atomicity.h
+ #usr/include/c++/4.1.2/bits/basic_ios.h
+ #usr/include/c++/4.1.2/bits/basic_ios.tcc
+ #usr/include/c++/4.1.2/bits/basic_string.h
+ #usr/include/c++/4.1.2/bits/basic_string.tcc
+ #usr/include/c++/4.1.2/bits/boost_concept_check.h
+ #usr/include/c++/4.1.2/bits/char_traits.h
+ #usr/include/c++/4.1.2/bits/cmath.tcc
+ #usr/include/c++/4.1.2/bits/codecvt.h
+ #usr/include/c++/4.1.2/bits/concept_check.h
+ #usr/include/c++/4.1.2/bits/concurrence.h
+ #usr/include/c++/4.1.2/bits/cpp_type_traits.h
+ #usr/include/c++/4.1.2/bits/deque.tcc
+ #usr/include/c++/4.1.2/bits/fstream.tcc
+ #usr/include/c++/4.1.2/bits/functexcept.h
+ #usr/include/c++/4.1.2/bits/gslice.h
+ #usr/include/c++/4.1.2/bits/gslice_array.h
+ #usr/include/c++/4.1.2/bits/indirect_array.h
+ #usr/include/c++/4.1.2/bits/ios_base.h
+ #usr/include/c++/4.1.2/bits/istream.tcc
+ #usr/include/c++/4.1.2/bits/list.tcc
+ #usr/include/c++/4.1.2/bits/locale_classes.h
+ #usr/include/c++/4.1.2/bits/locale_facets.h
+ #usr/include/c++/4.1.2/bits/locale_facets.tcc
+ #usr/include/c++/4.1.2/bits/localefwd.h
+ #usr/include/c++/4.1.2/bits/mask_array.h
+ #usr/include/c++/4.1.2/bits/ostream.tcc
+ #usr/include/c++/4.1.2/bits/postypes.h
+ #usr/include/c++/4.1.2/bits/slice_array.h
+ #usr/include/c++/4.1.2/bits/sstream.tcc
+ #usr/include/c++/4.1.2/bits/stl_algo.h
+ #usr/include/c++/4.1.2/bits/stl_algobase.h
+ #usr/include/c++/4.1.2/bits/stl_bvector.h
+ #usr/include/c++/4.1.2/bits/stl_construct.h
+ #usr/include/c++/4.1.2/bits/stl_deque.h
+ #usr/include/c++/4.1.2/bits/stl_function.h
+ #usr/include/c++/4.1.2/bits/stl_heap.h
+ #usr/include/c++/4.1.2/bits/stl_iterator.h
+ #usr/include/c++/4.1.2/bits/stl_iterator_base_funcs.h
+ #usr/include/c++/4.1.2/bits/stl_iterator_base_types.h
+ #usr/include/c++/4.1.2/bits/stl_list.h
+ #usr/include/c++/4.1.2/bits/stl_map.h
+ #usr/include/c++/4.1.2/bits/stl_multimap.h
+ #usr/include/c++/4.1.2/bits/stl_multiset.h
+ #usr/include/c++/4.1.2/bits/stl_numeric.h
+ #usr/include/c++/4.1.2/bits/stl_pair.h
+ #usr/include/c++/4.1.2/bits/stl_queue.h
+ #usr/include/c++/4.1.2/bits/stl_raw_storage_iter.h
+ #usr/include/c++/4.1.2/bits/stl_relops.h
+ #usr/include/c++/4.1.2/bits/stl_set.h
+ #usr/include/c++/4.1.2/bits/stl_stack.h
+ #usr/include/c++/4.1.2/bits/stl_tempbuf.h
+ #usr/include/c++/4.1.2/bits/stl_tree.h
+ #usr/include/c++/4.1.2/bits/stl_uninitialized.h
+ #usr/include/c++/4.1.2/bits/stl_vector.h
+ #usr/include/c++/4.1.2/bits/stream_iterator.h
+ #usr/include/c++/4.1.2/bits/streambuf.tcc
+ #usr/include/c++/4.1.2/bits/streambuf_iterator.h
+ #usr/include/c++/4.1.2/bits/stringfwd.h
+ #usr/include/c++/4.1.2/bits/valarray_after.h
+ #usr/include/c++/4.1.2/bits/valarray_array.h
+ #usr/include/c++/4.1.2/bits/valarray_array.tcc
+ #usr/include/c++/4.1.2/bits/valarray_before.h
+ #usr/include/c++/4.1.2/bits/vector.tcc
+ #usr/include/c++/4.1.2/bitset
+ #usr/include/c++/4.1.2/cassert
+ #usr/include/c++/4.1.2/cctype
+ #usr/include/c++/4.1.2/cerrno
+ #usr/include/c++/4.1.2/cfloat
+ #usr/include/c++/4.1.2/ciso646
+ #usr/include/c++/4.1.2/climits
+ #usr/include/c++/4.1.2/clocale
+ #usr/include/c++/4.1.2/cmath
+ #usr/include/c++/4.1.2/complex
+ #usr/include/c++/4.1.2/csetjmp
+ #usr/include/c++/4.1.2/csignal
+ #usr/include/c++/4.1.2/cstdarg
+ #usr/include/c++/4.1.2/cstddef
+ #usr/include/c++/4.1.2/cstdio
+ #usr/include/c++/4.1.2/cstdlib
+ #usr/include/c++/4.1.2/cstring
+ #usr/include/c++/4.1.2/ctime
+ #usr/include/c++/4.1.2/cwchar
+ #usr/include/c++/4.1.2/cwctype
+ #usr/include/c++/4.1.2/cxxabi.h
+ #usr/include/c++/4.1.2/debug
+ #usr/include/c++/4.1.2/debug/bitset
+ #usr/include/c++/4.1.2/debug/debug.h
+ #usr/include/c++/4.1.2/debug/deque
+ #usr/include/c++/4.1.2/debug/formatter.h
+ #usr/include/c++/4.1.2/debug/functions.h
+ #usr/include/c++/4.1.2/debug/hash_map
+ #usr/include/c++/4.1.2/debug/hash_map.h
+ #usr/include/c++/4.1.2/debug/hash_multimap.h
+ #usr/include/c++/4.1.2/debug/hash_multiset.h
+ #usr/include/c++/4.1.2/debug/hash_set
+ #usr/include/c++/4.1.2/debug/hash_set.h
+ #usr/include/c++/4.1.2/debug/list
+ #usr/include/c++/4.1.2/debug/macros.h
+ #usr/include/c++/4.1.2/debug/map
+ #usr/include/c++/4.1.2/debug/map.h
+ #usr/include/c++/4.1.2/debug/multimap.h
+ #usr/include/c++/4.1.2/debug/multiset.h
+ #usr/include/c++/4.1.2/debug/safe_base.h
+ #usr/include/c++/4.1.2/debug/safe_iterator.h
+ #usr/include/c++/4.1.2/debug/safe_iterator.tcc
+ #usr/include/c++/4.1.2/debug/safe_sequence.h
+ #usr/include/c++/4.1.2/debug/set
+ #usr/include/c++/4.1.2/debug/set.h
+ #usr/include/c++/4.1.2/debug/string
+ #usr/include/c++/4.1.2/debug/vector
+ #usr/include/c++/4.1.2/deque
+ #usr/include/c++/4.1.2/exception
+ #usr/include/c++/4.1.2/exception_defines.h
+ #usr/include/c++/4.1.2/ext
+ #usr/include/c++/4.1.2/ext/algorithm
+ #usr/include/c++/4.1.2/ext/array_allocator.h
+ #usr/include/c++/4.1.2/ext/bitmap_allocator.h
+ #usr/include/c++/4.1.2/ext/codecvt_specializations.h
+ #usr/include/c++/4.1.2/ext/debug_allocator.h
+ #usr/include/c++/4.1.2/ext/functional
+ #usr/include/c++/4.1.2/ext/hash_fun.h
+ #usr/include/c++/4.1.2/ext/hash_map
+ #usr/include/c++/4.1.2/ext/hash_set
+ #usr/include/c++/4.1.2/ext/hashtable.h
+ #usr/include/c++/4.1.2/ext/iterator
+ #usr/include/c++/4.1.2/ext/malloc_allocator.h
+ #usr/include/c++/4.1.2/ext/memory
+ #usr/include/c++/4.1.2/ext/mt_allocator.h
+ #usr/include/c++/4.1.2/ext/new_allocator.h
+ #usr/include/c++/4.1.2/ext/numeric
+ #usr/include/c++/4.1.2/ext/pb_assoc
+ #usr/include/c++/4.1.2/ext/pb_assoc/assoc_cntnr.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/data_type.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/assoc_cntnr_base.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/constructor_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/constructors_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/d_extract_key.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/d_find_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/d_insert_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/extract_key.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/info_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/insert_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_assoc_cntnr/iterators_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_hash_assoc_cntnr
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_hash_assoc_cntnr/resize_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/constructor_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/constructors_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/node_iteration_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/policy_access_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/r_erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/r_range_iteration_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/range_iteration_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/basic_tree_assoc_cntnr/split_join_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/bin_search_tree_.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/debug_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/find_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/find_iterators.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/info_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/insert_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/iterators_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/node_iterators.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/r_erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/rotate_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/bin_search_tree_/split_join_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_hash_assoc_cntnr
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/cc_ht_map_.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/cmp_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/cond_key_dtor_entry_dealtor.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/constructor_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/constructor_destructor_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/debug_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/debug_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/debug_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/entry_list_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/erase_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/erase_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/find_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/find_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/find_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/info_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/insert_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/insert_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/insert_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/iterators_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/policy_access_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/resize_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/resize_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/resize_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/size_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cc_ht_map_/standard_policies.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/cond_dealtor.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/constructors_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ds_trait_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/eq_fn
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/eq_fn/eq_by_less.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/eq_fn/hash_eq_fn.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_hash_assoc_cntnr
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/constructor_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/constructor_destructor_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/debug_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/debug_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/debug_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/erase_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/erase_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/find_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/find_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/find_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/gp_ht_map_.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/info_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/insert_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/insert_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/insert_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/iterator_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/policy_access_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/resize_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/gp_ht_map_/resize_store_hash_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/direct_mask_range_hashing_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/direct_mod_range_hashing_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/linear_probe_fn_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/mask_based_range_hashing.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/mod_based_range_hashing.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/probe_fn_base.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/quadratic_probe_fn_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/ranged_hash_fn.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_fn/ranged_probe_fn.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/hash_types_traits.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_assoc_cntnr
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_assoc_cntnr/constructor_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_assoc_cntnr/policy_access_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/constructor_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/debug_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/find_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/info_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/insert_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/iterators_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/lu_map_.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_map_/policy_access_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_policy
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_policy/counter_lu_metadata_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_policy/counter_lu_policy_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/lu_policy/mtf_lu_policy_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/map_debug_base.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/mapping_level_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ms_category_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ms_trait_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/order_statistics_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/cond_dtor.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/debug_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/find_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/info_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/insert_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/iterators_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/node_iterators.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/ov_tree_map_.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/ov_tree_map_/split_join_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/debug_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/find_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/info_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/insert_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/node.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/rb_tree_.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/rb_tree_map_/split_join_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/cc_hash_max_collision_resize_trigger_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/hash_exponential_size_policy_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/hash_prime_size_policy_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/hash_standard_resize_policy_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/ht_prime_size_policy_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/resize_policy/size_base.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/constructors_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/debug_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/find_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/info_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/insert_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/node.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/splay_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/splay_tree_.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/splay_tree_/split_join_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/standard_policies.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/standard_sizes.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/tree_assoc_cntnr
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/tree_assoc_cntnr/constructor_destructor_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/tree_policy
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/tree_policy/null_node_updator_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/tree_policy/order_statistics_imp.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/type_utils.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_append.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_apply.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_at_index.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_contains.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_filter.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_transform.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/typelist/typelist_typelist_append.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/types_traits.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/unordered_iterator
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/unordered_iterator/const_find_iterator.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/unordered_iterator/const_iterator.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/unordered_iterator/find_iterator.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/unordered_iterator/iterator.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/constructor_destructor_and_related.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/erase_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/erase_if_pred.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/find_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/info_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/insert_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/invalidation_guarantee_selector.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/it_value_type_traits.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/iterator.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/iterator_fn_imps.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/ref_pair.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/value_type_adapter.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/detail/value_type_adapter/value_type_traits.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/ds_trait.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/exception.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/hash_policy.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/lu_policy.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/ms_trait.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/tree_policy.hpp
+ #usr/include/c++/4.1.2/ext/pb_assoc/trivial_iterator_def.hpp
+ #usr/include/c++/4.1.2/ext/pod_char_traits.h
+ #usr/include/c++/4.1.2/ext/pool_allocator.h
+ #usr/include/c++/4.1.2/ext/rb_tree
+ #usr/include/c++/4.1.2/ext/rc_string_base.h
+ #usr/include/c++/4.1.2/ext/rope
+ #usr/include/c++/4.1.2/ext/ropeimpl.h
+ #usr/include/c++/4.1.2/ext/slist
+ #usr/include/c++/4.1.2/ext/sso_string_base.h
+ #usr/include/c++/4.1.2/ext/stdio_filebuf.h
+ #usr/include/c++/4.1.2/ext/stdio_sync_filebuf.h
+ #usr/include/c++/4.1.2/ext/typelist.h
+ #usr/include/c++/4.1.2/ext/vstring.h
+ #usr/include/c++/4.1.2/ext/vstring.tcc
+ #usr/include/c++/4.1.2/ext/vstring_fwd.h
+ #usr/include/c++/4.1.2/ext/vstring_util.h
+ #usr/include/c++/4.1.2/fstream
+ #usr/include/c++/4.1.2/functional
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/atomic_word.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/basic_file.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/c++allocator.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/c++config.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/c++io.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/c++locale.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/cpu_defines.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/ctype_base.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/ctype_inline.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/ctype_noninline.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/cxxabi_tweaks.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/gthr-default.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/gthr-posix.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/gthr-single.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/gthr-tpf.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/gthr.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/messages_members.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/os_defines.h
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/stdc++.h.gch
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/stdc++.h.gch/O0g.gch
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/stdc++.h.gch/O2g.gch
+ #usr/include/c++/4.1.2/i586-pc-linux-gnu/bits/time_members.h
+ #usr/include/c++/4.1.2/iomanip
+ #usr/include/c++/4.1.2/ios
+ #usr/include/c++/4.1.2/iosfwd
+ #usr/include/c++/4.1.2/iostream
+ #usr/include/c++/4.1.2/istream
+ #usr/include/c++/4.1.2/iterator
+ #usr/include/c++/4.1.2/limits
+ #usr/include/c++/4.1.2/list
+ #usr/include/c++/4.1.2/locale
+ #usr/include/c++/4.1.2/map
+ #usr/include/c++/4.1.2/memory
+ #usr/include/c++/4.1.2/new
+ #usr/include/c++/4.1.2/numeric
+ #usr/include/c++/4.1.2/ostream
+ #usr/include/c++/4.1.2/queue
+ #usr/include/c++/4.1.2/set
+ #usr/include/c++/4.1.2/sstream
+ #usr/include/c++/4.1.2/stack
+ #usr/include/c++/4.1.2/stdexcept
+ #usr/include/c++/4.1.2/streambuf
+ #usr/include/c++/4.1.2/string
+ #usr/include/c++/4.1.2/tr1
+ #usr/include/c++/4.1.2/tr1/array
+ #usr/include/c++/4.1.2/tr1/bind_iterate.h
+ #usr/include/c++/4.1.2/tr1/bind_repeat.h
+ #usr/include/c++/4.1.2/tr1/boost_shared_ptr.h
+ #usr/include/c++/4.1.2/tr1/functional
+ #usr/include/c++/4.1.2/tr1/functional_iterate.h
+ #usr/include/c++/4.1.2/tr1/hashtable
+ #usr/include/c++/4.1.2/tr1/memory
+ #usr/include/c++/4.1.2/tr1/mu_iterate.h
+ #usr/include/c++/4.1.2/tr1/ref_fwd.h
+ #usr/include/c++/4.1.2/tr1/ref_wrap_iterate.h
+ #usr/include/c++/4.1.2/tr1/repeat.h
+ #usr/include/c++/4.1.2/tr1/tuple
+ #usr/include/c++/4.1.2/tr1/tuple_iterate.h
+ #usr/include/c++/4.1.2/tr1/type_traits
+ #usr/include/c++/4.1.2/tr1/type_traits_fwd.h
+ #usr/include/c++/4.1.2/tr1/unordered_map
+ #usr/include/c++/4.1.2/tr1/unordered_set
+ #usr/include/c++/4.1.2/tr1/utility
+ #usr/include/c++/4.1.2/typeinfo
+ #usr/include/c++/4.1.2/utility
+ #usr/include/c++/4.1.2/valarray
+ #usr/include/c++/4.1.2/vector
  #usr/include/mf-runtime.h
  #usr/info/cpp.info
  #usr/info/cppinternals.info
@@@ -266,74 -501,87 +501,87 @@@
  #usr/info/gccinstall.info
  #usr/info/gccint.info
  #usr/lib/gcc
- #usr/lib/gcc/BUILDTARGET
- #usr/lib/gcc/BUILDTARGET/4.0.4
- #usr/lib/gcc/BUILDTARGET/4.0.4/cc1
- #usr/lib/gcc/BUILDTARGET/4.0.4/cc1plus
- #usr/lib/gcc/BUILDTARGET/4.0.4/collect2
- #usr/lib/gcc/BUILDTARGET/4.0.4/crtbegin.o
- #usr/lib/gcc/BUILDTARGET/4.0.4/crtbeginS.o
- #usr/lib/gcc/BUILDTARGET/4.0.4/crtbeginT.o
- #usr/lib/gcc/BUILDTARGET/4.0.4/crtend.o
- #usr/lib/gcc/BUILDTARGET/4.0.4/crtendS.o
- #usr/lib/gcc/BUILDTARGET/4.0.4/include
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/README
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/emmintrin.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/float.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/iso646.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/limits.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/mm3dnow.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/mm_malloc.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/mmintrin.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/pmmintrin.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/stdarg.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/stdbool.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/stddef.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/syslimits.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/unwind.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/varargs.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/include/xmmintrin.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/fixinc.sh
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/fixincl
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/gsyslimits.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/README
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/emmintrin.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/float.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/iso646.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/limits.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/mm3dnow.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/mm_malloc.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/mmintrin.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/pmmintrin.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/stdarg.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/stdbool.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/stddef.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/unwind.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/varargs.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/include/xmmintrin.h
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/macro_list
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/mkheaders
- #usr/lib/gcc/BUILDTARGET/4.0.4/install-tools/mkheaders.conf
- #usr/lib/gcc/BUILDTARGET/4.0.4/libgcc.a
- #usr/lib/gcc/BUILDTARGET/4.0.4/libgcc_eh.a
- #usr/lib/gcc/BUILDTARGET/4.0.4/libgcov.a
+ #usr/lib/gcc/i586-pc-linux-gnu
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/cc1
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/cc1plus
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/collect2
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtbegin.o
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtbeginS.o
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtbeginT.o
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtend.o
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtendS.o
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/crtfastmath.o
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/README
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/emmintrin.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/float.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/iso646.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/limits.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/mm3dnow.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/mm_malloc.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/mmintrin.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/pmmintrin.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/ssp
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/ssp/ssp.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/ssp/stdio.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/ssp/string.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/ssp/unistd.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/stdarg.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/stdbool.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/stddef.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/syslimits.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/unwind.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/varargs.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/include/xmmintrin.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/fixinc.sh
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/fixincl
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/gsyslimits.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/README
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/emmintrin.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/float.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/iso646.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/limits.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/mm3dnow.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/mm_malloc.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/mmintrin.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/pmmintrin.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/stdarg.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/stdbool.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/stddef.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/unwind.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/varargs.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/include/xmmintrin.h
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/macro_list
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/mkheaders
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/install-tools/mkheaders.conf
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/libgcc.a
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/libgcc_eh.a
+ #usr/lib/gcc/i586-pc-linux-gnu/4.1.2/libgcov.a
  #usr/lib/libmudflap.a
  #usr/lib/libmudflap.la
- #usr/lib/libmudflap.so
- #usr/lib/libmudflap.so.0
- #usr/lib/libmudflap.so.0.0.0
+ usr/lib/libmudflap.so
+ usr/lib/libmudflap.so.0
+ usr/lib/libmudflap.so.0.0.0
  #usr/lib/libmudflapth.a
  #usr/lib/libmudflapth.la
- #usr/lib/libmudflapth.so
- #usr/lib/libmudflapth.so.0
- #usr/lib/libmudflapth.so.0.0.0
+ usr/lib/libmudflapth.so
+ usr/lib/libmudflapth.so.0
+ usr/lib/libmudflapth.so.0.0.0
+ #usr/lib/libssp.a
+ #usr/lib/libssp.la
+ usr/lib/libssp.so
+ usr/lib/libssp.so.0
+ usr/lib/libssp.so.0.0.0
+ #usr/lib/libssp_nonshared.a
+ #usr/lib/libssp_nonshared.la
  #usr/lib/libstdc++.a
  #usr/lib/libstdc++.la
  usr/lib/libstdc++.so
  usr/lib/libstdc++.so.6
- usr/lib/libstdc++.so.6.0.7
+ usr/lib/libstdc++.so.6.0.8
  #usr/lib/libsupc++.a
  #usr/lib/libsupc++.la
  #usr/man/man1/cpp.1

diff --combined config/rootfiles/oldcore/51/update.sh
index 201c2db4a0abcf204efcfdbcf15b3f61f03035b3,58a47da0d3e33b4b49ff5d72a70c3d106f844429..58a47da0d3e33b4b49ff5d72a70c3d106f844429
--- 1/config/rootfiles/oldcore/51/update.sh
--- 2/config/rootfiles/core/51/update.sh
+++ b/config/rootfiles/oldcore/51/update.sh
@@@ -143,6 -143,11 +143,11 @@@ perl -e "require '/var/ipfire/lang.pl'
  #
  rm -rf /etc/sysconfig/lm_sensors
  
+ # Ensure that all data was written...
+ sync
+ sync
+ sync
+ 
  # Reboot message to console
  /usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Upgrade finished. If you use a customized grub.cfg"
  /usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Check it before reboot !!!"
@@@ -155,5 -160,12 +160,12 @@@ touch /var/run/need_reboo
  #Finish
  /etc/init.d/fireinfo start
  sendprofile
+ 
+ # Ensure that all data was written...
+ sync
+ sync
+ sync
+ 
+ #
  #Don't report the exitcode last command
  exit 0

diff --combined lfs/binutils
index c1b660b58380a148c64c6e20e3bbc3460f756074,b6b2c19b5a731542549c8609b44954c0dd07b98b..e0d039800aff4986938167a26a083225ba23ba10
--- 1/lfs/binutils
--- 2/lfs/binutils
+++ b/lfs/binutils
@@@ -24,45 -24,25 +24,28 @@@
  
  include Config
  
- ifeq "$(MACHINE_TYPE)" "arm"
-       VER = 2.18
- else
-       VER = 2.17
- endif
+ VER        = 2.18
  
  THISAPP    = binutils-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  
 +# XXX maybe we can remove that ugly MACHINE= by this
 +#unexport MACHINE
 +
  # Normal build or /tools build.
  #
  ifeq "$(ROOT)" ""
- ifeq "$(LFS_PASS)" "install"
-   TARGET = $(DIR_INFO)/$(THISAPP)-install
-   EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
-               --build=$(MACHINE)-pc-linux-gnu \
-               --host=$(MACHINE)-pc-linux-gnu \
-               --target=$(MACHINE)-linux-uclibc \
-               --disable-nls \
-               --enable-multilib \
-               --disable-werror
-   EXTRA_MAKE = all
-   EXTRA_INSTALL = 
- else
    TARGET = $(DIR_INFO)/$(THISAPP)
    EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls
    EXTRA_MAKE = tooldir=/usr
    EXTRA_INSTALL = tooldir=/usr
- endif
  else
  ifeq "$(PASS)" "1"
    TARGET = $(DIR_INFO)/$(THISAPP)-tools1
    EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror --disable-gprof
 -  EXTRA_MAKE = LDFLAGS="-all-static"
 +  #EXTRA_MAKE = LDFLAGS="-all-static"
    EXTRA_INSTALL = 
  else
    TARGET = $(DIR_INFO)/$(THISAPP)-tools2
@@@ -72,14 -52,7 +55,16 @@@
  endif
  endif
  
 -EXTRA_CONFIG += --build=$(BUILDTARGET)
 +ifeq "$(MACHINE_TYPE)" "arm"
 +      EXTRA_CONFIG += \
 +              --host=$(BUILDTARGET) \
 +              --build=$(BUILDTARGET) \
 +              --target=$(BUILDTARGET) \
 +              --with-abi=aapcs-linux \
 +              --with-float=soft
++else
++      EXTRA_CONFIG += --build=$(BUILDTARGET)
 +endif
  
  ###############################################################################
  # Top-level Rules
@@@ -89,11 -62,7 +74,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- ifeq "$(MACHINE_TYPE)" "arm"
-       $(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01
- else
-       $(DL_FILE)_MD5 = e26e2e06b6e4bf3acf1dc8688a94c0d1
- endif
+ $(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01
  
  install : $(TARGET)
  
@@@ -124,24 -93,23 +105,23 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/binutils-build
 -      cd $(DIR_SRC)/binutils-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-configure-1.patch
 +      cd $(DIR_SRC)/binutils-build && MACHINE= $(DIR_APP)/configure $(EXTRA_CONFIG)
  ifeq "$(PASS)" "1"
 -      cd $(DIR_SRC)/binutils-build && make configure-host
 +      cd $(DIR_SRC)/binutils-build && make configure-host MAKEINFO=makeinfo MACHINE=
  endif
 -      cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
 -      cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
 +      cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING) MAKEINFO=makeinfo MACHINE=
 +      cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install MAKEINFO=makeinfo MACHINE=
  ifeq "$(ROOT)" ""
- ifneq "$(LFS_PASS)" "install"
        cp -v $(DIR_APP)/include/libiberty.h /usr/include
- endif
  else
  ifeq "$(PASS)" "1"
 -      cd $(DIR_SRC)/binutils-build && make -C ld clean
 -      cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/tools/lib
 +      cd $(DIR_SRC)/binutils-build && make -C ld clean MACHINE=
 +      cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/tools/lib MACHINE=
        cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
  else
 -      cd $(DIR_SRC)/binutils-build && make -C ld clean
 -      cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib
 +      cd $(DIR_SRC)/binutils-build && make -C ld clean MACHINE=
 +      cd $(DIR_SRC)/binutils-build && make -C ld LIB_PATH=/usr/lib:/lib MACHINE=
        cd $(DIR_SRC)/binutils-build && cp -v ld/ld-new /tools/bin
  endif
  endif

diff --combined lfs/cleanup-toolchain
index 79d5db40a8a9149ac4ba45d2691c0556e7aaea9b,cc66a2d2fc3bb4fab9215c75a743a80577335304..306b781c2f97a5952302f6956c374c86692b3148
--- 1/lfs/cleanup-toolchain
--- 2/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
- # Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+ # Copyright (C) 2007-2011  IPFire Team  <info@ipfire.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        #
@@@ -29,12 -29,6 +29,8 @@@ VER        = ipfir
  THISAPP    = cleanup-toolchain
  TARGET     = $(DIR_INFO)/$(THISAPP)-$(PASS)-tools
  
- ifeq "$(MACHINE_TYPE)" "arm"
-       GCC_VER = 4.1.2
- else
-       GCC_VER = 4.0.4
- endif
++GCC_VER    = 4.1.2
 +
  ###############################################################################
  # Top-level Rules
  ###############################################################################
@@@ -60,11 -54,11 +56,11 @@@ ifeq "$(PASS)" "1
        mv -v /tools/$(BUILDTARGET)/bin/{ld,ld-old}
        cp -v /tools/bin/{ld-new,ld}
        ln -sv /tools/bin/ld /tools/$(BUILDTARGET)/bin/ld
 -      gcc -dumpspecs > /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs
 -      sed 's@^/lib/ld-linux.so@/tools&@g' /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs > tempspecfile
 -      mv -vf tempspecfile /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs
 -      find /tools/lib/gcc/$(BUILDTARGET)/4.1.2/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \;
 -      rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/$(BUILDTARGET)/4.1.2/include/*`
 +      gcc -dumpspecs > /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/specs
 +      sed 's@/lib/ld-linux.so@/tools&@g' /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/specs > tempspecfile
 +      mv -vf tempspecfile /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/specs
 +      find /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \;
 +      rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/include/*`
  endif
  ifeq "$(PASS)" "2"
        -strip --strip-debug /tools/lib/*
@@@ -80,6 -74,6 +76,6 @@@ ifeq "$(PASS)" "3
        gcc -dumpspecs | \
        perl -p -e 's@/tools/lib/ld-linux.so@/lib/ld-linux.so@g;' \
            -e 's@\*startfile_prefix_spec:\n@$$_/usr/lib/ @g;' > \
 -          /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs
 +          /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/specs
  endif
        @$(POSTBUILD)

diff --combined lfs/compat-wireless
index 8ae00dd0d96929d39b15aefcd2aa8d36ca3fafe0,370f06bef6fb5c6044b3efe1ea7341b8036a5657..4e97dabf8402624d9e45f1170f0c601af5299867
--- 1/lfs/compat-wireless
--- 2/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@@ -34,7 -34,7 +34,7 @@@ els
  endif
  endif
  
- VER        = 2.6.39-1-sn
+ VER        = 3.0-2
  
  THISAPP    = compat-wireless-$(VER)
  DL_FILE    = compat-wireless-$(VER).tar.bz2
@@@ -51,7 -51,7 +51,7 @@@ objects = $(DL_FILE) asix-3.5.0a.tar.bz
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2
  
- $(DL_FILE)_MD5 = ac2b20607d75de8ce2b30b74995383a6
+ $(DL_FILE)_MD5 = 7f2d0de30bf9c3e9a941d9e67971e9b3
  asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
  
  install : $(TARGET)
@@@ -97,12 -97,6 +97,12 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        # Build Updated asix usb-lan driver
        cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2
  
 +ifeq "$(MACHINE_TYPE)" "arm"
 +      # B43+B44 driver doesn't build on arm
 +      cd $(DIR_APP) && sed -i -e "s|CONFIG_B43=m||g" config.mk
 +      cd $(DIR_APP) && sed -i -e "s|CONFIG_B44=m||g" config.mk
 +endif
 +
        cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \
                KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules
  

diff --combined lfs/coreutils
index c4aa9db02b1cdef45d6353455d0ab9e205f154f4,71282333a6cba26c8070fa2bc13953c66a4d4df4..d5c437dd102b31c938b853a211132d91cb5705cf
--- 1/lfs/coreutils
--- 2/lfs/coreutils
+++ b/lfs/coreutils
@@@ -45,6 -45,8 +45,8 @@@ els
    EXTRA_INSTALL = 
  endif
  
+ EXTRA_CONFIG += --build=$(BUILDTARGET)
+ 
  ###############################################################################
  # Top-level Rules
  ###############################################################################
@@@ -83,11 -85,8 +85,11 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-5.96-rename-tee.patch
  ifeq "$(ROOT)" ""
 +ifeq "$(MACHINE)" "i586"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-uname-1.patch
 +endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-suppress_uptime_kill_su-1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-i18n-1.patch
        cd $(DIR_APP) && chmod +x tests/sort/sort-mb-tests
@@@ -107,13 -106,17 +109,13 @@@ ifeq "$(ROOT)" "
        ln -sf test /bin/[
        #ln -sf ../../bin/install /usr/bin
        mv -f /bin/uname /bin/uname.bak
 -      echo '#!/bin/bash'                              >  /bin/uname
 -      echo 'kernel=`/bin/uname.bak -r`' >> /bin/uname
 -      echo '/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g' | sed "s/$$kernel/2.6.32.45-ipfire/g"' >> /bin/uname
 +      cp -vf $(DIR_SRC)/src/scripts/uname /bin/uname
        chmod 755 /bin/uname
        dircolors -p > /etc/dircolors
  else
        rm /tools/bin/hostname
        mv -f /tools/bin/uname /tools/bin/uname.bak
 -      echo '#!/bin/bash'                                      >  /tools/bin/uname
 -      echo 'kernel=`/tools/bin/uname.bak -r`' >> /tools/bin/uname
 -      echo '/tools/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g' | sed "s/$$kernel/2.6.32.45-ipfire/g"' >> /tools/bin/uname
 +      cp -vf $(DIR_SRC)/src/scripts/uname /tools/bin/uname
        chmod 755 /tools/bin/uname
  endif
        @rm -rf $(DIR_APP)

diff --combined lfs/gcc
index 6605d5b9351b6e06e9669254aefd1b696fb0651d,95cc681c8ca3cbe691d3bd0a29cd85f6055e0c05..785b965cf1410a9e3306a03cb11b193615ec4029
--- 1/lfs/gcc
--- 2/lfs/gcc
+++ b/lfs/gcc
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
- # Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+ # Copyright (C) 2007-2011  IPFire Team  <info@ipfire.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        #
@@@ -24,59 -24,16 +24,16 @@@
  
  include Config
  
- ifeq "$(MACHINE_TYPE)" "arm"
-       VER = 4.1.2
- else
-       VER = 4.0.4
- endif
+ VER        = 4.1.2
  
  THISAPP    = gcc-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
- CFLAGS     =
- CXXFLAGS   =
- TARGET_PATH = /opt/$(MACHINE)-uClibc/bin:$(PATH)
  
  # Normal build or /tools build.
  #
  ifeq "$(ROOT)" ""
- ifeq "$(INST)" "1"
-   TARGET = $(DIR_INFO)/$(THISAPP)-install1
-   EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
-               --build=$(MACHINE)-pc-linux-gnu \
-               --host=$(MACHINE)-pc-linux-gnu \
-               --target=$(MACHINE)-linux-uclibc \
-               --enable-languages=c \
-               --with-sysroot=$(DIR_SRC)/uClibc_dev \
-               --disable-__cxa_atexit \
-               --enable-target-optspace \
-               --with-gnu-ld \
-               --disable-shared \
-               --enable-threads \
-               --enable-multilib \
-               --disable-nls
-   EXTRA_MAKE = 
-   EXTRA_INSTALL = 
- else
- ifeq "$(INST)" "2"
-   TARGET = $(DIR_INFO)/$(THISAPP)-install2
-   EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
-               --build=$(MACHINE)-pc-linux-gnu \
-               --host=$(MACHINE)-pc-linux-gnu \
-               --target=$(MACHINE)-linux-uclibc \
-               --enable-languages=c,c++ \
-               --with-sysroot=$(DIR_SRC)/uClibc_dev \
-               --disable-__cxa_atexit \
-               --enable-target-optspace \
-               --with-gnu-ld \
-               --enable-shared \
-               --disable-nls \
-               --enable-threads \
-               --enable-multilib
-   EXTRA_MAKE = 
-   EXTRA_INSTALL = 
- else
    TARGET = $(DIR_INFO)/$(THISAPP)
    EXTRA_CONFIG = --prefix=/usr \
                --libexecdir=/usr/lib \
@@@ -88,8 -45,6 +45,6 @@@
                --disable-nls
    EXTRA_MAKE =
    EXTRA_INSTALL =
- endif
- endif
  else
  ifeq "$(PASS)" "1"
    TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@@ -97,10 -52,9 +52,9 @@@
                --with-local-prefix=/tools \
                --disable-nls \
                --enable-shared \
 -              --enable-languages=c
 -  EXTRA_MAKE = bootstrap
 -  # BOOT_LDFLAGS="-static"
 +              --enable-languages=c \
 +              --disable-bootstrap
 +  EXTRA_MAKE = 
-   #bootstrap BOOT_LDFLAGS="-static"
    EXTRA_INSTALL = 
  else
    TARGET = $(DIR_INFO)/$(THISAPP)-tools2
@@@ -117,24 -71,7 +71,27 @@@
  endif
  endif
  
 -EXTRA_CONFIG += --build=$(BUILDTARGET) --host=$(BUILDTARGET) --target=$(BUILDTARGET)
 +ifeq "$(MACHINE_TYPE)" "arm"
 +      EXTRA_CONFIG += \
 +              --build=$(BUILDTARGET) \
 +              --host=$(BUILDTARGET) \
 +              --target=$(BUILDTARGET) \
 +              --with-float=soft \
 +              --disable-libmudflap \
 +              --disable-libssp \
 +              --disable-libgomp \
 +              --enable-threads=posix \
 +              --enable-long-long \
 +              --enable-c99 \
 +              --enable-__cxa_atexit \
 +              --disable-multilib
++else
++      EXTRA_CONFIG += --build=$(BUILDTARGET) --host=$(BUILDTARGET) \
++              --target=$(BUILDTARGET)
 +endif
 +
 +export XCFLAGS = $(CFLAGS)
 +export TCFLAGS = $(CFLAGS)
  
  ###############################################################################
  # Top-level Rules
@@@ -143,11 -80,7 +100,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- ifeq "$(MACHINE_TYPE)" "arm"
-       $(DL_FILE)_MD5 = a4a3eb15c96030906d8494959eeda23c
- else
-       $(DL_FILE)_MD5 = 8970debbc55bea85ee80961d733080f0
- endif
+ $(DL_FILE)_MD5 = a4a3eb15c96030906d8494959eeda23c
  
  install : $(TARGET)
  
@@@ -177,35 -110,9 +130,13 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_linker_version_detection.patch
        @mkdir $(DIR_SRC)/gcc-build
 +
 +      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/gcc-4.1.2-gcc_eh.patch
 +      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/gcc-4.1.2-arm-linux-soft-float.patch
 +
  ifeq "$(ROOT)" ""
- ifeq "$(INST)" "1"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch
-       cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-       cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make $(MAKETUNING) all-gcc
-       cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make install-gcc
-       cd /opt/$(MACHINE)-uClibc/bin && for i in `ls -w1 $(MACHINE)-linux-uclibc-*`; do \
-               ln -svf $$i $(MACHINE)-linux-`echo $$i | cut -c 19-`; \
-       done
-       ln -svf $(MACHINE)-linux-uclibc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux
-       ln -svf gcc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/bin/cc
- else
- ifeq "$(INST)" "2"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-locale.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-libstdc++-pic.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-sdk-libstdc++-includes.patch
-       ln -snf ../include /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/sys-include
-       cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-       cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make install $(EXTRA_INSTALL)
-       cp -f /opt/$(MACHINE)-uClibc/lib/libgcc_s.so /lib
-       cd /lib && ln -sf libgcc_s.so libgcc_s.so.1
- else
        cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
        cd $(DIR_APP) && sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in
        cd $(DIR_APP) && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
@@@ -216,17 -123,12 +147,15 @@@
        cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
        ln -sfv ../usr/bin/cpp /lib
        ln -sfv gcc /usr/bin/cc
- endif
- endif
  else
  ifeq "$(PASS)" "1"
        cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
        cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
        ln -sfv gcc /tools/bin/cc
 +      ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-gcc
 +      ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-g++
 +      ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-cc
  else
        cd $(DIR_APP) && cp -v gcc/Makefile.in{,.orig}
        cd $(DIR_APP) && sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in

diff --combined lfs/glibc
index 5950b1c4e59f980d44c7fd3918fe0b917a7af63f,a81419a6761e70159795ba6c2107d9c5f0a45088..702aa05f8f62fd346c67d012afc77168dec28138
--- 1/lfs/glibc
--- 2/lfs/glibc
+++ b/lfs/glibc
@@@ -24,11 -24,7 +24,11 @@@
  
  include Config
  
 -VER        = 2.3.6
 +ifeq "$(MACHINE_TYPE)" "arm"
 +      VER = 2.5
 +else
 +      VER = 2.3.6
 +endif
  
  THISAPP    = glibc-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@@ -55,13 -51,7 +55,15 @@@ els
    EXTRA_INSTALL =
  endif
  
 -EXTRA_CONFIG += --build=$(BUILDTARGET)
 +ifeq "$(MACHINE_TYPE)" "arm"
 +      # Disable hardware FP for ARM.
 +      EXTRA_CONFIG += \
 +              --build=arm \
 +              --host=$(BUILDTARGET) \
 +              --without-fp
++else
++      EXTRA_CONFIG += --build=$(BUILDTARGET)
 +endif
  
  ###############################################################################
  # Top-level Rules
@@@ -73,20 -63,8 +75,20 @@@ objects = $(DL_FILE) 
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  glibc-libidn-$(VER).tar.bz2 = $(DL_FROM)/glibc-libidn-$(VER).tar.bz2
  
 -$(DL_FILE)_MD5 = bfdce99f82d6dbcb64b7f11c05d6bc96
 -glibc-libidn-$(VER).tar.bz2_MD5 = 49dbe06ce830fc73874d6b38bdc5b4db
 +ifeq "$(MACHINE_TYPE)" "arm"
 +      $(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f
 +      glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01
 +else
 +      $(DL_FILE)_MD5 = bfdce99f82d6dbcb64b7f11c05d6bc96
 +      glibc-libidn-$(VER).tar.bz2_MD5 = 49dbe06ce830fc73874d6b38bdc5b4db
 +endif
 +
 +# ARM needs glibc-ports
 +ifeq "$(MACHINE_TYPE)" "arm"
 +      objects += glibc-ports-$(VER).tar.bz2
 +      glibc-ports-$(VER).tar.bz2 = $(DL_FROM)/glibc-ports-$(VER).tar.bz2
 +      glibc-ports-$(VER).tar.bz2_MD5 = 183f6d46e8fa5e4b2aff240ab1586c2e
 +endif
  
  install : $(TARGET)
  
@@@ -117,42 -95,23 +119,42 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/glibc-build
 +ifeq "$(MACHINE_TYPE)" "arm"
 +      cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(VER).tar.bz2
 +      cd $(DIR_APP) && mv -v glibc-ports-$(VER) ports
 +
 +      cd $(DIR_APP)/ports && patch -Np1 -i $(DIR_SRC)/src/patches/glibc-ports-avoid-using-asm-procinfo.patch
 +
 +      # asm/page.h should not be included in sysdeps/unix/sysv/linux/arm/ioperm.c.
 +      cd $(DIR_APP) && sed "/asm\/page.h/d" -i ports/sysdeps/unix/sysv/linux/arm/ioperm.c
 +else
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-dont_use_origin_on_privil_exec.patch
 +endif
  
  ifeq "$(ROOT)" ""
 +ifeq "$(MACHINE)" "i586"
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-linux_types-1.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-inotify-1.patch
 +endif
        # This locale causes a loop on bash login - exclude it
        cd $(DIR_APP) && sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED
 +ifeq "$(MACHINE_TYPE)" "arm"
 +      cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \
 +              scripts/test-installation.pl
 +else
        cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
                scripts/test-installation.pl
  endif
 -      cd $(DIR_SRC)/glibc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
 +endif
 +      cd $(DIR_SRC)/glibc-build && CFLAGS="$(CFLAGS)" $(DIR_APP)/configure $(EXTRA_CONFIG)
  
  ifeq "$(ROOT)" ""
        touch /etc/ld.so.conf
        cd $(DIR_SRC)/glibc-build && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
 +ifeq "$(MACHINE)" "i586"
        cp -v $(DIR_APP)/sysdeps/unix/sysv/linux/inotify.h /usr/include/sys
 +endif
  else
        -mkdir /tools/etc
        touch /tools/etc/ld.so.conf
@@@ -165,8 -124,7 +167,8 @@@ ifeq "$(ROOT)" "
        mkdir -p /usr/lib/locale
        cd $(DIR_SRC)/glibc-build && localedef -i en_US -f ISO-8859-1 en_US
        cd $(DIR_SRC)/glibc-build && localedef -i en_US -f UTF-8      en_US.utf8
 -      cp -f /usr/share/zoneinfo/GMT /etc/localtime
 +      # XXX zoneinfo stuff is not installed
 +      #cp -f /usr/share/zoneinfo/GMT /etc/localtime
  endif
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build
        @$(POSTBUILD)

diff --combined lfs/groff
index a3d13a1608183d2b3bd8ecd92d3c40ada6b492e5,1739fee23b16952105477b7ff5e8e77fb0481e4a..3c36edcc11c32c02c4c722c7cbd0e3f796ea667a
--- 1/lfs/groff
--- 2/lfs/groff
+++ b/lfs/groff
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
- # Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+ # Copyright (C) 2007-2011  IPFire Team  <info@ipfire.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        #
@@@ -24,7 -24,7 +24,7 @@@
  
  include Config
  
- VER        = 1.18.1.1
+ VER        = 1.21
  
  THISAPP    = groff-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@@ -40,7 -40,7 +40,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- $(DL_FILE)_MD5 = 511dbd64b67548c99805f1521f82cc5e
+ $(DL_FILE)_MD5 = 8b8cd29385b97616a0f0d96d0951c5bf
  
  install : $(TARGET)
  
@@@ -70,14 -70,10 +70,14 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-debian_fixes-1.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/groff-char_block.patch
 +      cd $(DIR_APP) && sed -i -e 's/2010/002D/' -e 's/2212/002D/' \
 +                              -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto
        cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr --enable-multibyte --disable-nls
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
-       ln -sv eqn /usr/bin/geqn
-       ln -sv tbl /usr/bin/gtbl
+       ln -svf eqn /usr/bin/geqn
+       ln -svf tbl /usr/bin/gtbl
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --combined lfs/kvm-kmod
index 94d9e844972605df1567207122008f7f287c3d53,7cb846eb78878eb4120460a5d590f74b81d1077b..fad1c59ad9466867a0460757b8f0890d7ced4a8e
--- 1/lfs/kvm-kmod
--- 2/lfs/kvm-kmod
+++ b/lfs/kvm-kmod
@@@ -34,14 -34,13 +34,14 @@@ els
  endif
  endif
  
- VER        = 2.6.38.6
+ VER        = 3.0b
  
  THISAPP    = kvm-kmod-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 +SUP_ARCH   = i586
  
  ###############################################################################
  # Top-level Rules
@@@ -51,7 -50,7 +51,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- $(DL_FILE)_MD5 = b631ba6ba7b0d3c07de870c6104ffbd5
+ $(DL_FILE)_MD5 = 19792041adc25779b31ea5c5fdca7d8c
  
  install : $(TARGET)
  
@@@ -84,7 -83,7 +84,7 @@@ $(subst %,%_MD5,$(objects)) 
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redifinition.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redefinition.patch
        cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && install -m 644 x86/*.ko \

diff --combined lfs/qemu
index 049efff3eaf9b87b6847ec62c5de96489412c41e,20f594241a7df224fbdcfa864a57567f0a421c95..da2ea34ba24421d9c12d52497dd54bd3cfc79c24
--- 1/lfs/qemu
--- 2/lfs/qemu
+++ b/lfs/qemu
@@@ -24,16 -24,15 +24,16 @@@
  
  include Config
  
- VER        = 0.14.1
+ VER        = 0.15.0
  
- THISAPP    = qemu-$(VER)
+ THISAPP    = qemu-kvm-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
 +SUP_ARCH   = i586
  PROG       = qemu
- PAK_VER    = 11
+ PAK_VER    = 13
  
  DEPS       = "sdl"
  
@@@ -45,7 -44,7 +45,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
- $(DL_FILE)_MD5 = b6c713a8db638e173af53a62d5178640
+ $(DL_FILE)_MD5 = b45b0deebba4ce47dcaaab3807f6ed47
  
  install : $(TARGET)
  
@@@ -79,10 -78,11 +79,11 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
  
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch
+       cd $(DIR_APP) && sed -i -e 's|CFLAGS+="-march=i486"|CFLAGS+=""|g' configure
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-0.15.0_missing_definitions_hack.patch
  
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-               --target-list="i386-linux-user i386-softmmu"
+               --target-list="i386-linux-user i386-softmmu arm-softmmu"
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --combined make.sh
index b3abaceb4fb60ac783de334c4d1052c0f75186bf,99fc86f491c52699b8825c6b61c171ad9713d0d8..e229b98fa959515014a8abb8544ed7b5b502e4d8
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
- VERSION="2.9"                                                 # Version number
- CORE="52"                                                     # Core Level (Filename)
- PAKFIRE_CORE="51"                                             # Core Level (PAKFIRE)
+ VERSION="2.11"                                                        # Version number
+ CORE="53"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="52"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -189,11 -189,7 +189,11 @@@ prepareenv() 
      set +h
      LC_ALL=POSIX
      if [ -z $MAKETUNING ]; then
 -       MAKETUNING="-j6"
 +        if [ "${MACHINE:0:3}" = "arm" ]; then
 +            MAKETUNING="-j2"
 +        else
 +            MAKETUNING="-j6"
 +        fi
      fi
      export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
      unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
@@@ -247,19 -243,15 +247,19 @@@ buildtoolchain() 
  
      LOGFILE="$BASEDIR/log/_build.toolchain.log"
      export LOGFILE
 -    ORG_PATH=$PATH
      NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
      export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
 +    ORG_PATH=$PATH
 +    export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
      lfsmake1 ccache   PASS=1
      lfsmake1 make     PASS=1
      lfsmake1 binutils PASS=1
      lfsmake1 gcc              PASS=1
 -    export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
 -    lfsmake1 linux-libc-header
 +    if [ "${MACHINE_TYPE}" = "arm" ]; then
 +        lfsmake1 linux TOOLS=1 HEADERS=1
 +    else
 +        lfsmake1 linux-libc-header
 +    fi
      lfsmake1 glibc
      lfsmake1 cleanup-toolchain PASS=1
      lfsmake1 tcl
@@@ -286,6 -278,7 +286,7 @@@
      lfsmake1 tar
      lfsmake1 texinfo
      lfsmake1 util-linux
+     lfsmake1 strip
      lfsmake1 cleanup-toolchain        PASS=2
      export PATH=$ORG_PATH
  }
@@@ -294,11 -287,7 +295,11 @@@ buildbase() 
      LOGFILE="$BASEDIR/log/_build.base.log"
      export LOGFILE
      lfsmake2 stage2
 -    lfsmake2 linux-libc-header
 +    if [ "${MACHINE_TYPE}" = "arm" ]; then
 +        lfsmake2 linux HEADERS=1
 +    else
 +        lfsmake2 linux-libc-header
 +    fi
      lfsmake2 man-pages
      lfsmake2 glibc
      lfsmake2 cleanup-toolchain        PASS=3
@@@ -371,53 -360,42 +372,53 @@@ buildipfire() 
    ipfiremake xz
    ipfiremake linux-firmware
    ipfiremake zd1211-firmware
 -  ipfiremake linux                    XEN=1
 -  ipfiremake kqemu                    XEN=1
 -  ipfiremake v4l-dvb                  XEN=1
 -  ipfiremake madwifi                  XEN=1
 -  ipfiremake mISDN                    XEN=1
 -  ipfiremake dahdi                    XEN=1 KMOD=1
 -  ipfiremake cryptodev                        XEN=1
 -  ipfiremake compat-wireless          XEN=1
 -  ipfiremake r8169                    XEN=1
 -  ipfiremake r8168                    XEN=1
 -  ipfiremake r8101                    XEN=1
 -  ipfiremake e1000                    XEN=1
 -  ipfiremake e1000e                   XEN=1
 -  ipfiremake igb                      XEN=1
 -  ipfiremake linux                    PAE=1
 -  ipfiremake kqemu                    PAE=1
 -  ipfiremake kvm-kmod                 PAE=1
 -  ipfiremake v4l-dvb                  PAE=1
 -  ipfiremake madwifi                  PAE=1
 -  ipfiremake alsa                     PAE=1 KMOD=1
 -  ipfiremake mISDN                    PAE=1
 -  ipfiremake dahdi                    PAE=1 KMOD=1
 -  ipfiremake cryptodev                        PAE=1
 -  ipfiremake compat-wireless          PAE=1
 -#  ipfiremake r8169                   PAE=1
 -#  ipfiremake r8168                   PAE=1
 -#  ipfiremake r8101                   PAE=1
 -  ipfiremake e1000                    PAE=1
 -  ipfiremake e1000e                   PAE=1
 -  ipfiremake igb                      PAE=1
 +  ipfiremake u-boot
 +
 +  # The xen and PAE kernels are only available for x86
 +  if [ "${MACHINE_TYPE}" != "arm" ]; then
 +    ipfiremake linux                  XEN=1
 +    ipfiremake kqemu                  XEN=1
 +    ipfiremake v4l-dvb                        XEN=1
 +    ipfiremake madwifi                        XEN=1
 +    ipfiremake mISDN                  XEN=1
 +    ipfiremake dahdi                  XEN=1 KMOD=1
 +    ipfiremake cryptodev                      XEN=1
 +    ipfiremake compat-wireless                XEN=1
 +    ipfiremake r8169                  XEN=1
 +    ipfiremake r8168                  XEN=1
 +    ipfiremake r8101                  XEN=1
 +    ipfiremake e1000                  XEN=1
 +    ipfiremake e1000e                 XEN=1
 +    ipfiremake igb                    XEN=1
 +    ipfiremake linux                  PAE=1
 +    ipfiremake kqemu                  PAE=1
 +    ipfiremake kvm-kmod                       PAE=1
 +    ipfiremake v4l-dvb                        PAE=1
 +    ipfiremake madwifi                        PAE=1
 +    ipfiremake alsa                   PAE=1 KMOD=1
 +    ipfiremake mISDN                  PAE=1
 +    ipfiremake dahdi                  PAE=1 KMOD=1
 +    ipfiremake cryptodev                      PAE=1
 +    ipfiremake compat-wireless                PAE=1
 +#    ipfiremake r8169                 PAE=1
 +#    ipfiremake r8168                 PAE=1
 +#    ipfiremake r8101                 PAE=1
 +    ipfiremake e1000                  PAE=1
 +    ipfiremake e1000e                 PAE=1
 +    ipfiremake igb                    PAE=1
 +  fi
 +
 +  # Default kernel build
    ipfiremake linux
 +  ipfiremake v4l-dvb
    ipfiremake kqemu
    ipfiremake kvm-kmod
 -  ipfiremake v4l-dvb
    ipfiremake madwifi
 -  ipfiremake alsa                     KMOD=1
 +  if [ "${MACHINE_TYPE}" = "arm" ]; then
 +    #todo enable alsa driver in kernel config
 +    ipfiremake alsa                   KMOD=1
 +  fi
 +  #undefined declaration in echo canceler try to fix later
    ipfiremake mISDN
    ipfiremake dahdi                    KMOD=1
    ipfiremake cryptodev
@@@ -431,6 -409,9 +432,6 @@@
    ipfiremake pkg-config
    ipfiremake linux-atm
    ipfiremake cpio
 -
 -  installmake strip
 -
    ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
@@@ -472,7 -453,7 +473,7 @@@
    ipfiremake arping
    ipfiremake beep
    ipfiremake bind
 -  ipfiremake cdrtools
 +  ipfiremake dvdrtools
    ipfiremake dnsmasq
    ipfiremake dosfstools
    ipfiremake reiserfsprogs
@@@ -557,7 -538,6 +558,6 @@@
    ipfiremake wireless
    ipfiremake libsafe
    ipfiremake pakfire
-   ipfiremake java
    ipfiremake spandsp
    ipfiremake lzo
    ipfiremake openvpn
@@@ -713,8 -693,7 +713,7 @@@
    ipfiremake python-m2crypto
    ipfiremake wireless-regdb
    ipfiremake crda
-   ipfiremake libsatsolver
-   ipfiremake python-satsolver
+   ipfiremake libsolv
    ipfiremake python-distutils-extra
    ipfiremake python-lzma
    ipfiremake python-progressbar
@@@ -730,7 -709,7 +729,7 @@@
    echo >> $BASEDIR/build/var/ipfire/firebuild
    cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
    echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-   if [ "$GIT_BRANCH" = "master" ]; then
+   if [ "$GIT_BRANCH" = "next" ]; then
        echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
    else
        echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
@@@ -776,13 -755,11 +775,13 @@@ buildpackages() 
    $0 git log
  
    # Create images for install
 -      ipfiremake cdrom ED=$IPFVER
 +  ipfiremake cdrom ED=$IPFVER
  
    # Check if there is a loop device for building in virtual environments
 -  if [ $BUILD_IMAGES == 1 ] &&  ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
 -      ipfiremake usb-stick ED=$IPFVER
 +  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
 +      if [ "${MACHINE_TYPE}" != "arm" ]; then
 +              ipfiremake usb-stick ED=$IPFVER
 +      fi
        ipfiremake flash-images ED=$IPFVER
    fi
  
@@@ -845,7 -822,7 +844,7 @@@ ipfirepackages() 
  case "$1" in 
  build)
        clear
-       PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
+       PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz 2> /dev/null | head -n 1`
        #only restore on a clean disk
        if [ ! -f log/cleanup-toolchain-2-tools ]; then
                if [ ! -n "$PACKAGE" ]; then
@@@ -936,10 -913,8 +935,10 @@@ downloadsrc
                cd $BASEDIR/lfs
                for i in *; do
                        if [ -f "$i" -a "$i" != "Config" ]; then
 -                              echo -ne "Loading $i"
 -                              make -s -f $i LFS_BASEDIR=$BASEDIR MESSAGE="$i\t ($c/$MAX_RETRIES)" download >> $LOGFILE 2>&1
 +                              lfsmakecommoncheck ${i} || continue
 +
 +                              make -s -f $i LFS_BASEDIR=$BASEDIR MACHINE=$MACHINE \
 +                                      MESSAGE="$i\t ($c/$MAX_RETRIES)" download >> $LOGFILE 2>&1
                                if [ $? -ne 0 ]; then
                                        beautify message FAIL
                                        FINISHED=0
@@@ -955,8 -930,7 +954,8 @@@
        ERROR=0
        for i in *; do
                if [ -f "$i" -a "$i" != "Config" ]; then
 -                      make -s -f $i LFS_BASEDIR=$BASEDIR MESSAGE="$i\t " md5 >> $LOGFILE 2>&1
 +                      make -s -f $i LFS_BASEDIR=$BASEDIR MACHINE=$MACHINE \
 +                              MESSAGE="$i\t " md5 >> $LOGFILE 2>&1
                        if [ $? -ne 0 ]; then
                                echo -ne "MD5 difference in lfs/$i"
                                beautify message FAIL
@@@ -978,27 -952,27 +977,27 @@@ toolchain
        prepareenv
        beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
        buildtoolchain
-       echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
+       echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $MACHINE" | tee -a $LOGFILE
        test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
-       cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
+       cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \
                build/{bin,etc,usr/bin,usr/local} \
 -              build/tools/{bin,etc,*-linux-gnu,include,lib,libexec,sbin,share,var} \
 +              build/tools/{bin,etc,*-linux-gnu*,include,lib,libexec,sbin,share,var} \
                log >> $LOGFILE
-       md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
-               > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.md5
+       md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \
+               > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.md5
        stdumount
        ;;
  gettoolchain)
        # arbitrary name to be updated in case of new toolchain package upload
-       PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE
+       PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE
        if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then
                URL_TOOLCHAIN=`grep URL_TOOLCHAIN lfs/Config | awk '{ print $3 }'`
                test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
-               echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
+               echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $MACHINE" | tee -a $LOGFILE
                cd $BASEDIR/cache/toolchains
                wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
                if [ $? -ne 0 ]; then
-                       echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
+                       echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $MACHINE machine" | tee -a $LOGFILE
                else
                        if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
                                echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE

diff --combined src/pakfire/pakfire.conf
index c408a6aaa933a1c073a9376a42cdfe4d2e5f04b6,7e7b8d59bc3ad45e1f7dd5b5dc5537db4407f8e8..be75bf5a00ca00d086554b6328ce4a5425462196
--- 1/src/pakfire/pakfire.conf
--- 2/src/pakfire/pakfire.conf
+++ b/src/pakfire/pakfire.conf
@@@ -2,7 -2,7 +2,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
- # Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+ # Copyright (C) 2011  IPFire Team  <info@ipfire.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        #
@@@ -21,7 -21,7 +21,7 @@@
  
  package Conf;
  
 -$version = "2.11";
 +$version = "@VERSION@";
  
  $mainserver = "pakfire.ipfire.org";