Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk

mk/build.mk

@@ -23,6 +23,7 @@ DEFCONFIG=		ADK_DEVELSYSTEM=n \
 			ADK_PACKAGE_HEIMDAL_SERVER=n \
 			ADK_PACKAGE_LIBHEIMDAL=n \
 			ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \
+			BUSYBOX_BBCONFIG=n \
 			BUSYBOX_SELINUX=n \
 			BUSYBOX_MODPROBE_SMALL=n \
 			BUSYBOX_EJECT=n \
@@ -393,7 +394,7 @@ menuconfig: $(CONFIG)/mconf defconfig .menu
 
 _config: $(CONFIG)/conf .menu
 	-@touch .config
-	@$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) >/dev/null
+	@$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN)
 	${POSTCONFIG}
 
 .NOTPARALLEL: _mconfig

package/Config.in

@@ -572,7 +572,7 @@ source "package/aircrack-ng/Config.in"
 source "package/chillispot/Config.in"
 source "package/hostapd/Config.in"
 source "package/iw/Config.in"
-#source "package/kismet/Config.in"
+source "package/kismet/Config.in"
 source "package/olsrd/Config.in"
 source "package/p54-firmware/Config.in"
 source "package/rt61-firmware/Config.in"

package/cbtt/patches/patch-Makefile

@@ -1,5 +1,5 @@
 --- cbtt80-20060211-src.orig/Makefile	2006-02-07 18:44:58.000000000 +0100
-+++ cbtt80-20060211-src/Makefile	2010-02-11 20:13:13.000000000 +0100
++++ cbtt80-20060211-src/Makefile	2010-02-14 09:21:02.000000000 +0100
 @@ -1,10 +1,8 @@
 -SHELL = /bin/sh
 -SYSTEM = $(shell uname)
@@ -58,5 +58,4 @@
  tracker.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h config.h md5.h server.h sort.h tracker.h util.h
  tracker_announce.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h link.h tracker.h util.h
 -tracker_scrape.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h tracker.h util.h
-\ No newline at end of file
 +tracker_scrape.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h tracker.h util.h

package/cryptsetup/patches/patch-INSTALL

@@ -1,345 +0,0 @@
---- cryptsetup-1.1.0.orig/INSTALL	2009-07-06 18:53:08.000000000 +0200
-+++ cryptsetup-1.1.0/INSTALL	2010-02-14 18:24:56.000000000 +0100
-@@ -1,13 +1,25 @@
--Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
--Foundation, Inc.
-+Installation Instructions
-+*************************
- 
--   This file is free documentation; the Free Software Foundation gives
--unlimited permission to copy, distribute and modify it.
-+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+
-+   Copying and distribution of this file, with or without modification,
-+are permitted in any medium without royalty provided the copyright
-+notice and this notice are preserved.  This file is offered as-is,
-+without warranty of any kind.
- 
- Basic Installation
- ==================
- 
--   These are generic installation instructions.
-+   Briefly, the shell commands `./configure; make; make install' should
-+configure, build, and install this package.  The following
-+more-detailed instructions are generic; see the `README' file for
-+instructions specific to this package.  Some packages provide this
-+`INSTALL' file but do not implement all of the features documented
-+below.  The lack of an optional feature in a given package is not
-+necessarily a bug.  More recommendations for GNU packages can be found
-+in *note Makefile Conventions: (standards)Makefile Conventions.
- 
-    The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation.  It uses
-@@ -20,9 +32,9 @@ debugging `configure').
- 
-    It can also use an optional file (typically called `config.cache'
- and enabled with `--cache-file=config.cache' or simply `-C') that saves
--the results of its tests to speed up reconfiguring.  (Caching is
-+the results of its tests to speed up reconfiguring.  Caching is
- disabled by default to prevent problems with accidental use of stale
--cache files.)
-+cache files.
- 
-    If you need to do unusual things to compile the package, please try
- to figure out how `configure' could check whether to do them, and mail
-@@ -32,30 +44,37 @@ some point `config.cache' contains resul
- may remove or edit it.
- 
-    The file `configure.ac' (or `configure.in') is used to create
--`configure' by a program called `autoconf'.  You only need
--`configure.ac' if you want to change it or regenerate `configure' using
--a newer version of `autoconf'.
-+`configure' by a program called `autoconf'.  You need `configure.ac' if
-+you want to change it or regenerate `configure' using a newer version
-+of `autoconf'.
- 
--The simplest way to compile this package is:
-+   The simplest way to compile this package is:
- 
-   1. `cd' to the directory containing the package's source code and type
--     `./configure' to configure the package for your system.  If you're
--     using `csh' on an old version of System V, you might need to type
--     `sh ./configure' instead to prevent `csh' from trying to execute
--     `configure' itself.
-+     `./configure' to configure the package for your system.
- 
--     Running `configure' takes awhile.  While running, it prints some
--     messages telling which features it is checking for.
-+     Running `configure' might take a while.  While running, it prints
-+     some messages telling which features it is checking for.
- 
-   2. Type `make' to compile the package.
- 
-   3. Optionally, type `make check' to run any self-tests that come with
--     the package.
-+     the package, generally using the just-built uninstalled binaries.
- 
-   4. Type `make install' to install the programs and any data files and
--     documentation.
-+     documentation.  When installing into a prefix owned by root, it is
-+     recommended that the package be configured and built as a regular
-+     user, and only the `make install' phase executed with root
-+     privileges.
- 
--  5. You can remove the program binaries and object files from the
-+  5. Optionally, type `make installcheck' to repeat any self-tests, but
-+     this time using the binaries in their final installed location.
-+     This target does not install anything.  Running this target as a
-+     regular user, particularly if the prior `make install' required
-+     root privileges, verifies that the installation completed
-+     correctly.
-+
-+  6. You can remove the program binaries and object files from the
-      source code directory by typing `make clean'.  To also remove the
-      files that `configure' created (so you can compile the package for
-      a different kind of computer), type `make distclean'.  There is
-@@ -64,6 +83,16 @@ The simplest way to compile this package
-      all sorts of other programs in order to regenerate files that came
-      with the distribution.
- 
-+  7. Often, you can also type `make uninstall' to remove the installed
-+     files again.  In practice, not all packages have tested that
-+     uninstallation works correctly, even though it is required by the
-+     GNU Coding Standards.
-+
-+  8. Some packages, particularly those that use Automake, provide `make
-+     distcheck', which can by used by developers to test that all other
-+     targets like `make install' and `make uninstall' work correctly.
-+     This target is generally not run by end users.
-+
- Compilers and Options
- =====================
- 
-@@ -75,7 +104,7 @@ for details on some of the pertinent env
- by setting variables in the command line or in the environment.  Here
- is an example:
- 
--     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
- 
-    *Note Defining Variables::, for more details.
- 
-@@ -84,44 +113,89 @@ Compiling For Multiple Architectures
- 
-    You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
--own directory.  To do this, you must use a version of `make' that
--supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-+own directory.  To do this, you can use GNU `make'.  `cd' to the
- directory where you want the object files and executables to go and run
- the `configure' script.  `configure' automatically checks for the
--source code in the directory that `configure' is in and in `..'.
-+source code in the directory that `configure' is in and in `..'.  This
-+is known as a "VPATH" build.
- 
--   If you have to use a `make' that does not support the `VPATH'
--variable, you have to compile the package for one architecture at a
--time in the source code directory.  After you have installed the
--package for one architecture, use `make distclean' before reconfiguring
--for another architecture.
-+   With a non-GNU `make', it is safer to compile the package for one
-+architecture at a time in the source code directory.  After you have
-+installed the package for one architecture, use `make distclean' before
-+reconfiguring for another architecture.
-+
-+   On MacOS X 10.5 and later systems, you can create libraries and
-+executables that work on multiple system types--known as "fat" or
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor.  Like
-+this:
-+
-+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+                 CPP="gcc -E" CXXCPP="g++ -E"
-+
-+   This is not guaranteed to produce working output in all cases, you
-+may have to build one architecture at a time and combine the results
-+using the `lipo' tool if you have problems.
- 
- Installation Names
- ==================
- 
--   By default, `make install' will install the package's files in
--`/usr/local/bin', `/usr/local/man', etc.  You can specify an
--installation prefix other than `/usr/local' by giving `configure' the
--option `--prefix=PATH'.
-+   By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc.  You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX', where PREFIX must be an
-+absolute file name.
- 
-    You can specify separate installation prefixes for
- architecture-specific files and architecture-independent files.  If you
--give `configure' the option `--exec-prefix=PATH', the package will use
--PATH as the prefix for installing programs and libraries.
--Documentation and other data files will still use the regular prefix.
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
- 
-    In addition, if you use an unusual directory layout you can give
--options like `--bindir=PATH' to specify different values for particular
-+options like `--bindir=DIR' to specify different values for particular
- kinds of files.  Run `configure --help' for a list of the directories
--you can set and what kinds of files go in them.
-+you can set and what kinds of files go in them.  In general, the
-+default for these options is expressed in terms of `${prefix}', so that
-+specifying just `--prefix' will affect all of the other directory
-+specifications that were not explicitly provided.
- 
--   If the package supports it, you can cause programs to be installed
--with an extra prefix or suffix on their names by giving `configure' the
--option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-+   The most portable way to affect installation locations is to pass the
-+correct locations to `configure'; however, many packages provide one or
-+both of the following shortcuts of passing variable assignments to the
-+`make install' command line to change installation locations without
-+having to reconfigure or recompile.
-+
-+   The first method involves providing an override variable for each
-+affected directory.  For example, `make install
-+prefix=/alternate/directory' will choose an alternate location for all
-+directory configuration variables that were expressed in terms of
-+`${prefix}'.  Any directories that were specified during `configure',
-+but not in terms of `${prefix}', must each be overridden at install
-+time for the entire installation to be relocated.  The approach of
-+makefile variable overrides for each directory variable is required by
-+the GNU Coding Standards, and ideally causes no recompilation.
-+However, some platforms have known limitations with the semantics of
-+shared libraries that end up requiring recompilation when using this
-+method, particularly noticeable in packages that use GNU Libtool.
-+
-+   The second method involves providing the `DESTDIR' variable.  For
-+example, `make install DESTDIR=/alternate/directory' will prepend
-+`/alternate/directory' before all installation names.  The approach of
-+`DESTDIR' overrides is not required by the GNU Coding Standards, and
-+does not work on platforms that have drive letters.  On the other hand,
-+it does better at avoiding recompilation issues, and works well even
-+when some directory options were not specified in terms of `${prefix}'
-+at `configure' time.
- 
- Optional Features
- =================
- 
-+   If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-+
-    Some packages pay attention to `--enable-FEATURE' options to
- `configure', where FEATURE indicates an optional part of the package.
- They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-@@ -134,6 +208,45 @@ find the X include and library files aut
- you can use the `configure' options `--x-includes=DIR' and
- `--x-libraries=DIR' to specify their locations.
- 
-+   Some packages offer the ability to configure how verbose the
-+execution of `make' will be.  For these packages, running `./configure
-+--enable-silent-rules' sets the default to minimal output, which can be
-+overridden with `make V=1'; while running `./configure
-+--disable-silent-rules' sets the default to verbose, which can be
-+overridden with `make V=0'.
-+
-+Particular systems
-+==================
-+
-+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-+
-+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-+
-+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-+
-+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-+a workaround.  If GNU CC is not installed, it is therefore recommended
-+to try
-+
-+     ./configure CC="cc"
-+
-+and if that doesn't work, try
-+
-+     ./configure CC="cc -nodtk"
-+
-+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-+
-+   On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'.  It is recommended to use the following options:
-+
-+     ./configure --prefix=/boot/common
-+
- Specifying the System Type
- ==========================
- 
-@@ -149,14 +262,15 @@ type, such as `sun4', or a canonical nam
- 
- where SYSTEM can have one of these forms:
- 
--     OS KERNEL-OS
-+     OS
-+     KERNEL-OS
- 
-    See the file `config.sub' for the possible values of each field.  If
- `config.sub' isn't included in this package, then this package doesn't
- need to know the machine type.
- 
-    If you are _building_ compiler tools for cross-compiling, you should
--use the `--target=TYPE' option to select the type of system they will
-+use the option `--target=TYPE' to select the type of system they will
- produce code for.
- 
-    If you want to _use_ a cross compiler, that generates code for a
-@@ -186,9 +300,14 @@ them in the `configure' command line, us
- 
-      ./configure CC=/usr/local2/bin/gcc
- 
--will cause the specified gcc to be used as the C compiler (unless it is
-+causes the specified `gcc' to be used as the C compiler (unless it is
- overridden in the site shell script).
- 
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf bug.  Until the bug is fixed you can use this workaround:
-+
-+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-+
- `configure' Invocation
- ======================
- 
-@@ -197,7 +316,14 @@ operates.
- 
- `--help'
- `-h'
--     Print a summary of the options to `configure', and exit.
-+     Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+     Print a summary of the options unique to this package's
-+     `configure', and exit.  The `short' variant lists options used
-+     only in the top level, while the `recursive' variant lists options
-+     also present in any nested packages.
- 
- `--version'
- `-V'
-@@ -224,6 +350,16 @@ operates.
-      Look for the package's source code in directory DIR.  Usually
-      `configure' can determine that directory automatically.
- 
-+`--prefix=DIR'
-+     Use DIR as the installation prefix.  *note Installation Names::
-+     for more details, including other options available for fine-tuning
-+     the installation locations.
-+
-+`--no-create'
-+`-n'
-+     Run the configure checks, but stop before creating any output
-+     files.
-+
- `configure' also accepts some other, not widely useful, options.  Run
- `configure --help' for more details.
- 

package/cryptsetup/patches/patch-Makefile_in

@@ -1,5 +1,5 @@
 --- cryptsetup-1.1.0.orig/Makefile.in	2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/Makefile.in	2010-02-14 18:24:56.000000000 +0100
++++ cryptsetup-1.1.0/Makefile.in	2010-02-16 20:32:36.876861682 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.

package/cryptsetup/patches/patch-aclocal_m4

@@ -1,5 +1,5 @@
 --- cryptsetup-1.1.0.orig/aclocal.m4	2010-01-17 11:29:20.000000000 +0100
-+++ cryptsetup-1.1.0/aclocal.m4	2010-02-14 18:24:56.000000000 +0100
++++ cryptsetup-1.1.0/aclocal.m4	2010-02-16 20:32:36.840860169 +0100
 @@ -1,4 +1,4 @@
 -# generated automatically by aclocal 1.11 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-

package/cryptsetup/patches/patch-compile

@@ -1,23 +0,0 @@
---- cryptsetup-1.1.0.orig/compile	2009-08-24 17:04:56.000000000 +0200
-+++ cryptsetup-1.1.0/compile	2010-02-14 18:24:56.000000000 +0100
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # Wrapper for compilers which do not understand `-c -o'.
- 
--scriptversion=2009-04-28.21; # UTC
-+scriptversion=2009-10-06.20; # UTC
- 
- # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
- # Foundation, Inc.
-@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
- ret=$?
- 
- if test -f "$cofile"; then
--  mv "$cofile" "$ofile"
-+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
- elif test -f "${cofile}bj"; then
--  mv "${cofile}bj" "$ofile"
-+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
- fi
- 
- rmdir "$lockdir"

package/cryptsetup/patches/patch-config_guess

@@ -1,339 +0,0 @@
---- cryptsetup-1.1.0.orig/config.guess	2009-06-30 10:31:47.000000000 +0200
-+++ cryptsetup-1.1.0/config.guess	2010-02-14 18:24:56.000000000 +0100
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- #   Free Software Foundation, Inc.
- 
--timestamp='2008-09-28'
-+timestamp='2009-06-10'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -139,23 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
- UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- 
--if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
--	eval $set_cc_for_build
--	cat << EOF > $dummy.c
--	#include <features.h>
--	#ifdef __UCLIBC__
--	# ifdef __UCLIBC_CONFIG_VERSION__
--	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
--	# else
--	LIBC=uclibc
--	# endif
--	#else
--	LIBC=gnu
--	#endif
--EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
--fi
--
- # Note: order is significant - the case branches are not exclusive.
- 
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -187,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- 		eval $set_cc_for_build
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--			| grep __ELF__ >/dev/null
-+			| grep -q __ELF__
- 		then
- 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- 		    # Return netbsd for either.  FIX?
-@@ -341,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- 	case `/usr/bin/uname -p` in
- 	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-+    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-@@ -348,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
--	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH="x86_64"
-+	    fi
-+	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
-@@ -657,7 +656,7 @@ EOF
- 	    # => hppa64-hp-hpux11.23
- 
- 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
--		grep __LP64__ >/dev/null
-+		grep -q __LP64__
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -823,6 +822,9 @@ EOF
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
- 	exit ;;
-+    8664:Windows_NT:*)
-+	echo x86_64-pc-mks
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -857,66 +859,43 @@ EOF
- 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- 	    | grep -q __ARM_EABI__
- 	then
--	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	else
--	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
- 	fi
- 	exit ;;
-     avr32*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     cris:Linux:*:*)
--	echo cris-axis-linux-${LIBC}
-+	echo cris-axis-linux-gnu
- 	exit ;;
-     crisv32:Linux:*:*)
--	echo crisv32-axis-linux-${LIBC}
-+	echo crisv32-axis-linux-gnu
- 	exit ;;
-     frv:Linux:*:*)
--    	echo frv-unknown-linux-${LIBC}
-+    	echo frv-unknown-linux-gnu
- 	exit ;;
-     ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     m32r*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
--    mips:Linux:*:*)
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#undef CPU
--	#undef mips
--	#undef mipsel
--	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mipsel
--	#else
--	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips
--	#else
--	CPU=
--	#endif
--	#endif
--EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^CPU/{
--		s: ::g
--		p
--	    }'`"
--	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
--	;;
--    mips64:Linux:*:*)
-+    mips:Linux:*:* | mips64:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
--	#undef mips64
--	#undef mips64el
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mips64el
-+	CPU=${UNAME_MACHINE}el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips64
-+	CPU=${UNAME_MACHINE}
- 	#else
- 	CPU=
- 	#endif
-@@ -927,16 +906,16 @@ EOF
- 		s: ::g
- 		p
- 	    }'`"
--	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     or32:Linux:*:*)
--	echo or32-unknown-linux-${LIBC}
-+	echo or32-unknown-linux-gnu
- 	exit ;;
-     ppc:Linux:*:*)
--	echo powerpc-unknown-linux-${LIBC}
-+	echo powerpc-unknown-linux-gnu
- 	exit ;;
-     ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-${LIBC}
-+	echo powerpc64-unknown-linux-gnu
- 	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -948,9 +927,9 @@ EOF
- 	  EV67)  UNAME_MACHINE=alphaev67 ;;
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
--	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- 	exit ;;
-     padre:Linux:*:*)
- 	echo sparc-unknown-linux-gnu
-@@ -958,34 +937,34 @@ EOF
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
--	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
--	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
--	  *)    echo hppa-unknown-linux-${LIBC} ;;
-+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
- 	exit ;;
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-${LIBC}
-+	echo hppa64-unknown-linux-gnu
- 	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
- 	exit ;;
-     sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     sh*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     vax:Linux:*:*)
--	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-+	echo ${UNAME_MACHINE}-dec-linux-gnu
- 	exit ;;
-     x86_64:Linux:*:*)
--	echo x86_64-unknown-linux-${LIBC}
-+	echo x86_64-unknown-linux-gnu
- 	exit ;;
-     xtensa*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
-@@ -1000,19 +979,9 @@ EOF
- 				    p'`
-         case "$ld_supported_targets" in
- 	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- 		;;
--	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
--		exit ;;
--	  "")
--		# Either a pre-BFD a.out linker (linux-gnuoldld) or
--		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
--		exit ;;
- 	esac
--	# This should get integrated into the C code below, but now we hack
--	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -1077,7 +1046,7 @@ EOF
-     i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
- 	exit ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-     i*86:*DOS:*:*)
-@@ -1121,8 +1090,11 @@ EOF
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i386.
--	echo i386-pc-msdosdjgpp
-+        # the processor, so we play safe by assuming i586.
-+	# Note: whatever this is, it MUST be the same as what config.sub
-+	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# this is a cross-build.
-+	echo i586-pc-msdosdjgpp
-         exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
-@@ -1160,6 +1132,16 @@ EOF
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-           && { echo i486-ncr-sysv4; exit; } ;;
-+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+	OS_REL='.3'
-+	test -r /etc/.relid \
-+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-@@ -1172,7 +1154,7 @@ EOF
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
--    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
-@@ -1346,6 +1328,9 @@ EOF
-     i*86:rdos:*:*)
- 	echo ${UNAME_MACHINE}-pc-rdos
- 	exit ;;
-+    i*86:AROS:*:*)
-+	echo ${UNAME_MACHINE}-pc-aros
-+	exit ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2

package/cryptsetup/patches/patch-config_sub

@@ -1,169 +0,0 @@
---- cryptsetup-1.1.0.orig/config.sub	2009-06-30 10:31:47.000000000 +0200
-+++ cryptsetup-1.1.0/config.sub	2010-02-14 18:24:56.000000000 +0100
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- #   Free Software Foundation, Inc.
- 
--timestamp='2008-09-08'
-+timestamp='2009-06-11'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-
- case $maybe_os in
-   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  kopensolaris*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-@@ -152,6 +153,9 @@ case $os in
- 		os=
- 		basic_machine=$1
- 		;;
-+        -bluegene*)
-+	        os=-cnk
-+		;;
- 	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
- 		basic_machine=$1
-@@ -244,11 +248,12 @@ case $basic_machine in
- 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- 	| bfin \
- 	| c4x | clipper \
--	| d10v | d30v | dlx | dsp16xx | dvp \
-+	| d10v | d30v | dlx | dsp16xx \
- 	| fido | fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
- 	| ip2k | iq2000 \
-+	| lm32 \
- 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
- 	| maxq | mb | microblaze | mcore | mep | metag \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
-@@ -270,6 +275,7 @@ case $basic_machine in
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| moxie \
- 	| mt \
- 	| msp430 \
- 	| nios | nios2 \
-@@ -279,7 +285,7 @@ case $basic_machine in
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
- 	| score \
--	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -331,6 +337,7 @@ case $basic_machine in
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
- 	| ip2k-* | iq2000-* \
-+	| lm32-* \
- 	| m32c-* | m32r-* | m32rle-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-@@ -362,7 +369,7 @@ case $basic_machine in
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
- 	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
-@@ -443,6 +450,10 @@ case $basic_machine in
- 		basic_machine=m68k-apollo
- 		os=-bsd
- 		;;
-+	aros)
-+		basic_machine=i386-pc
-+		os=-aros
-+		;;
- 	aux)
- 		basic_machine=m68k-apple
- 		os=-aux
-@@ -459,6 +470,10 @@ case $basic_machine in
- 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		os=-linux
- 		;;
-+	bluegene*)
-+		basic_machine=powerpc-ibm
-+		os=-cnk
-+		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
-@@ -726,24 +741,6 @@ case $basic_machine in
- 		basic_machine=m68k-atari
- 		os=-mint
- 		;;
--	mipsEE* | ee | ps2)
--		basic_machine=mips64r5900el-scei
--		case $os in
--		    -linux*)
--			;;
--		    *)
--			os=-elf
--			;;
--		esac
--		;;
--	iop)
--		basic_machine=mipsel-scei
--		os=-irx
--		;;
--	dvp)
--		basic_machine=dvp-scei
--		os=-elf
--		;;
- 	mips3*-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- 		;;
-@@ -1200,7 +1197,7 @@ case $basic_machine in
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
- 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-@@ -1270,10 +1267,11 @@ case $os in
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
--	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* \
-+	      | -aos* | -aros* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-@@ -1292,7 +1290,7 @@ case $os in
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1622,7 +1620,7 @@ case $basic_machine in
- 			-sunos*)
- 				vendor=sun
- 				;;
--			-aix*)
-+			-cnk*|-aix*)
- 				vendor=ibm
- 				;;
- 			-beos*)

package/cryptsetup/patches/patch-configure

@@ -1,6 +1,143 @@
 --- cryptsetup-1.1.0.orig/configure	2010-01-17 11:29:24.000000000 +0100
-+++ cryptsetup-1.1.0/configure	2010-02-14 18:24:56.000000000 +0100
-@@ -14619,7 +14619,7 @@ _ACEOF
++++ cryptsetup-1.1.0/configure	2010-02-16 20:32:36.868858986 +0100
+@@ -894,7 +894,6 @@ enable_nls
+ enable_rpath
+ with_libiconv_prefix
+ with_libintl_prefix
+-enable_shared_library
+ enable_selinux
+ with_plain_hash
+ with_plain_cipher
+@@ -1543,7 +1542,7 @@ Optional Features:
+   --disable-largefile     omit support for large files
+   --disable-nls           do not use Native Language Support
+   --disable-rpath         do not hardcode runtime library paths
+-  --disable-shared-library
++  --disable-shared
+                           disable building of shared cryptsetup library
+   --disable-selinux       disable selinux support [default=auto]
+ 
+@@ -5966,13 +5965,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:5969: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:5968: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:5972: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:5971: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:5975: output\"" >&5)
++  (eval echo "\"\$as_me:5974: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -7177,7 +7176,7 @@ ia64-*-hpux*)
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 7180 "configure"' > conftest.$ac_ext
++  echo '#line 7179 "configure"' > conftest.$ac_ext
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -8409,11 +8408,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8412: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8411: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8416: \$? = $ac_status" >&5
++   echo "$as_me:8415: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -8748,11 +8747,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8751: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8750: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8755: \$? = $ac_status" >&5
++   echo "$as_me:8754: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -8853,11 +8852,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8856: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8855: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8860: \$? = $ac_status" >&5
++   echo "$as_me:8859: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -8908,11 +8907,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8911: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8910: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8915: \$? = $ac_status" >&5
++   echo "$as_me:8914: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -11292,7 +11291,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11295 "configure"
++#line 11294 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11388,7 +11387,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11391 "configure"
++#line 11390 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14409,14 +14408,14 @@ POPT_LIBS=$LIBS
+ LIBS=$saved_LIBS
+ 
+ 
+-# Check whether --enable-shared-library was given.
+-if test "${enable_shared_library+set}" = set; then :
+-  enableval=$enable_shared_library;
++# Check whether --enable-shared was given.
++if test "${enable_shared+set}" = set; then :
++  enableval=$enable_shared;
+ else
+-  enable_shared_library=yes
++  enable_shared=yes
+ fi
+ 
+- if test x$enable_shared_library = xno; then
++ if test x$enable_shared = xno; then
+   STATIC_LIBRARY_TRUE=
+   STATIC_LIBRARY_FALSE='#'
+ else
+@@ -14619,7 +14618,7 @@ _ACEOF
  
  fi
  
@@ -9,7 +146,7 @@
  		SELINUX_STATIC_LIBS=$LIBS
  		# Check if we need -pthread with --enable-static and selinux
  		saved_LIBS2=$LIBS
-@@ -14684,7 +14684,7 @@ fi
+@@ -14684,7 +14683,7 @@ fi
  	fi
  fi
  
@@ -18,7 +155,7 @@
  	saved_LIBS2=$LIBS
  	LIBS="$LIBS -static"
  	# Check if it there is still not some missing dependency like static selinux libs
-@@ -14916,7 +14916,7 @@ fi
+@@ -14916,7 +14915,7 @@ fi
  
  
  
@@ -27,7 +164,7 @@
    STATIC_CRYPTSETUP_TRUE=
    STATIC_CRYPTSETUP_FALSE='#'
  else
-@@ -14924,7 +14924,7 @@ else
+@@ -14924,7 +14923,7 @@ else
    STATIC_CRYPTSETUP_FALSE=
  fi
  

package/cryptsetup/patches/patch-configure_in

@@ -1,5 +1,21 @@
 --- cryptsetup-1.1.0.orig/configure.in	2010-01-17 11:26:31.000000000 +0100
-+++ cryptsetup-1.1.0/configure.in	2010-02-14 18:24:56.000000000 +0100
++++ cryptsetup-1.1.0/configure.in	2010-02-16 20:32:36.868858986 +0100
+@@ -62,11 +62,11 @@ LIBS=$saved_LIBS
+ 
+ dnl ==========================================================================
+ 
+-AC_ARG_ENABLE(shared-library,
+-[  --disable-shared-library
++AC_ARG_ENABLE(shared,
++[  --disable-shared
+                           disable building of shared cryptsetup library],,
+-enable_shared_library=yes)
+-AM_CONDITIONAL(STATIC_LIBRARY, test x$enable_shared_library = xno)
++enable_shared=yes)
++AM_CONDITIONAL(STATIC_LIBRARY, test x$enable_shared = xno)
+ 
+ AC_ARG_ENABLE(selinux,
+ [  --disable-selinux       disable selinux support [[default=auto]]],[], [])
 @@ -80,7 +80,7 @@ LIBS=$saved_LIBS
  if test "x$enable_selinux" != xno; then
  	AC_CHECK_LIB(sepol, sepol_bool_set)

package/cryptsetup/patches/patch-lib_Makefile_in

@@ -1,5 +1,5 @@
 --- cryptsetup-1.1.0.orig/lib/Makefile.in	2010-01-17 11:29:22.000000000 +0100
-+++ cryptsetup-1.1.0/lib/Makefile.in	2010-02-14 18:24:56.000000000 +0100
++++ cryptsetup-1.1.0/lib/Makefile.in	2010-02-16 20:32:36.872861451 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.

package/cryptsetup/patches/patch-ltmain_sh

@@ -1,20 +0,0 @@
---- cryptsetup-1.1.0.orig/ltmain.sh	2010-01-17 11:29:15.000000000 +0100
-+++ cryptsetup-1.1.0/ltmain.sh	2010-02-14 18:24:56.000000000 +0100
-@@ -65,7 +65,7 @@
- #       compiler:		$LTCC
- #       compiler flags:		$LTCFLAGS
- #       linker:		$LD (gnu? $with_gnu_ld)
--#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
-+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
- #       automake:		$automake_version
- #       autoconf:		$autoconf_version
- #
-@@ -73,7 +73,7 @@
- 
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION="2.2.6b Debian-2.2.6b-2"
-+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
- TIMESTAMP=""
- package_revision=1.3017
- 

package/cryptsetup/patches/patch-luks_Makefile_in

@@ -1,5 +1,5 @@
 --- cryptsetup-1.1.0.orig/luks/Makefile.in	2010-01-17 11:29:22.000000000 +0100
-+++ cryptsetup-1.1.0/luks/Makefile.in	2010-02-14 18:24:56.000000000 +0100
++++ cryptsetup-1.1.0/luks/Makefile.in	2010-02-16 20:32:36.876861682 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.

package/cryptsetup/patches/patch-man_Makefile_in

@@ -1,5 +1,5 @@
 --- cryptsetup-1.1.0.orig/man/Makefile.in	2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/man/Makefile.in	2010-02-14 18:24:56.000000000 +0100
++++ cryptsetup-1.1.0/man/Makefile.in	2010-02-16 20:32:36.880860794 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.

package/cryptsetup/patches/patch-src_Makefile_in

@@ -1,5 +1,5 @@
 --- cryptsetup-1.1.0.orig/src/Makefile.in	2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/src/Makefile.in	2010-02-14 18:24:56.000000000 +0100
++++ cryptsetup-1.1.0/src/Makefile.in	2010-02-16 20:32:36.880860794 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.

package/cryptsetup/patches/patch-tests_Makefile_in

@@ -1,5 +1,5 @@
 --- cryptsetup-1.1.0.orig/tests/Makefile.in	2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/tests/Makefile.in	2010-02-14 18:24:56.000000000 +0100
++++ cryptsetup-1.1.0/tests/Makefile.in	2010-02-16 20:32:36.888860137 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.

package/file/Makefile

@@ -21,6 +21,7 @@ pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
 		CFLAGS="-static" \
 		./configure --enable-static --disable-shared \
+		--disable-warnings \
 	);
 	${MAKE} -C ${WRKBUILD}
 	${INSTALL_BIN} ${WRKBUILD}/src/file ${WRKBUILD}/magic

package/httping/Makefile

@@ -23,6 +23,6 @@ CONFIG_STYLE:=		manual
 
 post-install:
 	${INSTALL_DIR} ${IDIR_HTTPING}/usr/bin
-	${CP} ${WRKINST}/usr/bin/httping ${IDIR_HTTPING}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/httping ${IDIR_HTTPING}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/httping/patches/patch-Makefile

@@ -0,0 +1,21 @@
+--- httping-1.4.1.orig/Makefile	2010-01-10 21:35:22.000000000 +0100
++++ httping-1.4.1/Makefile	2010-02-14 11:30:47.000000000 +0100
+@@ -17,7 +17,7 @@ include version
+ TARGET=httping
+
+ WFLAGS=-Wall -W
+-OFLAGS=-O2
++OFLAGS=
+ CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
+
+ PACKAGE=$(TARGET)-$(VERSION)
+@@ -73,9 +73,6 @@ install: $(TARGET)
+	$(INSTALLMAN) $(MANS) $(DESTDIR)/$(MANDIR)/man1
+	$(INSTALLDIR) $(DESTDIR)/$(DOCDIR)
+	$(INSTALLDOC) $(DOCS) $(DESTDIR)/$(DOCDIR)
+-ifneq (DEBUG,yes)
+-	$(STRIP) $(DESTDIR)/$(BINDIR)/$(TARGET)
+-endif
+
+ clean:
+	$(RMDIR) $(OBJS) $(TARGET) *~ core

package/kismet/Makefile

@@ -4,54 +4,46 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		kismet
-PKG_VERSION:=		2008-05-R1
+PKG_VERSION:=		2010-01-R1
 PKG_RELEASE:=		1
+PKG_DESCR:=		Kismet
 PKG_BUILDDEP+=		libpcap ncurses
-PKG_CXX:=		KISMET
-PKG_MD5SUM:=		6ee365d36354b4dee4945e67f8149294
+PKG_DEPENDS:=		libpcap libncurses
+PKG_MD5SUM:=		a6d6edcf65d5bb2cb5de6472bcc16f19
+PKG_URL:=		http://www.kismetwireless.net/
 PKG_SITES:=		http://www.kismetwireless.net/code/
 
+PKG_DESCR_CLIENT:=	Kismet client
+PKG_DESCR_SERVER:=	Kismet server
+PKG_DESCR_DRONE:=	Kismet drone
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,KISMET,kismet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-INSTALL_STYLE:=		manual
-
-ifeq ($(ADK_COMPILE_KISMET_WITH_UCLIBCXX),y)
-TCFLAGS+=		-fno-builtin -fno-rtti -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++
-TLDFLAGS+=		-luClibc++ -lc -lm -lgcc_s -nodefaultlibs 
-CONFIGURE_ENV+=		CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
-			-I${STAGING_DIR}/usr/include/uClibc++"
-else
-TLDFLAGS+=		-shared
-endif
+$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENT},${PKG_SECTION}))
+$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DRONE},${PKG_SECTION}))
+$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SERVER},${PKG_SECTION}))
+
 CONFIGURE_ARGS+=	--sysconfdir=/etc/kismet \
-			--enable-syspcap=yes \
-			--disable-setuid \
-			--disable-gpsmap
+			--disable-linuxwext
+
+pre-build:
+	(cd ${WRKBUILD} && ${MAKE} dep);
 
-do-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_KISMET}/usr/bin/
-	${INSTALL_BIN} ${WRKBUILD}/kismet ${IDIR_KISMET}/usr/bin/kismet
+	${INSTALL_BIN} ${WRKINST}/usr/bin/kismet ${IDIR_KISMET}/usr/bin/kismet
 	${INSTALL_DIR} ${IDIR_KISMET_CLIENT}/usr/bin
-	${INSTALL_DIR} ${IDIR_KISMET_CLIENT}/etc/kismet/
-	${INSTALL_DATA} ./files/ap_manuf ${IDIR_KISMET_CLIENT}/etc/kismet/
-	${INSTALL_DATA} ./files/client_manuf ${IDIR_KISMET_CLIENT}/etc/kismet/
-	${INSTALL_DATA} ./files/kismet.conf ${IDIR_KISMET_CLIENT}/etc/kismet/
-	${INSTALL_DATA} ./files/kismet_ui.conf ${IDIR_KISMET_CLIENT}/etc/kismet/
-	${CP} ${WRKBUILD}/kismet_client ${IDIR_KISMET_CLIENT}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_client \
+		${IDIR_KISMET_CLIENT}/usr/bin/
 	${INSTALL_DIR} ${IDIR_KISMET_DRONE}/usr/bin
-	${INSTALL_DIR} ${IDIR_KISMET_DRONE}/etc/kismet/
-	${INSTALL_DATA} ./files/kismet_drone.conf ${IDIR_KISMET_DRONE}/etc/kismet/
-	${CP} ${WRKBUILD}/kismet_drone ${IDIR_KISMET_DRONE}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_drone \
+		${IDIR_KISMET_DRONE}/usr/bin/
 	${INSTALL_DIR} ${IDIR_KISMET_SERVER}/usr/bin
-	${INSTALL_DIR} ${IDIR_KISMET_SERVER}/etc/kismet/
-	${INSTALL_DATA} ./files/ap_manuf ${IDIR_KISMET_SERVER}/etc/kismet/
-	${INSTALL_DATA} ./files/client_manuf ${IDIR_KISMET_SERVER}/etc/kismet/
-	${INSTALL_DATA} ./files/kismet.conf ${IDIR_KISMET_SERVER}/etc/kismet/
-	${CP}  ${WRKBUILD}/kismet_server ${IDIR_KISMET_SERVER}/usr/bin/
+	${INSTALL_DIR} ${IDIR_KISMET_SERVER}/etc/kismet
+	${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_server \
+		${IDIR_KISMET_SERVER}/usr/bin/
+	${INSTALL_DATA} ${WRKINST}/etc/kismet/kismet.conf \
+		${IDIR_KISMET_SERVER}/etc/kismet
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/kismet/files/ap_manuf

@@ -1,79 +0,0 @@
-00:01:03:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:01:24:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	default	6	192.168.2.1
-00:01:24:24:00:00/FF:FF:FF:FF:00:00	SMC	SMC7004AWBR	default	6	192.168.2.1
-00:02:2D:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:02:6F:00:00:00/FF:FF:FF:00:00:00	Senao	Unknown		0	
-00:02:A5:00:00:00/FF:FF:FF:00:00:00	Compaq	Unknown		0	
-00:03:2F:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown		0	
-00:04:3A:3A:00:00/FF:FF:FF:FF:00:00	Avaya	ad-01444		0	
-00:04:5A:0E:00:00/FF:FF:FF:FF:00:00	Linksys	WAP11	linksys	6	192.168.1.1
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4	linksys	6	192.168.1.1
-00:04:5A:2E:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4	linksys	6	192.168.1.1
-00:04:5A:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:04:75:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:04:75:75:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE20096A AP2000 Version 1	3Com	0	169.254.0.1
-00:04:E2:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown		0	
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	7004AWBR	default	6	192.168.2.1
-00:05:5D:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-1000AP	default	6	
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4 v2	linksys	6	192.168.1.1
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WET11	linksys	6	192.168.1.225
-00:07:0E:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:07:50:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:08:21:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:43:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown		0	
-00:09:7C:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:92:92:00:00/FF:FF:FF:FF:00:00	Sweex	LC000010	wireless	11	192.168.0.1
-00:09:E8:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:41:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:8A:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:8A:8A:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-AP1200		0	
-00:30:65:00:00:00/FF:FF:FF:00:00:00	Apple	Unknown		0	
-00:30:65:65:00:00/FF:FF:FF:FF:00:00	Apple	Snow Base Station		1	
-00:30:AB:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown		0	
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MR314NA	Wireless	1	192.168.0.1
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown		0	
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6230-3		0	
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DI-614+	default	6	192.168.0.1
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-900AP+	default	6	192.168.0.50
-00:40:26:00:00:00/FF:FF:FF:00:00:00	Buffalo	Unknown		0	
-00:40:26:26:00:00/FF:FF:FF:FF:00:00	Buffalo	WLAR-L11G-L		0	
-00:40:96:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	tsunami	6	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-AP342E2R	tsunami	6	192.168.1.1
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AP-350	tsunami	7	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	Aironet 350	tsunami	6	
-00:50:08:00:00:00/FF:FF:FF:00:00:00	Compaq	Unknown		0	
-00:50:8B:8B:00:00/FF:FF:FF:FF:00:00	Compaq	WL400 - ETSI region	compaq	11	
-00:50:DA:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:50:DA:DA:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE747A		0	
-00:50:F2:F2:00:00/FF:FF:FF:FF:00:00	Microsoft	MN-500	MSHOME	6	192.168.0.1
-00:60:01:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:60:1D:00:00:00/FF:FF:FF:00:00:00	Orinoco	Unknown		0	
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Orinoco	RG1000		0	
-00:60:6D:00:00:00/FF:FF:FF:00:00:00	Cabletron	Unknown		0	
-00:60:B3:00:00:00/FF:FF:FF:00:00:00	Proxim	Unknown		0	
-00:80:37:37:00:00/FF:FF:FF:FF:00:00	Ericsson	A11 (AP-4121-105M-ER-EU)		0	
-00:80:C6:00:00:00/FF:FF:FF:00:00:00	SOHOware	Unknown	
-00:80:C6:C6:00:00/FF:FF:FF:FF:00:00	SOHOware	NetBlaster II
-00:90:4B:4B:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4	linksys	6	192.168.1.1
-00:90:D1:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	WLAN	11	
-00:90:D1:D1:00:00/FF:FF:FF:FF:00:00	SMC	SMC2652W	WLAN	11	
-00:90:D1:D1:00:00/FF:FF:FF:FF:00:00	SMC	SMC2682W	BRIDGE	11	
-00:A0:04:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown	
-00:A0:04:04:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE51196
-00:A0:F8:00:00:00/FF:FF:FF:00:00:00	Symbol	Unknown	
-00:E0:29:00:00:00/FF:FF:FF:00:00:00	OEM	Unknown	
-08:00:46:00:00:00/FF:FF:FF:00:00:00	Sony	Unknown	
-00:50:F2:00:00:00/FF:FF:FF:00:00:00	Microsoft	Unknown	MSHOME	6	192.168.2.1
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknwon	NETGEAR	11	192.168.0.1
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown	WLAN	11	0.0.0.0
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown	Wireless	11  192.168.0.2
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown	belkin54g	11  0.0.0.0
-00:0D:88:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	192.168.0.1
-00:80:C8:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	192.168.0.1
-00:40:05:00:00:00/FF:FF:FF:00:00:00	ANI	Unknown	default	6	192.168.0.1
-00:0C:41:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:04:E2:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	SMC	6	192.168.2.1
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys-g	6	192.168.1.1

package/kismet/files/client_manuf

@@ -1,249 +0,0 @@
-00:00:22:22:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Silver		0	
-00:00:8F:8F:00:00/FF:FF:FF:FF:00:00	BreezeCOM	Breezenet Pro SA-PC		0	
-00:01:03:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:01:03:03:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE62092A
-00:01:03:03:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE777A		0	
-00:01:24:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	default	6	192.168.2.1
-00:01:F4:F4:00:00/FF:FF:FF:FF:00:00	Entrasys	CSIBD-AB-S Roamabout		0	
-00:02:2D:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Agere	Orinoco Gold
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Agere	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Avaya	PC24E-H-ET
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Avaya	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Avaya	World Card Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Buffalo	WLI-PCM-L11
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Buffalo	WLI-PCM-L11
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Buffalo	WLI-PCM-L11GP		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Dell	TrueMobile 1150
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Dell	TrueMobile 1150 Mini-PCI		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Dell	Truemobile 1150		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Dell	true mobile 1150		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Gold
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN Silver		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN Silver (PC24E-H-FC)		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN-Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN/IEEE Version 01.01		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	MiniPCI Card (embedded in Sony Laptop)		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Orinoco Gold	wireless	3	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Orinoco Gold
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Orinoco Mini PCI Card		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	PC Card T2 Extended ORiNOCO Europe 128RC4 Kit Gold		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	PC24E-H-ET
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	PC24E-H-FC		0	
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Silver
-00:02:2D:2D:00:00/FF:FF:FF:FF:00:00	Orinoco	Silver
-00:02:6F:00:00:00/FF:FF:FF:00:00:00	Senao	Unknown		0	
-00:02:6F:6F:00:00/FF:FF:FF:FF:00:00	Senao	SL-2011 CD
-00:02:6F:6F:00:00/FF:FF:FF:FF:00:00	Senao	SL-2011CD		0	
-00:02:6F:6F:00:00/FF:FF:FF:FF:00:00	Senao	SL-2011CD
-00:02:6F:6F:00:00/FF:FF:FF:FF:00:00	Senao	SL-2511CD PLUS EXT2(F200)		0	
-00:02:A5:00:00:00/FF:FF:FF:00:00:00	Compaq	Unknown		0	
-00:02:A5:A5:00:00/FF:FF:FF:FF:00:00	Compaq	WL110
-00:02:A5:A5:00:00/FF:FF:FF:FF:00:00	Compaq	WL110 REV.0A		0	
-00:02:B3:B3:00:00/FF:FF:FF:FF:00:00	Intel	WPC-2011BWW		0	
-00:03:2F:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown		0	
-00:03:2F:2F:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11		0	
-00:03:2F:2F:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11
-00:03:2F:2F:00:00/FF:FF:FF:FF:00:00	Repotec	GL241101
-00:04:5A:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown		0	
-00:04:5A:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	Linksys	6	192.168.1.1
-00:04:5A:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4	linksys	0	
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11
-00:04:5A:5A:00:00/FF:FF:FF:FF:00:00	Linksys	WUSB11
-00:04:75:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:04:75:75:00:00/FF:FF:FF:FF:00:00	3Com	3CRSHPW696		0	
-00:04:75:75:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE62092B		0	
-00:04:75:75:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE62092B
-00:04:DB:DB:00:00/FF:FF:FF:FF:00:00	Tellus	TWL-C11		0	
-00:04:E2:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown		0	
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W		0	
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W
-00:04:E2:E2:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W
-00:05:3C:3C:00:00/FF:FF:FF:FF:00:00	Intel	Intel MiniPCI High Rate Wireless (ISL3874A)		0	
-00:05:5D:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown		0	
-00:05:5D:00:00:00/FF:FF:FF:00:00:00	D-Link	Unknown	default	6	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	Compaq	HNW-100		0	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DCF-650W
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650		0	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650		0	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650		0	
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650H
-00:05:5D:5D:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-660 H/W:A1 F/W:4.04		0	
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown		0	
-00:06:25:00:00:00/FF:FF:FF:00:00:00	Linksys	Unknown	linksys	6	192.168.1.1
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	D-Link	DCF-650W
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Dell	True Mobile 1150		6	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	BEFW11S4 v2	linksys	6	192.168.1.1
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WCF11		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WCF11
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WCF12		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WCF12
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WCF12
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WMP11		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WMP11 v2.5		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 V.3		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v2.5
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v2.5
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 v3.0		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WPC11 ver.3 (FCC-ID: PKW-WPC11-V31[suggests V3.1])		0	
-00:06:25:25:00:00/FF:FF:FF:FF:00:00	Linksys	WUSB11 v2.6		0	
-00:07:0E:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:07:0E:0E:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:07:0E:0E:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:07:50:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:07:50:50:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:07:50:50:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM350		0	
-00:08:21:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:08:21:21:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:08:21:21:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:08:21:21:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:08:21:21:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:09:43:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:43:43:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:09:5B:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown		0	
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	MA401		0	
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	MA401RA		0	
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	MA401RA
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	MA701		0	
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	MA701
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	ma101		0	
-00:09:5B:5B:00:00/FF:FF:FF:FF:00:00	Netgear	wab501		0	
-00:09:7C:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:7C:7C:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:09:7C:7C:00:00/FF:FF:FF:FF:00:00	Cisco	Cisco Aironet 352 802.11b pcmcia card		0	
-00:09:92:92:00:00/FF:FF:FF:FF:00:00	Sweex	LC500010 ATMEL PCMCIA FastVNET (502A-D)		0	
-00:09:B7:B7:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352		0	
-00:09:B7:B7:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352		0	
-00:09:E8:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:09:E8:E8:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352
-00:0A:41:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:41:41:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-LMC352		0	
-00:0A:41:41:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352		0	
-00:0A:41:41:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352		0	
-00:0A:41:41:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:0A:41:41:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:0A:8A:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:8A:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:0A:8A:8A:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:0B:5F:5F:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-CB20A-A-K9		0	
-00:20:A6:A6:00:00/FF:FF:FF:FF:00:00	Proxim	Symphony (PC Card 4430)		0	
-00:20:D6:D6:00:00/FF:FF:FF:FF:00:00	BreezeCOM	Breezenet Pro.11 SA-PCR		0	
-00:30:65:00:00:00/FF:FF:FF:00:00:00	Apple	Unknown		0	
-00:30:65:00:00:00/FF:FF:FF:00:00:00	Apple	Unknown		0	
-00:30:65:65:00:00/FF:FF:FF:FF:00:00	Apple	Airport Card 2002
-00:30:AB:00:00:00/FF:FF:FF:00:00:00	Netgear	Unknown		0	
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MA401		0	
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MA401
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MA401
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MA401
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MA401
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	MR314	Wireless	1	192.168.0.1
-00:30:AB:AB:00:00/FF:FF:FF:FF:00:00	Netgear	Netgear ma401		0	
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown		0	
-00:30:BD:00:00:00/FF:FF:FF:00:00:00	Belkin	Unknown		0	
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020		0	
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020		0	
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020 (Version 01.02)		0	
-00:30:BD:BD:00:00/FF:FF:FF:FF:00:00	Belkin	F5D6020u		0	
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DI-614+	default	6	192.168.0.1
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DI-614+ 22Mbps router/AP/switch	default	6	192.168.0.1
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-520+		0	
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650		0	
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650	internet	8	
-00:40:05:05:00:00/FF:FF:FF:FF:00:00	D-Link	DWL-650+	wireless	6	192.168.0.1
-00:40:26:00:00:00/FF:FF:FF:00:00:00	Buffalo	Unknown		0	
-00:40:96:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown		0	
-00:40:96:00:00:00/FF:FF:FF:00:00:00	Cisco	Unknown	tsunami	6	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	350
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PC4800
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340		0	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340		0	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM340 (Dell Rebrand)		0	
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	AIR-PCM352
-00:40:96:96:00:00/FF:FF:FF:FF:00:00	Cisco	PC 4800 DS PCI Adapter		0	
-00:50:08:00:00:00/FF:FF:FF:00:00:00	Compaq	Unknown		0	
-00:50:08:08:00:00/FF:FF:FF:FF:00:00	Compaq	WL100		0	
-00:50:08:08:00:00/FF:FF:FF:FF:00:00	Compaq	WL100
-00:50:8B:8B:00:00/FF:FF:FF:FF:00:00	Compaq	Compaq WL100	compaq	0	
-00:50:8B:8B:00:00/FF:FF:FF:FF:00:00	Compaq	WL200 - ETSI region		0	
-00:50:DA:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:50:DA:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:50:DA:DA:00:00/FF:FF:FF:FF:00:00	3Com	3CRWE73796B
-00:50:F2:F2:00:00/FF:FF:FF:FF:00:00	Microsoft	MN-510		0	
-00:50:F2:F2:00:00/FF:FF:FF:FF:00:00	Microsoft	Wireless Notebook Adapter MN-520		0	
-00:60:01:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:60:01:01:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN Silver
-00:60:1D:00:00:00/FF:FF:FF:00:00:00	Lucent	Unknown		0	
-00:60:1D:00:00:00/FF:FF:FF:00:00:00	Orinoco	Unknown		0	
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	Lucent WaveLAN Turbo - Bronze, P/N: 011498/A		0	
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	Orinoco Gold
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	PC24E-00-FC		0	
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	Silver
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN Bronze
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	WaveLAN Gold
-00:60:1D:1D:00:00/FF:FF:FF:FF:00:00	Lucent	Wavelan Turbo Bronze		0	
-00:60:6D:00:00:00/FF:FF:FF:00:00:00	Cabletron	Unknown		0	
-00:60:6D:6D:00:00/FF:FF:FF:FF:00:00	Cabletron	CSIBB-AA
-00:60:6D:6D:00:00/FF:FF:FF:FF:00:00	Cabletron	CSIBB-AA
-00:60:6D:6D:00:00/FF:FF:FF:FF:00:00	Cabletron	RoamAbout 802.11DS		0	
-00:60:B3:00:00:00/FF:FF:FF:00:00:00	Proxim	Unknown		0	
-00:60:B3:B3:00:00/FF:FF:FF:FF:00:00	3Com	XI-815		0	
-00:60:B3:B3:00:00/FF:FF:FF:FF:00:00	3Com	Zcom WL2000D		0	
-00:60:B3:B3:00:00/FF:FF:FF:FF:00:00	Proxim	RangeLAN DS		0	
-00:60:B3:B3:00:00/FF:FF:FF:FF:00:00	Proxim	RangeLan DS 8430
-00:60:B3:B3:00:00/FF:FF:FF:FF:00:00	SMC	SMC2642W
-00:80:37:37:00:00/FF:FF:FF:FF:00:00	Ericsson	C11 (LA-4121-102M-ER-EU)		0	
-00:80:C6:00:00:00/FF:FF:FF:00:00:00	SOHOware	Unknown		0	
-00:90:4B:4B:00:00/FF:FF:FF:FF:00:00	Dell	1180 True Mobile PCI		0	
-00:90:96:96:00:00/FF:FF:FF:FF:00:00	Yakumo	WLAN PCMCIA Card 11 Mbps		0	
-00:90:D1:00:00:00/FF:FF:FF:00:00:00	LeArtery	Unknown		0	
-00:90:D1:00:00:00/FF:FF:FF:00:00:00	SMC	Unknown	WLAN	11	
-00:90:D1:D1:00:00/FF:FF:FF:FF:00:00	LeArtery	SyncByAir LN101
-00:90:D1:D1:00:00/FF:FF:FF:FF:00:00	SMC	2662W		0	
-00:90:D1:D1:00:00/FF:FF:FF:FF:00:00	SMC	SMC2632W		0	
-00:A0:04:00:00:00/FF:FF:FF:00:00:00	3Com	Unknown		0	
-00:A0:65:65:00:00/FF:FF:FF:FF:00:00	Nexland	Zcom XI-300		0	
-00:A0:F8:00:00:00/FF:FF:FF:00:00:00	Symbol	Unknown		0	
-00:A0:F8:F8:00:00/FF:FF:FF:FF:00:00	Symbol	Spectrum 24 High Rate 11MBps wireless LAN adapter		0	
-00:A0:F8:F8:00:00/FF:FF:FF:FF:00:00	Symbol	Spectrum24
-00:C0:49:49:00:00/FF:FF:FF:FF:00:00	US Robotics	USR1120		0	
-00:E0:29:00:00:00/FF:FF:FF:00:00:00	OEM	Unknown		0	
-00:E0:29:29:00:00/FF:FF:FF:FF:00:00	OEM	OEM
-00:E0:29:29:00:00/FF:FF:FF:FF:00:00	SMC	2632W		0	
-00:E0:29:29:00:00/FF:FF:FF:FF:00:00	SMC	EZ-Connect Wireless		0	
-08:00:46:00:00:00/FF:FF:FF:00:00:00	Sony	Unknown		0	
-08:00:46:46:00:00/FF:FF:FF:FF:00:00	Sony	PCWA-C100

package/kismet/files/kismet.conf

@@ -1,281 +0,0 @@
-# Kismet config file
-# Most of the "static" configs have been moved to here -- the command line
-# config was getting way too crowded and cryptic.  We want functionality,
-# not continually reading --help!
-
-# Version of Kismet config
-version=2005.01.R1
-
-# Name of server (Purely for organiational purposes)
-servername=Kismet
-
-# User to setid to (should be your normal user)
-suiduser=nobody
-
-# Sources are defined as:
-# source=cardtype,interface,name[,initialchannel]
-# Card types and required drivers are listed in the README.
-# The initial channel is optional, if hopping is not enabled it can be used
-# to set the channel the interface listens on.
-# YOU MUST CHANGE THIS TO BE THE SOURCE YOU WANT TO USE
-source=wrt54g,eth1,wireless
-# For v1 hardware uncomment this:
-# source=wrt54g,eth2,wireless
-
-# Comma-separated list of sources to enable.  This is only needed if you defined
-# multiple sources and only want to enable some of them.  By default, all defined
-# sources are enabled.
-# For example:
-# enablesources=prismsource,ciscosource
-
-# Do we channelhop?
-channelhop=true
-
-# How many channels per second do we hop?  (1-10)
-channelvelocity=5
-
-# By setting the dwell time for channel hopping we override the channelvelocity
-# setting above and dwell on each channel for the given number of seconds.
-#channeldwell=10
-
-# Do we split channels between cards on the same spectrum?  This means if 
-# multiple 802.11b capture sources are defined, they will be offset to cover
-# the most possible spectrum at a given time.  This also controls splitting
-# fine-tuned sourcechannels lines which cover multiple interfaces (see below)
-channelsplit=true
-
-# Basic channel hopping control:
-# These define the channels the cards hop through for various frequency ranges
-# supported by Kismet.   More finegrain control is available via the 
-# "sourcechannels" configuration option.
-# 
-# Don't change the IEEE80211<x> identifiers or channel hopping won't work.
-
-# Users outside the US might want to use this list:
-# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12
-defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11g uses the same channels as 802.11b...
-defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11a channels are non-overlapping so sequential is fine.  You may want to
-# adjust the list depending on the channels your card actually supports.
-# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 
-defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64
-
-# Combo cards like Atheros use both 'a' and 'b/g' channels.  Of course, you
-# can also explicitly override a given source.  You can use the script 
-# extras/listchan.pl to extract all the channels your card supports.
-defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64
-
-# Fine-tuning channel hopping control:
-# The sourcechannels option can be used to set the channel hopping for 
-# specific interfaces, and to control what interfaces share a list of 
-# channels for split hopping.  This can also be used to easily lock
-# one card on a single channel while hopping with other cards.
-# Any card without a sourcechannel definition will use the standard hopping
-# list.
-# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN
-
-# ie, for us channels on the source 'prism2source' (same as normal channel
-# hopping behavior):
-# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10
-
-# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay
-# on channel 6 and prism2b to hop normally.  By not setting a sourcechannels 
-# line for prism2b, it will use the standard hopping.
-# sourcechannels=prism2a:6
-
-# To assign the same custom hop channel to multiple sources, or to split the 
-# same custom hop channel over two sources (if splitchannels is true), list
-# them all on the same sourcechannels line:
-# sourcechannels=prism2a,prism2b,prism2c:1,6,11
-
-# Port to serve GUI data
-tcpport=2501
-# People allowed to connect, comma seperated IP addresses or network/mask
-# blocks.  Netmasks can be expressed as dotted quad (/255.255.255.0) or as
-# numbers (/24)
-allowedhosts=127.0.0.1
-# Maximum number of concurrent GUI's
-maxclients=5
-
-# Do we have a GPS?
-gps=false
-# Host:port that GPSD is running on.  This can be localhost OR remote!
-gpshost=localhost:2947
-# Do we lock the mode?  This overrides coordinates of lock "0", which will
-# generate some bad information until you get a GPS lock, but it will 
-# fix problems with GPS units with broken NMEA that report lock 0
-gpsmodelock=false
-
-# Packet filtering options:
-# filter_tracker - Packets filtered from the tracker are not processed or
-#                  recorded in any way.
-# filter_dump    - Packets filtered at the dump level are tracked, displayed,
-#                  and written to the csv/xml/network/etc files, but not 
-#                  recorded in the packet dump
-# filter_export  - Controls what packets influence the exported CSV, network,
-#                  xml, gps, etc files.
-# All filtering options take arguments containing the type of address and
-# addresses to be filtered.  Valid address types are 'ANY', 'BSSID',
-# 'SOURCE', and 'DEST'.  Filtering can be inverted by the use of '!' before
-# the address.  For example,
-# filter_tracker=ANY(!00:00:DE:AD:BE:EF)
-# has the same effect as the previous mac_filter config file option.
-# filter_tracker=...
-# filter_dump=...
-# filter_export=...
-
-# Alerts to be reported and the throttling rates.
-# alert=name,throttle/unit,burst
-# The throttle/unit describes the number of alerts of this type that are
-# sent per time unit.  Valid time units are second, minute, hour, and day.
-# Burst describes the number of alerts sent before throttling takes place.
-# For example:
-# alert=FOO,10/min,5
-# Would allow 5 alerts through before throttling is enabled, and will then
-# limit the number of alerts to 10 per minute.
-# A throttle rate of 0 disables throttling of the alert.
-# See the README for a list of alert types.
-alert=NETSTUMBLER,5/min,2
-alert=WELLENREITER,5/min,2
-alert=LUCENTTEST,5/min,2
-alert=DEAUTHFLOOD,5/min,4
-alert=BCASTDISCON,5/min,4
-alert=CHANCHANGE,5/min,4
-alert=AIRJACKSSID,5/min,2
-alert=PROBENOJOIN,5/min,2
-alert=DISASSOCTRAFFIC,5/min,2
-alert=NULLPROBERESP,5/min,5
-alert=BSSTIMESTAMP,5/min,5
-
-# Known WEP keys to decrypt, bssid,hexkey.  This is only for networks where
-# the keys are already known, and it may impact throughput on slower hardware.
-# Multiple wepkey lines may be used for multiple BSSIDs.
-# wepkey=00:DE:AD:C0:DE:00,FEEDFACEDEADBEEF01020304050607080900
-
-# Is transmission of the keys to the client allowed?  This may be a security
-# risk for some.  If you disable this, you will not be able to query keys from
-# a client.
-allowkeytransmit=true
-
-# How often (in seconds) do we write all our data files (0 to disable)
-writeinterval=300
-
-# Where do we get our manufacturer fingerprints from?  Assumed to be in the
-# default config directory if an absolute path is not given.
-ap_manuf=ap_manuf
-client_manuf=client_manuf
-
-# Use metric measurements in the output?
-metric=false
-
-# Do we write waypoints for gpsdrive to load?  Note:  This is NOT related to
-# recent versions of GPSDrive's native support of Kismet.
-waypoints=false
-# GPSMap waypoint file.  This WILL be truncated.
-waypointdata=%h/.gpsdrive/way_kismet.txt
-
-# How many alerts do we backlog for new clients?  Only change this if you have
-# a -very- low memory system and need those extra bytes, or if you have a high
-# memory system and a huge number of alert conditions.
-alertbacklog=50
-
-# File types to log, comma seperated
-# dump    - raw packet dump
-# network - plaintext detected networks
-# csv     - plaintext detected networks in CSV format
-# xml     - XML formatted network and cisco log
-# weak    - weak packets (in airsnort format)
-# cisco   - cisco equipment CDP broadcasts
-# gps     - gps coordinates
-logtypes=dump,network,csv,xml,weak,cisco,gps
-
-# Do we track probe responses and merge probe networks into their owners?
-# This isn't always desireable, depending on the type of monitoring you're
-# trying to do.
-trackprobenets=true
-
-# Do we log "noise" packets that we can't decipher?  I tend to not, since 
-# they don't have anything interesting at all in them.
-noiselog=false
-
-# Do we log corrupt packets?  Corrupt packets have enough header information
-# to see what they are, but someting is wrong with them that prevents us from
-# completely dissecting them.  Logging these is usually not a bad idea.
-corruptlog=true
-
-# Do we log beacon packets or do we filter them out of the dumpfile
-beaconlog=true
-
-# Do we log PHY layer packets or do we filter them out of the dumpfile
-phylog=true
-
-# Do we mangle packets if we can decrypt them or if they're fuzzy-detected
-mangledatalog=true
-
-# Do we do "fuzzy" crypt detection?  (byte-based detection instead of 802.11
-# frame headers)
-# valid option: Comma seperated list of card types to perform fuzzy detection 
-#  on, or 'all'
-fuzzycrypt=wtapfile,wlanng,wlanng_legacy,wlanng_avs,hostap,wlanng_wext
-
-# What type of dump do we generate? 
-# valid option: "wiretap" 
-dumptype=wiretap
-# Do we limit the size of dump logs?  Sometimes ethereal can't handle big ones.
-# 0 = No limit
-# Anything else = Max number of packets to log to a single file before closing
-# and opening a new one.
-dumplimit=0
-
-# Do we write data packets to a FIFO for an external data-IDS (such as Snort)?
-# See the docs before enabling this.
-#fifo=/tmp/kismet_dump
-
-# Default log title
-logdefault=Kismet
-
-# logtemplate - Filename logging template.
-# This is, at first glance, really nasty and ugly, but you'll hardly ever
-# have to touch it so don't complain too much.
-#
-# %n is replaced by the logging instance name
-# %d is replaced by the current date as Mon-DD-YYYY
-# %D is replaced by the current date as YYYYMMDD
-# %t is replaced by the starting log time
-# %i is replaced by the increment log in the case of multiple logs
-# %l is replaced by the log type (dump, status, crypt, etc)
-# %h is replaced by the home directory
-# ie, "netlogs/%n-%d-%i.dump" called with a logging name of "Pok" could expand
-# to something like "netlogs/Pok-Dec-20-01-1.dump" for the first instance and 
-# "netlogs/Pok-Dec-20-01-2.%l" for the second logfile generated.
-# %h/netlots/%n-%d-%i.dump could expand to
-# /home/foo/netlogs/Pok-Dec-20-01-2.dump
-#
-# Other possibilities:  Sorting by directory
-# logtemplate=%l/%n-%d-%i
-# Would expand to, for example,
-# dump/Pok-Dec-20-01-1
-# crypt/Pok-Dec-20-01-1
-# and so on.  The "dump", "crypt", etc, dirs must exist before kismet is run
-# in this case.
-logtemplate=%n-%d-%i.%l
-
-# Where do we store the pid file of the server?
-piddir=/var/run/
-
-# Where state info, etc, is stored.  You shouldnt ever need to change this.
-# This is a directory.
-configdir=%h/.kismet/
-
-# cloaked SSID file.  You shouldn't ever need to change this.
-ssidmap=ssid_map
-
-# Group map file.  You shouldn't ever need to change this.
-groupmap=group_map
-
-# IP range map file.  You shouldn't ever need to change this.
-ipmap=ip_map
-

package/kismet/files/kismet_drone.conf

@@ -1,121 +0,0 @@
-# Kismet drone config file
-
-version=2005.04.R1
-
-# Name of server (Purely for organiational purposes)
-servername=Kismet
-
-# User to setid to (should be your normal user)
-suiduser=nobody
-
-# Port to serve packet data... This probably shouldn't be the same as the port
-# you configured kismet_server for, or else you'll have problems running them 
-# on the same system.
-tcpport=3501
-# People allowed to connect, comma seperated IP addresses or network/mask
-# blocks.  Netmasks can be expressed as dotted quad (/255.255.255.0) or as
-# numbers (/24)
-allowedhosts=127.0.0.1
-# Maximum number of concurrent stream attachments
-maxclients=5
-
-# Packet sources:
-# source=capture_cardtype,capture_interface,capture_name
-# Card type - Specifies the type of device. It can be one of:
-#     cisco         - Cisco card with Linux Kernel drivers 
-#     cisco_cvs     - Cisco card with CVS Linux drivers
-#     cisco_bsd     - Cisco on *BSD
-#     prism2        - Prism2 using wlan-ng drivers with pcap support (all 
-#                      current versions support pcap)
-#     prism2_hostap - Prism2 using hostap drivers
-#     prism2_legacy - Prism2 using wlan-ng drivers without pcap support (0.1.9)
-#     prism2_bsd    - Prism2 on *BSD
-#     orinoco       - Orinoco cards using Snax's patched driers
-#     generic       - Generic card with no specific support.  You will have 
-#                      to put this into monitor mode yourself!
-#     wsp100        - WSP100 embedded remote sensor.  
-#     wtapfile      - Saved file of packets readable by libwiretap
-#     ar5k          - ar5k 802.11a using the vt_ar5k drivers
-# Capture interface - Specifies the network interface Kismet will watch for
-#  packets to come in on.  Typically "ethX" or "wlanX".  For the WSP100 capture
-#  engine, the WSP100 device sends packets via a UDP stream, so the capture
-#  interface should be in the form of host:port where 'host' is the WSP100 and 
-#  'port' is the local UDP port that it will send data to.
-# Capture Name      - The name Kismet uses for this capture source.  This is the 
-#   name used to specify what sources to enable.
-# 
-# To enable multiple sources, specify a source line for each and then use the
-# enablesources line to enable them.  For example:
-# source=prism2,wlan0,prism
-# source=cisco,eth0,cisco
-source=wrt54g,eth1,wireless
-# For v1 hardware uncomment this:
-# source=wrt54g,eth2,wireless
-
-# Comma-separated list of sources to enable.  This is only needed if you wish 
-# to selectively enable multiple sources.
-# enablesources=prism,cisco
-
-# Do we channelhop?
-channelhop=true
-
-# How many channels per second do we hop?  (1-10)
-channelvelocity=5
-
-# By setting the dwell time for channel hopping we override the channelvelocity
-# setting above and dwell on each channel for the given number of seconds.
-#channeldwell=10
-
-# Do we split channels between cards on the same spectrum?  This means if 
-# multiple 802.11b capture sources are defined, they will be offset to cover
-# the most possible spectrum at a given time.  This also controls splitting
-# fine-tuned sourcechannels lines which cover multiple interfaces (see below)
-splitchannels=true
-
-# Basic channel hopping control:
-# These define the channels the cards hop through for various frequency ranges
-# supported by Kismet.   More finegrain control is available via the 
-# "sourcechannels" configuration option.
-# 
-# Don't change the IEEE80211<x> identifiers or channel hopping won't work.
-
-# Users outside the US might want to use this list:
-# defaultchannels=IEEE80211b:1,7,13,2,8,3,14,9,4,10,5,11,6,12
-defaultchannels=IEEE80211b:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11g uses the same channels as 802.11b...
-defaultchannels=IEEE80211g:1,6,11,2,7,3,8,4,9,5,10
-
-# 802.11a channels are non-overlapping so sequential is fine.  You may want to
-# adjust the list depending on the channels your card actually supports.
-# defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,184,188,192,196,200,204,208,212,216 
-defaultchannels=IEEE80211a:36,40,44,48,52,56,60,64
-
-# Combo cards like Atheros use both 'a' and 'b/g' channels.  Of course, you
-# can also explicitly override a given source.  You can use the script 
-# extras/listchan.pl to extract all the channels your card supports.
-defaultchannels=IEEE80211ab:1,6,11,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64
-
-# Fine-tuning channel hopping control:
-# The sourcechannels option can be used to set the channel hopping for 
-# specific interfaces, and to control what interfaces share a list of 
-# channels for split hopping.  This can also be used to easily lock
-# one card on a single channel while hopping with other cards.
-# Any card without a sourcechannel definition will use the standard hopping
-# list.
-# sourcechannels=sourcename[,sourcename]:ch1,ch2,ch3,...chN
-
-# ie, for us channels on the source 'prism2source' (same as normal channel
-# hopping behavior):
-# sourcechannels=prism2source:1,6,11,2,7,3,8,4,9,5,10
-
-# Given two capture sources, "prism2a" and "prism2b", we want prism2a to stay
-# on channel 6 and prism2b to hop normally.  By not setting a sourcechannels 
-# line for prism2b, it will use the standard hopping.
-# sourcechannels=prism2a:6
-
-# To assign the same custom hop channel to multiple sources, or to split the 
-# same custom hop channel over two sources (if splitchannels is true), list
-# them all on the same sourcechannels line:
-# sourcechannels=prism2a,prism2b,prism2c:1,6,11
-

package/kismet/files/kismet_ui.conf

@@ -1,61 +0,0 @@
-# Kismet GUI config file
-
-# Version of Kismet config
-version=2005.04.R1
-
-# Do we show the intro window?
-showintro=false
-
-# Gui type to use
-# Valid types: curses, panel
-gui=panel
-# Server to connect to (host:port)
-host=localhost:2501
-# Network traffic decay (active/recent/inactive) and packet click rate - increase
-# this if you are doing prism2 channel hopping.
-decay=3
-# What columns do we display?  Comma seperated.  Read the documentation for what 
-# columns are valid.
-columns=decay,name,type,wep,channel,packets,flags,ip,size
-# What columns do we display for clients?  Comma seperated.
-clientcolumns=decay,type,mac,manuf,data,crypt,size,ip,signal,quality,noise
-
-# Do we auotmatically make a group for probed networks or do we show them
-# amidst other networks?
-autogroup_probe=true
-# Do we autogroup data-only networks?
-autogroup_data=true
-
-# Display battery status?
-apm=false
-
-# Simple borders (use - and | instead of smooth vertical and horizontal
-# lines.  This is required on Zaurus, and might be needed elsewhere if your
-# terminal doesn't display the border characters correctly.
-simpleborders=false
-
-# Colors (front, back) of text in the panel front.  Valid colors are:
-# black, red, yellow, green, blue, magenta, cyan, white
-# optionally prefixed with "hi-" for bold/bright colors, ie
-# hi-red, hi-yellow, hi-green, etc.
-
-# Enable colors?  
-color=true
-# Background
-backgroundcolor=black
-# Default text
-textcolor=white
-# Window borders
-bordercolor=green
-# Titles
-titlecolor=hi-white
-# GPS and APM info
-monitorcolor=hi-white
-# WEP network color
-wepcolor=hi-green
-# Factory network color
-factorycolor=hi-red
-# Open color
-opencolor=hi-yellow
-# Decloaked network color
-cloakcolor=hi-blue

package/kismet/patches/patch-Makefile_in

@@ -1,12 +1,41 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- kismet-2008-05-R1.orig/Makefile.in	2008-05-29 21:18:26.000000000 +0200
-+++ kismet-2008-05-R1/Makefile.in	2009-05-10 01:19:47.000000000 +0200
-@@ -22,7 +22,7 @@ LDFLAGS	= @LDFLAGS@
- LIBS	= @LIBS@
- CLIBS   = @CLIBS@
- CFLAGS	= @CFLAGS@
--CXXFLAGS = -O2 -Wall -DVERSION_MAJOR=\"$(VERSION_MAJOR)\" -DVERSION_MINOR=\"$(VERSION_MINOR)\" -DVERSION_TINY=\"$(VERSION_TINY)\" -DTIMESTAMP=\"`cat TIMESTAMP`\" @CXXFLAGS@
-+CXXFLAGS = -Wall -DVERSION_MAJOR=\"$(VERSION_MAJOR)\" -DVERSION_MINOR=\"$(VERSION_MINOR)\" -DVERSION_TINY=\"$(VERSION_TINY)\" -DTIMESTAMP=\"`cat TIMESTAMP`\" @CXXFLAGS@
- CPPFLAGS = @CPPFLAGS@
- SUID	= @suid@
+--- kismet-2010-01-R1.orig/Makefile.in	2009-12-14 20:04:11.000000000 +0100
++++ kismet-2010-01-R1/Makefile.in	2010-02-14 20:19:50.000000000 +0100
+@@ -100,25 +100,25 @@ commoninstall:
+ 	mkdir -p $(ETC)
+ 	mkdir -p $(BIN)
  
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC)
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(PS) $(BIN)/$(PS); 
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(DRONE) $(BIN)/$(DRONE);
++	$(INSTALL) -m 755 scripts/kismet $(BIN)/kismet
++	$(INSTALL) -m 755 $(NC) $(BIN)/$(NC)
++	$(INSTALL) -m 755 $(PS) $(BIN)/$(PS); 
++	$(INSTALL) -m 755 $(DRONE) $(BIN)/$(DRONE);
+ 
+ 	mkdir -p $(MAN)/man1
+-	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
+-	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
++	$(INSTALL) -m 644 man/kismet.1 $(MAN)/man1/kismet.1
++	$(INSTALL) -m 644 man/kismet_drone.1 $(MAN)/man1/kismet_drone.1
+ 
+ 	mkdir -p $(MAN)/man5
+-	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
+-	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
++	$(INSTALL) -m 644 man/kismet.conf.5 $(MAN)/man5/kismet.conf.5
++	$(INSTALL) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
+ 
+ 	mkdir -p $(WAV)
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/new.wav $(WAV)/new.wav
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/packet.wav $(WAV)/packet.wav
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/alert.wav $(WAV)/alert.wav
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/gpslost.wav $(WAV)/gpslost.wav
+-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 644 wav/gpslock.wav $(WAV)/gpslock.wav
++	$(INSTALL) -m 644 wav/new.wav $(WAV)/new.wav
++	$(INSTALL) -m 644 wav/packet.wav $(WAV)/packet.wav
++	$(INSTALL) -m 644 wav/alert.wav $(WAV)/alert.wav
++	$(INSTALL) -m 644 wav/gpslost.wav $(WAV)/gpslost.wav
++	$(INSTALL) -m 644 wav/gpslock.wav $(WAV)/gpslock.wav
+ 
+ suidinstall: $(CS)
+ 	-groupadd -f $(SUIDGROUP)

package/kismet/patches/patch-configure

@@ -0,0 +1,95 @@
+--- kismet-2010-01-R1.orig/configure	2010-01-08 00:33:30.000000000 +0100
++++ kismet-2010-01-R1/configure	2010-02-14 20:32:44.000000000 +0100
+@@ -26,7 +26,8 @@ esac
+ 
+ fi
+ 
+-
++oCC="$CC"
++CC="$CXX"
+ 
+ 
+ # PATH needs CR
+@@ -6836,73 +6837,6 @@ else
+ $as_echo "yes" >&6; }
+ fi
+ 
+-# Do we use libstdc++?
+-# We need to swap to the g++ compiler here
+-oCC="$CC"
+-CC="$CXX"
+-{ $as_echo "$as_me:$LINENO: checking for main in -luClibc++" >&5
+-$as_echo_n "checking for main in -luClibc++... " >&6; }
+-if test "${ac_cv_lib_uClibcpp_main+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-luClibc++  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-
+-int
+-main ()
+-{
+-return main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_lib_uClibcpp_main=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_uClibcpp_main=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_uClibcpp_main" >&5
+-$as_echo "$ac_cv_lib_uClibcpp_main" >&6; }
+-if test "x$ac_cv_lib_uClibcpp_main" = x""yes; then
+-  foundcxxl="uclibc" CXXLIBS="$CXXLIBS -luClibc++"
+-fi
+-
+ 
+ # Do we use uclibc++?
+ if test "$foundcxxl"x == "x"; then
+@@ -7017,7 +6951,7 @@ fi
+ 
+ 
+ # Add additional cflags since some distros bury panel.h
+-CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
++#CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+ 
+ termcontrol="none";
+ 

package/kismet/patches/patch-ifcontrol_cc

@@ -0,0 +1,11 @@
+--- kismet-2010-01-R1.orig/ifcontrol.cc	2009-08-31 01:36:19.000000000 +0200
++++ kismet-2010-01-R1/ifcontrol.cc	2010-02-14 19:59:51.000000000 +0100
+@@ -149,7 +149,7 @@ string Linux_GetSysDrv(const char *in_de
+ 	devlinklen = readlink(devlink.c_str(), devlinktarget, 511);
+ 	if (devlinklen > 0) {
+ 		devlinktarget[devlinklen] = '\0';
+-		rind = rindex(devlinktarget, '/');
++		rind = strchr(devlinktarget, '/');
+ 		// If we found it and not at the end of the line
+ 		if (rind != NULL && (rind - devlinktarget) + 1 < devlinklen)
+ 			return string(rind + 1);

package/kismet/patches/patch-iwcontrol_cc

@@ -0,0 +1,36 @@
+--- kismet-2010-01-R1.orig/iwcontrol.cc	2009-08-17 21:51:36.000000000 +0200
++++ kismet-2010-01-R1/iwcontrol.cc	2010-02-14 22:27:00.000000000 +0100
+@@ -32,7 +32,6 @@
+ #include <linux/if.h>
+ #include <linux/wireless.h>
+ 
+-#endif // wireless
+ 
+ #ifndef rintf
+ #define rintf(x) (float) rint((double) (x))
+@@ -697,7 +696,7 @@ int Iwconfig_Get_Chanlist(const char *in
+ 		return -1;
+ 	}
+ 
+-	bzero(buffer, sizeof(buffer));
++	memset(buffer, 0, sizeof(buffer));
+ 
+ 	memset(&wrq, 0, sizeof(struct iwreq));
+ 
+@@ -732,7 +731,7 @@ int Iwconfig_Get_Chanlist(const char *in
+ 		memcpy((char *) &range, buffer, sizeof(iw_range));
+ 	} else {
+ 		/* Zero unknown fields */
+-		bzero((char *) &range, sizeof(struct iw_range));
++		memset((char *) &range, 0, sizeof(struct iw_range));
+ 
+ 		/* Initial part unmoved */
+ 		memcpy((char *) &range, buffer, iwr15_off(num_channels));
+@@ -798,5 +797,7 @@ int Iwconfig_Get_Chanlist(const char *in
+ 	return chan_list->size();
+ }
+ 
++#endif // wireless
++
+ #endif
+ 

package/lvm/patches/patch-libdm_Makefile_in

@@ -1,6 +1,6 @@
 always install static library
---- LVM2.2.02.51.orig/libdm/Makefile.in	2009-04-08 16:04:35.000000000 +0200
-+++ LVM2.2.02.51/libdm/Makefile.in	2009-08-22 15:37:53.000000000 +0200
+--- LVM2.2.02.51.orig/libdm/Makefile.in	Wed Apr  8 16:04:35 2009
++++ LVM2.2.02.51/libdm/Makefile.in	Mon Feb 15 23:25:01 2010
 @@ -34,9 +34,9 @@ SOURCES =\
  
  INCLUDES = -I$(interface) -I.
@@ -35,7 +35,7 @@ always install static library
  		$(includedir)/libdevmapper.h
  
  install_dynamic: install_@interface@
-@@ -83,15 +84,17 @@ install_static: install_@interface@_stat
+@@ -83,15 +84,17 @@ install_static: install_@interface@_static
  	$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
  
  install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)

package/lvm/patches/patch-tools_Makefile_in

@@ -1,6 +1,15 @@
---- LVM2.2.02.51.orig/tools/Makefile.in	2009-05-21 13:11:29.000000000 +0200
-+++ LVM2.2.02.51/tools/Makefile.in	2009-08-22 15:30:31.000000000 +0200
-@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r
+--- LVM2.2.02.51.orig/tools/Makefile.in	Thu May 21 13:11:29 2009
++++ LVM2.2.02.51/tools/Makefile.in	Mon Feb 15 23:30:04 2010
+@@ -137,7 +137,7 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
+ 
+ .commands: commands.h cmdnames.h Makefile
+ 	$(CC) -E -P cmdnames.h 2> /dev/null | \
+-		egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
++		egrep -v '^ *\(|#.*|dumpconfig|formats|help|pvdata|segtypes|version\) *$$' > .commands
+ 
+ .PHONY: install_cmdlib_dynamic install_cmdlib_static \
+ 	install_tools_dynamic install_tools_static
+@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref
  endif
  
  install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)

package/mksh/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mksh
-PKG_VERSION:=		39
+PKG_VERSION:=		39b
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b2eeb4fe4ccac2704e1440e53cd2672c
+PKG_MD5SUM:=		91274beff2be95260a51234d2c7bb4f7
 PKG_DESCR:=		MirBSD Korn Shell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.mirbsd.org

package/mksh/patches/patch-dot_mkshrc

@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mksh.orig/dot.mkshrc	2009-05-30 12:07:24.734860691 +0200
-+++ mksh/dot.mkshrc	2009-05-30 12:07:18.782465058 +0200
-@@ -20,7 +20,7 @@
+--- mksh.orig/dot.mkshrc	2010-02-16 20:13:59.000000000 +0100
++++ mksh/dot.mkshrc	2010-02-16 20:13:50.000000000 +0100
+@@ -21,7 +21,7 @@
  #-
  # ~/.mkshrc: mksh initialisation file for interactive shells
  
@@ -10,12 +9,3 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  [[ $HOSTNAME = @(localhost|*([	 ])) ]] && HOSTNAME=$(ulimit -c 0;hostname 2>&-)
  : ${HOSTNAME:=nil}; if (( USER_ID )); then PS1='$'; else PS1='#'; fi
  function precmd {
-@@ -38,7 +38,7 @@ unalias ls
- alias l='ls -F'
- alias la='l -a'
- alias ll='l -l'
--alias lo='l -alo'
-+alias lo='l -al'
- alias which='whence -p'
- whence -p rot13 >&- || alias rot13='tr \
-     abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \

package/opensips/Makefile

@@ -4,14 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		opensips
-PKG_VERSION:=		1.5.1
+PKG_VERSION:=		1.6.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		87c6fe40c143775d6a1be1beb75c3eb2
+PKG_MD5SUM:=		e7e59910183ca8a213c76a7a80789ea1
 PKG_DESCR:=		a high-performance, configurable, free SIP server
 PKG_SECTION:=		net
-PKG_BUILDDEP+=		openssl
 PKG_MULTI:=		1
 PKG_VARIANT:=		tls
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP+=		openssl
 PKG_URL:=		http://opensips.org
 PKG_SITES:=		http://opensips.org/pub/opensips/$(PKG_VERSION)/src/
 
@@ -52,7 +53,6 @@ $(eval $(call PKG_template,OPENSIPS_MOD_SMS,opensips-mod-sms,$(PKG_VERSION)-${PK
 $(eval $(call PKG_template,OPENSIPS_MOD_UAC,opensips-mod-uac,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENSIPS_MOD_UAC_REDIRECT,opensips-mod-uac-redirect,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENSIPS_MOD_URI,opensips-mod-uri,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSIPS_MOD_URI_DB,opensips-mod-uri-db,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENSIPS_MOD_XLOG,opensips-mod-xlog,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 $(eval $(call PKG_mod_template,OPENSIPS_MOD_ACCOUNTING,acc))
@@ -76,11 +76,10 @@ $(eval $(call PKG_mod_template,OPENSIPS_MOD_SPEEDIAL,speeddial))
 $(eval $(call PKG_mod_template,OPENSIPS_MOD_UAC,uac))
 $(eval $(call PKG_mod_template,OPENSIPS_MOD_UAC_REDIRECT,uac_redirect))
 $(eval $(call PKG_mod_template,OPENSIPS_MOD_URI,uri))
-$(eval $(call PKG_mod_template,OPENSIPS_MOD_URI_DB,uri_db))
 $(eval $(call PKG_mod_template,OPENSIPS_MOD_XLOG,xlog))
 
-# Select here the modules for the ipk package
-OPENSIPS_MODULES:=	sl tm rr maxfwd usrloc registrar db_text textops exec mi_fifo
+# Select here the modules for the main package
+OPENSIPS_MODULES:=	sl tm rr maxfwd usrloc registrar db_text textops exec mi_fifo signaling
 
 OPENSIPS_MODULE_FILES:=	$(foreach module,$(OPENSIPS_MODULES),modules/$(module)/$(module).so)
 OPENSIPS_MODULES:=	$(patsubst %,modules/%,$(OPENSIPS_MODULES))

package/opensips/files/opensips.cfg

@@ -20,7 +20,7 @@ children=4
 port=5060
 
 # uncomment the following lines for TLS support
-#disable_tls = 0
+disable_tls = 1
 #listen = tls:your_IP:5061
 #tls_verify_server = 1
 #tls_verify_client = 1
@@ -38,6 +38,7 @@ mpath="/usr/lib/opensips/modules/"
 # Uncomment this if you want to use SQL database
 #loadmodule "mysql.so"
 
+loadmodule "signaling.so"
 loadmodule "sl.so"
 loadmodule "tm.so"
 loadmodule "rr.so"

package/python2/Makefile

@@ -12,6 +12,8 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://www.python.org
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
 
+PKG_HOST_DEPENDS:=	!netbsd
+
 DISTFILES=		Python-${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/Python-${PKG_VERSION}
 

package/tcsh/patches/patch-sh_h

@@ -0,0 +1,14 @@
+--- tcsh-6.17.00.orig/sh.h	2009-06-25 23:27:37.000000000 +0200
++++ tcsh-6.17.00/sh.h	2010-02-15 18:45:11.000000000 +0100
+@@ -375,9 +375,11 @@ static inline void ignore(intptr_t a)
+ #include <pwd.h>
+ #include <grp.h>
+ #endif /* WINNT_NATIVE */
++#if !defined(BSD)
+ #ifdef HAVE_SHADOW_H
+ # include <shadow.h>
+ #endif /* HAVE_SHADOW_H */
++#endif
+ #ifdef HAVE_AUTH_H
+ # include <auth.h>
+ #endif /* HAVE_AUTH_H */

scripts/cpio

@@ -4,7 +4,7 @@
 
 os=$(uname)
 case $os in
-	NetBSD|MirBSD)
+	NetBSD|MirBSD|OpenBSD)
 		quiet=""
 		;;
 	*)

target/Config.in

@@ -304,6 +304,7 @@ config ADK_LINUX_XSCALE_ZAURUS
 	select ADK_zaurus
 	select ADK_TARGET_NO_FPU
 	select ADK_TARGET_WITH_INPUT
+	depends on ADK_BROKEN
 	help
 	 Support for Sharp Zaurus SL-C3200 (aka Terrier)
 	 Status: development
@@ -378,12 +379,14 @@ config ADK_LINUX_X86_RESCUE
 config ADK_LINUX_MIPSEL_RESCUE
 	bool "mips (little endian)"
 	select ADK_mipsel_rescue
+	depends on ADK_BROKEN
 	help
 	 MIPS LE architecture.
 
 config ADK_LINUX_MIPS_RESCUE
 	bool "mips (big endian)"
 	select ADK_mips_rescue
+	depends on ADK_BROKEN
 	help
 	 MIPS BE architecture.
 
@@ -645,7 +648,7 @@ endchoice
 
 choice
 prompt "Routerboard model"
-default ADK_LINUX_MIPS_RB433
+default ADK_LINUX_MIPS_RB532
 depends on ADK_LINUX_MIKROTIK
 
 config ADK_LINUX_MIPS_RB411
@@ -656,6 +659,7 @@ config ADK_LINUX_MIPS_RB411
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_TARGET_WITH_MINIPCI
+	depends on ADK_BROKEN
 	help
 	 Support for Mikrotik RB411.
 	 Status: development
@@ -668,6 +672,7 @@ config ADK_LINUX_MIPS_RB433
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_TARGET_WITH_MINIPCI
+	depends on ADK_BROKEN
 	help
 	 Support for Mikrotik RB433.
 	 Status: development
@@ -718,7 +723,7 @@ depends on ! ADK_NATIVE
 config ADK_TARGET_LIB_UCLIBC
 	bool "uClibc embedded C library"
 	# broken, because of 16kB pagesize
-	#depends on !ADK_LINUX_MIPS64_LEMOTE
+	depends on !ADK_LINUX_MIPS64_LEMOTE
 	select ADK_uclibc
 	help
  	 http://uclibc.org

target/linux/patches/2.6.32/scsi-header.patch

@@ -1,41 +0,0 @@
-diff -Nur linux-2.6.32.orig/include/scsi/Kbuild linux-2.6.32/include/scsi/Kbuild
---- linux-2.6.32.orig/include/scsi/Kbuild	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/include/scsi/Kbuild	2009-12-03 19:46:03.000000000 +0100
-@@ -1,3 +1,5 @@
-+header-y += sg.h
-+header-y += scsi_ioctl.h
- header-y += scsi.h
- header-y += scsi_netlink.h
- header-y += scsi_netlink_fc.h
-diff -Nur linux-2.6.32.orig/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h
---- linux-2.6.32.orig/include/scsi/scsi.h	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/include/scsi/scsi.h	2009-12-03 19:47:49.000000000 +0100
-@@ -143,6 +143,8 @@
- 
- #define SCSI_MAX_VARLEN_CDB_SIZE 260
- 
-+#ifdef __KERNEL__
-+
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
- 	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-@@ -169,6 +171,8 @@
- 		scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
- }
- 
-+#endif
-+
- /*
-  *  SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
-  *  T10/1561-D Revision 4 Draft dated 7th November 2002.
-@@ -284,8 +288,10 @@
- 	SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
- };
- 
-+#ifdef __KERNEL__
- /* Returns a human-readable name for the device */
- extern const char * scsi_device_type(unsigned type);
-+#endif
- 
- /*
-  * standard mode-select header prepended to all mode-select commands

target/rescue-x86/Makefile

@@ -11,9 +11,27 @@ kernel-install:
 	@cp $(LINUX_DIR)/arch/x86/boot/bzImage \
 		$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
 
+createinit:
+	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio.*
+	$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' \
+		$(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
+	echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+		CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) 
+	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+		CC="$(TARGET_CC)" $(MAKE_TRACE)
+	@cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+
 ifeq ($(FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
+
+ifeq ($(FS),initramfs-piggyback)
+imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
+	@echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo 'Login as user root with password linux123 via ssh or console'
+endif

toolchain/kernel-headers/patches/linux-gcc-check.patch

@@ -0,0 +1,18 @@
+diff -Nur linux-2.6.32.orig/arch/mips/include/asm/sgidefs.h linux-2.6.32/arch/mips/include/asm/sgidefs.h
+--- linux-2.6.32.orig/arch/mips/include/asm/sgidefs.h	2009-12-03 04:51:21.000000000 +0100
++++ linux-2.6.32/arch/mips/include/asm/sgidefs.h	2010-02-14 11:49:21.000000000 +0100
+@@ -11,14 +11,6 @@
+ #define __ASM_SGIDEFS_H
+
+ /*
+- * Using a Linux compiler for building Linux seems logic but not to
+- * everybody.
+- */
+-#ifndef __linux__
+-#error Use a Linux compiler or give up.
+-#endif
+-
+-/*
+  * Definitions for the ISA levels
+  *
+  * With the introduction of MIPS32 / MIPS64 instruction sets definitions