rblibtorrent, deluge: broken for ages, moved to abandoned github feed
rblibtorrent, deluge: broken for ages, moved to abandoned github feed

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

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

#  
# Copyright (C) 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:=lttng-tools  
PKG_VERSION:=2.1.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)  
PKG_MD5SUM:=cfc35db9eb2d4ae09a65c006a70204f6  
PKG_FIXUP:=autoreconf  
 
PKG_USE_MIPS16:=0  
PKG_BUILD_PARALLEL:=1  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/lttng-tools  
SECTION:=devel  
CATEGORY:=Development  
DEPENDS:=+lttng-ust +libpopt  
TITLE:=LTTng tracing tools  
URL:=https://lttng.org/  
endef  
 
TARGET_LDFLAGS += -lurcu-bp  
 
define Package/lttng-tools/description  
LTTng Userspace Tracing Library  
endef  
 
define Package/lttng-tools/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ctl.so.* $(1)/usr/lib/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lttng $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lttng* $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,lttng-tools))  
 
Make sync_file_range() usage optional  
 
Under uClibc, sync_file_range() is not available under all  
architectures, so we fall back to fdatasync() in this case.  
 
Inspired by the patch done by Thomas Petazzoni for the  
2.0-pre25 version.  
 
Signed-off-by: Samuel Martin <s.martin49@gmail.com>  
---  
configure.ac | 2 +-  
src/common/compat/fcntl.h | 5 +++++  
2 files changed, 6 insertions(+), 1 deletion(-)  
 
--- a/configure.ac  
+++ b/configure.ac  
@@ -150,7 +150,7 @@ AS_IF([test "x$lttng_ust_support" = "xye  
)  
])  
AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])  
-AC_CHECK_FUNCS([sched_getcpu sysconf])  
+AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])  
 
# check for dlopen  
AC_CHECK_LIB([dl], [dlopen],  
@@ -394,4 +394,3 @@ AS_IF([test "x$consumerd_only" = "xno"],  
])  
 
AS_ECHO()  
-  
--- a/src/common/compat/compat-fcntl.c  
+++ b/src/common/compat/compat-fcntl.c  
@@ -23,7 +23,11 @@  
int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,  
unsigned int flags)  
{  
+#ifdef HAVE_SYNC_FILE_RANGE  
return sync_file_range(fd, offset, nbytes, flags);  
+#else  
+ return fdatasync(fd);  
+#endif  
}  
 
#endif /* __linux__ */  
 
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) 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/check/Makefile (deleted)
#  
# Copyright (C) 2008-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:=check  
PKG_VERSION:=0.9.8  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/check  
PKG_MD5SUM:=5d75e9a6027cde79d2c339ef261e7470  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
TARGET_CFLAGS += $(FPIC)  
 
define Package/check  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Unit testing framework for C  
URL:=http://check.sourceforge.net/  
DEPENDS:= +libpthread  
endef  
 
define Package/check/description  
Check features a simple interface for defining unit tests, putting little in  
the way of the developer. Tests are run in a separate address space, so Check  
can catch both assertion failures and code errors that cause segmentation  
faults or other signals. The output from unit tests can be used within source  
code editors and IDEs.  
endef  
 
define Build/Configure  
$(CP) $(SCRIPT_DIR)/config.* $(PKG_BUILD_DIR)/build-aux/  
$(call Build/Configure/Default)  
endef  
 
define Build/Install  
$(call Build/Install/Default)  
cd $(PKG_INSTALL_DIR)/usr/lib/ ; ln -nsf libcheck.so libcheck_pic.so  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)  
$(CP) $(PKG_INSTALL_DIR)/* $(1)/  
endef  
 
define Package/check/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcheck.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,check))  
 
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)  
 
# #
# Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2006-2010 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
   
PKG_NAME:=clearsilver PKG_NAME:=clearsilver
PKG_VERSION:=0.10.5 PKG_VERSION:=0.10.5
PKG_RELEASE:=5 PKG_RELEASE:=5
   
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.clearsilver.net/downloads/ PKG_SOURCE_URL:=http://www.clearsilver.net/downloads/
PKG_MD5SUM:=b8c0c7fbe0ef5e06e0c935f134304d44 PKG_MD5SUM:=b8c0c7fbe0ef5e06e0c935f134304d44
   
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_CLEARSILVER_ENABLE_COMPRESSION \ CONFIG_CLEARSILVER_ENABLE_COMPRESSION \
CONFIG_CLEARSILVER_ENABLE_REMOTE_DEBUGGER \ CONFIG_CLEARSILVER_ENABLE_REMOTE_DEBUGGER \
CONFIG_CLEARSILVER_ENABLE_GETTEXT CONFIG_CLEARSILVER_ENABLE_GETTEXT
   
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=0 PKG_BUILD_PARALLEL:=0
   
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
   
define Package/clearsilver define Package/clearsilver
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=ClearSilver template system TITLE:=ClearSilver template system
URL:=http://www.clearsilver.net/ URL:=http://www.clearsilver.net/
MAINTAINER:=Raphaël HUCK <rhk@cksum.org>
DEPENDS:=+CLEARSILVER_ENABLE_COMPRESSION:zlib +CLEARSILVER_ENABLE_GETTEXT:libintl DEPENDS:=+CLEARSILVER_ENABLE_COMPRESSION:zlib +CLEARSILVER_ENABLE_GETTEXT:libintl
endef endef
   
define Package/clearsilver/config define Package/clearsilver/config
menu "Configuration" menu "Configuration"
depends on PACKAGE_clearsilver depends on PACKAGE_clearsilver
source "$(SOURCE)/Config.in" source "$(SOURCE)/Config.in"
endmenu endmenu
endef endef
   
define Package/clearsilver/description define Package/clearsilver/description
Clearsilver is a fast, powerful, and language-neutral HTML template system. In Clearsilver is a fast, powerful, and language-neutral HTML template system. In
both static content sites and dynamic HTML applications, it provides a separation both static content sites and dynamic HTML applications, it provides a separation
between presentation code and application logic which makes working with your between presentation code and application logic which makes working with your
project easier. project easier.
endef endef
   
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--disable-wdb \ --disable-wdb \
--disable-apache \ --disable-apache \
--disable-python \ --disable-python \
--disable-perl \ --disable-perl \
--disable-ruby \ --disable-ruby \
--disable-java \ --disable-java \
--disable-csharp \ --disable-csharp \
--prefix=/usr --prefix=/usr
   
ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_COMPRESSION),y) ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_COMPRESSION),y)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-compression --enable-compression
else else
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--disable-compression --disable-compression
endif endif
   
ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_REMOTE_DEBUGGER),y) ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_REMOTE_DEBUGGER),y)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-remote-debugger --enable-remote-debugger
else else
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--disable-remote-debugger --disable-remote-debugger
endif endif
   
ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_GETTEXT),y) ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_GETTEXT),y)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-gettext --enable-gettext
else else
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--disable-gettext --disable-gettext
endif endif
   
TARGET_CFLAGS+=$(FPIC) TARGET_CFLAGS+=$(FPIC)
   
MAKE_FLAGS+= \ MAKE_FLAGS+= \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
AR="$(AR) cr" \ AR="$(AR) cr" \
LD="$(TARGET_CC) -o" \ LD="$(TARGET_CC) -o" \
OSTYPE=Linux OSTYPE=Linux
   
define Build/InstallDev define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/* $(1)/ $(CP) $(PKG_INSTALL_DIR)/* $(1)/
endef endef
   
define Package/clearsilver/install define Package/clearsilver/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
endef endef
   
$(eval $(call BuildPackage,clearsilver)) $(eval $(call BuildPackage,clearsilver))
   
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/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 */  
 
file:a/libs/libnfc/Makefile (deleted)
#  
# Copyright (C) 2010-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:=libnfc  
PKG_VERSION:=1.7.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=http://libnfc.googlecode.com/files  
PKG_MD5SUM:=8d8aced79cc0859c605c04d59e4484b3  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libnfc/Default  
TITLE:=Near Field Communication (NFC) library  
URL:=http://www.libnfc.org  
endef  
 
define Package/libnfc  
$(call Package/libnfc/Default)  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=+libusb-compat +pcscd +ccid  
endef  
 
define Package/libnfc/description  
libnfc is a free software library used to handle NFC capable devices.  
It supports the four main NFC modulations:  
* ISO14443-A (NXP MIFARE),  
* ISO14443-B,  
* JIS X 6319-4 (Sony Felica) and  
* Jewel Topaz (Innovision Research & Development).  
And depending on hardware, it supports:  
* Read (RFID @13.56Mhz),  
* Emulation and  
* Peer2Peer mode.  
endef  
 
define Package/libnfc-bin  
$(call Package/libnfc/Default)  
TITLE+= (binaries)  
SECTION:=utils  
CATEGORY:=Utilities  
DEPENDS:=+libnfc  
endef  
 
define Package/libnfc-bin/description  
libnfc is provided with some useful tools:  
* nfc-list: target listing;  
* nfc-mfclassic: Mifare Classic operations;  
* nfc-mfultralight: Mifare Ultralight operations.  
endef  
 
define Package/libnfc-examples  
$(call Package/libnfc/Default)  
TITLE+= (examples)  
SECTION:=utils  
CATEGORY:=Utilities  
DEPENDS:=+libnfc  
endef  
 
define Package/libnfc-examples/description  
libnfc is provided with some examples like:  
* various targets emulation;  
* NFC frames relay (ie. over network);  
* manually done anticollision;  
* etc.  
endef  
 
TARGET_CFLAGS += $(FPIC)  
CONFIGURE_ARGS += --without-readline  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/nfc $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfc.{a,so*} $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnfc.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libnfc/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfc.so.* $(1)/usr/lib/  
endef  
 
define Package/libnfc-bin/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-list $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-mfclassic $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-mfultralight $(1)/usr/bin/  
endef  
 
define Package/libnfc-examples/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-anticol $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-dep-initiator $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-dep-target $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-forum-tag4 $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-tag $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-uid $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-poll $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-relay $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-relay-picc $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,libnfc))  
$(eval $(call BuildPackage,libnfc-bin))  
$(eval $(call BuildPackage,libnfc-examples))  
 
file:a/libs/lttng-ust/Makefile (deleted)
#  
# Copyright (C) 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:=lttng-ust  
PKG_VERSION:=2.1.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)  
PKG_MD5SUM:=2032e66f3438949c51ec9922c6f8542b  
 
PKG_BUILD_PARALLEL:=1  
PKG_USE_MIPS16:=0  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/lttng-ust  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=+liburcu +libuuid +librt  
TITLE:=LTTng Userspace Tracing Library  
URL:=https://lttng.org/  
endef  
 
define Package/lttng-ust/description  
LTTng Userspace Tracing Library  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/lttng* $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ust*.{a,so*} $(1)/usr/lib/  
endef  
 
define Package/lttng-ust/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ust*.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,lttng-ust))  
 
diff -urN lttng-ust-2.1.0/Makefile.am lttng-ust-2.1.0.new/Makefile.am  
--- lttng-ust-2.1.0/Makefile.am 2012-12-10 21:29:20.000000000 +0100  
+++ lttng-ust-2.1.0.new/Makefile.am 2013-01-14 14:25:41.923661688 +0100  
@@ -5,9 +5,7 @@  
liblttng-ust-ctl \  
liblttng-ust-fork \  
liblttng-ust-libc-wrapper \  
- tools \  
- tests \  
- doc  
+ tools  
 
if BUILD_JNI_INTERFACE  
SUBDIRS += liblttng-ust-java  
diff -urN lttng-ust-2.1.0/Makefile.in lttng-ust-2.1.0.new/Makefile.in  
--- lttng-ust-2.1.0/Makefile.in 2012-12-20 19:24:57.000000000 +0100  
+++ lttng-ust-2.1.0.new/Makefile.in 2013-01-14 14:25:31.247661789 +0100  
@@ -135,7 +135,7 @@  
CTAGS = ctags  
DIST_SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \  
liblttng-ust liblttng-ust-ctl liblttng-ust-fork \  
- liblttng-ust-libc-wrapper tools tests doc liblttng-ust-java  
+ liblttng-ust-libc-wrapper tools liblttng-ust-java  
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)  
distdir = $(PACKAGE)-$(VERSION)  
top_distdir = $(distdir)  
@@ -307,7 +307,7 @@  
ACLOCAL_AMFLAGS = -I config  
SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \  
liblttng-ust liblttng-ust-ctl liblttng-ust-fork \  
- liblttng-ust-libc-wrapper tools tests doc $(am__append_1)  
+ liblttng-ust-libc-wrapper tools $(am__append_1)  
 
#temporarily disabled  
# liblttng-ust-malloc  
 
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/ortp/Makefile (deleted)
#  
# Copyright (C) 2010-2014 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=ortp  
PKG_VERSION:=0.16.3  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:= \  
http://download.savannah.gnu.org/releases-noredirect/linphone/ortp/sources/ \  
http://www.very-clever.com/download/nongnu/linphone/ortp/sources/  
PKG_MD5SUM:=2b0281600cb958d1c94e318a86b62fe3  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libortp  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Real-time Transport Protocol (RTP) library  
URL:=http://www.linphone.org/index.php/eng/code_review/ortp  
DEPENDS:= +libpthread  
endef  
 
ifneq ($(CONFIG_avr32),)  
TARGET_CFLAGS += -fsigned-char  
endif  
 
CONFIGURE_ARGS += \  
--disable-debug \  
--enable-ipv6 \  
--enable-perf \  
--disable-ssl-hmac \  
--disable-so-reuseaddr \  
--without-srtp \  
 
CONFIGURE_VARS += \  
ac_cv_header_srtp_srtp_h=no \  
ac_cv_lib_srtp_srtp_init=no \  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
( cd $(PKG_INSTALL_DIR); $(CP) \  
./usr/include/ortp \  
$(1)/usr/include/ \  
)  
$(INSTALL_DIR) $(1)/usr/lib  
( cd $(PKG_INSTALL_DIR); $(CP) \  
./usr/lib/libortp.{a,so*} \  
$(1)/usr/lib/ \  
)  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
( cd $(PKG_INSTALL_DIR); $(CP) \  
./usr/lib/pkgconfig/ortp.pc \  
$(1)/usr/lib/pkgconfig/ \  
)  
endef  
 
define Package/libortp/install  
$(INSTALL_DIR) $(1)/usr/lib  
( cd $(PKG_INSTALL_DIR); $(CP) \  
./usr/lib/libortp.so.* \  
$(1)/usr/lib/ \  
)  
endef  
 
$(eval $(call BuildPackage,libortp))  
 
--- a/src/stun.c  
+++ b/src/stun.c  
@@ -399,7 +399,7 @@ stunParseMessage( char* buf, unsigned in  
char* body;  
unsigned int size;  
ortp_debug("stun: Received stun message: %i bytes\n", bufLen);  
- memset(msg, 0, sizeof(msg));  
+ memset(msg, 0, sizeof(*msg));  
 
if (sizeof(StunMsgHdr) > bufLen)  
{  
 
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))  
 
#  
# Copyright (C) 2007 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
# $Id: Makefile 9173 2007-10-07 03:20:26Z blogic $  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=rblibtorrent  
PKG_VERSION:=0.14.7  
PKG_RELEASE:=1  
 
PKG_SOURCE:=libtorrent-rasterbar-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/libtorrent  
PKG_MD5SUM:=6959f719245d82758235fd73d93373b2  
PKG_BUILD_DIR:=$(BUILD_DIR)/libtorrent-rasterbar-$(PKG_VERSION)  
PKG_BUILD_DEPENDS:=libtool  
BOOSTPOSTFIX=mt  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/rblibtorrent  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Rasterbar BitTorrent library  
URL:=http://www.rasterbar.com/products/libtorrent/  
DEPENDS:=+boost +boost-python +boost-filesystem +boost-regex +boost-thread +boost-program_options +boost-system +libopenssl @BROKEN  
endef  
 
define Package/rblibtorrent/description  
Rasterbar libtorrent is a C++ library that aims to be a good alternative to  
all the other bittorrent implementations around. It is a library and not a  
full featured client, although it comes with a working example client.  
endef  
 
CONFIGURE_ARGS+= \  
--enable-shared \  
--disable-debug \  
--enable-python-binding \  
--with-ssl=$(STAGING_DIR)/usr \  
--with-boost=$(STAGING_DIR)/usr/include \  
--with-boost-libdir=$(STAGING_DIR)/usr/lib \  
--with-zlib=detect \  
--with-boost-system=boost_system-$(BOOSTPOSTFIX) \  
--with-boost-filesystem=boost_filesystem-$(BOOSTPOSTFIX) \  
--with-boost-thread=boost_thread-$(BOOSTPOSTFIX) \  
--with-boost-regex=boost_regex-$(BOOSTPOSTFIX) \  
--with-boost-python=boost_python-$(BOOSTPOSTFIX) \  
--with-boost-program_options=boost_program_options-$(BOOSTPOSTFIX)  
 
CONFIGURE_VARS+=CC="$(TARGET_CXX)"  
 
EXTRA_LDFLAGS+=-lz -lpthread  
 
define Build/Compile  
$(call Build/Compile/Default)  
$(call Build/Install/Default)  
endef  
 
define Build/InstallDev  
mkdir -p $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/libtorrent $(1)/usr/include/  
mkdir -p $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/  
mkdir -p $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent-rasterbar.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/rblibtorrent/install  
$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/lib/python2.6/site-packages/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.6/site-packages/*.so* $(1)/usr/lib/python2.6/site-packages/  
endef  
 
$(eval $(call BuildPackage,rblibtorrent))  
 
--- libtorrent-rasterbar-0.14.7/bindings/python/Makefile.in 2009-11-18 09:25:39.000000000 +0100  
+++ libtorrent-rasterbar-0.14.7/bindings/python/Makefile.in 2010-02-26 13:27:58.000000000 +0100  
@@ -408,7 +408,7 @@  
 
 
@ENABLE_PYTHON_BINDING_TRUE@all-local:  
-@ENABLE_PYTHON_BINDING_TRUE@ $(PYTHON) setup.py build  
+@ENABLE_PYTHON_BINDING_TRUE@ CXX="$(CXX) -pthread -shared" $(PYTHON) setup.py build  
 
@ENABLE_PYTHON_BINDING_TRUE@install-exec-local:  
@ENABLE_PYTHON_BINDING_TRUE@ $(PYTHON) setup.py install @PYTHON_INSTALL_PARAMS@  
 
file:a/mail/alpine/Makefile (deleted)
#  
# Copyright (C) 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:=alpine  
PKG_VERSION:=2.11  
PKG_RELEASE:=1  
 
PKG_SOURCE_URL:=http://patches.freeiz.com/alpine/release/src/  
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz  
PKG_MD5SUM:=a3bba218787691080d706b36215eec06  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/alpine  
SECTION:=mail  
CATEGORY:=Mail  
DEPENDS:=+libopenssl +libncurses +libpthread +libpam  
TITLE:=Alternatively Licensed Program for Internet News and Email  
URL:=http://www.washington.edu/alpine  
endef  
 
define Package/alpine/description  
Alpine (Alternatively Licenced Program for Internet News and Email) is a  
free software email client developed at the University of Washington.  
It is suitable for both the inexperienced email user as well as for  
the most demanding power user.  
endef  
 
CONFIGURE_ARGS += \  
--with-ssl-include-dir=$(STAGING_DIR)/usr/include/openssl/. \  
--with-ssl-lib-dir=$(STAGING_DIR)/usr/lib \  
--without-tcl \  
--without-ldap \  
--without-krb5 \  
--with-system-pinerc=/etc/pine.conf \  
--with-system-fixed-pinerc=/etc/pine.conf.fixed \  
--disable-debug \  
--disable-mouse \  
--with-c-client-target=slx \  
 
ifeq ($(CONFIG_IPV6),y)  
DISABLE_IPV6:=  
else  
DISABLE_IPV6:=--without-ipv6  
endif  
 
define Build/Compile  
( cd $(PKG_BUILD_DIR)/pith ; \  
$(HOSTCC) help_h_gen.c -c -o help_h_gen.o ; \  
$(HOSTCC) help_h_gen.o -o help_h_gen ; \  
$(HOSTCC) help_c_gen.c -c -o help_c_gen.o ; \  
$(HOSTCC) help_c_gen.o -o help_c_gen ; \  
)  
$(call Build/Compile/Default)  
endef  
 
define Package/alpine/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/alpine $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,alpine))  
 
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) 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:=aircrack-ng  
PKG_VERSION:=1.1  
PKG_RELEASE:=3  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://download.aircrack-ng.org/ \  
http://archive.aircrack-ng.org/aircrack-ng/$(PKG_VERSION)/  
PKG_MD5SUM:=f7a24ed8fad122c4187d06bfd6f998b4  
 
PKG_BUILD_PARALLEL:=0  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/aircrack-ng  
SECTION:=net  
CATEGORY:=Network  
DEPENDS:=+libpthread +libopenssl +libpcap  
TITLE:=next generation of aircrack with new features  
URL:=http://www.aircrack-ng.org/  
SUBMENU:=wireless  
endef  
 
define Package/aircrack-ng/description  
Aircrack-ng is the next generation of aircrack with new features  
endef  
 
MAKE_FLAGS += \  
CFLAGS="$(TARGET_CFLAGS) -Wall -Iinclude/ $(TARGET_CPPFLAGS) -D_REVISION=0" \  
LDFLAGS="$(TARGET_LDFLAGS)" \  
OSNAME=Linux \  
prefix="/usr" \  
sqlite="false" \  
unstable="true"  
 
define Package/aircrack-ng/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/  
$(INSTALL_DIR) $(1)/usr/sbin  
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/  
endef  
 
$(eval $(call BuildPackage,aircrack-ng))  
 
--- a/src/aireplay-ng.c  
+++ b/src/aireplay-ng.c  
@@ -200,7 +200,9 @@ char usage[] =  
"\n"  
" Miscellaneous options:\n"  
"\n"  
-" -R : disable /dev/rtc usage\n"  
+" -R : disable /dev/rtc usage\n"  
+" --ignore-negative-one : if the interface's channel can't be determined,\n"  
+" ignore the mismatch, needed for unpatched cfg80211\n"  
"\n"  
" Attack modes (numbers can still be used):\n"  
"\n"  
@@ -268,6 +270,7 @@ struct options  
int bittest;  
 
int nodetect;  
+ int ignore_negative_one;  
int rtc;  
}  
opt;  
@@ -715,6 +718,13 @@ int attack_check(uchar* bssid, char* ess  
 
iface_chan = wi_get_channel(wi);  
 
+ if(iface_chan == -1 && !opt.ignore_negative_one)  
+ {  
+ PCT; printf("Couldn't determine current channel for %s, you should either force the operation with --ignore-negative-one or apply a kernel patch\n",  
+ wi_get_ifname(wi));  
+ return -1;  
+ }  
+  
if(bssid != NULL)  
{  
ap_chan = wait_for_beacon(bssid, capa, essid);  
@@ -723,7 +733,7 @@ int attack_check(uchar* bssid, char* ess  
PCT; printf("No such BSSID available.\n");  
return -1;  
}  
- if(ap_chan != iface_chan)  
+ if((ap_chan != iface_chan) && (iface_chan != -1 || !opt.ignore_negative_one))  
{  
PCT; printf("%s is on channel %d, but the AP uses channel %d\n", wi_get_ifname(wi), iface_chan, ap_chan);  
return -1;  
@@ -5765,6 +5775,7 @@ int main( int argc, char *argv[] )  
{"help", 0, 0, 'H'},  
{"fast", 0, 0, 'F'},  
{"bittest", 0, 0, 'B'},  
+ {"ignore-negative-one", 0, &opt.ignore_negative_one, 1},  
{0, 0, 0, 0 }  
};  
 
 
file:a/net/aodv-uu/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  
include $(INCLUDE_DIR)/kernel.mk  
 
PKG_NAME:=aodv-uu  
PKG_VERSION:=0.9.3  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://core.it.uu.se/core/files/  
PKG_MD5SUM:=05460543054449cb4b170252a7168c65  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/aodv-uu/Default  
TITLE:=Ad-hoc On-demand Distance Vector Routing  
DEPENDS:=@BROKEN  
URL:=http://core.it.uu.se/core/index.php/AODV-UU  
endef  
 
define Package/aodv-uu/Default/description  
AODV is the Ad-hoc On-demand Distance Vector routing protocol  
implementation created at Uppsala University.  
endef  
 
define Package/aodv-uu  
$(call Package/aodv-uu/Default)  
SECTION:=net  
CATEGORY:=Network  
TITLE+= (daemon)  
endef  
 
define Package/aodv-uu/description  
$(call Package/aodv-uu/Default/description)  
This package contains the AODV userland daemon.  
endef  
 
define KernelPackage/aodv-uu  
$(call Package/aodv-uu/Default)  
TITLE+= (kernel module)  
FILES:=$(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX)  
SUBMENU:=Network Support  
AUTOLOAD:=$(call AutoLoad,80,$(shell cat ./files/aodv-uu.modules))  
endef  
 
define KernelPackage/aodv-uu/description  
$(call Package/aodv-uu/Default/description)  
This package contains the AODV kernel module.  
endef  
 
ifneq ($(CONFIG_LINUX_2_4),y)  
define Build/Compile/linux26  
$(MAKE) -C $(LINUX_DIR) \  
ARCH="$(LINUX_KARCH)" \  
CROSS_COMPILE="$(TARGET_CROSS)" \  
PATCHLEVEL="$(LINUX_VERSION)" \  
KERNDIR="$(LINUX_DIR)" \  
SUBDIRS="$(PKG_BUILD_DIR)/lnx" \  
modules  
endef  
else  
# We assume 2.4 builds are only for brcm-2.4 yet  
define Build/Compile/linux24-brcm  
$(call Build/Compile/Default,\  
KERNEL_DIR="$(LINUX_DIR)" \  
KCC="$(TARGET_CC)" \  
CFLAGS="$(TARGET_CFLAGS)" \  
kaodv-mips \  
)  
cp $(PKG_BUILD_DIR)/lnx/kaodv-mips.$(LINUX_KMOD_SUFFIX) $(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX)  
endef  
endif  
 
define Build/Compile  
$(call Build/Compile/linux26)  
$(call Build/Compile/linux24-brcm)  
$(call Build/Compile/Default,\  
KERNEL_DIR="$(LINUX_DIR)" \  
KCC="$(TARGET_CC)" \  
CFLAGS="$(TARGET_CFLAGS)" \  
aodvd \  
)  
endef  
 
define Package/aodv-uu/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/aodvd $(1)/usr/sbin  
endef  
 
define Package/kmod-aodv-uu/install  
$(INSTALL_DIR) $(1)/etc/modules.d  
$(INSTALL_DATA) ./files/aodv-uu.modules $(1)/etc/modules.d/80-aodv-uu  
$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)  
$(CP) $(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX) $(1)/lib/modules/$(LINUX_VERSION)/  
endef  
 
$(eval $(call BuildPackage,aodv-uu))  
$(eval $(call KernelPackage,aodv-uu))  
 
kaodv  
 
Index: aodv-uu-0.9.3/lnx/Makefile  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/Makefile 2007-06-04 13:22:19.859836128 +0200  
+++ aodv-uu-0.9.3/lnx/Makefile 2007-06-04 13:22:19.932825032 +0200  
@@ -30,7 +30,7 @@  
KCFLAGS=-Wall -Wno-strict-aliasing -O2 $(KDEFS) $(KINC) $(XDEFS)  
KCFLAGS_ARM=-Wall -O2 -D__KERNEL__ -DMODULE -nostdinc $(shell $(ARM_CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp') -I$(KERNEL_INC)  
KCFLAGS_MIPS=-Wall -mips2 -O2 -fno-pic -mno-abicalls -mlong-calls -G0 -msoft-float -D__KERNEL__ -DMODULE -nostdinc $(shell $(MIPS_CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp') -I$(KERNEL_INC) $(XDEFS)  
-  
+endif  
.PHONY: clean clean-2.4 clean-2.6 indent default  
 
# Check for kernel version  
@@ -89,5 +89,3 @@  
etags *.c *.h  
indent:  
indent -kr -i8 -ts8 -sob -l80 -ss -ncs *.c *.h  
-endif  
-  
Index: aodv-uu-0.9.3/Makefile  
===================================================================  
--- aodv-uu-0.9.3.orig/Makefile 2007-06-04 13:22:19.866835064 +0200  
+++ aodv-uu-0.9.3/Makefile 2007-06-04 13:22:19.932825032 +0200  
@@ -87,7 +87,7 @@  
mips: aodvd-mips kaodv-mips  
 
endian.h:  
- $(CC) $(CFLAGS) -o endian endian.c  
+ gcc -o endian endian.c  
./endian > endian.h  
 
$(OBJS): %.o: %.c Makefile  
@@ -143,19 +143,18 @@  
@makedepend -Y./ -- $(DEFS) -- $(SRC) &>/dev/null  
@makedepend -a -Y./ -- $(KDEFS) kaodv.c &>/dev/null  
 
-install: default  
- install -s -m 755 aodvd /usr/sbin/aodvd  
- @if [ ! -d /lib/modules/$(KERNEL)/aodv ]; then \  
- mkdir /lib/modules/$(KERNEL)/aodv; \  
- fi  
-  
- @echo "Installing kernel module in /lib/modules/$(KERNEL)/aodv/";  
- @if [ -f ./kaodv.ko ]; then \  
- install -m 644 kaodv.ko /lib/modules/$(KERNEL)/aodv/kaodv.ko; \  
- else \  
- install -m 644 kaodv.o /lib/modules/$(KERNEL)/aodv/kaodv.o; \  
- fi  
- /sbin/depmod -a  
+install: install-aodvd install-kaodv  
+  
+install-aodvd:  
+ @echo "Installing aodv in $(DESTDIR)/usr/sbin";  
+ install -d -m0755 $(DESTDIR)/usr/sbin/  
+ install -m0755 aodvd $(DESTDIR)/usr/sbin/aodvd  
+  
+install-kaodv:  
+ @echo "Installing kernel module in $(DESTDIR)/lib/modules/$(KERNEL)/";  
+ install -d -m0644 $(DESTDIR)/lib/modules/$(KERNEL)/  
+ install -m 644 lnx/kaodv.$(KMOD_SUFFIX) $(DESTDIR)/lib/modules/$(KERNEL)/kaodv.$(KMOD_SUFFIX);  
+  
uninstall:  
rm -f /usr/sbin/aodvd  
rm -rf /lib/modules/$(KERNEL)/aodv  
 
Index: aodv-uu-0.9.3/lnx/kaodv-mod.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.c 2007-06-04 13:22:19.830840536 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-mod.c 2007-06-04 13:22:20.130794936 +0200  
@@ -19,7 +19,7 @@  
 
*  
*****************************************************************************/  
-#include <linux/config.h>  
+#include <linux/autoconf.h>  
#include <linux/version.h>  
 
#ifdef KERNEL26  
@@ -258,7 +258,11 @@  
if (!(*skb))  
return NF_STOLEN;  
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)  
+ ip_route_me_harder(skb, RTN_UNSPEC);  
+#else  
ip_route_me_harder(skb);  
+#endif  
}  
break;  
case NF_IP_POST_ROUTING:  
Index: aodv-uu-0.9.3/lnx/kaodv-queue.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.c 2007-06-04 13:22:19.837839472 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-queue.c 2007-06-04 13:22:20.130794936 +0200  
@@ -29,6 +29,7 @@  
#include <linux/spinlock.h>  
#include <linux/sysctl.h>  
#include <linux/proc_fs.h>  
+#include <linux/version.h>  
#include <net/sock.h>  
#include <net/route.h>  
#include <net/icmp.h>  
@@ -246,7 +247,11 @@  
if (!entry->skb)  
goto next;  
}  
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)  
+ ip_route_me_harder(&entry->skb, RTN_UNSPEC);  
+#else  
ip_route_me_harder(&entry->skb);  
+#endif  
 
pkts++;  
 
 
Index: aodv-uu-0.9.3/lnx/kaodv-netlink.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-netlink.c 2007-06-04 13:22:19.810843576 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-netlink.c 2007-06-04 13:22:20.326765144 +0200  
@@ -284,7 +284,11 @@  
/* RCV_SKB_FAIL(-EINVAL); */  
 
#ifdef KERNEL26  
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)  
+ if (security_netlink_recv(skb, CAP_NET_ADMIN))  
+# else  
if (security_netlink_recv(skb))  
+# endif  
RCV_SKB_FAIL(-EPERM);  
#endif  
//write_lock_bh(&queue_lock);  
 
Index: aodv-uu-0.9.3/main.c  
===================================================================  
--- aodv-uu-0.9.3.orig/main.c 2007-06-04 13:22:19.782847832 +0200  
+++ aodv-uu-0.9.3/main.c 2007-06-04 13:22:20.513736720 +0200  
@@ -26,6 +26,8 @@  
#include <sys/types.h>  
#include <sys/socket.h>  
#include <sys/stat.h>  
+#include <linux/types.h>  
+#include <linux/if.h>  
#include <linux/sockios.h>  
#include <linux/wireless.h>  
#include <getopt.h>  
Index: aodv-uu-0.9.3/nl.c  
===================================================================  
--- aodv-uu-0.9.3.orig/nl.c 2007-06-04 13:22:19.789846768 +0200  
+++ aodv-uu-0.9.3/nl.c 2007-06-04 13:22:20.513736720 +0200  
@@ -33,6 +33,10 @@  
#include <netinet/in.h>  
#include <arpa/inet.h>  
#include <linux/rtnetlink.h>  
+#include <linux/version.h>  
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)  
+#include <linux/if_addr.h>  
+#endif  
 
#include "defs.h"  
#include "lnx/kaodv-netlink.h"  
 
Index: aodv-uu-0.9.3/lnx/kaodv-compat.h  
===================================================================  
--- /dev/null 1970-01-01 00:00:00.000000000 +0000  
+++ aodv-uu-0.9.3/lnx/kaodv-compat.h 2007-06-17 02:49:46.844217144 +0200  
@@ -0,0 +1,15 @@  
+#ifndef __KAODV_COMPAT_H  
+#define __KAODV_COMPAT_H  
+  
+#include <linux/version.h>  
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)  
+  
+#define ip_hdr(_skb) (_skb)->nh.iph  
+#define skb_reset_network_header(_skb) do { \  
+ _skb->nh.iph = (struct iphdr *)_skb->data; \  
+ } while (0);  
+  
+  
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */  
+  
+#endif  
Index: aodv-uu-0.9.3/lnx/kaodv-ipenc.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-ipenc.c 2007-06-17 02:31:56.448941960 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-ipenc.c 2007-06-17 02:45:50.420159064 +0200  
@@ -64,7 +64,7 @@  
if (skb->sk != NULL)  
skb_set_owner_w(nskb, skb->sk);  
 
- iph = skb->nh.iph;  
+ iph = ip_hdr(skb);  
 
skb_put(nskb, sizeof(struct min_ipenc_hdr));  
 
@@ -78,7 +78,8 @@  
skb = nskb;  
 
/* Update pointers */  
- iph = skb->nh.iph = (struct iphdr *)skb->data;  
+ skb_reset_network_header(skb);  
+ iph = (struct iphdr *)skb->data;  
 
ipe = (struct min_ipenc_hdr *)(skb->data + (iph->ihl << 2));  
 
@@ -99,8 +100,8 @@  
 
ip_send_check(iph);  
 
- if (skb->nh.iph->id == 0)  
- ip_select_ident(skb->nh.iph, skb->dst, NULL);  
+ if (ip_hdr(skb)->id == 0)  
+ ip_select_ident(ip_hdr(skb), skb->dst, NULL);  
 
return skb;  
}  
@@ -108,9 +109,7 @@  
struct sk_buff *ip_pkt_decapsulate(struct sk_buff *skb)  
{  
struct min_ipenc_hdr *ipe;  
- /* skb->nh.iph is probably not set yet */  
- struct iphdr *iph = skb->nh.iph;  
-  
+ struct iphdr *iph = ip_hdr(skb);  
 
ipe = (struct min_ipenc_hdr *)((char *)iph + (iph->ihl << 2));  
 
@@ -123,8 +122,9 @@  
skb->len - (iph->ihl << 2) - sizeof(struct min_ipenc_hdr));  
 
skb_trim(skb, skb->len - sizeof(struct min_ipenc_hdr));  
-  
- skb->nh.iph = iph = (struct iphdr *)skb->data;  
+  
+ skb_reset_network_header(skb);  
+ iph = (struct iphdr *)skb->data;  
 
iph->tot_len = htons((ntohs(iph->tot_len) - sizeof(struct min_ipenc_hdr)));  
ip_send_check(iph);  
Index: aodv-uu-0.9.3/lnx/kaodv-ipenc.h  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-ipenc.h 2007-06-17 02:44:13.881835120 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-ipenc.h 2007-06-17 02:44:16.549429584 +0200  
@@ -27,6 +27,7 @@  
#include <linux/ip.h>  
#include <linux/skbuff.h>  
#include <asm/byteorder.h>  
+#include "kaodv-compat.h"  
 
#define IPPROTO_MIPE 55  
 
Index: aodv-uu-0.9.3/lnx/kaodv-mod.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.c 2007-06-17 02:43:33.776931992 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-mod.c 2007-06-17 02:43:39.008136728 +0200  
@@ -120,7 +120,7 @@  
const struct net_device *out,  
int (*okfn) (struct sk_buff *))  
{  
- struct iphdr *iph = (*skb)->nh.iph;  
+ struct iphdr *iph = ip_hdr(*skb);  
struct expl_entry e;  
struct in_addr ifaddr, bcaddr;  
int res = 0;  
@@ -188,7 +188,7 @@  
if (is_gateway && iph->protocol == IPPROTO_MIPE &&  
iph->daddr == ifaddr.s_addr) {  
ip_pkt_decapsulate(*skb);  
- iph = (*skb)->nh.iph;  
+ iph = ip_hdr(*skb);  
return NF_ACCEPT;  
}  
/* Ignore packets generated locally or that are for this  
Index: aodv-uu-0.9.3/lnx/kaodv-mod.h  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.h 2007-06-17 02:44:32.498005032 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-mod.h 2007-06-17 02:44:34.662675952 +0200  
@@ -5,6 +5,7 @@  
#include <linux/inetdevice.h>  
#include <linux/list.h>  
#include <linux/spinlock.h>  
+#include "kaodv-compat.h"  
 
/* Interface information */  
struct if_info {  
Index: aodv-uu-0.9.3/lnx/kaodv-queue.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.c 2007-06-17 02:45:01.513593992 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-queue.c 2007-06-17 02:45:11.534070648 +0200  
@@ -152,7 +152,7 @@  
{  
int status = -EINVAL;  
struct kaodv_queue_entry *entry;  
- struct iphdr *iph = skb->nh.iph;  
+ struct iphdr *iph = ip_hdr(skb);  
 
entry = kmalloc(sizeof(*entry), GFP_ATOMIC);  
 
Index: aodv-uu-0.9.3/lnx/kaodv-queue.h  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.h 2007-06-17 02:44:50.537262648 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-queue.h 2007-06-17 02:44:53.629792512 +0200  
@@ -21,6 +21,7 @@  
*****************************************************************************/  
#ifndef _KAODV_QUEUE_H  
#define _KAODV_QUEUE_H  
+#include "kaodv-compat.h"  
 
#define KAODV_QUEUE_DROP 1  
#define KAODV_QUEUE_SEND 2  
Index: aodv-uu-0.9.3/lnx/kaodv-netlink.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-netlink.c 2007-06-17 02:47:48.927143264 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-netlink.c 2007-06-17 02:49:11.604574384 +0200  
@@ -338,8 +338,10 @@  
netlink_register_notifier(&kaodv_nl_notifier);  
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14))  
kaodvnl = netlink_kernel_create(NETLINK_AODV, kaodv_netlink_rcv_sk);  
-#else  
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))  
kaodvnl = netlink_kernel_create(NETLINK_AODV, AODVGRP_MAX, kaodv_netlink_rcv_sk, THIS_MODULE);  
+#else  
+ kaodvnl = netlink_kernel_create(NETLINK_AODV, AODVGRP_MAX, kaodv_netlink_rcv_sk, NULL, THIS_MODULE);  
#endif  
if (kaodvnl == NULL) {  
printk(KERN_ERR "kaodv_netlink: failed to create netlink socket\n");  
 
file:a/net/bmon/Makefile (deleted)
#  
# 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:=bmon  
PKG_VERSION:=2.1.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://people.suug.ch/~tgr/bmon/files/  
PKG_MD5SUM:=3111a027907016c0902d67350c619df6  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/bmon  
SECTION:=net  
CATEGORY:=Network  
DEPENDS:=+libncurses  
TITLE:=bmon is a portable bandwidth monitor  
URL:=http://people.suug.ch/~tgr/bmon/  
endef  
 
define Package/bmon/description  
bmon is a portable bandwidth monitor  
and rate estimator running on various  
operating systems. It supports various  
input methods for different architectures.  
endef  
 
CONFIGURE_ARGS += \  
--disable-cnt-workaround \  
--disable-dbi \  
--disable-rrd \  
--disable-asound \  
 
CONFIGURE_VARS += \  
ac_cv_lib_nl_nl_connect=no \  
 
define Package/bmon/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/bmon $(1)/usr/sbin/  
endef  
 
$(eval $(call BuildPackage,bmon))  
 
Index: bmon-2.1.0/src/out_audio.c  
===================================================================  
--- bmon-2.1.0.orig/src/out_audio.c 2007-11-20 17:25:54.000000000 +0100  
+++ bmon-2.1.0/src/out_audio.c 2007-11-20 17:25:54.000000000 +0100  
@@ -141,7 +141,7 @@  
.om_draw = audio_draw,  
.om_set_opts = audio_set_opts,  
.om_probe = audio_probe,  
- .om_shutdown audio_shutdown,  
+ .om_shutdown = audio_shutdown,  
};  
 
static void __init audio_init(void)  
Index: bmon-2.1.0/src/out_xml_event.c  
===================================================================  
--- bmon-2.1.0.orig/src/out_xml_event.c 2007-11-20 17:25:54.000000000 +0100  
+++ bmon-2.1.0/src/out_xml_event.c 2007-11-20 17:25:54.000000000 +0100  
@@ -127,7 +127,7 @@  
.om_draw = xml_event_draw,  
.om_set_opts = xml_event_set_opts,  
.om_probe = xml_event_probe,  
- .om_shutdown xml_event_shutdown,  
+ .om_shutdown = xml_event_shutdown,  
};  
 
static void __init xml_event_init(void)  
 
file:a/net/click/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:=click  
PKG_VERSION:=20101020  
PKG_RELEASE:=1  
PKG_REV:=8f521a2dcd58ea8205b3b6070be605a21fb9154b  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=git://read.cs.ucla.edu/git/click  
PKG_SOURCE_PROTO:=git  
PKG_SOURCE_VERSION:=$(PKG_REV)  
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)  
PKG_MD5SUM:=c3cba1c923d0a034cc518720b5ba7b40  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/click  
SECTION:=net  
CATEGORY:=Network  
DEPENDS:=@BROKEN  
TITLE:=Click Modular Router  
URL:=http://read.cs.ucla.edu/click  
endef  
 
define Package/click/Description  
The Click Modular Router userspace package  
endef  
 
TARGET_CFLAGS += "-static -O2 -MD"  
TARGET_CXXFLAGS += "-static -O2 -MD"  
 
define Build/Configure  
(cd $(PKG_BUILD_DIR); \  
rm -rf config.{cache,status} ; \  
./configure \  
--prefix=/usr \  
--target=$(GNU_TARGET_NAME) \  
--host=$(GNU_HOST_NAME) \  
--build=$(GNU_BUILD_NAME) \  
--enable-tools=mixed \  
--enable-userlevel \  
--enable-wifi \  
--enable-fixincludes \  
--disable-linuxmodule \  
)  
endef  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
tools elementmap.xml  
(cd $(PKG_BUILD_DIR)/userlevel; \  
../tools/click-mkmindriver/click-mkmindriver -p $(PKG_NAME) -C .. \  
-f $(PKG_BUILD_DIR)/conf/wifi/dump.click \  
-A --all -E Discard -E Print; \  
)  
$(MAKE) -C $(PKG_BUILD_DIR) MINDRIVER=$(PKG_NAME)  
endef  
 
define Package/click/install  
$(INSTALL_DIR) $(1)/usr  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_DIR) $(1)/usr/share/click  
$(CP) $(PKG_BUILD_DIR)/userlevel/$(PKG_NAME)click $(1)/usr/bin/click  
$(CP) $(PKG_BUILD_DIR)/tools/click-align/click-align $(1)/usr/bin/click-align  
$(CP) $(PKG_BUILD_DIR)/elementmap.xml $(1)/usr/share/click/elementmap.xml  
endef  
 
$(eval $(call BuildPackage,click))  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2006 OpenWrt.org  
START=50  
 
start() {  
killall -q click  
cp /usr/bin/srcr.click /tmp  
sh /usr/bin/gen_config_roofnet.sh > /tmp/unaligned.click  
click-align /tmp/unaligned.click > /tmp/roofnet.click  
/usr/bin/click /tmp/roofnet.click > /tmp/roofnet.log 2>&1 &  
}  
 
stop() {  
killall click  
}  
 
--- a/tools/click-mkmindriver/Makefile.in  
+++ b/tools/click-mkmindriver/Makefile.in  
@@ -60,7 +60,7 @@ DEPCFLAGS = @DEPCFLAGS@  
DEFS = @DEFS@  
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \  
-I$(top_srcdir)/tools/lib -I$(srcdir)  
-LDFLAGS = @LDFLAGS@  
+LDFLAGS = @LDFLAGS@ -lrt  
LIBS = @LIBS@ @POSIX_CLOCK_LIBS@ $(DL_LIBS)  
 
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEPCFLAGS)  
--- a/configure  
+++ b/configure  
@@ -7135,7 +7135,7 @@ fi  
$as_echo "$ac_cv_va_list_addr" >&6; }  
if test "x$ac_cv_va_list_addr" = xyes; then  
 
-$as_echo "#define HAVE_ADDRESSABLE_VA_LIST 1" >>confdefs.h  
+$as_echo "#define HAVE_ADDRESSABLE_VA_LIST 0" >>confdefs.h  
 
fi  
 
 
--- a/lib/master.cc  
+++ b/lib/master.cc  
@@ -409,7 +409,9 @@ Master::process_pending(RouterThread *th  
while (Task *t = Task::pending_to_task(my_pending)) {  
my_pending = t->_pending_nextptr;  
t->_pending_nextptr = 0;  
+# if HAVE_MULTITHREAD  
click_master_mb();  
+# endif  
t->process_pending(thread);  
}  
}  
 
#  
# Copyright (C) 2008-2009 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=dansguardian  
PKG_VERSION:=2.10.1.1  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://dansguardian.org/downloads/2/Stable  
PKG_MD5SUM:=0987a1c9bfbdf398118386f10279611a  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/uclibc++.mk  
include $(INCLUDE_DIR)/package.mk  
 
define Package/dansguardian  
SECTION:=net  
DEPENDS:=+libpthread $(CXX_DEPENDS) +zlib  
CATEGORY:=Network  
SUBMENU:=Web Servers/Proxies  
TITLE:=DansGuardian  
URL:=http://dansguardian.org  
endef  
 
define Package/dansguardian/conffiles  
/etc/dansguardian/dansguardian.conf  
endef  
 
CONFIGURE_VARS += \  
INCLUDES="" \  
CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \  
LIBS="-lpthread" \  
 
define Build/Configure  
$(call Build/Configure/Default,\  
--disable-clamav \  
--with-sysconfsubdir=dansguardian \  
--with-proxyuser=root \  
--with-proxygroup=root \  
--disable-pcre \  
)  
endef  
 
define Package/dansguardian/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dansguardian $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/etc  
$(CP) $(PKG_INSTALL_DIR)/etc/dansguardian $(1)/etc/  
$(INSTALL_DIR) $(1)/usr/share/dansguardian  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/dansguardian/transparent1x1.gif $(1)/usr/share/dansguardian/  
$(INSTALL_DIR) $(1)/usr/share/dansguardian/languages/ukenglish  
$(CP) $(PKG_INSTALL_DIR)/usr/share/dansguardian/languages/ukenglish/* $(1)/usr/share/dansguardian/languages/ukenglish/  
endef  
 
$(eval $(call BuildPackage,dansguardian))  
 
--- a/configure  
+++ b/configure  
@@ -861,7 +861,7 @@ sysconfdir='${prefix}/etc'  
sharedstatedir='${prefix}/com'  
localstatedir='${prefix}/var'  
includedir='${prefix}/include'  
-oldincludedir='/usr/include'  
+oldincludedir='${prefix}/usr/include'  
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'  
infodir='${datarootdir}/info'  
htmldir='${docdir}'  
@@ -6317,7 +6317,7 @@ $as_echo_n "checking for zlib... " >&6;  
# Check whether --with-zlib was given.  
if test "${with_zlib+set}" = set; then  
withval=$with_zlib; # check for header & func (in library) in given prefix  
- CPPFLAGS="${CPPFLAGS} -I${withval}/include"  
+ CPPFLAGS="${CPPFLAGS}"  
if test "x$staticzlib" = "xtrue"; then  
LIBS="-Bstatic -L${withval} -lz -Bdynamic ${LIBS}"  
else  
@@ -10042,7 +10042,7 @@ _ACEOF  
if test "${with_libiconv+set}" = set; then  
withval=$with_libiconv; # check for header & func (in library) in given prefix  
if test "x$withval" != "x"; then  
- CPPFLAGS="${CPPFLAGS} -I${withval}/include"  
+ CPPFLAGS="${CPPFLAGS}"  
LIBS="-L${withval}/lib -liconv ${LIBS}"  
else  
LIBS="-liconv ${LIBS}"  
 
file:a/net/deluge/Makefile (deleted)
#  
# Copyright (C) 2008-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:=deluge  
PKG_VERSION:=1.2.0  
PKG_RELEASE:=3  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://download.deluge-torrent.org/source/  
PKG_MD5SUM:=cec6b48f0abd79ea2cff3815a1124192  
 
PKG_BUILD_DEPENDS:=distribute/host  
 
include $(INCLUDE_DIR)/package.mk  
$(call include_mk, python-package.mk)  
 
define Package/deluge/Default  
SUBMENU:=BitTorrent  
SECTION:=net  
CATEGORY:=Network  
TITLE:=A lightweight BitTorrent client  
URL:=http://deluge-torrent.org/  
endef  
 
define Package/deluge  
$(call Package/deluge/Default)  
TITLE+= (console UI & daemon)  
DEPENDS+=+python +rblibtorrent +python2-chardet +pyxdg +twisted +twisted-web +pyopenssl  
endef  
 
define Package/deluge-ui-gtk  
$(call Package/deluge/Default)  
TITLE+= (GTK+ UI)  
DEPENDS+=deluge +python-gtk  
endef  
 
define Package/deluge-ui-web  
$(call Package/deluge/Default)  
TITLE+= (Web UI)  
DEPENDS+=deluge +mako  
endef  
 
define Package/deluge/description  
BitTorrent client with a client/server model.  
endef  
 
define Package/deluge/conffiles  
/etc/config/deluge  
endef  
 
define Build/Compile  
$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))  
 
$(SED) 's,#!$(STAGING_DIR)/host/bin/$(PYTHON),#!/usr/bin/$(PYTHON),' $(PKG_INSTALL_DIR)/usr/bin/*  
endef  
 
define Package/deluge/install  
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)  
$(CP) \  
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \  
$(1)$(PYTHON_PKG_DIR)/  
rm -rf $(1)$(PYTHON_PKG_DIR)/deluge/ui/gtkui  
rm -rf $(1)$(PYTHON_PKG_DIR)/deluge/ui/web  
 
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/bin/* \  
$(1)/usr/bin/  
rm -rf $(1)/usr/bin/deluge-gtk  
rm -rf $(1)/usr/bin/deluge-web  
 
$(INSTALL_DIR) $(1)/etc/config  
$(INSTALL_CONF) ./files/deluge.config $(1)/etc/config/deluge  
 
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/deluge.init $(1)/etc/init.d/deluge  
endef  
 
define Package/deluge-ui-gtk/install  
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/deluge/ui  
$(CP) \  
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/deluge/ui/gtkui \  
$(1)$(PYTHON_PKG_DIR)/deluge/ui/  
 
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/bin/deluge-gtk \  
$(1)/usr/bin/  
endef  
 
define Package/deluge-ui-web/install  
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/deluge/ui  
$(CP) \  
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/deluge/ui/web \  
$(1)$(PYTHON_PKG_DIR)/deluge/ui/  
 
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/bin/deluge-web \  
$(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,deluge))  
$(eval $(call BuildPackage,deluge-ui-gtk))  
$(eval $(call BuildPackage,deluge-ui-web))  
 
config global deluged  
option 'user' 'deluge'  
option 'group' 'deluge'  
option 'home' ''  
option 'options' ''  
option 'enabled' 1  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2010-2011 OpenWrt.org  
# Copyright (C) 2010 Alexander Sulfrian  
 
START=50  
STOP=50  
 
SERVICE_DAEMONIZE=1  
SERVICE_WRITE_PID=1  
SERVICE_PID_FILE="/var/run/deluged.pid"  
 
error() {  
echo "${initscript}:" "$@" 1>&2  
}  
 
section_enabled() {  
config_get_bool enabled "$1" 'enabled' 0  
[ $enabled -gt 0 ]  
}  
 
start_instance() {  
local s="$1"  
 
section_enabled "$s" || return 1  
 
config_get uid "$s" 'user'  
[ -n "$uid" ] || {  
error "user is not set"  
return 1  
}  
user_exists $uid || {  
error "user '$uid' dos not exist"  
return 1  
}  
 
config_get gid "$s" 'group'  
[ -n "$gid" ] || {  
error "group is not set"  
return 1  
}  
group_exists $gid || {  
error "group '$gid' dos not exist"  
return 1  
}  
 
config_get home "$s" 'home'  
[ -n "$home" ] || {  
home=$(grep "^${user}:" /etc/passwd | cut -d ':' -f 6)  
fi  
[ -d "$home" ] || {  
error "home directory '$home' for user '$uid' dos not exist"  
return 1  
}  
 
config_get options "$s" 'options'  
 
HOME="$home" \  
SERVICE_UID="$uid" \  
SERVICE_GID="$gid" \  
service_start /usr/bin/python2.6 /usr/bin/deluged --do-not-daemonize $options  
}  
 
stop_instance() {  
local s="$1"  
 
section_enabled "$s" || return 1  
 
config_get uid "$s" 'user'  
config_get gid "$s" 'group'  
 
SERVICE_UID="$uid" \  
SERVICE_GID="$gid" \  
service_stop /usr/bin/python2.6  
}  
 
start()  
{  
config_load 'deluged'  
config_foreach start_instance 'deluged'  
}  
 
stop()  
{  
config_load 'deluged'  
config_foreach stop_instance 'deluged'  
}  
 
file:a/net/keepalived/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:=keepalived  
PKG_VERSION:=1.1.19  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:= http://www.keepalived.org/software  
PKG_MD5SUM:=a35b8d9d462810f7650d292bd7457523  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/kernel.mk  
 
define Package/keepalived  
SECTION:=net  
CATEGORY:=Network  
TITLE:=Failover and monitoring daemon for LVS clusters  
URL:=http://www.keepalived.org/  
DEPENDS:=+libpopt +libopenssl  
endef  
 
define Package/keepalived/description  
Failover and monitoring daemon for Linux Virtual Server (LVS) clusters.  
endef  
 
define Package/keepalived/conffiles  
/etc/keepalived/keepalived.conf  
endef  
 
acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))  
 
CONFIGURE_ARGS+= \  
--enable-shared \  
--disable-static \  
--disable-debug \  
--disable-strip \  
--disable-lvs \  
--disable-lvs-syncd \  
--with-kernel-dir="$(LINUX_DIR)/$(LINUX_UAPI_DIR)"  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
DESTDIR="$(PKG_INSTALL_DIR)" \  
STRIP="/bin/true" \  
all install  
endef  
 
define Package/keepalived/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/keepalived $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/genhash $(1)/usr/bin/  
$(INSTALL_DIR) $(1)/etc/keepalived  
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/keepalived/keepalived.conf $(1)/etc/keepalived/  
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/keepalived.init $(1)/etc/init.d/keepalived  
endef  
 
$(eval $(call BuildPackage,keepalived))  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2007-2011 OpenWrt.org  
 
START=70  
 
SERVICE_USE_PID=1  
 
start() {  
service_start /usr/sbin/keepalived  
}  
 
stop() {  
service_stop /usr/sbin/keepalived  
}  
 
file:a/net/linuxigd/Makefile (deleted)
#  
# Copyright (C) 2006-2012 OpenWrt.org  
# Copyright (C) 2006 loswillios  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=linuxigd  
PKG_VERSION:=1.0  
PKG_RELEASE:=3  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/linux-igd  
PKG_MD5SUM:=929f5c4878c91d534613b7c7070215d9  
 
PKG_BUILD_DEPENDS:=iptables libupnp  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/linuxigd  
SECTION:=net  
CATEGORY:=Network  
TITLE:=UPnP daemon  
SUBMENU:=Firewall  
DEPENDS:=+libip4tc +libupnp +libpthread @BROKEN  
URL:=http://linux-igd.sourceforge.net/  
endef  
 
define Package/linuxigd/description  
It implements the UPnP Internet Gateway Device specification (IGD)  
and allows UPnP aware clients, such as MSN Messenger, Azureus or  
Miranda to work properly from behind a NAT firewall.  
 
Please edit /etc/upnpd.conf before using upnpd!  
endef  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
$(TARGET_CONFIGURE_OPTS) \  
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -DIPTABLES_143 -Wl,-rpath-link=$(STAGING_DIR)/usr/lib" \  
BINDIR="/usr/sbin" \  
MANDIR="/usr/man" \  
HAVE_LIBIPTC=1 \  
LIBIPTC_PREFIX="$(STAGING_DIR)/usr" \  
LIBUPNP_PREFIX="$(STAGING_DIR)/usr" \  
LIBS="-lpthread -lupnp -lixml -lthreadutil -lip4tc -L../lib" \  
all  
endef  
 
define Package/linuxigd/conffiles  
/etc/upnpd.conf  
endef  
 
define Package/linuxigd/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/upnpd $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/etc/linuxigd  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/*.gif $(1)/etc/linuxigd/  
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/*.xml $(1)/etc/linuxigd/  
$(INSTALL_DIR) $(1)/etc  
$(INSTALL_DATA) ./files/upnpd.conf $(1)/etc/  
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/upnpd.init $(1)/etc/init.d/upnpd  
endef  
 
$(eval $(call BuildPackage,linuxigd))  
 
#  
# The full path and name of the iptables executable,  
# (enclosed in quotes).  
#  
iptables_location = "/usr/sbin/iptables"  
 
#  
# Daemon debug level. Messages are logged via syslog to debug.  
# 0 - no debug messages  
# 1 - log errors  
# 2 - log errors and basic info  
# 3 - log errors and verbose info  
# default = 0  
debug_mode = 2  
 
#  
# Should the daemon insert rules in the forward chain  
# This is necessary if your firewall has a drop or reject  
# policy in your forward chain.  
# allowed values: yes,no  
# default = no  
insert_forward_rules = yes  
 
#  
# The name of the chain to put the forward rules in.  
# This directive is only activ if "insert_forward_rules = yes"  
# above.  
# allowed values: a-z, A-Z, _, -  
# default = FORWARD  
forward_chain_name = forwarding_wan  
 
#  
# The name of the chain to put prerouting rules in.  
# allowed values: a-z, A-Z, _, -  
# default = PREROUTING  
prerouting_chain_name = prerouting_wan  
 
#  
# The internet line upstream bit rate reported from  
# the daemon. Value in bits per second  
# default = 0  
upstream_bitrate = 512000  
 
#  
# The internet line downstream bit rate reported from  
# the daemon. Value in bits per second  
# default = 0  
downstream_bitrate = 512000  
 
#  
# The default duration of port mappings, used when the client  
# doesn't specify a duration.  
# Can have the following values:  
# 0 - no default duration specified  
# seconds | HH:MM - duration from the time of addition  
# @seconds | @HH:MM - expire mapping at the specified time of day  
# default = 0  
duration = 0  
 
# The name of the igd device xml description document  
# default = gatedesc.xml  
description_document_name = gatedesc.xml  
 
# The path to the xml documents  
# Do not include the trailing "/"  
# default = /etc/linuxigd  
# WARNING! The make install does put the xml files  
# in /etc/linuxigd, if you change this variable  
# you have to make sure the xml docs are in the  
# right place  
xml_document_path = /etc/linuxigd  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2006-2012 OpenWrt.org  
# Copyright (C) 2006 loswillios  
 
START=65  
 
start() {  
. /lib/functions/network.sh  
 
network_get_device wan_if 'wan' || return 1  
network_get_device lan_if 'lan' || return 1  
 
route add -net 239.0.0.0 netmask 255.0.0.0 $lan_if  
service_start /usr/sbin/upnpd $wan_if $lan_if  
}  
 
stop() {  
. /lib/functions/network.sh  
 
service_stop /usr/sbin/upnpd  
 
network_get_device lan_if 'lan' && \  
route del -net 239.0.0.0 netmask 255.0.0.0 $lan_if  
}  
 
diff -urN linuxigd-1.0/iptc.c linuxigd-1.0.new/iptc.c  
--- linuxigd-1.0/iptc.c 2006-09-11 17:55:48.000000000 +0200  
+++ linuxigd-1.0.new/iptc.c 2007-06-02 12:24:34.000000000 +0200  
@@ -22,9 +22,9 @@  
struct ipt_entry_match *get_udp_match(const char *sports, const char *dports, unsigned int *nfcache);  
struct ipt_entry_target *get_dnat_target(const char *input, unsigned int *nfcache);  
 
-static u_int16_t parse_port(const char *port);  
-static void parse_ports(const char *portstring, u_int16_t *ports);  
-static int service_to_port(const char *name);  
+static u_int16_t igd_parse_port(const char *port);  
+void parse_ports(const char *portstring, u_int16_t *ports);  
+static int igd_service_to_port(const char *name);  
 
static void parse_range(const char *input, struct ip_nat_range *range);  
static struct ipt_natinfo *append_range(struct ipt_natinfo *info, const struct ip_nat_range *range);  
@@ -336,13 +336,12 @@  
}  
 
/* Copied and modified from libipt_tcp.c and libipt_udp.c */  
-  
static u_int16_t  
-parse_port(const char *port)  
+igd_parse_port(const char *port)  
{  
unsigned int portnum;  
 
- if ((portnum = service_to_port(port)) != -1) {  
+ if ((portnum = igd_service_to_port(port)) != -1) {  
return (u_int16_t)portnum;  
}  
else {  
@@ -350,7 +349,7 @@  
}  
}  
 
-static void  
+void  
parse_ports(const char *portstring, u_int16_t *ports)  
{  
char *buffer;  
@@ -358,19 +357,18 @@  
 
buffer = strdup(portstring);  
if ((cp = strchr(buffer, ':')) == NULL)  
- ports[0] = ports[1] = parse_port(buffer);  
+ ports[0] = ports[1] = igd_parse_port(buffer);  
else {  
*cp = '\0';  
cp++;  
 
- ports[0] = buffer[0] ? parse_port(buffer) : 0;  
- ports[1] = cp[0] ? parse_port(cp) : 0xFFFF;  
+ ports[0] = buffer[0] ? igd_parse_port(buffer) : 0;  
+ ports[1] = cp[0] ? igd_parse_port(cp) : 0xFFFF;  
}  
free(buffer);  
}  
-  
static int  
-service_to_port(const char *name)  
+igd_service_to_port(const char *name)  
{  
struct servent *service;  
 
@@ -382,7 +380,6 @@  
 
 
 
-  
/* Copied and modified from libipt_DNAT.c */  
 
static void  
 
diff -urN linuxigd-1.0/iptc.c linuxigd-1.0.new/iptc.c  
--- linuxigd-1.0/iptc.c 2006-09-11 17:55:48.000000000 +0200  
+++ linuxigd-1.0.new/iptc.c 2007-07-13 14:50:23.000000000 +0200  
@@ -6,7 +6,12 @@  
#include <string.h>  
#include <iptables.h>  
#include <libiptc/libiptc.h>  
+#include <linux/version.h>  
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)  
+#include <linux/netfilter/nf_nat.h>  
+#else  
#include <linux/netfilter_ipv4/ip_nat.h>  
+#endif  
#include <arpa/inet.h> /* inet_addr */  
#include "globals.h"  
#include "util.h"  
 
Index: linuxigd-1.0/Makefile  
===================================================================  
--- linuxigd-1.0.orig/Makefile 2008-02-27 10:45:26.000000000 +0100  
+++ linuxigd-1.0/Makefile 2008-02-27 10:45:54.000000000 +0100  
@@ -27,7 +27,7 @@  
@echo "make $@ finished on `date`"  
 
%.o: %.c  
- $(CC) $(CFLAGS) $(INCLUDES) -c $<  
+ $(CC) $(CFLAGS) $(INCLUDES) -D_GNU_SOURCE -c $<  
 
clean:  
rm -f *.o upnpd  
 
diff -ur linuxigd-1.0.orig/iptc.c linuxigd-1.0/iptc.c  
--- linuxigd-1.0.orig/iptc.c 2009-05-05 14:01:59.000000000 +0200  
+++ linuxigd-1.0/iptc.c 2009-05-05 14:05:48.000000000 +0200  
@@ -7,16 +7,24 @@  
#include <iptables.h>  
#include <libiptc/libiptc.h>  
#include <linux/version.h>  
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)  
-#include <linux/netfilter/nf_nat.h>  
+#ifdef IPTABLES_143  
+# include <net/netfilter/nf_nat.h>  
+# define ip_nat_multi_range nf_nat_multi_range_compat  
+# define ip_nat_range nf_nat_range  
#else  
-#include <linux/netfilter_ipv4/ip_nat.h>  
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)  
+# include <linux/netfilter/nf_nat.h>  
+# else  
+# include <linux/netfilter_ipv4/ip_nat.h>  
+# endif  
#endif  
#include <arpa/inet.h> /* inet_addr */  
#include "globals.h"  
#include "util.h"  
#include "iptc.h"  
 
+#define IPTC_HANDLE struct iptc_handle *  
+  
struct ipt_natinfo  
{  
struct ipt_entry_target t;  
@@ -49,7 +57,7 @@  
const char *dnat_to,  
const int append)  
{  
- iptc_handle_t handle;  
+ IPTC_HANDLE handle;  
struct ipt_entry *chain_entry;  
struct ipt_entry_match *entry_match = NULL;  
struct ipt_entry_target *entry_target = NULL;  
@@ -126,15 +134,15 @@  
return;  
}  
if (append)  
- result = iptc_append_entry(labelit, chain_entry, &handle);  
+ result = iptc_append_entry(labelit, chain_entry, handle);  
else  
- result = iptc_insert_entry(labelit, chain_entry, 0, &handle);  
+ result = iptc_insert_entry(labelit, chain_entry, 0, handle);  
 
if (!result) {  
trace(1, "libiptc error: Can't add, %s", iptc_strerror(errno));  
return;  
}  
- result = iptc_commit(&handle);  
+ result = iptc_commit(handle);  
if (!result) {  
trace(1, "libiptc error: Commit error, %s", iptc_strerror(errno));  
return;  
@@ -159,7 +167,7 @@  
const char *target,  
const char *dnat_to)  
{  
- iptc_handle_t handle;  
+ IPTC_HANDLE handle;  
const struct ipt_entry *e;  
ipt_chainlabel labelit;  
int i, result;  
@@ -182,7 +190,7 @@  
}  
 
/* check through rules to find match */  
- for (e = iptc_first_rule(chain, &handle), i=0; e; e = iptc_next_rule(e, &handle), i++) {  
+ for (e = iptc_first_rule(chain, handle), i=0; e; e = iptc_next_rule(e, handle), i++) {  
if (s_src != INADDR_NONE && e->ip.src.s_addr != s_src) continue;  
if (s_dest != INADDR_NONE && e->ip.dst.s_addr != s_dest) continue;  
if (iniface && strcmp(e->ip.iniface, iniface) != 0) continue;  
@@ -190,7 +198,7 @@  
if (protocol && strcmp(protocol, "TCP") == 0 && e->ip.proto != IPPROTO_TCP) continue;  
if (protocol && strcmp(protocol, "UDP") == 0 && e->ip.proto != IPPROTO_UDP) continue;  
if ((srcports || destports) && IPT_MATCH_ITERATE(e, matchcmp, srcports, destports) == 0) continue;  
- if (target && strcmp(target, iptc_get_target(e, &handle)) != 0) continue;  
+ if (target && strcmp(target, iptc_get_target(e, handle)) != 0) continue;  
if (dnat_to && strcmp(target, "DNAT") == 0) {  
struct ipt_entry_target *t;  
struct ip_nat_multi_range *mr;  
@@ -214,12 +222,12 @@  
break;  
}  
if (!e) return;  
- result = iptc_delete_num_entry(chain, i, &handle);  
+ result = iptc_delete_num_entry(chain, i, handle);  
if (!result) {  
trace(1, "libiptc error: Delete error, %s", iptc_strerror(errno));  
return;  
}  
- result = iptc_commit(&handle);  
+ result = iptc_commit(handle);  
if (!result) {  
trace(1, "libiptc error: Commit error, %s", iptc_strerror(errno));  
return;  
 
--- a/gatedevice.c  
+++ b/gatedevice.c  
@@ -1,5 +1,6 @@  
#include <syslog.h>  
#include <stdlib.h>  
+#include <stdio.h>  
#include <upnp/ixml.h>  
#include <string.h>  
#include <time.h>  
--- a/main.c  
+++ b/main.c  
@@ -10,6 +10,7 @@  
#include <time.h>  
#include <net/if.h>  
#include <upnp/upnp.h>  
+#include <string.h>  
#include "globals.h"  
#include "config.h"  
#include "gatedevice.h"  
--- a/pmlist.c  
+++ b/pmlist.c  
@@ -2,6 +2,8 @@  
#include <sys/wait.h>  
#include <unistd.h>  
#include <upnp/upnp.h>  
+#include <stdio.h>  
+#include <string.h>  
#include "globals.h"  
#include "config.h"  
#include "pmlist.h"  
 
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+