mxml: moved to github
mxml: moved to github

https://github.com/openwrt/packages/commit/c606a0a040dc02af29e3a14dc4daa359a76c5835

Signed-off-by: Nicolas Thill <nico@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@44195 3c298f89-4303-0410-b956-a3cf2f4a3e73

file:a/admin/sudo/Makefile (deleted)
#  
# Copyright (C) 2006-2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=sudo  
PKG_VERSION:=1.7.10p8  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.sudo.ws/sudo/dist  
PKG_MD5SUM:=4620e31c28b387dd9582dfd42e930cfb  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/sudo  
SECTION:=admin  
CATEGORY:=Administration  
TITLE:=Delegate authority to run commands  
URL:=http://www.sudo.ws/  
endef  
 
define Package/sudo/description  
Sudo (su "do") allows a system administrator to delegate authority to  
give certain users (or groups of users) the ability to run some (or  
all) commands as root or another user while providing an audit trail of  
the commands and their arguments.  
endef  
 
define Package/sudo/conffiles  
/etc/sudoers  
endef  
 
CONFIGURE_ARGS+= \  
--without-pam \  
--disable-pam-session \  
--with-editor=/bin/vi \  
--without-lecture \  
--disable-zlib  
 
CONFIGURE_VARS+= \  
sudo_cv_uid_t_len=10 \  
sudo_cv_func_unsetenv_void=no  
 
define Package/sudo/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/sudo $(1)/usr/bin/  
chmod 4755 $(1)/usr/bin/sudo  
$(INSTALL_DIR) $(1)/usr/sbin  
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/visudo $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/etc  
$(CP) $(PKG_INSTALL_DIR)/etc/sudoers $(1)/etc/  
chmod 0440 $(1)/etc/sudoers  
$(INSTALL_DIR) $(1)/etc/sudoers.d  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/sudo_noexec.so $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/sudo.init $(1)/etc/init.d/sudo  
endef  
 
define Package/sudo/postinst  
#!/bin/sh  
 
[ -n "$$IPKG_INSTROOT" ] || {  
/etc/init.d/sudo enable  
/etc/init.d/sudo start  
}  
endef  
 
$(eval $(call BuildPackage,sudo))  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2011 OpenWrt.org  
 
START=99  
 
start() {  
[ -d /var/lib/sudo ] || {  
mkdir -m 0755 -p /var/lib/sudo  
chmod 0700 /var/lib/sudo  
}  
}  
 
file:a/devel/perf/Makefile (deleted)
#  
# Copyright (C) 2011-2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
include $(INCLUDE_DIR)/kernel.mk  
 
PKG_NAME:=perf  
PKG_VERSION:=$(LINUX_VERSION)  
PKG_RELEASE:=2  
 
PKG_USE_MIPS16:=0  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/perf  
SECTION:=devel  
CATEGORY:=Development  
DEPENDS:= +libelf1 +libdw +libpthread +librt +binutils  
TITLE:=Linux performance monitoring tool  
VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)  
URL:=http://www.kernel.org  
endef  
 
define Package/perf/description  
perf is the Linux performance monitoring tool  
endef  
 
# Perf's makefile and headers are not relocatable and must be built from the  
# Linux sources directory  
define Build/Prepare  
$(RM) -r $(PKG_BUILD_DIR)  
ln -s $(LINUX_DIR)/tools/perf $(PKG_BUILD_DIR)  
endef  
 
# MAKE_FLAGS should be passed again upon cleaning because Perf's makefile  
# always performs checks before processing any rule  
define Build/Clean  
-$(MAKE) -C $(PKG_BUILD_DIR) \  
NO_DWARF=1 \  
$(MAKE_FLAGS) \  
clean  
endef  
 
MAKE_FLAGS = \  
ARCH="$(LINUX_KARCH)" \  
NO_LIBPERL=1 \  
NO_LIBPYTHON=1 \  
NO_NEWT=1 \  
CROSS_COMPILE="$(TARGET_CROSS)" \  
CC="$(TARGET_CC)" \  
LD="$(TARGET_CROSS)ld" \  
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \  
LDFLAGS="$(TARGET_LDFLAGS)" \  
V=1 \  
prefix=/usr  
 
define Package/perf/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(LINUX_DIR)/tools/perf/perf $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,perf))  
 
file:a/lang/jamvm/Makefile (deleted)
#  
# Copyright (C) 2006-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=jamvm  
PKG_VERSION:=1.6.0-git  
PKG_RELEASE:=2  
 
PKG_SOURCE_PROTO:=git  
PKG_SOURCE_URL:=git://git.berlios.de/jamvm  
PKG_SOURCE_VERSION:=4617da717ecb05654ea5bb9572338061106a414d  
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)  
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz  
PKG_MIRROR_MD5SUM:=66a728a3cb8dad0e3773035c4049eb5f  
 
PKG_USE_MIPS16:=0  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/jamvm  
SUBMENU:=Java  
SECTION:=lang  
CATEGORY:=Languages  
TITLE:=A compact Java Virtual Machine  
URL:=http://sourceforge.net/projects/jamvm  
DEPENDS:=+zlib +libpthread +librt +classpath @!avr32  
endef  
 
define Package/jamvm/description  
JamVM is a new Java Virtual Machine which conforms to the JVM  
specification version (blue book). In comparison to most other VM's (free  
and commercial) it is extremely small.However, unlike other small VMs  
(e.g. KVM) it is designed to support the full specification, and includes  
support for object finalisation, Soft/Weak/Phantom References, the Java  
Native Interface (JNI) and the Reflection API.  
endef  
 
CONFIGURE_ARGS += \  
--with-java-runtime-library=gnuclasspath \  
--with-classpath-install-dir=/usr \  
--disable-int-inlining \  
--disable-shared \  
--without-pic  
 
MAKE_FLAGS += \  
GLIBJ_ZIP=$(STAGING_DIR)/usr/share/classpath/glibj.zip  
 
define Package/jamvm/install  
$(INSTALL_DIR) $(1)/usr  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/bin \  
$(PKG_INSTALL_DIR)/usr/share \  
$(1)/usr/  
endef  
 
define Build/InstallDev  
$(CP) $(PKG_INSTALL_DIR)/* $(1)/  
endef  
 
$(eval $(call BuildPackage,jamvm))  
 
#  
# Copyright (C) 2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=python-imaging-library  
PKG_VERSION:=1.1.7  
PKG_RELEASE:=2  
 
PKG_SOURCE:=Imaging-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://effbot.org/downloads  
PKG_MD5SUM:=fc14a54e1ce02a0225be8854bfba478e  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/Imaging-$(PKG_VERSION)  
PKG_BUILD_DEPENDS:=python  
 
include $(INCLUDE_DIR)/package.mk  
$(call include_mk, python-package.mk)  
 
define Package/python-imaging-library  
SECTION:=language-python  
CATEGORY:=Languages  
SUBMENU:=Python  
TITLE:=Python Imaging Library (PIL)  
URL:=http://www.pythonware.com/products/pil/  
DEPENDS:=+python +libfreetype +libjpeg +zlib  
endef  
 
define Package/python-imaging-library/description  
The Python Imaging Library adds image processing capabilities to your  
Python interpreter.  
.  
This library provides extensive file format support, an efficient  
internal representation, and fairly powerful image processing  
capabilities.  
.  
The core image library is designed for fast access to data stored in a  
few basic pixel formats. It should provide a solid foundation for a  
general image processing tool.  
endef  
 
define Build/Compile  
$(call Build/Compile/PyMod,., \  
install --prefix="/usr" --root="$(PKG_INSTALL_DIR)", \  
)  
endef  
 
define Package/python-imaging-library/install  
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)  
$(CP) \  
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \  
$(1)$(PYTHON_PKG_DIR)/  
endef  
 
$(eval $(call BuildPackage,python-imaging-library))  
 
--- a/setup.py 2011-11-15 01:06:00.000000000 +0100  
+++ b/setup.py 2011-11-15 01:07:32.000000000 +0100  
@@ -147,7 +147,6 @@  
add_directory(library_dirs, "/opt/local/lib")  
add_directory(include_dirs, "/opt/local/include")  
 
- add_directory(library_dirs, "/usr/local/lib")  
# FIXME: check /opt/stuff directories here?  
 
prefix = sysconfig.get_config_var("prefix")  
@@ -199,22 +198,6 @@  
add_directory(include_dirs, include_root)  
 
#  
- # add standard directories  
-  
- # look for tcl specific subdirectory (e.g debian)  
- if _tkinter:  
- tcl_dir = "/usr/include/tcl" + TCL_VERSION  
- if os.path.isfile(os.path.join(tcl_dir, "tk.h")):  
- add_directory(include_dirs, tcl_dir)  
-  
- # standard locations  
- add_directory(library_dirs, "/usr/local/lib")  
- add_directory(include_dirs, "/usr/local/include")  
-  
- add_directory(library_dirs, "/usr/lib")  
- add_directory(include_dirs, "/usr/include")  
-  
- #  
# insert new dirs *before* default libs, to avoid conflicts  
# between Python PYD stub libs and real libraries  
 
 
#  
# Copyright (C) 2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=simplejson  
PKG_VERSION:=2.2.1  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://pypi.python.org/packages/source/s/simplejson/  
PKG_MD5SUM:=070c6467462bd63306f1756b01df6d70  
PKG_BUILD_DEPENDS:=python  
 
include $(INCLUDE_DIR)/package.mk  
$(call include_mk, python-package.mk)  
 
define Package/simplejson  
SUBMENU:=Python  
SECTION:=lang  
CATEGORY:=Languages  
TITLE:=Simple, fast, extensible JSON encoder/decoder for Python  
URL:=http://simplejson.readthedocs.org/  
DEPENDS:=+python +distribute  
endef  
 
define Package/simplejson/description  
Simple, fast, extensible JSON encoder/decoder for Python  
endef  
 
define Build/Compile  
$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))  
endef  
 
define Package/simplejson/install  
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)  
$(CP) \  
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \  
$(1)$(PYTHON_PKG_DIR)  
endef  
 
$(eval $(call BuildPackage,simplejson))  
 
file:a/lang/vala/Makefile (deleted)
#  
# Copyright (C) 2006-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=vala  
PKG_VERSION:=0.16.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz  
PKG_SOURCE_URL:=@GNOME/vala/0.16/  
PKG_MD5SUM:=84b742e9cca4c90fde3026c3793c03c1  
 
PKG_BUILD_DEPENDS:=glib2/host vala/host  
HOST_BUILD_DEPENDS:=glib2/host  
 
include $(INCLUDE_DIR)/host-build.mk  
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
 
TARGET_LDFLAGS+=\  
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib  
 
define Package/vala  
SECTION:=lang  
CATEGORY:=Languages  
TITLE:=C-sharp like language for the GObject system  
URL:=http://live.gnome.org/Vala  
endef  
 
define Package/vala/description  
Vala is a C-sharp like language for the GObject system. This package contains  
the Vala-to-C compiler.  
endef  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
DESTDIR="$(PKG_INSTALL_DIR)" \  
all install  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) \  
$(1)/usr/share/vala-0.16/vapi \  
$(1)/usr/lib \  
$(1)/usr/share/pkgconfig \  
$(1)/usr/bin  
 
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/share/vala-0.16/vapi/* \  
$(1)/usr/share/vala-0.16/vapi  
 
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/lib/libvala-0.16.{so*,la} \  
$(1)/usr/lib  
 
$(INSTALL_BIN) \  
$(PKG_INSTALL_DIR)/usr/bin/{vala,vala-0.16,valac,valac-0.16,vapicheck,vapicheck-0.16,vapigen,vapigen-0.16,vala-gen-introspect,vala-gen-introspect-0.16} \  
$(1)/usr/bin  
 
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/share/pkgconfig/*.pc \  
$(1)/usr/share/pkgconfig  
endef  
 
$(eval $(call HostBuild))  
$(eval $(call BuildPackage,vala))  
 
#  
# Copyright (C) 2006-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=bluez-libs  
PKG_VERSION:=3.36  
PKG_RELEASE:=3  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://bluez.sourceforge.net/download  
PKG_MD5SUM:=8c2ca546c0e7bb73dbd0e906fce7f6b1  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/bluez-libs  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Bluetooth library  
URL:=http://www.bluez.org/  
endef  
 
CONFIGURE_ARGS += \  
--enable-shared \  
--enable-static \  
 
TARGET_CFLAGS += $(FPIC)  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include/bluetooth  
$(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(1)/usr/include/bluetooth  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.{a,so*} $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/bluez.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/bluez-libs/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,bluez-libs))  
 
diff --git a/configure b/configure  
index 6a387c6..5ffc003 100755  
--- a/configure  
+++ b/configure  
@@ -2430,10 +2430,6 @@ fi  
prefix="${ac_default_prefix}"  
fi  
 
- if (test "${libdir}" = '${exec_prefix}/lib'); then  
- libdir="${prefix}/lib"  
- fi  
-  
if (test "$sysconfdir" = '${prefix}/etc'); then  
configdir="${prefix}/etc/bluetooth"  
else  
 
file:a/libs/classpath/Makefile (deleted)
#  
# Copyright (C) 2006-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=classpath  
PKG_VERSION:=0.98  
PKG_RELEASE:=4  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@GNU/classpath  
PKG_MD5SUM:=90c6571b8b0309e372faa0f9f6255ea9  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/classpath  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=GNU Classpath  
URL:=http://www.gnu.org/software/classpath/  
MAINTAINER:=Roberto Riggio <roberto.riggio@create-net.org>  
DEPENDS:=+alsa-lib +libgmp +libmagic  
endef  
 
define Package/classpath/Description  
GNU Classpath, Essential Libraries for Java, is a GNU project  
to create free core class libraries for use with virtual  
machines and compilers for the java programming language.  
endef  
 
define Package/classpath-tools  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=GNU Classpath tools  
URL:=http://www.gnu.org/software/classpath/  
MAINTAINER:=Roberto Riggio <roberto.riggio@create-net.org>  
endef  
 
define Download/antlr  
URL:=http://www.antlr.org/download  
FILE:=antlr-3.4-complete.jar  
MD5SUM:=1b91dea1c7d480b3223f7c8a9aa0e172  
endef  
$(eval $(call Download,antlr))  
 
CONFIGURE_ARGS += \  
--without-x \  
--disable-gtk-peer \  
--disable-qt-peer \  
--disable-dssi \  
--disable-plugin \  
--disable-gconf-peer \  
--disable-gjdoc \  
--with-antlr-jar=$(DL_DIR)/antlr-3.4-complete.jar  
 
define Package/classpath/install  
$(INSTALL_DIR) \  
$(1)/usr/lib/classpath \  
$(1)/usr/share/classpath  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/security \  
$(PKG_INSTALL_DIR)/usr/lib/logging.properties \  
$(1)/usr/lib/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/classpath/*.so* $(1)/usr/lib/classpath/  
$(CP) $(PKG_INSTALL_DIR)/usr/share/classpath/glibj.zip $(1)/usr/share/classpath/  
endef  
 
define Package/classpath-tools/install  
$(INSTALL_DIR) \  
$(1)/usr/bin \  
$(1)/usr/share/classpath  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/share/classpath/tools.zip $(1)/usr/share/classpath/  
endef  
 
define Build/InstallDev  
$(CP) $(PKG_INSTALL_DIR)/* $(1)/  
endef  
 
$(eval $(call BuildPackage,classpath))  
$(eval $(call BuildPackage,classpath-tools))  
 
Index: classpath-0.98/configure.ac  
===================================================================  
--- classpath-0.98.orig/configure.ac 2009-02-06 00:26:08.000000000 +0100  
+++ classpath-0.98/configure.ac 2012-08-22 10:18:53.325876508 +0200  
@@ -762,8 +762,7 @@  
dnl change the name of the corresponding ac_ variable on lines 860...  
if test "x${COMPILE_GMP}" = xyes; then  
AC_CHECK_LIB(gmp, __gmpz_mul_si,  
- [GMP_CFLAGS=-I/usr/include  
- GMP_LIBS=-lgmp ],  
+ [GMP_LIBS=-lgmp ],  
[GMP_CFLAGS=  
GMP_LIBS= ])  
AC_SUBST(GMP_CFLAGS)  
 
file:a/libs/elfutils/Makefile (deleted)
#  
# Copyright (C) 2010-2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=elfutils  
PKG_VERSION:=0.155  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=http://fedorahosted.org/releases/e/l/$(PKG_NAME)/$(PKG_VERSION)  
PKG_MD5SUM:=163a5712b86f6bdfebdf233cc6e2192d  
 
PKG_INSTALL:=1  
PKG_USE_MIPS16:=0  
 
PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
 
define Package/elfutils/Default  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=$(INTL_DEPENDS)  
TITLE:=ELF manipulation libraries  
URL:=https://fedorahosted.org/elfutils/  
endef  
 
define Package/libdw  
$(call Package/elfutils/Default)  
DEPENDS:=libelf1 +zlib +libbz2  
TITLE+= (libdw)  
endef  
 
define Package/libelf1  
$(call Package/elfutils/Default)  
TITLE+= (libelf)  
endef  
 
ifeq ($(CONFIG_BUILD_NLS),y)  
TARGET_LDFLAGS += "-lintl"  
endif  
 
ifdef CONFIG_USE_UCLIBC  
CONFIGURE_VARS += \  
LIBS="-largp"  
endif  
 
CONFIGURE_ARGS += \  
--disable-werror \  
--without-lzma  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libdw/libdw.{a,so*} $(1)/usr/lib/  
$(CP) $(PKG_BUILD_DIR)/libelf/libelf.{a,so*} $(1)/usr/lib/  
endef  
 
define Package/libdw/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libdw/libdw.so* $(1)/usr/lib/  
endef  
 
define Package/libelf1/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libelf/libelf.so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libdw))  
$(eval $(call BuildPackage,libelf1))  
 
--- elfutils/backends/ChangeLog  
+++ elfutils/backends/ChangeLog  
@@ -135,6 +135,10 @@  
* ppc_attrs.c (ppc_check_object_attribute): Handle tag  
GNU_Power_ABI_Struct_Return.  
 
+2009-01-23 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).  
+  
2008-10-04 Ulrich Drepper <drepper@redhat.com>  
 
* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and  
@@ -462,6 +466,11 @@  
* sparc_init.c: Likewise.  
* x86_64_init.c: Likewise.  
 
+2005-11-22 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.  
+ (libebl_%.so rule): Use it in place of -Wl,--as-needed.  
+  
2005-11-19 Roland McGrath <roland@redhat.com>  
 
* ppc64_reloc.def: REL30 -> ADDR30.  
@@ -484,6 +493,9 @@  
* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).  
(CLEANFILES): Add libebl_$(m).so.  
 
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
* ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.  
* ppc64_reloc.def: Likewise.  
 
--- elfutils/backends/Makefile.am  
+++ elfutils/backends/Makefile.am  
@@ -111,7 +111,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a  
$(LINK) -shared -o $(@:.map=.so) \  
-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \  
-Wl,--version-script,$(@:.so=.map) \  
- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)  
+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)  
$(textrel_check)  
 
libebl_i386.so: $(cpu_i386)  
--- elfutils/backends/Makefile.in  
+++ elfutils/backends/Makefile.in  
@@ -38,7 +38,8 @@ build_triplet = @build@  
host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
subdir = backends  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -172,6 +173,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -201,6 +203,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -263,10 +266,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \  
-I$(top_srcdir)/libelf -I$(top_srcdir)/libdw  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1)  
+ $(am__append_1) $(am__append_2)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -725,7 +727,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a  
$(LINK) -shared -o $(@:.map=.so) \  
-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \  
-Wl,--version-script,$(@:.so=.map) \  
- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)  
+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)  
$(textrel_check)  
 
libebl_i386.so: $(cpu_i386)  
--- elfutils/ChangeLog  
+++ elfutils/ChangeLog  
@@ -16,6 +16,8 @@  
 
2012-01-24 Mark Wielaard <mjw@redhat.com>  
 
+ * configure.ac: Wrap AC_COMPILE_IFELSE sources in AC_LANG_SOURCE.  
+  
* COPYING: Fix address. Updated version from gnulib.  
 
2012-01-23 Mark Wielaard <mjw@redhat.com>  
@@ -34,6 +36,9 @@  
 
2011-10-08 Mike Frysinger <vapier@gentoo.org>  
 
+ * configure.ac (--disable-werror): Handle it, controlling BUILD_WERROR  
+ automake option.  
+  
* configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.  
 
2011-10-02 Ulrich Drepper <drepper@gmail.com>  
@@ -55,6 +60,10 @@  
 
* configure.ac (LOCALEDIR, DATADIRNAME): Removed.  
 
+2009-11-22 Roland McGrath <roland@redhat.com>  
+  
+ * configure.ac: Use sed and expr instead of modern bash extensions.  
+  
2009-09-21 Ulrich Drepper <drepper@redhat.com>  
 
* configure.ac: Update for more modern autoconf.  
@@ -63,6 +72,10 @@  
 
* configure.ac (zip_LIBS): Check for liblzma too.  
 
+2009-08-17 Roland McGrath <roland@redhat.com>  
+  
+ * configure.ac: Check for -fgnu89-inline; add it to WEXTRA if it works.  
+  
2009-04-19 Roland McGrath <roland@redhat.com>  
 
* configure.ac (eu_version): Round down here, not in version.h macros.  
@@ -74,6 +87,8 @@  
 
2009-01-23 Roland McGrath <roland@redhat.com>  
 
+ * configure.ac: Check for __builtin_popcount.  
+  
* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.  
 
* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of  
@@ -154,6 +169,10 @@  
* configure.ac: Add dummy automake conditional to get dependencies  
for non-generic linker right. See src/Makefile.am.  
 
+2005-11-22 Roland McGrath <roland@redhat.com>  
+  
+ * configure.ac: Check for --as-needed linker option.  
+  
2005-11-18 Roland McGrath <roland@redhat.com>  
 
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.  
@@ -201,6 +220,17 @@  
* Makefile.am (all_SUBDIRS): Add libdwfl.  
* configure.ac: Write libdwfl/Makefile.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * configure.ac (WEXTRA): Check for -Wextra and set this substitution.  
+  
+ * configure.ac: Check for struct stat st_?tim members.  
+ * src/strip.c (process_file): Use st_?time if st_?tim are not there.  
+  
+ * configure.ac: Check for futimes function.  
+ * src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead.  
+ (handle_ar) [! HAVE_FUTIMES]: Likewise.  
+  
2005-05-19 Roland McGrath <roland@redhat.com>  
 
* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.  
--- elfutils/config/ChangeLog  
+++ elfutils/config/ChangeLog  
@@ -19,6 +19,10 @@  
 
* known-dwarf.awk: Use gawk.  
 
+2011-10-08 Mike Frysinger <vapier@gentoo.org>  
+  
+ * eu.am [BUILD_WERROR]: Conditionalize -Werror use on this.  
+  
2010-07-02 Ulrich Drepper <drepper@redhat.com>  
 
* elfutils.spec.in: Add more BuildRequires.  
--- elfutils/config/eu.am  
+++ elfutils/config/eu.am  
@@ -1,6 +1,6 @@  
## Common automake fragments for elfutils subdirectory makefiles.  
##  
-## Copyright (C) 2010 Red Hat, Inc.  
+## Copyright (C) 2010-2011 Red Hat, Inc.  
##  
## This file is part of elfutils.  
##  
@@ -29,14 +29,20 @@  
## not, see <http://www.gnu.org/licenses/>.  
##  
 
+WEXTRA = @WEXTRA@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
+  
DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'  
INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow \  
- $(if $($(*F)_no_Werror),,-Werror) \  
- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \  
+ $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \  
$(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \  
$($(*F)_CFLAGS)  
 
+if BUILD_WERROR  
+AM_CFLAGS += $(if $($(*F)_no_Werror),,-Werror)  
+endif  
+  
if MUDFLAP  
AM_CFLAGS += -fmudflap  
libmudflap = -lmudflap  
--- elfutils/config/Makefile.in  
+++ elfutils/config/Makefile.in  
@@ -76,6 +76,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -105,6 +106,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
--- elfutils/config.h.in  
+++ elfutils/config.h.in  
@@ -6,6 +6,9 @@  
/* Defined if libdw should support GNU ref_alt FORM, dwz multi files. */  
#undef ENABLE_DWZ  
 
+/* Have __builtin_popcount. */  
+#undef HAVE_BUILTIN_POPCOUNT  
+  
/* $libdir subdirectory containing libebl modules. */  
#undef LIBEBL_SUBDIR  
 
@@ -64,4 +67,7 @@  
/* Define for large files, on AIX-style hosts. */  
#undef _LARGE_FILES  
 
+/* Stubbed out if missing compiler support. */  
+#undef __thread  
+  
#include <eu-config.h>  
--- elfutils/configure  
+++ elfutils/configure  
@@ -598,6 +598,8 @@ ZLIB_TRUE  
LIBEBL_SUBDIR  
TESTS_RPATH_FALSE  
TESTS_RPATH_TRUE  
+BUILD_WERROR_FALSE  
+BUILD_WERROR_TRUE  
BUILD_STATIC_FALSE  
BUILD_STATIC_TRUE  
GCOV_FALSE  
@@ -612,6 +614,8 @@ NEVER_TRUE  
base_cpu  
NATIVE_LD_FALSE  
NATIVE_LD_TRUE  
+LD_AS_NEEDED  
+WEXTRA  
LEXLIB  
LEX_OUTPUT_ROOT  
LEX  
@@ -726,6 +730,7 @@ enable_mudflap  
enable_debugpred  
enable_gprof  
enable_gcov  
+enable_werror  
enable_tests_rpath  
enable_libebl_subdir  
with_zlib  
@@ -1379,6 +1384,7 @@ Optional Features:  
prediction  
--enable-gprof build binaries with gprof support  
--enable-gcov build binaries with gcov support  
+ --disable-werror do not build with -Werror  
--enable-tests-rpath build $ORIGIN-using rpath into tests  
--enable-libebl-subdir=DIR  
install libebl_CPU modules in $(libdir)/DIR  
@@ -3920,6 +3926,130 @@ if test "x$ac_cv_c99" != xyes; then :  
as_fn_error $? "gcc with C99 support required" "$LINENO" 5  
fi  
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5  
+$as_echo_n "checking for -Wextra option to $CC... " >&6; }  
+if ${ac_cv_cc_wextra+:} false; then :  
+ $as_echo_n "(cached) " >&6  
+else  
+ old_CFLAGS="$CFLAGS"  
+CFLAGS="$CFLAGS -Wextra"  
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext  
+/* end confdefs.h. */  
+void foo (void) { }  
+_ACEOF  
+if ac_fn_c_try_compile "$LINENO"; then :  
+ ac_cv_cc_wextra=yes  
+else  
+ ac_cv_cc_wextra=no  
+fi  
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext  
+CFLAGS="$old_CFLAGS"  
+fi  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5  
+$as_echo "$ac_cv_cc_wextra" >&6; }  
+  
+if test "x$ac_cv_cc_wextra" = xyes; then :  
+ WEXTRA=-Wextra  
+else  
+ WEXTRA=-W  
+fi  
+  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline option to $CC" >&5  
+$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }  
+if ${ac_cv_cc_gnu89_inline+:} false; then :  
+ $as_echo_n "(cached) " >&6  
+else  
+ old_CFLAGS="$CFLAGS"  
+CFLAGS="$CFLAGS -fgnu89-inline -Werror"  
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext  
+/* end confdefs.h. */  
+  
+void foo (void)  
+{  
+ inline void bar (void) {}  
+ bar ();  
+}  
+extern inline void baz (void) {}  
+  
+_ACEOF  
+if ac_fn_c_try_compile "$LINENO"; then :  
+ ac_cv_cc_gnu89_inline=yes  
+else  
+ ac_cv_cc_gnu89_inline=no  
+fi  
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext  
+CFLAGS="$old_CFLAGS"  
+fi  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_gnu89_inline" >&5  
+$as_echo "$ac_cv_cc_gnu89_inline" >&6; }  
+if test "x$ac_cv_cc_gnu89_inline" = xyes; then :  
+ WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"  
+fi  
+  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker option" >&5  
+$as_echo_n "checking for --as-needed linker option... " >&6; }  
+if ${ac_cv_as_needed+:} false; then :  
+ $as_echo_n "(cached) " >&6  
+else  
+ cat > conftest.c <<EOF  
+int main (void) { return 0; }  
+EOF  
+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS  
+ -fPIC -shared -o conftest.so conftest.c  
+ -Wl,--as-needed 1>&5'  
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5  
+ (eval $ac_try) 2>&5  
+ ac_status=$?  
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5  
+ test $ac_status = 0; }; }  
+then  
+ ac_cv_as_needed=yes  
+else  
+ ac_cv_as_needed=no  
+fi  
+rm -f conftest*  
+fi  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5  
+$as_echo "$ac_cv_as_needed" >&6; }  
+if test "x$ac_cv_as_needed" = xyes; then :  
+ LD_AS_NEEDED=-Wl,--as-needed  
+else  
+ LD_AS_NEEDED=  
+fi  
+  
+  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5  
+$as_echo_n "checking for __builtin_popcount... " >&6; }  
+if ${ac_cv_popcount+:} false; then :  
+ $as_echo_n "(cached) " >&6  
+else  
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext  
+/* end confdefs.h. */  
+  
+int  
+main ()  
+{  
+exit (__builtin_popcount (127));  
+ ;  
+ return 0;  
+}  
+_ACEOF  
+if ac_fn_c_try_link "$LINENO"; then :  
+ ac_cv_popcount=yes  
+else  
+ ac_cv_popcount=no  
+fi  
+rm -f core conftest.err conftest.$ac_objext \  
+ conftest$ac_exeext conftest.$ac_ext  
+fi  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5  
+$as_echo "$ac_cv_popcount" >&6; }  
+if test "x$ac_cv_popcount" = xyes; then :  
+  
+$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h  
+  
+fi  
+  
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5  
$as_echo_n "checking for __thread support... " >&6; }  
if ${ac_cv_tls+:} false; then :  
@@ -3956,7 +4086,13 @@ fi  
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5  
$as_echo "$ac_cv_tls" >&6; }  
if test "x$ac_cv_tls" != xyes; then :  
- as_fn_error $? "__thread support required" "$LINENO" 5  
+ if test "$use_locks" = yes; then :  
+ as_fn_error $? "--enable-thread-safety requires __thread support" "$LINENO" 5  
+else  
+  
+$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h  
+  
+fi  
fi  
 
# Check whether --enable-largefile was given.  
@@ -4305,6 +4441,22 @@ else  
fi  
 
 
+# Check whether --enable-werror was given.  
+if test "${enable_werror+set}" = set; then :  
+ enableval=$enable_werror; enable_werror=$enableval  
+else  
+ enable_werror=yes  
+fi  
+  
+ if test "$enable_werror" = yes; then  
+ BUILD_WERROR_TRUE=  
+ BUILD_WERROR_FALSE='#'  
+else  
+ BUILD_WERROR_TRUE='#'  
+ BUILD_WERROR_FALSE=  
+fi  
+  
+  
# Check whether --enable-tests-rpath was given.  
if test "${enable_tests_rpath+set}" = set; then :  
enableval=$enable_tests_rpath; tests_use_rpath=$enableval  
@@ -5025,7 +5177,7 @@ case "$eu_version" in  
esac  
 
# Round up to the next release API (x.y) version.  
-eu_version=$(( (eu_version + 999) / 1000 ))  
+eu_version=`expr \( $eu_version + 999 \) / 1000`  
 
cat >confcache <<\_ACEOF  
# This file is a shell script that caches the results of configure  
@@ -5188,6 +5340,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes  
as_fn_error $? "conditional \"BUILD_STATIC\" was never defined.  
Usually this means the macro was only invoked conditionally." "$LINENO" 5  
fi  
+if test -z "${BUILD_WERROR_TRUE}" && test -z "${BUILD_WERROR_FALSE}"; then  
+ as_fn_error $? "conditional \"BUILD_WERROR\" was never defined.  
+Usually this means the macro was only invoked conditionally." "$LINENO" 5  
+fi  
if test -z "${TESTS_RPATH_TRUE}" && test -z "${TESTS_RPATH_FALSE}"; then  
as_fn_error $? "conditional \"TESTS_RPATH\" was never defined.  
Usually this means the macro was only invoked conditionally." "$LINENO" 5  
--- elfutils/configure.ac  
+++ elfutils/configure.ac  
@@ -90,6 +90,54 @@ CFLAGS="$old_CFLAGS"])  
AS_IF([test "x$ac_cv_c99" != xyes],  
AC_MSG_ERROR([gcc with C99 support required]))  
 
+AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl  
+old_CFLAGS="$CFLAGS"  
+CFLAGS="$CFLAGS -Wextra"  
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([void foo (void) { }])],  
+ ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)  
+CFLAGS="$old_CFLAGS"])  
+AC_SUBST(WEXTRA)  
+AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])  
+  
+AC_CACHE_CHECK([for -fgnu89-inline option to $CC], ac_cv_cc_gnu89_inline, [dnl  
+old_CFLAGS="$CFLAGS"  
+CFLAGS="$CFLAGS -fgnu89-inline -Werror"  
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([  
+void foo (void)  
+{  
+ inline void bar (void) {}  
+ bar ();  
+}  
+extern inline void baz (void) {}  
+])], ac_cv_cc_gnu89_inline=yes, ac_cv_cc_gnu89_inline=no)  
+CFLAGS="$old_CFLAGS"])  
+AS_IF([test "x$ac_cv_cc_gnu89_inline" = xyes],  
+ [WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"])  
+  
+AC_CACHE_CHECK([for --as-needed linker option],  
+ ac_cv_as_needed, [dnl  
+cat > conftest.c <<EOF  
+int main (void) { return 0; }  
+EOF  
+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS  
+ -fPIC -shared -o conftest.so conftest.c  
+ -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])  
+then  
+ ac_cv_as_needed=yes  
+else  
+ ac_cv_as_needed=no  
+fi  
+rm -f conftest*])  
+AS_IF([test "x$ac_cv_as_needed" = xyes],  
+ [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])  
+AC_SUBST(LD_AS_NEEDED)  
+  
+AC_CACHE_CHECK([for __builtin_popcount], ac_cv_popcount, [dnl  
+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[exit (__builtin_popcount (127));]])],  
+ ac_cv_popcount=yes, ac_cv_popcount=no)])  
+AS_IF([test "x$ac_cv_popcount" = xyes],  
+ [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])])  
+  
AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl  
# Use the same flags that we use for our DSOs, so the test is representative.  
# Some old compiler/linker/libc combinations fail some ways and not others.  
@@ -105,7 +153,10 @@ static __thread int a; int foo (int b) {  
CFLAGS="$save_CFLAGS"  
LDFLAGS="$save_LDFLAGS"])  
AS_IF([test "x$ac_cv_tls" != xyes],  
- AC_MSG_ERROR([__thread support required]))  
+ [AS_IF([test "$use_locks" = yes],  
+ [AC_MSG_ERROR([--enable-thread-safety requires __thread support])],  
+ [AC_DEFINE([__thread], [/* empty: no multi-thread support */],  
+ [Stubbed out if missing compiler support.])])])  
 
dnl This test must come as early as possible after the compiler configuration  
dnl tests, because the choice of the file model can (in principle) affect  
@@ -193,6 +244,11 @@ AM_CONDITIONAL(GCOV, test "$use_gcov" =  
AM_CONDITIONAL(BUILD_STATIC, [dnl  
test "$use_mudflap" = yes -o "$use_gprof" = yes -o "$use_gcov" = yes])  
 
+AC_ARG_ENABLE([werror],  
+AS_HELP_STRING([--disable-werror],[do not build with -Werror]),  
+ [enable_werror=$enableval], [enable_werror=yes])  
+AM_CONDITIONAL(BUILD_WERROR, test "$enable_werror" = yes)  
+  
AC_ARG_ENABLE([tests-rpath],  
AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]),  
[tests_use_rpath=$enableval], [tests_use_rpath=no])  
@@ -304,6 +360,6 @@ case "$eu_version" in  
esac  
 
# Round up to the next release API (x.y) version.  
-eu_version=$(( (eu_version + 999) / 1000 ))  
+eu_version=`expr \( $eu_version + 999 \) / 1000`  
 
AC_OUTPUT  
--- elfutils/lib/ChangeLog  
+++ elfutils/lib/ChangeLog  
@@ -35,6 +35,9 @@  
 
2009-01-23 Roland McGrath <roland@redhat.com>  
 
+ * eu-config.h [! HAVE_BUILTIN_POPCOUNT]  
+ (__builtin_popcount): New inline function.  
+  
* eu-config.h: Add multiple inclusion protection.  
 
2009-01-17 Ulrich Drepper <drepper@redhat.com>  
@@ -91,6 +94,11 @@  
* Makefile.am (libeu_a_SOURCES): Add it.  
* system.h: Declare crc32_file.  
 
+2005-02-07 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-04-30 Ulrich Drepper <drepper@redhat.com>  
 
* Makefile.am: Use -ffunction-sections for xmalloc.c.  
--- elfutils/lib/eu-config.h  
+++ elfutils/lib/eu-config.h  
@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .pr  
/* This macro is used by the tests conditionalize for standalone building. */  
#define ELFUTILS_HEADER(name) <lib##name.h>  
 
+#ifndef HAVE_BUILTIN_POPCOUNT  
+# define __builtin_popcount hakmem_popcount  
+static inline unsigned int __attribute__ ((unused))  
+hakmem_popcount (unsigned int x)  
+{  
+ /* HAKMEM 169 */  
+ unsigned int n = x - ((x >> 1) & 033333333333) - ((x >> 2) & 011111111111);  
+ return ((n + (n >> 3)) & 030707070707) % 63;  
+}  
+#endif /* HAVE_BUILTIN_POPCOUNT */  
+  
 
#ifdef SHARED  
# define OLD_VERSION(name, version) \  
--- elfutils/lib/Makefile.in  
+++ elfutils/lib/Makefile.in  
@@ -37,7 +37,8 @@ build_triplet = @build@  
host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
subdir = lib  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -100,6 +101,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -129,6 +131,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -190,10 +193,9 @@ zip_LIBS = @zip_LIBS@  
INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \  
-I$(srcdir)/../libelf  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1) -fpic  
+ $(am__append_1) $(am__append_2) -fpic  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
--- elfutils/libasm/ChangeLog  
+++ elfutils/libasm/ChangeLog  
@@ -71,6 +71,11 @@  
* asm_error.c: Add new error ASM_E_IOERROR.  
* libasmP.h: Add ASM_E_IOERROR definition.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-02-15 Ulrich Drepper <drepper@redhat.com>  
 
* Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.  
--- elfutils/libasm/Makefile.in  
+++ elfutils/libasm/Makefile.in  
@@ -39,10 +39,11 @@ host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \  
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \  
$(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
@MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)  
@MUDFLAP_TRUE@am_libasm_pic_a_OBJECTS =  
-@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_2 = -lpthread  
+@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread  
subdir = libasm  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -153,6 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -182,6 +184,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = 1  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -244,10 +247,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \  
-I$(top_srcdir)/libdw  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1)  
+ $(am__append_1) $(am__append_2)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -276,7 +278,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort  
 
@MUDFLAP_FALSE@libasm_pic_a_SOURCES =  
@MUDFLAP_FALSE@am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)  
-@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_2)  
+@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_3)  
@MUDFLAP_FALSE@libasm_so_SOURCES =  
noinst_HEADERS = libasmP.h symbolhash.h  
EXTRA_DIST = libasm.map  
--- elfutils/libcpu/ChangeLog  
+++ elfutils/libcpu/ChangeLog  
@@ -38,6 +38,9 @@  
 
2009-01-23 Roland McGrath <roland@redhat.com>  
 
+ * i386_disasm.c (i386_disasm): Add abort after assert-constant for old  
+ compilers that don't realize it's noreturn.  
+  
* Makefile.am (i386_parse_CFLAGS): Use quotes around command  
substitution that can produce leading whitespace.  
 
@@ -367,6 +370,11 @@  
* defs/i386.doc: New file.  
* defs/x86_64: New file.  
 
+2005-04-04 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it instead of -Wextra.  
+  
2005-02-15 Ulrich Drepper <drepper@redhat.com>  
 
* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.  
--- elfutils/libcpu/i386_disasm.c  
+++ elfutils/libcpu/i386_disasm.c  
@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, con  
 
default:  
assert (! "INVALID not handled");  
+ abort ();  
}  
}  
else  
--- elfutils/libcpu/Makefile.in  
+++ elfutils/libcpu/Makefile.in  
@@ -39,7 +39,8 @@ host_triplet = @host@  
DIST_COMMON = $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \  
i386_lex.c i386_parse.c  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT)  
subdir = libcpu  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
@@ -117,6 +118,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)  
@@ -146,6 +148,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -208,10 +211,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(srcdir)/../libelf -I$(srcdir)/../libebl \  
-I$(srcdir)/../libdw -I$(srcdir)/../libasm  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1) -fpic -fdollars-in-identifiers  
+ $(am__append_1) $(am__append_2) -fpic -fdollars-in-identifiers  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
--- elfutils/libdw/ChangeLog  
+++ elfutils/libdw/ChangeLog  
@@ -82,6 +82,10 @@  
 
* Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.  
 
+2011-07-20 Mark Wielaard <mjw@redhat.com>  
+  
+ * dwarf_begin_elf.c: Add fallback for be64toh if not defined.  
+  
2011-07-14 Mark Wielaard <mjw@redhat.com>  
 
* libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.  
@@ -441,6 +445,10 @@  
 
* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.  
 
+2009-08-17 Roland McGrath <roland@redhat.com>  
+  
+ * libdw.h: Disable extern inlines for GCC 4.2.  
+  
2009-08-10 Roland McGrath <roland@redhat.com>  
 
* dwarf_getscopevar.c: Use dwarf_diename.  
@@ -1209,6 +1217,11 @@  
 
2005-05-31 Roland McGrath <roland@redhat.com>  
 
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
* dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to  
formref offset.  
 
--- elfutils/libdw/dwarf_begin_elf.c  
+++ elfutils/libdw/dwarf_begin_elf.c  
@@ -48,6 +48,14 @@  
#if USE_ZLIB  
# include <endian.h>  
# define crc32 loser_crc32  
+# ifndef be64toh  
+# include <byteswap.h>  
+# if __BYTE_ORDER == __LITTLE_ENDIAN  
+# define be64toh(x) bswap_64 (x)  
+# else  
+# define be64toh(x) (x)  
+# endif  
+# endif  
# include <zlib.h>  
# undef crc32  
#endif  
--- elfutils/libdw/libdw.h  
+++ elfutils/libdw/libdw.h  
@@ -831,7 +831,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (  
 
 
/* Inline optimizations. */  
-#ifdef __OPTIMIZE__  
+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)  
/* Return attribute code of given attribute. */  
__libdw_extern_inline unsigned int  
dwarf_whatattr (Dwarf_Attribute *attr)  
--- elfutils/libdw/Makefile.in  
+++ elfutils/libdw/Makefile.in  
@@ -39,8 +39,9 @@ host_triplet = @host@  
DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \  
$(pkginclude_HEADERS) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
-@BUILD_STATIC_TRUE@am__append_2 = -fpic  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
+@BUILD_STATIC_TRUE@am__append_3 = -fpic  
@MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)  
@MUDFLAP_TRUE@am_libdw_pic_a_OBJECTS =  
subdir = libdw  
@@ -198,6 +199,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -227,6 +229,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = 1  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -288,10 +291,9 @@ zip_LIBS = @zip_LIBS@  
INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \  
-I$(srcdir)/../libelf  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1) $(am__append_2)  
+ $(am__append_1) $(am__append_2) $(am__append_3)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
--- elfutils/libdwfl/ChangeLog  
+++ elfutils/libdwfl/ChangeLog  
@@ -1420,6 +1420,11 @@  
 
2005-07-21 Roland McGrath <roland@redhat.com>  
 
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
+2005-07-21 Roland McGrath <roland@redhat.com>  
+  
* Makefile.am (noinst_HEADERS): Add loc2c.c.  
 
* test2.c (main): Check sscanf result to quiet warning.  
--- elfutils/libdwfl/Makefile.in  
+++ elfutils/libdwfl/Makefile.in  
@@ -38,11 +38,12 @@ host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \  
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \  
$(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
-@MUDFLAP_FALSE@am__append_2 = libdwfl_pic.a  
-@ZLIB_TRUE@am__append_3 = gzip.c  
-@BZLIB_TRUE@am__append_4 = bzip2.c  
-@LZMA_TRUE@am__append_5 = lzma.c  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
+@MUDFLAP_FALSE@am__append_3 = libdwfl_pic.a  
+@ZLIB_TRUE@am__append_4 = gzip.c  
+@BZLIB_TRUE@am__append_5 = bzip2.c  
+@LZMA_TRUE@am__append_6 = lzma.c  
@MUDFLAP_TRUE@am_libdwfl_pic_a_OBJECTS =  
subdir = libdwfl  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
@@ -188,6 +189,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -217,6 +219,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = 1  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -279,10 +282,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(srcdir)/../libelf -I$(srcdir)/../libebl \  
-I$(srcdir)/../libdw  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1)  
+ $(am__append_1) $(am__append_2)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -290,7 +292,7 @@ COMPILE.os = $(filter-out -fprofile-arcs  
 
CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS)  
textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
-noinst_LIBRARIES = libdwfl.a $(am__append_2)  
+noinst_LIBRARIES = libdwfl.a $(am__append_3)  
pkginclude_HEADERS = libdwfl.h  
libdwfl_a_SOURCES = dwfl_begin.c dwfl_end.c dwfl_error.c \  
dwfl_version.c dwfl_module.c dwfl_report_elf.c relocate.c \  
@@ -311,8 +313,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en  
dwfl_module_getsym.c dwfl_module_addrname.c \  
dwfl_module_addrsym.c dwfl_module_return_value_location.c \  
dwfl_module_register_names.c dwfl_segment_report_module.c \  
- link_map.c core-file.c open.c image-header.c $(am__append_3) \  
- $(am__append_4) $(am__append_5)  
+ link_map.c core-file.c open.c image-header.c $(am__append_4) \  
+ $(am__append_5) $(am__append_6)  
@MUDFLAP_FALSE@libdwfl = $(libdw)  
@MUDFLAP_TRUE@libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu)  
@MUDFLAP_FALSE@libdw = ../libdw/libdw.so  
--- elfutils/libebl/ChangeLog  
+++ elfutils/libebl/ChangeLog  
@@ -658,6 +658,11 @@  
* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency  
tracking works right.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-05-21 Ulrich Drepper <drepper@redhat.com>  
 
* libebl_x86_64.map: Add x86_64_core_note.  
--- elfutils/libebl/Makefile.in  
+++ elfutils/libebl/Makefile.in  
@@ -38,7 +38,8 @@ host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \  
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \  
$(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
subdir = libebl  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -150,6 +151,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -179,6 +181,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = 1  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -241,10 +244,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(srcdir)/../libelf -I$(srcdir)/../libdw \  
-I$(srcdir)/../libasm  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1) -fpic  
+ $(am__append_1) $(am__append_2) -fpic  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
--- elfutils/libelf/ChangeLog  
+++ elfutils/libelf/ChangeLog  
@@ -34,6 +34,11 @@  
 
* elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.  
 
+2011-03-10 Roland McGrath <roland@redhat.com>  
+  
+ * gnuhash_xlate.h (elf_cvt_gnuhash): Avoid post-increment in bswap_32  
+ argument, since some implementations are buggy macros.  
+  
2011-02-26 Mark Wielaard <mjw@redhat.com>  
 
* elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.  
@@ -711,6 +716,11 @@  
 
* elf.h: Update from glibc.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-05-08 Roland McGrath <roland@redhat.com>  
 
* elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.  
--- elfutils/libelf/common.h  
+++ elfutils/libelf/common.h  
@@ -139,7 +139,7 @@ libelf_release_all (Elf *elf)  
(Var) = (sizeof (Var) == 1 \  
? (unsigned char) (Var) \  
: (sizeof (Var) == 2 \  
- ? bswap_16 (Var) \  
+ ? (unsigned short int) bswap_16 (Var) \  
: (sizeof (Var) == 4 \  
? bswap_32 (Var) \  
: bswap_64 (Var))))  
@@ -148,7 +148,7 @@ libelf_release_all (Elf *elf)  
(Dst) = (sizeof (Var) == 1 \  
? (unsigned char) (Var) \  
: (sizeof (Var) == 2 \  
- ? bswap_16 (Var) \  
+ ? (unsigned short int) bswap_16 (Var) \  
: (sizeof (Var) == 4 \  
? bswap_32 (Var) \  
: bswap_64 (Var))))  
--- elfutils/libelf/gnuhash_xlate.h  
+++ elfutils/libelf/gnuhash_xlate.h  
@@ -1,5 +1,5 @@  
/* Conversion functions for versioning information.  
- Copyright (C) 2006, 2007 Red Hat, Inc.  
+ Copyright (C) 2006-2011 Red Hat, Inc.  
This file is part of elfutils.  
Written by Ulrich Drepper <drepper@redhat.com>, 2006.  
 
@@ -68,7 +68,9 @@ elf_cvt_gnuhash (void *dest, const void  
dest32 = (Elf32_Word *) &dest64[bitmask_words];  
while (len >= 4)  
{  
- *dest32++ = bswap_32 (*src32++);  
+ *dest32 = bswap_32 (*src32);  
+ ++dest32;  
+ ++src32;  
len -= 4;  
}  
}  
--- elfutils/libelf/Makefile.in  
+++ elfutils/libelf/Makefile.in  
@@ -39,11 +39,12 @@ host_triplet = @host@  
DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \  
$(pkginclude_HEADERS) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
-@BUILD_STATIC_TRUE@am__append_2 = -fpic  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
+@BUILD_STATIC_TRUE@am__append_3 = -fpic  
@MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)  
@MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS =  
-@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread  
+@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_4 = -lpthread  
subdir = libelf  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -195,6 +196,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -224,6 +226,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = 1  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -284,10 +287,9 @@ top_srcdir = @top_srcdir@  
zip_LIBS = @zip_LIBS@  
INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1) $(am__append_2)  
+ $(am__append_1) $(am__append_2) $(am__append_3)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -352,7 +354,7 @@ libelf_a_SOURCES = elf_version.c elf_has  
 
@MUDFLAP_FALSE@libelf_pic_a_SOURCES =  
@MUDFLAP_FALSE@am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)  
-@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_3)  
+@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_4)  
@MUDFLAP_FALSE@libelf_so_SOURCES =  
noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \  
version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h  
--- elfutils/m4/Makefile.in  
+++ elfutils/m4/Makefile.in  
@@ -75,6 +75,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -104,6 +105,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
--- elfutils/Makefile.in  
+++ elfutils/Makefile.in  
@@ -165,6 +165,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -194,6 +195,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
--- elfutils/src/addr2line.c  
+++ elfutils/src/addr2line.c  
@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl  
bool parsed = false;  
int i, j;  
char *name = NULL;  
- if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2  
+ if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2  
&& string[i] == '\0')  
parsed = adjust_to_section (name, &addr, dwfl);  
- switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))  
+ switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))  
{  
default:  
break;  
--- elfutils/src/ChangeLog  
+++ elfutils/src/ChangeLog  
@@ -606,8 +606,16 @@  
* readelf.c (attr_callback): Use print_block only when we don't use  
print_ops.  
 
+2009-08-17 Roland McGrath <roland@redhat.com>  
+  
+ * ld.h: Disable extern inlines for GCC 4.2.  
+  
2009-08-14 Roland McGrath <roland@redhat.com>  
 
+ * strings.c (read_block): Conditionalize posix_fadvise use  
+ on [POSIX_FADV_SEQUENTIAL].  
+ From Petr Salinger <Petr.Salinger@seznam.cz>.  
+  
* ar.c (do_oper_extract): Use pathconf instead of statfs.  
 
2009-08-01 Ulrich Drepper <drepper@redhat.com>  
@@ -771,6 +779,8 @@  
* readelf.c (print_debug_frame_section): Use t instead of j formats  
for ptrdiff_t OFFSET.  
 
+ * addr2line.c (handle_address): Use %a instead of %m for compatibility.  
+  
2009-01-21 Ulrich Drepper <drepper@redhat.com>  
 
* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section  
@@ -954,6 +964,11 @@  
that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really  
is valid in RELRO.  
 
+2008-03-01 Roland McGrath <roland@redhat.com>  
+  
+ * readelf.c (dump_archive_index): Tweak portability hack  
+ to match [__GNUC__ < 4] too.  
+  
2008-02-29 Roland McGrath <roland@redhat.com>  
 
* readelf.c (print_attributes): Add a cast.  
@@ -1205,6 +1220,8 @@  
 
* readelf.c (hex_dump): Fix rounding error in whitespace calculation.  
 
+ * Makefile.am (readelf_no_Werror): New variable.  
+  
2007-10-15 Roland McGrath <roland@redhat.com>  
 
* make-debug-archive.in: New file.  
@@ -1644,6 +1661,10 @@  
* elflint.c (valid_e_machine): Add EM_ALPHA.  
Reported by Christian Aichinger <Greek0@gmx.net>.  
 
+ * strings.c (map_file): Define POSIX_MADV_SEQUENTIAL to  
+ MADV_SEQUENTIAL if undefined. Don't call posix_madvise  
+ if neither is defined.  
+  
2006-08-08 Ulrich Drepper <drepper@redhat.com>  
 
* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.  
@@ -1720,6 +1741,10 @@  
* Makefile.am: Add hacks to create dependency files for non-generic  
linker.  
 
+2006-04-05 Roland McGrath <roland@redhat.com>  
+  
+ * strings.c (MAP_POPULATE): Define to 0 if undefined.  
+  
2006-06-12 Ulrich Drepper <drepper@redhat.com>  
 
* ldgeneric.c (ld_generic_generate_sections): Don't create .interp  
@@ -2068,6 +2093,11 @@  
* readelf.c (print_debug_loc_section): Fix indentation for larger  
address size.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-05-30 Roland McGrath <roland@redhat.com>  
 
* readelf.c (print_debug_line_section): Print section offset of each  
--- elfutils/src/findtextrel.c  
+++ elfutils/src/findtextrel.c  
@@ -496,7 +496,11 @@ ptrcompare (const void *p1, const void *  
 
 
static void  
-check_rel (size_t nsegments, struct segments segments[nsegments],  
+check_rel (size_t nsegments, struct segments segments[  
+#if __GNUC__ >= 4  
+ nsegments  
+#endif  
+ ],  
GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,  
const char *fname, bool more_than_one, void **knownsrcs)  
{  
--- elfutils/src/ld.h  
+++ elfutils/src/ld.h  
@@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void);  
 
/* Checked whether the symbol is undefined and referenced from a DSO. */  
extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);  
+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)  
#ifdef __GNUC_STDC_INLINE__  
__attribute__ ((__gnu_inline__))  
#endif  
@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scnin  
 
return sym->defined && sym->in_dso;  
}  
+#endif /* Optimizing and not GCC 4.2. */  
 
#endif /* ld.h */  
--- elfutils/src/Makefile.am  
+++ elfutils/src/Makefile.am  
@@ -95,6 +95,9 @@ addr2line_no_Wformat = yes  
# XXX While the file is not finished, don't warn about this  
ldgeneric_no_Wunused = yes  
 
+# Buggy old compilers.  
+readelf_no_Werror = yes  
+  
readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl  
nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \  
$(demanglelib)  
--- elfutils/src/Makefile.in  
+++ elfutils/src/Makefile.in  
@@ -40,7 +40,8 @@ host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \  
ldlex.c ldscript.c  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \  
strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \  
findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \  
@@ -49,9 +50,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE  
@NATIVE_LD_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)  
# We never build this library but we need to get the dependency files  
# of all the linker backends that might be used in a non-generic linker.  
-@NEVER_TRUE@am__append_2 = libdummy.a  
+@NEVER_TRUE@am__append_3 = libdummy.a  
# -ldl is always needed for libebl.  
-@NATIVE_LD_TRUE@am__append_3 = libld_elf.a  
+@NATIVE_LD_TRUE@am__append_4 = libld_elf.a  
@NATIVE_LD_TRUE@am_libld_elf_i386_pic_a_OBJECTS =  
subdir = src  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
@@ -115,7 +116,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$  
versionhash.$(OBJEXT)  
ld_OBJECTS = $(am_ld_OBJECTS)  
ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__DEPENDENCIES_1) \  
- $(am__append_3)  
+ $(am__append_4)  
ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \  
$@  
am_libld_elf_i386_so_OBJECTS =  
@@ -235,6 +236,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -264,6 +266,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -327,10 +330,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \  
-I$(srcdir)/../libasm  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1)  
+ $(am__append_1) $(am__append_2)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -346,8 +348,8 @@ AM_LFLAGS = -Pld -olex.yy.c  
native_ld = @native_ld@  
ld_dsos = libld_elf_i386_pic.a  
@NATIVE_LD_FALSE@noinst_LIBRARIES = libld_elf.a libar.a $(ld_dsos) \  
-@NATIVE_LD_FALSE@ $(am__append_2)  
-@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_2)  
+@NATIVE_LD_FALSE@ $(am__append_3)  
+@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_3)  
@NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu)  
@NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c  
ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \  
@@ -376,6 +378,9 @@ strings_no_Wformat = yes  
addr2line_no_Wformat = yes  
# XXX While the file is not finished, don't warn about this  
ldgeneric_no_Wunused = yes  
+  
+# Buggy old compilers.  
+readelf_no_Werror = yes  
readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl  
nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \  
$(demanglelib)  
@@ -383,7 +388,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf)  
size_LDADD = $(libelf) $(libeu) $(libmudflap)  
strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl  
ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \  
- $(am__append_3)  
+ $(am__append_4)  
ld_LDFLAGS = -rdynamic  
elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl  
findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)  
--- elfutils/src/readelf.c  
+++ elfutils/src/readelf.c  
@@ -3949,10 +3949,11 @@ struct listptr  
#define listptr_offset_size(p) ((p)->dwarf64 ? 8 : 4)  
#define listptr_address_size(p) ((p)->addr64 ? 8 : 4)  
 
+static const char *listptr_name;  
static int  
-compare_listptr (const void *a, const void *b, void *arg)  
+compare_listptr (const void *a, const void *b)  
{  
- const char *name = arg;  
+ const char *const name = listptr_name;  
struct listptr *p1 = (void *) a;  
struct listptr *p2 = (void *) b;  
 
@@ -4033,8 +4034,11 @@ static void  
sort_listptr (struct listptr_table *table, const char *name)  
{  
if (table->n > 0)  
- qsort_r (table->table, table->n, sizeof table->table[0],  
- &compare_listptr, (void *) name);  
+ {  
+ listptr_name = name;  
+ qsort (table->table, table->n, sizeof table->table[0],  
+ &compare_listptr);  
+ }  
}  
 
static bool  
@@ -8442,7 +8446,7 @@ dump_archive_index (Elf *elf, const char  
if (unlikely (elf_rand (elf, as_off) == 0)  
|| unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))  
== NULL))  
-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7)  
+#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) || __GNUC__ < 4  
while (1)  
#endif  
error (EXIT_FAILURE, 0,  
--- elfutils/src/strings.c  
+++ elfutils/src/strings.c  
@@ -43,6 +43,10 @@  
 
#include <system.h>  
 
+#ifndef MAP_POPULATE  
+# define MAP_POPULATE 0  
+#endif  
+  
 
/* Prototypes of local functions. */  
static int read_fd (int fd, const char *fname, off64_t fdlen);  
@@ -483,8 +487,13 @@ map_file (int fd, off64_t start_off, off  
fd, start_off);  
if (mem != MAP_FAILED)  
{  
+#if !defined POSIX_MADV_SEQUENTIAL && defined MADV_SEQUENTIAL  
+# define POSIX_MADV_SEQUENTIAL MADV_SEQUENTIAL  
+#endif  
+#ifdef POSIX_MADV_SEQUENTIAL  
/* We will go through the mapping sequentially. */  
(void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL);  
+#endif  
break;  
}  
if (errno != EINVAL && errno != ENOMEM)  
@@ -576,9 +585,11 @@ read_block (int fd, const char *fname, o  
elfmap_off = from & ~(ps - 1);  
elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);  
 
+#ifdef POSIX_FADV_SEQUENTIAL  
if (unlikely (elfmap == MAP_FAILED))  
/* Let the kernel know we are going to read everything in sequence. */  
(void) posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);  
+#endif  
}  
 
if (unlikely (elfmap == MAP_FAILED))  
--- elfutils/src/strip.c  
+++ elfutils/src/strip.c  
@@ -45,6 +45,12 @@  
#include <libebl.h>  
#include <system.h>  
 
+#ifdef HAVE_FUTIMES  
+# define FUTIMES(fd, fname, tvp) futimes (fd, tvp)  
+#else  
+# define FUTIMES(fd, fname, tvp) utimes (fname, tvp)  
+#endif  
+  
typedef uint8_t GElf_Byte;  
 
/* Name and version of program. */  
@@ -318,8 +324,18 @@ process_file (const char *fname)  
 
/* If we have to preserve the timestamp, we need it in the  
format utimes() understands. */  
+#ifdef HAVE_STRUCT_STAT_ST_ATIM  
TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);  
+#else  
+ tv[0].tv_sec = pre_st.st_atime;  
+ tv[0].tv_usec = 0;  
+#endif  
+#ifdef HAVE_STRUCT_STAT_ST_MTIM  
TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);  
+#else  
+ tv[1].tv_sec = pre_st.st_atime;  
+ tv[1].tv_usec = 0;  
+#endif  
}  
 
/* Open the file. */  
@@ -2055,7 +2071,7 @@ while computing checksum for debug infor  
/* If requested, preserve the timestamp. */  
if (tvp != NULL)  
{  
- if (futimes (fd, tvp) != 0)  
+ if (FUTIMES (fd, output_fname, tvp) != 0)  
{  
error (0, errno, gettext ("\  
cannot set access and modification date of '%s'"),  
@@ -2112,7 +2128,7 @@ handle_ar (int fd, Elf *elf, const char  
 
if (tvp != NULL)  
{  
- if (unlikely (futimes (fd, tvp) != 0))  
+ if (unlikely (FUTIMES (fd, fname, tvp) != 0))  
{  
error (0, errno, gettext ("\  
cannot set access and modification date of '%s'"), fname);  
--- elfutils/tests/ChangeLog  
+++ elfutils/tests/ChangeLog  
@@ -439,6 +439,8 @@  
 
2008-01-21 Roland McGrath <roland@redhat.com>  
 
+ * line2addr.c (main): Revert last change.  
+  
* testfile45.S.bz2: Add tests for cltq, cqto.  
* testfile45.expect.bz2: Adjust.  
 
@@ -1147,6 +1149,11 @@  
* Makefile.am (TESTS): Add run-elflint-test.sh.  
(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-05-24 Ulrich Drepper <drepper@redhat.com>  
 
* get-files.c (main): Use correct format specifier.  
--- elfutils/tests/line2addr.c  
+++ elfutils/tests/line2addr.c  
@@ -124,7 +124,7 @@ main (int argc, char *argv[])  
{  
struct args a = { .arg = argv[cnt] };  
 
- switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line))  
+ switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))  
{  
default:  
case 0:  
--- elfutils/tests/Makefile.in  
+++ elfutils/tests/Makefile.in  
@@ -35,14 +35,15 @@ build_triplet = @build@  
host_triplet = @host@  
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \  
$(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
-@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
+@STANDALONE_FALSE@am__append_3 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \  
@STANDALONE_FALSE@ -I$(top_srcdir)/libdwfl \  
@STANDALONE_FALSE@ -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \  
@STANDALONE_FALSE@ -I$(top_srcdir)/lib -I..  
 
-@STANDALONE_FALSE@am__append_3 = -Wl,-rpath-link,../libasm:../libdw:../libelf  
-@TESTS_RPATH_TRUE@am__append_4 = -Wl,-rpath,$(BUILD_RPATH)  
+@STANDALONE_FALSE@am__append_4 = -Wl,-rpath-link,../libasm:../libdw:../libelf  
+@TESTS_RPATH_TRUE@am__append_5 = -Wl,-rpath,$(BUILD_RPATH)  
check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \  
newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \  
sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \  
@@ -92,12 +93,12 @@ TESTS = run-arextract.sh run-arsymtest.s  
run-readelf-gdb_index.sh run-unstrip-n.sh run-low_high_pc.sh \  
run-macro-test.sh run-elf_cntl_gelf_getshdr.sh \  
run-test-archive64.sh $(am__EXEEXT_1) $(am__EXEEXT_3) \  
- $(am__append_9)  
-@STANDALONE_FALSE@am__append_5 = msg_tst md5-sha1-test  
+ $(am__append_10)  
@STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test  
-@HAVE_LIBASM_TRUE@am__append_7 = $(asm_TESTS)  
+@STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test  
@HAVE_LIBASM_TRUE@am__append_8 = $(asm_TESTS)  
-@ENABLE_DWZ_TRUE@am__append_9 = run-readelf-dwz-multi.sh  
+@HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS)  
+@ENABLE_DWZ_TRUE@am__append_10 = run-readelf-dwz-multi.sh  
subdir = tests  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -412,6 +413,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -441,6 +443,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -499,12 +502,11 @@ top_build_prefix = @top_build_prefix@  
top_builddir = @top_builddir@  
top_srcdir = @top_srcdir@  
zip_LIBS = @zip_LIBS@  
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2)  
+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_3)  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1)  
+ $(am__append_1) $(am__append_2)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -514,7 +516,7 @@ CLEANFILES = *.gcno *.gcda  
textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
@MUDFLAP_FALSE@BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf  
@MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends  
-AM_LDFLAGS = $(am__append_3) $(am__append_4)  
+AM_LDFLAGS = $(am__append_4) $(am__append_5)  
@TESTS_RPATH_FALSE@tests_rpath = no  
@TESTS_RPATH_TRUE@tests_rpath = yes  
asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \  
 
--- a/Makefile.am  
+++ b/Makefile.am  
@@ -31,7 +31,7 @@ pkginclude_HEADERS = version.h  
 
# Add doc back when we have some real content.  
SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \  
- src po tests  
+ src po  
 
EXTRA_DIST = elfutils.spec GPG-KEY NOTES EXCEPTION  
 
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -249,7 +249,7 @@ pkginclude_HEADERS = version.h  
 
# Add doc back when we have some real content.  
SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \  
- src po tests  
+ src po  
 
EXTRA_DIST = elfutils.spec GPG-KEY NOTES EXCEPTION  
 
 
--- a/libelf/libelf.h  
+++ b/libelf/libelf.h  
@@ -34,6 +34,11 @@  
/* Get the ELF types. */  
#include <elf.h>  
 
+#ifndef _LIBC  
+#ifndef __mempcpy  
+#define __mempcpy mempcpy  
+#endif  
+#endif  
 
/* Known translation types. */  
typedef enum  
 
--- a/Makefile.am  
+++ b/Makefile.am  
@@ -23,8 +23,7 @@ ACLOCAL_AMFLAGS = -I m4  
pkginclude_HEADERS = version.h  
 
# Add doc back when we have some real content.  
-SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \  
- src po  
+SUBDIRS = config m4 lib libelf libebl libdwfl libdw  
 
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \  
COPYING COPYING-GPLV2 COPYING-LGPLV3  
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -258,8 +258,7 @@ ACLOCAL_AMFLAGS = -I m4  
pkginclude_HEADERS = version.h  
 
# Add doc back when we have some real content.  
-SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \  
- src po  
+SUBDIRS = config m4 lib libelf libebl libdwfl libdw  
 
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \  
COPYING COPYING-GPLV2 COPYING-LGPLV3  
 
--- a/libdw/Makefile.am  
+++ b/libdw/Makefile.am  
@@ -111,7 +111,7 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.  
-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \  
-Wl,--version-script,$<,--no-undefined \  
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\  
- -ldl $(zip_LIBS)  
+ -ldl $(zip_LIBS) $(LIBS)  
if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
ln -fs $@ $@.$(VERSION)  
 
--- a/libdw/Makefile.in  
+++ b/libdw/Makefile.in  
@@ -845,7 +845,7 @@ uninstall-am: uninstall-includeHEADERS u  
@MUDFLAP_FALSE@ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \  
@MUDFLAP_FALSE@ -Wl,--version-script,$<,--no-undefined \  
@MUDFLAP_FALSE@ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\  
-@MUDFLAP_FALSE@ -ldl $(zip_LIBS)  
+@MUDFLAP_FALSE@ -ldl $(zip_LIBS) $(LIBS)  
@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
@MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION)  
 
 
--- a/libasm/Makefile.am  
+++ b/libasm/Makefile.am  
@@ -69,7 +69,6 @@ libasm.so: libasm_pic.a libasm.map  
-Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \  
-Wl,--soname,$@.$(VERSION) \  
../libebl/libebl.a ../libelf/libelf.so $(libasm_so_LDLIBS)  
- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
ln -fs $@ $@.$(VERSION)  
 
install: install-am libasm.so  
--- a/libasm/Makefile.in  
+++ b/libasm/Makefile.in  
@@ -656,7 +656,6 @@ uninstall-am: uninstall-libLIBRARIES uni  
@MUDFLAP_FALSE@ -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \  
@MUDFLAP_FALSE@ -Wl,--soname,$@.$(VERSION) \  
@MUDFLAP_FALSE@ ../libebl/libebl.a ../libelf/libelf.so $(libasm_so_LDLIBS)  
-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
@MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION)  
 
@MUDFLAP_FALSE@install: install-am libasm.so  
--- a/libdw/Makefile.am  
+++ b/libdw/Makefile.am  
@@ -112,7 +112,6 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.  
-Wl,--version-script,$<,--no-undefined \  
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\  
-ldl $(zip_LIBS) $(LIBS)  
- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
ln -fs $@ $@.$(VERSION)  
 
install: install-am libdw.so  
--- a/libdw/Makefile.in  
+++ b/libdw/Makefile.in  
@@ -846,7 +846,6 @@ uninstall-am: uninstall-includeHEADERS u  
@MUDFLAP_FALSE@ -Wl,--version-script,$<,--no-undefined \  
@MUDFLAP_FALSE@ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\  
@MUDFLAP_FALSE@ -ldl $(zip_LIBS) $(LIBS)  
-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
@MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION)  
 
@MUDFLAP_FALSE@install: install-am libdw.so  
--- a/libelf/Makefile.am  
+++ b/libelf/Makefile.am  
@@ -106,7 +106,6 @@ libelf.so: libelf_pic.a libelf.map  
$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \  
-Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \  
-Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)  
- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
ln -fs $@ $@.$(VERSION)  
 
install: install-am libelf.so  
--- a/libelf/Makefile.in  
+++ b/libelf/Makefile.in  
@@ -832,7 +832,6 @@ uninstall-am: uninstall-includeHEADERS u  
@MUDFLAP_FALSE@ $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \  
@MUDFLAP_FALSE@ -Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \  
@MUDFLAP_FALSE@ -Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)  
-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
@MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION)  
 
@MUDFLAP_FALSE@install: install-am libelf.so  
 
file:a/libs/gperf/Makefile (deleted)
#  
# Copyright (C) 2006-2008 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=gperf  
PKG_VERSION:=3.0.3  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@GNU/gperf  
PKG_MD5SUM:=cc20e58975a38075440423c8fb85fd00  
PKG_HOST_ONLY=1  
 
include $(INCLUDE_DIR)/host-build.mk  
include $(INCLUDE_DIR)/package.mk  
 
define Package/gperf  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Perfect hash function generator  
BUILDONLY:=1  
URL:=http://www.gnu.org/software/gperf  
endef  
 
define Package/lua/Default/description  
gperf is a perfect hash function generator  
endef  
 
define Host/Install  
$(MAKE) -C $(HOST_BUILD_DIR) install  
endef  
 
 
$(eval $(call HostBuild))  
$(eval $(call BuildPackage,gperf))  
 
file:a/libs/jansson/Makefile (deleted)
#  
# Copyright (C) 2011-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=jansson  
PKG_VERSION:=2.2.1  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.digip.org/jansson/releases/  
PKG_MD5SUM:=ebf4ebc7af47de27f7b9d79ad5853176  
 
PKG_INSTALL:=1  
PKG_BUILD_PARALLEL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/jansson  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=JSON library  
endef  
 
TARGET_CFLAGS += $(FPIC)  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/{lib,include}  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson* $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/  
endef  
 
define Package/jansson/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson*so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,jansson))  
 
This patch adds a function which can be used to update  
json key values on all levels, not just one, automagically  
adding new keys to objects which do not exist in old object.  
 
Signed-off-by: Roman Yeryomin <roman@advem.lv>  
 
--- a/src/value.c 2011-04-21 13:15:58.000000000 +0300  
+++ b/src/value.c 2011-07-01 00:23:05.105103308 +0300  
@@ -215,6 +215,41 @@  
return 0;  
}  
 
+int json_object_deep_update(json_t *object, json_t *other)  
+{  
+ void *iter;  
+  
+ if(!json_is_object(object) || !json_is_object(other))  
+ return -1;  
+  
+ iter = json_object_iter(other);  
+ while(iter) {  
+ const char *key;  
+ json_t *value;  
+  
+ key = json_object_iter_key(iter);  
+ value = json_object_iter_value(iter);  
+  
+ if (!json_is_object(value)) {  
+ if ( json_object_set_nocheck( object, key, value ) )  
+ return -1;  
+ } else {  
+ json_t *subobj = json_object_get(object, key);  
+ if (!subobj) {  
+ json_object_set_nocheck( object, key, value );  
+ iter = json_object_iter_next(other, iter);  
+ continue;  
+ }  
+ if (json_object_deep_update( subobj, value ) == -1)  
+ return -1;  
+ }  
+  
+ iter = json_object_iter_next(other, iter);  
+ }  
+  
+ return 0;  
+}  
+  
void *json_object_iter(json_t *json)  
{  
json_object_t *object;  
 
--- a/src/jansson.h  
+++ b/src/jansson.h  
@@ -126,6 +126,7 @@ int json_object_set_new_nocheck(json_t *  
int json_object_del(json_t *object, const char *key);  
int json_object_clear(json_t *object);  
int json_object_update(json_t *object, json_t *other);  
+int json_object_deep_update(json_t *object, json_t *other);  
void *json_object_iter(json_t *object);  
void *json_object_iter_at(json_t *object, const char *key);  
void *json_object_iter_next(json_t *object, void *iter);  
 
file:a/libs/libdaq/Makefile (deleted)
#  
# Copyright (C) 2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libdaq  
PKG_VERSION:=1.1.1  
PKG_RELEASE:=1  
 
PKG_SOURCE_URL:=http://www.snort.org/dl/snort-current/  
PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz  
PKG_MD5SUM:=bc204ea09165b4ecbb1bb49c7c1a2ad4  
PKG_BUILD_DIR:=$(BUILD_DIR)/daq-$(PKG_VERSION)  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
 
define Package/libdaq  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=DAQ library  
URL:=$(PKG_SOURCE_URL)  
DEPENDS:=+libdnet +libpcap  
endef  
 
define Package/libdaq/description  
Data Acquisition library for packet I/O.  
endef  
 
CONFIGURE_ARGS+= \  
--disable-static \  
--disable-nfq-module \  
--with-dnet-includes="$(STAGING_DIR)/usr/include" \  
--with-dnet-libraries="$(STAGING_DIR)/usr/lib" \  
--with-libpcap-includes="$(STAGING_DIR)/usr/include" \  
--with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \  
 
define Build/Compile  
$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)  
endef  
 
define Build/Install  
$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR) install DESTDIR=$(PKG_INSTALL_DIR)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(STAGING_DIR)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include/  
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib/  
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/* $(STAGING_DIR)/usr/lib/daq/  
$(INSTALL_DIR) $(STAGING_DIR)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(STAGING_DIR)/usr/bin/  
endef  
 
define Package/libdaq/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/daq  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/*.so* $(1)/usr/lib/daq/  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,libdaq))  
 
--- daq-1.1.1/configure 2012-07-10 21:32:51.000000000 +0200  
+++ daq-new/configure 2012-08-03 15:47:07.654945651 +0200  
@@ -12717,10 +12717,11 @@  
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcap version >= \"1.0.0\"" >&5  
$as_echo_n "checking for libpcap version >= \"1.0.0\"... " >&6; }  
if test "$cross_compiling" = yes; then :  
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}  
-as_fn_error $? "cannot run test program while cross compiling  
-See \`config.log' for more details" "$LINENO" 5; }  
+# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  
+#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}  
+#as_fn_error $? "cannot run test program while cross compiling  
+#See \`config.log' for more details" "$LINENO" 5; }  
+ echo " No cross compiling test."  
else  
cat confdefs.h - <<_ACEOF >conftest.$ac_ext  
/* end confdefs.h. */  
 
file:a/libs/libdnet/Makefile (deleted)
#  
# Copyright (C) 2006-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libdnet  
PKG_VERSION:=1.11  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/$(PKG_NAME)  
PKG_MD5SUM:=04c394ed8e1e7fc455456e79e908916d  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
PKG_CONFIG_DEPENDS:=\  
CONFIG_PACKAGE_libdnet \  
CONFIG_PACKAGE_pydnet  
 
PKG_BUILD_DEPENDS:=PACKAGE_pydnet:python  
 
include $(INCLUDE_DIR)/package.mk  
$(call include_mk, python-package.mk)  
 
define Package/libdnet/Default  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Low-level network library  
URL:=http://sourceforge.net/projects/libdnet/  
endef  
 
define Package/libdnet/Default/description  
libdnet is a library of simplified, portable interface to several  
low-level networking routines.  
endef  
 
define Package/libdnet  
$(call Package/libdnet/Default)  
endef  
 
define Package/libdnet/description  
$(call Package/libdnet/Default/description)  
endef  
 
define Package/pydnet  
$(call Package/libdnet/Default)  
DEPENDS:=libdnet +python-mini  
endef  
 
define Package/pydnet/description  
$(call Package/libdnet/Default/description)  
This package contains the python dnet library.  
endef  
 
TARGET_CFLAGS += $(FPIC)  
 
CONFIGURE_ARGS += \  
--enable-shared \  
--enable-static \  
--without-check \  
--without-python  
 
CONFIGURE_VARS += \  
ac_cv_dnet_bsd_bpf=no  
 
MAKE_FLAGS += \  
CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"  
 
define Build/Configure  
(cd $(PKG_BUILD_DIR); \  
ln -sf config/acinclude.m4 . ; \  
autoreconf -v --install || exit 1 \  
);  
$(call Build/Configure/Default)  
endef  
 
define Build/Compile  
$(call Build/Compile/Default)  
$(if $(CONFIG_PACKAGE_pydnet), \  
$(call Build/Compile/PyMod, \  
python/, \  
build \  
) \  
)  
endef  
 
define Build/Install  
$(call Build/Install/Default)  
$(if $(CONFIG_PACKAGE_pydnet), \  
$(call Build/Compile/PyMod, \  
python/, \  
install --no-compile --prefix $(PKG_INSTALL_DIR)/usr \  
) \  
)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(2)/bin  
$(INSTALL_BIN) \  
$(PKG_INSTALL_DIR)/usr/bin/dnet-config \  
$(2)/bin/  
$(SED) \  
's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \  
$(2)/bin/dnet-config  
 
$(INSTALL_DIR) $(1)/usr/include  
$(INSTALL_DATA)\  
$(PKG_INSTALL_DIR)/usr/include/dnet.h \  
$(1)/usr/include/  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/include/dnet \  
$(1)/usr/include/  
 
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/libdnet.{la,a,so*} \  
$(1)/usr/lib/  
endef  
 
define Package/libdnet/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* \  
$(1)/usr/lib/  
 
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) \  
$(PKG_INSTALL_DIR)/usr/sbin/dnet \  
$(1)/usr/sbin/  
endef  
 
define Package/pydnet/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/python* $(1)/usr/lib/  
endef  
 
 
$(eval $(call BuildPackage,libdnet))  
$(eval $(call BuildPackage,pydnet))  
 
--- a/dnet-config.in  
+++ b/dnet-config.in  
@@ -45,10 +45,18 @@ while test $# -gt 0; do  
done  
 
if test "$echo_cflags" = "yes"; then  
- echo -I@includedir@  
+ includes=  
+ if test "@includedir@" != "/usr/include" ; then  
+ includes=-I@includedir@  
+ fi  
+ echo $includes  
fi  
 
if test "$echo_libs" = "yes"; then  
- echo -L@libdir@ -ldnet @LIBS@  
+ libs=  
+ if test "@libdir@" != "/usr/lib" ; then  
+ libs=-I@libdir@  
+ fi  
+ echo $libs -ldnet @LIBS@  
fi  
 
 
--- a/config/config.sub  
+++ b/config/config.sub  
@@ -228,7 +228,7 @@ case $basic_machine in  
| a29k \  
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \  
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \  
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \  
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \  
| c4x | clipper \  
| d10v | d30v | dlx | dsp16xx \  
| fr30 | frv \  
@@ -290,7 +290,7 @@ case $basic_machine in  
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \  
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \  
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \  
- | avr-* \  
+ | avr-* | avr32-* \  
| bs2000-* \  
| c[123]* | c30-* | [cjt]90-* | c54x-* \  
| clipper-* | cydra-* \  
 
--- a/python/dnet.c  
+++ b/python/dnet.c  
@@ -2726,7 +2726,7 @@ static PyObject *__pyx_f_4dnet_15__addr_  
PyObject *__pyx_3 = 0;  
unsigned short __pyx_4;  
Py_INCREF(__pyx_v_self);  
- ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));  
+ __pyx_v_next = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));  
 
/* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */  
__pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max);  
@@ -2738,7 +2738,7 @@ static PyObject *__pyx_f_4dnet_15__addr_  
Py_DECREF(__pyx_2); __pyx_2 = 0;  
if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}  
Py_DECREF(((PyObject *)__pyx_v_next));  
- ((PyObject *)__pyx_v_next) = __pyx_3;  
+ __pyx_v_next = __pyx_3;  
__pyx_3 = 0;  
 
/* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */  
 
#  
# Copyright (C) 2007-2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libtorrent  
PKG_VERSION:=0.13.3-git  
PKG_RELEASE=$(PKG_SOURCE_VERSION)-1  
 
PKG_SOURCE_PROTO:=git  
PKG_SOURCE_URL:=https://github.com/rakshasa/libtorrent.git  
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)  
PKG_SOURCE_VERSION:=680576e23e7d5f642ee51486fdf301ac0195e188  
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz  
 
PKG_FIXUP:=autoreconf  
PKG_BUILD_PARALLEL:=1  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libtorrent  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Rakshasa's BitTorrent library  
URL:=http://libtorrent.rakshasa.no/  
DEPENDS:=+libopenssl +libsigcxx  
endef  
 
define Package/libtorrent/description  
LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on  
high performance and good code. The library differentiates itself from other  
implementations by transfering directly from file pages to the network stack.  
On high-bandwidth connections it is able to seed at 3 times the speed of the  
official client.  
endef  
 
TARGET_LDFLAGS += $(LIBGCC_S)  
 
CONFIGURE_ARGS+= \  
--enable-shared \  
--enable-static \  
--enable-aligned \  
--disable-debug \  
--enable-openssl \  
--disable-instrumentation  
 
define Build/Configure  
( cd $(PKG_BUILD_DIR); ./autogen.sh );  
$(call Build/Configure/Default)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/torrent $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.{a,so*} $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libtorrent/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libtorrent))  
 
--- a/configure.ac  
+++ b/configure.ac  
@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO  
 
AM_INIT_AUTOMAKE  
AC_CONFIG_HEADERS(config.h)  
-AM_PATH_CPPUNIT(1.9.6)  
 
AC_PROG_CXX  
 
--- a/scripts/checks.m4  
+++ b/scripts/checks.m4  
@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [  
AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [  
AC_MSG_CHECKING(whether kqueue supports pipes and ptys)  
 
- AC_RUN_IFELSE([AC_LANG_SOURCE([  
+ AC_LINK_IFELSE([AC_LANG_SOURCE([  
#include <fcntl.h>  
#include <stdlib.h>  
#include <unistd.h>  
--- a/scripts/common.m4  
+++ b/scripts/common.m4  
@@ -223,7 +223,7 @@ dnl Need to fix this so that it uses t  
AC_DEFUN([TORRENT_CHECK_EXECINFO], [  
AC_MSG_CHECKING(for execinfo.h)  
 
- AC_RUN_IFELSE([AC_LANG_SOURCE([  
+ AC_LINK_IFELSE([AC_LANG_SOURCE([  
#include <execinfo.h>  
int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}  
])],  
@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [  
AC_DEFUN([TORRENT_CHECK_ALIGNED], [  
AC_MSG_CHECKING(the byte alignment)  
 
- AC_RUN_IFELSE([AC_LANG_SOURCE([  
+ AC_LINK_IFELSE([AC_LANG_SOURCE([  
#include <inttypes.h>  
int main() {  
char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };  
 
--- a/src/net/socket_datagram.cc  
+++ b/src/net/socket_datagram.cc  
@@ -73,6 +73,23 @@ SocketDatagram::write_datagram(const voi  
int r;  
 
if (sa != NULL) {  
+#ifdef RAK_USE_INET6  
+ if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet) {  
+ uint32_t addr32[4];  
+ sockaddr_in6 mapped_addr;  
+ memset(&mapped_addr, 0, sizeof(mapped_addr));  
+ mapped_addr.sin6_family = AF_INET6;  
+ addr32[0] = 0;  
+ addr32[1] = 0;  
+ addr32[2] = htonl(0xffff);  
+ addr32[3] = sa->sa_inet()->address_n();  
+ memcpy(mapped_addr.sin6_addr.s6_addr, addr32, sizeof(uint32_t) * 4);  
+ mapped_addr.sin6_port = sa->sa_inet()->port_n();  
+ r = ::sendto(m_fileDesc, buffer, length, 0, (sockaddr*)&mapped_addr, sizeof(mapped_addr));  
+ } else if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet6) {  
+ r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet6()->c_sockaddr(), sizeof(rak::socket_address_inet6));  
+ } else  
+#endif  
r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet()->c_sockaddr(), sizeof(rak::socket_address_inet));  
} else {  
r = ::send(m_fileDesc, buffer, length, 0);  
 
file:a/libs/mxml/Makefile (deleted)
#  
# Copyright (C) 2010 Tobias Schneider  
# Copyright (C) 2007 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=mxml  
PKG_VERSION:=2.8  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.msweet.org/files/project3/  
PKG_FIXUP:=autoreconf  
PKG_MD5SUM:=d85ee6d30de053581242c4a86e79a5d2  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/mxml  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=mini-xml  
URL:=http://www.minixml.org/  
endef  
 
define Package/mxml/description  
A small xml library.  
endef  
 
TARGET_CFLAGS += $(FPIC)  
 
define Build/Configure  
$(call Build/Configure/Default, \  
--enable-shared \  
--enable-static \  
)  
endef  
 
define Build/InstallDev  
mkdir -p $(1)/usr/include  
$(CP) $(PKG_BUILD_DIR)/mxml.h $(1)/usr/include/  
mkdir -p $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libmxml.so* $(1)/usr/lib/  
mkdir -p $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_BUILD_DIR)/mxml.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/mxml/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libmxml.so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,mxml))  
 
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -88,7 +88,7 @@ PUBLIBOBJS = mxml-attr.o mxml-entity.o m  
mxml-index.o mxml-node.o mxml-search.o mxml-set.o  
LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o  
OBJS = mxmldoc.o testmxml.o $(LIBOBJS)  
-TARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man  
+TARGETS = $(LIBMXML)  
 
 
#  
 
diff -Nur uClibc++-0.2.4.orig/Makefile uClibc++-0.2.4/Makefile  
--- uClibc++-0.2.4.orig/Makefile 2012-05-25 23:15:31.000000000 +0200  
+++ uClibc++-0.2.4/Makefile 2013-03-11 11:50:03.000000000 +0100  
@@ -1,4 +1,3 @@  
-MAKE = make  
SUBDIRS = bin include src  
 
# User defines:  
 
file:a/mail/msmtp/Makefile (deleted)
#  
# Copyright (C) 2009 David Cooper <dave@kupesoft.com>  
# Copyright (C) 2009-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=msmtp  
PKG_VERSION:=1.4.27  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=@SF/msmtp  
PKG_MD5SUM:=2d6d10d9c59ed2b2635554ed35fb9226  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/msmtp/Default  
SECTION:=mail  
CATEGORY:=Mail  
TITLE:=Simple sendmail SMTP forwarding  
URL:=http://msmtp.sourceforge.net/  
endef  
 
define Package/msmtp/Default/description  
msmtp is an SMTP client. In the default mode, it transmits a mail to  
an SMTP server (for example at a free mail provider) which does the  
delivery. To use this program with your mail user agent (MUA), create  
a configuration file with your mail account(s) and tell your MUA to  
call msmtp instead of /usr/sbin/sendmail.  
endef  
 
define Package/msmtp  
$(call Package/msmtp/Default)  
DEPENDS+= +libopenssl  
TITLE+= (with SSL support)  
VARIANT:=ssl  
endef  
 
define Package/msmtp/conffiles  
/etc/msmtprc  
endef  
 
define Package/msmtp/description  
$(call Package/msmtp/Default/description)  
This package is built with SSL support.  
endef  
 
define Package/msmtp-nossl  
$(call Package/msmtp/Default)  
TITLE+= (without SSL support)  
VARIANT:=nossl  
endef  
 
define Package/msmtp-nossl/description  
$(call Package/msmtp/Default/description)  
This package is built without SSL support.  
endef  
 
define Package/msmtp-queue  
$(call Package/msmtp/Default)  
DEPENDS+= +bash  
TITLE+= (queue scripts)  
endef  
 
define Package/msmtp-queue/description  
$(call Package/msmtp/Default/description)  
This package contains the msmtp queue scripts.  
endef  
 
CONFIGURE_ARGS += \  
--disable-rpath \  
--without-libintl-prefix \  
--without-libgsasl \  
--without-libidn  
 
MAKE_FLAGS :=  
 
ifeq ($(BUILD_VARIANT),ssl)  
CONFIGURE_ARGS += \  
--with-ssl=openssl  
endif  
 
ifeq ($(BUILD_VARIANT),nossl)  
CONFIGURE_ARGS += \  
--with-ssl=no  
endif  
 
define Package/msmtp/install  
$(INSTALL_DIR) $(1)/etc  
$(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/msmtprc-system.example \  
$(1)/etc/msmtprc  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/msmtp $(1)/usr/bin/  
$(INSTALL_DIR) $(1)/usr/sbin  
endef  
 
define Package/msmtp/postinst  
ln -sf ../bin/msmtp $${IPKG_INSTROOT}/usr/sbin/sendmail  
endef  
 
Package/msmtp-nossl/conffiles = $(Package/msmtp/conffiles)  
Package/msmtp-nossl/install = $(Package/msmtp/install)  
Package/msmtp-nossl/postinst = $(Package/msmtp/postinst)  
 
define Package/msmtp-queue/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/msmtpq/msmtp{q,-queue} $(1)/usr/bin/  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/msmtpqueue/msmtp-{en,list,run}queue.sh $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,msmtp))  
$(eval $(call BuildPackage,msmtp-nossl))  
$(eval $(call BuildPackage,msmtp-queue))  
 
file:a/mail/ssmtp/Makefile (deleted)
#  
# Copyright (C) 2007-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=ssmtp  
PKG_VERSION:=2.64  
PKG_RELEASE:=4  
 
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.bz2  
PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp  
PKG_MD5SUM:=65b4e0df4934a6cd08c506cabcbe584f  
 
include $(INCLUDE_DIR)/package.mk  
 
TARGET_CFLAGS += $(TARGET_CPPFLAGS)  
 
define Package/ssmtp  
SECTION:=mail  
CATEGORY:=Mail  
DEPENDS:=+libopenssl  
TITLE:=A minimal and secure mail sender  
URL:=http://packages.debian.org/ssmtp  
endef  
 
define Package/ssmtp/description  
A secure, effective and simple way of getting mail off a system to your  
mail hub. It contains no suid-binaries or other dangerous things - no  
mail spool to poke around in, and no daemons running in the background.  
mail is simply forwarded to the configured mailhost. Extremely easy  
configuration.  
endef  
 
define Package/ssmtp/conffiles  
/etc/ssmtp/ssmtp.conf  
/etc/ssmtp/revaliases  
endef  
 
CONFIGURE_VARS += \  
LIBS="$(TARGET_LDFLAGS) -lcrypto -lssl"  
 
CONFIGURE_ARGS += \  
--enable-ssl  
 
define Package/ssmtp/install  
$(INSTALL_DIR) $(1)/etc/ssmtp  
$(INSTALL_CONF) $(PKG_BUILD_DIR)/ssmtp.conf $(1)/etc/ssmtp/  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/revaliases $(1)/etc/ssmtp/  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ssmtp $(1)/usr/sbin/  
endef  
 
define Package/ssmtp/postinst  
#!/bin/sh  
ln -sf ssmtp $${IPKG_INSTROOT}/usr/sbin/sendmail  
endef  
 
$(eval $(call BuildPackage,ssmtp))  
 
# CoovaChilli avanced configuration  
 
menu "Configuration"  
depends on PACKAGE_coova-chilli  
 
config COOVACHILLI_REDIR  
bool "Enable support for redir server. Required for uamregex"  
default n  
 
config COOVACHILLI_MINIPORTAL  
bool "Enable support Coova miniportal"  
default n  
 
config COOVACHILLI_USERAGENT  
bool "Enable recording user-agent"  
default n  
 
config COOVACHILLI_DNSLOG  
bool "Enable support to log DNS name queries"  
default n  
 
config COOVACHILLI_UAMDOMAINFILE  
bool "Enable loading of mass uamdomains from file"  
default n  
 
config COOVACHILLI_LARGELIMITS  
bool "Enable larger limits for use with non-embedded systems"  
default n  
 
choice  
prompt "SSL library"  
default COOVACHILLI_NOSSL  
 
config COOVACHILLI_NOSSL  
bool "No SSL support"  
 
config COOVACHILLI_MATRIXSSL  
bool "MatrixSSL"  
 
config COOVACHILLI_CYASSL  
bool "CyaSSL"  
 
config COOVACHILLI_OPENSSL  
bool "OpenSSL"  
 
endchoice  
 
endmenu  
 
#  
# Copyright (C) 2007-2014 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=coova-chilli  
PKG_VERSION:=1.3.0  
PKG_RELEASE:=5  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://ap.coova.org/chilli  
PKG_MD5SUM:=dc0037e3cdebcb60508081b4e42e984a  
 
PKG_INSTALL:=1  
 
PKG_CONFIG_DEPENDS := \  
COOVACHILLI_MINIPORTAL \  
COOVACHILLI_REDIR \  
COOVACHILLI_USERAGENT \  
COOVACHILLI_DNSLOG \  
COOVACHILLI_UAMDOMAINFILE \  
COOVACHILLI_LARGELIMITS \  
COOVACHILLI_NOSSL \  
COOVACHILLI_MATRIXSSL \  
COOVACHILLI_CYASSL \  
COOVACHILLI_OPENSSL  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/coova-chilli  
SUBMENU:=Captive Portals  
SECTION:=net  
CATEGORY:=Network  
DEPENDS:=+kmod-tun +librt +COOVACHILLI_MATRIXSSL:libmatrixssl +COOVACHILLI_CYASSL:libcyassl +COOVACHILLI_OPENSSL:libopenssl  
TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version)  
URL:=http://www.coova.org/CoovaChilli  
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>  
MENU:=1  
endef  
 
define Package/coova-chilli/description  
CoovaChilli is an open source access controller for wireless LAN  
access points and is based on ChilliSpot. It is used for authenticating  
users of a wireless (or wired) LAN. It supports web based login (UAM)  
which is today's standard for public HotSpots and it supports Wireless  
Protected Access (WPA) which is the standard of the future.  
Authentication, authorization and accounting (AAA) is handled by your  
favorite radius server.  
endef  
 
define Package/coova-chilli/config  
source "$(SOURCE)/Config.in"  
endef  
 
define Build/Configure  
$(call Build/Configure/Default, \  
$(if $(CONFIG_COOVACHILLI_REDIR),--enable,--disable)-chilliredir \  
$(if $(CONFIG_COOVACHILLI_DNSLOG),--enable,--disable)-dnslog \  
$(if $(CONFIG_COOVACHILLI_MINIPORTAL),--enable,--disable)-miniportal \  
$(if $(CONFIG_COOVACHILLI_USERAGENT),--enable,--disable)-useragent \  
$(if $(CONFIG_COOVACHILLI_LARGELIMITS),--enable,--disable)-largelimits \  
$(if $(CONFIG_COOVACHILLI_UAMDOMAINFILE),--enable,--disable)-uamdomainfile \  
$(if $(CONFIG_COOVACHILLI_MATRIXSSL),--with,--without)-matrixssl \  
$(if $(CONFIG_COOVACHILLI_CYASSL),--with,--without)-cyaxssl \  
$(if $(CONFIG_COOVACHILLI_OPENSSL),--with,--without)-openssl \  
)  
endef  
 
define Package/coova-chilli/conffiles  
/etc/chilli.conf  
endef  
 
define Package/coova-chilli/install  
$(INSTALL_DIR) $(1)/etc  
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/chilli.conf $(1)/etc/  
$(INSTALL_DIR) $(1)/etc/chilli  
$(CP) $(PKG_INSTALL_DIR)/etc/chilli/* $(1)/etc/chilli/  
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface  
$(INSTALL_DATA) ./files/chilli.hotplug $(1)/etc/hotplug.d/iface/30-chilli  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/chilli* $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/usr/lib/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,coova-chilli))  
 
#!/bin/sh  
 
[ "$ACTION" == "ifup" ] || exit 0  
 
[ "$INTERFACE" = "wan" ] && {  
/etc/init.d/chilli restart  
}  
 
--- a/src/system.h  
+++ b/src/system.h  
@@ -76,10 +76,6 @@  
#include <sys/stat.h>  
#endif  
 
-#ifdef HAVE_SYS_SYSINFO_H  
-#include <sys/sysinfo.h>  
-#endif  
-  
#ifdef HAVE_TIME_H  
#include <time.h>  
#endif  
@@ -132,6 +128,10 @@  
#include <linux/un.h>  
#endif  
 
+#ifdef HAVE_SYS_SYSINFO_H  
+#include <sys/sysinfo.h>  
+#endif  
+  
#elif defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)  
#include <net/if.h>  
#include <net/bpf.h>  
 
#  
# Copyright (C) 2008-2009 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=dansguardian  
PKG_VERSION:=2.10.1.1  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://dansguardian.org/downloads/2/Stable  
PKG_MD5SUM:=0987a1c9bfbdf398118386f10279611a  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/uclibc++.mk  
include $(INCLUDE_DIR)/package.mk  
 
define Package/dansguardian  
SECTION:=net  
DEPENDS:=+libpthread $(CXX_DEPENDS) +zlib  
CATEGORY:=Network  
SUBMENU:=Web Servers/Proxies  
TITLE:=DansGuardian  
URL:=http://dansguardian.org  
endef  
 
define Package/dansguardian/conffiles  
/etc/dansguardian/dansguardian.conf  
endef  
 
CONFIGURE_VARS += \  
INCLUDES="" \  
CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \  
LIBS="-lpthread" \  
 
define Build/Configure  
$(call Build/Configure/Default,\  
--disable-clamav \  
--with-sysconfsubdir=dansguardian \  
--with-proxyuser=root \  
--with-proxygroup=root \  
--disable-pcre \  
)  
endef  
 
define Package/dansguardian/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dansguardian $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/etc  
$(CP) $(PKG_INSTALL_DIR)/etc/dansguardian $(1)/etc/  
$(INSTALL_DIR) $(1)/usr/share/dansguardian  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/dansguardian/transparent1x1.gif $(1)/usr/share/dansguardian/  
$(INSTALL_DIR) $(1)/usr/share/dansguardian/languages/ukenglish  
$(CP) $(PKG_INSTALL_DIR)/usr/share/dansguardian/languages/ukenglish/* $(1)/usr/share/dansguardian/languages/ukenglish/  
endef  
 
$(eval $(call BuildPackage,dansguardian))  
 
--- a/configure  
+++ b/configure  
@@ -861,7 +861,7 @@ sysconfdir='${prefix}/etc'  
sharedstatedir='${prefix}/com'  
localstatedir='${prefix}/var'  
includedir='${prefix}/include'  
-oldincludedir='/usr/include'  
+oldincludedir='${prefix}/usr/include'  
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'  
infodir='${datarootdir}/info'  
htmldir='${docdir}'  
@@ -6317,7 +6317,7 @@ $as_echo_n "checking for zlib... " >&6;  
# Check whether --with-zlib was given.  
if test "${with_zlib+set}" = set; then  
withval=$with_zlib; # check for header & func (in library) in given prefix  
- CPPFLAGS="${CPPFLAGS} -I${withval}/include"  
+ CPPFLAGS="${CPPFLAGS}"  
if test "x$staticzlib" = "xtrue"; then  
LIBS="-Bstatic -L${withval} -lz -Bdynamic ${LIBS}"  
else  
@@ -10042,7 +10042,7 @@ _ACEOF  
if test "${with_libiconv+set}" = set; then  
withval=$with_libiconv; # check for header & func (in library) in given prefix  
if test "x$withval" != "x"; then  
- CPPFLAGS="${CPPFLAGS} -I${withval}/include"  
+ CPPFLAGS="${CPPFLAGS}"  
LIBS="-L${withval}/lib -liconv ${LIBS}"  
else  
LIBS="-liconv ${LIBS}"  
 
file:a/net/kismet/Makefile (deleted)
#  
# Copyright (C) 2006-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=kismet  
PKG_VERSION:=2010-07-R1  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.kismetwireless.net/code  
PKG_MD5SUM:=85e59186eb529889118b5635f35cf57d  
 
PKG_BUILD_DEPENDS:=libpcap libncurses libpcre  
 
include $(INCLUDE_DIR)/uclibc++.mk  
include $(INCLUDE_DIR)/package.mk  
 
define Package/kismet/Default  
SECTION:=net  
CATEGORY:=Network  
TITLE:=Kismet  
DEPENDS:= $(CXX_DEPENDS) +libnl  
URL:=http://www.kismetwireless.net/  
SUBMENU:=wireless  
endef  
 
define Package/kismet/Default/description  
An 802.11 layer2 wireless network detector, sniffer, and intrusion  
detection system.  
endef  
 
define Package/kismet-client  
$(call Package/kismet/Default)  
TITLE+= client  
DEPENDS+= +libncurses  
endef  
 
define Package/kismet-client/conffiles  
/etc/kismet/kismet.conf  
endef  
 
define Package/kismet-client/description  
$(call Package/kismet/Default/description)  
This package contains the kismet text interface client.  
endef  
 
define Package/kismet-drone  
$(call Package/kismet/Default)  
DEPENDS+= +libpcap +libpcre +libcap  
TITLE+= drone  
endef  
 
define Package/kismet-drone/conffiles  
/etc/kismet/kismet_drone.conf  
endef  
 
define Package/kismet-drone/description  
$(call Package/kismet/Default/description)  
This package contains the kismet remote sniffing.and monitoring drone.  
endef  
 
define Package/kismet-server  
$(call Package/kismet/Default)  
DEPENDS+= +libpcap +libpcre +libcap  
TITLE+= server  
endef  
 
define Package/kismet-server/conffiles  
/etc/kismet/kismet.conf  
endef  
 
define Package/kismet-server/description  
$(call Package/kismet/Default/description)  
This package contains the kismet server.  
endef  
 
CONFIGURE_ARGS += \  
--sysconfdir=/etc/kismet \  
 
CONFIGURE_VARS += \  
CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \  
LIBS="-lm" \  
CLIENTCLIBS="-lm"  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
LD="$(TARGET_CXX)" \  
all  
endef  
 
#FIXME: remove this package?  
define Package/kismet/install  
$(INSTALL_DIR) $(1)/usr/bin/  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/kismet $(1)/usr/bin/kismet  
endef  
 
define Package/kismet-client/install  
$(INSTALL_DIR) $(1)/etc/kismet/  
$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet.conf $(1)/etc/kismet/  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_client $(1)/usr/bin/  
endef  
 
define Package/kismet-drone/install  
$(INSTALL_DIR) $(1)/etc/kismet/  
$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet_drone.conf $(1)/etc/kismet/  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_drone $(1)/usr/bin/  
endef  
 
define Package/kismet-server/install  
$(INSTALL_DIR) $(1)/etc/kismet/  
$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/kismet.conf $(1)/etc/kismet/  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/kismet_server $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,kismet-client))  
$(eval $(call BuildPackage,kismet-drone))  
$(eval $(call BuildPackage,kismet-server))  
 
00:00:0C:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:00:74:00:00:00/FF:FF:FF:00:00:00 Ricoh Unknown 0  
00:00:92:00:00:00/FF:FF:FF:00:00:00 Cogent Unknown 0  
00:00:AA:00:00:00/FF:FF:FF:00:00:00 Xerox Unknown 0  
00:00:C5:00:00:00/FF:FF:FF:00:00:00 FarallonCo Unknown 0  
00:00:CE:00:00:00/FF:FF:FF:00:00:00 Megadata Unknown 0  
00:00:DE:00:00:00/FF:FF:FF:00:00:00 Unigraph Unknown 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:01:38:00:00:00/FF:FF:FF:00:00:00 XaviTechno Unknown 0  
00:01:95:00:00:00/FF:FF:FF:00:00:00 Sena Unknown 0  
00:01:E6:00:00:00/FF:FF:FF:00:00:00 Hewlett-Pa Unknown 0  
00:01:F4:00:00:00/FF:FF:FF:00:00:00 EnterasysN Unknown 0  
00:02:2D:00:00:00/FF:FF:FF:00:00:00 Lucent Unknown 0  
00:02:44:00:00:00/FF:FF:FF:00:00:00 Surecom Unknown 0  
00:02:6F:00:00:00/FF:FF:FF:00:00:00 Senao Unknown 0  
00:02:72:00:00:00/FF:FF:FF:00:00:00 Cc&C Unknown 0  
00:02:8A:00:00:00/FF:FF:FF:00:00:00 AmbitMicro Unknown 0  
00:02:A5:00:00:00/FF:FF:FF:00:00:00 Compaq Unknown 0  
00:02:B3:00:00:00/FF:FF:FF:00:00:00 Intel Unknown 0  
00:03:0A:00:00:00/FF:FF:FF:00:00:00 Argus Unknown 0  
00:03:2F:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown 0  
00:03:52:00:00:00/FF:FF:FF:00:00:00 Colubris Unknown 0  
00:03:93:00:00:00/FF:FF:FF:00:00:00 AppleCompu Unknown 0  
00:04:23:00:00:00/FF:FF:FF:00:00:00 Intel Unknown 0  
00:04:3A:3A:00:00/FF:FF:FF:FF:00:00 Avaya ad-01444 0  
00:04:5A:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys 6 192.168.1.1  
00:04:5A:0E:00:00/FF:FF:FF:FF:00:00 Linksys WAP11 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:5A:00:00/FF:FF:FF:FF:00:00 Linksys BEFW11S4 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:76:00:00:00/FF:FF:FF:00:00:00 3Com Unknown 0  
00:04:DB:00:00:00/FF:FF:FF:00:00:00 TellusGrou Unknown 0  
00:04:E2:00:00:00/FF:FF:FF:00:00:00 SMC Unknown 0  
00:04:E2:00:00:00/FF:FF:FF:00:00:00 SMC Unknown SMC 6 192.168.2.1  
00:04:E2:E2:00:00/FF:FF:FF:FF:00:00 SMC 7004AWBR default 6 192.168.2.1  
00:05:3C:00:00:00/FF:FF:FF:00:00:00 Xircom Unknown 0  
00:05:4E:00:00:00/FF:FF:FF:00:00:00 PhilipsCom 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 D-Link DWL-1000AP default 6  
00:05:87:00:00:00/FF:FF:FF:00:00:00 Locus 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:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys 6 192.168.1.1  
00:06:25:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys-g 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:06:B1:00:00:00/FF:FF:FF:00:00:00 Sonicwall Unknown 0  
00:07:0E:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:07:13:00:00:00/FF:FF:FF:00:00:00 IpOne Unknown 0  
00:07:40:00:00:00/FF:FF:FF:00:00:00 Melco Unknown 0  
00:07:50:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:07:85:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:07:EB: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:08:A1:00:00:00/FF:FF:FF:00:00:00 CnetTechno 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:5B:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown NETGEAR 11 192.168.0.1  
00:09:5B:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown Wireless 11 192.168.0.2  
00:09:5B:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown NETGEAR 11 192.168.0.1  
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:B7:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:09:E8:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0A:04:00:00:00/FF:FF:FF:00:00:00 3comEurope 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:0A:95:00:00:00/FF:FF:FF:00:00:00 AppleCompu Unknown 0  
00:0A:B7:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0A:E9:00:00:00/FF:FF:FF:00:00:00 Airvast Unknown 0  
00:0B:5F:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0B:6B:00:00:00/FF:FF:FF:00:00:00 WistronNew Unknown 0  
00:0B:6C:00:00:00/FF:FF:FF:00:00:00 Sychip Unknown 0  
00:0B:7D:00:00:00/FF:FF:FF:00:00:00 SolomonExt Unknown 0  
00:0B:85:00:00:00/FF:FF:FF:00:00:00 Airespace Unknown 0  
00:0B:86:00:00:00/FF:FF:FF:00:00:00 Aruba Unknown 0  
00:0B:AC:00:00:00/FF:FF:FF:00:00:00 3comEurope Unknown 0  
00:0B:BE:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0B:CD:00:00:00/FF:FF:FF:00:00:00 CompaqHp Unknown 0  
00:0B:FD:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0C:30:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0C:41:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys 6 192.168.1.1  
00:0C:85:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0C:CE:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0C:E5:00:00:00/FF:FF:FF:00:00:00 MotorolaBc Unknown 0  
00:0C:F1:00:00:00/FF:FF:FF:00:00:00 Intel Unknown 0  
00:0D:0B:00:00:00/FF:FF:FF:00:00:00 Melco Unknown 0  
00:0D:14:00:00:00/FF:FF:FF:00:00:00 VtechInnov Unknown 0  
00:0D:28:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0D:29:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0D:3A:00:00:00/FF:FF:FF:00:00:00 Microsoft Unknown 0  
00:0D:54:00:00:00/FF:FF:FF:00:00:00 3comEurope Unknown 0  
00:0D:65:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0D:72:00:00:00/FF:FF:FF:00:00:00 2wire Unknown 0  
00:0D:88:00:00:00/FF:FF:FF:00:00:00 D-Link Unknown default 6 192.168.0.1  
00:0D:93:00:00:00/FF:FF:FF:00:00:00 AppleCompu Unknown 0  
00:0D:97:00:00:00/FF:FF:FF:00:00:00 Tropos Unknown 0  
00:0D:9D:00:00:00/FF:FF:FF:00:00:00 HewlettPac Unknown 0  
00:0D:BD:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0D:ED:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0E:35:00:00:00/FF:FF:FF:00:00:00 Intel Unknown 0  
00:0E:38:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0E:3B:00:00:00/FF:FF:FF:00:00:00 HawkingTec Unknown 0  
00:0E:58:00:00:00/FF:FF:FF:00:00:00 RinconNetw Unknown 0  
00:0E:6A:00:00:00/FF:FF:FF:00:00:00 3comEurope Unknown 0  
00:0E:7F:00:00:00/FF:FF:FF:00:00:00 HewlettPac Unknown 0  
00:0E:83:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0E:84:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0E:9B:00:00:00/FF:FF:FF:00:00:00 Private Unknown 0  
00:0E:A6:00:00:00/FF:FF:FF:00:00:00 AsustekCom Unknown 0  
00:0E:D7:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:23:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:24:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:34:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:3D:00:00:00/FF:FF:FF:00:00:00 D-Link Unknown default 6 192.168.0.1  
00:0F:66:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys 6 192.168.1.1  
00:0F:8F:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:90:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:B5:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown NETGEAR 11 192.168.0.1  
00:0F:EA:00:00:00/FF:FF:FF:00:00:00 GigaByte Unknown 0  
00:0F:F7:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:F8:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:10:C6:00:00:00/FF:FF:FF:00:00:00 Usi Unknown 0  
00:10:E7:00:00:00/FF:FF:FF:00:00:00 Breezecom Unknown 0  
00:11:09:00:00:00/FF:FF:FF:00:00:00 Micro-Star Unknown 0  
00:11:0A:00:00:00/FF:FF:FF:00:00:00 HewlettPac Unknown 0  
00:11:20:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:21:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:24:00:00:00/FF:FF:FF:00:00:00 AppleCompu Unknown 0  
00:11:2F:00:00:00/FF:FF:FF:00:00:00 AsustekCom Unknown 0  
00:11:50:00:00:00/FF:FF:FF:00:00:00 Belkin Unknown 0  
00:17:3F:00:00:00/FF:FF:FF:00:00:00 Belkin54g Unknown 0  
00:11:5C:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:88:00:00:00/FF:FF:FF:00:00:00 Enterasys Unknown 0  
00:11:92:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:93:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:95:00:00:00/FF:FF:FF:00:00:00 AlphaNetwo Unknown 0  
00:11:BB:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:D8:00:00:00/FF:FF:FF:00:00:00 AsustekCom Unknown 0  
00:11:F5:00:00:00/FF:FF:FF:00:00:00 Askey Unknown 0  
00:12:00:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:01:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:17:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys 6 192.168.1.1  
00:12:25:00:00:00/FF:FF:FF:00:00:00 MotorolaBc Unknown 0  
00:12:43:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:7F:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:80:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:88:00:00:00/FF:FF:FF:00:00:00 2wire Unknown 0  
00:12:D9:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:DA:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:F0:00:00:00/FF:FF:FF:00:00:00 IntelCorpo Unknown 0  
00:13:10:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys 6 192.168.1.1  
00:13:19:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:13:1A:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:13:46:00:00:00/FF:FF:FF:00:00:00 D-Link Unknown 0  
00:13:60:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:13:7F:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:13:80:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:13:C4:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:20:00:00:00:00/FF:FF:FF:00:00:00 LexmarkInt Unknown 0  
00:20:A6:00:00:00/FF:FF:FF:00:00:00 Proxim Unknown 0  
00:20:D8:00:00:00/FF:FF:FF:00:00:00 Nortel Unknown 0  
00:20:E0:00:00:00/FF:FF:FF:00:00:00 Actiontec Unknown 0  
00:30:1A:00:00:00/FF:FF:FF:00:00:00 Smartbridge 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 Snow Base Station 1  
00:30:6E:00:00:00/FF:FF:FF:00:00:00 HP Unknown 0  
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:18:4D:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown 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 WLAN 11 0.0.0.0  
00:30:BD:00:00:00/FF:FF:FF:00:00:00 Belkin Unknown belkin54g 11 0.0.0.0  
00:30:BD:BD:00:00/FF:FF:FF:FF:00:00 Belkin F5D6230-3 0  
00:30:F1:00:00:00/FF:FF:FF:00:00:00 AcctonTech Unknown 0  
00:40:01:00:00:00/FF:FF:FF:00:00:00 Zyxel Unknown 0  
00:40:05:00:00:00/FF:FF:FF:00:00:00 ANI Unknown default 6 192.168.0.1  
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:33:00:00:00/FF:FF:FF:00:00:00 Addtron Unknown 0  
00:40:36:00:00:00/FF:FF:FF:00:00:00 TribeCompu 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 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:18:00:00:00/FF:FF:FF:00:00:00 Amit 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:00:00:00/FF:FF:FF:00:00:00 Microsoft Unknown MSHOME 6 192.168.2.1  
00:50:F2:F2:00:00/FF:FF:FF:FF:00:00 Microsoft MN-500 MSHOME 6 192.168.0.1  
00:50:FC:00:00:00/FF:FF:FF:00:00:00 Edimax Unknown 0  
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:48:00:00:00/FF:FF:FF:00:00:00 Compex Unknown 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:80:C8:00:00:00/FF:FF:FF:00:00:00 D-Link Unknown default 6 192.168.0.1  
00:90:0E:00:00:00/FF:FF:FF:00:00:00 Handlink Unknown 0  
00:90:4B:4B:00:00/FF:FF:FF:FF:00:00 Linksys BEFW11S4 linksys 6 192.168.1.1  
00:90:4B:00:00:00/FF:FF:FF:00:00:00 Motorola Unknown 0  
00:90:4C:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown NETGEAR 11 192.168.0.1  
00:90:96:00:00:00/FF:FF:FF:00:00:00 Askey 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 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:C5:00:00:00/FF:FF:FF:00:00:00 Zyxel Unknown 0  
00:A0:F8:00:00:00/FF:FF:FF:00:00:00 Symbol Unknown  
00:B0:64:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:C0:02:00:00:00/FF:FF:FF:00:00:00 Sercomm Unknown 0  
00:C0:49:00:00:00/FF:FF:FF:00:00:00 USRobotics Unknown 0  
00:D0:59:00:00:00/FF:FF:FF:00:00:00 AmbitMicro Unknown 0  
00:E0:00:00:00:00/FF:FF:FF:00:00:00 Fujitsu Unknown 0  
00:E0:29:00:00:00/FF:FF:FF:00:00:00 OEM Unknown  
00:E0:63:00:00:00/FF:FF:FF:00:00:00 Cabletron Unknown 0  
00:E0:98:00:00:00/FF:FF:FF:00:00:00 Trend Unknown 0  
00:E0:B8:00:00:00/FF:FF:FF:00:00:00 Gateway2000 Unknown 0  
08:00:46:00:00:00/FF:FF:FF:00:00:00 Sony Unknown  
00:14:BF:00:00:00/FF:FF:FF:00:00:00 linksys Unknown linksys 6 192.168.1.1  
00:14:6C:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown NETGEAR 11 192.168.0.1  
00:16:B6:00:00:00/FF:FF:FF:00:00:00 linksys Unknown linksys 6 192.168.1.1  
00:18:39:00:00:00/FF:FF:FF:00:00:00 linksys Unknown linksys 6 192.168.1.1  
00:18:F8:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown 0  
02:13:CE:00:00:00/FF:FF:FF:00:00:00 hpsetup Unknown 0  
00:15:E9:00:00:00/FF:FF:FF:00:00:00 dlink Unknown 0  
00:14:51:00:00:00/FF:FF:FF:00:00:00 AppleCompu Unknown 0  
00:C0:A8:00:00:00/FF:FF:FF:00:00:00 AMX Unknown 0  
00:16:CB:00:00:00/FF:FF:FF:00:00:00 Apple Macbook Pro 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:16:CB:00:00:00/FF:FF:FF:00:00:00 Apple Macbook Pro 0  
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:6F:00:00/FF:FF:FF:FF:00:00 WMATA WashingtonMetroAreaTA 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  
00:00:0C:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:00:74:00:00:00/FF:FF:FF:00:00:00 Ricoh Unknown 0  
00:00:92:00:00:00/FF:FF:FF:00:00:00 Cogent Unknown 0  
00:00:AA:00:00:00/FF:FF:FF:00:00:00 Xerox Unknown 0  
00:00:C5:00:00:00/FF:FF:FF:00:00:00 FarallonCo Unknown 0  
00:00:CE:00:00:00/FF:FF:FF:00:00:00 Megadata Unknown 0  
00:00:DE:00:00:00/FF:FF:FF:00:00:00 Unigraph Unknown 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:38:00:00:00/FF:FF:FF:00:00:00 XaviTechno Unknown 0  
00:01:95:00:00:00/FF:FF:FF:00:00:00 Sena Unknown 0  
00:01:E6:00:00:00/FF:FF:FF:00:00:00 Hewlett-Pa Unknown 0  
00:01:F4:00:00:00/FF:FF:FF:00:00:00 EnterasysN Unknown 0  
00:02:2D:00:00:00/FF:FF:FF:00:00:00 Lucent Unknown 0  
00:02:44:00:00:00/FF:FF:FF:00:00:00 Surecom Unknown 0  
00:02:6F:00:00:00/FF:FF:FF:00:00:00 Senao Unknown 0  
00:02:72:00:00:00/FF:FF:FF:00:00:00 Cc&C Unknown 0  
00:02:8A:00:00:00/FF:FF:FF:00:00:00 AmbitMicro Unknown 0  
00:02:A5:00:00:00/FF:FF:FF:00:00:00 Compaq Unknown 0  
00:02:B3:00:00:00/FF:FF:FF:00:00:00 Intel Unknown 0  
00:03:0A:00:00:00/FF:FF:FF:00:00:00 Argus Unknown 0  
00:03:2F:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown 0  
00:03:52:00:00:00/FF:FF:FF:00:00:00 Colubris Unknown 0  
00:03:93:00:00:00/FF:FF:FF:00:00:00 AppleCompu Unknown 0  
00:04:23:00:00:00/FF:FF:FF:00:00:00 Intel Unknown 0  
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:76:00:00:00/FF:FF:FF:00:00:00 3Com Unknown 0  
00:04:DB:00:00:00/FF:FF:FF:00:00:00 TellusGrou Unknown 0  
00:04:E2:00:00:00/FF:FF:FF:00:00:00 SMC Unknown 0  
00:04:E2:00:00:00/FF:FF:FF:00:00:00 SMC Unknown SMC 6 192.168.2.1  
00:05:3C:00:00:00/FF:FF:FF:00:00:00 Xircom Unknown 0  
00:05:4E:00:00:00/FF:FF:FF:00:00:00 PhilipsCom Unknown 0  
00:05:5D:00:00:00/FF:FF:FF:00:00:00 D-Link Unknown default 6  
00:05:87:00:00:00/FF:FF:FF:00:00:00 Locus 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:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys 6 192.168.1.1  
00:06:25:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys-g 6 192.168.1.1  
00:06:B1:00:00:00/FF:FF:FF:00:00:00 Sonicwall Unknown 0  
00:07:0E:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:07:13:00:00:00/FF:FF:FF:00:00:00 IpOne Unknown 0  
00:07:40:00:00:00/FF:FF:FF:00:00:00 Melco Unknown 0  
00:07:50:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:07:85:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:07:EB: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:08:A1:00:00:00/FF:FF:FF:00:00:00 CnetTechno 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:5B:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown NETGEAR 11 192.168.0.1  
00:09:5B:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown Wireless 11 192.168.0.2  
00:09:5B:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown NETGEAR 11 192.168.0.1  
00:09:7C:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:09:B7:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:09:E8:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0A:04:00:00:00/FF:FF:FF:00:00:00 3comEurope 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:95:00:00:00/FF:FF:FF:00:00:00 AppleCompu Unknown 0  
00:0A:B7:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0A:E9:00:00:00/FF:FF:FF:00:00:00 Airvast Unknown 0  
00:0B:5F:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0B:6B:00:00:00/FF:FF:FF:00:00:00 WistronNew Unknown 0  
00:0B:6C:00:00:00/FF:FF:FF:00:00:00 Sychip Unknown 0  
00:0B:7D:00:00:00/FF:FF:FF:00:00:00 SolomonExt Unknown 0  
00:0B:85:00:00:00/FF:FF:FF:00:00:00 Airespace Unknown 0  
00:0B:86:00:00:00/FF:FF:FF:00:00:00 Aruba Unknown 0  
00:0B:AC:00:00:00/FF:FF:FF:00:00:00 3comEurope Unknown 0  
00:0B:BE:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0B:CD:00:00:00/FF:FF:FF:00:00:00 CompaqHp Unknown 0  
00:0B:FD:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0C:30:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0C:41:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys 6 192.168.1.1  
00:0C:85:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0C:CE:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0C:E5:00:00:00/FF:FF:FF:00:00:00 MotorolaBc Unknown 0  
00:0C:F1:00:00:00/FF:FF:FF:00:00:00 Intel Unknown 0  
00:0D:0B:00:00:00/FF:FF:FF:00:00:00 Melco Unknown 0  
00:0D:14:00:00:00/FF:FF:FF:00:00:00 VtechInnov Unknown 0  
00:0D:28:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0D:29:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0D:3A:00:00:00/FF:FF:FF:00:00:00 Microsoft Unknown 0  
00:0D:54:00:00:00/FF:FF:FF:00:00:00 3comEurope Unknown 0  
00:0D:65:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0D:72:00:00:00/FF:FF:FF:00:00:00 2wire Unknown 0  
00:0D:88:00:00:00/FF:FF:FF:00:00:00 D-Link Unknown default 6 192.168.0.1  
00:0D:93:00:00:00/FF:FF:FF:00:00:00 AppleCompu Unknown 0  
00:0D:97:00:00:00/FF:FF:FF:00:00:00 Tropos Unknown 0  
00:0D:9D:00:00:00/FF:FF:FF:00:00:00 HewlettPac Unknown 0  
00:0D:BD:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0D:ED:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0E:35:00:00:00/FF:FF:FF:00:00:00 Intel Unknown 0  
00:0E:38:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0E:3B:00:00:00/FF:FF:FF:00:00:00 HawkingTec Unknown 0  
00:0E:58:00:00:00/FF:FF:FF:00:00:00 RinconNetw Unknown 0  
00:0E:6A:00:00:00/FF:FF:FF:00:00:00 3comEurope Unknown 0  
00:0E:7F:00:00:00/FF:FF:FF:00:00:00 HewlettPac Unknown 0  
00:0E:83:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0E:84:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0E:9B:00:00:00/FF:FF:FF:00:00:00 Private Unknown 0  
00:0E:A6:00:00:00/FF:FF:FF:00:00:00 AsustekCom Unknown 0  
00:0E:D7:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:23:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:24:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:34:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:3D:00:00:00/FF:FF:FF:00:00:00 D-Link Unknown default 6 192.168.0.1  
00:0F:66:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys 6 192.168.1.1  
00:0F:8F:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:90:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:B5:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown NETGEAR 11 192.168.0.1  
00:0F:EA:00:00:00/FF:FF:FF:00:00:00 GigaByte Unknown 0  
00:0F:F7:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:0F:F8:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:10:C6:00:00:00/FF:FF:FF:00:00:00 Usi Unknown 0  
00:10:E7:00:00:00/FF:FF:FF:00:00:00 Breezecom Unknown 0  
00:11:09:00:00:00/FF:FF:FF:00:00:00 Micro-Star Unknown 0  
00:11:0A:00:00:00/FF:FF:FF:00:00:00 HewlettPac Unknown 0  
00:11:20:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:21:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:24:00:00:00/FF:FF:FF:00:00:00 AppleCompu Unknown 0  
00:11:2F:00:00:00/FF:FF:FF:00:00:00 AsustekCom Unknown 0  
00:11:50:00:00:00/FF:FF:FF:00:00:00 Belkin Unknown 0  
00:11:5C:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:88:00:00:00/FF:FF:FF:00:00:00 Enterasys Unknown 0  
00:11:92:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:93:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:95:00:00:00/FF:FF:FF:00:00:00 AlphaNetwo Unknown 0  
00:11:BB:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:11:D8:00:00:00/FF:FF:FF:00:00:00 AsustekCom Unknown 0  
00:11:F5:00:00:00/FF:FF:FF:00:00:00 Askey Unknown 0  
00:12:00:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:01:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:17:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys 6 192.168.1.1  
00:12:25:00:00:00/FF:FF:FF:00:00:00 MotorolaBc Unknown 0  
00:12:43:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:7F:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:80:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:88:00:00:00/FF:FF:FF:00:00:00 2wire Unknown 0  
00:12:D9:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:DA:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:12:F0:00:00:00/FF:FF:FF:00:00:00 IntelCorpo Unknown 0  
00:13:10:00:00:00/FF:FF:FF:00:00:00 Linksys Unknown linksys 6 192.168.1.1  
00:13:19:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:13:1A:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:13:46:00:00:00/FF:FF:FF:00:00:00 D-Link Unknown 0  
00:13:60:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:13:7F:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:13:80:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:13:C4:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:20:00:00:00:00/FF:FF:FF:00:00:00 LexmarkInt Unknown 0  
00:20:A6:00:00:00/FF:FF:FF:00:00:00 Proxim Unknown 0  
00:20:D8:00:00:00/FF:FF:FF:00:00:00 Nortel Unknown 0  
00:20:E0:00:00:00/FF:FF:FF:00:00:00 Actiontec Unknown 0  
00:30:1A:00:00:00/FF:FF:FF:00:00:00 Smartbridge Unknown 0  
00:30:65:00:00:00/FF:FF:FF:00:00:00 Apple Unknown 0  
00:30:6E:00:00:00/FF:FF:FF:00:00:00 HP Unknown 0  
00:30:AB:00:00:00/FF:FF:FF:00:00:00 Netgear Unknown 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 WLAN 11 0.0.0.0  
00:30:BD:00:00:00/FF:FF:FF:00:00:00 Belkin Unknown belkin54g 11 0.0.0.0  
00:30:F1:00:00:00/FF:FF:FF:00:00:00 AcctonTech Unknown 0  
00:40:01:00:00:00/FF:FF:FF:00:00:00 Zyxel Unknown 0  
00:40:05:00:00:00/FF:FF:FF:00:00:00 ANI Unknown default 6 192.168.0.1  
00:40:26:00:00:00/FF:FF:FF:00:00:00 Buffalo Unknown 0  
00:40:33:00:00:00/FF:FF:FF:00:00:00 Addtron Unknown 0  
00:40:36:00:00:00/FF:FF:FF:00:00:00 TribeCompu Unknown 0  
00:40:96:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown tsunami 6  
00:50:08:00:00:00/FF:FF:FF:00:00:00 Compaq Unknown 0  
00:50:18:00:00:00/FF:FF:FF:00:00:00 Amit Unknown 0  
00:50:DA:00:00:00/FF:FF:FF:00:00:00 3Com Unknown 0  
00:50:F2:00:00:00/FF:FF:FF:00:00:00 Microsoft Unknown MSHOME 6 192.168.2.1  
00:50:FC:00:00:00/FF:FF:FF:00:00:00 Edimax Unknown 0  
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: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:48:00:00:00/FF:FF:FF:00:00:00 Compex Unknown 0  
00:80:C6:00:00:00/FF:FF:FF:00:00:00 SOHOware Unknown  
00:80:C8:00:00:00/FF:FF:FF:00:00:00 D-Link Unknown default 6 192.168.0.1  
00:90:0E:00:00:00/FF:FF:FF:00:00:00 Handlink Unknown 0  
00:90:4C:00:00:00/FF:FF:FF:00:00:00 Netgear/Epigram Unknown NETGEAR 11 192.168.0.1  
00:90:96:00:00:00/FF:FF:FF:00:00:00 Askey Unknown 0  
00:90:D1:00:00:00/FF:FF:FF:00:00:00 SMC Unknown WLAN 11  
00:A0:04:00:00:00/FF:FF:FF:00:00:00 3Com Unknown  
00:A0:C5:00:00:00/FF:FF:FF:00:00:00 Zyxel Unknown 0  
00:A0:F8:00:00:00/FF:FF:FF:00:00:00 Symbol Unknown  
00:B0:64:00:00:00/FF:FF:FF:00:00:00 Cisco Unknown 0  
00:C0:02:00:00:00/FF:FF:FF:00:00:00 Sercomm Unknown 0  
00:C0:49:00:00:00/FF:FF:FF:00:00:00 USRobotics Unknown 0  
00:D0:59:00:00:00/FF:FF:FF:00:00:00 AmbitMicro Unknown 0  
00:E0:00:00:00:00/FF:FF:FF:00:00:00 Fujitsu Unknown 0  
00:E0:29:00:00:00/FF:FF:FF:00:00:00 OEM Unknown  
00:E0:63:00:00:00/FF:FF:FF:00:00:00 Cabletron Unknown 0  
00:E0:98:00:00:00/FF:FF:FF:00:00:00 Trend Unknown 0  
00:E0:B8:00:00:00/FF:FF:FF:00:00:00 Gateway2000 Unknown 0  
08:00:46:00:00:00/FF:FF:FF:00:00:00 Sony Unknown  
00:14:BF:00:00:00/FF:FF:FF:00:00:00 linksys Unknown 0  
00:14:6C:00:00:00/FF:FF:FF:00:00:00 NETGEAR Unknown 0  
00:16:B6:00:00:00/FF:FF:FF:00:00:00 linksys Unknown linksys 6 192.168.1.1  
02:12:F0:00:00:00/FF:FF:FF:00:00:00 hpsetup Unknown 0  
02:13:CE:00:00:00/FF:FF:FF:00:00:00 hpsetup Unknown 0  
00:15:E9:00:00:00/FF:FF:FF:00:00:00 dlink Unknown 0  
00:17:9A:00:00:00/FF:FF:FF:00:00:00 dlink Unknown 0  
00:13:F7:00:00:00/FF:FF:FF:00:00:00 SMC Unknown 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  
alert=MSFBCOMSSID,10/min,1/sec  
alert=LONGSSID,10/min,1/sec  
alert=MSFDLINKRATE,10/min,1/sec  
alert=MSFNETGEARBEACON,10/min,1/sec  
alert=DISCONCODEINVALID,10/min,1/sec  
alert=DEAUTHCODEINVALID,10/min,1/sec  
 
# 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  
 
 
# 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  
 
 
# 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  
 
diff --git a/configure b/configure  
index 6936a47..9a85269 100755  
--- a/configure  
+++ b/configure  
@@ -6980,9 +6980,6 @@ else  
fi  
 
 
-# Add additional cflags since some distros bury panel.h  
-CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"  
-  
termcontrol="none";  
 
if test "$wantclient" = "yes"; then  
 
# #
# Copyright (C) 2006-2009 OpenWrt.org # Copyright (C) 2006-2009 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
   
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
   
PKG_NAME:=madwifi PKG_NAME:=madwifi
   
PKG_REV:=3314 PKG_REV:=3314
PKG_VERSION:=r$(PKG_REV) PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=6 PKG_RELEASE:=6
   
PKG_SOURCE_PROTO:=svn PKG_SOURCE_PROTO:=svn
PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION)
PKG_SOURCE_URL:=http://madwifi-project.org/svn/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk) PKG_SOURCE_URL:=http://madwifi-project.org/svn/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
PKG_MIRROR_MD5SUM:=086b026d1c1561be8a949b79b0931404 PKG_MIRROR_MD5SUM:=086b026d1c1561be8a949b79b0931404
   
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION)
   
HAL_VERSION:=20090508 HAL_VERSION:=20090508
HAL_FILE:=ath_hal-$(HAL_VERSION).tgz HAL_FILE:=ath_hal-$(HAL_VERSION).tgz
HAL_MD5SUM:=4ab7ae8bdb96c0be388c98bf8f92d5ca HAL_MD5SUM:=4ab7ae8bdb96c0be388c98bf8f92d5ca
   
PKG_BUILD_DEPENDS:=wprobe PKG_BUILD_DEPENDS:=wprobe
   
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
   
ifdef CONFIG_MADWIFI_COMPRESSION ifdef CONFIG_MADWIFI_COMPRESSION
COMPRESSION:=1 COMPRESSION:=1
else else
COMPRESSION:=0 COMPRESSION:=0
endif endif
   
define Download/hal define Download/hal
FILE:=$(HAL_FILE) FILE:=$(HAL_FILE)
URL:=http://mirror2.openwrt.org/sources URL:=http://mirror2.openwrt.org/sources
MD5SUM:=$(HAL_MD5SUM) MD5SUM:=$(HAL_MD5SUM)
endef endef
$(eval $(call Download,hal)) $(eval $(call Download,hal))
   
   
ifneq ($(CONFIG_TARGET_atheros),) ifneq ($(CONFIG_TARGET_atheros),)
BUS:=AHB BUS:=AHB
else else
ifneq ($(CONFIG_PCI_SUPPORT),) ifneq ($(CONFIG_PCI_SUPPORT),)
BUS:=PCI BUS:=PCI
endif endif
endif endif
   
ifneq ($(CONFIG_CPU_MIPS32_R2),) ifneq ($(CONFIG_CPU_MIPS32_R2),)
ifeq ($(ARCH),mips) ifeq ($(ARCH),mips)
HAL_TARGET:=mips32r2-be-elf HAL_TARGET:=mips32r2-be-elf
endif endif
ifeq ($(ARCH),mipsel) ifeq ($(ARCH),mipsel)
HAL_TARGET:=mips32r2-le-elf HAL_TARGET:=mips32r2-le-elf
endif endif
else else
ifeq ($(ARCH),mips) ifeq ($(ARCH),mips)
HAL_TARGET:=mips32-be-elf HAL_TARGET:=mips32-be-elf
endif endif
ifeq ($(ARCH),mipsel) ifeq ($(ARCH),mipsel)
HAL_TARGET:=mips32-le-elf HAL_TARGET:=mips32-le-elf
endif endif
endif endif
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
HAL_TARGET:=i386-elf HAL_TARGET:=i386-elf
endif endif
ifeq ($(ARCH),i686) ifeq ($(ARCH),i686)
HAL_TARGET:=i386-elf HAL_TARGET:=i386-elf
endif endif
ifeq ($(ARCH),armeb) ifeq ($(ARCH),armeb)
HAL_TARGET:=xscale-be-elfgnueabi HAL_TARGET:=xscale-be-elfgnueabi
endif endif
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
HAL_TARGET:=xscale-le-elfgnueabi HAL_TARGET:=xscale-le-elfgnueabi
ifeq ($(BOARD),cns21xx) ifeq ($(BOARD),cns21xx)
HAL_TARGET:=armv4-le-elfgnueabi HAL_TARGET:=armv4-le-elfgnueabi
endif endif
ifeq ($(BOARD),cns3xxx) ifeq ($(BOARD),cns3xxx)
HAL_TARGET:=arm11-le-elfgnueabi HAL_TARGET:=arm11-le-elfgnueabi
endif endif
ifeq ($(BOARD),gemini) ifeq ($(BOARD),gemini)
HAL_TARGET:=armv4-le-elfgnueabi HAL_TARGET:=armv4-le-elfgnueabi
endif endif
endif endif
ifeq ($(ARCH),powerpc) ifeq ($(ARCH),powerpc)
HAL_TARGET:=powerpc-be-elf HAL_TARGET:=powerpc-be-elf
endif endif
ifneq ($(CONFIG_TARGET_atheros),) ifneq ($(CONFIG_TARGET_atheros),)
HAL_TARGET:=wisoc HAL_TARGET:=wisoc
endif endif
   
ifdef CONFIG_MADWIFI_RCA_MINSTREL ifdef CONFIG_MADWIFI_RCA_MINSTREL
RATE_CONTROL:=minstrel RATE_CONTROL:=minstrel
endif endif
   
ifdef CONFIG_MADWIFI_RCA_ONOE ifdef CONFIG_MADWIFI_RCA_ONOE
RATE_CONTROL:=onoe RATE_CONTROL:=onoe
endif endif
   
ifdef CONFIG_MADWIFI_RCA_AMRR ifdef CONFIG_MADWIFI_RCA_AMRR
RATE_CONTROL:=amrr RATE_CONTROL:=amrr
endif endif
   
ifdef CONFIG_MADWIFI_RCA_SAMPLERATE ifdef CONFIG_MADWIFI_RCA_SAMPLERATE
RATE_CONTROL:=sample RATE_CONTROL:=sample
endif endif
   
ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),) ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),)
MADWIFI_FILES:= $(PKG_BUILD_DIR)/ath_hal/ath_hal.ko MADWIFI_FILES:= $(PKG_BUILD_DIR)/ath_hal/ath_hal.ko
else else
MADWIFI_FILES:= \ MADWIFI_FILES:= \
$(PKG_BUILD_DIR)/net80211/wlan.ko \ $(PKG_BUILD_DIR)/net80211/wlan.ko \
$(PKG_BUILD_DIR)/net80211/wlan_scan_ap.ko \ $(PKG_BUILD_DIR)/net80211/wlan_scan_ap.ko \
$(PKG_BUILD_DIR)/net80211/wlan_scan_sta.ko \ $(PKG_BUILD_DIR)/net80211/wlan_scan_sta.ko \
$(PKG_BUILD_DIR)/ath_hal/ath_hal.ko \ $(PKG_BUILD_DIR)/ath_hal/ath_hal.ko \
$(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).ko \ $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).ko \
$(PKG_BUILD_DIR)/net80211/wlan_acl.ko \ $(PKG_BUILD_DIR)/net80211/wlan_acl.ko \
$(PKG_BUILD_DIR)/net80211/wlan_ccmp.ko \ $(PKG_BUILD_DIR)/net80211/wlan_ccmp.ko \
$(PKG_BUILD_DIR)/net80211/wlan_tkip.ko \ $(PKG_BUILD_DIR)/net80211/wlan_tkip.ko \
$(PKG_BUILD_DIR)/net80211/wlan_wep.ko \ $(PKG_BUILD_DIR)/net80211/wlan_wep.ko \
$(PKG_BUILD_DIR)/net80211/wlan_xauth.ko $(PKG_BUILD_DIR)/net80211/wlan_xauth.ko
endif endif
   
ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),) ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),)
MADWIFI_AUTOLOAD:= ath_hal MADWIFI_AUTOLOAD:= ath_hal
else else
MADWIFI_AUTOLOAD:= \ MADWIFI_AUTOLOAD:= \
wlan \ wlan \
wlan_scan_ap \ wlan_scan_ap \
wlan_scan_sta \ wlan_scan_sta \
ath_hal \ ath_hal \
ath_rate_$(RATE_CONTROL) \ ath_rate_$(RATE_CONTROL) \
wlan_acl \ wlan_acl \
wlan_ccmp \ wlan_ccmp \
wlan_tkip \ wlan_tkip \
wlan_wep \ wlan_wep \
wlan_xauth wlan_xauth
endif endif
   
ifeq ($(findstring AHB,$(BUS)),AHB) ifeq ($(findstring AHB,$(BUS)),AHB)
MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.ko MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.ko
MADWIFI_AUTOLOAD+= ath_ahb MADWIFI_AUTOLOAD+= ath_ahb
endif endif
ifeq ($(findstring PCI,$(BUS)),PCI) ifeq ($(findstring PCI,$(BUS)),PCI)
MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.ko MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.ko
MADWIFI_AUTOLOAD+= ath_pci MADWIFI_AUTOLOAD+= ath_pci
endif endif
   
MADWIFI_APPLETS:=80211stats athchans athkey athstats wlanconfig ath_info madwifi_multi MADWIFI_APPLETS:=80211stats athchans athkey athstats wlanconfig ath_info madwifi_multi
ifdef CONFIG_MADWIFI_DEBUG ifdef CONFIG_MADWIFI_DEBUG
MADWIFI_APPLETS += athdebug 80211debug MADWIFI_APPLETS += athdebug 80211debug
endif endif
   
define KernelPackage/madwifi define KernelPackage/madwifi
SUBMENU:=Wireless Drivers SUBMENU:=Wireless Drivers
TITLE:=Driver for Atheros wireless chipsets TITLE:=Driver for Atheros wireless chipsets
URL:=http://madwifi-project.org/ URL:=http://madwifi-project.org/
DEPENDS:=+wireless-tools @PCI_SUPPORT @(!(TARGET_avr32||TARGET_brcm63xx||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) +@DRIVER_WEXT_SUPPORT +hostapd-common-old DEPENDS:=+wireless-tools @PCI_SUPPORT @(!(TARGET_avr32||TARGET_brcm63xx||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) +@DRIVER_WEXT_SUPPORT +hostapd-common-old @BROKEN
FILES:=$(MADWIFI_FILES) FILES:=$(MADWIFI_FILES)
AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD)) AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
MENU:=1 MENU:=1
endef endef
   
define KernelPackage/madwifi/description define KernelPackage/madwifi/description
This package contains a driver for Atheros 802.11a/b/g chipsets. This package contains a driver for Atheros 802.11a/b/g chipsets.
endef endef
   
define KernelPackage/madwifi/config define KernelPackage/madwifi/config
source "$(SOURCE)/Config.in" source "$(SOURCE)/Config.in"
endef endef
   
MADWIFI_INC = \ MADWIFI_INC = \
-I$(PKG_BUILD_DIR) \ -I$(PKG_BUILD_DIR) \
-I$(PKG_BUILD_DIR)/include \ -I$(PKG_BUILD_DIR)/include \
-I$(PKG_BUILD_DIR)/hal \ -I$(PKG_BUILD_DIR)/hal \
-I$(PKG_BUILD_DIR)/ath \ -I$(PKG_BUILD_DIR)/ath \
-I$(PKG_BUILD_DIR)/ath_hal \ -I$(PKG_BUILD_DIR)/ath_hal \
-I$(PKG_BUILD_DIR)/net80211 \ -I$(PKG_BUILD_DIR)/net80211 \
-I$(STAGING_DIR)/usr/include/wprobe \ -I$(STAGING_DIR)/usr/include/wprobe \
-include $(PKG_BUILD_DIR)/include/compat.h -include $(PKG_BUILD_DIR)/include/compat.h
   
MAKE_ARGS:= \ MAKE_ARGS:= \
PATH="$(TARGET_PATH)" \ PATH="$(TARGET_PATH)" \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
ARCH-y="$(LINUX_KARCH)" \ ARCH-y="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
TARGET="$(HAL_TARGET)" \ TARGET="$(HAL_TARGET)" \
TOOLPREFIX="$(KERNEL_CROSS)" \ TOOLPREFIX="$(KERNEL_CROSS)" \
TOOLPATH="$(KERNEL_CROSS)" \ TOOLPATH="$(KERNEL_CROSS)" \
KERNELPATH="$(LINUX_DIR)" \ KERNELPATH="$(LINUX_DIR)" \
KERNELRELEASE="$(LINUX_VERSION)" \ KERNELRELEASE="$(LINUX_VERSION)" \
LDOPTS="--no-warn-mismatch " \ LDOPTS="--no-warn-mismatch " \
ATH_RATE="$(RATE_CONTROL)" \ ATH_RATE="$(RATE_CONTROL)" \
ATH_CAP_SUPERG_COMP="$(COMPRESSION)" \ ATH_CAP_SUPERG_COMP="$(COMPRESSION)" \
DO_MULTI=1 \ DO_MULTI=1 \
SINGLE_MODULE=$(if $(CONFIG_MADWIFI_SINGLE_MODULE),1) \ SINGLE_MODULE=$(if $(CONFIG_MADWIFI_SINGLE_MODULE),1) \
INCS="$(MADWIFI_INC)" \ INCS="$(MADWIFI_INC)" \
$(if $(CONFIG_MADWIFI_DEBUG),,DEBUG=) WARNINGS="-Wno-unused" $(if $(CONFIG_MADWIFI_DEBUG),,DEBUG=) WARNINGS="-Wno-unused"
   
MAKE_VARS:= \ MAKE_VARS:= \
COPTS="-DATH_REVERSE_ENGINEERING=1" \ COPTS="-DATH_REVERSE_ENGINEERING=1" \
   
define Build/Prepare/HAL define Build/Prepare/HAL
rm -rf $(PKG_BUILD_DIR)/tmp rm -rf $(PKG_BUILD_DIR)/tmp
mkdir -p $(PKG_BUILD_DIR)/tmp mkdir -p $(PKG_BUILD_DIR)/tmp
tar xvzf $(DL_DIR)/$(HAL_FILE) -C $(PKG_BUILD_DIR)/tmp tar xvzf $(DL_DIR)/$(HAL_FILE) -C $(PKG_BUILD_DIR)/tmp
$(CP) $(PKG_BUILD_DIR)/tmp/ath_hal*/* $(PKG_BUILD_DIR)/hal/ $(CP) $(PKG_BUILD_DIR)/tmp/ath_hal*/* $(PKG_BUILD_DIR)/hal/
rm -rf $(PKG_BUILD_DIR)/tmp rm -rf $(PKG_BUILD_DIR)/tmp
endef endef
   
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
$(call Build/Prepare/HAL) $(call Build/Prepare/HAL)
# patch cflags # patch cflags
$(SED) 's, -E[LB],,' \ $(SED) 's, -E[LB],,' \
-e 's, -mips2,,' \ -e 's, -mips2,,' \
-e 's, -mapcs-32,,' \ -e 's, -mapcs-32,,' \
-e 's, -mlong-calls,,' \ -e 's, -mlong-calls,,' \
$(PKG_BUILD_DIR)/hal/public/*.inc $(PKG_BUILD_DIR)/hal/public/*.inc
$(SED) 's,march=armv4,march=armv5te,' \ $(SED) 's,march=armv4,march=armv5te,' \
$(PKG_BUILD_DIR)/hal/public/xscale*.inc $(PKG_BUILD_DIR)/hal/public/xscale*.inc
$(SED) 's,march=armv6j,march=armv6k,' \ $(SED) 's,march=armv6j,march=armv6k,' \
$(PKG_BUILD_DIR)/hal/public/arm11*.inc $(PKG_BUILD_DIR)/hal/public/arm11*.inc
$(SED) 's,mtune=arm1136j-s,mtune=mpcore,' \ $(SED) 's,mtune=arm1136j-s,mtune=mpcore,' \
$(PKG_BUILD_DIR)/hal/public/arm11*.inc $(PKG_BUILD_DIR)/hal/public/arm11*.inc
endef endef
   
ifeq ($(findstring AHB,$(BUS)),AHB) ifeq ($(findstring AHB,$(BUS)),AHB)
define Build/Compile/ahb define Build/Compile/ahb
$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="AHB" modules $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="AHB" modules
$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) CFLAGS="$(TARGET_CFLAGS)" tools $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) CFLAGS="$(TARGET_CFLAGS)" tools
endef endef
endif endif
   
ifeq ($(findstring PCI,$(BUS)),PCI) ifeq ($(findstring PCI,$(BUS)),PCI)
define Build/Compile/pci define Build/Compile/pci
$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="PCI" modules $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="PCI" modules
$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) CFLAGS="$(TARGET_CFLAGS)" tools $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) CFLAGS="$(TARGET_CFLAGS)" tools
endef endef
endif endif
   
define Build/Configure define Build/Configure
$(SED) 's,-E[LB] ,,g' $(PKG_BUILD_DIR)/hal/public/*.inc $(SED) 's,-E[LB] ,,g' $(PKG_BUILD_DIR)/hal/public/*.inc
endef endef
   
define Build/Compile define Build/Compile
$(call Build/Compile/ahb) $(call Build/Compile/ahb)
$(call Build/Compile/pci) $(call Build/Compile/pci)
endef endef
   
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/include/madwifi mkdir -p $(1)/usr/include/madwifi
$(CP) $(PKG_BUILD_DIR)/include $(1)/usr/include/madwifi/ $(CP) $(PKG_BUILD_DIR)/include $(1)/usr/include/madwifi/
mkdir -p $(1)/usr/include/madwifi/net80211 mkdir -p $(1)/usr/include/madwifi/net80211
$(CP) $(PKG_BUILD_DIR)/net80211/*.h $(1)/usr/include/madwifi/net80211/ $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(1)/usr/include/madwifi/net80211/
endef endef
   
define KernelPackage/madwifi/install define KernelPackage/madwifi/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) ./files/* $(1)/ $(CP) ./files/* $(1)/
$(CP) $(foreach applet,$(MADWIFI_APPLETS),$(PKG_BUILD_DIR)/tools/$(applet)) $(1)/usr/sbin/ $(CP) $(foreach applet,$(MADWIFI_APPLETS),$(PKG_BUILD_DIR)/tools/$(applet)) $(1)/usr/sbin/
endef endef
   
$(eval $(call KernelPackage,madwifi)) $(eval $(call KernelPackage,madwifi))
   
file:a/net/mtr/Makefile (deleted)
#  
# Copyright (C) 2006-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=mtr  
PKG_VERSION:=0.82  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr  
PKG_MD5SUM:=10601ea543fda3e51545c4bce195b64c  
 
PKG_INSTALL:=1  
 
PKG_FIXUP:=autoreconf  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/mtr  
SECTION:=net  
CATEGORY:=Network  
DEPENDS:=+libncurses  
TITLE:=Full screen ncurses traceroute tool  
URL:=http://www.bitwizard.nl/mtr/  
endef  
 
define Package/mtr/description  
mtr combines the functionality of the 'traceroute' and 'ping' programs  
in a single network diagnostic tool.  
As mtr starts, it investigates the network connection between the host  
mtr runs on and a user-specified destination host. After it  
determines the address of each network hop between the machines,  
it sends a sequence ICMP ECHO requests to each one to determine the  
quality of the link to each machine. As it does this, it prints  
running statistics about each machine.  
endef  
 
CONFIGURE_ARGS += \  
--without-gtk \  
 
#CONFIGURE_VARS += \  
# ac_cv_lib_resolv_res_mkquery=no \  
 
define Build/Configure  
(cd $(PKG_BUILD_DIR); touch \  
configure.in \  
aclocal.m4 \  
Makefile.in \  
img/Makefile.in \  
stamp-h.in \  
config.h.in \  
configure \  
);  
$(call Build/Configure/Default)  
endef  
 
define Package/mtr/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(1)/usr/sbin/  
endef  
 
$(eval $(call BuildPackage,mtr))  
 
--- a/dns.c  
+++ b/dns.c  
@@ -880,6 +880,507 @@ void restell(char *s)  
fputs("\r",stderr);  
}  
 
+#ifdef __UCLIBC__  
+  
+static const char digits[] = "0123456789";  
+#define __set_errno(e) (errno = (e))  
+  
+#define NS_PUT16(s, cp) do { \  
+ register u_int16_t t_s = (u_int16_t)(s); \  
+ register u_char *t_cp = (u_char *)(cp); \  
+ *t_cp++ = t_s >> 8; \  
+ *t_cp = t_s; \  
+ (cp) += NS_INT16SZ; \  
+} while (0)  
+  
+  
+  
+#define NS_PUT32(l, cp) do { \  
+ register u_int32_t t_l = (u_int32_t)(l); \  
+ register u_char *t_cp = (u_char *)(cp); \  
+ *t_cp++ = t_l >> 24; \  
+ *t_cp++ = t_l >> 16; \  
+ *t_cp++ = t_l >> 8; \  
+ *t_cp = t_l; \  
+ (cp) += NS_INT32SZ; \  
+} while (0)  
+  
+  
+void  
+ns_put16(u_int src, u_char *dst) {  
+ NS_PUT16(src, dst);  
+}  
+  
+void  
+ns_put32(u_long src, u_char *dst) {  
+ NS_PUT32(src, dst);  
+}  
+  
+void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }  
+void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); }  
+  
+int  
+mklower(int ch) {  
+ if (ch >= 0x41 && ch <= 0x5A)  
+ return (ch + 0x20);  
+ return (ch);  
+}  
+  
+  
+static int  
+dn_find(const u_char *domain, const u_char *msg,  
+ const u_char * const *dnptrs,  
+ const u_char * const *lastdnptr)  
+{  
+ const u_char *dn, *cp, *sp;  
+ const u_char * const *cpp;  
+ u_int n;  
+  
+ for (cpp = dnptrs; cpp < lastdnptr; cpp++) {  
+ sp = *cpp;  
+ /*  
+ * terminate search on:  
+ * root label  
+ * compression pointer  
+ * unusable offset  
+ */  
+ while (*sp != 0 && (*sp & NS_CMPRSFLGS) == 0 &&  
+ (sp - msg) < 0x4000) {  
+ dn = domain;  
+ cp = sp;  
+ while ((n = *cp++) != 0) {  
+ /*  
+ * check for indirection  
+ */  
+ switch (n & NS_CMPRSFLGS) {  
+ case 0: /* normal case, n == len */  
+ if (n != *dn++)  
+ goto next;  
+ for ((void)NULL; n > 0; n--)  
+ if (mklower(*dn++) !=  
+ mklower(*cp++))  
+ goto next;  
+ /* Is next root for both ? */  
+ if (*dn == '\0' && *cp == '\0')  
+ return (sp - msg);  
+ if (*dn)  
+ continue;  
+ goto next;  
+  
+ case NS_CMPRSFLGS: /* indirection */  
+ cp = msg + (((n & 0x3f) << 8) | *cp);  
+ break;  
+  
+ default: /* illegal type */  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ }  
+ next:  
+ sp += *sp + 1;  
+ }  
+ }  
+ __set_errno (ENOENT);  
+ return (-1);  
+}  
+  
+  
+int  
+ns_name_pack(const u_char *src, u_char *dst, int dstsiz,  
+ const u_char **dnptrs, const u_char **lastdnptr)  
+{  
+ u_char *dstp;  
+ const u_char **cpp, **lpp, *eob, *msg;  
+ const u_char *srcp;  
+ int n, l, first = 1;  
+  
+ srcp = src;  
+ dstp = dst;  
+ eob = dstp + dstsiz;  
+ lpp = cpp = NULL;  
+ if (dnptrs != NULL) {  
+ if ((msg = *dnptrs++) != NULL) {  
+ for (cpp = dnptrs; *cpp != NULL; cpp++)  
+ (void)NULL;  
+ lpp = cpp; /* end of list to search */  
+ }  
+ } else  
+ msg = NULL;  
+  
+ /* make sure the domain we are about to add is legal */  
+ l = 0;  
+ do {  
+ n = *srcp;  
+ if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ if (n == 0x41)  
+ n = *++srcp / 8;  
+ l += n + 1;  
+ if (l > MAXCDNAME) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ srcp += n + 1;  
+ } while (n != 0);  
+  
+ /* from here on we need to reset compression pointer array on error */  
+ srcp = src;  
+ do {  
+ /* Look to see if we can use pointers. */  
+ n = *srcp;  
+ if (n != 0 && n != 0x41 && msg != NULL) {  
+ l = dn_find(srcp, msg, (const u_char * const *)dnptrs,  
+ (const u_char * const *)lpp);  
+ if (l >= 0) {  
+ if (dstp + 1 >= eob) {  
+ goto cleanup;  
+ }  
+ *dstp++ = (l >> 8) | NS_CMPRSFLGS;  
+ *dstp++ = l % 256;  
+ return (dstp - dst);  
+ }  
+ /* Not found, save it. */  
+ if (lastdnptr != NULL && cpp < lastdnptr - 1 &&  
+ (dstp - msg) < 0x4000 && first) {  
+ *cpp++ = dstp;  
+ *cpp = NULL;  
+ first = 0;  
+ }  
+ }  
+ /* copy label to buffer */  
+ if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) { /* Should not happen. */  
+ goto cleanup;  
+ }  
+ if (n == 0x41) {  
+ n = *++srcp / 8;  
+ if (dstp + 1 >= eob)  
+ goto cleanup;  
+ *dstp++ = 0x41;  
+ }  
+ if (dstp + 1 + n >= eob) {  
+ goto cleanup;  
+ }  
+ memcpy(dstp, srcp, n + 1);  
+ srcp += n + 1;  
+ dstp += n + 1;  
+ } while (n != 0);  
+  
+ if (dstp > eob) {  
+cleanup:  
+ if (msg != NULL)  
+ *lpp = NULL;  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ return (dstp - dst);  
+}  
+  
+  
+int  
+ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {  
+ u_char *label, *bp, *eom;  
+ int c, n, escaped;  
+ char *cp;  
+  
+ escaped = 0;  
+ bp = dst;  
+ eom = dst + dstsiz;  
+ label = bp++;  
+  
+ while ((c = *src++) != 0) {  
+ if (escaped) {  
+ if ((cp = strchr(digits, c)) != NULL) {  
+ n = (cp - digits) * 100;  
+ if ((c = *src++) == 0 ||  
+ (cp = strchr(digits, c)) == NULL) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ n += (cp - digits) * 10;  
+ if ((c = *src++) == 0 ||  
+ (cp = strchr(digits, c)) == NULL) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ n += (cp - digits);  
+ if (n > 255) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ c = n;  
+ } else if (c == '[' && label == bp - 1 && *src == 'x') {  
+ /* Theoretically we would have to handle \[o  
+ as well but we do not since we do not need  
+ it internally. */  
+ *label = 0x41;  
+ label = bp++;  
+ ++src;  
+ while (isxdigit (*src)) {  
+ n = *src > '9' ? *src - 'a' + 10 : *src - '0';  
+ ++src;  
+ if (! isxdigit(*src)) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ n <<= 4;  
+ n += *src > '9' ? *src - 'a' + 10 : *src - '0';  
+ if (bp + 1 >= eom) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ *bp++ = n;  
+ ++src;  
+ }  
+ *label = (bp - label - 1) * 8;  
+ if (*src++ != ']' || *src++ != '.') {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ escaped = 0;  
+ label = bp++;  
+ if (bp >= eom) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ continue;  
+ }  
+ escaped = 0;  
+ } else if (c == '\\') {  
+ escaped = 1;  
+ continue;  
+ } else if (c == '.') {  
+ c = (bp - label - 1);  
+ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ if (label >= eom) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ *label = c;  
+ /* Fully qualified ? */  
+ if (*src == '\0') {  
+ if (c != 0) {  
+ if (bp >= eom) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ *bp++ = '\0';  
+ }  
+ if ((bp - dst) > MAXCDNAME) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ return (1);  
+ }  
+ if (c == 0 || *src == '.') {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ label = bp++;  
+ continue;  
+ }  
+ if (bp >= eom) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ *bp++ = (u_char)c;  
+ }  
+ c = (bp - label - 1);  
+ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ if (label >= eom) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ *label = c;  
+ if (c != 0) {  
+ if (bp >= eom) {  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ *bp++ = 0;  
+ }  
+ if ((bp - dst) > MAXCDNAME) { /* src too big */  
+ __set_errno (EMSGSIZE);  
+ return (-1);  
+ }  
+ return (0);  
+}  
+  
+  
+  
+int  
+ns_name_compress(const char *src, u_char *dst, size_t dstsiz,  
+ const u_char **dnptrs, const u_char **lastdnptr)  
+{  
+ u_char tmp[NS_MAXCDNAME];  
+  
+ if (ns_name_pton(src, tmp, sizeof tmp) == -1)  
+ return (-1);  
+ return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr));  
+}  
+  
+  
+int  
+dn_comp(const char *src, u_char *dst, int dstsiz,  
+ u_char **dnptrs, u_char **lastdnptr)  
+{  
+ return (ns_name_compress(src, dst, (size_t)dstsiz,  
+ (const u_char **)dnptrs,  
+ (const u_char **)lastdnptr));  
+}  
+  
+  
+  
+  
+int  
+res_nmkquery(res_state statp,  
+ int op, /* opcode of query */  
+ const char *dname, /* domain name */  
+ int class, int type, /* class and type of query */  
+ const u_char *data, /* resource record data */  
+ int datalen, /* length of data */  
+ const u_char *newrr_in, /* new rr for modify or append */  
+ u_char *buf, /* buffer to put query */  
+ int buflen) /* size of buffer */  
+{  
+ register HEADER *hp;  
+ register u_char *cp;  
+ register int n;  
+ u_char *dnptrs[20], **dpp, **lastdnptr;  
+  
+#ifdef DEBUG  
+ if (statp->options & RES_DEBUG)  
+ printf(";; res_nmkquery(%s, %s, %s, %s)\n",  
+ _res_opcodes[op], dname, p_class(class), p_type(type));  
+#endif  
+ /*  
+ * Initialize header fields.  
+ */  
+ if ((buf == NULL) || (buflen < HFIXEDSZ))  
+ return (-1);  
+ memset(buf, 0, HFIXEDSZ);  
+ hp = (HEADER *) buf;  
+ /* We randomize the IDs every time. The old code just  
+ incremented by one after the initial randomization which  
+ still predictable if the application does multiple  
+ requests. */  
+#if 0  
+ hp->id = htons(++statp->id);  
+#else  
+ hp->id = htons(statp->id);  
+ int randombits;  
+ do  
+ {  
+#ifdef RANDOM_BITS  
+ RANDOM_BITS (randombits);  
+#else  
+ struct timeval tv;  
+ gettimeofday (&tv, NULL);  
+ randombits = (tv.tv_sec << 8) ^ tv.tv_usec;  
+#endif  
+ }  
+ while ((randombits & 0xffff) == 0);  
+ statp->id = (statp->id + randombits) & 0xffff;  
+#endif  
+ hp->opcode = op;  
+ hp->rd = (statp->options & RES_RECURSE) != 0;  
+ hp->rcode = NOERROR;  
+ cp = buf + HFIXEDSZ;  
+ buflen -= HFIXEDSZ;  
+ dpp = dnptrs;  
+ *dpp++ = buf;  
+ *dpp++ = NULL;  
+ lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];  
+ /*  
+ * perform opcode specific processing  
+ */  
+ switch (op) {  
+ case QUERY: /*FALLTHROUGH*/  
+ case NS_NOTIFY_OP:  
+ if ((buflen -= QFIXEDSZ) < 0)  
+ return (-1);  
+ if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)  
+ return (-1);  
+ cp += n;  
+ buflen -= n;  
+ __putshort(type, cp);  
+ cp += INT16SZ;  
+ __putshort(class, cp);  
+ cp += INT16SZ;  
+ hp->qdcount = htons(1);  
+ if (op == QUERY || data == NULL)  
+ break;  
+ /*  
+ * Make an additional record for completion domain.  
+ */  
+ buflen -= RRFIXEDSZ;  
+ n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);  
+ if (n < 0)  
+ return (-1);  
+ cp += n;  
+ buflen -= n;  
+ __putshort(T_NULL, cp);  
+ cp += INT16SZ;  
+ __putshort(class, cp);  
+ cp += INT16SZ;  
+ __putlong(0, cp);  
+ cp += INT32SZ;  
+ __putshort(0, cp);  
+ cp += INT16SZ;  
+ hp->arcount = htons(1);  
+ break;  
+  
+ case IQUERY:  
+ /*  
+ * Initialize answer section  
+ */  
+ if (buflen < 1 + RRFIXEDSZ + datalen)  
+ return (-1);  
+ *cp++ = '\0'; /* no domain name */  
+ __putshort(type, cp);  
+ cp += INT16SZ;  
+ __putshort(class, cp);  
+ cp += INT16SZ;  
+ __putlong(0, cp);  
+ cp += INT32SZ;  
+ __putshort(datalen, cp);  
+ cp += INT16SZ;  
+ if (datalen) {  
+ memcpy(cp, data, datalen);  
+ cp += datalen;  
+ }  
+ hp->ancount = htons(1);  
+ break;  
+  
+ default:  
+ return (-1);  
+ }  
+ return (cp - buf);  
+}  
+  
+int  
+res_mkquery(int op, /* opcode of query */  
+ const char *dname, /* domain name */  
+ int class, int type, /* class and type of query */  
+ const u_char *data, /* resource record data */  
+ int datalen, /* length of data */  
+ const u_char *newrr_in, /* new rr for modify or append */  
+ u_char *buf, /* buffer to put query */  
+ int buflen) /* size of buffer */  
+{  
+ return (res_nmkquery(&_res, op, dname, class, type,  
+ data, datalen,  
+ newrr_in, buf, buflen));  
+}  
+  
+#endif  
 
void dorequest(char *s,int type,word id)  
{  
 
--- a/dns.c  
+++ b/dns.c  
@@ -1267,28 +1267,6 @@ res_nmkquery(res_state statp,  
return (-1);  
memset(buf, 0, HFIXEDSZ);  
hp = (HEADER *) buf;  
- /* We randomize the IDs every time. The old code just  
- incremented by one after the initial randomization which  
- still predictable if the application does multiple  
- requests. */  
-#if 0  
- hp->id = htons(++statp->id);  
-#else  
- hp->id = htons(statp->id);  
- int randombits;  
- do  
- {  
-#ifdef RANDOM_BITS  
- RANDOM_BITS (randombits);  
-#else  
- struct timeval tv;  
- gettimeofday (&tv, NULL);  
- randombits = (tv.tv_sec << 8) ^ tv.tv_usec;  
-#endif  
- }  
- while ((randombits & 0xffff) == 0);  
- statp->id = (statp->id + randombits) & 0xffff;  
-#endif  
hp->opcode = op;  
hp->rd = (statp->options & RES_RECURSE) != 0;  
hp->rcode = NOERROR;  
 
--- a/configure.in  
+++ b/configure.in  
@@ -72,10 +72,10 @@ AC_CHECK_FUNC(gethostbyname, ,  
AC_CHECK_FUNCS(seteuid)  
# AC_CHECK_FUNC(setuid, , AC_MSG_ERROR (I Need either seteuid or setuid))  
 
-AC_CHECK_FUNC(res_mkquery, ,  
- AC_CHECK_LIB(bind, res_mkquery, ,  
- AC_CHECK_LIB(resolv, res_mkquery, ,  
- AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))  
+#AC_CHECK_FUNC(res_mkquery, ,  
+# AC_CHECK_LIB(bind, res_mkquery, ,  
+# AC_CHECK_LIB(resolv, res_mkquery, ,  
+# AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))  
# This next line would override the just detected-or-not -lresolv.  
# This apparently hurts BSD. And it's bad practise. So it should go.  
# However, it probably didn't get added for nothing..... Holler if  
 
--- a/configure.in  
+++ b/configure.in  
@@ -48,16 +48,16 @@ AC_ARG_ENABLE(ipv6,  
[ --disable-ipv6 Do not enable IPv6],  
WANTS_IPV6=$enableval, WANTS_IPV6=yes)  
 
-if test "x$WANTS_GTK" = "xyes"; then  
- AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"  
- LIBS="$LIBS $GTK_LIBS -lm",  
- AC_MSG_WARN(Building without GTK2 display support)  
- AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])  
- GTK_OBJ="")  
-else  
+#if test "x$WANTS_GTK" = "xyes"; then  
+# AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"  
+# LIBS="$LIBS $GTK_LIBS -lm",  
+# AC_MSG_WARN(Building without GTK2 display support)  
+# AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])  
+# GTK_OBJ="")  
+#else  
AC_DEFINE(NO_GTK)  
GTK_OBJ=""  
-fi  
+#fi  
 
AC_CHECK_FUNC(socket, ,  
AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))  
 
file:a/net/netcat/Makefile (deleted)
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=netcat  
PKG_VERSION:=0.7.1  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=@SF/$(PKG_NAME)  
PKG_MD5SUM:=0a29eff1736ddb5effd0b1ec1f6fe0ef  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/netcat  
SECTION:=net  
CATEGORY:=Network  
TITLE:=A feature-rich network debugging and exploration tool.  
URL:=http://netcat.sourceforge.net/  
endef  
 
define Package/netcat/description  
Netcat is a featured networking utility which reads and writes data across network connections, using the TCP/IP protocol.  
It is designed to be a reliable "back-end" tool that can be used directly or easily driven by other programs and scripts. At the same time, it is a feature-rich network debugging and exploration tool, since it can create almost any kind of connection you would need and has several interesting built-in capabilities.  
endef  
 
define Build/Configure  
$(call Build/Configure/Default, \  
--disable-rpath \  
--with-included-getopt \  
)  
endef  
 
define Package/netcat/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/netcat \  
$(1)/usr/bin  
endef  
 
define Package/netcat/postinst  
#!/bin/sh  
if [ -e $${IPKG_INSTROOT}/usr/bin/nc ]; then  
rm -rf $${IPKG_INSTROOT}/usr/bin/nc;  
fi  
ln -s ./netcat $${IPKG_INSTROOT}/usr/bin/nc  
endef  
 
define Package/netcat/postrm  
#!/bin/sh  
rm $${IPKG_INSTROOT}/usr/bin/nc  
ln -s ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/nc  
$${IPKG_INSTROOT}/usr/bin/nc 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/nc  
exit 0  
endef  
 
 
$(eval $(call BuildPackage,netcat))  
 
Index: netcat-0.7.1/src/flagset.c  
===================================================================  
--- netcat-0.7.1.orig/src/flagset.c 2009-02-06 19:56:01.000000000 +0100  
+++ netcat-0.7.1/src/flagset.c 2009-02-06 19:56:13.000000000 +0100  
@@ -134,7 +134,7 @@  
 
int netcat_flag_count(void)  
{  
- register char c;  
+ register unsigned char c;  
register int i;  
int ret = 0;  
 
@@ -154,7 +154,7 @@  
Assumed that the bit number 1 is the sign, and that we will shift the  
bit 1 (or the bit that takes its place later) until the the most right,  
WHY it has to keep the wrong sign? */  
- ret -= (c >> 7);  
+ ret += (c >> 7);  
c <<= 1;  
}  
}  
 
file:a/net/pen/Makefile (deleted)
#  
# Copyright (C) 2006 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=pen  
PKG_VERSION:=0.18.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=ftp://siag.nu/pub/pen/  
PKG_MD5SUM:=96f6d39e7e7cca11a647e795550f3829  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/pen  
SECTION:=net  
CATEGORY:=Network  
DEPENDS:=+libopenssl  
TITLE:=Simple tcp load balancer  
URL:=http://siag.nu/pen/  
endef  
 
define Package/pen/description  
This is pen, a load balancer for "simple" tcp based protocols  
such as http or smtp. It allows several servers to appear as  
one to the outside and automatically detects servers that are  
down and distributes clients among the available servers.  
This gives high availability and scalable performance.  
endef  
 
define Build/Configure  
$(call Build/Configure/Default, \  
--with-poll \  
--with-experimental-only-ssl="$(STAGING_DIR)/usr" \  
)  
endef  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR)  
endef  
 
define Package/pen/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/mergelogs $(1)/usr/bin/  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/pen $(1)/usr/bin/  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/penctl $(1)/usr/bin/  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/penctl.cgi $(1)/usr/bin/  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/penlog $(1)/usr/bin/  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/penlogd $(1)/usr/bin/  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/penstats $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,pen))  
 
file:a/net/privoxy/Makefile (deleted)
#  
# Copyright (C) 2006-2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=privoxy  
PKG_VERSION:=3.0.21  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz  
PKG_SOURCE_URL:=@SF/ijbswa  
PKG_MD5SUM:=79558f2545cfcf9731f7de611646d837  
 
PKG_LICENSE:=GPLv2  
PKG_LICENSE_FILES:=LICENSE  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable  
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/privoxy  
SECTION:=net  
CATEGORY:=Network  
SUBMENU:=Web Servers/Proxies  
DEPENDS:=+libpcre +libpthread +zlib  
TITLE:=web proxy with advanced filtering capabilities  
URL:=http://www.privoxy.org/  
endef  
 
define Package/privoxy/description  
Privoxy is a web proxy with advanced filtering capabilities for  
protecting privacy, modifying web page content, managing cookies,  
controlling access, and removing ads, banners, pop-ups and other  
obnoxious Internet junk. Privoxy has a very flexible configuration  
and can be customized to suit individual needs and tastes. Privoxy  
has application for both stand-alone systems and multi-user networks.  
endef  
 
CONFIGURE_ARGS += \  
--sysconfdir=/etc/privoxy \  
 
MAKE_FLAGS :=  
 
define Package/privoxy/conffiles  
/etc/privoxy/config  
endef  
 
define Package/privoxy/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/privoxy $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/etc/privoxy  
$(CP) $(PKG_INSTALL_DIR)/etc/privoxy/* $(1)/etc/privoxy/  
$(INSTALL_CONF) ./files/privoxy.config $(1)/etc/privoxy/config  
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/privoxy.init $(1)/etc/init.d/privoxy  
endef  
 
$(eval $(call BuildPackage,privoxy))  
 
confdir /etc/privoxy  
logdir /var/log  
filterfile default.filter  
logfile privoxy  
actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on.  
actionsfile default.action # Main actions file  
#actionsfile user.action # User customizations  
listen-address 127.0.0.1:8118  
toggle 1  
enable-remote-toggle 1  
enable-remote-http-toggle 0  
enable-edit-actions 1  
enforce-blocks 0  
buffer-limit 4096  
forwarded-connect-retries 0  
accept-intercepted-requests 0  
allow-cgi-request-crunching 0  
split-large-forms 0  
keep-alive-timeout 300  
socket-timeout 300  
permit-access 192.168.1.0/24  
debug 1 # show each GET/POST/CONNECT request  
debug 4096 # Startup banner and warnings  
debug 8192 # Errors - *we highly recommended enabling this*  
#admin-address privoxy-admin@example.com  
#proxy-info-url http://www.example.com/proxy-service.html  
 
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2006-2011 OpenWrt.org  
 
START=80  
STOP=80  
 
SERVICE_USE_PID=1  
 
start() {  
service_start /usr/sbin/privoxy --pidfile /var/run/privoxy.pid \  
/etc/privoxy/config  
}  
 
stop() {  
service_stop /usr/sbin/privoxy  
}  
 
file:a/net/ser2net/Makefile (deleted)
#  
# Copyright (C) 2006-2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=ser2net  
PKG_VERSION:=2.9.1  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/ser2net  
PKG_MD5SUM:=80011ac0e60bbdcb65f1d7a86251e3f3  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/ser2net  
SECTION:=net  
CATEGORY:=Network  
TITLE:=Serial port TCP/IP redirector  
URL:=http://sourceforge.net/projects/ser2net/  
endef  
 
define Package/ser2net/description  
This is ser2net, a program for allowing network connections to serial ports.  
See the man page for information about using the program. Note that ser2net  
supports RFC 2217 (remote control of serial port parameters), but you must  
have a complient client.  
endef  
 
define Package/ser2net/conffiles  
/etc/ser2net.conf  
endef  
 
# uses GNU configure  
 
define Package/ser2net/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ser2net $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/etc  
$(INSTALL_CONF) $(PKG_BUILD_DIR)/ser2net.conf $(1)/etc/  
endef  
 
$(eval $(call BuildPackage,ser2net))  
 
file:a/net/smcroute/Makefile (deleted)
#  
# Copyright (C) 2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=smcroute  
PKG_VERSION:=0.92  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz  
PKG_SOURCE_URL:=http://www.cschill.de/smcroute  
PKG_MD5SUM:=2b50e7166606ec90e09682399e69c4a6  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/smcroute  
SECTION:=net  
CATEGORY:=Network  
SUBMENU:=Routing and Redirection  
TITLE:=Static multicast routing daemon  
URL:=http://www.cschill.de/smcroute/  
endef  
 
define Package/smcroute/description  
SMCRoute is a command line tool to manipulate the multicast routes of the Linux kernel.  
endef  
 
 
ifeq ($(HOST_OS),FreeBSD)  
TARGET_CFLAGS += -fno-builtin-log  
TARGET_LDFLAGS += -fno-builtin-log  
endif  
 
define Build/Compile  
$(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" -C $(PKG_BUILD_DIR)/src all  
endef  
 
define Package/smcroute/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_DIR) $(1)/etc/init.d/  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/smcroute $(1)/usr/sbin/  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mcsender $(1)/usr/bin/  
$(INSTALL_BIN) ./files/smcroute.init $(1)/etc/init.d/smcroute  
endef  
 
$(eval $(call BuildPackage,smcroute))  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2006-2010 OpenWrt.org  
START=50  
 
start() {  
smcroute -d  
}  
 
stop() {  
smcroute -k  
}  
 
--- a/src/ipc.c 2002-07-07 19:38:49.000000000 +0200  
+++ b/src/ipc.c 2010-10-01 21:44:26.000000000 +0200  
@@ -24,7 +24,7 @@  
 
#include "mclab.h"  
 
-#define SOCKET_PATH "/var/lib/smcroute"  
+#define SOCKET_PATH "/tmp/smcroute"  
 
// server's listen socket  
static int ListenSock;  
 
--- a/src/Makefile  
+++ b/src/Makefile  
@@ -1,9 +1,6 @@  
 
BINDIR=../bin  
 
-# CFLAGS=-g  
-CFLAGS=-O  
-  
default : build.h smcroute  
 
all : smcroute mcsender  
 
file:a/net/snort/Makefile (deleted)
 
# Copyright (C) 2006-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=snort  
PKG_VERSION:=2.9.2.2  
PKG_RELEASE:=3  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://snort.org/dl/snort-current/  
PKG_MD5SUM:=4254389550e3be31afebc70e64e6002f  
 
PKG_BUILD_DEPENDS:=librpc  
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)  
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/snort/Default  
SUBMENU:=Firewall  
SECTION:=net  
CATEGORY:=Network  
DEPENDS:=+libpcap +libpcre +libdnet +libdaq +libpthread +libuuid +zlib  
TITLE:=Lightweight Network Intrusion Detection System  
URL:=http://www.snort.org/  
endef  
 
define Package/snort/Default/description  
Snort is an open source network intrusion detection and prevention system.  
It is capable of performing real-time traffic analysis, alerting, blocking  
and packet logging on IP networks. It utilizes a combination of protocol  
analysis and pattern matching in order to detect anomalies, misuse and  
attacks.  
endef  
 
define Package/snort  
$(call Package/snort/Default)  
VARIANT:=basic  
endef  
 
define Package/snort/description  
$(call Package/snort/Default/description)  
endef  
 
define Package/snort-mysql  
$(call Package/snort/Default)  
DEPENDS+= +libmysqlclient  
TITLE+= (MySQL)  
VARIANT:=mysql  
endef  
 
define Package/snort-mysql/description  
$(call Package/snort/Default/description)  
This package contains snort with support for logging to a MySQL database.  
endef  
 
define Package/snort-pgsql  
$(call Package/snort/Default)  
DEPENDS+= +libpq +libuuid  
TITLE+= (PostgreSQL)  
VARIANT:=pgsql  
endef  
 
define Package/snort-pgsql/description  
$(call Package/snort/Default/description)  
This package contains snort with support for logging to a PostgreSQL database.  
endef  
 
 
CONFIGURE_ARGS += \  
--prefix="/usr" \  
--enable-flexresp \  
--with-dnet-includes="$(STAGING_DIR)/usr/include" \  
--with-dnet-libraries="$(STAGING_DIR)/usr/lib" \  
--with-libpcap-includes="$(STAGING_DIR)/usr/include" \  
--with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \  
--with-libpcre-includes="$(STAGING_DIR)/usr/include" \  
--with-libpcre-libraries="$(STAGING_DIR)/usr/lib" \  
--with-daq-includes="$(STAGING_DIR)/usr/include" \  
--with-daq-libraries="$(STAGING_DIR)/usr/lib" \  
--disable-static-daq  
 
CONFIGURE_VARS += \  
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/mysql" \  
LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/mysql" \  
PATH="$(STAGING_DIR)/usr/lib/libnet-1.0.x/bin:$$$$PATH" \  
 
MAKE_FLAGS += \  
extra_incl="" \  
 
ifeq ($(BUILD_VARIANT),basic)  
 
CONFIGURE_ARGS += \  
--without-mysql \  
--without-postgresql \  
 
endif  
ifeq ($(BUILD_VARIANT),mysql)  
CONFIGURE_VARS += \  
mysql_has_reconnect=yes  
 
CONFIGURE_ARGS += \  
--with-mysql="$(STAGING_DIR)/usr" \  
--without-postgresql \  
 
endif  
ifeq ($(BUILD_VARIANT),pgsql)  
 
CONFIGURE_ARGS += \  
--without-mysql \  
--with-postgresql="$(STAGING_DIR)/usr" \  
 
endif  
 
define Build/InstallDev  
$(INSTALL_DIR) $(STAGING_DIR)/usr/include/snort/dynamic_preproc  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/include/snort/dynamic_preproc/* \  
$(STAGING_DIR)/usr/include/snort/dynamic_preproc/  
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/snort/dynamic_preproc  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/snort/dynamic_preproc/* \  
$(STAGING_DIR)/usr/lib/snort/dynamic_preproc/  
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/snort_dynamicengine  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/snort_dynamicengine/* \  
$(STAGING_DIR)/usr/lib/snort_dynamicengine/  
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/snort_dynamicpreprocessor  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/snort_dynamicpreprocessor/* \  
$(STAGING_DIR)/usr/lib/snort_dynamicpreprocessor/  
endef  
 
define Package/snort/conffiles  
/etc/default/snort  
/etc/snort/snort.conf  
/etc/snort/threshold.conf  
endef  
 
define Package/snort/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/snort $(1)/usr/bin/snort.bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/u2{boat,spewfoo} $(1)/usr/bin  
$(INSTALL_BIN) ./files/snort.bin $(1)/usr/bin/snort  
$(INSTALL_DIR) $(1)/usr/lib/snort_dynamicengine  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/snort_dynamicengine/libsf_engine.so* $(1)/usr/lib/snort_dynamicengine/  
$(INSTALL_DIR) $(1)/usr/lib/snort_dynamicpreprocessor  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/snort_dynamicpreprocessor/libsf*.so* $(1)/usr/lib/snort_dynamicpreprocessor/  
$(INSTALL_DIR) $(1)/etc/snort  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/snort.conf $(1)/etc/snort/  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/attribute_table.dtd $(1)/etc/snort/  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/classification.config $(1)/etc/snort/  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/gen-msg.map $(1)/etc/snort/  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/reference.config $(1)/etc/snort/  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/threshold.conf $(1)/etc/snort/  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/unicode.map $(1)/etc/snort/  
$(INSTALL_DIR) $(1)/etc/snort/preproc_rules  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/preproc_rules/*.rules $(1)/etc/snort/preproc_rules/  
$(INSTALL_DIR) $(1)/etc/snort/rules  
$(INSTALL_DATA) ./files/snort.local.rules $(1)/etc/snort/rules/local.rules  
$(INSTALL_DIR) $(1)/etc/default  
$(INSTALL_DATA) ./files/snort.default $(1)/etc/default/snort  
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/snort.init $(1)/etc/init.d/snort  
endef  
 
Package/snort-mysql/conffiles = $(Package/snort/conffiles)  
Package/snort-mysql/install = $(Package/snort/install)  
 
Package/snort-pgsql/conffiles = $(Package/snort/conffiles)  
Package/snort-pgsql/install = $(Package/snort/install)  
 
$(eval $(call BuildPackage,snort))  
$(eval $(call BuildPackage,snort-mysql))  
$(eval $(call BuildPackage,snort-pgsql))  
 
#!/bin/sh  
 
exec snort.bin --daq-dir /usr/lib/daq/ $*  
 
INTERFACE="lo"  
OPTIONS="-i $INTERFACE -c /etc/snort/snort.conf -D -N -q -s"  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2012 OpenWrt.org  
 
START=99  
APP=snort.bin  
BIN_FILE="/usr/bin/"$APP  
PID_FILE="/var/run/"$APP"_"$INTERFACE".pid"  
OPTIONS="--daq-dir /usr/lib/daq/"  
DEFAULT=/etc/default/snort  
LOG_D=/var/log/snort  
 
start() {  
[ -d $LOG_D ] || mkdir -p $LOG_D  
start-stop-daemon -S -x $APP -p $PID_FILE -b -m -- $OPTIONS  
}  
 
stop() {  
start-stop-daemon -K -x $APP -p $PID_FILE -s TERM  
rm -rf $PID_FILE  
}  
 
# ----------------  
# LOCAL RULES  
# ----------------  
# This file intentionally does not come with signatures. Put your local  
# additions here.  
 
--- /dev/null  
+++ b/acinclude.m4  
@@ -0,0 +1 @@  
+sinclude(m4/libprelude.m4)  
 
--- a/configure.in  
+++ b/configure.in  
@@ -283,21 +283,22 @@ AC_CHECK_TYPES([int8_t,int16_t,int32_t,i  
AC_CHECK_TYPES([boolean])  
 
# In case INADDR_NONE is not defined (like on Solaris)  
-have_inaddr_none="no"  
-AC_MSG_CHECKING([for INADDR_NONE])  
-AC_RUN_IFELSE(  
-[AC_LANG_PROGRAM(  
-[[  
-#include <sys/types.h>  
-#include <netinet/in.h>  
-#include <arpa/inet.h>  
-]],  
-[[  
- if (inet_addr("10,5,2") == INADDR_NONE);  
- return 0;  
-]])],  
-[have_inaddr_none="yes"],  
-[have_inaddr_none="no"])  
+have_inaddr_none="yes"  
+#AC_MSG_CHECKING([for INADDR_NONE])  
+#AC_RUN_IFELSE(  
+#[AC_LANG_PROGRAM(  
+#[[  
+##include <sys/types.h>  
+##include <netinet/in.h>  
+##include <arpa/inet.h>  
+#]],  
+#[[  
+# if (inet_addr("10,5,2") == INADDR_NONE);  
+# return 0;  
+#]])],  
+#[have_inaddr_none="yes"],  
+#[have_inaddr_none="yes"])  
+  
AC_MSG_RESULT($have_inaddr_none)  
if test "x$have_inaddr_none" = "xno"; then  
AC_DEFINE([INADDR_NONE],[-1],[For INADDR_NONE definition])  
 
--- a/configure.in  
+++ b/configure.in  
@@ -401,16 +401,18 @@ if test "x$LPCAP" = "xno"; then  
fi  
 
AC_MSG_CHECKING([for pcap_lex_destroy])  
-AC_RUN_IFELSE(  
-[AC_LANG_PROGRAM(  
-[[  
-#include <pcap.h>  
-]],  
-[[  
- pcap_lex_destroy();  
-]])],  
-[have_pcap_lex_destroy="yes"],  
-[have_pcap_lex_destroy="no"])  
+have_pcap_lex_destroy="yes"  
+#AC_RUN_IFELSE(  
+#[AC_LANG_PROGRAM(  
+#[[  
+##include <pcap.h>  
+#]],  
+#[[  
+# pcap_lex_destroy();  
+#]])],  
+#[have_pcap_lex_destroy="yes"],  
+#[have_pcap_lex_destroy="no"])  
+  
AC_MSG_RESULT($have_pcap_lex_destroy)  
if test "x$have_pcap_lex_destroy" = "xyes"; then  
AC_DEFINE([HAVE_PCAP_LEX_DESTROY],[1],[Can cleanup lex buffer stack created by pcap bpf filter])  
 
--- a/etc/snort.conf  
+++ b/etc/snort.conf  
@@ -20,6 +20,13 @@  
# test mode -T you are required to supply an interface -i <interface>  
# or test mode will fail to fully validate the configuration and  
# exit with a FATAL error  
+#!  
+#! OpenWrt:  
+#! Some options in this config were changed to adapt snort for OpenWrt. Any changes  
+#! made to the original default configuration will start with '#! ' so you can track  
+#! the changes.  
+#!  
+#! Most preprocessors and rules were disabled to save memory.  
#--------------------------------------------------  
 
###################################################  
@@ -42,10 +49,12 @@  
###################################################  
 
# Setup the network addresses you are protecting  
-ipvar HOME_NET any  
+#! ipvar HOME_NET any  
+ipvar HOME_NET 192.168.1.0/24  
 
# Set up the external network addresses. Leave as "any" in most situations  
-ipvar EXTERNAL_NET any  
+#! ipvar EXTERNAL_NET any  
+ipvar EXTERNAL_NET !$HOME_NET  
 
# List of DNS servers on your network  
ipvar DNS_SERVERS $HOME_NET  
@@ -101,17 +110,23 @@ ipvar AIM_SERVERS [64.12.24.0/23,64.12.2  
# Path to your rules files (this can be a relative path)  
# Note for Windows users: You are advised to make this an absolute path,  
# such as: c:\snort\rules  
-var RULE_PATH ../rules  
-var SO_RULE_PATH ../so_rules  
-var PREPROC_RULE_PATH ../preproc_rules  
+#! Those paths are relative to this snort.conf file.  
+#! var RULE_PATH ../rules  
+#! var SO_RULE_PATH ../so_rules  
+#! var PREPROC_RULE_PATH ../preproc_rules  
+var RULE_PATH ./rules  
+var SO_RULE_PATH ./so_rules  
+var PREPROC_RULE_PATH ./preproc_rules  
 
# If you are using reputation preprocessor set these  
# Currently there is a bug with relative paths, they are relative to where snort is  
# not relative to snort.conf like the above variables  
# This is completely inconsistent with how other vars work, BUG 89986  
# Set the absolute path appropriately  
-var WHITE_LIST_PATH ../rules  
-var BLACK_LIST_PATH ../rules  
+#! var WHITE_LIST_PATH ../rules  
+#! var BLACK_LIST_PATH ../rules  
+var WHITE_LIST_PATH ./rules  
+var BLACK_LIST_PATH ./rules  
 
###################################################  
# Step #2: Configure the decoder. For more information, see README.decode  
@@ -244,13 +259,16 @@ config paf_max: 16000  
###################################################  
 
# path to dynamic preprocessor libraries  
-dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/  
+#! dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/  
+dynamicpreprocessor directory /usr/lib/snort_dynamicpreprocessor/  
 
# path to base preprocessor engine  
-dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so  
+#! dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so  
+#! dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so #! disabled for performance reasons  
 
# path to dynamic rules libraries  
-dynamicdetection directory /usr/local/lib/snort_dynamicrules  
+#! dynamicdetection directory /usr/local/lib/snort_dynamicrules  
+#! dynamicdetection directory /usr/lib/snort_dynamicrules #! disabled for performance reasons  
 
###################################################  
# Step #5: Configure preprocessors  
@@ -294,124 +312,128 @@ preprocessor stream5_udp: timeout 180  
# preprocessor perfmonitor: time 300 file /var/snort/snort.stats pktcnt 10000  
 
# HTTP normalization and anomaly detection. For more information, see README.http_inspect  
-preprocessor http_inspect: global iis_unicode_map unicode.map 1252 compress_depth 65535 decompress_depth 65535  
-preprocessor http_inspect_server: server default \  
- http_methods { GET POST PUT SEARCH MKCOL COPY MOVE LOCK UNLOCK NOTIFY POLL BCOPY BDELETE BMOVE LINK UNLINK OPTIONS HEAD DELETE TRACE TRACK CONNECT SOURCE SUBSCRIBE UNSUBSCRIBE PROPFIND PROPPATCH BPROPFIND BPROPPATCH RPC_CONNECT PROXY_SUCCESS BITS_POST CCM_POST SMS_POST RPC_IN_DATA RPC_OUT_DATA RPC_ECHO_DATA } \  
- chunk_length 500000 \  
- server_flow_depth 0 \  
- client_flow_depth 0 \  
- post_depth 65495 \  
- oversize_dir_length 500 \  
- max_header_length 750 \  
- max_headers 100 \  
- max_spaces 0 \  
- small_chunk_length { 10 5 } \  
- ports { 80 81 311 591 593 901 1220 1414 1830 2301 2381 2809 3128 3702 4343 5250 7001 7145 7510 7777 7779 8000 8008 8014 8028 8080 8088 8118 8123 8180 8181 8243 8280 8800 8888 8899 9080 9090 9091 9443 9999 11371 55555 } \  
- non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \  
- enable_cookie \  
- extended_response_inspection \  
- inspect_gzip \  
- normalize_utf \  
- unlimited_decompress \  
- normalize_javascript \  
- apache_whitespace no \  
- ascii no \  
- bare_byte no \  
- directory no \  
- double_decode no \  
- iis_backslash no \  
- iis_delimiter no \  
- iis_unicode no \  
- multi_slash no \  
- utf_8 no \  
- u_encode yes \  
- webroot no  
+#! disabled for performance reasons:  
+#! preprocessor http_inspect: global iis_unicode_map unicode.map 1252 compress_depth 65535 decompress_depth 65535  
+#! preprocessor http_inspect_server: server default \  
+#! http_methods { GET POST PUT SEARCH MKCOL COPY MOVE LOCK UNLOCK NOTIFY POLL BCOPY BDELETE BMOVE LINK UNLINK OPTIONS HEAD DELETE TRACE TRACK CONNECT SOURCE SUBSCRIBE UNSUBSCRIBE PROPFIND PROPPATCH BPROPFIND BPROPPATCH RPC_CONNECT PROXY_SUCCESS BITS_POST CCM_POST SMS_POST RPC_IN_DATA RPC_OUT_DATA RPC_ECHO_DATA } \  
+#! chunk_length 500000 \  
+#! server_flow_depth 0 \  
+#! client_flow_depth 0 \  
+#! post_depth 65495 \  
+#! oversize_dir_length 500 \  
+#! max_header_length 750 \  
+#! max_headers 100 \  
+#! max_spaces 0 \  
+#! small_chunk_length { 10 5 } \  
+#! ports { 80 81 311 591 593 901 1220 1414 1830 2301 2381 2809 3128 3702 4343 5250 7001 7145 7510 7777 7779 8000 8008 8014 8028 8080 8088 8118 8123 8180 8181 8243 8280 8800 8888 8899 9080 9090 9091 9443 9999 11371 55555 } \  
+#! non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \  
+#! enable_cookie \  
+#! extended_response_inspection \  
+#! inspect_gzip \  
+#! normalize_utf \  
+#! unlimited_decompress \  
+#! normalize_javascript \  
+#! apache_whitespace no \  
+#! ascii no \  
+#! bare_byte no \  
+#! directory no \  
+#! double_decode no \  
+#! iis_backslash no \  
+#! iis_delimiter no \  
+#! iis_unicode no \  
+#! multi_slash no \  
+#! utf_8 no \  
+#! u_encode yes \  
+#! webroot no  
 
# ONC-RPC normalization and anomaly detection. For more information, see the Snort Manual, Configuring Snort - Preprocessors - RPC Decode  
-preprocessor rpc_decode: 111 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779 no_alert_multiple_requests no_alert_large_fragments no_alert_incomplete  
+#! disabled for performance reasons:  
+#! preprocessor rpc_decode: 111 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779 no_alert_multiple_requests no_alert_large_fragments no_alert_incomplete  
 
# Back Orifice detection.  
-preprocessor bo  
+#! preprocessor bo #! disabled for performance reasons  
 
# FTP / Telnet normalization and anomaly detection. For more information, see README.ftptelnet  
-preprocessor ftp_telnet: global inspection_type stateful encrypted_traffic no  
-preprocessor ftp_telnet_protocol: telnet \  
- ayt_attack_thresh 20 \  
- normalize ports { 23 } \  
- detect_anomalies  
-preprocessor ftp_telnet_protocol: ftp server default \  
- def_max_param_len 100 \  
- ports { 21 2100 3535 } \  
- telnet_cmds yes \  
- ignore_telnet_erase_cmds yes \  
- ftp_cmds { ABOR ACCT ADAT ALLO APPE AUTH CCC CDUP } \  
- ftp_cmds { CEL CLNT CMD CONF CWD DELE ENC EPRT } \  
- ftp_cmds { EPSV ESTA ESTP FEAT HELP LANG LIST LPRT } \  
- ftp_cmds { LPSV MACB MAIL MDTM MIC MKD MLSD MLST } \  
- ftp_cmds { MODE NLST NOOP OPTS PASS PASV PBSZ PORT } \  
- ftp_cmds { PROT PWD QUIT REIN REST RETR RMD RNFR } \  
- ftp_cmds { RNTO SDUP SITE SIZE SMNT STAT STOR STOU } \  
- ftp_cmds { STRU SYST TEST TYPE USER XCUP XCRC XCWD } \  
- ftp_cmds { XMAS XMD5 XMKD XPWD XRCP XRMD XRSQ XSEM } \  
- ftp_cmds { XSEN XSHA1 XSHA256 } \  
- alt_max_param_len 0 { ABOR CCC CDUP ESTA FEAT LPSV NOOP PASV PWD QUIT REIN STOU SYST XCUP XPWD } \  
- alt_max_param_len 200 { ALLO APPE CMD HELP NLST RETR RNFR STOR STOU XMKD } \  
- alt_max_param_len 256 { CWD RNTO } \  
- alt_max_param_len 400 { PORT } \  
- alt_max_param_len 512 { SIZE } \  
- chk_str_fmt { ACCT ADAT ALLO APPE AUTH CEL CLNT CMD } \  
- chk_str_fmt { CONF CWD DELE ENC EPRT EPSV ESTP HELP } \  
- chk_str_fmt { LANG LIST LPRT MACB MAIL MDTM MIC MKD } \  
- chk_str_fmt { MLSD MLST MODE NLST OPTS PASS PBSZ PORT } \  
- chk_str_fmt { PROT REST RETR RMD RNFR RNTO SDUP SITE } \  
- chk_str_fmt { SIZE SMNT STAT STOR STRU TEST TYPE USER } \  
- chk_str_fmt { XCRC XCWD XMAS XMD5 XMKD XRCP XRMD XRSQ } \  
- chk_str_fmt { XSEM XSEN XSHA1 XSHA256 } \  
- cmd_validity ALLO < int [ char R int ] > \  
- cmd_validity EPSV < [ { char 12 | char A char L char L } ] > \  
- cmd_validity MACB < string > \  
- cmd_validity MDTM < [ date nnnnnnnnnnnnnn[.n[n[n]]] ] string > \  
- cmd_validity MODE < char ASBCZ > \  
- cmd_validity PORT < host_port > \  
- cmd_validity PROT < char CSEP > \  
- cmd_validity STRU < char FRPO [ string ] > \  
- cmd_validity TYPE < { char AE [ char NTC ] | char I | char L [ number ] } >  
-preprocessor ftp_telnet_protocol: ftp client default \  
- max_resp_len 256 \  
- bounce yes \  
- ignore_telnet_erase_cmds yes \  
- telnet_cmds yes  
+#! disabled for performance reasons:  
+#! preprocessor ftp_telnet: global inspection_type stateful encrypted_traffic no check_encrypted  
+#! preprocessor ftp_telnet_protocol: telnet \  
+#! ayt_attack_thresh 20 \  
+#! normalize ports { 23 } \  
+#! detect_anomalies  
+#! preprocessor ftp_telnet_protocol: ftp server default \  
+#! def_max_param_len 100 \  
+#! ports { 21 2100 3535 } \  
+#! telnet_cmds yes \  
+#! ignore_telnet_erase_cmds yes \  
+#! ftp_cmds { ABOR ACCT ADAT ALLO APPE AUTH CCC CDUP } \  
+#! ftp_cmds { CEL CLNT CMD CONF CWD DELE ENC EPRT } \  
+#! ftp_cmds { EPSV ESTA ESTP FEAT HELP LANG LIST LPRT } \  
+#! ftp_cmds { LPSV MACB MAIL MDTM MIC MKD MLSD MLST } \  
+#! ftp_cmds { MODE NLST NOOP OPTS PASS PASV PBSZ PORT } \  
+#! ftp_cmds { PROT PWD QUIT REIN REST RETR RMD RNFR } \  
+#! ftp_cmds { RNTO SDUP SITE SIZE SMNT STAT STOR STOU } \  
+#! ftp_cmds { STRU SYST TEST TYPE USER XCUP XCRC XCWD } \  
+#! ftp_cmds { XMAS XMD5 XMKD XPWD XRCP XRMD XRSQ XSEM } \  
+#! ftp_cmds { XSEN XSHA1 XSHA256 } \  
+#! alt_max_param_len 0 { ABOR CCC CDUP ESTA FEAT LPSV NOOP PASV PWD QUIT REIN STOU SYST XCUP XPWD } \  
+#! alt_max_param_len 200 { ALLO APPE CMD HELP NLST RETR RNFR STOR STOU XMKD } \  
+#! alt_max_param_len 256 { CWD RNTO } \  
+#! alt_max_param_len 400 { PORT } \  
+#! alt_max_param_len 512 { SIZE } \  
+#! chk_str_fmt { ACCT ADAT ALLO APPE AUTH CEL CLNT CMD } \  
+#! chk_str_fmt { CONF CWD DELE ENC EPRT EPSV ESTP HELP } \  
+#! chk_str_fmt { LANG LIST LPRT MACB MAIL MDTM MIC MKD } \  
+#! chk_str_fmt { MLSD MLST MODE NLST OPTS PASS PBSZ PORT } \  
+#! chk_str_fmt { PROT REST RETR RMD RNFR RNTO SDUP SITE } \  
+#! chk_str_fmt { SIZE SMNT STAT STOR STRU TEST TYPE USER } \  
+#! chk_str_fmt { XCRC XCWD XMAS XMD5 XMKD XRCP XRMD XRSQ } \  
+#! chk_str_fmt { XSEM XSEN XSHA1 XSHA256 } \  
+#! cmd_validity ALLO < int [ char R int ] > \  
+#! cmd_validity EPSV < [ { char 12 | char A char L char L } ] > \  
+#! cmd_validity MACB < string > \  
+#! cmd_validity MDTM < [ date nnnnnnnnnnnnnn[.n[n[n]]] ] string > \  
+#! cmd_validity MODE < char ASBCZ > \  
+#! cmd_validity PORT < host_port > \  
+#! cmd_validity PROT < char CSEP > \  
+#! cmd_validity STRU < char FRPO [ string ] > \  
+#! cmd_validity TYPE < { char AE [ char NTC ] | char I | char L [ number ] } >  
+#! preprocessor ftp_telnet_protocol: ftp client default \  
+#! max_resp_len 256 \  
+#! bounce yes \  
+#! ignore_telnet_erase_cmds yes \  
+#! telnet_cmds yes  
 
 
# SMTP normalization and anomaly detection. For more information, see README.SMTP  
-preprocessor smtp: ports { 25 465 587 691 } \  
- inspection_type stateful \  
- b64_decode_depth 0 \  
- qp_decode_depth 0 \  
- bitenc_decode_depth 0 \  
- uu_decode_depth 0 \  
- log_mailfrom \  
- log_rcptto \  
- log_filename \  
- log_email_hdrs \  
- normalize cmds \  
- normalize_cmds { ATRN AUTH BDAT CHUNKING DATA DEBUG EHLO EMAL ESAM ESND ESOM ETRN EVFY } \  
- normalize_cmds { EXPN HELO HELP IDENT MAIL NOOP ONEX QUEU QUIT RCPT RSET SAML SEND SOML } \  
- normalize_cmds { STARTTLS TICK TIME TURN TURNME VERB VRFY X-ADAT X-DRCP X-ERCP X-EXCH50 } \  
- normalize_cmds { X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \  
- max_command_line_len 512 \  
- max_header_line_len 1000 \  
- max_response_line_len 512 \  
- alt_max_command_line_len 260 { MAIL } \  
- alt_max_command_line_len 300 { RCPT } \  
- alt_max_command_line_len 500 { HELP HELO ETRN EHLO } \  
- alt_max_command_line_len 255 { EXPN VRFY ATRN SIZE BDAT DEBUG EMAL ESAM ESND ESOM EVFY IDENT NOOP RSET } \  
- alt_max_command_line_len 246 { SEND SAML SOML AUTH TURN ETRN DATA RSET QUIT ONEX QUEU STARTTLS TICK TIME TURNME VERB X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \  
- valid_cmds { ATRN AUTH BDAT CHUNKING DATA DEBUG EHLO EMAL ESAM ESND ESOM ETRN EVFY } \  
- valid_cmds { EXPN HELO HELP IDENT MAIL NOOP ONEX QUEU QUIT RCPT RSET SAML SEND SOML } \  
- valid_cmds { STARTTLS TICK TIME TURN TURNME VERB VRFY X-ADAT X-DRCP X-ERCP X-EXCH50 } \  
- valid_cmds { X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \  
- xlink2state { enabled }  
+#! disabled for performance reasons:  
+#! preprocessor smtp: ports { 25 465 587 691 } \  
+#! inspection_type stateful \  
+#! b64_decode_depth 0 \  
+#! qp_decode_depth 0 \  
+#! bitenc_decode_depth 0 \  
+#! uu_decode_depth 0 \  
+#! log_mailfrom \  
+#! log_rcptto \  
+#! log_filename \  
+#! log_email_hdrs \  
+#! normalize cmds \  
+#! normalize_cmds { ATRN AUTH BDAT CHUNKING DATA DEBUG EHLO EMAL ESAM ESND ESOM ETRN EVFY } \  
+#! normalize_cmds { EXPN HELO HELP IDENT MAIL NOOP ONEX QUEU QUIT RCPT RSET SAML SEND SOML } \  
+#! normalize_cmds { STARTTLS TICK TIME TURN TURNME VERB VRFY X-ADAT X-DRCP X-ERCP X-EXCH50 } \  
+#! normalize_cmds { X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \  
+#! max_command_line_len 512 \  
+#! max_header_line_len 1000 \  
+#! max_response_line_len 512 \  
+#! alt_max_command_line_len 260 { MAIL } \  
+#! alt_max_command_line_len 300 { RCPT } \  
+#! alt_max_command_line_len 500 { HELP HELO ETRN EHLO } \  
+#! alt_max_command_line_len 255 { EXPN VRFY ATRN SIZE BDAT DEBUG EMAL ESAM ESND ESOM EVFY IDENT NOOP RSET } \  
+#! alt_max_command_line_len 246 { SEND SAML SOML AUTH TURN ETRN DATA RSET QUIT ONEX QUEU STARTTLS TICK TIME TURNME VERB X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \  
+#! valid_cmds { ATRN AUTH BDAT CHUNKING DATA DEBUG EHLO EMAL ESAM ESND ESOM ETRN EVFY } \  
+#! valid_cmds { EXPN HELO HELP IDENT MAIL NOOP ONEX QUEU QUIT RCPT RSET SAML SEND SOML } \  
+#! valid_cmds { STARTTLS TICK TIME TURN TURNME VERB VRFY X-ADAT X-DRCP X-ERCP X-EXCH50 } \  
+#! valid_cmds { X-EXPS X-LINK2STATE XADR XAUTH XCIR XEXCH50 XGEN XLICENSE XQUE XSTA XTRN XUSR } \  
+#! xlink2state { enabled }  
 
# Portscan detection. For more information, see README.sfportscan  
# preprocessor sfportscan: proto { all } memcap { 10000000 } sense_level { low }  
@@ -430,17 +452,19 @@ preprocessor ssh: server_ports { 22 } \  
enable_srvoverflow enable_protomismatch  
 
# SMB / DCE-RPC normalization and anomaly detection. For more information, see README.dcerpc2  
-preprocessor dcerpc2: memcap 102400, events [co ]  
-preprocessor dcerpc2_server: default, policy WinXP, \  
- detect [smb [139,445], tcp 135, udp 135, rpc-over-http-server 593], \  
- autodetect [tcp 1025:, udp 1025:, rpc-over-http-server 1025:], \  
- smb_max_chain 3, smb_invalid_shares ["C$", "D$", "ADMIN$"]  
+#! disabled for performance reasons:  
+#! preprocessor dcerpc2: memcap 102400, events [co ]  
+#! preprocessor dcerpc2_server: default, policy WinXP, \  
+#! detect [smb [139,445], tcp 135, udp 135, rpc-over-http-server 593], \  
+#! autodetect [tcp 1025:, udp 1025:, rpc-over-http-server 1025:], \  
+#! smb_max_chain 3, smb_invalid_shares ["C$", "D$", "ADMIN$"]  
 
# DNS anomaly detection. For more information, see README.dns  
-preprocessor dns: ports { 53 } enable_rdata_overflow  
+#! preprocessor dns: ports { 53 } enable_rdata_overflow #! disabled for performance reasons  
 
# SSL anomaly detection and traffic bypass. For more information, see README.ssl  
-preprocessor ssl: ports { 443 465 563 636 989 992 993 994 995 7801 7802 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 }, trustservers, noinspect_encrypted  
+#! disabled for performance reasons:  
+#! preprocessor ssl: ports { 443 465 563 636 989 992 993 994 995 7801 7802 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 }, trustservers, noinspect_encrypted  
 
# SDF sensitive data preprocessor. For more information see README.sensitive_data  
preprocessor sensitive_data: alert_threshold 25  
@@ -503,12 +527,13 @@ preprocessor dnp3: ports { 20000 } \  
check_crc  
 
# Reputation preprocessor. For more information see README.reputation  
-preprocessor reputation: \  
- memcap 500, \  
- priority whitelist, \  
- nested_ip inner, \  
- whitelist $WHITE_LIST_PATH/white_list.rules, \  
- blacklist $BLACK_LIST_PATH/black_list.rules  
+#! disabled for performance reasons:  
+#! preprocessor reputation: \  
+#! memcap 500, \  
+#! priority whitelist, \  
+#! nested_ip inner, \  
+#! whitelist $WHITE_LIST_PATH/white_list.rules, \  
+#! blacklist $BLACK_LIST_PATH/black_list.rules  
 
###################################################  
# Step #6: Configure output plugins  
@@ -551,60 +576,71 @@ include reference.config  
# site specific rules  
include $RULE_PATH/local.rules  
 
-include $RULE_PATH/attack-responses.rules  
-include $RULE_PATH/backdoor.rules  
-include $RULE_PATH/bad-traffic.rules  
-include $RULE_PATH/blacklist.rules  
-include $RULE_PATH/botnet-cnc.rules  
-include $RULE_PATH/chat.rules  
-include $RULE_PATH/content-replace.rules  
-include $RULE_PATH/ddos.rules  
-include $RULE_PATH/dns.rules  
-include $RULE_PATH/dos.rules  
-include $RULE_PATH/exploit.rules  
-include $RULE_PATH/file-identify.rules  
-include $RULE_PATH/finger.rules  
-include $RULE_PATH/ftp.rules  
-include $RULE_PATH/icmp.rules  
-include $RULE_PATH/icmp-info.rules  
-include $RULE_PATH/imap.rules  
-include $RULE_PATH/info.rules  
-include $RULE_PATH/misc.rules  
-include $RULE_PATH/multimedia.rules  
-include $RULE_PATH/mysql.rules  
-include $RULE_PATH/netbios.rules  
-include $RULE_PATH/nntp.rules  
-include $RULE_PATH/oracle.rules  
-include $RULE_PATH/other-ids.rules  
-include $RULE_PATH/p2p.rules  
-include $RULE_PATH/phishing-spam.rules  
-include $RULE_PATH/policy.rules  
-include $RULE_PATH/pop2.rules  
-include $RULE_PATH/pop3.rules  
-include $RULE_PATH/rpc.rules  
-include $RULE_PATH/rservices.rules  
-include $RULE_PATH/scada.rules  
-include $RULE_PATH/scan.rules  
-include $RULE_PATH/shellcode.rules  
-include $RULE_PATH/smtp.rules  
-include $RULE_PATH/snmp.rules  
-include $RULE_PATH/specific-threats.rules  
-include $RULE_PATH/spyware-put.rules  
-include $RULE_PATH/sql.rules  
-include $RULE_PATH/telnet.rules  
-include $RULE_PATH/tftp.rules  
-include $RULE_PATH/virus.rules  
-include $RULE_PATH/voip.rules  
-include $RULE_PATH/web-activex.rules  
-include $RULE_PATH/web-attacks.rules  
-include $RULE_PATH/web-cgi.rules  
-include $RULE_PATH/web-client.rules  
-include $RULE_PATH/web-coldfusion.rules  
-include $RULE_PATH/web-frontpage.rules  
-include $RULE_PATH/web-iis.rules  
-include $RULE_PATH/web-misc.rules  
-include $RULE_PATH/web-php.rules  
-include $RULE_PATH/x11.rules  
+#! include $RULE_PATH/attack-responses.rules  
+#! include $RULE_PATH/backdoor.rules  
+#! include $RULE_PATH/bad-traffic.rules  
+#! include $RULE_PATH/blacklist.rules  
+#! include $RULE_PATH/botnet-cnc.rules  
+#! include $RULE_PATH/chat.rules  
+#! include $RULE_PATH/content-replace.rules  
+#! include $RULE_PATH/ddos.rules  
+#! include $RULE_PATH/dns.rules  
+#! include $RULE_PATH/dos.rules  
+#! include $RULE_PATH/exploit.rules  
+#! include $RULE_PATH/file-identify.rules  
+#! include $RULE_PATH/file-office.rules  
+#! include $RULE_PATH/file-other.rules  
+#! include $RULE_PATH/file-pdf.rules  
+#! include $RULE_PATH/finger.rules  
+#! include $RULE_PATH/ftp.rules  
+#! include $RULE_PATH/icmp.rules  
+#! include $RULE_PATH/icmp-info.rules  
+#! include $RULE_PATH/imap.rules  
+#! include $RULE_PATH/indicator-compromise.rules  
+#! include $RULE_PATH/indicator-obfuscation.rules  
+#! include $RULE_PATH/info.rules  
+#! include $RULE_PATH/misc.rules  
+#! include $RULE_PATH/multimedia.rules  
+#! include $RULE_PATH/mysql.rules  
+#! include $RULE_PATH/netbios.rules  
+#! include $RULE_PATH/nntp.rules  
+#! include $RULE_PATH/oracle.rules  
+#! include $RULE_PATH/other-ids.rules  
+#! include $RULE_PATH/p2p.rules  
+#! include $RULE_PATH/phishing-spam.rules  
+#! include $RULE_PATH/policy.rules  
+#! include $RULE_PATH/policy-multimedia.rules  
+#! include $RULE_PATH/policy-other.rules  
+#! include $RULE_PATH/policy-social.rules  
+#! include $RULE_PATH/pop2.rules  
+#! include $RULE_PATH/pop3.rules  
+#! include $RULE_PATH/pua-p2p.rules  
+#! include $RULE_PATH/pua-toolbars.rules  
+#! include $RULE_PATH/rpc.rules  
+#! include $RULE_PATH/rservices.rules  
+#! include $RULE_PATH/scada.rules  
+#! include $RULE_PATH/scan.rules  
+#! include $RULE_PATH/server-mail.rules  
+#! include $RULE_PATH/shellcode.rules  
+#! include $RULE_PATH/smtp.rules  
+#! include $RULE_PATH/snmp.rules  
+#! include $RULE_PATH/specific-threats.rules  
+#! include $RULE_PATH/spyware-put.rules  
+#! include $RULE_PATH/sql.rules  
+#! include $RULE_PATH/telnet.rules  
+#! include $RULE_PATH/tftp.rules  
+#! include $RULE_PATH/virus.rules  
+#! include $RULE_PATH/voip.rules  
+#! include $RULE_PATH/web-activex.rules  
+#! include $RULE_PATH/web-attacks.rules  
+#! include $RULE_PATH/web-cgi.rules  
+#! include $RULE_PATH/web-client.rules  
+#! include $RULE_PATH/web-coldfusion.rules  
+#! include $RULE_PATH/web-frontpage.rules  
+#! include $RULE_PATH/web-iis.rules  
+#! include $RULE_PATH/web-misc.rules  
+#! include $RULE_PATH/web-php.rules  
+#! include $RULE_PATH/x11.rules  
 
###################################################  
# Step #8: Customize your preprocessor and decoder alerts  
 
--- a/configure.in  
+++ b/configure.in  
@@ -1128,63 +1128,6 @@ if test "x$with_mysql" != "xno"; then  
fi  
fi  
 
- AC_MSG_CHECKING([for mysql default client reconnect])  
-  
- AC_RUN_IFELSE(  
- [AC_LANG_PROGRAM(  
- [[  
- #include <mysql.h>  
- ]],  
- [[  
- if (mysql_get_client_version() < 50003)  
- return 1;  
- ]])],  
- [mysql_default_reconnect="no"],  
- [mysql_default_reconnect="yes"])  
-  
- AC_MSG_RESULT($mysql_default_reconnect)  
-  
- if test "x$mysql_default_reconnect" = "xno"; then  
- AC_MSG_CHECKING([for mysql reconnect option])  
-  
- AC_RUN_IFELSE(  
- [AC_LANG_PROGRAM(  
- [[  
- #include <mysql.h>  
- ]],  
- [[  
- if (mysql_get_client_version() < 50013)  
- return 1;  
- ]])],  
- [mysql_has_reconnect="yes"],  
- [mysql_has_reconnect="no"])  
-  
- AC_MSG_RESULT($mysql_has_reconnect)  
-  
- if test "x$mysql_has_reconnect" = "xyes"; then  
- AC_DEFINE([MYSQL_HAS_OPT_RECONNECT],[1],[For MySQL versions 5.0.13 and greater])  
-  
- AC_MSG_CHECKING([for mysql setting of reconnect option before connect bug])  
-  
- AC_RUN_IFELSE(  
- [AC_LANG_PROGRAM(  
- [[  
- #include <mysql.h>  
- ]],  
- [[  
- if (mysql_get_client_version() < 50019)  
- return 1;  
- ]])],  
- [mysql_has_reconnect_bug="no"],  
- [mysql_has_reconnect_bug="yes"])  
-  
- AC_MSG_RESULT($mysql_has_reconnect_bug)  
-  
- if test "x$mysql_has_reconnect_bug" = "xyes"; then  
- AC_DEFINE([MYSQL_HAS_OPT_RECONNECT_BUG],[1],[For MySQL versions 5.0.13 to 5.0.18])  
- fi  
- fi  
- fi  
fi  
 
AC_ARG_WITH(odbc,  
 
diff -ruN snort-2.9.2.2/autojunk.sh snort-2.9.2.2_bkup/autojunk.sh  
--- snort-2.9.2.2/autojunk.sh 1969-12-31 16:00:00.000000000 -0800  
+++ snort-2.9.2.2_bkup/autojunk.sh 2012-04-08 20:34:57.385687022 -0700  
@@ -0,0 +1,7 @@  
+#!/bin/sh  
+# the list of commands that need to run before we do a compile  
+libtoolize --automake --copy  
+aclocal -I m4  
+autoheader  
+automake --add-missing --copy  
+autoconf  
diff -ruN snort-2.9.2.2/etc/snort.conf snort-2.9.2.2_bkup/etc/snort.conf  
--- snort-2.9.2.2/etc/snort.conf 2012-03-19 15:57:09.000000000 -0700  
+++ snort-2.9.2.2_bkup/etc/snort.conf 2012-04-08 20:34:57.385687022 -0700  
@@ -536,11 +536,38 @@  
# prelude  
# output alert_prelude  
 
+###################################################  
+# snortsam  
+###################################################