Hinzugefuegt:

  * Net-Tools
  * Inetutils
  * Ed

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@316 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/gcc b/config/rootfiles/common/gcc
new file mode 100644 (file)
index 0000000..5aa76f2
--- /dev/null
+++ b/config/rootfiles/common/gcc
@@ -0,0 +1,346 @@
+#lib/cpp
+#usr/bin/c++
+#usr/bin/cc
+#usr/bin/cpp
+#usr/bin/g##
+#usr/bin/gcc
+#usr/bin/gccbug
+#usr/bin/gcov
+#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.0.3
+#usr/include/c++
+#usr/include/c++/4.0.3
+#usr/include/c++/4.0.3/algorithm
+#usr/include/c++/4.0.3/backward
+#usr/include/c++/4.0.3/backward/algo.h
+#usr/include/c++/4.0.3/backward/algobase.h
+#usr/include/c++/4.0.3/backward/alloc.h
+#usr/include/c++/4.0.3/backward/backward_warning.h
+#usr/include/c++/4.0.3/backward/bvector.h
+#usr/include/c++/4.0.3/backward/complex.h
+#usr/include/c++/4.0.3/backward/defalloc.h
+#usr/include/c++/4.0.3/backward/deque.h
+#usr/include/c++/4.0.3/backward/fstream.h
+#usr/include/c++/4.0.3/backward/function.h
+#usr/include/c++/4.0.3/backward/hash_map.h
+#usr/include/c++/4.0.3/backward/hash_set.h
+#usr/include/c++/4.0.3/backward/hashtable.h
+#usr/include/c++/4.0.3/backward/heap.h
+#usr/include/c++/4.0.3/backward/iomanip.h
+#usr/include/c++/4.0.3/backward/iostream.h
+#usr/include/c++/4.0.3/backward/istream.h
+#usr/include/c++/4.0.3/backward/iterator.h
+#usr/include/c++/4.0.3/backward/list.h
+#usr/include/c++/4.0.3/backward/map.h
+#usr/include/c++/4.0.3/backward/multimap.h
+#usr/include/c++/4.0.3/backward/multiset.h
+#usr/include/c++/4.0.3/backward/new.h
+#usr/include/c++/4.0.3/backward/ostream.h
+#usr/include/c++/4.0.3/backward/pair.h
+#usr/include/c++/4.0.3/backward/queue.h
+#usr/include/c++/4.0.3/backward/rope.h
+#usr/include/c++/4.0.3/backward/set.h
+#usr/include/c++/4.0.3/backward/slist.h
+#usr/include/c++/4.0.3/backward/stack.h
+#usr/include/c++/4.0.3/backward/stream.h
+#usr/include/c++/4.0.3/backward/streambuf.h
+#usr/include/c++/4.0.3/backward/strstream
+#usr/include/c++/4.0.3/backward/tempbuf.h
+#usr/include/c++/4.0.3/backward/tree.h
+#usr/include/c++/4.0.3/backward/vector.h
+#usr/include/c++/4.0.3/bits
+#usr/include/c++/4.0.3/bits/allocator.h
+#usr/include/c++/4.0.3/bits/atomicity.h
+#usr/include/c++/4.0.3/bits/basic_ios.h
+#usr/include/c++/4.0.3/bits/basic_ios.tcc
+#usr/include/c++/4.0.3/bits/basic_string.h
+#usr/include/c++/4.0.3/bits/basic_string.tcc
+#usr/include/c++/4.0.3/bits/boost_concept_check.h
+#usr/include/c++/4.0.3/bits/char_traits.h
+#usr/include/c++/4.0.3/bits/cmath.tcc
+#usr/include/c++/4.0.3/bits/codecvt.h
+#usr/include/c++/4.0.3/bits/concept_check.h
+#usr/include/c++/4.0.3/bits/concurrence.h
+#usr/include/c++/4.0.3/bits/cpp_type_traits.h
+#usr/include/c++/4.0.3/bits/deque.tcc
+#usr/include/c++/4.0.3/bits/fstream.tcc
+#usr/include/c++/4.0.3/bits/functexcept.h
+#usr/include/c++/4.0.3/bits/gslice.h
+#usr/include/c++/4.0.3/bits/gslice_array.h
+#usr/include/c++/4.0.3/bits/indirect_array.h
+#usr/include/c++/4.0.3/bits/ios_base.h
+#usr/include/c++/4.0.3/bits/istream.tcc
+#usr/include/c++/4.0.3/bits/list.tcc
+#usr/include/c++/4.0.3/bits/locale_classes.h
+#usr/include/c++/4.0.3/bits/locale_facets.h
+#usr/include/c++/4.0.3/bits/locale_facets.tcc
+#usr/include/c++/4.0.3/bits/localefwd.h
+#usr/include/c++/4.0.3/bits/mask_array.h
+#usr/include/c++/4.0.3/bits/ostream.tcc
+#usr/include/c++/4.0.3/bits/postypes.h
+#usr/include/c++/4.0.3/bits/slice_array.h
+#usr/include/c++/4.0.3/bits/sstream.tcc
+#usr/include/c++/4.0.3/bits/stl_algo.h
+#usr/include/c++/4.0.3/bits/stl_algobase.h
+#usr/include/c++/4.0.3/bits/stl_bvector.h
+#usr/include/c++/4.0.3/bits/stl_construct.h
+#usr/include/c++/4.0.3/bits/stl_deque.h
+#usr/include/c++/4.0.3/bits/stl_function.h
+#usr/include/c++/4.0.3/bits/stl_heap.h
+#usr/include/c++/4.0.3/bits/stl_iterator.h
+#usr/include/c++/4.0.3/bits/stl_iterator_base_funcs.h
+#usr/include/c++/4.0.3/bits/stl_iterator_base_types.h
+#usr/include/c++/4.0.3/bits/stl_list.h
+#usr/include/c++/4.0.3/bits/stl_map.h
+#usr/include/c++/4.0.3/bits/stl_multimap.h
+#usr/include/c++/4.0.3/bits/stl_multiset.h
+#usr/include/c++/4.0.3/bits/stl_numeric.h
+#usr/include/c++/4.0.3/bits/stl_pair.h
+#usr/include/c++/4.0.3/bits/stl_queue.h
+#usr/include/c++/4.0.3/bits/stl_raw_storage_iter.h
+#usr/include/c++/4.0.3/bits/stl_relops.h
+#usr/include/c++/4.0.3/bits/stl_set.h
+#usr/include/c++/4.0.3/bits/stl_stack.h
+#usr/include/c++/4.0.3/bits/stl_tempbuf.h
+#usr/include/c++/4.0.3/bits/stl_tree.h
+#usr/include/c++/4.0.3/bits/stl_uninitialized.h
+#usr/include/c++/4.0.3/bits/stl_vector.h
+#usr/include/c++/4.0.3/bits/stream_iterator.h
+#usr/include/c++/4.0.3/bits/streambuf.tcc
+#usr/include/c++/4.0.3/bits/streambuf_iterator.h
+#usr/include/c++/4.0.3/bits/stringfwd.h
+#usr/include/c++/4.0.3/bits/valarray_after.h
+#usr/include/c++/4.0.3/bits/valarray_array.h
+#usr/include/c++/4.0.3/bits/valarray_array.tcc
+#usr/include/c++/4.0.3/bits/valarray_before.h
+#usr/include/c++/4.0.3/bits/vector.tcc
+#usr/include/c++/4.0.3/bitset
+#usr/include/c++/4.0.3/cassert
+#usr/include/c++/4.0.3/cctype
+#usr/include/c++/4.0.3/cerrno
+#usr/include/c++/4.0.3/cfloat
+#usr/include/c++/4.0.3/ciso646
+#usr/include/c++/4.0.3/climits
+#usr/include/c++/4.0.3/clocale
+#usr/include/c++/4.0.3/cmath
+#usr/include/c++/4.0.3/complex
+#usr/include/c++/4.0.3/csetjmp
+#usr/include/c++/4.0.3/csignal
+#usr/include/c++/4.0.3/cstdarg
+#usr/include/c++/4.0.3/cstddef
+#usr/include/c++/4.0.3/cstdio
+#usr/include/c++/4.0.3/cstdlib
+#usr/include/c++/4.0.3/cstring
+#usr/include/c++/4.0.3/ctime
+#usr/include/c++/4.0.3/cwchar
+#usr/include/c++/4.0.3/cwctype
+#usr/include/c++/4.0.3/cxxabi.h
+#usr/include/c++/4.0.3/debug
+#usr/include/c++/4.0.3/debug/bitset
+#usr/include/c++/4.0.3/debug/debug.h
+#usr/include/c++/4.0.3/debug/deque
+#usr/include/c++/4.0.3/debug/formatter.h
+#usr/include/c++/4.0.3/debug/hash_map
+#usr/include/c++/4.0.3/debug/hash_map.h
+#usr/include/c++/4.0.3/debug/hash_multimap.h
+#usr/include/c++/4.0.3/debug/hash_multiset.h
+#usr/include/c++/4.0.3/debug/hash_set
+#usr/include/c++/4.0.3/debug/hash_set.h
+#usr/include/c++/4.0.3/debug/list
+#usr/include/c++/4.0.3/debug/map
+#usr/include/c++/4.0.3/debug/map.h
+#usr/include/c++/4.0.3/debug/multimap.h
+#usr/include/c++/4.0.3/debug/multiset.h
+#usr/include/c++/4.0.3/debug/safe_base.h
+#usr/include/c++/4.0.3/debug/safe_iterator.h
+#usr/include/c++/4.0.3/debug/safe_iterator.tcc
+#usr/include/c++/4.0.3/debug/safe_sequence.h
+#usr/include/c++/4.0.3/debug/set
+#usr/include/c++/4.0.3/debug/set.h
+#usr/include/c++/4.0.3/debug/string
+#usr/include/c++/4.0.3/debug/vector
+#usr/include/c++/4.0.3/deque
+#usr/include/c++/4.0.3/exception
+#usr/include/c++/4.0.3/exception_defines.h
+#usr/include/c++/4.0.3/ext
+#usr/include/c++/4.0.3/ext/algorithm
+#usr/include/c++/4.0.3/ext/array_allocator.h
+#usr/include/c++/4.0.3/ext/bitmap_allocator.h
+#usr/include/c++/4.0.3/ext/codecvt_specializations.h
+#usr/include/c++/4.0.3/ext/debug_allocator.h
+#usr/include/c++/4.0.3/ext/functional
+#usr/include/c++/4.0.3/ext/hash_fun.h
+#usr/include/c++/4.0.3/ext/hash_map
+#usr/include/c++/4.0.3/ext/hash_set
+#usr/include/c++/4.0.3/ext/hashtable.h
+#usr/include/c++/4.0.3/ext/iterator
+#usr/include/c++/4.0.3/ext/malloc_allocator.h
+#usr/include/c++/4.0.3/ext/memory
+#usr/include/c++/4.0.3/ext/mt_allocator.h
+#usr/include/c++/4.0.3/ext/new_allocator.h
+#usr/include/c++/4.0.3/ext/numeric
+#usr/include/c++/4.0.3/ext/pod_char_traits.h
+#usr/include/c++/4.0.3/ext/pool_allocator.h
+#usr/include/c++/4.0.3/ext/rb_tree
+#usr/include/c++/4.0.3/ext/rope
+#usr/include/c++/4.0.3/ext/ropeimpl.h
+#usr/include/c++/4.0.3/ext/slist
+#usr/include/c++/4.0.3/ext/stdio_filebuf.h
+#usr/include/c++/4.0.3/ext/stdio_sync_filebuf.h
+#usr/include/c++/4.0.3/fstream
+#usr/include/c++/4.0.3/functional
+#usr/include/c++/4.0.3/i586-pc-linux-gnu
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/atomic_word.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/basic_file.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/c++allocator.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/c++config.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/c++io.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/c++locale.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/ctype_base.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/ctype_inline.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/ctype_noninline.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/cxxabi_tweaks.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/gthr-default.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/gthr-posix.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/gthr-single.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/gthr-tpf.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/gthr.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/messages_members.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/os_defines.h
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/stdc++.h.gch
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/stdc++.h.gch/O0g.gch
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/stdc++.h.gch/O2g.gch
+#usr/include/c++/4.0.3/i586-pc-linux-gnu/bits/time_members.h
+#usr/include/c++/4.0.3/iomanip
+#usr/include/c++/4.0.3/ios
+#usr/include/c++/4.0.3/iosfwd
+#usr/include/c++/4.0.3/iostream
+#usr/include/c++/4.0.3/istream
+#usr/include/c++/4.0.3/iterator
+#usr/include/c++/4.0.3/limits
+#usr/include/c++/4.0.3/list
+#usr/include/c++/4.0.3/locale
+#usr/include/c++/4.0.3/map
+#usr/include/c++/4.0.3/memory
+#usr/include/c++/4.0.3/new
+#usr/include/c++/4.0.3/numeric
+#usr/include/c++/4.0.3/ostream
+#usr/include/c++/4.0.3/queue
+#usr/include/c++/4.0.3/set
+#usr/include/c++/4.0.3/sstream
+#usr/include/c++/4.0.3/stack
+#usr/include/c++/4.0.3/stdexcept
+#usr/include/c++/4.0.3/streambuf
+#usr/include/c++/4.0.3/string
+#usr/include/c++/4.0.3/tr1
+#usr/include/c++/4.0.3/tr1/array
+#usr/include/c++/4.0.3/tr1/bind_iterate.h
+#usr/include/c++/4.0.3/tr1/bind_repeat.h
+#usr/include/c++/4.0.3/tr1/boost_shared_ptr.h
+#usr/include/c++/4.0.3/tr1/functional
+#usr/include/c++/4.0.3/tr1/functional_iterate.h
+#usr/include/c++/4.0.3/tr1/hashtable
+#usr/include/c++/4.0.3/tr1/memory
+#usr/include/c++/4.0.3/tr1/mu_iterate.h
+#usr/include/c++/4.0.3/tr1/ref_fwd.h
+#usr/include/c++/4.0.3/tr1/ref_wrap_iterate.h
+#usr/include/c++/4.0.3/tr1/repeat.h
+#usr/include/c++/4.0.3/tr1/tuple
+#usr/include/c++/4.0.3/tr1/tuple_iterate.h
+#usr/include/c++/4.0.3/tr1/type_traits
+#usr/include/c++/4.0.3/tr1/type_traits_fwd.h
+#usr/include/c++/4.0.3/tr1/unordered_map
+#usr/include/c++/4.0.3/tr1/unordered_set
+#usr/include/c++/4.0.3/tr1/utility
+#usr/include/c++/4.0.3/typeinfo
+#usr/include/c++/4.0.3/utility
+#usr/include/c++/4.0.3/valarray
+#usr/include/c++/4.0.3/vector
+#usr/include/mf-runtime.h
+#usr/info/cpp.info
+#usr/info/cppinternals.info
+#usr/info/gcc.info
+#usr/info/gccinstall.info
+#usr/info/gccint.info
+#usr/lib/gcc
+#usr/lib/gcc/i586-pc-linux-gnu
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/cc1
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/cc1plus
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/collect2
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/crtbegin.o
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/crtbeginS.o
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/crtbeginT.o
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/crtend.o
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/crtendS.o
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/README
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/emmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/float.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/iso646.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/limits.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/mm3dnow.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/mm_malloc.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/mmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/pmmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/stdarg.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/stdbool.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/stddef.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/syslimits.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/unwind.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/varargs.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/include/xmmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/fixinc.sh
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/fixincl
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/gsyslimits.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/README
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/emmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/float.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/iso646.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/limits.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/mm3dnow.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/mm_malloc.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/mmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/pmmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/stdarg.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/stdbool.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/stddef.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/unwind.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/varargs.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/include/xmmintrin.h
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/macro_list
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/mkheaders
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/install-tools/mkheaders.conf
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/libgcc.a
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/libgcc_eh.a
+#usr/lib/gcc/i586-pc-linux-gnu/4.0.3/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/libmudflapth.a
+#usr/lib/libmudflapth.la
+#usr/lib/libmudflapth.so
+#usr/lib/libmudflapth.so.0
+#usr/lib/libmudflapth.so.0.0.0
+#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/libsupc++.a
+#usr/lib/libsupc++.la
+#usr/man/man1/cpp.1
+#usr/man/man1/g##.1
+#usr/man/man1/gcc.1
+#usr/man/man1/gcov.1
+#usr/man/man7
+#usr/man/man7/fsf-funding.7
+#usr/man/man7/gfdl.7
+#usr/man/man7/gpl.7

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
new file mode 100644 (file)
index 0000000..30574bb
--- /dev/null
+++ b/config/rootfiles/common/stage2
@@ -0,0 +1,114 @@
+#bin/bash
+#bin/cat
+#bin/grep
+#bin/pwd
+#bin/stty
+#boot
+etc/certparams
+etc/fstab
+etc/group
+etc/host.conf
+etc/inittab
+etc/inputrc
+etc/issue
+etc/ld.so.conf
+etc/logrotate.conf
+etc/mime.types
+etc/modules.conf
+etc/mtab
+etc/nsswitch.conf
+#etc/opt
+etc/passwd
+etc/profile
+etc/resolv.conf
+etc/securetty
+etc/sysctl.conf
+etc/syslog.conf
+#home
+home/nobody
+#lib
+#media
+media/cdrom
+media/floppy
+mnt
+opt
+root
+sbin
+srv
+#usr/bin/perl
+#usr/include
+#usr/lib
+#usr/lib/libgcc_s.so
+#usr/lib/libgcc_s.so.1
+#usr/local/bin/connscheduler
+#usr/local/bin/hddshutdown
+#usr/local/bin/hddshutdown-state
+#usr/local/bin/httpscert
+#usr/local/bin/langcache
+#usr/local/bin/makegraphs
+#usr/local/bin/packager
+#usr/local/bin/qosd
+#usr/local/bin/readhash
+#usr/local/bin/resetusb
+#usr/local/bin/run-parts
+#usr/local/bin/setddns.pl
+#usr/local/bin/setreservedports
+#usr/local/bin/settime
+#usr/local/bin/timecheck
+#usr/local/bin/tunerrd.pl
+#usr/local/bin/vpn-restart
+#usr/local/include
+#usr/local/lib
+#usr/local/sbin
+#usr/local/share
+#usr/local/share/doc
+#usr/local/share/info
+#usr/local/share/locale
+#usr/local/share/man
+#usr/local/share/man/man1
+#usr/local/share/man/man2
+#usr/local/share/man/man3
+#usr/local/share/man/man4
+#usr/local/share/man/man5
+#usr/local/share/man/man6
+#usr/local/share/man/man7
+#usr/local/share/man/man8
+#usr/local/share/misc
+#usr/local/share/terminfo
+#usr/local/share/zoneinfo
+#usr/local/src
+#usr/sbin
+#usr/share
+#usr/share/doc
+#usr/share/info
+#usr/share/locale
+#usr/share/man
+#usr/share/man/man1
+#usr/share/man/man2
+#usr/share/man/man3
+#usr/share/man/man4
+#usr/share/man/man5
+#usr/share/man/man6
+#usr/share/man/man7
+#usr/share/man/man8
+#usr/share/misc
+#usr/share/terminfo
+#usr/share/zoneinfo
+#var
+var/cache
+var/empty
+var/lib
+var/lib/locate
+var/lib/misc
+#var/local
+var/lock
+var/log
+var/log/btmp
+var/log/lastlog
+var/log/wtmp
+var/mail
+#var/opt
+var/run
+var/run/utmp
+var/spool
+var/tmp

diff --git a/lfs/ed b/lfs/ed
index 3d22ed8246a7f5101ba7bb7e968de710458d07a5..a7810c752a4c61887fc8710644a64e8c8c4557fc 100644 (file)
--- a/lfs/ed
+++ b/lfs/ed
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #

-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ed,v 1.3.2.2 2005/02/05 15:38:14 gespinasse Exp $
-#                                                                             #

 ###############################################################################
 
 ###############################################################################
 ###############################################################################
 
 ###############################################################################


@@ -36,7 +30,7 @@ VER        = 0.2
 
 THISAPP    = ed-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 THISAPP    = ed-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

-DL_FROM    = $(URL_GNU)/ed
+DL_FROM    = $(URL_IPFIRE)

 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 


@@ -80,9 +74,8 @@ $(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_DL)/$(THISAPP)-mkstemp-1.patch
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-mkstemp-1.patch

-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix="" --disable-nls

        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install

-       mv -f /usr/bin/{ed,red} /bin

        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/inetutils b/lfs/inetutils
index 69cc272e9220924b6da920b3f45b7b3ba8b61a65..ae78dd287f515a3e266ac7a8a0ca91569bbba62a 100644 (file)
--- a/lfs/inetutils
+++ b/lfs/inetutils
@@ -73,11 +73,11 @@ $(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)-gcc4_fixes-3.patch
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-3.patch

-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-no_server_man_pages-1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-daemon_fixes-1.patch

        cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin \
        cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin \

-                                       --sysconfdir=/etc --localstatedir=/var \
-                                       --disable-logger --disable-syslogd \
-                                       --disable-whois --disable-servers
+                               --sysconfdir=/etc --localstatedir=/var \
+                               --mandir=/usr/share/man --infodir=/usr/share/info \
+                               --disable-logger --disable-syslogd

        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        mv -v /usr/bin/ping /bin
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        mv -v /usr/bin/ping /bin

diff --git a/lfs/net-tools b/lfs/net-tools
index b06707db7e427f8bbde030b9d5519f4091eb00b2..e3d923206a4b08dc63262dca7194c99b414ad1ee 100644 (file)
--- a/lfs/net-tools
+++ b/lfs/net-tools
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #

-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: net-tools,v 1.5.2.8 2005/08/13 08:09:10 eoberlander Exp $
-#                                                                             #

 ###############################################################################
 
 ###############################################################################
 ###############################################################################
 
 ###############################################################################


@@ -36,20 +30,18 @@ VER        = 1.60
 
 THISAPP    = net-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 
 THISAPP    = net-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2

-DL_FROM    = http://www.tazenda.demon.co.uk/phil/net-tools
+DL_FROM    = $(URL_IPFIRE)

 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################

-objects = $(DL_FILE) $(THISAPP)-miitool_gcc33-1.patch
+objects = $(DL_FILE)

 
 $(DL_FILE)                            = $(DL_FROM)/$(DL_FILE)
 
 $(DL_FILE)                            = $(DL_FROM)/$(DL_FILE)

-$(THISAPP)-miitool_gcc33-1.patch      = $(URL_LFS)/net-tools/$(THISAPP)-miitool_gcc33-1.patch

 
 $(DL_FILE)_MD5                        = 888774accab40217dde927e21979c165
 
 $(DL_FILE)_MD5                        = 888774accab40217dde927e21979c165

-$(THISAPP)-miitool_gcc33-1.patch_MD5  = fc629313c10ebd75abd2750aafbaa0be

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -79,30 +71,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 $(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_DL)/$(THISAPP)-miitool_gcc33-1.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-get_name.patch
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/$(THISAPP)-cleanup-list-handling.patch
-       # correct bits to Bytes in output from /sbin/ifconfig
-       cd $(DIR_APP)/lib && sed -i \
-           -e 's/"Mb"/"MB"/g' \
-           -e 's/"Kb"/"KB"/g' interface.c 
-       cd $(DIR_APP) && sed -i \
-           -e 's/HAVE_AFIPX y/HAVE_AFIPX n/' \
-           -e 's/HAVE_AFATALK y/HAVE_AFATALK n/' \
-           -e 's/HAVE_AFAX25 y/HAVE_AFAX25 n/' \
-           -e 's/HAVE_AFNETROM y/HAVE_AFNETROM n/' \
-           -e 's/HAVE_AFX25 y/HAVE_AFX25 n/' \
-           -e 's/HAVE_HWSTRIP y/HAVE_HWSTRIP n/' \
-           -e 's/HAVE_HWX25 y/HAVE_HWX25 n/' \
-           -e 's/HAVE_HWNETROM y/HAVE_HWNETROM n/' \
-           -e 's/HAVE_HWARC y/HAVE_HWARC n/' \
-           -e 's/HAVE_HWTR y/HAVE_HWTR n/' \
-           -e 's/HAVE_HWAX25 y/HAVE_HWAX25 n/' \
-           -e 's/HAVE_HWFR y/HAVE_HWFR n/' \
-           -e 's/HAVE_HWIRDA y/HAVE_HWIRDA n/' \
-           -e 's/HAVE_MII n/HAVE_MII y/' config.in
-       cd $(DIR_APP) && sed -i -e 's/DNLIB = -ldnet/DNLIB =/' Makefile
-       cd $(DIR_APP) && yes '' | make config
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-gcc34-3.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-kernel_headers-2.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-mii_ioctl-1.patch
+       cd $(DIR_APP) && yes "" | make config
+       cd $(DIR_APP) && sed -i -e 's|HAVE_IP_TOOLS 0|HAVE_IP_TOOLS 1|g' \
+                                       -e 's|HAVE_MII 0|HAVE_MII 1|g' config.h
+       cd $(DIR_APP) && sed -i -e 's|# HAVE_IP_TOOLS=0|HAVE_IP_TOOLS=1|g' \
+                                       -e 's|# HAVE_MII=0|HAVE_MII=1|g' config.make

        cd $(DIR_APP) && make
        cd $(DIR_APP) && make update
        @rm -rf $(DIR_APP)
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make update
        @rm -rf $(DIR_APP)

diff --git a/make.sh b/make.sh
index 6476ab0ebcf86daa20c109d39975f1a622ed81e9..3fd8fa041d3e82e2a886de4a7f23c42d923e403d 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -300,16 +300,14 @@ buildbase() {
     lfsmake2 udev
     lfsmake2 util-linux
     lfsmake2 vim
     lfsmake2 udev
     lfsmake2 util-linux
     lfsmake2 vim

-####
-#    lfsmake2 net-tools
-#    lfsmake2 inetutils
-#    lfsmake2 ed
-#    lfsmake2 procinfo

 }
 
 buildipfire() {
   LOGFILE="$BASEDIR/log/_build.ipfire.log"
   export LOGFILE
 }
 
 buildipfire() {
   LOGFILE="$BASEDIR/log/_build.ipfire.log"
   export LOGFILE

+  ipfiremake inetutils
+  ipfiremake net-tools
+  ipfiremake ed

   ipfiremake configroot
   ipfiremake dhcp
   ipfiremake dhcpcd
   ipfiremake configroot
   ipfiremake dhcp
   ipfiremake dhcpcd

diff --git a/src/patches/inetutils-1.4.2-daemon_fixes-1.patch b/src/patches/inetutils-1.4.2-daemon_fixes-1.patch
new file mode 100644 (file)
index 0000000..c57f9ae
--- /dev/null
+++ b/src/patches/inetutils-1.4.2-daemon_fixes-1.patch
@@ -0,0 +1,166 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-03-23
+Initial Package Version: 1.4.2
+Upstream Status:         Not sure
+Origin:                  Internet (URL's are now lost)
+Description:             Fix the rexecd daemon so that it understands shadow
+                         passwords. Fix the rshd daemon so that it properly
+                         resolves hostnames.
+
+diff -Naur inetutils-1.4.2-orig/rexecd/rexecd.c inetutils-1.4.2/rexecd/rexecd.c
+--- inetutils-1.4.2-orig/rexecd/rexecd.c       2002-12-11 12:38:00.000000000 +0000
++++ inetutils-1.4.2/rexecd/rexecd.c    2005-02-22 19:53:44.146962264 +0000
+@@ -79,6 +79,10 @@
+ #include <varargs.h>
+ #endif
+ 
++#ifdef HAVE_SHADOW_H
++#include <shadow.h>
++#endif
++
+ void error __P ((const char *fmt, ...));
+ /*
+  * remote execute server:
+@@ -127,6 +131,10 @@
+       char *cmdbuf, *cp, *namep;
+       char *user, *pass;
+       struct passwd *pwd;
++#ifdef HAVE_SHADOW_H
++      struct spwd *spwd;
++      char *pw_field;
++#endif
+       int s;
+       u_short port;
+       int pv[2], pid, cc;
+@@ -186,6 +194,24 @@
+               exit(1);
+       }
+       endpwent();
++
++#ifdef HAVE_SHADOW_H
++      // Get encrypted password from /etc/shadow if possible,
++      // else from /etc/passwd.
++      spwd = getspnam(user);
++      if (spwd) {
++              pw_field = spwd->sp_pwdp;
++      } else {
++              pw_field = pwd->pw_passwd;
++      }
++      if (*pw_field != '\0') {
++              namep = CRYPT (pass, pw_field);
++              if (strcmp(namep, pw_field)) {
++                      error("Password incorrect.\n");
++                      exit(1);
++              }
++      }
++#else
+       if (*pwd->pw_passwd != '\0') {
+               namep = CRYPT (pass, pwd->pw_passwd);
+               if (strcmp(namep, pwd->pw_passwd)) {
+@@ -193,6 +219,7 @@
+                       exit(1);
+               }
+       }
++#endif
+       write(STDERR_FILENO, "\0", 1);
+       if (port) {
+               pipe(pv);
+diff -Naur inetutils-1.4.2-orig/rshd/rshd.c inetutils-1.4.2/rshd/rshd.c
+--- inetutils-1.4.2-orig/rshd/rshd.c   2002-12-11 12:38:00.000000000 +0000
++++ inetutils-1.4.2/rshd/rshd.c        2005-02-22 19:54:33.162510768 +0000
+@@ -443,7 +443,7 @@
+       dup2 (sockfd, STDERR_FILENO);
+     }
+ 
+-  /* Get the "name" of the clent form its Internet address.
++  /* Get the "name" of the client form its Internet address.
+    * This is used for the autentication below
+    */
+   errorstr = NULL;
+@@ -457,52 +457,49 @@
+        * in a remote net; look up the name and check that this
+        * address corresponds to the name.
+        */
+-      hostname = strdup (hp->h_name);
++      const char *remotehost = strdup(hp->h_name);
+ #ifdef        KERBEROS
+       if (!use_kerberos)
+ #endif
+-      if (check_all || local_domain (hp->h_name))
++       if (! remotehost)
++           errorstr = "Out of memory\n";
++       else if (check_all || local_domain (remotehost))
+         {
+-          char *remotehost = (char *) alloca (strlen (hp->h_name) + 1);
+-          if (! remotehost)
+-            errorstr = "Out of memory\n";
+-          else
++           errorhost = remotehost;
++           hp = gethostbyname (remotehost);
++           if (hp == NULL)
+             {
+-              strcpy (remotehost, hp->h_name);
+-              errorhost = remotehost;
+-              hp = gethostbyname (remotehost);
+-              if (hp == NULL)
++               syslog (LOG_INFO,
++                       "Couldn't look up address for %s", remotehost);
++                       errorstr = "Couldn't look up address for your host (%s)\n";
++                       hostname = strdup(inet_ntoa(fromp->sin_addr));
++             }
++           else
++              {
++               for (; ; hp->h_addr_list++)
+                 {
+-                  syslog (LOG_INFO,
+-                          "Couldn't look up address for %s", remotehost);
+-                  errorstr = "Couldn't look up address for your host (%s)\n";
+-                  hostname = inet_ntoa (fromp->sin_addr);
++                   if (hp->h_addr_list[0] == NULL)
++                     {
++                       syslog (LOG_NOTICE,
++                               "Host addr %s not listed for host %s",
++                               inet_ntoa (fromp->sin_addr), hp->h_name);
++                       errorstr = "Host address mismatch for %s\n";
++                       hostname = strdup(inet_ntoa(fromp->sin_addr));
++                       break;
++                     }
++                   if (!memcmp (hp->h_addr_list[0],
++                               (caddr_t)&fromp->sin_addr,
++                               sizeof fromp->sin_addr))
++                     {
++                       hostname = strdup(hp->h_name);
++                       break; /* equal, OK */
++                     }
+                 }
+-              else
+-                for (; ; hp->h_addr_list++)
+-                  {
+-                    if (hp->h_addr_list[0] == NULL)
+-                      {
+-                        syslog (LOG_NOTICE,
+-                                "Host addr %s not listed for host %s",
+-                                inet_ntoa (fromp->sin_addr), hp->h_name);
+-                        errorstr = "Host address mismatch for %s\n";
+-                        hostname = inet_ntoa (fromp->sin_addr);
+-                        break;
+-                      }
+-                    if (!memcmp (hp->h_addr_list[0],
+-                                 (caddr_t)&fromp->sin_addr,
+-                                 sizeof fromp->sin_addr))
+-                      {
+-                        hostname = hp->h_name;
+-                        break; /* equal, OK */
+-                      }
+-                  }
+-            }
++              }
+         }
+     }
+   else
+-    errorhost = hostname = inet_ntoa (fromp->sin_addr);
++    errorhost = hostname = strdup(inet_ntoa(fromp->sin_addr));
+ 
+ #ifdef        KERBEROS
+   if (use_kerberos)
+

diff --git a/src/patches/net-tools-1.60-gcc34-3.patch b/src/patches/net-tools-1.60-gcc34-3.patch
new file mode 100644 (file)
index 0000000..e6ec253
--- /dev/null
+++ b/src/patches/net-tools-1.60-gcc34-3.patch
@@ -0,0 +1,86 @@
+Originaly By: Zack Winkles <winkie AT linuxfromscratch DOT org>
+Submitted By: Jim Gifford <jim AT linuxfromscratch DOT org>
+Date: 2004-06-23
+Initial Package Version: 1.60
+Origin: N/A
+Upstream Status: N/A
+Description: Fix some occurrences of syntax that GCC 3.4 doesn't like.
+ 
+diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c
+--- net-tools-1.60.orig/hostname.c     2001-04-08 17:04:23.000000000 +0000
++++ net-tools-1.60/hostname.c  2004-06-24 06:22:16.913258663 +0000
+@@ -78,6 +78,7 @@
+             fprintf(stderr, _("%s: name too long\n"), program_name);
+             break;
+         default:
++          ((void)0);
+         }
+       exit(1);
+     }
+@@ -98,6 +99,7 @@
+           fprintf(stderr, _("%s: name too long\n"), program_name);
+           break;
+       default:
++          ((void)0);
+       }
+       exit(1);
+     };
+@@ -117,6 +119,7 @@
+           fprintf(stderr, _("%s: name too long\n"), program_name);
+           break;
+       default:
++          ((void)0);
+       }
+       exit(1);
+     };
+@@ -174,6 +177,7 @@
+       printf("%s\n", hp->h_name);
+       break;
+     default:
++      ((void)0);
+     }
+ }
+ 
+diff -Naur net-tools-1.60.orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c
+--- net-tools-1.60.orig/lib/inet_sr.c  2000-02-20 21:46:45.000000000 +0000
++++ net-tools-1.60/lib/inet_sr.c       2004-06-24 06:22:01.967840446 +0000
+@@ -105,6 +105,7 @@
+     case 2:
+        isnet = 0; break;
+     default:
++       ((void)0);
+     }
+ 
+     /* Fill in the other fields. */
+diff -Naur net-tools-1.60.orig/mii-tool.c net-tools-1.60/mii-tool.c
+--- net-tools-1.60.orig/mii-tool.c     2000-05-21 14:31:17.000000000 +0000
++++ net-tools-1.60/mii-tool.c  2004-06-24 06:22:01.971839755 +0000
+@@ -379,17 +379,17 @@
+ /*--------------------------------------------------------------------*/
+ 
+ const char *usage =
+-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
+-       -V, --version               display version information
+-       -v, --verbose               more verbose output
+-       -R, --reset                 reset MII to poweron state
+-       -r, --restart               restart autonegotiation
+-       -w, --watch                 monitor for link status changes
+-       -l, --log                   with -w, write events to syslog
+-       -A, --advertise=media,...   advertise only specified media
+-       -F, --force=media           force specified media technology
+-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
+-       (to advertise both HD and FD) 100baseTx, 10baseT\n";
++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
++"       -V, --version               display version information\n"
++"       -v, --verbose               more verbose output\n"
++"       -R, --reset                 reset MII to poweron state\n"
++"       -r, --restart               restart autonegotiation\n"
++"       -w, --watch                 monitor for link status changes\n"
++"       -l, --log                   with -w, write events to syslog\n"
++"       -A, --advertise=media,...   advertise only specified media\n"
++"       -F, --force=media           force specified media technology\n"
++"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n"
++"       (to advertise both HD and FD) 100baseTx, 10baseT\n";
+ 
+ int main(int argc, char **argv)
+ {

diff --git a/src/patches/net-tools-1.60-kernel_headers-2.patch b/src/patches/net-tools-1.60-kernel_headers-2.patch
new file mode 100644 (file)
index 0000000..c881537
--- /dev/null
+++ b/src/patches/net-tools-1.60-kernel_headers-2.patch
@@ -0,0 +1,51 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-06-24
+Initial Package Version: 2.6
+Origin: Gentoo and Self
+Upstream Status: N/A
+Description: Fixes Compile Issues with the 2.6 Kernel
+ 
+
+diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c
+--- net-tools-1.60.orig/hostname.c     2001-04-08 17:04:23.000000000 +0000
++++ net-tools-1.60/hostname.c  2004-06-24 06:17:32.517305695 +0000
+@@ -42,10 +42,16 @@
+ #include "config.h"
+ #include "version.h"
+ #include "../intl.h"
++#include <linux/version.h>
+ 
+ #if HAVE_AFDECnet
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
+ #include <netdnet/dn.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
++#include <linux/dn.h>
++#endif
++#endif
+ 
+ char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)";
+ 
+diff -Naur net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
+--- net-tools-1.60.orig/lib/x25_sr.c   2000-05-20 13:38:10.000000000 +0000
++++ net-tools-1.60/lib/x25_sr.c        2004-06-24 06:15:45.163773724 +0000
+@@ -22,6 +22,7 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <linux/x25.h>
++#include <linux/version.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <netdb.h>
+@@ -77,7 +78,11 @@
+   rt.sigdigits=sigdigits;
+ 
+   /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+   memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
++#else
++  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
++#endif
+ 
+   while (*args) {
+       if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {

diff --git a/src/patches/net-tools-1.60-mii_ioctl-1.patch b/src/patches/net-tools-1.60-mii_ioctl-1.patch
new file mode 100644 (file)
index 0000000..ca8582d
--- /dev/null
+++ b/src/patches/net-tools-1.60-mii_ioctl-1.patch
@@ -0,0 +1,27 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2004-08-27
+Initial Package Version: 1.60
+Upstream Status:         N/A (package is unmaintained)
+Origin:                  From Fedora Core (submitted to LFS-Hackers by Kevin White)
+Description:             Fixes mii-tool when compiled using Linux-2.6.x
+
+$LastChangedBy: randy $
+$Date: 2004-08-27 21:04:05 -0600 (Fri, 27 Aug 2004) $
+
+--- net-tools-1.60/include/mii.h.bar   Tue Jul 31 11:49:39 2001
++++ net-tools-1.60/include/mii.h       Tue Jul 31 11:49:33 2001
+@@ -11,11 +11,9 @@
+ 
+ /* network interface ioctl's for MII commands */
+ #ifndef SIOCGMIIPHY
+-#define SIOCGMIIPHY (SIOCDEVPRIVATE)  /* Read from current PHY */
+-#define SIOCGMIIREG (SIOCDEVPRIVATE+1)        /* Read any PHY register */
+-#define SIOCSMIIREG (SIOCDEVPRIVATE+2)        /* Write any PHY register */
+-#define SIOCGPARAMS (SIOCDEVPRIVATE+3)        /* Read operational parameters */
+-#define SIOCSPARAMS (SIOCDEVPRIVATE+4)        /* Set operational parameters */
++#define SIOCGMIIPHY 0x8947    /* Read from current PHY */
++#define SIOCGMIIREG 0x8948    /* Read any PHY register */
++#define SIOCSMIIREG 0x8949    /* Write any PHY register */
+ #endif
+ 
+ #include <linux/types.h>

diff --git a/src/rc.d/rc.updatered b/src/rc.d/rc.updatered
index c4745edc288c6644a0ad67bf56cc2b2c946831f1..ba8367222399ea6d6a0b153059e78674a15577c0 100644 (file)
--- a/src/rc.d/rc.updatered
+++ b/src/rc.d/rc.updatered
@@ -134,7 +134,7 @@ if [ -e "CONFIG_ROOT/red/active" ]; then
        /etc/rc.d/rc.firewall reload
        /usr/local/bin/setfilters
        /usr/local/bin/restartsnort red
        /etc/rc.d/rc.firewall reload
        /usr/local/bin/setfilters
        /usr/local/bin/restartsnort red

-       /usr/local/bin/qosctrl start
+       /usr/local/bin/qosctrl restart

        /usr/local/bin/setportfw
        /usr/local/bin/setxtaccess
        /usr/local/bin/setddns.pl -f
        /usr/local/bin/setportfw
        /usr/local/bin/setxtaccess
        /usr/local/bin/setddns.pl -f