pthsem: moved to github
pthsem: moved to github

https://github.com/openwrt/packages/commit/9fe2d12df9f2231ea0c44afde377de3f4ac292af

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

git-svn-id: svn://svn.openwrt.org/openwrt/packages@44196 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/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)  
 
 
#  
 
file:a/libs/pthsem/Makefile (deleted)
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=pthsem  
PKG_VERSION:=2.0.8  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.auto.tuwien.ac.at/~mkoegler/pth/  
PKG_MD5SUM:=9144b26dcc27e67498d63dd5456f934c  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)  
PKG_FIXUP:=autoreconf  
PKG_BUILD_PARALLEL:=1  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/pthsem  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=GNU pth extended with semaphore support  
URL:=http://www.auto.tuwien.ac.at/~mkoegler/index.php/pth  
DEPENDS:=@USE_EGLIBC @TARGET_x86  
endef  
 
define Package/pthsem/description  
GNU pth is a user mode multi threading library.  
pthsem is an extend version, with support for semaphores added. It can be installed parallel to a normal pth.  
endef  
 
MAKE_FLAGS += \  
OPTIM="$(TARGET_CFLAGS)" \  
CFLAGS="$(TARGET_CFLAGS)" \  
DESTDIR="$(PKG_INSTALL_DIR)"  
 
define Build/InstallDev  
$(INSTALL_DIR) $(2)/bin  
$(INSTALL_BIN) \  
$(PKG_INSTALL_DIR)/usr/bin/pthsem-config \  
$(2)/bin/  
$(SED) \  
's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \  
$(2)/bin/pthsem-config  
 
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h \  
$(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpthsem.{a,la,so*} \  
$(1)/usr/lib/  
endef  
 
define Package/pthsem/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpthsem.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,pthsem))  
 
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))  
 
#  
# 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}"  
 
# #
# 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/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/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  
+###################################################  
+# In order to cause Snort to send a blocking request to the SnortSam agent,  
+# that agent has to be listed, including the port it listens on,  
+# and the encryption key it is using. The statement for that is:  
+#  
+# output alert_fwsam: {SnortSam Station}:{port}/{password}  
+#  
+# {SnortSam Station}: IP address or host name of the host where SnortSam is running.  
+# {port}: The port the remote SnortSam agent listens on.  
+# {password}: The password, or key, used for encryption of the  
+# communication to the remote agent.  
+#  
+# At the very least, the IP address or host name of the host running SnortSam  
+# needs to be specified. If the port is omitted, it defaults to TCP port 898.  
+# If the password is omitted, it defaults to a preset password.  
+# (In which case it needs to be omitted on the SnortSam agent as well)  
+#  
+# More than one host can be specified, but has to be done on the same line.  
+# Just separate them with one or more spaces.  
+#  
+# Examples:  
+#  
+# output alert_fwsam: firewall/idspassword  
+# output alert_fwsam: fw1.domain.tld:898/mykey  
+# output alert_fwsam: 192.168.0.1/borderfw 192.168.1.254/wanfw  
+  
# metadata reference data. do not modify these lines  
include classification.config  
include reference.config  
 
-  
###################################################  
# Step #7: Customize your rule set  
# For more information, see Snort Manual, Writing Snort Rules  
diff -ruN snort-2.9.2.2/src/fatal.h snort-2.9.2.2_bkup/src/fatal.h  
--- snort-2.9.2.2/src/fatal.h 1969-12-31 16:00:00.000000000 -0800  
+++ snort-2.9.2.2_bkup/src/fatal.h 2012-04-08 20:34:57.385687022 -0700  
@@ -0,0 +1,40 @@  
+/* $Id$ */  
+/*  
+** Copyright (C) 2002-2008 Sourcefire, Inc.  
+** Copyright (C) 1998-2002 Martin Roesch <roesch@sourcefire.com>  
+**  
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License Version 2 as  
+** published by the Free Software Foundation. You may not use, modify or  
+** distribute this program under any other version of the GNU General  
+** Public License.  
+**  
+** This program is distributed in the hope that it will be useful,  
+** but WITHOUT ANY WARRANTY; without even the implied warranty of  
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  
+** GNU General Public License for more details.  
+**  
+** You should have received a copy of the GNU General Public License  
+** along with this program; if not, write to the Free Software  
+** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+*/  
+  
+#ifndef __FATAL_H__  
+#define __FATAL_H__  
+  
+  
+/*  
+ * in debugging mode print out the filename and the line number where the  
+ * failure have occured  
+ */  
+  
+  
+#ifdef DEBUG  
+ #define FATAL(msg) { printf("%s:%d: ", __FILE__, __LINE__); FatalError( (char *) msg); }  
+#else  
+ #define FATAL(msg) FatalError( (char *) msg)  
+#endif  
+  
+  
+  
+#endif /* __FATAL_H__ */  
diff -ruN snort-2.9.2.2/src/Makefile.am snort-2.9.2.2_bkup/src/Makefile.am  
--- snort-2.9.2.2/src/Makefile.am 2011-10-26 11:28:52.000000000 -0700  
+++ snort-2.9.2.2_bkup/src/Makefile.am 2012-04-08 20:34:57.385687022 -0700  
@@ -59,6 +59,7 @@  
rate_filter.c rate_filter.h \  
obfuscation.c obfuscation.h \  
rule_option_types.h \  
+twofish.c twofish.h \  
sfdaq.c sfdaq.h \  
idle_processing.c idle_processing.h idle_processing_funcs.h  
 
diff -ruN snort-2.9.2.2/src/output-plugins/Makefile.am snort-2.9.2.2_bkup/src/output-plugins/Makefile.am  
--- snort-2.9.2.2/src/output-plugins/Makefile.am 2010-06-09 15:05:17.000000000 -0700  
+++ snort-2.9.2.2_bkup/src/output-plugins/Makefile.am 2012-04-08 20:34:57.385687022 -0700  
@@ -15,6 +15,7 @@  
spo_log_tcpdump.h spo_unified.c spo_unified2.c spo_unified.h spo_unified2.h \  
spo_log_ascii.c spo_log_ascii.h spo_alert_sf_socket.h spo_alert_sf_socket.c \  
$(PRELUDE_CODE) spo_alert_arubaaction.c spo_alert_arubaaction.h \  
+spo_alert_fwsam.c spo_alert_fwsam.h \  
spo_alert_test.c spo_alert_test.h  
 
INCLUDES = @INCLUDES@  
diff -ruN snort-2.9.2.2/src/output-plugins/spo_alert_fwsam.c snort-2.9.2.2_bkup/src/output-plugins/spo_alert_fwsam.c  
--- snort-2.9.2.2/src/output-plugins/spo_alert_fwsam.c 1969-12-31 16:00:00.000000000 -0800  
+++ snort-2.9.2.2_bkup/src/output-plugins/spo_alert_fwsam.c 2012-04-08 23:40:57.676343063 -0700  
@@ -0,0 +1,1387 @@  
+/* $id: snortpatchb,v 1.2 2002/10/26 03:32:35 fknobbe Exp $  
+**  
+** spo_alert_fwsam.c  
+**  
+** Copyright (c) 2001-2004 Frank Knobbe <frank@knobbe.us>  
+**  
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by  
+** the Free Software Foundation; either version 2 of the License, or  
+** (at your option) any later version.  
+**  
+** This program is distributed in the hope that it will be useful,  
+** but WITHOUT ANY WARRANTY; without even the implied warranty of  
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  
+** GNU General Public License for more details.  
+**  
+** You should have received a copy of the GNU General Public License  
+** along with this program; if not, write to the Free Software  
+** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+*/  
+  
+/*  
+ * Purpose:  
+ *  
+ * This module sends alerts to a remote service on a host running SnortSam  
+ * (the agent) which will block the intruding IP address on a variety of  
+ * host and network firewalls.  
+ *  
+ * SnortSam also performs checks against a white-list of never-to-be-blocked IP addresses,  
+ * can override block durations (for example for known proxies), and can detect attack conditions  
+ * where too many blocks are received within a defined interval. If an attack is detected  
+ * it will unblock the last x blocks and wait for the attack to end.  
+ *  
+ * See the SnortSam documentation for more information.  
+ *  
+ *  
+ * Output Plugin Parameters:  
+ ***************************  
+ *  
+ * output alert_fwsam: <SnortSam Station>:<port>/<key>  
+ *  
+ * <FW Mgmt Station>: The IP address or host name of the host running SnortSam.  
+ * <port>: The port the remote SnortSam service listens on (default 898).  
+ * <key>: The key used for authentication (encryption really)  
+ * of the communication to the remote service.  
+ *  
+ * Examples:  
+ *  
+ * output alert_fwsam: snortsambox/idspassword  
+ * output alert_fwsam: fw1.domain.tld:898/mykey  
+ * output alert_fwsam: 192.168.0.1/borderfw 192.168.1.254/wanfw  
+ *  
+ *  
+ * Rule Options:  
+ ***************  
+ *  
+ * fwsam: who[how],time;  
+ *  
+ * who: src, source, dst, dest, destination  
+ * IP address to be blocked according to snort rule (some rules  
+ * are reversed, i.e. homenet -> any [and you want to block any]).  
+ * src denotes IP to the left of -> and dst denotes IP to the right  
+ *  
+ * how: Optional. In, out, src, dest, either, both, this, conn, connection  
+ * Tells FW-1 to block packets INcoming from host, OUTgoing to host,  
+ * EITHERway, or only THIS connection (IP/Service pair).  
+ * See 'fw sam' for more information. May be ignored by other plugins.  
+ *  
+ * time: Duration of block in seconds. (Accepts 'days', 'months', 'weeks',  
+ * 'years', 'minutes', 'seconds', 'hours'. Alternatively, a value of  
+ * 0, or the keyword PERManent, INFinite, or ALWAYS, will block the  
+ * host permanently. Be careful with this!  
+ * Tells FW-1 (and others) how long to inhibit packets from the host.  
+ *  
+ * Examples:  
+ *  
+ * fwsam: src[either],15min;  
+ * or dst[in], 2 days 4 hours  
+ * or src, 1 hour  
+ *  
+ * (default: src[either],5min)  
+ *  
+ *  
+ * Effect:  
+ *  
+ * Alerts are sent to the remote SnortSam services on Firewall-1 Management Stations  
+ * or other hosts running SnortSam (as required for Cisco Routers and PIX).  
+ * The remote services will invoke the SAM configuration via the fw sam  
+ * command line, or by sending a packet to the SAM port 18183, or by using the official  
+ * OPSEC API calls, or by telnetting into Cisco routers or PIX firewalls.  
+ * The communication over the network is encrypted using two-fish.  
+ * (Implementation ripped from CryptCat by Farm9 with permission.)  
+ *  
+ * Future Plans:  
+ *  
+ * - Custom alert trigger per rule (x alerts in y secs) --> Seems to exist in Snort 1.9 now.  
+ * - Enable/Allow tagged fwsam: arguments to provide different values to  
+ * different stations. --> Seems to be accomplished with custom rule-types  
+ *  
+ *  
+ * Comments:  
+ *  
+ * It seem that above wishes can be implemented with todays setup. Feedback concerning  
+ * these is greatly appreciated.  
+ *  
+*/  
+  
+  
+#include "spo_alert_fwsam.h"  
+#include "twofish.h"  
+/* external globals from rules.c */  
+extern char *file_name;  
+extern int file_line;  
+extern OptTreeNode *otn_tmp;  
+extern char *snort_conf_dir; /* extern PV pv; */  
+  
+  
+/* my globals */  
+  
+FWsamList *FWsamStationList=NULL; /* Global (for all alert-types) list of snortsam stations */  
+FWsamOptions *FWsamOptionField=NULL;  
+unsigned long FWsamMaxOptions=0;  
+  
+  
+/*  
+ * Function: AlertFWsamSetup()  
+ *  
+ * Purpose: Registers the output plugin keyword and initialization  
+ * function into the output plugin list. This is the function that  
+ * gets called from InitOutputPlugins() in plugbase.c.  
+ * It also registers itself as a plugin in order to parse every rule  
+ * and to set the appropiate flags from fwsam: option.  
+ *  
+ * Arguments: None.  
+ *  
+ * Returns: void function  
+ *  
+*/  
+void AlertFWsamSetup(void)  
+{  
+ /* link the preprocessor keyword to the init function in the preproc list */  
+ RegisterOutputPlugin("alert_fwsam", OUTPUT_TYPE_FLAG__ALERT, AlertFWsamInit);  
+ RegisterRuleOption("fwsam", AlertFWsamOptionInit, NULL, OPT_TYPE_ACTION, NULL);  
+  
+#ifdef FWSAMDEBUG /* This allows debugging of fwsam only */  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWsamSetup) Output plugin is plugged in...\n");  
+#endif  
+}  
+  
+  
+/* This function checks if a given snortsam station is already in  
+ * a given list.  
+*/  
+int FWsamStationExists(FWsamStation *who,FWsamList *list)  
+{  
+ while(list)  
+ {  
+ if(list->station) {  
+// if( who->stationip.s_addr==list->station->stationip.s_addr &&  
+ if(IP_EQUALITY(&who->stationip, &list->station->stationip) &&  
+ who->stationport==list->station->stationport)  
+ return TRUE;  
+ }  
+ list=list->next;  
+ }  
+ return FALSE;  
+}  
+  
+/*  
+ * Function: AlertFWsamInit(char *args)  
+ *  
+ * Purpose: Calls the argument parsing function, performs final setup on data  
+ * structs, links the preproc function into the function list.  
+ *  
+ * Arguments: args => ptr to argument string  
+ *  
+ * Returns: void function  
+ *  
+*/  
+void AlertFWsamInit(char *args)  
+{ char *ap;  
+ unsigned long statip,cnt,again,i;  
+ char *stathost,*statport,*statpass;  
+ FWsamStation *station;  
+ FWsamList *fwsamlist=NULL; /* alert-type dependent list of snortsam stations */  
+ FWsamList *listp,*newlistp;  
+ struct hostent *hoste;  
+ char buf[1024]="";  
+ FILE *fp;  
+ FWsamOptions tempopt;  
+  
+#ifdef FWSAMDEBUG  
+ unsigned long hostcnt=0;  
+  
+  
+  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWsamInit) Output plugin initializing...\n");  
+#endif  
+  
+ /* pv.alert_plugin_active = 1; */  
+  
+ /* parse the argument list from the rules file */  
+  
+ if(args == NULL)  
+ FatalError("ERROR %s (%d) => [Alert_FWsam](AlertFWsamInit) No arguments to alert_fwsam preprocessor!\n", file_name, file_line);  
+  
+ if(!FWsamOptionField && !FWsamMaxOptions)  
+ { strncpy(buf,snort_conf_dir,sizeof(buf)-1);  
+ strncpy(buf+strlen(buf),SID_MAPFILE,sizeof(buf)-strlen(buf)-1);  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWsamSetup) Using file: %s\n",buf);  
+#endif  
+ fp=fopen(buf,"rt");  
+ if(!fp)  
+ { strncpy(buf,snort_conf_dir,sizeof(buf)-1);  
+ strncpy(buf+strlen(buf),SID_ALT_MAPFILE,sizeof(buf)-strlen(buf)-1);  
+ fp=fopen(buf,"rt");  
+ }  
+ if(fp) /* Check for presence of map file and read those in, sorted. */  
+ { LogMessage("INFO => [Alert_FWsam](AlertFWsamSetup) Using sid-map file: %s\n",buf);  
+  
+ while(FWsamReadLine(buf,sizeof(buf),fp))  
+ if(*buf)  
+ FWsamMaxOptions++;  
+ if(FWsamMaxOptions)  
+ { if((FWsamOptionField=(FWsamOptions *)malloc(sizeof(FWsamOptions)*FWsamMaxOptions))==NULL)  
+ FatalError("ERROR => [Alert_FWsam](AlertFWsamSetup) malloc failed for OptionField!\n");  
+ fseek(fp,0,SEEK_SET);  
+ for(cnt=0;cnt<FWsamMaxOptions;)  
+ { FWsamReadLine(buf,sizeof(buf),fp);  
+ if(*buf)  
+ FWsamParseLine(&(FWsamOptionField[cnt++]),buf);  
+ }  
+ if(FWsamMaxOptions>1)  
+ { for(again=TRUE,cnt=FWsamMaxOptions-1;cnt>=1 && again;cnt--)  
+ { for(again=FALSE,i=0;i<cnt;i++)  
+ { if(FWsamOptionField[i].sid>FWsamOptionField[i+1].sid)  
+ { memcpy(&tempopt,&(FWsamOptionField[i]),sizeof(FWsamOptions));  
+ memcpy(&(FWsamOptionField[i]),&(FWsamOptionField[i+1]),sizeof(FWsamOptions));  
+ memcpy(&(FWsamOptionField[i+1]),&tempopt,sizeof(FWsamOptions));  
+ again=TRUE;  
+ }  
+ }  
+ }  
+ }  
+ }  
+ else  
+ FWsamMaxOptions=1;  
+ fclose(fp);  
+ }  
+ else  
+ FWsamMaxOptions=1;  
+ }  
+  
+  
+ ap=args; /* start at the beginning of the argument */  
+ while(*ap && isspace(*ap)) ap++;  
+ while(*ap)  
+ { stathost=ap; /* first argument should be host */  
+ statport=NULL;  
+ statpass=NULL;  
+ while(*ap && *ap!=':' && *ap!='/' && !isspace(*ap)) ap++; /* find token */  
+ switch(*ap)  
+ { case ':': *ap++=0; /* grab the port */  
+ statport=ap;  
+ while(*ap && *ap!='/' && !isspace(*ap)) ap++;  
+ if(*ap!='/')  
+ break;  
+ case '/': *ap++=0; /* grab the key */  
+ statpass=ap;  
+ while(*ap && !isspace(*ap)) ap++;  
+ default: break;  
+ }  
+ if(*ap)  
+ { *ap++=0;  
+ while(isspace(*ap)) ap++;  
+ }  
+ /* now we have the first host with port and password (key) */  
+ /* next we check for valid/blank password/port */  
+ if(statpass!=NULL)  
+ if(!*statpass)  
+ statpass=NULL;  
+ if(statport!=NULL)  
+ if(!*statport)  
+ statport=NULL;  
+ statip=0;  
+ /* now we check if a valid host was specified */  
+ if(inet_addr(stathost)==INADDR_NONE)  
+ { hoste=gethostbyname(stathost);  
+ if (!hoste)  
+ LogMessage("WARNING %s (%d) => [Alert_FWsam](AlertFWsamInit) Unable to resolve host '%s'!\n",file_name,file_line,stathost);  
+ else  
+ statip=*(unsigned long *)hoste->h_addr;  
+ }  
+ else  
+ { statip=inet_addr(stathost);  
+ if(!statip)  
+ LogMessage("WARNING %s (%d) => [Alert_FWsam](AlertFWsamInit) Invalid host address '%s'!\n",file_name,file_line,stathost);  
+ }  
+ if(statip)  
+ { /* groovie, a valid host. Let's alloc and assemble the structure for it. */  
+ if((station=(FWsamStation *)malloc(sizeof(FWsamStation)))==NULL)  
+ FatalError("ERROR => [Alert_FWsam](AlertFWsamInit) malloc failed for station!\n");  
+  
+// station->stationip.s_addr=statip; /* the IP address */  
+ station->stationip.ip32[0] = statip; /* the IP address */  
+ if(statport!=NULL && atoi(statport)>0) /* if the user specified one */  
+ station->stationport=atoi(statport); /* use users setting */  
+ else  
+ station->stationport=FWSAM_DEFAULTPORT; /* set the default port */  
+  
+ if(statpass!=NULL) /* if specified by user */  
+ strncpy(station->stationkey,statpass,TwoFish_KEY_LENGTH); /* use defined key */  
+ else  
+ station->stationkey[0]=0;  
+ station->stationkey[TwoFish_KEY_LENGTH]=0; /* make sure it's terminated. (damn strncpy...) */  
+  
+ strcpy(station->initialkey,station->stationkey);  
+ station->stationfish=TwoFishInit(station->stationkey);  
+  
+ station->localsocketaddr.sin_port=htons(0); /* let's use dynamic ports for now */  
+ station->localsocketaddr.sin_addr.s_addr=0;  
+ station->localsocketaddr.sin_family=AF_INET;  
+ station->stationsocketaddr.sin_port=htons(station->stationport);  
+ //station->stationsocketaddr.sin_addr=station->stationip;  
+ station->stationsocketaddr.sin_addr.s_addr=station->stationip.ip32[0];  
+ station->stationsocketaddr.sin_family=AF_INET; /* load all socket crap and keep for later */  
+  
+ do  
+ station->myseqno=rand(); /* the seqno this host will use */  
+ while(station->myseqno<20 || station->myseqno>65500);  
+ station->mykeymod[0]=rand();  
+ station->mykeymod[1]=rand();  
+ station->mykeymod[2]=rand();  
+ station->mykeymod[3]=rand();  
+ station->stationseqno=0; /* peer hasn't answered yet. */  
+  
+  
+ if(!FWsamStationExists(station,FWsamStationList)) /* If we don't have the station already in global list....*/  
+ { if(FWsamCheckIn(station)) /* ...and we can talk to the agent... */  
+ { if((newlistp=(FWsamList *)malloc(sizeof(FWsamList)))==NULL)  
+ FatalError("ERROR => [Alert_FWsam](AlertFWsamInit) malloc failed for global newlistp!\n");  
+ newlistp->station=station;  
+ newlistp->next=NULL;  
+  
+ if(!FWsamStationList) /* ... add it to the global list/ */  
+ FWsamStationList=newlistp;  
+ else  
+ { listp=FWsamStationList;  
+ while(listp->next)  
+ listp=listp->next;  
+ listp->next=newlistp;  
+ }  
+ }  
+ else  
+ { TwoFishDestroy(station->stationfish); /* if not, we trash it. */  
+ free(station);  
+ station=NULL;  
+ }  
+ }  
+#ifdef FWSAMDEBUG  
+ else  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWsamInit) Host %s:%i already in global list, skipping CheckIn.\n", sfip_ntoa(&station->stationip),station->stationport);  
+#endif  
+  
+ if(station)  
+ { if(!FWsamStationExists(station,fwsamlist)) /* If we don't have the station already in local list....*/  
+ { if((newlistp=(FWsamList *)malloc(sizeof(FWsamList)))==NULL)  
+ FatalError("ERROR => [Alert_FWsam](AlertFWsamInit) malloc failed for local newlistp!\n");  
+ newlistp->station=station;  
+ newlistp->next=NULL;  
+  
+ if(!fwsamlist) /* ... add it to the local list/ */  
+ fwsamlist=newlistp;  
+ else  
+ { listp=fwsamlist;  
+ while(listp->next)  
+ listp=listp->next;  
+ listp->next=newlistp;  
+ }  
+ }  
+  
+#ifdef FWSAMDEBUG  
+ else  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWsamInit) Host %s:%i already in local list, skipping.\n",sfip_ntoa(&station->stationip),station->stationport);  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWsamInit) #%i: Host %s [%s] port %i password %s\n",++hostcnt,stathost,sfip_ntoa(&station->stationip),station->stationport,station->stationkey);  
+#endif  
+ }  
+  
+ }  
+ } /* next one */  
+  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWsamInit) Linking fwsam alert function to call list...\n");  
+#endif  
+  
+ /* Set the preprocessor function into the function list */  
+ AddFuncToOutputList(AlertFWsam, OUTPUT_TYPE_FLAG__ALERT, fwsamlist);  
+ AddFuncToCleanExitList(AlertFWsamCleanExitFunc, fwsamlist);  
+  
+/*  
+* This ifdef function reloads snortsam config/list on SIG HUP  
+* 04082012 RZ  
+*/  
+#ifdef SNORT_RELOAD  
+ AddFuncToReloadList(AlertFWsamRestartFunc, fwsamlist);  
+#endif  
+  
+}  
+  
+  
+/* This routine reads in a str from a file, snips white-spaces  
+ * off the front and back, removes comments, and pretties the  
+ * string. Returns true or false if a line was read or not.  
+*/  
+int FWsamReadLine(char *buf,unsigned long bufsize,FILE *fp)  
+{ char *p;  
+  
+ if(fgets(buf,bufsize-1,fp))  
+ { buf[bufsize-1]=0;  
+  
+#ifdef FWSAMDEBUG_off  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWsamReadLine) Line: %s\n",buf);  
+#endif  
+  
+ p=buf;  
+ while(isspace(*p))  
+ p++;  
+ if(p>buf);  
+ strcpy(buf,p);  
+ if(*buf)  
+ { p=buf+strlen(buf)-1; /* remove leading and trailing spaces */  
+ while(isspace(*p))  
+ *p-- =0;  
+ }  
+ p=buf;  
+ if(*p=='#' || *p==';')  
+ *p=0;  
+ else  
+ p++;  
+ while(*p) /* remove inline comments (except escaped #'s and ;'s) */  
+ { if(*p=='#' || *p==';')  
+ { if(*(p-1)=='\\')  
+ strcpy(p-1,p);  
+ else  
+ *p=0;  
+ }  
+ else  
+ p++;  
+ }  
+ return TRUE;  
+ }  
+ return FALSE;  
+}  
+  
+  
+/* Parses the duration of the argument, recognizing minutes, hours, etc..  
+*/  
+unsigned long FWsamParseDuration(char *p)  
+{ unsigned long dur=0,tdu;  
+ char *tok,c1,c2;  
+  
+ while(*p)  
+ { tok=p;  
+ while(*p && isdigit(*p))  
+ p++;  
+ if(*p)  
+ { c1=tolower(*p);  
+ *p=0;  
+ p++;  
+ if(*p && !isdigit(*p))  
+ { c2=tolower(*p++);  
+ while(*p && !isdigit(*p))  
+ p++;  
+ }  
+ else  
+ c2=0;  
+ tdu=atol(tok);  
+ switch(c1)  
+ { case 'm': if(c2=='o') /* month */  
+ tdu*=(60*60*24*30); /* use 30 days */  
+ else  
+ tdu*=60; /* minutes */  
+ case 's': break; /* seconds */  
+ case 'h': tdu*=(60*60); /* hours */  
+ break;  
+ case 'd': tdu*=(60*60*24); /* days */  
+ break;  
+ case 'w': tdu*=(60*60*24*7); /* week */  
+ break;  
+ case 'y': tdu*=(60*60*24*365); /* year */  
+ break;  
+ }  
+ dur+=tdu;  
+ }  
+ else  
+ dur+=atol(tok);  
+ }  
+  
+ return dur;  
+}  
+  
+  
+/* This routine parses an option line. It is called by FWsamParseLine,  
+ * which parses the sid-block.map file, and also by AlertFWsamOptionInit,  
+ * which is called by Snort when processing fwsam: options in rules.  
+ * It returns TRUE it there is a possible option problem, otherwise FALSE.  
+*/  
+int FWsamParseOption(FWsamOptions *optp,char *ap)  
+{ int possprob=FALSE;  
+  
+ /* set defaults */  
+  
+ optp->duration=300; /* default of 5 minute block */  
+ optp->how=FWSAM_HOW_INOUT; /* inbound and outbound block */  
+ optp->who=FWSAM_WHO_SRC; /* the source */  
+ optp->loglevel=FWSAM_LOG_LONGALERT; /* the log level default */  
+ /* parse the fwsam keywords */  
+  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWamOptionInit) Parse Options Args: %s\n",ap);  
+#endif  
+  
+ if(*ap) /* should be dst/src (the WHO) or duration */  
+ { if(isdigit(*ap))  
+ optp->duration=FWsamParseDuration(ap);  
+ else  
+ { switch(*ap) /* yeah, we're lazy and check only the first character */  
+ { case 'p': ; /* permanent, perm */  
+ case 'f': ; /* forever */  
+ case 'i': optp->duration=0; /* infinite, inf */  
+ break;  
+ case 'd': optp->who=FWSAM_WHO_DST; /* destination, dest, dst */  
+ break;  
+ case 's': optp->who=FWSAM_WHO_SRC; /* source, src */  
+ break;  
+ default: possprob=TRUE;  
+ }  
+ while(*ap && *ap!=',' && *ap!='[')  
+ ap++;  
+ if(*ap=='[')  
+ { ap++; /* now we have the HOW */  
+ switch(*ap)  
+ { case 'i': ; /* in */  
+ case 's': optp->how=FWSAM_HOW_IN; /* source, src */  
+ break;  
+ case 'o': ; /* out */  
+ case 'd': optp->how=FWSAM_HOW_OUT; /* destination, dest, dst */  
+ break;  
+ case 'b': ; /* both */  
+ case 'e': optp->how=FWSAM_HOW_INOUT; /* either */  
+ break;  
+ case 't': ; /* this */  
+ case 'c': optp->how=FWSAM_HOW_THIS; /* connection, conn */  
+ break;  
+ default: possprob=TRUE;  
+ }  
+ while(*ap && *ap!=',')  
+ ap++;  
+ }  
+ if(*ap==',')  
+ { ap++;  
+ if(isdigit(*ap)) /* and figure out how long to block */  
+ optp->duration=FWsamParseDuration(ap);  
+ else if(*ap=='p' || *ap=='f' || *ap=='i')  
+ optp->duration=0;  
+ else  
+ possprob=TRUE;  
+ }  
+ else if(!*ap)  
+ possprob=TRUE;  
+ }  
+ }  
+ else  
+ possprob=TRUE;  
+  
+ return possprob;  
+}  
+  
+  
+/* This goes through the lines of sid-block.map and sets the  
+ * options for fwsam if the file is being used.  
+*/  
+void FWsamParseLine(FWsamOptions *optp,char *buf)  
+{ char *ap;  
+  
+ ap=buf; /* start at the beginning of the argument */  
+  
+ while(*ap)  
+ { if(isspace(*ap)) /* normalize spaces (tabs into space, etc) */  
+ *ap=' ';  
+ if(isupper(*ap)) /* and set to lower case */  
+ *ap=tolower(*ap);  
+ ap++;  
+ }  
+ while((ap=strrchr(buf,' '))!=NULL) /* remove spaces */  
+ strcpy(ap,ap+1);  
+  
+ ap=buf;  
+ if(*ap)  
+ { while(*ap && *ap!=':' && *ap!='|')  
+ ap++;  
+ *ap++ =0;  
+ while(*ap && (*ap==':' || *ap=='|'))  
+ ap++;  
+  
+ optp->sid=(unsigned long)atol(buf);  
+  
+ if(FWsamParseOption(optp,ap))  
+ LogMessage("WARNING %s (%d) => [Alert_FWsam](AlertFWamOptionInit) Possible option problem. Using %s[%s],%lu.\n",file_name,file_line,(optp->who==FWSAM_WHO_SRC)?"src":"dst",(optp->how==FWSAM_HOW_IN)?"in":((optp->how==FWSAM_HOW_OUT)?"out":"either"),optp->duration);  
+ }  
+ else  
+ optp->sid=0;  
+}  
+  
+  
+  
+/*  
+ * Function: AlertFWsamOptionInit(char *data, OptTreeNode *otn, int protocol)  
+ *  
+ * Purpose: Parses each rule and sets the option flags in the tree.  
+ *  
+ * Arguments: args => ptr to argument string  
+ *  
+ * Returns: void function  
+ *  
+*/  
+void AlertFWsamOptionInit(char *args,OptTreeNode *otn,int protocol)  
+{  
+ FWsamOptions *optp;  
+ char *ap;  
+  
+  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWamOptionInit) FWsamOptionInit is parsing...\n");  
+#endif  
+  
+ if((optp=(FWsamOptions *)malloc(sizeof(FWsamOptions)))==NULL)  
+ FatalError("ERROR => [Alert_FWsam](AlertFWamOptionInit) malloc failed for opt!\n");  
+  
+  
+ ap=args; /* start at the beginning of the argument */  
+  
+ while(*ap)  
+ { if(isspace(*ap)) /* normalize spaces (tabs into space, etc) */  
+ *ap=' ';  
+ if(isupper(*ap)) /* and set to lower case */  
+ *ap=tolower(*ap);  
+ ap++;  
+ }  
+ while((ap=strrchr(args,' '))!=NULL) /* remove spaces */  
+ strcpy(ap,ap+1);  
+  
+  
+ if(FWsamParseOption(optp,args))  
+ LogMessage("WARNING %s (%d) => [Alert_FWsam](AlertFWamOptionInit) Possible option problem. Using %s[%s],%lu.\n",file_name,file_line,(optp->who==FWSAM_WHO_SRC)?"src":"dst",(optp->how==FWSAM_HOW_IN)?"in":((optp->how==FWSAM_HOW_OUT)?"out":"either"),optp->duration);  
+  
+ otn->ds_list[PLUGIN_FWSAM]=(FWsamOptions *)optp;  
+}  
+  
+  
+/* Generates a new encryption key for TwoFish based on seq numbers and a random that  
+ * the SnortSam agents send on checkin (in protocol)  
+*/  
+void FWsamNewStationKey(FWsamStation *station,FWsamPacket *packet)  
+{  
+ //unsigned char newkey[TwoFish_KEY_LENGTH+2];  
+ char newkey[TwoFish_KEY_LENGTH+2];  
+ int i;  
+  
+ newkey[0]=packet->snortseqno[0]; /* current snort seq # (which both know) */  
+ newkey[1]=packet->snortseqno[1];  
+ newkey[2]=packet->fwseqno[0]; /* current SnortSam seq # (which both know) */  
+ newkey[3]=packet->fwseqno[1];  
+ newkey[4]=packet->protocol[0]; /* the random SnortSam chose */  
+ newkey[5]=packet->protocol[1];  
+  
+ strncpy(newkey+6,station->stationkey,TwoFish_KEY_LENGTH-6); /* append old key */  
+ newkey[TwoFish_KEY_LENGTH]=0;  
+  
+ newkey[0]^=station->mykeymod[0]; /* modify key with key modifiers which were */  
+ newkey[1]^=station->mykeymod[1]; /* exchanged during the check-in handshake. */  
+ newkey[2]^=station->mykeymod[2];  
+ newkey[3]^=station->mykeymod[3];  
+ newkey[4]^=station->fwkeymod[0];  
+ newkey[5]^=station->fwkeymod[1];  
+ newkey[6]^=station->fwkeymod[2];  
+ newkey[7]^=station->fwkeymod[3];  
+  
+ for(i=0;i<=7;i++)  
+ if(newkey[i]==0)  
+ newkey[i]++;  
+  
+ strcpy(station->stationkey,newkey);  
+ TwoFishDestroy(station->stationfish);  
+ station->stationfish=TwoFishInit(newkey);  
+}  
+  
+  
+/* This routine will search the option list as defined  
+ * by the sid-block.map file and return a pointer  
+ * to the matching record.  
+*/  
+FWsamOptions *FWsamGetOption(unsigned long sid)  
+{ signed long i,step,diff,o,o2;  
+  
+#ifdef FWSAM_FANCYFETCH /* Fancy-fetch jumps in decreasing n/2 steps and takes much less lookups */  
+ o=o2= -1;  
+ i=step=FWsamMaxOptions>>1;  
+ while(i>=0 && i<FWsamMaxOptions && i!=o2)  
+ { diff=sid-FWsamOptionField[i].sid;  
+ if(!diff)  
+ return &(FWsamOptionField[i]);  
+ if(step>1)  
+ step=step>>1;  
+ o2=o;  
+ o=i;  
+ if(diff>0)  
+ i+=step;  
+ else  
+ i-=step;  
+ }  
+#else /* This is just a sequential list lookup */  
+ for(i=0;i<FWsamMaxOptions;i++)  
+ if(FWsamOptionField[i].sid==sid)  
+ return &(FWsamOptionField[i]);  
+#endif  
+ return NULL;  
+}  
+  
+  
+/****************************************************************************  
+ *  
+ * Function: AlertFWsam(Packet *, char *)  
+ *  
+ * Purpose: Send the current alert to a remote module on a FW-1 mgmt station  
+ *  
+ * Arguments: p => pointer to the packet data struct  
+ * msg => the message to print in the alert  
+ *  
+ * Returns: void function  
+ *  
+ ***************************************************************************/  
+void AlertFWsam(Packet *p, char *msg, void *arg, Event *event)  
+{ FWsamOptions *optp;  
+ FWsamPacket sampacket;  
+ FWsamStation *station=NULL;  
+ FWsamList *fwsamlist;  
+ SOCKET stationsocket;  
+ int i,len,deletestation,stationtry=0;  
+ //unsigned char *encbuf,*decbuf;  
+ char *encbuf,*decbuf;  
+ static unsigned long lastbsip[FWSAM_REPET_BLOCKS],lastbdip[FWSAM_REPET_BLOCKS],  
+ lastbduration[FWSAM_REPET_BLOCKS],lastbtime[FWSAM_REPET_BLOCKS];  
+ static unsigned short lastbsp[FWSAM_REPET_BLOCKS],lastbdp[FWSAM_REPET_BLOCKS],  
+ lastbproto[FWSAM_REPET_BLOCKS],lastbpointer;  
+ static unsigned char lastbmode[FWSAM_REPET_BLOCKS];  
+ static unsigned long btime=0;  
+  
+  
+ if(otn_tmp==NULL)  
+ {  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam] NULL otn_tmp!\n");  
+#endif  
+ return;  
+ }  
+ if(p == NULL)  
+ {  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam] NULL packet!\n");  
+#endif  
+ return;  
+ }  
+ if(arg == NULL)  
+ {  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam] NULL arg!\n");  
+#endif  
+ return;  
+ }  
+  
+ /* SnortSam does no IPv6 */  
+ if (!IS_IP4(p)) {  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam] not acting on non-IP4 packet!\n");  
+#endif  
+ return;  
+ }  
+  
+ optp=NULL;  
+  
+ if(FWsamOptionField) /* If using the file (field present), let's use that */  
+ optp=FWsamGetOption(event->sig_id);  
+  
+ if(!optp) /* If file not present, check if an fwsam option was defined on the triggering rule */  
+ optp=otn_tmp->ds_list[PLUGIN_FWSAM];  
+  
+ if(optp) /* if options specified for this rule */  
+ { if(!btime) /* if this is the first time this function is */  
+ { for(i=0;i<FWSAM_REPET_BLOCKS;i++) /* called, reset the time and protocol to 0. */  
+ { lastbproto[i]=0;  
+ lastbtime[i]=0;  
+ }  
+ }  
+  
+ fwsamlist=(FWsamList *)arg;  
+  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam] Alert -> Msg=\"%s\"\n",msg);  
+  
+ LogMessage("DEBUG => [Alert_FWsam] Alert -> Option: %s[%s],%lu.\n",(optp->who==FWSAM_WHO_SRC)?"src":"dst",(optp->how==FWSAM_HOW_IN)?"in":((optp->how==FWSAM_HOW_OUT)?"out":"either"),optp->duration);  
+#endif  
+  
+ len=TRUE;  
+ btime=(unsigned long)time(NULL); /* get current time */  
+ /* This is a cheap check to see if the blocking request matches any of the previous requests. */  
+ for(i=0;i<FWSAM_REPET_BLOCKS && len;i++)  
+ { if( ((optp->how==FWSAM_HOW_THIS)? /* if blocking mode SERVICE, check for src and dst */  
+ ( lastbsip[i]==p->iph->ip_src.s_addr && lastbdip[i]==p->iph->ip_dst.s_addr &&lastbproto[i]==p->iph->ip_proto &&  
+ ((p->iph->ip_proto==IPPROTO_TCP || p->iph->ip_proto==IPPROTO_UDP)? /* check port only of TCP or UDP */  
+/* ((optp->who==FWSAM_WHO_SRC)?(lastbsp[i]==p->sp):(lastbdp[i]==p->dp)):TRUE) ): */  
+ lastbdp[i]==p->dp:TRUE) ):  
+ ((optp->who==FWSAM_WHO_SRC)?(lastbsip[i]==p->iph->ip_src.s_addr):(lastbdip[i]==p->iph->ip_dst.s_addr))) && /* otherwise if we block source, only compare source. Same for dest. */  
+ lastbduration[i]==optp->duration &&  
+ (lastbmode[i]&(FWSAM_HOW|FWSAM_WHO))==(optp->how|optp->who) &&  
+ (btime-lastbtime[i]<((optp->duration>FWSAM_REPET_TIME)?FWSAM_REPET_TIME:optp->duration)))  
+ { len=FALSE; /* If so, we don't need to block again. */  
+ }  
+ }  
+ if(len)  
+ { if(++lastbpointer>=FWSAM_REPET_BLOCKS) /* increase repetitive check pointer */  
+ lastbpointer=0;  
+ lastbsip[lastbpointer]=p->iph->ip_src.s_addr; /* and note packet details */  
+ lastbdip[lastbpointer]=p->iph->ip_dst.s_addr;  
+ lastbduration[lastbpointer]=optp->duration;  
+ lastbmode[lastbpointer]=optp->how|optp->who|optp->loglevel;  
+ lastbproto[lastbpointer]=p->iph->ip_proto;  
+ if(p->iph->ip_proto==IPPROTO_TCP || p->iph->ip_proto==IPPROTO_UDP)  
+ { lastbsp[lastbpointer]=p->sp; /* set ports if TCP or UDP */  
+ lastbdp[lastbpointer]=p->dp;  
+ }  
+ lastbtime[lastbpointer]=btime;  
+  
+  
+ while(fwsamlist!=NULL)  
+ { station=fwsamlist->station;  
+ //if(station->stationip.s_addr)  
+ if(station->stationip.ip32[0])  
+ { deletestation=FALSE;  
+ stationtry++; /* first try */  
+ /* create a socket for the station */  
+ stationsocket=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);  
+ if(stationsocket==INVALID_SOCKET)  
+ FatalError("ERROR => [Alert_FWsam] Funky socket error (socket)!\n");  
+ if(bind(stationsocket,(struct sockaddr *)&(station->localsocketaddr),sizeof(struct sockaddr)))  
+ FatalError("ERROR => [Alert_FWsam] Could not bind socket!\n");  
+  
+ /* let's connect to the agent */  
+ if(connect(stationsocket,(struct sockaddr *)&station->stationsocketaddr,sizeof(struct sockaddr)))  
+ {  
+ LogMessage("WARNING => [Alert_FWsam] Could not send block to host %s. Will try later.\n",sfip_ntoa(&station->stationip));  
+#ifdef WIN32  
+ closesocket(stationsocket);  
+#else  
+ close(stationsocket);  
+#endif  
+ stationtry=0;  
+ }  
+ else  
+ {  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam] Connected to host %s.\n",sfip_ntoa(&station->stationip));  
+#endif  
+ /* now build the packet */  
+ station->myseqno+=station->stationseqno; /* increase my seqno by adding agent seq no */  
+ sampacket.endiancheck=1; /* This is an endian indicator for Snortsam */  
+ sampacket.snortseqno[0]=(char)station->myseqno;  
+ sampacket.snortseqno[1]=(char)(station->myseqno>>8);  
+ sampacket.fwseqno[0]=(char)station->stationseqno;/* fill station seqno */  
+ sampacket.fwseqno[1]=(char)(station->stationseqno>>8);  
+ sampacket.status=FWSAM_STATUS_BLOCK; /* set block mode */  
+ sampacket.version=FWSAM_PACKETVERSION; /* set packet version */  
+ sampacket.duration[0]=(char)optp->duration; /* set duration */  
+ sampacket.duration[1]=(char)(optp->duration>>8);  
+ sampacket.duration[2]=(char)(optp->duration>>16);  
+ sampacket.duration[3]=(char)(optp->duration>>24);  
+ sampacket.fwmode=optp->how|optp->who|optp->loglevel; /* set the mode */  
+ sampacket.dstip[0]=(char)p->iph->ip_dst.s_addr; /* destination IP */  
+ sampacket.dstip[1]=(char)(p->iph->ip_dst.s_addr>>8);  
+ sampacket.dstip[2]=(char)(p->iph->ip_dst.s_addr>>16);  
+ sampacket.dstip[3]=(char)(p->iph->ip_dst.s_addr>>24);  
+ sampacket.srcip[0]=(char)p->iph->ip_src.s_addr; /* source IP */  
+ sampacket.srcip[1]=(char)(p->iph->ip_src.s_addr>>8);  
+ sampacket.srcip[2]=(char)(p->iph->ip_src.s_addr>>16);  
+ sampacket.srcip[3]=(char)(p->iph->ip_src.s_addr>>24);  
+ sampacket.protocol[0]=(char)p->iph->ip_proto; /* protocol */  
+ sampacket.protocol[1]=(char)(p->iph->ip_proto>>8);/* protocol */  
+  
+ if(p->iph->ip_proto==IPPROTO_TCP || p->iph->ip_proto==IPPROTO_UDP)  
+ { sampacket.srcport[0]=(char)p->sp; /* set ports */  
+ sampacket.srcport[1]=(char)(p->sp>>8);  
+ sampacket.dstport[0]=(char)p->dp;  
+ sampacket.dstport[1]=(char)(p->dp>>8);  
+ }  
+ else  
+ sampacket.srcport[0]=sampacket.srcport[1]=sampacket.dstport[0]=sampacket.dstport[1]=0;  
+  
+ sampacket.sig_id[0]=(char)event->sig_id; /* set signature ID */  
+ sampacket.sig_id[1]=(char)(event->sig_id>>8);  
+ sampacket.sig_id[2]=(char)(event->sig_id>>16);  
+ sampacket.sig_id[3]=(char)(event->sig_id>>24);  
+  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam] Sending BLOCK\n");  
+ LogMessage("DEBUG => [Alert_FWsam] Snort SeqNo: %x\n",station->myseqno);  
+ LogMessage("DEBUG => [Alert_FWsam] Mgmt SeqNo : %x\n",station->stationseqno);  
+ LogMessage("DEBUG => [Alert_FWsam] Status : %i\n",FWSAM_STATUS_BLOCK);  
+ LogMessage("DEBUG => [Alert_FWsam] Mode : %i\n",optp->how|optp->who|optp->loglevel);  
+ LogMessage("DEBUG => [Alert_FWsam] Duration : %li\n",optp->duration);  
+ LogMessage("DEBUG => [Alert_FWsam] Protocol : %i\n",GET_IPH_PROTO(p));  
+#ifdef SUP_IP6  
+ LogMessage("DEBUG => [Alert_FWsam] Src IP : %s\n",sfip_ntoa(GET_SRC_IP(p)));  
+ LogMessage("DEBUG => [Alert_FWsam] Dest IP : %s\n",sfip_ntoa(GET_DST_IP(p)));  
+#else  
+ LogMessage("DEBUG => [Alert_FWsam] Src IP : %s\n",inet_ntoa(p->iph->ip_src));  
+ LogMessage("DEBUG => [Alert_FWsam] Dest IP : %s\n",inet_ntoa(p->iph->ip_dst));  
+#endif  
+ LogMessage("DEBUG => [Alert_FWsam] Src Port : %i\n",p->sp);  
+ LogMessage("DEBUG => [Alert_FWsam] Dest Port : %i\n",p->dp);  
+ LogMessage("DEBUG => [Alert_FWsam] Sig_ID : %lu\n",event->sig_id);  
+  
+#endif  
+  
+ encbuf=TwoFishAlloc(sizeof(FWsamPacket),FALSE,FALSE,station->stationfish); /* get the encryption buffer */  
+ len=TwoFishEncrypt((char *)&sampacket,&encbuf,sizeof(FWsamPacket),FALSE,station->stationfish); /* encrypt the packet with current key */  
+  
+ if(send(stationsocket,encbuf,len,0)!=len) /* weird...could not send */  
+ { LogMessage("WARNING => [Alert_FWsam] Could not send to host %s. Will try again later.\n",sfip_ntoa(&station->stationip));  
+#ifdef WIN32  
+ closesocket(stationsocket);  
+#else  
+ close(stationsocket);  
+#endif  
+ stationtry=0;  
+ }  
+ else  
+ { i=FWSAM_NETWAIT;  
+#ifdef WIN32  
+ ioctlsocket(stationsocket,FIONBIO,&i); /* set non blocking and wait for */  
+#else  
+ ioctl(stationsocket,FIONBIO,&i); /* set non blocking and wait for */  
+#endif  
+ while(i-- >1) /* the response packet */  
+ { waitms(10); /* wait for response (default maximum 3 secs */  
+ if(recv(stationsocket,encbuf,len,0)==len)  
+ i=0; /* if we received packet we set the counter to 0. */  
+ /* by the time we check with if, it's already dec'ed to -1 */  
+ }  
+ if(!i) /* id we timed out (i was one, then dec'ed)... */  
+ { LogMessage("WARNING => [Alert_FWsam] Did not receive response from host %s. Will try again later.\n",sfip_ntoa(&station->stationip));  
+#ifdef WIN32  
+ closesocket(stationsocket);  
+#else  
+ close(stationsocket);  
+#endif  
+ stationtry=0;  
+ }  
+ else /* got a packet */  
+ { decbuf=(char *)&sampacket; /* get the pointer to the packet struct */  
+ len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* try to decrypt the packet with current key */  
+  
+ if(len!=sizeof(FWsamPacket)) /* invalid decryption */  
+ { strcpy(station->stationkey,station->initialkey); /* try the intial key */  
+ TwoFishDestroy(station->stationfish);  
+ station->stationfish=TwoFishInit(station->stationkey); /* re-initialize the TwoFish with the intial key */  
+ len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* try again to decrypt */  
+ LogMessage("INFO => [Alert_FWsam] Had to use initial key!\n");  
+ }  
+ if(len==sizeof(FWsamPacket)) /* valid decryption */  
+ { if(sampacket.version==FWSAM_PACKETVERSION)/* master speaks my language */  
+ { if(sampacket.status==FWSAM_STATUS_OK || sampacket.status==FWSAM_STATUS_NEWKEY  
+ || sampacket.status==FWSAM_STATUS_RESYNC || sampacket.status==FWSAM_STATUS_HOLD)  
+ { station->stationseqno=sampacket.fwseqno[0] | (sampacket.fwseqno[1]<<8); /* get stations seqno */  
+ station->lastcontact=(unsigned long)time(NULL); /* set the last contact time (not used yet) */  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam] Received %s\n",sampacket.status==FWSAM_STATUS_OK?"OK":  
+ sampacket.status==FWSAM_STATUS_NEWKEY?"NEWKEY":  
+ sampacket.status==FWSAM_STATUS_RESYNC?"RESYNC":  
+ sampacket.status==FWSAM_STATUS_HOLD?"HOLD":"ERROR");  
+ LogMessage("DEBUG => [Alert_FWsam] Snort SeqNo: %x\n",sampacket.snortseqno[0]|(sampacket.snortseqno[1]<<8));  
+ LogMessage("DEBUG => [Alert_FWsam] Mgmt SeqNo : %x\n",station->stationseqno);  
+ LogMessage("DEBUG => [Alert_FWsam] Status : %i\n",sampacket.status);  
+ LogMessage("DEBUG => [Alert_FWsam] Version : %i\n",sampacket.version);  
+#endif  
+ if(sampacket.status==FWSAM_STATUS_HOLD)  
+ { i=FWSAM_NETHOLD; /* Stay on hold for a maximum of 60 secs (default) */  
+ while(i-- >1) /* the response packet */  
+ { waitms(10); /* wait for response */  
+ if(recv(stationsocket,encbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,0)==sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE)  
+ i=0; /* if we received packet we set the counter to 0. */  
+ }  
+ if(!i) /* id we timed out (i was one, then dec'ed)... */  
+ { LogMessage("WARNING => [Alert_FWsam] Did not receive response from host %s. Will try again later.\n",sfip_ntoa(&station->stationip));  
+ stationtry=0;  
+ sampacket.status=FWSAM_STATUS_ERROR;  
+ }  
+ else /* got a packet */  
+ { decbuf=(char *)&sampacket; /* get the pointer to the packet struct */  
+ len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* try to decrypt the packet with current key */  
+  
+ if(len!=sizeof(FWsamPacket)) /* invalid decryption */  
+ { strcpy(station->stationkey,station->initialkey); /* try the intial key */  
+ TwoFishDestroy(station->stationfish);  
+ station->stationfish=TwoFishInit(station->stationkey); /* re-initialize the TwoFish with the intial key */  
+ len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* try again to decrypt */  
+ LogMessage("INFO => [Alert_FWsam] Had to use initial key again!\n");  
+ }  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam] Received %s\n",sampacket.status==FWSAM_STATUS_OK?"OK":  
+ sampacket.status==FWSAM_STATUS_NEWKEY?"NEWKEY":  
+ sampacket.status==FWSAM_STATUS_RESYNC?"RESYNC":  
+ sampacket.status==FWSAM_STATUS_HOLD?"HOLD":"ERROR");  
+ LogMessage("DEBUG => [Alert_FWsam] Snort SeqNo: %x\n",sampacket.snortseqno[0]|(sampacket.snortseqno[1]<<8));  
+ LogMessage("DEBUG => [Alert_FWsam] Mgmt SeqNo : %x\n",station->stationseqno);  
+ LogMessage("DEBUG => [Alert_FWsam] Status : %i\n",sampacket.status);  
+ LogMessage("DEBUG => [Alert_FWsam] Version : %i\n",sampacket.version);  
+#endif  
+ if(len!=sizeof(FWsamPacket)) /* invalid decryption */  
+ { ErrorMessage("ERROR => [Alert_FWsam] Password mismatch! Ignoring host %s.\n",sfip_ntoa(&station->stationip));  
+ deletestation=TRUE;  
+ sampacket.status=FWSAM_STATUS_ERROR;  
+ }  
+ else if(sampacket.version!=FWSAM_PACKETVERSION) /* invalid protocol version */  
+ { ErrorMessage("ERROR => [Alert_FWsam] Protocol version error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));  
+ deletestation=TRUE;  
+ sampacket.status=FWSAM_STATUS_ERROR;  
+ }  
+ else if(sampacket.status!=FWSAM_STATUS_OK && sampacket.status!=FWSAM_STATUS_NEWKEY && sampacket.status!=FWSAM_STATUS_RESYNC)  
+ { ErrorMessage("ERROR => [Alert_FWsam] Funky handshake error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));  
+ deletestation=TRUE;  
+ sampacket.status=FWSAM_STATUS_ERROR;  
+ }  
+ }  
+ }  
+ if(sampacket.status==FWSAM_STATUS_RESYNC) /* if station want's to resync... */  
+ { strcpy(station->stationkey,station->initialkey); /* ...we use the intial key... */  
+ memcpy(station->fwkeymod,sampacket.duration,4); /* and note the random key modifier */  
+ }  
+ if(sampacket.status==FWSAM_STATUS_NEWKEY || sampacket.status==FWSAM_STATUS_RESYNC)  
+ {  
+ FWsamNewStationKey(station,&sampacket); /* generate new TwoFish keys */  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam] Generated new encryption key...\n");  
+#endif  
+ }  
+#ifdef WIN32  
+ closesocket(stationsocket);  
+#else  
+ close(stationsocket);  
+#endif  
+ stationtry=0;  
+ }  
+ else if(sampacket.status==FWSAM_STATUS_ERROR) /* if SnortSam reports an error on second try, */  
+ {  
+#ifdef WIN32  
+ closesocket(stationsocket); /* something is messed up and ... */  
+#else  
+ close(stationsocket);  
+#endif  
+ if(stationtry>1) /* we ignore that station. */  
+ { deletestation=TRUE; /* flag for deletion */  
+ ErrorMessage("ERROR => [Alert_FWsam] Could not renegotiate key! Ignoring host %s.\n",sfip_ntoa(&station->stationip));  
+ }  
+ else /* if we get an error on the first try, */  
+ { if(!FWsamCheckIn(station)) /* we first try to check in again. */  
+ { deletestation=TRUE;  
+ ErrorMessage("ERROR => [Alert_FWsam] Password mismatch! Ignoring host %s.\n",sfip_ntoa(&station->stationip));  
+ }  
+ }  
+ }  
+ else /* an unknown status means trouble... */  
+ { ErrorMessage("ERROR => [Alert_FWsam] Funky handshake error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));  
+#ifdef WIN32  
+ closesocket(stationsocket);  
+#else  
+ close(stationsocket);  
+#endif  
+ deletestation=TRUE;  
+ }  
+ }  
+ else /* if the SnortSam agent uses a different packet version, we have no choice but to ignore it. */  
+ { ErrorMessage("ERROR => [Alert_FWsam] Protocol version error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));  
+#ifdef WIN32  
+ closesocket(stationsocket);  
+#else  
+ close(stationsocket);  
+#endif  
+ deletestation=TRUE;  
+ }  
+ }  
+ else /* if the intial key failed to decrypt as well, the keys are not configured the same, and we ignore that SnortSam station. */  
+ { ErrorMessage("ERROR => [Alert_FWsam] Password mismatch! Ignoring host %s.\n",sfip_ntoa(&station->stationip));  
+#ifdef WIN32  
+ closesocket(stationsocket);  
+#else  
+ close(stationsocket);  
+#endif  
+ deletestation=TRUE;  
+ }  
+ }  
+ }  
+ free(encbuf); /* release of the TwoFishAlloc'ed encryption buffer */  
+ }  
+ if(stationtry==0 || deletestation) /* if everything went real well, or real bad... */  
+ { if(deletestation){ /* If it went bad, we remove the station from the list by marking the IP */  
+// station->stationip.s_addr=0;  
+ station->stationip.ip32[0]=0;  
+ }  
+ fwsamlist=fwsamlist->next;  
+ }  
+ }  
+ else  
+ fwsamlist=fwsamlist->next;  
+ }  
+ }  
+ else  
+ {  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam] Skipping repetitive block.\n");  
+#endif  
+ }  
+ }  
+}  
+  
+/* FWsamCheckOut will be called when Snort exists. It de-registeres this snort sensor  
+ * from the list of sensor that the SnortSam agent keeps.  
+ */  
+void FWsamCheckOut(FWsamStation *station)  
+{ FWsamPacket sampacket;  
+ SOCKET stationsocket;  
+ int i,len;  
+ char *encbuf,*decbuf;  
+ //unsigned char *encbuf,*decbuf;  
+  
+  
+ stationsocket=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);  
+ if(stationsocket==INVALID_SOCKET)  
+ FatalError("ERROR => [Alert_FWsam](FWsamCheckOut) Funky socket error (socket)!\n");  
+ if(bind(stationsocket,(struct sockaddr *)&(station->localsocketaddr),sizeof(struct sockaddr)))  
+ FatalError("ERROR => [Alert_FWsam](FWsamCheckOut) Could not bind socket!\n");  
+  
+ /* let's connect to the agent */  
+ if(!connect(stationsocket,(struct sockaddr *)&station->stationsocketaddr,sizeof(struct sockaddr)))  
+ { LogMessage("INFO => [Alert_FWsam](FWsamCheckOut) Disconnecting from host %s.\n",sfip_ntoa(&station->stationip));  
+ /* now build the packet */  
+ station->myseqno+=station->stationseqno; /* increase my seqno */  
+ sampacket.endiancheck=1;  
+ sampacket.snortseqno[0]=(char)station->myseqno;  
+ sampacket.snortseqno[1]=(char)(station->myseqno>>8);  
+ sampacket.fwseqno[0]=(char)station->stationseqno; /* fill station seqno */  
+ sampacket.fwseqno[1]=(char)(station->stationseqno>>8);  
+ sampacket.status=FWSAM_STATUS_CHECKOUT; /* checking out... */  
+ sampacket.version=FWSAM_PACKETVERSION;  
+  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckOut) Sending CHECKOUT\n");  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckOut) Snort SeqNo: %x\n",station->myseqno);  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckOut) Mgmt SeqNo : %x\n",station->stationseqno);  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckOut) Status : %i\n",sampacket.status);  
+  
+#endif  
+  
+ encbuf=TwoFishAlloc(sizeof(FWsamPacket),FALSE,FALSE,station->stationfish); /* get encryption buffer */  
+ len=TwoFishEncrypt((char *)&sampacket,&encbuf,sizeof(FWsamPacket),FALSE,station->stationfish); /* encrypt packet with current key */  
+  
+ if(send(stationsocket,encbuf,len,0)==len)  
+ { i=FWSAM_NETWAIT;  
+#ifdef WIN32  
+ ioctlsocket(stationsocket,FIONBIO,&i); /* set non blocking and wait for */  
+#else  
+ ioctl(stationsocket,FIONBIO,&i); /* set non blocking and wait for */  
+#endif  
+ while(i-- >1)  
+ { waitms(10); /* ...wait a maximum of 3 secs for response... */  
+ if(recv(stationsocket,encbuf,len,0)==len) /* ... for the status packet */  
+ i=0;  
+ }  
+ if(i) /* if we got the packet */  
+ { decbuf=(char *)&sampacket;  
+ len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish);  
+  
+ if(len!=sizeof(FWsamPacket)) /* invalid decryption */  
+ { strcpy(station->stationkey,station->initialkey); /* try initial key */  
+ TwoFishDestroy(station->stationfish); /* toss this fish */  
+ station->stationfish=TwoFishInit(station->stationkey); /* re-initialze TwoFish with initial key */  
+ len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* and try to decrypt again */  
+ LogMessage("INFO => [Alert_FWsam](FWsamCheckOut) Had to use initial key!\n");  
+ }  
+ if(len==sizeof(FWsamPacket)) /* valid decryption */  
+ { if(sampacket.version!=FWSAM_PACKETVERSION) /* but don't really care since we are on the way out */  
+ ErrorMessage("WARNING => [Alert_FWsam](FWsamCheckOut) Protocol version error! What the hell, we're quitting anyway! :)\n");  
+ }  
+ else  
+ ErrorMessage("WARNING => [Alert_FWsam](FWsamCheckOut) Password mismatch! What the hell, we're quitting anyway! :)\n");  
+ }  
+ }  
+ free(encbuf); /* release TwoFishAlloc'ed buffer */  
+ }  
+ else  
+ LogMessage("WARNING => [Alert_FWsam] Could not connect to host %s for CheckOut. What the hell, we're quitting anyway! :)\n",sfip_ntoa(&station->stationip));  
+#ifdef WIN32  
+ closesocket(stationsocket);  
+#else  
+ close(stationsocket);  
+#endif  
+}  
+  
+  
+/* FWSamFree: Disconnects all FW-1 management stations,  
+ * closes sockets, and frees the structures.  
+ */  
+void FWsamFree(FWsamList *list)  
+{  
+ FWsamList *next;  
+  
+ while(list) /* Free pointer list for rule type */  
+ {  
+ next=list->next;  
+ free(list);  
+ list=next;  
+ }  
+ list=FWsamStationList;  
+  
+ while(list) /* Free global pointer list and stations */  
+ {  
+ next=list->next;  
+ if (list->station)  
+ {  
+ if(list->station->stationip.ip32[0])  
+ //if(list->station->stationip.s_addr)  
+ FWsamCheckOut(list->station); /* Send a Check-Out to SnortSam, */  
+  
+ TwoFishDestroy(list->station->stationfish); /* toss the fish, */  
+ free(list->station); /* free station, */  
+ }  
+ free(list); /* free pointer, */  
+ list=next; /* and move to next. */  
+ }  
+ FWsamStationList=NULL;  
+ if(FWsamOptionField)  
+ free(FWsamOptionField);  
+}  
+  
+void AlertFWsamCleanExitFunc(int signal, void *arg)  
+{ FWsamList *fwsamlist;  
+  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWsamCleanExitFunc) Exiting...\n");  
+#endif  
+  
+ fwsamlist=(FWsamList *)arg;  
+ FWsamFree(fwsamlist); /* Free all elements */  
+}  
+  
+void AlertFWsamRestartFunc(int signal, void *arg)  
+{ FWsamList *fwsamlist;  
+  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam](AlertFWsamRestartFunc) Restarting...\n");  
+#endif  
+  
+ fwsamlist=(FWsamList *)arg;  
+ FWsamFree(fwsamlist); /* Free all elements */  
+}  
+  
+/* This routine registers this Snort sensor with SnortSam.  
+ * It will also change the encryption key based on some variables.  
+ */  
+int FWsamCheckIn(FWsamStation *station)  
+{ int i,len,stationok=TRUE;  
+ FWsamPacket sampacket;  
+ char *encbuf,*decbuf;  
+ //unsigned char *encbuf,*decbuf;  
+ SOCKET stationsocket;  
+  
+  
+ /* create a socket for the station */  
+ stationsocket=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);  
+ if(stationsocket==INVALID_SOCKET)  
+ FatalError("ERROR => [Alert_FWsam](FWsamCheckIn) Funky socket error (socket)!\n");  
+ if(bind(stationsocket,(struct sockaddr *)&(station->localsocketaddr),sizeof(struct sockaddr)))  
+ FatalError("ERROR => [Alert_FWsam](FWsamCheckIn) Could not bind socket!\n");  
+  
+ i=TRUE;  
+ /* let's connect to the agent */  
+ if(connect(stationsocket,(struct sockaddr *)&station->stationsocketaddr,sizeof(struct sockaddr)))  
+ LogMessage("WARNING => [Alert_FWsam](FWsamCheckIn) Could not connect to host %s. Will try later.\n",sfip_ntoa(&station->stationip));  
+ else  
+ { LogMessage("INFO => [Alert_FWsam](FWsamCheckIn) Connected to host %s.\n",sfip_ntoa(&station->stationip));  
+ /* now build the packet */  
+ sampacket.endiancheck=1;  
+ sampacket.snortseqno[0]=(char)station->myseqno; /* fill my sequence number number */  
+ sampacket.snortseqno[1]=(char)(station->myseqno>>8); /* fill my sequence number number */  
+ sampacket.status=FWSAM_STATUS_CHECKIN; /* let's check in */  
+ sampacket.version=FWSAM_PACKETVERSION; /* set the packet version */  
+ memcpy(sampacket.duration,station->mykeymod,4); /* we'll send SnortSam our key modifier in the duration slot */  
+ /* (the checkin packet is just the plain initial key) */  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Sending CheckIn\n");  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Snort SeqNo: %x\n",station->myseqno);  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Mode : %i\n",sampacket.status);  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Version : %i\n",sampacket.version);  
+#endif  
+ encbuf=TwoFishAlloc(sizeof(FWsamPacket),FALSE,FALSE,station->stationfish); /* get buffer for encryption */  
+ len=TwoFishEncrypt((char *)&sampacket,&encbuf,sizeof(FWsamPacket),FALSE,station->stationfish); /* encrypt with initial key */  
+ if(send(stationsocket,encbuf,len,0)!=len) /* weird...could not send */  
+ LogMessage("WARNING => [Alert_FWsam](FWsamCheckIn) Could not send to host %s. Will try again later.\n",sfip_ntoa(&station->stationip));  
+ else  
+ { i=FWSAM_NETWAIT;  
+#ifdef WIN32  
+ ioctlsocket(stationsocket,FIONBIO,&i); /* set non blocking and wait for */  
+#else  
+ ioctl(stationsocket,FIONBIO,&i); /* set non blocking and wait for */  
+#endif  
+ while(i-- >1)  
+ { waitms(10); /* wait a maximum of 3 secs for response */  
+ if(recv(stationsocket,encbuf,len,0)==len)  
+ i=0;  
+ }  
+ if(!i) /* time up? */  
+ LogMessage("WARNING => [Alert_FWsam](FWsamCheckIn) Did not receive response from host %s. Will try again later.\n",sfip_ntoa(&station->stationip));  
+ else  
+ { decbuf=(char *)&sampacket; /* got status packet */  
+ len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* try to decrypt with initial key */  
+ if(len==sizeof(FWsamPacket)) /* valid decryption */  
+ {  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Received %s\n",sampacket.status==FWSAM_STATUS_OK?"OK":  
+ sampacket.status==FWSAM_STATUS_NEWKEY?"NEWKEY":  
+ sampacket.status==FWSAM_STATUS_RESYNC?"RESYNC":  
+ sampacket.status==FWSAM_STATUS_HOLD?"HOLD":"ERROR");  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Snort SeqNo: %x\n",sampacket.snortseqno[0]|(sampacket.snortseqno[1]<<8));  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Mgmt SeqNo : %x\n",sampacket.fwseqno[0]|(sampacket.fwseqno[1]<<8));  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Status : %i\n",sampacket.status);  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Version : %i\n",sampacket.version);  
+#endif  
+ if(sampacket.version==FWSAM_PACKETVERSION) /* master speaks my language */  
+ { if(sampacket.status==FWSAM_STATUS_OK || sampacket.status==FWSAM_STATUS_NEWKEY || sampacket.status==FWSAM_STATUS_RESYNC)  
+ { station->stationseqno=sampacket.fwseqno[0]|(sampacket.fwseqno[1]<<8); /* get stations seqno */  
+ station->lastcontact=(unsigned long)time(NULL);  
+  
+ if(sampacket.status==FWSAM_STATUS_NEWKEY || sampacket.status==FWSAM_STATUS_RESYNC) /* generate new keys */  
+ { memcpy(station->fwkeymod,sampacket.duration,4); /* note the key modifier */  
+ FWsamNewStationKey(station,&sampacket); /* and generate new TwoFish keys (with key modifiers) */  
+#ifdef FWSAMDEBUG  
+ LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Generated new encryption key...\n");  
+#endif  
+ }  
+ }  
+ else /* weird, got a strange status back */  
+ { ErrorMessage("ERROR => [Alert_FWsam](FWsamCheckIn) Funky handshake error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));  
+ stationok=FALSE;  
+ }  
+ }  
+ else /* packet version does not match */  
+ { ErrorMessage("ERROR =>[Alert_FWsam](FWsamCheckIn) Protocol version error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));  
+ stationok=FALSE;  
+ }  
+ }  
+ else /* key does not match */  
+ { ErrorMessage("ERROR => [Alert_FWsam](FWsamCheckIn) Password mismatch! Ignoring host %s.\n",sfip_ntoa(&station->stationip));  
+ stationok=FALSE;  
+ }  
+ }  
+ }  
+ free(encbuf); /* release TwoFishAlloc'ed buffer */  
+ }  
+#ifdef WIN32  
+ closesocket(stationsocket);  
+#else  
+ close(stationsocket);  
+#endif  
+ return stationok;  
+}  
+#undef FWSAMDEBUG  
+  
diff -ruN snort-2.9.2.2/src/output-plugins/spo_alert_fwsam.h snort-2.9.2.2_bkup/src/output-plugins/spo_alert_fwsam.h  
--- snort-2.9.2.2/src/output-plugins/spo_alert_fwsam.h 1969-12-31 16:00:00.000000000 -0800  
+++ snort-2.9.2.2_bkup/src/output-plugins/spo_alert_fwsam.h 2012-04-08 20:34:57.389687124 -0700  
@@ -0,0 +1,216 @@  
+/* $Id: snortpatchb,v 1.5 2005/10/06 08:50:39 fknobbe Exp $  
+**  
+** spo_alert_fwsam.h  
+**  
+** Copyright (c) 2001-2004 Frank Knobbe <frank@knobbe.us>  
+**  
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by  
+** the Free Software Foundation; either version 2 of the License, or  
+** (at your option) any later version.  
+**  
+** This program is distributed in the hope that it will be useful,  
+** but WITHOUT ANY WARRANTY; without even the implied warranty of  
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  
+** GNU General Public License for more details.  
+**  
+** You should have received a copy of the GNU General Public License  
+** along with this program; if not, write to the Free Software  
+** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+*/  
+  
+/* This file gets included in plugbase.c when it is integrated into the rest  
+ * of the program.  
+ *  
+ * For more info, see the beginning of spo_alert_fwsam.c  
+ *  
+ */  
+  
+#ifndef __SPO_FWSAM_H__  
+#define __SPO_FWSAM_H__  
+  
+#include "snort.h"  
+#include "rules.h"  
+#include "plugbase.h"  
+#include "plugin_enum.h"  
+#include "fatal.h"  
+#include "util.h"  
+#include "twofish.h"  
+  
+#include <stdlib.h>  
+#include <stdio.h>  
+#include <time.h>  
+#include <string.h>  
+#include <ctype.h>  
+#include <unistd.h>  
+  
+  
+/* just some compatibility stuff */  
+#ifdef WIN32  
+#if !defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_)  
+#include <winsock.h>  
+#endif  
+#define waitms(x) Sleep(x)  
+  
+#else  
+  
+#include <sys/socket.h>  
+#include <netinet/in.h>  
+#include <arpa/inet.h>  
+#include <sys/ioctl.h>  
+#include <netdb.h>  
+  
+#ifdef SOLARIS  
+#include <sys/filio.h>  
+#endif  
+  
+typedef int SOCKET;  
+  
+#ifndef INVALID_SOCKET  
+#define INVALID_SOCKET -1  
+#endif  
+  
+#define waitms(x) usleep((x)*1000)  
+  
+#endif  
+  
+#ifndef FALSE  
+#define FALSE 0  
+#endif  
+#ifndef TRUE  
+#define TRUE !FALSE  
+#endif  
+#ifndef bool  
+#define bool int  
+#endif  
+  
+  
+#if defined(_DEBUG) || defined(DEBUG)  
+#ifndef FWSAMDEBUG  
+#define FWSAMDEBUG  
+#endif  
+#else  
+#endif  
+  
+  
+/* Official Snort PlugIn Number has been moved into plugin_enum.h */  
+  
+  
+/* fixed defines */  
+  
+#define FWSAM_DEFAULTPORT 898 /* Default port if user does not specify one in snort.conf */  
+ /* (Was unused last time I checked...) */  
+#define FWSAM_PACKETVERSION 14 /* version of the packet. Will increase with enhancements. */  
+  
+#define FWSAM_STATUS_CHECKIN 1 /* snort to fw */  
+#define FWSAM_STATUS_CHECKOUT 2  
+#define FWSAM_STATUS_BLOCK 3  
+#define FWSAM_STATUS_UNBLOCK 9  
+  
+#define FWSAM_STATUS_OK 4 /* fw to snort */  
+#define FWSAM_STATUS_ERROR 5  
+#define FWSAM_STATUS_NEWKEY 6  
+#define FWSAM_STATUS_RESYNC 7  
+#define FWSAM_STATUS_HOLD 8  
+  
+#define FWSAM_LOG_NONE 0  
+#define FWSAM_LOG_SHORTLOG 1  
+#define FWSAM_LOG_SHORTALERT 2  
+#define FWSAM_LOG_LONGLOG 3  
+#define FWSAM_LOG_LONGALERT 4  
+#define FWSAM_LOG (FWSAM_LOG_SHORTLOG|FWSAM_LOG_SHORTALERT|FWSAM_LOG_LONGLOG|FWSAM_LOG_LONGALERT)  
+#define FWSAM_WHO_DST 8  
+#define FWSAM_WHO_SRC 16  
+#define FWSAM_WHO (FWSAM_WHO_DST|FWSAM_WHO_SRC)  
+#define FWSAM_HOW_IN 32  
+#define FWSAM_HOW_OUT 64  
+#define FWSAM_HOW_INOUT (FWSAM_HOW_IN|FWSAM_HOW_OUT)  
+#define FWSAM_HOW_THIS 128  
+#define FWSAM_HOW (FWSAM_HOW_IN|FWSAM_HOW_OUT|FWSAM_HOW_THIS)  
+  
+  
+/* user adjustable defines */  
+  
+#define FWSAM_REPET_BLOCKS 10 /* Snort remembers this amount of last blocks and... */  
+#define FWSAM_REPET_TIME 20 /* ...checks if they fall within this time. If so,... */  
+ /* ...the blocking request is not send. */  
+  
+#define FWSAM_NETWAIT 300 /* 100th of a second. 3 sec timeout for network connections */  
+#define FWSAM_NETHOLD 6000 /* 100th of a second. 60 sec timeout for holding */  
+  
+#define SID_MAPFILE "sid-block.map"  
+#define SID_ALT_MAPFILE "sid-fwsam.map"  
+  
+#define FWSAM_FANCYFETCH /* This will invoke a fast sid lookup routine */  
+  
+  
+/* vars */  
+  
+typedef struct _FWsamstation /* structure of a mgmt station */  
+{ unsigned short myseqno;  
+ unsigned short stationseqno;  
+ unsigned char mykeymod[4];  
+ unsigned char fwkeymod[4];  
+ unsigned short stationport;  
+ //struct in_addr stationip;  
+ sfip_t stationip;  
+ struct sockaddr_in localsocketaddr;  
+ struct sockaddr_in stationsocketaddr;  
+ TWOFISH *stationfish;  
+ char initialkey[TwoFish_KEY_LENGTH+2];  
+ char stationkey[TwoFish_KEY_LENGTH+2];  
+ time_t lastcontact;  
+/* time_t sleepstart; */  
+} FWsamStation;  
+  
+typedef struct _FWsampacket /* 2 blocks (3rd block is header from TwoFish) */  
+{ unsigned short endiancheck; /* 0 */  
+ unsigned char srcip[4]; /* 2 */  
+ unsigned char dstip[4]; /* 6 */  
+ unsigned char duration[4]; /* 10 */  
+ unsigned char snortseqno[2]; /* 14 */  
+ unsigned char fwseqno[2]; /* 16 */  
+ unsigned char srcport[2]; /* 18 */  
+ unsigned char dstport[2]; /* 20 */  
+ unsigned char protocol[2]; /* 22 */  
+ unsigned char fwmode; /* 24 */  
+ unsigned char version; /* 25 */  
+ unsigned char status; /* 26 */  
+ unsigned char sig_id[4]; /* 27 */  
+ unsigned char fluff; /* 31 */  
+} FWsamPacket; /* 32 bytes in size */  
+  
+typedef struct _FWsamoptions /* snort rule options */  
+{ unsigned long sid;  
+ unsigned long duration;  
+ unsigned char who;  
+ unsigned char how;  
+ unsigned char loglevel;  
+} FWsamOptions;  
+  
+typedef struct _FWsamlistpointer  
+{ FWsamStation *station;  
+ struct _FWsamlistpointer *next;  
+} FWsamList;  
+  
+  
+/* functions */  
+void AlertFWsamSetup(void);  
+void AlertFWsamInit(char *args);  
+void AlertFWsamOptionInit(char *args,OptTreeNode *otn,int protocol);  
+void AlertFWsamCleanExitFunc(int signal, void *arg);  
+void AlertFWsamRestartFunc(int signal, void *arg);  
+void AlertFWsam(Packet *p, char *msg, void *arg, Event *event);  
+int FWsamCheckIn(FWsamStation *station);  
+void FWsamCheckOut(FWsamStation *station);  
+void FWsamNewStationKey(FWsamStation *station,FWsamPacket *packet);  
+void FWsamFixPacketEndian(FWsamPacket *p);  
+unsigned long FWsamParseDuration(char *p);  
+void FWsamFree(FWsamList *fwsamlist);  
+int FWsamStationExists(FWsamStation *who,FWsamList *list);  
+int FWsamReadLine(char *,unsigned long,FILE *);  
+void FWsamParseLine(FWsamOptions *,char *);  
+FWsamOptions *FWsamGetOption(unsigned long);  
+int FWsamParseOption(FWsamOptions *,char *);  
+  
+#endif /* __SPO_FWSAM_H__ */  
diff -ruN snort-2.9.2.2/src/plugbase.c snort-2.9.2.2_bkup/src/plugbase.c  
--- snort-2.9.2.2/src/plugbase.c 2012-03-17 14:40:16.000000000 -0700  
+++ snort-2.9.2.2_bkup/src/plugbase.c 2012-04-08 20:34:57.389687124 -0700  
@@ -130,6 +130,7 @@  
#endif  
 
#include "output-plugins/spo_alert_test.h"  
+#include "output-plugins/spo_alert_fwsam.h"  
 
extern ListHead *head_tmp;  
extern PreprocConfigFuncNode *preproc_config_funcs;  
@@ -1520,6 +1521,7 @@  
#endif  
 
AlertTestSetup();  
+ AlertFWsamSetup();  
}  
 
/****************************************************************************  
diff -ruN snort-2.9.2.2/src/plugin_enum.h snort-2.9.2.2_bkup/src/plugin_enum.h  
--- snort-2.9.2.2/src/plugin_enum.h 2012-01-12 14:11:40.000000000 -0800  
+++ snort-2.9.2.2_bkup/src/plugin_enum.h 2012-04-08 20:34:57.389687124 -0700  
@@ -60,6 +60,7 @@  
PLUGIN_URILEN_CHECK,  
PLUGIN_DYNAMIC,  
PLUGIN_FLOWBIT,  
+ PLUGIN_FWSAM,  
PLUGIN_FILE_DATA,  
PLUGIN_BASE64_DECODE,  
PLUGIN_MAX /* sentinel value */  
diff -ruN snort-2.9.2.2/src/twofish.c snort-2.9.2.2_bkup/src/twofish.c  
--- snort-2.9.2.2/src/twofish.c 1969-12-31 16:00:00.000000000 -0800  
+++ snort-2.9.2.2_bkup/src/twofish.c 2012-04-08 20:34:57.389687124 -0700  
@@ -0,0 +1,971 @@  
+/* $Id: twofish.c,v 2.1 2008/12/15 20:36:05 fknobbe Exp $  
+ *  
+ *  
+ * Copyright (C) 1997-2000 The Cryptix Foundation Limited.  
+ * Copyright (C) 2000 Farm9.  
+ * Copyright (C) 2001 Frank Knobbe.  
+ * All rights reserved.  
+ *  
+ * For Cryptix code:  
+ * Use, modification, copying and distribution of this software is subject  
+ * the terms and conditions of the Cryptix General Licence. You should have  
+ * received a copy of the Cryptix General Licence along with this library;  
+ * if not, you can download a copy from http://www.cryptix.org/ .  
+ *  
+ * For Farm9:  
+ * --- jojo@farm9.com, August 2000, converted from Java to C++, added CBC mode and  
+ * ciphertext stealing technique, added AsciiTwofish class for easy encryption  
+ * decryption of text strings  
+ *  
+ * Frank Knobbe <frank@knobbe.us>:  
+ * --- April 2001, converted from C++ to C, prefixed global variables  
+ * with TwoFish, substituted some defines, changed functions to make use of  
+ * variables supplied in a struct, modified and added routines for modular calls.  
+ * Cleaned up the code so that defines are used instead of fixed 16's and 32's.  
+ * Created two general purpose crypt routines for one block and multiple block  
+ * encryption using Joh's CBC code.  
+ * Added crypt routines that use a header (with a magic and data length).  
+ * (Basically a major rewrite).  
+ *  
+ * Note: Routines labeled _TwoFish are private and should not be used  
+ * (or with extreme caution).  
+ *  
+ */  
+  
+#ifndef __TWOFISH_LIBRARY_SOURCE__  
+#define __TWOFISH_LIBRARY_SOURCE__  
+  
+#include <string.h>  
+#include <stdlib.h>  
+#include <time.h>  
+#include <ctype.h>  
+#include <sys/types.h>  
+  
+#ifdef WIN32  
+  
+#ifndef u_long  
+typedef unsigned long u_long;  
+#endif  
+#ifndef u_int32_t  
+typedef unsigned long u_int32_t;  
+#endif  
+#ifndef u_word  
+typedef unsigned short u_word;  
+#endif  
+#ifndef u_int16_t  
+typedef unsigned short u_int16_t;  
+#endif  
+#ifndef u_char  
+typedef unsigned char u_char;  
+#endif  
+#ifndef u_int8_t  
+typedef unsigned char u_int8_t;  
+#endif  
+  
+#endif /* WIN32 */  
+  
+#include "twofish.h"  
+  
+  
+bool TwoFish_srand=TRUE; /* if TRUE, first call of TwoFishInit will seed rand(); */  
+ /* of TwoFishInit */  
+  
+/* Fixed 8x8 permutation S-boxes */  
+static const u_int8_t TwoFish_P[2][256] =  
+{  
+ { /* p0 */  
+ 0xA9, 0x67, 0xB3, 0xE8, 0x04, 0xFD, 0xA3, 0x76, 0x9A, 0x92, 0x80, 0x78,  
+ 0xE4, 0xDD, 0xD1, 0x38, 0x0D, 0xC6, 0x35, 0x98, 0x18, 0xF7, 0xEC, 0x6C,  
+ 0x43, 0x75, 0x37, 0x26, 0xFA, 0x13, 0x94, 0x48, 0xF2, 0xD0, 0x8B, 0x30,  
+ 0x84, 0x54, 0xDF, 0x23, 0x19, 0x5B, 0x3D, 0x59, 0xF3, 0xAE, 0xA2, 0x82,  
+ 0x63, 0x01, 0x83, 0x2E, 0xD9, 0x51, 0x9B, 0x7C, 0xA6, 0xEB, 0xA5, 0xBE,  
+ 0x16, 0x0C, 0xE3, 0x61, 0xC0, 0x8C, 0x3A, 0xF5, 0x73, 0x2C, 0x25, 0x0B,  
+ 0xBB, 0x4E, 0x89, 0x6B, 0x53, 0x6A, 0xB4, 0xF1, 0xE1, 0xE6, 0xBD, 0x45,  
+ 0xE2, 0xF4, 0xB6, 0x66, 0xCC, 0x95, 0x03, 0x56, 0xD4, 0x1C, 0x1E, 0xD7,  
+ 0xFB, 0xC3, 0x8E, 0xB5, 0xE9, 0xCF, 0xBF, 0xBA, 0xEA, 0x77, 0x39, 0xAF,  
+ 0x33, 0xC9, 0x62, 0x71, 0x81, 0x79, 0x09, 0xAD, 0x24, 0xCD, 0xF9, 0xD8,  
+ 0xE5, 0xC5, 0xB9, 0x4D, 0x44, 0x08, 0x86, 0xE7, 0xA1, 0x1D, 0xAA, 0xED,  
+ 0x06, 0x70, 0xB2, 0xD2, 0x41, 0x7B, 0xA0, 0x11, 0x31, 0xC2, 0x27, 0x90,  
+ 0x20, 0xF6, 0x60, 0xFF, 0x96, 0x5C, 0xB1, 0xAB, 0x9E, 0x9C, 0x52, 0x1B,  
+ 0x5F, 0x93, 0x0A, 0xEF, 0x91, 0x85, 0x49, 0xEE, 0x2D, 0x4F, 0x8F, 0x3B,  
+ 0x47, 0x87, 0x6D, 0x46, 0xD6, 0x3E, 0x69, 0x64, 0x2A, 0xCE, 0xCB, 0x2F,  
+ 0xFC, 0x97, 0x05, 0x7A, 0xAC, 0x7F, 0xD5, 0x1A, 0x4B, 0x0E, 0xA7, 0x5A,  
+ 0x28, 0x14, 0x3F, 0x29, 0x88, 0x3C, 0x4C, 0x02, 0xB8, 0xDA, 0xB0, 0x17,  
+ 0x55, 0x1F, 0x8A, 0x7D, 0x57, 0xC7, 0x8D, 0x74, 0xB7, 0xC4, 0x9F, 0x72,  
+ 0x7E, 0x15, 0x22, 0x12, 0x58, 0x07, 0x99, 0x34, 0x6E, 0x50, 0xDE, 0x68,  
+ 0x65, 0xBC, 0xDB, 0xF8, 0xC8, 0xA8, 0x2B, 0x40, 0xDC, 0xFE, 0x32, 0xA4,  
+ 0xCA, 0x10, 0x21, 0xF0, 0xD3, 0x5D, 0x0F, 0x00, 0x6F, 0x9D, 0x36, 0x42,  
+ 0x4A, 0x5E, 0xC1, 0xE0  
+ },  
+ { /* p1 */  
+ 0x75, 0xF3, 0xC6, 0xF4, 0xDB, 0x7B, 0xFB, 0xC8, 0x4A, 0xD3, 0xE6, 0x6B,  
+ 0x45, 0x7D, 0xE8, 0x4B, 0xD6, 0x32, 0xD8, 0xFD, 0x37, 0x71, 0xF1, 0xE1,  
+ 0x30, 0x0F, 0xF8, 0x1B, 0x87, 0xFA, 0x06, 0x3F, 0x5E, 0xBA, 0xAE, 0x5B,  
+ 0x8A, 0x00, 0xBC, 0x9D, 0x6D, 0xC1, 0xB1, 0x0E, 0x80, 0x5D, 0xD2, 0xD5,  
+ 0xA0, 0x84, 0x07, 0x14, 0xB5, 0x90, 0x2C, 0xA3, 0xB2, 0x73, 0x4C, 0x54,  
+ 0x92, 0x74, 0x36, 0x51, 0x38, 0xB0, 0xBD, 0x5A, 0xFC, 0x60, 0x62, 0x96,  
+ 0x6C, 0x42, 0xF7, 0x10, 0x7C, 0x28, 0x27, 0x8C, 0x13, 0x95, 0x9C, 0xC7,  
+ 0x24, 0x46, 0x3B, 0x70, 0xCA, 0xE3, 0x85, 0xCB, 0x11, 0xD0, 0x93, 0xB8,  
+ 0xA6, 0x83, 0x20, 0xFF, 0x9F, 0x77, 0xC3, 0xCC, 0x03, 0x6F, 0x08, 0xBF,  
+ 0x40, 0xE7, 0x2B, 0xE2, 0x79, 0x0C, 0xAA, 0x82, 0x41, 0x3A, 0xEA, 0xB9,  
+ 0xE4, 0x9A, 0xA4, 0x97, 0x7E, 0xDA, 0x7A, 0x17, 0x66, 0x94, 0xA1, 0x1D,  
+ 0x3D, 0xF0, 0xDE, 0xB3, 0x0B, 0x72, 0xA7, 0x1C, 0xEF, 0xD1, 0x53, 0x3E,  
+ 0x8F, 0x33, 0x26, 0x5F, 0xEC, 0x76, 0x2A, 0x49, 0x81, 0x88, 0xEE, 0x21,  
+ 0xC4, 0x1A, 0xEB, 0xD9, 0xC5, 0x39, 0x99, 0xCD, 0xAD, 0x31, 0x8B, 0x01,  
+ 0x18, 0x23, 0xDD, 0x1F, 0x4E, 0x2D, 0xF9, 0x48, 0x4F, 0xF2, 0x65, 0x8E,  
+ 0x78, 0x5C, 0x58, 0x19, 0x8D, 0xE5, 0x98, 0x57, 0x67, 0x7F, 0x05, 0x64,  
+ 0xAF, 0x63, 0xB6, 0xFE, 0xF5, 0xB7, 0x3C, 0xA5, 0xCE, 0xE9, 0x68, 0x44,  
+ 0xE0, 0x4D, 0x43, 0x69, 0x29, 0x2E, 0xAC, 0x15, 0x59, 0xA8, 0x0A, 0x9E,  
+ 0x6E, 0x47, 0xDF, 0x34, 0x35, 0x6A, 0xCF, 0xDC, 0x22, 0xC9, 0xC0, 0x9B,  
+ 0x89, 0xD4, 0xED, 0xAB, 0x12, 0xA2, 0x0D, 0x52, 0xBB, 0x02, 0x2F, 0xA9,  
+ 0xD7, 0x61, 0x1E, 0xB4, 0x50, 0x04, 0xF6, 0xC2, 0x16, 0x25, 0x86, 0x56,  
+ 0x55, 0x09, 0xBE, 0x91  
+ }  
+};  
+  
+static bool TwoFish_MDSready=FALSE;  
+static u_int32_t TwoFish_MDS[4][256]; /* TwoFish_MDS matrix */  
+  
+  
+#define TwoFish_LFSR1(x) (((x)>>1)^(((x)&0x01)?TwoFish_MDS_GF_FDBK/2:0))  
+#define TwoFish_LFSR2(x) (((x)>>2)^(((x)&0x02)?TwoFish_MDS_GF_FDBK/2:0)^(((x)&0x01)?TwoFish_MDS_GF_FDBK/4:0))  
+  
+#define TwoFish_Mx_1(x) ((u_int32_t)(x)) /* force result to dword so << will work */  
+#define TwoFish_Mx_X(x) ((u_int32_t)((x)^TwoFish_LFSR2(x))) /* 5B */  
+#define TwoFish_Mx_Y(x) ((u_int32_t)((x)^TwoFish_LFSR1(x)^TwoFish_LFSR2(x))) /* EF */  
+#define TwoFish_RS_rem(x) { u_int8_t b=(u_int8_t)(x>>24); u_int32_t g2=((b<<1)^((b&0x80)?TwoFish_RS_GF_FDBK:0))&0xFF; u_int32_t g3=((b>>1)&0x7F)^((b&1)?TwoFish_RS_GF_FDBK>>1:0)^g2; x=(x<<8)^(g3<<24)^(g2<<16)^(g3<<8)^b; }  
+  
+/*#define TwoFish__b(x,N) (((u_int8_t *)&x)[((N)&3)^TwoFish_ADDR_XOR])*/ /* pick bytes out of a dword */  
+  
+#define TwoFish_b0(x) TwoFish__b(x,0) /* extract LSB of u_int32_t */  
+#define TwoFish_b1(x) TwoFish__b(x,1)  
+#define TwoFish_b2(x) TwoFish__b(x,2)  
+#define TwoFish_b3(x) TwoFish__b(x,3) /* extract MSB of u_int32_t */  
+  
+u_int8_t TwoFish__b(u_int32_t x,int n)  
+{ n&=3;  
+ while(n-->0)  
+ x>>=8;  
+ return (u_int8_t)x;  
+}  
+  
+  
+/* TwoFish Initialization  
+ *  
+ * This routine generates a global data structure for use with TwoFish,  
+ * initializes important values (such as subkeys, sBoxes), generates subkeys  
+ * and precomputes the MDS matrix if not already done.  
+ *  
+ * Input: User supplied password (will be appended by default password of 'SnortHas2FishEncryptionRou