ksymoops: remove package, it has been obsolete and useless for a long time
ksymoops: remove package, it has been obsolete and useless for a long time

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

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

file:a/devel/ksymoops/Makefile (deleted)
--- a/devel/ksymoops/Makefile
+++ /dev/null
@@ -1,59 +1,1 @@
-#
-# Copyright (C) 2009 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:=ksymoops
-PKG_VERSION:=2.4.11
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/ksymoops/v2.4/
-PKG_MD5SUM:=4a8249e182a5dbc75e566d162e9f3314
-
-PKG_BUILD_DEPENDS:=binutils
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ksymoops
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=@mips||mipsel||m68k||i386 +zlib
-  TITLE:=Interpret oops of the kernel
-  URL:=http://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/
-  MENU:=1
-endef
-
-define Package/kexec-tools/description
-endef
-
-define Build/Configure
-endef
-
-TARGET=$(strip $(shell echo $(TARGET_CFLAGS) | cut -d- -f4 | cut -d= -f2))
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		BFD_PREFIX="$(STAGING_DIR)/usr" \
-		DEF_TARGET='\"$(TARGET)\"' \
-		DEF_ARCH='\"$(ARCH)\"' \
-		DEF_MAP='\"$(LINUX_DIR)/System.map\"' \
-		CROSS="$(TARGET_CROSS)" \
-		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
-		LDFLAGS="-lz" \
-		all install
-endef
-
-define Package/ksymoops/install
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/$(TARGET_CROSS)ksymoops $(1)/bin/ksymoops
-endef
-
-$(eval $(call BuildPackage,ksymoops))
-

--- a/devel/lttng-tools/Makefile
+++ /dev/null
@@ -1,48 +1,1 @@
-#
-# 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))
-

--- a/devel/lttng-tools/patches/001-uclibc_sync_file_ranges.patch
+++ /dev/null
@@ -1,45 +1,1 @@
-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/urbi/Makefile (deleted)
--- a/lang/urbi/Makefile
+++ /dev/null
@@ -1,67 +1,1 @@
-#
-# Copyright (C) 2007-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:=urbi
-PKG_VERSION:=1.0RC2-l455
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-sdk-$(PKG_VERSION)-src.zip
-PKG_SOURCE_URL:=http://www.gostai.com/downloads/aibo/
-PKG_MD5SUM:=02f64abb6232ddd7b0cb6dc182e2df26
-PKG_FIXUP:=libtool-ucxx
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-sdk
-
-include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += $(FPIC)
-
-define Package/urbi
-  SECTION:=lang
-  CATEGORY:=Languages
-  DEPENDS:=+uclibcxx +libpthread @BROKEN
-  TITLE:=URBI SDK
-  URL:=http://www.urbiforge.com
-endef
-
-define Package/urbi/description
-  Universal Real-Time Behavior Interface for robots.
-endef
-
-CONFIGURE_VARS += \
-	CXX="g++-uc" \
-	CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \
-	EXAMPLES=0 \
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		WARNING_CXXFLAGS="-Wall" \
-		all install
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/urbi
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/urbi* $(1)/usr/include/urbi/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liburbi* $(1)/usr/lib/
-endef
-
-define Package/urbi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/gostai
-	$(CP) $(PKG_INSTALL_DIR)/usr/gostai/* $(1)/usr/gostai/
-endef
-
-$(eval $(call BuildPackage,urbi))
-

--- a/lang/urbi/patches/001-no_examples.patch
+++ /dev/null
@@ -1,32 +1,1 @@
-diff -urN urbi-sdk/src/Makefile.am urbi-sdk.new/src/Makefile.am
---- urbi-sdk/src/Makefile.am	2007-01-31 11:37:04.000000000 +0100
-+++ urbi-sdk.new/src/Makefile.am	2007-10-03 11:17:00.000000000 +0200
-@@ -1,5 +1,5 @@
- SUBDIRS = liburbi 
- 
- if EXAMPLES
--SUBDIRS += utils examples
-+SUBDIRS += utils
- endif
-diff -urN urbi-sdk/src/Makefile.in urbi-sdk.new/src/Makefile.in
---- urbi-sdk/src/Makefile.in	2007-04-10 17:44:07.000000000 +0200
-+++ urbi-sdk.new/src/Makefile.in	2007-10-03 11:14:33.000000000 +0200
-@@ -30,7 +30,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--@EXAMPLES_TRUE@am__append_1 = utils examples
-+@EXAMPLES_TRUE@am__append_1 = utils
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -68,7 +68,7 @@
-   distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = liburbi utils examples
-+DIST_SUBDIRS = liburbi utils
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- INSTALL_HEADER = @INSTALL_HEADER@
- ACLOCAL = @ACLOCAL@
 

--- a/lang/urbi/patches/005-fix-gcc_4_3-compile.patch
+++ /dev/null
@@ -1,23 +1,1 @@
-diff --git a/libport/semaphore.hxx b/libport/semaphore.hxx
-index bb2546d..38b0d8e 100644
---- a/libport/semaphore.hxx
-+++ b/libport/semaphore.hxx
-@@ -5,6 +5,7 @@
- # include "exception.hh"
- # include <sstream>
- # include <string>
-+# include <cstring>
- 
- namespace libport
- {
---- a/src/liburbi/uconversion.cc	2007-01-31 11:37:04.000000000 +0100
-+++ b/src/liburbi/uconversion.cc	2010-03-29 09:43:00.000000000 +0200
-@@ -1,5 +1,7 @@
- #include "urbi/uconversion.hh"
- 
-+#include <cstdio>
-+
- #ifndef NO_IMAGE_CONVERSION
- # include <setjmp.h>
- 
 

file:a/libs/boost/Makefile (deleted)
--- a/libs/boost/Makefile
+++ /dev/null
@@ -1,379 +1,1 @@
-#
-# Copyright (C) 2009-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-# Dude, this "boost" is really one of the most crude stuff I ported yet.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=boost
-PKG_VERSION:=1_51_0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/boost
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_VERSION)
-PKG_MD5SUM:=6a1f32d902203ac70fbec78af95b3cf8
-
-PKG_BUILD_DEPENDS:=boost/host
-PKG_BUILD_PARALLEL:=0
-PKG_USE_MIPS16:=0
-
-PKG_CONFIG_DEPENDS := \
-	CONFIG_PACKAGE_boost-date_time \
-	CONFIG_PACKAGE_boost-filesystem \
-	CONFIG_PACKAGE_boost-graph \
-	CONFIG_PACKAGE_boost-iostreams \
-	CONFIG_PACKAGE_boost-math \
-	CONFIG_PACKAGE_boost-program_options \
-	CONFIG_PACKAGE_boost-python \
-	CONFIG_PACKAGE_boost-regex \
-	CONFIG_PACKAGE_boost-serialization \
-	CONFIG_PACKAGE_boost-signals \
-	CONFIG_PACKAGE_boost-system \
-	CONFIG_PACKAGE_boost-test \
-	CONFIG_PACKAGE_boost-thread \
-	CONFIG_PACKAGE_boost-wave \
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-
-define Package/boost/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Boost C++ source libraries
-  URL:=http://www.boost.org
-  DEPENDS:=+libstdcpp +libpthread +librt
-  MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
-endef
-
-define Package/boost/Default/description
-  Boost provides free peer-reviewed portable C++ source libraries
-endef
-
-define Package/boost-chrono
-  $(call Package/boost/Default)
-  TITLE+= (chrono)
-  DEPENDS+= +boost-system
-endef
-
-define Package/boost-date_time
-  $(call Package/boost/Default)
-  TITLE+= (date_time)
-endef
-
-define Package/boost-exception
-  $(call Package/boost/Default)
-  TITLE+= (exception)
-endef
-
-define Package/boost-filesystem
-  $(call Package/boost/Default)
-  TITLE+= (filesystem)
-  DEPENDS+= +boost-system
-endef
-
-define Package/boost-graph
-  $(call Package/boost/Default)
-  TITLE+= (graph)
-  DEPENDS+= +boost-regex
-endef
-
-define Package/boost-graph_parallel
-  $(call Package/boost/Default)
-  TITLE+= (graph_parallel)
-endef
-
-define Package/boost-iostreams
-  $(call Package/boost/Default)
-  TITLE+= (iostreams)
-  DEPENDS+= +zlib
-endef
-
-define Package/boost-locale
-  $(call Package/boost/Default)
-  TITLE+= (locale)
-endef
-
-define Package/boost-math
-  $(call Package/boost/Default)
-  TITLE+= (math)
-endef
-
-define Package/boost-mpi
-  $(call Package/boost/Default)
-  TITLE+= (mpi)
-endef
-
-define Package/boost-program_options
-  $(call Package/boost/Default)
-  TITLE+= (program_options)
-endef
-
-define Package/boost-python
-  $(call Package/boost/Default)
-  TITLE+= (python)
-  DEPENDS+= +PACKAGE_boost-python:python
-endef
-
-define Package/boost-random
-  $(call Package/boost/Default)
-  TITLE+= (random)
-endef
-
-define Package/boost-regex
-  $(call Package/boost/Default)
-  TITLE+= (regex)
-endef
-
-define Package/boost-serialization
-  $(call Package/boost/Default)
-  TITLE+= (serialization)
-endef
-
-define Package/boost-signals
-  $(call Package/boost/Default)
-  TITLE+= (signals)
-endef
-
-define Package/boost-system
-  $(call Package/boost/Default)
-  TITLE+= (system)
-endef
-
-define Package/boost-test
-  $(call Package/boost/Default)
-  TITLE+= (test)
-endef
-
-define Package/boost-thread
-  $(call Package/boost/Default)
-  TITLE+= (thread)
-  DEPENDS+= +boost-system +boost-chrono
-endef
-
-define Package/boost-timer
-  $(call Package/boost/Default)
-  TITLE+= (timer)
-  DEPENDS+= boost-chrono
-endef
-
-define Package/boost-wave
-  $(call Package/boost/Default)
-  TITLE+= (wave)
-  DEPENDS+= +boost-date_time +boost-thread +boost-filesystem
-endef
-
-define Package/boost
-  $(call Package/boost/Default)
-  TITLE+= (header-only)
-  BUILDONLY:=1
-endef
-
-define Build/Configure
-endef
-
-define Host/Compile
-	# bjam does not provide a configure-script nor a Makefile
-	( cd $(HOST_BUILD_DIR)/tools/build/v2/engine ; ./build.sh gcc )
-endef
-
-CONFIGURE_PREFIX:=$(PKG_INSTALL_DIR)
-TARGET_LDFLAGS += -pthread -lrt
-
-define Build/Compile
-	( cd $(PKG_BUILD_DIR) ; \
-		echo "using gcc : $(ARCH) : $(GNU_TARGET_NAME)-gcc : <compileflags>\"$(TARGET_CFLAGS)\" <cxxflags>\"$(TARGET_CXXFLAGS)\" <linkflags>\"$(TARGET_LDFLAGS)\" ;" > tools/build/v2/user-config.jam ; \
-		$(if $(CONFIG_PACKAGE_boost-python), \
-			echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python :	$(STAGING_DIR)/usr/include/python2.7/ ;" >> \
-				tools/build/v2/user-config.jam; \
-		) \
-		bjam \
-			'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
-			--toolset=gcc-$(ARCH) --build-type=minimal --layout=system \
-			--disable-long-double \
-			$(CONFIGURE_ARGS) \
-			$(if $(CONFIG_PACKAGE_boost-chrono),,--without-chrono) \
-			$(if $(CONFIG_PACKAGE_boost-date_time),,--without-date_time) \
-			$(if $(CONFIG_PACKAGE_boost-exception),,--without-exception) \
-			$(if $(CONFIG_PACKAGE_boost-filesystem),,--without-filesystem) \
-			$(if $(CONFIG_PACKAGE_boost-graph),,--without-graph) \
-			$(if $(CONFIG_PACKAGE_boost-graph_parallel),,--without-graph_parallel) \
-			$(if $(CONFIG_PACKAGE_boost-iostreams),,--without-iostreams) \
-			$(if $(CONFIG_PACKAGE_boost-locale),,--without-locale) \
-			$(if $(CONFIG_PACKAGE_boost-math),,--without-math) \
-			$(if $(CONFIG_PACKAGE_boost-mpi),,--without-mpi) \
-			$(if $(CONFIG_PACKAGE_boost-program_options),,--without-program_options) \
-			$(if $(CONFIG_PACKAGE_boost-python),,--without-python) \
-			$(if $(CONFIG_PACKAGE_boost-random),,--without-random) \
-			$(if $(CONFIG_PACKAGE_boost-regex),,--without-regex) \
-			$(if $(CONFIG_PACKAGE_boost-serialization),,--without-serialization) \
-			$(if $(CONFIG_PACKAGE_boost-signals),,--without-signals) \
-			$(if $(CONFIG_PACKAGE_boost-system),,--without-system) \
-			$(if $(CONFIG_PACKAGE_boost-test),,--without-test) \
-			$(if $(CONFIG_PACKAGE_boost-thread),,--without-thread) \
-			$(if $(CONFIG_PACKAGE_boost-timer),,--without-timer) \
-			$(if $(CONFIG_PACKAGE_boost-wave),,--without-wave) \
-			\
-			$(if $(CONFIG_PACKAGE_boost-iostreams),-sNO_BZIP2=1 -sZLIB_INCLUDE=$(STAGING_DIR)/usr/include \
-				-sZLIB_LIBPATH=$(STAGING_DIR)/usr/lib) \
-			install \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/include/boost/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/include/boost/* \
-		$(1)/usr/include/boost/ \
-		# copies _all_ header files - independent of <--with-library>-argument above
-
-	if [ -d $(PKG_INSTALL_DIR)/lib ]; then \
-		$(INSTALL_DIR) \
-			$(1)/usr/lib; \
-		$(CP) \
-			$(PKG_INSTALL_DIR)/lib/*.a \
-			$(1)/usr/lib/; \
-		$(CP) \
-			$(PKG_INSTALL_DIR)/lib/*.so* \
-			$(1)/usr/lib/; \
-	fi
-endef
-
-define Host/Install
-	$(INSTALL_DIR) \
-		$(STAGING_DIR_HOST)/bin
-
-	$(CP) \
-		$(HOST_BUILD_DIR)/tools/build/v2/engine/bin.*/bjam \
-		$(STAGING_DIR_HOST)/bin/
-endef
-
-define Package/boost/Default/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/lib/libboost_$(2)*.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/boost-chrono/install
-  $(call Package/boost/Default/install,$(1),chrono)
-endef
-
-define Package/boost-date_time/install
-  $(call Package/boost/Default/install,$(1),date_time)
-endef
-
-define Package/boost-exception/install
-  $(call Package/boost/Default/install,$(1),exception)
-endef
-
-define Package/boost-filesystem/install
-  $(call Package/boost/Default/install,$(1),filesystem)
-endef
-
-define Package/boost-graph/install
-  $(call Package/boost/Default/install,$(1),graph)
-endef
-
-define Package/boost-graph_parallel/install
-  $(call Package/boost/Default/install,$(1),graph_parallel)
-endef
-
-define Package/boost-iostreams/install
-  $(call Package/boost/Default/install,$(1),iostreams)
-endef
-
-define Package/boost-math/install
-  $(call Package/boost/Default/install,$(1),math)
-endef
-
-define Package/boost-mpi/install
-  $(call Package/boost/Default/install,$(1),mpi)
-endef
-
-define Package/boost-program_options/install
-  $(call Package/boost/Default/install,$(1),program_options)
-endef
-
-define Package/boost-python/install
-  $(call Package/boost/Default/install,$(1),python)
-endef
-
-define Package/boost-random/install
-  $(call Package/boost/Default/install,$(1),random)
-endef
-
-define Package/boost-regex/install
-  $(call Package/boost/Default/install,$(1),regex)
-endef
-
-define Package/boost-serialization/install
-  $(call Package/boost/Default/install,$(1),serialization)
-endef
-
-define Package/boost-signals/install
-  $(call Package/boost/Default/install,$(1),signals)
-endef
-
-define Package/boost-system/install
-  $(call Package/boost/Default/install,$(1),system)
-endef
-
-define Package/boost-test/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/lib/libboost_unit_test_framework*.so* \
-		$(1)/usr/lib/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/lib/libboost_prg_exec_monitor*.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/boost-thread/install
-  $(call Package/boost/Default/install,$(1),thread)
-endef
-
-define Package/boost-timer/install
-  $(call Package/boost/Default/install,$(1),timer)
-endef
-
-define Package/boost-wave/install
-  $(call Package/boost/Default/install,$(1),wave)
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,boost))
-$(eval $(call BuildPackage,boost-chrono))
-$(eval $(call BuildPackage,boost-date_time))
-#$(eval $(call BuildPackage,boost-exception))
-$(eval $(call BuildPackage,boost-filesystem))
-$(eval $(call BuildPackage,boost-graph))
-#$(eval $(call BuildPackage,boost-graph_parallel))
-$(eval $(call BuildPackage,boost-iostreams))
-$(eval $(call BuildPackage,boost-locale))
-$(eval $(call BuildPackage,boost-math))
-#$(eval $(call BuildPackage,boost-mpi))
-$(eval $(call BuildPackage,boost-program_options))
-$(eval $(call BuildPackage,boost-random))
-$(eval $(call BuildPackage,boost-python))
-$(eval $(call BuildPackage,boost-regex))
-$(eval $(call BuildPackage,boost-serialization))
-$(eval $(call BuildPackage,boost-signals))
-$(eval $(call BuildPackage,boost-system))
-$(eval $(call BuildPackage,boost-test))
-$(eval $(call BuildPackage,boost-thread))
-$(eval $(call BuildPackage,boost-timer))
-$(eval $(call BuildPackage,boost-wave))
-

--- a/libs/boost/patches/100-do-not-use-librt.patch
+++ /dev/null
@@ -1,26 +1,1 @@
---- a/tools/build/v2/tools/gcc.jam
-+++ b/tools/build/v2/tools/gcc.jam
-@@ -1063,8 +1063,7 @@ rule setup-threading ( targets * : sourc
-             }
-             case * :
-             {
--                option = -pthread ;
--                libs = rt ;
-+                # pass appropriate options via OpenWrt
-             }
-         }
-     
---- a/tools/build/v2/tools/gcc.py
-+++ b/tools/build/v2/tools/gcc.py
-@@ -685,8 +685,8 @@ elif bjam.variable('UNIX'):
-         # Darwin has no threading options, don't set anything here.
-         pass
-     else:
--        flags('gcc', 'OPTIONS', ['<threading>multi'], ['-pthread'])
--        flags('gcc', 'FINDLIBS-SA', [], ['rt'])
-+        # pass appropriate options via OpenWrt
-+        pass
- 
- def cpu_flags(toolset, variable, architecture, instruction_set, values, default=None):
-     #FIXME: for some reason this fails.  Probably out of date feature code
 

--- a/libs/boost/patches/200-cstdint_missing_include.patch
+++ /dev/null
@@ -1,13 +1,1 @@
---- a/libs/context/src/fcontext.cpp.new	2012-12-11 17:59:59.349131458 +0100
-+++ b/libs/context/src/fcontext.cpp	2012-12-11 18:00:06.925131652 +0100
-@@ -9,6 +9,9 @@
- #include <boost/context/fcontext.hpp>
- 
- #include <cstddef>
-+extern "C" {
-+#include <stdint.h>
-+}
- 
- #ifdef BOOST_HAS_ABI_HEADERS
- #  include BOOST_ABI_PREFIX
 

file:a/libs/check/Makefile (deleted)
--- a/libs/check/Makefile
+++ /dev/null
@@ -1,62 +1,1 @@
-#
-# 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))
-

--- a/libs/clearsilver/Makefile
+++ b/libs/clearsilver/Makefile
@@ -31,7 +31,7 @@
   CATEGORY:=Libraries
   TITLE:=ClearSilver template system
   URL:=http://www.clearsilver.net/

+  MAINTAINER:=Raphaël HUCK <rhk@cksum.org>
   DEPENDS:=+CLEARSILVER_ENABLE_COMPRESSION:zlib +CLEARSILVER_ENABLE_GETTEXT:libintl
 endef
 

file:a/libs/gperf/Makefile (deleted)
--- a/libs/gperf/Makefile
+++ /dev/null
@@ -1,40 +1,1 @@
-#
-# 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)
--- a/libs/libdaq/Makefile
+++ /dev/null
@@ -1,71 +1,1 @@
-#
-# 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))
-

--- a/libs/libdaq/patches/001-cross-compile-test.patch
+++ /dev/null
@@ -1,19 +1,1 @@
---- 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)
--- a/libs/libdnet/Makefile
+++ /dev/null
@@ -1,145 +1,1 @@
-#
-# 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/libs/libdnet/patches/001-dnet_config.patch
+++ /dev/null
@@ -1,24 +1,1 @@
---- 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/libs/libdnet/patches/002-fix_avr32_compile.patch
+++ /dev/null
@@ -1,21 +1,1 @@
---- 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/libs/libdnet/patches/010-gcc4.patch
+++ /dev/null
@@ -1,21 +1,1 @@
---- 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)
--- a/libs/libnfc/Makefile
+++ /dev/null
@@ -1,119 +1,1 @@
-#
-# 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/libugpio/Makefile (deleted)
--- a/libs/libugpio/Makefile
+++ /dev/null
@@ -1,74 +1,1 @@
-#
-# 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:=libugpio
-PKG_VERSION:=0.0.1
-PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/mhei/libugpio.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8235d04096bfa9db594d5df75c5cd634a3bbc39a
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libugpio
-  SECTION:=libs
-  CATEGORY:=Libraries
-  URL:=https://github.com/mhei/libugpio
-  TITLE:=Library for using sysfs gpio interface from C programs
-  DEPENDS:=@GPIO_SUPPORT
-endef
-
-define Package/libugpio/description
-  libugpio is a library to ease the use of linux kernel's sysfs
-  gpio interface from C programs and/or other libraries.
-endef
-
-define Package/gpioctl-sysfs
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Tool for controlling gpio pins
-  DEPENDS:=+libugpio
-endef
-
-define Package/gpioctl-sysfs/description
-  Tool for controlling gpio pins using the sysfs api provided by the kernel.
-endef
-
-define Build/Configure
-	( cd "$(PKG_BUILD_DIR)"; ./autogen.sh )
-	$(call Build/Configure/Default)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/ugpio $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libugpio.{so*,a} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libugpio.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libugpio/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libugpio.so* $(1)/usr/lib/
-endef
-
-define Package/gpioctl-sysfs/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpioctl $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,libugpio))
-$(eval $(call BuildPackage,gpioctl-sysfs))
-

file:a/libs/lttng-ust/Makefile (deleted)
--- a/libs/lttng-ust/Makefile
+++ /dev/null
@@ -1,49 +1,1 @@
-#
-# 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))
-

--- a/libs/lttng-ust/patches/001.no_docs_tests.patch
+++ /dev/null
@@ -1,36 +1,1 @@
-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)
--- a/libs/mxml/Makefile
+++ /dev/null
@@ -1,57 +1,1 @@
-#
-# 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/libs/mxml/patches/001-targets.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- 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)
--- a/libs/ortp/Makefile
+++ /dev/null
@@ -1,76 +1,1 @@
-#
-# 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/libs/ortp/patches/001-memset_fix.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- 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)
--- a/libs/pthsem/Makefile
+++ /dev/null
@@ -1,60 +1,1 @@
 
-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))
-

--- a/libs/rblibtorrent/Makefile
+++ /dev/null
@@ -1,78 +1,1 @@
-#
-# 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))
-

--- a/libs/rblibtorrent/patches/enable-shared-linking.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- 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)
--- a/mail/alpine/Makefile
+++ /dev/null
@@ -1,71 +1,1 @@
-#
-# 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))
-

--- a/net/aircrack-ng/Makefile
+++ /dev/null
@@ -1,53 +1,1 @@
-#
-# 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/net/aircrack-ng/patches/100-add-ignore-channel-negative-1.patch
+++ /dev/null
@@ -1,53 +1,1 @@
---- 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)
--- a/net/aodv-uu/Makefile
+++ /dev/null
@@ -1,105 +1,1 @@
-#
-# 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))
-

--- a/net/aodv-uu/files/aodv-uu.modules
+++ /dev/null
@@ -1,2 +1,1 @@
-kaodv
 

--- a/net/aodv-uu/patches/001-normalize.patch
+++ /dev/null
@@ -1,65 +1,1 @@
-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
 

--- a/net/aodv-uu/patches/002-linux_2.6.19_ip_route_me_harder_change.patch
+++ /dev/null
@@ -1,50 +1,1 @@
-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++;
- 
 

--- a/net/aodv-uu/patches/003-linux_2.6.19_security_netlink_recv_change.patch
+++ /dev/null
@@ -1,17 +1,1 @@
-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);
 

--- a/net/aodv-uu/patches/004-linux_2.6.19_includes.patch
+++ /dev/null
@@ -1,29 +1,1 @@
-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"
 

--- a/net/aodv-uu/patches/005-linux_2.6.22_skbuff.patch
+++ /dev/null
@@ -1,165 +1,1 @@
-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)
--- a/net/bmon/Makefile
+++ /dev/null
@@ -1,50 +1,1 @@
-#
-# 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))
-

--- a/net/bmon/patches/001-bugfixes.patch
+++ /dev/null
@@ -1,27 +1,1 @@
-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)
--- a/net/click/Makefile
+++ /dev/null
@@ -1,76 +1,1 @@
-#
-# 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))
-

--- a/net/click/files/roofnet.init
+++ /dev/null
@@ -1,16 +1,1 @@
-#!/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/net/click/patches/100-compile_fix.patch
+++ /dev/null
@@ -1,23 +1,1 @@
---- 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/net/click/patches/110-multithread_fix.patch
+++ /dev/null
@@ -1,13 +1,1 @@
---- 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);
-     }
- }
 

--- a/net/dansguardian/Makefile
+++ /dev/null
@@ -1,63 +1,1 @@
-#
-# 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/net/dansguardian/patches/001-include_dir.patch
+++ /dev/null
@@ -1,30 +1,1 @@
---- 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)
--- a/net/deluge/Makefile
+++ /dev/null
@@ -1,112 +1,1 @@
-#
-# 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))
-

--- a/net/deluge/files/deluge.config
+++ /dev/null
@@ -1,7 +1,1 @@
-config global deluged
-	option 'user' 'deluge'
-	option 'group' 'deluge'
-	option 'home' ''
-	option 'options' ''
-	option 'enabled' 1
 

--- a/net/deluge/files/deluge.init
+++ /dev/null
@@ -1,87 +1,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/freepops/Makefile (deleted)
--- a/net/freepops/Makefile
+++ /dev/null
@@ -1,68 +1,1 @@
-#
-# Copyright (C) 2010-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=freepops
-PKG_VERSION:=0.2.4
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/freepops
-PKG_MD5SUM:=d18848b903ceb68a53ded6b6d9e33047
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/freepops
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=POP3 interface to several webmails
-  DEPENDS:=+libpthread +liblua +luafilesystem +luaexpat @BROKEN # +luacurl
-  URL:=http://www.freepops.org
-endef
-
-define Package/freepops/description
-	FreePOPs is a POP3 daemon that translates local POP3 commands
-	to remote HTTP requests to the supported webmail sites.
-
-	FreePOPs can also be used as RSS aggregator and POP3 forwarder.
-endef
-
-define Build/Configure
-	cd $(PKG_BUILD_DIR) && \
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) -DHAVE_CONFIG_H -I$(PKG_BUILD_DIR)" \
-	LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) -llua -llua-filesystem -llua-curl -llua-expat" \
-	PKGCONFIG=true \
-	./configure.sh openwrt -lua -luafilesystem -luacurl -luaexpat
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) WHERE=/usr/ all
-	$(TARGET_CROSS)strip $(PKG_BUILD_DIR)/src/freepopsd
-endef
-
-define Package/freepops/install
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR)/ WHERE=/usr/ install
-	mkdir -p $(PKG_INSTALL_DIR)/etc/init.d
-	$(CP) $(PKG_BUILD_DIR)/buildfactory/openwrt/S50freepopsd \
-		$(PKG_INSTALL_DIR)/etc/init.d
-	chmod a+x $(PKG_INSTALL_DIR)/etc/init.d/*
-	rm -rf $(PKG_INSTALL_DIR)/usr/share/doc
-	rm -rf $(PKG_INSTALL_DIR)/usr/share/man
-	rm -rf $(PKG_INSTALL_DIR)/usr/bin/freepops-updater-dialog
-	rm -rf $(PKG_INSTALL_DIR)/usr/share/freepops/lua/foo.lua
-	rm -rf $(PKG_INSTALL_DIR)/usr/share/freepops/lua/skeleton.lua
-	cp -r $(PKG_INSTALL_DIR)/* $(1)
-endef
-
-$(eval $(call BuildPackage,freepops))
-

file:a/net/keepalived/Makefile (deleted)
--- a/net/keepalived/Makefile
+++ /dev/null
@@ -1,67 +1,1 @@
-#
-# 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))
-

--- a/net/keepalived/files/keepalived.init
+++ /dev/null
@@ -1,15 +1,1 @@
-#!/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)
--- a/net/linuxigd/Makefile
+++ /dev/null
@@ -1,70 +1,1 @@
-#
-# 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))
-

--- a/net/linuxigd/files/upnpd.conf
+++ /dev/null
@@ -1,72 +1,1 @@
-#
-# 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
-

--- a/net/linuxigd/files/upnpd.init
+++ /dev/null
@@ -1,25 +1,1 @@
-#!/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
-}
-

--- a/net/linuxigd/patches/001-iptables_defs.patch
+++ /dev/null
@@ -1,74 +1,1 @@
-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
 

--- a/net/linuxigd/patches/002-netfilter_nat_headers.patch
+++ /dev/null
@@ -1,17 +1,1 @@
-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"
 

--- a/net/linuxigd/patches/003-Makefile-fix.patch
+++ /dev/null
@@ -1,14 +1,1 @@
-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
 

--- a/net/linuxigd/patches/004-iptables-1.4.3.2-compat.patch
+++ /dev/null
@@ -1,102 +1,1 @@
-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/net/linuxigd/patches/005-includes.patch
+++ /dev/null
@@ -1,31 +1,1 @@
---- 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/snort/Makefile (deleted)
--- a/net/snort/Makefile
+++ /dev/null
@@ -1,182 +1,1 @@
 
-# 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))
-

--- a/net/snort/files/snort.bin
+++ /dev/null
@@ -1,4 +1,1 @@
-#!/bin/sh
 
-exec snort.bin --daq-dir /usr/lib/daq/ $*
-

--- a/net/snort/files/snort.default
+++ /dev/null
@@ -1,3 +1,1 @@
-INTERFACE="lo"
-OPTIONS="-i $INTERFACE -c /etc/snort/snort.conf -D -N -q -s"
 

--- a/net/snort/files/snort.init
+++ /dev/null
@@ -1,21 +1,1 @@
-#!/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
-}
-

--- a/net/snort/files/snort.local.rules
+++ /dev/null
@@ -1,6 +1,1 @@
-# ----------------
-# LOCAL RULES
-# ----------------
-# This file intentionally does not come with signatures.  Put your local
-# additions here.
 

--- a/net/snort/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,5 +1,1 @@
---- /dev/null
-+++ b/acinclude.m4
-@@ -0,0 +1 @@
-+sinclude(m4/libprelude.m4)
 

--- a/net/snort/patches/100-INADDR_NONE.patch
+++ /dev/null
@@ -1,41 +1,1 @@
---- 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/net/snort/patches/101-PCAP.patch
+++ /dev/null
@@ -1,32 +1,1 @@
---- 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/net/snort/patches/150-config-preprocessors-disable.patch
+++ /dev/null
@@ -1,492 +1,1 @@
---- 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/net/snort/patches/160-mysql_cross_compiling_checks.patch
+++ /dev/null
@@ -1,67 +1,1 @@
---- 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,
 

--- a/net/snort/patches/200-snortsam.patch
+++ /dev/null
@@ -1,3017 +1,1 @@
-diff -ruN snort-2.9.2.2/autojunk.sh snort-2.9.2.2_bkup/autojunk.sh
---- snort-2.9.2.2/autojunk.sh	1969-12-31 16:00:00.000000000 -0800
-+++ snort-2.9.2.2_bkup/autojunk.sh	2012-04-08 20:34:57.385687022 -0700
-@@ -0,0 +1,7 @@
-+#!/bin/sh
-+# the list of commands that need to run before we do a compile
-+libtoolize --automake --copy
-+aclocal -I m4
-+autoheader
-+automake --add-missing --copy
-+autoconf
-diff -ruN snort-2.9.2.2/etc/snort.conf snort-2.9.2.2_bkup/etc/snort.conf
---- snort-2.9.2.2/etc/snort.conf	2012-03-19 15:57:09.000000000 -0700
-+++ snort-2.9.2.2_bkup/etc/snort.conf	2012-04-08 20:34:57.385687022 -0700
-@@ -536,11 +536,38 @@
- # prelude
- # output alert_prelude
- 
-+###################################################
-+# snortsam
-+###################################################
-+# In order to cause Snort to send a blocking request to the SnortSam agent,
-+# that agent has to be listed, including the port it listens on,
-+# and the encryption key it is using. The statement for that is:
-+#
-+# output alert_fwsam: {SnortSam Station}:{port}/{password}
-+#
-+#  {SnortSam Station}: IP address or host name of the host where SnortSam is running.
-+#  {port}:             The port the remote SnortSam agent listens on.
-+#  {password}:         The password, or key, used for encryption of the
-+#                      communication to the remote agent.
-+#
-+# At the very least, the IP address or host name of the host running SnortSam
-+# needs to be specified. If the port is omitted, it defaults to TCP port 898.
-+# If the password is omitted, it defaults to a preset password.
-+# (In which case it needs to be omitted on the SnortSam agent as well)
-+#
-+# More than one host can be specified, but has to be done on the same line.
-+# Just separate them with one or more spaces.
-+#
-+# Examples:
-+#
-+# output alert_fwsam: firewall/idspassword
-+# output alert_fwsam: fw1.domain.tld:898/mykey
-+# output alert_fwsam: 192.168.0.1/borderfw  192.168.1.254/wanfw
-+
- # metadata reference data.  do not modify these lines
- include classification.config
- include reference.config
- 
--
- ###################################################
- # Step #7: Customize your rule set
- # For more information, see Snort Manual, Writing Snort Rules
-diff -ruN snort-2.9.2.2/src/fatal.h snort-2.9.2.2_bkup/src/fatal.h
---- snort-2.9.2.2/src/fatal.h	1969-12-31 16:00:00.000000000 -0800
-+++ snort-2.9.2.2_bkup/src/fatal.h	2012-04-08 20:34:57.385687022 -0700
-@@ -0,0 +1,40 @@
-+/* $Id$ */
-+/*
-+** Copyright (C) 2002-2008 Sourcefire, Inc.
-+** Copyright (C) 1998-2002 Martin Roesch <roesch@sourcefire.com>
-+**
-+** This program is free software; you can redistribute it and/or modify
-+** it under the terms of the GNU General Public License Version 2 as
-+** published by the Free Software Foundation.  You may not use, modify or
-+** distribute this program under any other version of the GNU General
-+** Public License.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+** You should have received a copy of the GNU General Public License
-+** along with this program; if not, write to the Free Software
-+** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __FATAL_H__
-+#define __FATAL_H__
-+
-+
-+/*
-+ * in debugging mode print out the filename and the line number where the
-+ * failure have occured
-+ */
-+
-+
-+#ifdef DEBUG
-+	#define	FATAL(msg) 	{ printf("%s:%d: ", __FILE__, __LINE__); FatalError( (char *) msg); }
-+#else
-+	#define	FATAL(msg)	FatalError( (char *) msg)
-+#endif
-+
-+
-+
-+#endif	/* __FATAL_H__ */
-diff -ruN snort-2.9.2.2/src/Makefile.am snort-2.9.2.2_bkup/src/Makefile.am
---- snort-2.9.2.2/src/Makefile.am	2011-10-26 11:28:52.000000000 -0700
-+++ snort-2.9.2.2_bkup/src/Makefile.am	2012-04-08 20:34:57.385687022 -0700
-@@ -59,6 +59,7 @@
- rate_filter.c rate_filter.h \
- obfuscation.c obfuscation.h \
- rule_option_types.h \
-+twofish.c twofish.h \
- sfdaq.c sfdaq.h \
- idle_processing.c idle_processing.h idle_processing_funcs.h
- 
-diff -ruN snort-2.9.2.2/src/output-plugins/Makefile.am snort-2.9.2.2_bkup/src/output-plugins/Makefile.am
---- snort-2.9.2.2/src/output-plugins/Makefile.am	2010-06-09 15:05:17.000000000 -0700
-+++ snort-2.9.2.2_bkup/src/output-plugins/Makefile.am	2012-04-08 20:34:57.385687022 -0700
-@@ -15,6 +15,7 @@
- spo_log_tcpdump.h spo_unified.c spo_unified2.c spo_unified.h spo_unified2.h \
- spo_log_ascii.c spo_log_ascii.h spo_alert_sf_socket.h spo_alert_sf_socket.c \
- $(PRELUDE_CODE) spo_alert_arubaaction.c spo_alert_arubaaction.h \
-+spo_alert_fwsam.c spo_alert_fwsam.h \
- spo_alert_test.c spo_alert_test.h
- 
- INCLUDES = @INCLUDES@
-diff -ruN snort-2.9.2.2/src/output-plugins/spo_alert_fwsam.c snort-2.9.2.2_bkup/src/output-plugins/spo_alert_fwsam.c
---- snort-2.9.2.2/src/output-plugins/spo_alert_fwsam.c	1969-12-31 16:00:00.000000000 -0800
-+++ snort-2.9.2.2_bkup/src/output-plugins/spo_alert_fwsam.c	2012-04-08 23:40:57.676343063 -0700
-@@ -0,0 +1,1387 @@
-+/* $id: snortpatchb,v 1.2 2002/10/26 03:32:35 fknobbe Exp $
-+**
-+** spo_alert_fwsam.c
-+**
-+** Copyright (c) 2001-2004 Frank Knobbe <frank@knobbe.us>
-+**
-+** This program is free software; you can redistribute it and/or modify
-+** it under the terms of the GNU General Public License as published by
-+** the Free Software Foundation; either version 2 of the License, or
-+** (at your option) any later version.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+** You should have received a copy of the GNU General Public License
-+** along with this program; if not, write to the Free Software
-+** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+*/
-+
-+/*
-+ * Purpose:
-+ *
-+ * This module sends alerts to a remote service on a host running SnortSam
-+ * (the agent) which will block the intruding IP address on a variety of
-+ * host and network firewalls.
-+ *
-+ * SnortSam also performs checks against a white-list of never-to-be-blocked IP addresses,
-+ * can override block durations (for example for known proxies), and can detect attack conditions
-+ * where too many blocks are received within a defined interval. If an attack is detected
-+ * it will unblock the last x blocks and wait for the attack to end.
-+ *
-+ * See the SnortSam documentation for more information.
-+ *
-+ *
-+ * Output Plugin Parameters:
-+ ***************************
-+ *
-+ * output alert_fwsam: <SnortSam Station>:<port>/<key>
-+ *
-+ *	<FW Mgmt Station>:	The IP address or host name of the host running SnortSam.
-+ *	<port>:			The port the remote SnortSam service listens on (default 898).
-+ *	<key>:			The key used for authentication (encryption really)
-+ *				of the communication to the remote service.
-+ *
-+ * Examples:
-+ *
-+ * output alert_fwsam: snortsambox/idspassword
-+ * output alert_fwsam: fw1.domain.tld:898/mykey
-+ * output alert_fwsam: 192.168.0.1/borderfw  192.168.1.254/wanfw
-+ *
-+ *
-+ * Rule Options:
-+ ***************
-+ *
-+ * fwsam:	who[how],time;
-+ *
-+ *  who: src, source, dst, dest, destination
-+ *			IP address to be blocked according to snort rule (some rules
-+ *			are reversed, i.e. homenet -> any [and you want to block any]).
-+ *          src denotes IP to the left of -> and dst denotes IP to the right
-+ *
-+ *  how: Optional. In, out, src, dest, either, both, this, conn, connection
-+ *			Tells FW-1 to block packets INcoming from host, OUTgoing to host,
-+ *			EITHERway, or only THIS connection (IP/Service pair).
-+ *			See 'fw sam' for more information. May be ignored by other plugins.
-+ *
-+ * time: Duration of block in seconds. (Accepts 'days', 'months', 'weeks',
-+ *		 'years', 'minutes', 'seconds', 'hours'. Alternatively, a value of
-+ *		 0, or the keyword PERManent, INFinite, or ALWAYS, will block the
-+ *		 host permanently. Be careful with this!
-+ *			Tells FW-1 (and others) how long to inhibit packets from the host.
-+ *
-+ * Examples:
-+ *
-+ * fwsam:  src[either],15min;
-+ *     or  dst[in], 2 days 4 hours
-+ *     or  src, 1 hour
-+ *
-+ *         (default: src[either],5min)
-+ *
-+ *
-+ * Effect:
-+ *
-+ * Alerts are sent to the remote SnortSam services on Firewall-1 Management Stations
-+ * or other hosts running SnortSam (as required for Cisco Routers and PIX).
-+ * The remote services will invoke the SAM configuration via the fw sam
-+ * command line, or by sending a packet to the SAM port 18183, or by using the official
-+ * OPSEC API calls, or by telnetting into Cisco routers or PIX firewalls.
-+ * The communication over the network is encrypted using two-fish.
-+ * (Implementation ripped from CryptCat by Farm9 with permission.)
-+ *
-+ * Future Plans:
-+ *
-+ * - Custom alert trigger per rule (x alerts in y secs) --> Seems to exist in Snort 1.9 now.
-+ * - Enable/Allow tagged fwsam: arguments to provide different values to
-+ *        different stations.  --> Seems to be accomplished with custom rule-types
-+ *
-+ *
-+ * Comments:
-+ *
-+ * It seem that above wishes can be implemented with todays setup. Feedback concerning
-+ * these is greatly appreciated.
-+ *
-+*/
-+
-+
-+#include "spo_alert_fwsam.h"
-+#include "twofish.h"
-+/* external globals from rules.c  */
-+extern char *file_name;
-+extern int file_line;
-+extern OptTreeNode *otn_tmp;
-+extern char *snort_conf_dir; /* extern PV pv; */
-+
-+
-+/* my globals  */
-+
-+FWsamList *FWsamStationList=NULL;			/* Global (for all alert-types) list of snortsam stations */
-+FWsamOptions *FWsamOptionField=NULL;
-+unsigned long FWsamMaxOptions=0;
-+
-+
-+/*
-+ * Function: AlertFWsamSetup()
-+ *
-+ * Purpose: Registers the output plugin keyword and initialization
-+ *          function into the output plugin list.  This is the function that
-+ *          gets called from InitOutputPlugins() in plugbase.c.
-+ *			It also registers itself as a plugin in order to parse every rule
-+ *			and to set the appropiate flags from fwsam: option.
-+ *
-+ * Arguments: None.
-+ *
-+ * Returns: void function
-+ *
-+*/
-+void AlertFWsamSetup(void)
-+{
-+    /* link the preprocessor keyword to the init function in the preproc list */
-+    RegisterOutputPlugin("alert_fwsam", OUTPUT_TYPE_FLAG__ALERT, AlertFWsamInit);
-+    RegisterRuleOption("fwsam", AlertFWsamOptionInit, NULL, OPT_TYPE_ACTION, NULL);
-+
-+#ifdef FWSAMDEBUG   /* This allows debugging of fwsam only */
-+    LogMessage("DEBUG => [Alert_FWsam](AlertFWsamSetup) Output plugin is plugged in...\n");
-+#endif
-+}
-+
-+
-+/*	This function checks if a given snortsam station is already in
-+ *	a given list.
-+*/
-+int FWsamStationExists(FWsamStation *who,FWsamList *list)
-+{
-+    while(list)
-+    {
-+        if(list->station) {
-+//			if(	who->stationip.s_addr==list->station->stationip.s_addr &&
-+            if(IP_EQUALITY(&who->stationip, &list->station->stationip) &&
-+            who->stationport==list->station->stationport)
-+            return TRUE;
-+        }
-+        list=list->next;
-+    }
-+    return FALSE;
-+}
-+
-+/*
-+ * Function: AlertFWsamInit(char *args)
-+ *
-+ * Purpose: Calls the argument parsing function, performs final setup on data
-+ *          structs, links the preproc function into the function list.
-+ *
-+ * Arguments: args => ptr to argument string
-+ *
-+ * Returns: void function
-+ *
-+*/
-+void AlertFWsamInit(char *args)
-+{	char *ap;
-+	unsigned long statip,cnt,again,i;
-+	char *stathost,*statport,*statpass;
-+	FWsamStation *station;
-+	FWsamList *fwsamlist=NULL;	/* alert-type dependent list of snortsam stations  */
-+	FWsamList *listp,*newlistp;
-+	struct hostent *hoste;
-+	char buf[1024]="";
-+	FILE *fp;
-+	FWsamOptions tempopt;
-+
-+#ifdef FWSAMDEBUG
-+	unsigned long hostcnt=0;
-+
-+
-+
-+    LogMessage("DEBUG => [Alert_FWsam](AlertFWsamInit) Output plugin initializing...\n");
-+#endif
-+
-+    /* pv.alert_plugin_active = 1; */
-+
-+    /* parse the argument list from the rules file */
-+
-+	if(args == NULL)
-+		FatalError("ERROR %s (%d) => [Alert_FWsam](AlertFWsamInit) No arguments to alert_fwsam preprocessor!\n", file_name, file_line);
-+
-+	if(!FWsamOptionField && !FWsamMaxOptions)
-+	{	strncpy(buf,snort_conf_dir,sizeof(buf)-1);
-+		strncpy(buf+strlen(buf),SID_MAPFILE,sizeof(buf)-strlen(buf)-1);
-+#ifdef FWSAMDEBUG
-+		LogMessage("DEBUG => [Alert_FWsam](AlertFWsamSetup) Using file: %s\n",buf);
-+#endif
-+		fp=fopen(buf,"rt");
-+		if(!fp)
-+		{	strncpy(buf,snort_conf_dir,sizeof(buf)-1);
-+			strncpy(buf+strlen(buf),SID_ALT_MAPFILE,sizeof(buf)-strlen(buf)-1);
-+			fp=fopen(buf,"rt");
-+		}
-+		if(fp)  /* Check for presence of map file and read those in, sorted. */
-+		{   LogMessage("INFO => [Alert_FWsam](AlertFWsamSetup) Using sid-map file: %s\n",buf);
-+
-+			while(FWsamReadLine(buf,sizeof(buf),fp))
-+				if(*buf)
-+					FWsamMaxOptions++;
-+			if(FWsamMaxOptions)
-+			{   if((FWsamOptionField=(FWsamOptions *)malloc(sizeof(FWsamOptions)*FWsamMaxOptions))==NULL)
-+					FatalError("ERROR => [Alert_FWsam](AlertFWsamSetup) malloc failed for OptionField!\n");
-+				fseek(fp,0,SEEK_SET);
-+				for(cnt=0;cnt<FWsamMaxOptions;)
-+				{	FWsamReadLine(buf,sizeof(buf),fp);
-+					if(*buf)
-+						FWsamParseLine(&(FWsamOptionField[cnt++]),buf);
-+				}
-+				if(FWsamMaxOptions>1)
-+				{	for(again=TRUE,cnt=FWsamMaxOptions-1;cnt>=1 && again;cnt--)
-+					{	for(again=FALSE,i=0;i<cnt;i++)
-+						{	if(FWsamOptionField[i].sid>FWsamOptionField[i+1].sid)
-+							{	memcpy(&tempopt,&(FWsamOptionField[i]),sizeof(FWsamOptions));
-+								memcpy(&(FWsamOptionField[i]),&(FWsamOptionField[i+1]),sizeof(FWsamOptions));
-+								memcpy(&(FWsamOptionField[i+1]),&tempopt,sizeof(FWsamOptions));
-+								again=TRUE;
-+							}
-+						}
-+					}
-+				}
-+			}
-+			else
-+				FWsamMaxOptions=1;
-+			fclose(fp);
-+		}
-+		else
-+			FWsamMaxOptions=1;
-+	}
-+
-+
-+	ap=args; /* start at the beginning of the argument */
-+	while(*ap && isspace(*ap)) ap++;
-+	while(*ap)
-+	{	stathost=ap; /* first argument should be host */
-+		statport=NULL;
-+		statpass=NULL;
-+		while(*ap && *ap!=':' && *ap!='/' && !isspace(*ap)) ap++; /* find token */
-+		switch(*ap)
-+		{	case ':':	*ap++=0; /* grab the port */
-+						statport=ap;
-+						while(*ap && *ap!='/' && !isspace(*ap)) ap++;
-+						if(*ap!='/')
-+							break;
-+			case '/':	*ap++=0; /* grab the key */
-+						statpass=ap;
-+						while(*ap && !isspace(*ap)) ap++;
-+			default:	break;
-+		}
-+		if(*ap)
-+		{	*ap++=0;
-+			while(isspace(*ap)) ap++;
-+		}
-+		/* now we have the first host with port and password (key) */
-+		/* next we check for valid/blank password/port */
-+		if(statpass!=NULL)
-+			if(!*statpass)
-+				statpass=NULL;
-+		if(statport!=NULL)
-+			if(!*statport)
-+				statport=NULL;
-+		statip=0;
-+		/* now we check if a valid host was specified */
-+		if(inet_addr(stathost)==INADDR_NONE)
-+		{	hoste=gethostbyname(stathost);
-+			if (!hoste)
-+				LogMessage("WARNING %s (%d) => [Alert_FWsam](AlertFWsamInit) Unable to resolve host '%s'!\n",file_name,file_line,stathost);
-+			else
-+				statip=*(unsigned long *)hoste->h_addr;
-+		}
-+		else
-+		{	statip=inet_addr(stathost);
-+			if(!statip)
-+				LogMessage("WARNING %s (%d) => [Alert_FWsam](AlertFWsamInit) Invalid host address '%s'!\n",file_name,file_line,stathost);
-+		}
-+		if(statip)
-+		{	/* groovie, a valid host. Let's alloc and assemble the structure for it. */
-+			if((station=(FWsamStation *)malloc(sizeof(FWsamStation)))==NULL)
-+				FatalError("ERROR => [Alert_FWsam](AlertFWsamInit) malloc failed for station!\n");
-+
-+//			station->stationip.s_addr=statip; /* the IP address */
-+			station->stationip.ip32[0] = statip; /* the IP address */
-+			if(statport!=NULL && atoi(statport)>0) /* if the user specified one */
-+				station->stationport=atoi(statport); /* use users setting */
-+			else
-+				station->stationport=FWSAM_DEFAULTPORT; /* set the default port */
-+
-+			if(statpass!=NULL) /* if specified by user */
-+				strncpy(station->stationkey,statpass,TwoFish_KEY_LENGTH); /* use defined key */
-+			else
-+				station->stationkey[0]=0;
-+			station->stationkey[TwoFish_KEY_LENGTH]=0; /* make sure it's terminated. (damn strncpy...) */
-+
-+			strcpy(station->initialkey,station->stationkey);
-+			station->stationfish=TwoFishInit(station->stationkey);
-+
-+			station->localsocketaddr.sin_port=htons(0); /* let's use dynamic ports for now */
-+			station->localsocketaddr.sin_addr.s_addr=0;
-+			station->localsocketaddr.sin_family=AF_INET;
-+			station->stationsocketaddr.sin_port=htons(station->stationport);
-+			//station->stationsocketaddr.sin_addr=station->stationip;
-+			station->stationsocketaddr.sin_addr.s_addr=station->stationip.ip32[0];
-+			station->stationsocketaddr.sin_family=AF_INET; /* load all socket crap and keep for later */
-+
-+			do
-+				station->myseqno=rand(); /* the seqno this host will use */
-+			while(station->myseqno<20 || station->myseqno>65500);
-+			station->mykeymod[0]=rand();
-+			station->mykeymod[1]=rand();
-+			station->mykeymod[2]=rand();
-+			station->mykeymod[3]=rand();
-+			station->stationseqno=0;				/* peer hasn't answered yet. */
-+
-+
-+			if(!FWsamStationExists(station,FWsamStationList))	/* If we don't have the station already in global list....*/
-+			{	if(FWsamCheckIn(station))			/* ...and we can talk to the agent...  */
-+				{	if((newlistp=(FWsamList *)malloc(sizeof(FWsamList)))==NULL)
-+						FatalError("ERROR => [Alert_FWsam](AlertFWsamInit) malloc failed for global newlistp!\n");
-+					newlistp->station=station;
-+					newlistp->next=NULL;
-+
-+					if(!FWsamStationList)				/* ... add it to the global list/ */
-+						FWsamStationList=newlistp;
-+					else
-+					{	listp=FWsamStationList;
-+						while(listp->next)
-+							listp=listp->next;
-+						listp->next=newlistp;
-+					}
-+				}
-+				else
-+				{	TwoFishDestroy(station->stationfish); /* if not, we trash it. */
-+					free(station);
-+					station=NULL;
-+				}
-+			}
-+#ifdef FWSAMDEBUG
-+			else
-+				LogMessage("DEBUG => [Alert_FWsam](AlertFWsamInit) Host %s:%i already in global list, skipping CheckIn.\n", sfip_ntoa(&station->stationip),station->stationport);
-+#endif
-+
-+			if(station)
-+			{	if(!FWsamStationExists(station,fwsamlist))	/* If we don't have the station already in local list....*/
-+				{	if((newlistp=(FWsamList *)malloc(sizeof(FWsamList)))==NULL)
-+						FatalError("ERROR => [Alert_FWsam](AlertFWsamInit) malloc failed for local newlistp!\n");
-+					newlistp->station=station;
-+					newlistp->next=NULL;
-+
-+					if(!fwsamlist)				/* ... add it to the local list/ */
-+						fwsamlist=newlistp;
-+					else
-+					{	listp=fwsamlist;
-+						while(listp->next)
-+							listp=listp->next;
-+						listp->next=newlistp;
-+					}
-+				}
-+
-+#ifdef FWSAMDEBUG
-+				else
-+					LogMessage("DEBUG => [Alert_FWsam](AlertFWsamInit) Host %s:%i already in local list, skipping.\n",sfip_ntoa(&station->stationip),station->stationport);
-+				LogMessage("DEBUG => [Alert_FWsam](AlertFWsamInit) #%i: Host %s [%s] port %i password %s\n",++hostcnt,stathost,sfip_ntoa(&station->stationip),station->stationport,station->stationkey);
-+#endif
-+			}
-+
-+		}
-+	}	/* next one */
-+
-+#ifdef FWSAMDEBUG
-+    LogMessage("DEBUG => [Alert_FWsam](AlertFWsamInit) Linking fwsam alert function to call list...\n");
-+#endif
-+
-+    /* Set the preprocessor function into the function list */
-+    AddFuncToOutputList(AlertFWsam, OUTPUT_TYPE_FLAG__ALERT, fwsamlist);
-+    AddFuncToCleanExitList(AlertFWsamCleanExitFunc, fwsamlist);
-+
-+/* 
-+* This ifdef function reloads snortsam config/list on SIG HUP
-+* 04082012 RZ
-+*/
-+#ifdef SNORT_RELOAD
-+    AddFuncToReloadList(AlertFWsamRestartFunc, fwsamlist);
-+#endif
-+
-+}
-+
-+
-+/*	This routine reads in a str from a file, snips white-spaces
-+ *	off the front and back, removes comments, and pretties the
-+ *	string. Returns true or false if a line was read or not.
-+*/
-+int FWsamReadLine(char *buf,unsigned long bufsize,FILE *fp)
-+{	char *p;
-+
-+	if(fgets(buf,bufsize-1,fp))
-+	{	buf[bufsize-1]=0;
-+
-+#ifdef FWSAMDEBUG_off
-+		LogMessage("DEBUG => [Alert_FWsam](AlertFWsamReadLine) Line: %s\n",buf);
-+#endif
-+
-+		p=buf;
-+		while(isspace(*p))
-+		  p++;
-+		if(p>buf);
-+			strcpy(buf,p);
-+		if(*buf)
-+		{	p=buf+strlen(buf)-1;	/* remove leading and trailing spaces */
-+			while(isspace(*p))
-+				*p-- =0;
-+		}
-+		p=buf;
-+		if(*p=='#' || *p==';')
-+			*p=0;
-+		else
-+			p++;
-+		while(*p)					/* remove inline comments (except escaped #'s and ;'s) */
-+		{	if(*p=='#' || *p==';')
-+			{	if(*(p-1)=='\\')
-+					strcpy(p-1,p);
-+				else
-+					*p=0;
-+			}
-+			else
-+				p++;
-+		}
-+		return TRUE;
-+	}
-+	return FALSE;
-+}
-+
-+
-+/* Parses the duration of the argument, recognizing minutes, hours, etc..
-+*/
-+unsigned long FWsamParseDuration(char *p)
-+{	unsigned long dur=0,tdu;
-+	char *tok,c1,c2;
-+
-+	while(*p)
-+	{	tok=p;
-+		while(*p && isdigit(*p))
-+			p++;
-+		if(*p)
-+		{	c1=tolower(*p);
-+			*p=0;
-+			p++;
-+			if(*p && !isdigit(*p))
-+			{	c2=tolower(*p++);
-+				while(*p && !isdigit(*p))
-+					p++;
-+			}
-+			else
-+				c2=0;
-+			tdu=atol(tok);
-+			switch(c1)
-+			{	case 'm':	if(c2=='o')				/* month */
-+								tdu*=(60*60*24*30);	/* use 30 days */
-+							else
-+								tdu*=60;			/* minutes */
-+				case 's':	break;					/* seconds */
-+				case 'h':	tdu*=(60*60);			/* hours */
-+							break;
-+				case 'd':	tdu*=(60*60*24);		/* days */
-+							break;
-+				case 'w':	tdu*=(60*60*24*7);		/* week */
-+							break;
-+				case 'y':	tdu*=(60*60*24*365);	/* year */
-+							break;
-+			}
-+			dur+=tdu;
-+		}
-+		else
-+			dur+=atol(tok);
-+	}
-+
-+	return dur;
-+}
-+
-+
-+/*  This routine parses an option line. It is called by FWsamParseLine,
-+ *  which parses the sid-block.map file, and also by AlertFWsamOptionInit,
-+ *  which is called by Snort when processing fwsam: options in rules.
-+ *  It returns TRUE it there is a possible option problem, otherwise FALSE.
-+*/
-+int FWsamParseOption(FWsamOptions *optp,char *ap)
-+{   int possprob=FALSE;
-+
-+	/* set defaults */
-+
-+	optp->duration=300;					/* default of 5 minute block */
-+	optp->how=FWSAM_HOW_INOUT;			/* inbound and outbound block */
-+	optp->who=FWSAM_WHO_SRC;			/* the source  */
-+    optp->loglevel=FWSAM_LOG_LONGALERT; /* the log level default */
-+	/* parse the fwsam keywords */
-+
-+#ifdef FWSAMDEBUG
-+	LogMessage("DEBUG => [Alert_FWsam](AlertFWamOptionInit) Parse Options Args: %s\n",ap);
-+#endif
-+
-+	if(*ap)		/* should be dst/src (the WHO) or duration */
-+	{	if(isdigit(*ap))
-+			optp->duration=FWsamParseDuration(ap);
-+		else
-+		{	switch(*ap)			/* yeah, we're lazy and check only the first character */
-+			{	case 'p':	;								/* permanent, perm */
-+				case 'f':	;								/* forever */
-+				case 'i':	optp->duration=0;				/* infinite, inf */
-+							break;
-+				case 'd':	optp->who=FWSAM_WHO_DST;		/* destination, dest, dst */
-+							break;
-+				case 's':	optp->who=FWSAM_WHO_SRC;		/* source, src */
-+							break;
-+				default:	possprob=TRUE;
-+			}
-+			while(*ap && *ap!=',' && *ap!='[')
-+				ap++;
-+			if(*ap=='[')
-+			{	ap++;		/* now we have the HOW */
-+				switch(*ap)
-+				{	case 'i':	;							/* in */
-+					case 's':	optp->how=FWSAM_HOW_IN;		/* source, src */
-+								break;
-+					case 'o':	;							/* out */
-+					case 'd':	optp->how=FWSAM_HOW_OUT;	/* destination, dest, dst */
-+								break;
-+					case 'b':	;							/* both */
-+					case 'e':	optp->how=FWSAM_HOW_INOUT;	/* either */
-+								break;
-+					case 't':	;							/* this */
-+					case 'c':	optp->how=FWSAM_HOW_THIS;	/* connection, conn */
-+								break;
-+					default:	possprob=TRUE;
-+				}
-+				while(*ap && *ap!=',')
-+					ap++;
-+			}
-+			if(*ap==',')
-+			{	ap++;
-+				if(isdigit(*ap))  /* and figure out how long to block */
-+					optp->duration=FWsamParseDuration(ap);
-+				else if(*ap=='p' || *ap=='f' || *ap=='i')
-+					optp->duration=0;
-+				else
-+					possprob=TRUE;
-+			}
-+			else if(!*ap)
-+				possprob=TRUE;
-+		}
-+	}
-+	else
-+		possprob=TRUE;
-+
-+	return possprob;
-+}
-+
-+
-+/*	This goes through the lines of sid-block.map and sets the
-+ *	options for fwsam if the file is being used.
-+*/
-+void FWsamParseLine(FWsamOptions *optp,char *buf)
-+{   char *ap;
-+
-+	ap=buf; /* start at the beginning of the argument */
-+
-+	while(*ap)
-+	{	if(isspace(*ap))		/* normalize spaces (tabs into space, etc) */
-+			*ap=' ';
-+		if(isupper(*ap))		/* and set to lower case */
-+			*ap=tolower(*ap);
-+		ap++;
-+	}
-+	while((ap=strrchr(buf,' '))!=NULL)	/* remove spaces */
-+		strcpy(ap,ap+1);
-+
-+	ap=buf;
-+	if(*ap)
-+	{	while(*ap && *ap!=':' && *ap!='|')
-+			ap++;
-+		*ap++ =0;
-+		while(*ap && (*ap==':' || *ap=='|'))
-+			ap++;
-+
-+		optp->sid=(unsigned long)atol(buf);
-+
-+		if(FWsamParseOption(optp,ap))
-+			LogMessage("WARNING %s (%d) => [Alert_FWsam](AlertFWamOptionInit) Possible option problem. Using %s[%s],%lu.\n",file_name,file_line,(optp->who==FWSAM_WHO_SRC)?"src":"dst",(optp->how==FWSAM_HOW_IN)?"in":((optp->how==FWSAM_HOW_OUT)?"out":"either"),optp->duration);
-+	}
-+	else
-+		optp->sid=0;
-+}
-+
-+
-+
-+/*
-+ * Function: AlertFWsamOptionInit(char *data, OptTreeNode *otn, int protocol)
-+ *
-+ * Purpose: Parses each rule and sets the option flags in the tree.
-+ *
-+ * Arguments: args => ptr to argument string
-+ *
-+ * Returns: void function
-+ *
-+*/
-+void AlertFWsamOptionInit(char *args,OptTreeNode *otn,int protocol)
-+{
-+    FWsamOptions *optp;
-+	char *ap;
-+
-+
-+#ifdef FWSAMDEBUG
-+    LogMessage("DEBUG => [Alert_FWsam](AlertFWamOptionInit) FWsamOptionInit is parsing...\n");
-+#endif
-+
-+    if((optp=(FWsamOptions *)malloc(sizeof(FWsamOptions)))==NULL)
-+		FatalError("ERROR => [Alert_FWsam](AlertFWamOptionInit) malloc failed for opt!\n");
-+
-+
-+	ap=args; /* start at the beginning of the argument */
-+
-+	while(*ap)
-+	{	if(isspace(*ap))		/* normalize spaces (tabs into space, etc) */
-+			*ap=' ';
-+		if(isupper(*ap))		/* and set to lower case */
-+			*ap=tolower(*ap);
-+		ap++;
-+	}
-+	while((ap=strrchr(args,' '))!=NULL)	/* remove spaces */
-+		strcpy(ap,ap+1);
-+
-+
-+	if(FWsamParseOption(optp,args))
-+		LogMessage("WARNING %s (%d) => [Alert_FWsam](AlertFWamOptionInit) Possible option problem. Using %s[%s],%lu.\n",file_name,file_line,(optp->who==FWSAM_WHO_SRC)?"src":"dst",(optp->how==FWSAM_HOW_IN)?"in":((optp->how==FWSAM_HOW_OUT)?"out":"either"),optp->duration);
-+
-+	otn->ds_list[PLUGIN_FWSAM]=(FWsamOptions *)optp;
-+}
-+
-+
-+/* Generates a new encryption key for TwoFish based on seq numbers and a random that
-+ * the SnortSam agents send on checkin (in protocol)
-+*/
-+void FWsamNewStationKey(FWsamStation *station,FWsamPacket *packet)
-+{
-+    //unsigned char newkey[TwoFish_KEY_LENGTH+2];
-+    char newkey[TwoFish_KEY_LENGTH+2];
-+	int i;
-+
-+	newkey[0]=packet->snortseqno[0];		/* current snort seq # (which both know) */
-+	newkey[1]=packet->snortseqno[1];
-+	newkey[2]=packet->fwseqno[0];			/* current SnortSam seq # (which both know) */
-+	newkey[3]=packet->fwseqno[1];
-+	newkey[4]=packet->protocol[0];		/* the random SnortSam chose */
-+	newkey[5]=packet->protocol[1];
-+
-+	strncpy(newkey+6,station->stationkey,TwoFish_KEY_LENGTH-6); /* append old key */
-+	newkey[TwoFish_KEY_LENGTH]=0;
-+
-+	newkey[0]^=station->mykeymod[0];		/* modify key with key modifiers which were */
-+	newkey[1]^=station->mykeymod[1];		/* exchanged during the check-in handshake. */
-+	newkey[2]^=station->mykeymod[2];
-+	newkey[3]^=station->mykeymod[3];
-+	newkey[4]^=station->fwkeymod[0];
-+	newkey[5]^=station->fwkeymod[1];
-+	newkey[6]^=station->fwkeymod[2];
-+	newkey[7]^=station->fwkeymod[3];
-+
-+	for(i=0;i<=7;i++)
-+		if(newkey[i]==0)
-+			newkey[i]++;
-+
-+	strcpy(station->stationkey,newkey);
-+	TwoFishDestroy(station->stationfish);
-+	station->stationfish=TwoFishInit(newkey);
-+}
-+
-+
-+/*	This routine will search the option list as defined
-+ *	by the sid-block.map file and return a pointer
-+ *	to the matching record.
-+*/
-+FWsamOptions *FWsamGetOption(unsigned long sid)
-+{	signed long i,step,diff,o,o2;
-+
-+#ifdef FWSAM_FANCYFETCH       /* Fancy-fetch jumps in decreasing n/2 steps and takes much less lookups */
-+	o=o2= -1;
-+	i=step=FWsamMaxOptions>>1;
-+	while(i>=0 && i<FWsamMaxOptions && i!=o2)
-+	{	diff=sid-FWsamOptionField[i].sid;
-+		if(!diff)
-+			return &(FWsamOptionField[i]);
-+		if(step>1)
-+			step=step>>1;
-+		o2=o;
-+		o=i;
-+		if(diff>0)
-+			i+=step;
-+		else
-+			i-=step;
-+	}
-+#else						/* This is just a sequential list lookup */
-+	for(i=0;i<FWsamMaxOptions;i++)
-+		if(FWsamOptionField[i].sid==sid)
-+			return &(FWsamOptionField[i]);
-+#endif
-+	return NULL;
-+}
-+
-+
-+/****************************************************************************
-+ *
-+ * Function: AlertFWsam(Packet *, char *)
-+ *
-+ * Purpose: Send the current alert to a remote module on a FW-1 mgmt station
-+ *
-+ * Arguments: p => pointer to the packet data struct
-+ *            msg => the message to print in the alert
-+ *
-+ * Returns: void function
-+ *
-+ ***************************************************************************/
-+void AlertFWsam(Packet *p, char *msg, void *arg, Event *event)
-+{	FWsamOptions *optp;
-+	FWsamPacket sampacket;
-+	FWsamStation *station=NULL;
-+	FWsamList *fwsamlist;
-+	SOCKET stationsocket;
-+	int i,len,deletestation,stationtry=0;
-+	//unsigned char *encbuf,*decbuf;
-+    char *encbuf,*decbuf;
-+	static unsigned long lastbsip[FWSAM_REPET_BLOCKS],lastbdip[FWSAM_REPET_BLOCKS],
-+						 lastbduration[FWSAM_REPET_BLOCKS],lastbtime[FWSAM_REPET_BLOCKS];
-+	static unsigned short lastbsp[FWSAM_REPET_BLOCKS],lastbdp[FWSAM_REPET_BLOCKS],
-+						  lastbproto[FWSAM_REPET_BLOCKS],lastbpointer;
-+	static unsigned char lastbmode[FWSAM_REPET_BLOCKS];
-+	static unsigned long btime=0;
-+
-+
-+	if(otn_tmp==NULL)
-+    {
-+#ifdef FWSAMDEBUG
-+        LogMessage("DEBUG => [Alert_FWsam] NULL otn_tmp!\n");
-+#endif
-+        return;
-+    }
-+    if(p == NULL)
-+    {
-+#ifdef FWSAMDEBUG
-+        LogMessage("DEBUG => [Alert_FWsam] NULL packet!\n");
-+#endif
-+        return;
-+    }
-+    if(arg == NULL)
-+    {
-+#ifdef FWSAMDEBUG
-+        LogMessage("DEBUG => [Alert_FWsam] NULL arg!\n");
-+#endif
-+        return;
-+    }
-+
-+    /* SnortSam does no IPv6 */
-+    if (!IS_IP4(p)) {
-+#ifdef FWSAMDEBUG
-+        LogMessage("DEBUG => [Alert_FWsam] not acting on non-IP4 packet!\n");
-+#endif
-+        return;
-+    }
-+
-+	optp=NULL;
-+
-+	if(FWsamOptionField)            /* If using the file (field present), let's use that */
-+		optp=FWsamGetOption(event->sig_id);
-+
-+	if(!optp)                       /* If file not present, check if an fwsam option was defined on the triggering rule */
-+		optp=otn_tmp->ds_list[PLUGIN_FWSAM];
-+
-+	if(optp)	/* if options specified for this rule */
-+	{	if(!btime)			/* if this is the first time this function is */
-+		{	for(i=0;i<FWSAM_REPET_BLOCKS;i++)	/*  called, reset the time and protocol to 0. */
-+			{	lastbproto[i]=0;
-+				lastbtime[i]=0;
-+			}
-+		}
-+
-+		fwsamlist=(FWsamList *)arg;
-+
-+#ifdef FWSAMDEBUG
-+		LogMessage("DEBUG => [Alert_FWsam] Alert -> Msg=\"%s\"\n",msg);
-+
-+		LogMessage("DEBUG => [Alert_FWsam] Alert -> Option: %s[%s],%lu.\n",(optp->who==FWSAM_WHO_SRC)?"src":"dst",(optp->how==FWSAM_HOW_IN)?"in":((optp->how==FWSAM_HOW_OUT)?"out":"either"),optp->duration);
-+#endif
-+
-+		len=TRUE;
-+		btime=(unsigned long)time(NULL);	/* get current time */
-+		/* This is a cheap check to see if the blocking request matches any of the previous requests. */
-+		for(i=0;i<FWSAM_REPET_BLOCKS && len;i++)
-+		{	if( ((optp->how==FWSAM_HOW_THIS)?	/* if blocking mode SERVICE, check for src and dst	  */
-+				( lastbsip[i]==p->iph->ip_src.s_addr && lastbdip[i]==p->iph->ip_dst.s_addr &&lastbproto[i]==p->iph->ip_proto &&
-+				  ((p->iph->ip_proto==IPPROTO_TCP || p->iph->ip_proto==IPPROTO_UDP)? /* check port only of TCP or UDP */
-+/*					((optp->who==FWSAM_WHO_SRC)?(lastbsp[i]==p->sp):(lastbdp[i]==p->dp)):TRUE) ): */
-+					lastbdp[i]==p->dp:TRUE) ):
-+				((optp->who==FWSAM_WHO_SRC)?(lastbsip[i]==p->iph->ip_src.s_addr):(lastbdip[i]==p->iph->ip_dst.s_addr))) && /* otherwise if we block source, only compare source. Same for dest. */
-+				lastbduration[i]==optp->duration &&
-+				(lastbmode[i]&(FWSAM_HOW|FWSAM_WHO))==(optp->how|optp->who) &&
-+				(btime-lastbtime[i]<((optp->duration>FWSAM_REPET_TIME)?FWSAM_REPET_TIME:optp->duration)))
-+			{	len=FALSE;		/* If so, we don't need to block again. */
-+			}
-+		}
-+		if(len)
-+		{	if(++lastbpointer>=FWSAM_REPET_BLOCKS)		/* increase repetitive check pointer */
-+				lastbpointer=0;
-+			lastbsip[lastbpointer]=p->iph->ip_src.s_addr;		/* and note packet details */
-+			lastbdip[lastbpointer]=p->iph->ip_dst.s_addr;
-+			lastbduration[lastbpointer]=optp->duration;
-+			lastbmode[lastbpointer]=optp->how|optp->who|optp->loglevel;
-+			lastbproto[lastbpointer]=p->iph->ip_proto;
-+			if(p->iph->ip_proto==IPPROTO_TCP || p->iph->ip_proto==IPPROTO_UDP)
-+			{	lastbsp[lastbpointer]=p->sp;					/* set ports if TCP or UDP */
-+				lastbdp[lastbpointer]=p->dp;
-+			}
-+			lastbtime[lastbpointer]=btime;
-+
-+
-+			while(fwsamlist!=NULL)
-+			{	station=fwsamlist->station;
-+				//if(station->stationip.s_addr)
-+				if(station->stationip.ip32[0])
-+				{	deletestation=FALSE;
-+					stationtry++;				/* first try */
-+					/* create a socket for the station */
-+					stationsocket=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
-+					if(stationsocket==INVALID_SOCKET)
-+						FatalError("ERROR => [Alert_FWsam] Funky socket error (socket)!\n");
-+					if(bind(stationsocket,(struct sockaddr *)&(station->localsocketaddr),sizeof(struct sockaddr)))
-+						FatalError("ERROR => [Alert_FWsam] Could not bind socket!\n");
-+
-+					/* let's connect to the agent */
-+					if(connect(stationsocket,(struct sockaddr *)&station->stationsocketaddr,sizeof(struct sockaddr)))
-+					{
-+						LogMessage("WARNING => [Alert_FWsam] Could not send block to host %s. Will try later.\n",sfip_ntoa(&station->stationip));
-+#ifdef WIN32
-+						closesocket(stationsocket);
-+#else
-+						close(stationsocket);
-+#endif
-+						stationtry=0;
-+					}
-+					else
-+					{
-+#ifdef FWSAMDEBUG
-+						LogMessage("DEBUG => [Alert_FWsam] Connected to host %s.\n",sfip_ntoa(&station->stationip));
-+#endif
-+						/* now build the packet */
-+						station->myseqno+=station->stationseqno; /* increase my seqno by adding agent seq no */
-+						sampacket.endiancheck=1;						/* This is an endian indicator for Snortsam */
-+						sampacket.snortseqno[0]=(char)station->myseqno;
-+						sampacket.snortseqno[1]=(char)(station->myseqno>>8);
-+						sampacket.fwseqno[0]=(char)station->stationseqno;/* fill station seqno */
-+						sampacket.fwseqno[1]=(char)(station->stationseqno>>8);
-+						sampacket.status=FWSAM_STATUS_BLOCK;			/* set block mode */
-+						sampacket.version=FWSAM_PACKETVERSION;			/* set packet version */
-+						sampacket.duration[0]=(char)optp->duration;		/* set duration */
-+						sampacket.duration[1]=(char)(optp->duration>>8);
-+						sampacket.duration[2]=(char)(optp->duration>>16);
-+						sampacket.duration[3]=(char)(optp->duration>>24);
-+						sampacket.fwmode=optp->how|optp->who|optp->loglevel; /* set the mode */
-+						sampacket.dstip[0]=(char)p->iph->ip_dst.s_addr; /* destination IP */
-+						sampacket.dstip[1]=(char)(p->iph->ip_dst.s_addr>>8);
-+						sampacket.dstip[2]=(char)(p->iph->ip_dst.s_addr>>16);
-+						sampacket.dstip[3]=(char)(p->iph->ip_dst.s_addr>>24);
-+						sampacket.srcip[0]=(char)p->iph->ip_src.s_addr;	/* source IP */
-+						sampacket.srcip[1]=(char)(p->iph->ip_src.s_addr>>8);
-+						sampacket.srcip[2]=(char)(p->iph->ip_src.s_addr>>16);
-+						sampacket.srcip[3]=(char)(p->iph->ip_src.s_addr>>24);
-+						sampacket.protocol[0]=(char)p->iph->ip_proto;	/* protocol */
-+						sampacket.protocol[1]=(char)(p->iph->ip_proto>>8);/* protocol */
-+
-+						if(p->iph->ip_proto==IPPROTO_TCP || p->iph->ip_proto==IPPROTO_UDP)
-+						{	sampacket.srcport[0]=(char)p->sp;	/* set ports */
-+							sampacket.srcport[1]=(char)(p->sp>>8);
-+							sampacket.dstport[0]=(char)p->dp;
-+							sampacket.dstport[1]=(char)(p->dp>>8);
-+						}
-+						else
-+							sampacket.srcport[0]=sampacket.srcport[1]=sampacket.dstport[0]=sampacket.dstport[1]=0;
-+
-+						sampacket.sig_id[0]=(char)event->sig_id;		/* set signature ID */
-+						sampacket.sig_id[1]=(char)(event->sig_id>>8);
-+						sampacket.sig_id[2]=(char)(event->sig_id>>16);
-+						sampacket.sig_id[3]=(char)(event->sig_id>>24);
-+
-+#ifdef FWSAMDEBUG
-+						LogMessage("DEBUG => [Alert_FWsam] Sending BLOCK\n");
-+						LogMessage("DEBUG => [Alert_FWsam] Snort SeqNo:  %x\n",station->myseqno);
-+						LogMessage("DEBUG => [Alert_FWsam] Mgmt SeqNo :  %x\n",station->stationseqno);
-+						LogMessage("DEBUG => [Alert_FWsam] Status     :  %i\n",FWSAM_STATUS_BLOCK);
-+						LogMessage("DEBUG => [Alert_FWsam] Mode       :  %i\n",optp->how|optp->who|optp->loglevel);
-+						LogMessage("DEBUG => [Alert_FWsam] Duration   :  %li\n",optp->duration);
-+						LogMessage("DEBUG => [Alert_FWsam] Protocol   :  %i\n",GET_IPH_PROTO(p));
-+#ifdef SUP_IP6
-+						LogMessage("DEBUG => [Alert_FWsam] Src IP     :  %s\n",sfip_ntoa(GET_SRC_IP(p)));
-+						LogMessage("DEBUG => [Alert_FWsam] Dest IP    :  %s\n",sfip_ntoa(GET_DST_IP(p)));
-+#else
-+						LogMessage("DEBUG => [Alert_FWsam] Src IP     :  %s\n",inet_ntoa(p->iph->ip_src));
-+						LogMessage("DEBUG => [Alert_FWsam] Dest IP    :  %s\n",inet_ntoa(p->iph->ip_dst));
-+#endif
-+						LogMessage("DEBUG => [Alert_FWsam] Src Port   :  %i\n",p->sp);
-+						LogMessage("DEBUG => [Alert_FWsam] Dest Port  :  %i\n",p->dp);
-+						LogMessage("DEBUG => [Alert_FWsam] Sig_ID     :  %lu\n",event->sig_id);
-+
-+#endif
-+
-+						encbuf=TwoFishAlloc(sizeof(FWsamPacket),FALSE,FALSE,station->stationfish); /* get the encryption buffer */
-+						len=TwoFishEncrypt((char *)&sampacket,&encbuf,sizeof(FWsamPacket),FALSE,station->stationfish); /* encrypt the packet with current key */
-+
-+						if(send(stationsocket,encbuf,len,0)!=len) /* weird...could not send */
-+						{	LogMessage("WARNING => [Alert_FWsam] Could not send to host %s. Will try again later.\n",sfip_ntoa(&station->stationip));
-+#ifdef WIN32
-+							closesocket(stationsocket);
-+#else
-+							close(stationsocket);
-+#endif
-+							stationtry=0;
-+						}
-+						else
-+						{	i=FWSAM_NETWAIT;
-+#ifdef WIN32
-+							ioctlsocket(stationsocket,FIONBIO,&i);	/* set non blocking and wait for  */
-+#else
-+							ioctl(stationsocket,FIONBIO,&i);		/* set non blocking and wait for  */
-+#endif
-+							while(i-- >1)							/* the response packet	 */
-+							{	waitms(10); /* wait for response (default maximum 3 secs */
-+								if(recv(stationsocket,encbuf,len,0)==len)
-+									i=0; /* if we received packet we set the counter to 0. */
-+										 /* by the time we check with if, it's already dec'ed to -1 */
-+							}
-+							if(!i) /* id we timed out (i was one, then dec'ed)... */
-+							{	LogMessage("WARNING => [Alert_FWsam] Did not receive response from host %s. Will try again later.\n",sfip_ntoa(&station->stationip));
-+#ifdef WIN32
-+								closesocket(stationsocket);
-+#else
-+								close(stationsocket);
-+#endif
-+								stationtry=0;
-+							}
-+							else /* got a packet */
-+							{	decbuf=(char *)&sampacket; /* get the pointer to the packet struct */
-+								len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* try to decrypt the packet with current key */
-+
-+								if(len!=sizeof(FWsamPacket)) /* invalid decryption */
-+								{	strcpy(station->stationkey,station->initialkey); /* try the intial key */
-+									TwoFishDestroy(station->stationfish);
-+									station->stationfish=TwoFishInit(station->stationkey); /* re-initialize the TwoFish with the intial key */
-+									len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* try again to decrypt */
-+									LogMessage("INFO => [Alert_FWsam] Had to use initial key!\n");
-+								}
-+								if(len==sizeof(FWsamPacket)) /* valid decryption */
-+								{	if(sampacket.version==FWSAM_PACKETVERSION)/* master speaks my language */
-+									{	if(sampacket.status==FWSAM_STATUS_OK || sampacket.status==FWSAM_STATUS_NEWKEY
-+										|| sampacket.status==FWSAM_STATUS_RESYNC || sampacket.status==FWSAM_STATUS_HOLD)
-+										{	station->stationseqno=sampacket.fwseqno[0] | (sampacket.fwseqno[1]<<8); /* get stations seqno */
-+											station->lastcontact=(unsigned long)time(NULL); /* set the last contact time (not used yet) */
-+#ifdef FWSAMDEBUG
-+									LogMessage("DEBUG => [Alert_FWsam] Received %s\n",sampacket.status==FWSAM_STATUS_OK?"OK":
-+																		   sampacket.status==FWSAM_STATUS_NEWKEY?"NEWKEY":
-+																		   sampacket.status==FWSAM_STATUS_RESYNC?"RESYNC":
-+																		   sampacket.status==FWSAM_STATUS_HOLD?"HOLD":"ERROR");
-+									LogMessage("DEBUG => [Alert_FWsam] Snort SeqNo:  %x\n",sampacket.snortseqno[0]|(sampacket.snortseqno[1]<<8));
-+									LogMessage("DEBUG => [Alert_FWsam] Mgmt SeqNo :  %x\n",station->stationseqno);
-+									LogMessage("DEBUG => [Alert_FWsam] Status     :  %i\n",sampacket.status);
-+									LogMessage("DEBUG => [Alert_FWsam] Version    :  %i\n",sampacket.version);
-+#endif
-+											if(sampacket.status==FWSAM_STATUS_HOLD)
-+											{	i=FWSAM_NETHOLD;			/* Stay on hold for a maximum of 60 secs (default) */
-+												while(i-- >1)							/* the response packet	 */
-+												{	waitms(10); /* wait for response  */
-+													if(recv(stationsocket,encbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,0)==sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE)
-+													  i=0; /* if we received packet we set the counter to 0. */
-+										 		}
-+												if(!i) /* id we timed out (i was one, then dec'ed)... */
-+												{	LogMessage("WARNING => [Alert_FWsam] Did not receive response from host %s. Will try again later.\n",sfip_ntoa(&station->stationip));
-+													stationtry=0;
-+													sampacket.status=FWSAM_STATUS_ERROR;
-+												}
-+												else /* got a packet */
-+												{	decbuf=(char *)&sampacket; /* get the pointer to the packet struct */
-+													len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* try to decrypt the packet with current key */
-+
-+													if(len!=sizeof(FWsamPacket)) /* invalid decryption */
-+													{	strcpy(station->stationkey,station->initialkey); /* try the intial key */
-+														TwoFishDestroy(station->stationfish);
-+														station->stationfish=TwoFishInit(station->stationkey); /* re-initialize the TwoFish with the intial key */
-+														len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* try again to decrypt */
-+														LogMessage("INFO => [Alert_FWsam] Had to use initial key again!\n");
-+													}
-+#ifdef FWSAMDEBUG
-+									LogMessage("DEBUG => [Alert_FWsam] Received %s\n",sampacket.status==FWSAM_STATUS_OK?"OK":
-+																		   sampacket.status==FWSAM_STATUS_NEWKEY?"NEWKEY":
-+																		   sampacket.status==FWSAM_STATUS_RESYNC?"RESYNC":
-+																		   sampacket.status==FWSAM_STATUS_HOLD?"HOLD":"ERROR");
-+									LogMessage("DEBUG => [Alert_FWsam] Snort SeqNo:  %x\n",sampacket.snortseqno[0]|(sampacket.snortseqno[1]<<8));
-+									LogMessage("DEBUG => [Alert_FWsam] Mgmt SeqNo :  %x\n",station->stationseqno);
-+									LogMessage("DEBUG => [Alert_FWsam] Status     :  %i\n",sampacket.status);
-+									LogMessage("DEBUG => [Alert_FWsam] Version    :  %i\n",sampacket.version);
-+#endif
-+													if(len!=sizeof(FWsamPacket)) /* invalid decryption */
-+													{	ErrorMessage("ERROR => [Alert_FWsam] Password mismatch! Ignoring host %s.\n",sfip_ntoa(&station->stationip));
-+														deletestation=TRUE;
-+														sampacket.status=FWSAM_STATUS_ERROR;
-+													}
-+													else if(sampacket.version!=FWSAM_PACKETVERSION) /* invalid protocol version */
-+													{	ErrorMessage("ERROR => [Alert_FWsam] Protocol version error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));
-+														deletestation=TRUE;
-+														sampacket.status=FWSAM_STATUS_ERROR;
-+													}
-+													else if(sampacket.status!=FWSAM_STATUS_OK && sampacket.status!=FWSAM_STATUS_NEWKEY && sampacket.status!=FWSAM_STATUS_RESYNC)
-+													{	ErrorMessage("ERROR => [Alert_FWsam] Funky handshake error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));
-+														deletestation=TRUE;
-+														sampacket.status=FWSAM_STATUS_ERROR;
-+													}
-+												}
-+											}
-+											if(sampacket.status==FWSAM_STATUS_RESYNC)  /* if station want's to resync... */
-+											{	strcpy(station->stationkey,station->initialkey); /* ...we use the intial key... */
-+												memcpy(station->fwkeymod,sampacket.duration,4);	 /* and note the random key modifier */
-+											}
-+											if(sampacket.status==FWSAM_STATUS_NEWKEY || sampacket.status==FWSAM_STATUS_RESYNC)
-+											{
-+												FWsamNewStationKey(station,&sampacket); /* generate new TwoFish keys */
-+#ifdef FWSAMDEBUG
-+													LogMessage("DEBUG => [Alert_FWsam] Generated new encryption key...\n");
-+#endif
-+											}
-+#ifdef WIN32
-+											closesocket(stationsocket);
-+#else
-+											close(stationsocket);
-+#endif
-+											stationtry=0;
-+										}
-+										else if(sampacket.status==FWSAM_STATUS_ERROR) /* if SnortSam reports an error on second try, */
-+										{
-+#ifdef WIN32
-+											closesocket(stationsocket);				  /* something is messed up and ... */
-+#else
-+											close(stationsocket);
-+#endif
-+											if(stationtry>1)						  /* we ignore that station. */
-+											{	deletestation=TRUE;					  /* flag for deletion */
-+												ErrorMessage("ERROR => [Alert_FWsam] Could not renegotiate key! Ignoring host %s.\n",sfip_ntoa(&station->stationip));
-+											}
-+											else							/* if we get an error on the first try, */
-+											{	if(!FWsamCheckIn(station))	/* we first try to check in again. */
-+												{	deletestation=TRUE;
-+													ErrorMessage("ERROR => [Alert_FWsam] Password mismatch! Ignoring host %s.\n",sfip_ntoa(&station->stationip));
-+												}
-+											}
-+										}
-+										else /* an unknown status means trouble... */
-+										{	ErrorMessage("ERROR => [Alert_FWsam] Funky handshake error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));
-+#ifdef WIN32
-+											closesocket(stationsocket);
-+#else
-+											close(stationsocket);
-+#endif
-+											deletestation=TRUE;
-+										}
-+									}
-+									else   /* if the SnortSam agent uses a different packet version, we have no choice but to ignore it. */
-+									{	ErrorMessage("ERROR => [Alert_FWsam] Protocol version error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));
-+#ifdef WIN32
-+										closesocket(stationsocket);
-+#else
-+										close(stationsocket);
-+#endif
-+										deletestation=TRUE;
-+									}
-+								}
-+								else /* if the intial key failed to decrypt as well, the keys are not configured the same, and we ignore that SnortSam station. */
-+								{	ErrorMessage("ERROR => [Alert_FWsam] Password mismatch! Ignoring host %s.\n",sfip_ntoa(&station->stationip));
-+#ifdef WIN32
-+									closesocket(stationsocket);
-+#else
-+									close(stationsocket);
-+#endif
-+									deletestation=TRUE;
-+								}
-+							}
-+						}
-+						free(encbuf); /* release of the TwoFishAlloc'ed encryption buffer */
-+					}
-+					if(stationtry==0 || deletestation)		/* if everything went real well, or real bad... */
-+					{	if(deletestation){					/* If it went bad, we remove the station from the list by marking the IP */
-+//							station->stationip.s_addr=0;
-+							station->stationip.ip32[0]=0;
-+                                                }
-+						fwsamlist=fwsamlist->next;
-+					}
-+				}
-+				else
-+					fwsamlist=fwsamlist->next;
-+			}
-+		}
-+		else
-+		{
-+#ifdef FWSAMDEBUG
-+			LogMessage("DEBUG => [Alert_FWsam] Skipping repetitive block.\n");
-+#endif
-+		}
-+	}
-+}
-+
-+/*  FWsamCheckOut will be called when Snort exists. It de-registeres this snort sensor
-+ *  from the list of sensor that the SnortSam agent keeps.
-+ */
-+void FWsamCheckOut(FWsamStation *station)
-+{	FWsamPacket sampacket;
-+	SOCKET stationsocket;
-+	int i,len;
-+    char *encbuf,*decbuf;
-+	//unsigned char *encbuf,*decbuf;
-+
-+
-+	stationsocket=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
-+	if(stationsocket==INVALID_SOCKET)
-+		FatalError("ERROR => [Alert_FWsam](FWsamCheckOut) Funky socket error (socket)!\n");
-+	if(bind(stationsocket,(struct sockaddr *)&(station->localsocketaddr),sizeof(struct sockaddr)))
-+		FatalError("ERROR => [Alert_FWsam](FWsamCheckOut) Could not bind socket!\n");
-+
-+	/* let's connect to the agent */
-+	if(!connect(stationsocket,(struct sockaddr *)&station->stationsocketaddr,sizeof(struct sockaddr)))
-+	{	LogMessage("INFO => [Alert_FWsam](FWsamCheckOut) Disconnecting from host %s.\n",sfip_ntoa(&station->stationip));
-+		/* now build the packet */
-+		station->myseqno+=station->stationseqno; /* increase my seqno */
-+		sampacket.endiancheck=1;
-+		sampacket.snortseqno[0]=(char)station->myseqno;
-+		sampacket.snortseqno[1]=(char)(station->myseqno>>8);
-+		sampacket.fwseqno[0]=(char)station->stationseqno; /* fill station seqno */
-+		sampacket.fwseqno[1]=(char)(station->stationseqno>>8);
-+		sampacket.status=FWSAM_STATUS_CHECKOUT;  /* checking out... */
-+		sampacket.version=FWSAM_PACKETVERSION;
-+
-+#ifdef FWSAMDEBUG
-+			LogMessage("DEBUG => [Alert_FWsam](FWsamCheckOut) Sending CHECKOUT\n");
-+			LogMessage("DEBUG => [Alert_FWsam](FWsamCheckOut) Snort SeqNo:  %x\n",station->myseqno);
-+			LogMessage("DEBUG => [Alert_FWsam](FWsamCheckOut) Mgmt SeqNo :  %x\n",station->stationseqno);
-+			LogMessage("DEBUG => [Alert_FWsam](FWsamCheckOut) Status     :  %i\n",sampacket.status);
-+
-+#endif
-+
-+		encbuf=TwoFishAlloc(sizeof(FWsamPacket),FALSE,FALSE,station->stationfish); /* get encryption buffer */
-+		len=TwoFishEncrypt((char *)&sampacket,&encbuf,sizeof(FWsamPacket),FALSE,station->stationfish); /* encrypt packet with current key */
-+
-+		if(send(stationsocket,encbuf,len,0)==len)
-+		{	i=FWSAM_NETWAIT;
-+#ifdef WIN32
-+			ioctlsocket(stationsocket,FIONBIO,&i);	/* set non blocking and wait for  */
-+#else
-+			ioctl(stationsocket,FIONBIO,&i);		/* set non blocking and wait for  */
-+#endif
-+			while(i-- >1)
-+			{	waitms(10);					/* ...wait a maximum of 3 secs for response... */
-+				if(recv(stationsocket,encbuf,len,0)==len) /* ... for the status packet */
-+					i=0;
-+			}
-+			if(i) /* if we got the packet */
-+			{	decbuf=(char *)&sampacket;
-+				len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish);
-+
-+				if(len!=sizeof(FWsamPacket)) /* invalid decryption */
-+				{	strcpy(station->stationkey,station->initialkey); /* try initial key */
-+					TwoFishDestroy(station->stationfish);			 /* toss this fish */
-+					station->stationfish=TwoFishInit(station->stationkey); /* re-initialze TwoFish with initial key */
-+					len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* and try to decrypt again */
-+					LogMessage("INFO => [Alert_FWsam](FWsamCheckOut) Had to use initial key!\n");
-+				}
-+				if(len==sizeof(FWsamPacket)) /* valid decryption */
-+				{	if(sampacket.version!=FWSAM_PACKETVERSION) /* but don't really care since we are on the way out */
-+						ErrorMessage("WARNING => [Alert_FWsam](FWsamCheckOut) Protocol version error! What the hell, we're quitting anyway! :)\n");
-+				}
-+				else
-+					ErrorMessage("WARNING => [Alert_FWsam](FWsamCheckOut) Password mismatch! What the hell, we're quitting anyway! :)\n");
-+			}
-+		}
-+		free(encbuf); /* release TwoFishAlloc'ed buffer */
-+	}
-+	else
-+		LogMessage("WARNING => [Alert_FWsam] Could not connect to host %s for CheckOut. What the hell, we're quitting anyway! :)\n",sfip_ntoa(&station->stationip));
-+#ifdef WIN32
-+	closesocket(stationsocket);
-+#else
-+	close(stationsocket);
-+#endif
-+}
-+
-+
-+/*   FWSamFree: Disconnects all FW-1 management stations,
-+ *   closes sockets, and frees the structures.
-+ */
-+void FWsamFree(FWsamList *list)
-+{
-+    FWsamList *next;
-+
-+    while(list)	/* Free pointer list for rule type */
-+    {
-+        next=list->next;
-+        free(list);
-+        list=next;
-+    }
-+    list=FWsamStationList;
-+
-+    while(list) /* Free global pointer list and stations */
-+    {
-+        next=list->next;
-+        if (list->station)
-+        {
-+            if(list->station->stationip.ip32[0])
-+            //if(list->station->stationip.s_addr)
-+                FWsamCheckOut(list->station); /* Send a Check-Out to SnortSam, */
-+
-+            TwoFishDestroy(list->station->stationfish);	/* toss the fish, */
-+            free(list->station); /* free station, */
-+        }
-+        free(list); /* free pointer, */
-+        list=next; /* and move to next. */
-+    }
-+    FWsamStationList=NULL;
-+    if(FWsamOptionField)
-+        free(FWsamOptionField);
-+}
-+
-+void AlertFWsamCleanExitFunc(int signal, void *arg)
-+{	FWsamList *fwsamlist;
-+
-+#ifdef FWSAMDEBUG
-+    LogMessage("DEBUG => [Alert_FWsam](AlertFWsamCleanExitFunc) Exiting...\n");
-+#endif
-+
-+	fwsamlist=(FWsamList *)arg;
-+	FWsamFree(fwsamlist); /* Free all elements */
-+}
-+
-+void AlertFWsamRestartFunc(int signal, void *arg)
-+{	FWsamList *fwsamlist;
-+
-+#ifdef FWSAMDEBUG
-+    LogMessage("DEBUG => [Alert_FWsam](AlertFWsamRestartFunc) Restarting...\n");
-+#endif
-+
-+	fwsamlist=(FWsamList *)arg;
-+	FWsamFree(fwsamlist); /* Free all elements */
-+}
-+
-+/*  This routine registers this Snort sensor with SnortSam.
-+ *  It will also change the encryption key based on some variables.
-+ */
-+int FWsamCheckIn(FWsamStation *station)
-+{	int i,len,stationok=TRUE;
-+	FWsamPacket sampacket;
-+    char *encbuf,*decbuf;
-+	//unsigned char *encbuf,*decbuf;
-+	SOCKET stationsocket;
-+
-+
-+	/* create a socket for the station */
-+	stationsocket=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
-+	if(stationsocket==INVALID_SOCKET)
-+		FatalError("ERROR => [Alert_FWsam](FWsamCheckIn) Funky socket error (socket)!\n");
-+	if(bind(stationsocket,(struct sockaddr *)&(station->localsocketaddr),sizeof(struct sockaddr)))
-+		FatalError("ERROR => [Alert_FWsam](FWsamCheckIn) Could not bind socket!\n");
-+
-+	i=TRUE;
-+	/* let's connect to the agent */
-+	if(connect(stationsocket,(struct sockaddr *)&station->stationsocketaddr,sizeof(struct sockaddr)))
-+		LogMessage("WARNING => [Alert_FWsam](FWsamCheckIn) Could not connect to host %s. Will try later.\n",sfip_ntoa(&station->stationip));
-+	else
-+	{	LogMessage("INFO => [Alert_FWsam](FWsamCheckIn) Connected to host %s.\n",sfip_ntoa(&station->stationip));
-+		/* now build the packet */
-+		sampacket.endiancheck=1;
-+		sampacket.snortseqno[0]=(char)station->myseqno; /* fill my sequence number number */
-+		sampacket.snortseqno[1]=(char)(station->myseqno>>8); /* fill my sequence number number */
-+		sampacket.status=FWSAM_STATUS_CHECKIN; /* let's check in */
-+		sampacket.version=FWSAM_PACKETVERSION; /* set the packet version */
-+		memcpy(sampacket.duration,station->mykeymod,4);  /* we'll send SnortSam our key modifier in the duration slot */
-+											   /* (the checkin packet is just the plain initial key) */
-+#ifdef FWSAMDEBUG
-+			LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Sending CheckIn\n");
-+			LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Snort SeqNo:  %x\n",station->myseqno);
-+			LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Mode       :  %i\n",sampacket.status);
-+			LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Version    :  %i\n",sampacket.version);
-+#endif
-+		encbuf=TwoFishAlloc(sizeof(FWsamPacket),FALSE,FALSE,station->stationfish); /* get buffer for encryption */
-+		len=TwoFishEncrypt((char *)&sampacket,&encbuf,sizeof(FWsamPacket),FALSE,station->stationfish); /* encrypt with initial key */
-+		if(send(stationsocket,encbuf,len,0)!=len) /* weird...could not send */
-+			LogMessage("WARNING => [Alert_FWsam](FWsamCheckIn) Could not send to host %s. Will try again later.\n",sfip_ntoa(&station->stationip));
-+		else
-+		{	i=FWSAM_NETWAIT;
-+#ifdef WIN32
-+			ioctlsocket(stationsocket,FIONBIO,&i);	/* set non blocking and wait for  */
-+#else
-+			ioctl(stationsocket,FIONBIO,&i);		/* set non blocking and wait for  */
-+#endif
-+			while(i-- >1)
-+			{	waitms(10); /* wait a maximum of 3 secs for response */
-+				if(recv(stationsocket,encbuf,len,0)==len)
-+					i=0;
-+			}
-+			if(!i) /* time up? */
-+				LogMessage("WARNING => [Alert_FWsam](FWsamCheckIn) Did not receive response from host %s. Will try again later.\n",sfip_ntoa(&station->stationip));
-+			else
-+			{	decbuf=(char *)&sampacket; /* got status packet */
-+				len=TwoFishDecrypt(encbuf,&decbuf,sizeof(FWsamPacket)+TwoFish_BLOCK_SIZE,FALSE,station->stationfish); /* try to decrypt with initial key */
-+				if(len==sizeof(FWsamPacket)) /* valid decryption */
-+				{
-+#ifdef FWSAMDEBUG
-+					LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Received %s\n",sampacket.status==FWSAM_STATUS_OK?"OK":
-+															   sampacket.status==FWSAM_STATUS_NEWKEY?"NEWKEY":
-+															   sampacket.status==FWSAM_STATUS_RESYNC?"RESYNC":
-+															   sampacket.status==FWSAM_STATUS_HOLD?"HOLD":"ERROR");
-+					LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Snort SeqNo:  %x\n",sampacket.snortseqno[0]|(sampacket.snortseqno[1]<<8));
-+					LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Mgmt SeqNo :  %x\n",sampacket.fwseqno[0]|(sampacket.fwseqno[1]<<8));
-+					LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Status     :  %i\n",sampacket.status);
-+					LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Version    :  %i\n",sampacket.version);
-+#endif
-+					if(sampacket.version==FWSAM_PACKETVERSION) /* master speaks my language */
-+					{	if(sampacket.status==FWSAM_STATUS_OK || sampacket.status==FWSAM_STATUS_NEWKEY || sampacket.status==FWSAM_STATUS_RESYNC)
-+						{	station->stationseqno=sampacket.fwseqno[0]|(sampacket.fwseqno[1]<<8); /* get stations seqno */
-+							station->lastcontact=(unsigned long)time(NULL);
-+
-+							if(sampacket.status==FWSAM_STATUS_NEWKEY || sampacket.status==FWSAM_STATUS_RESYNC)	/* generate new keys */
-+							{	memcpy(station->fwkeymod,sampacket.duration,4); /* note the key modifier */
-+								FWsamNewStationKey(station,&sampacket); /* and generate new TwoFish keys (with key modifiers) */
-+#ifdef FWSAMDEBUG
-+				LogMessage("DEBUG => [Alert_FWsam](FWsamCheckIn) Generated new encryption key...\n");
-+#endif
-+							}
-+						}
-+						else /* weird, got a strange status back */
-+						{	ErrorMessage("ERROR => [Alert_FWsam](FWsamCheckIn) Funky handshake error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));
-+							stationok=FALSE;
-+						}
-+					}
-+					else /* packet version does not match */
-+					{	ErrorMessage("ERROR =>[Alert_FWsam](FWsamCheckIn) Protocol version error! Ignoring host %s.\n",sfip_ntoa(&station->stationip));
-+						stationok=FALSE;
-+					}
-+				}
-+				else /* key does not match */
-+				{	ErrorMessage("ERROR => [Alert_FWsam](FWsamCheckIn) Password mismatch! Ignoring host %s.\n",sfip_ntoa(&station->stationip));
-+					stationok=FALSE;
-+				}
-+			}
-+		}
-+		free(encbuf); /* release TwoFishAlloc'ed buffer */
-+	}
-+#ifdef WIN32
-+	closesocket(stationsocket);
-+#else
-+	close(stationsocket);
-+#endif
-+	return stationok;
-+}
-+#undef FWSAMDEBUG
-+
-diff -ruN snort-2.9.2.2/src/output-plugins/spo_alert_fwsam.h snort-2.9.2.2_bkup/src/output-plugins/spo_alert_fwsam.h
---- snort-2.9.2.2/src/output-plugins/spo_alert_fwsam.h	1969-12-31 16:00:00.000000000 -0800
-+++ snort-2.9.2.2_bkup/src/output-plugins/spo_alert_fwsam.h	2012-04-08 20:34:57.389687124 -0700
-@@ -0,0 +1,216 @@
-+/* $Id: snortpatchb,v 1.5 2005/10/06 08:50:39 fknobbe Exp $
-+**
-+** spo_alert_fwsam.h
-+**
-+** Copyright (c) 2001-2004 Frank Knobbe <frank@knobbe.us>
-+**
-+** This program is free software; you can redistribute it and/or modify
-+** it under the terms of the GNU General Public License as published by
-+** the Free Software Foundation; either version 2 of the License, or
-+** (at your option) any later version.
-+**
-+** This program is distributed in the hope that it will be useful,
-+** but WITHOUT ANY WARRANTY; without even the implied warranty of
-+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+** GNU General Public License for more details.
-+**
-+** You should have received a copy of the GNU General Public License
-+** along with this program; if not, write to the Free Software
-+** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+*/
-+
-+/* This file gets included in plugbase.c when it is integrated into the rest
-+ * of the program.
-+ *
-+ * For more info, see the beginning of spo_alert_fwsam.c
-+ *
-+ */
-+
-+#ifndef __SPO_FWSAM_H__
-+#define __SPO_FWSAM_H__
-+
-+#include "snort.h"
-+#include "rules.h"
-+#include "plugbase.h"
-+#include "plugin_enum.h"
-+#include "fatal.h"
-+#include "util.h"
-+#include "twofish.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <time.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <unistd.h>
-+
-+
-+/* just some compatibility stuff */
-+#ifdef WIN32
-+#if !defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_)
-+#include <winsock.h>
-+#endif
-+#define	waitms(x)				Sleep(x)
-+
-+#else
-+
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <sys/ioctl.h>
-+#include <netdb.h>
-+
-+#ifdef SOLARIS
-+#include <sys/filio.h>
-+#endif
-+
-+typedef int SOCKET;
-+
-+#ifndef INVALID_SOCKET
-+#define INVALID_SOCKET	-1
-+#endif
-+
-+#define	waitms(x)				usleep((x)*1000)
-+
-+#endif
-+
-+#ifndef	FALSE
-+#define FALSE	0
-+#endif
-+#ifndef	TRUE
-+#define	TRUE	!FALSE
-+#endif
-+#ifndef	bool
-+#define	bool	int
-+#endif
-+
-+
-+#if defined(_DEBUG) || defined(DEBUG)
-+#ifndef FWSAMDEBUG
-+#define FWSAMDEBUG
-+#endif
-+#else
-+#endif
-+
-+
-+/* Official Snort PlugIn Number has been moved into plugin_enum.h */
-+
-+
-+/* fixed defines */
-+
-+#define FWSAM_DEFAULTPORT		898	/* Default port if user does not specify one in snort.conf */
-+									/* (Was unused last time I checked...) */
-+#define FWSAM_PACKETVERSION		14	/* version of the packet. Will increase with enhancements. */
-+
-+#define FWSAM_STATUS_CHECKIN	1	/* snort to fw */
-+#define FWSAM_STATUS_CHECKOUT	2
-+#define FWSAM_STATUS_BLOCK		3
-+#define FWSAM_STATUS_UNBLOCK	9
-+
-+#define FWSAM_STATUS_OK			4	/* fw to snort */
-+#define FWSAM_STATUS_ERROR		5
-+#define FWSAM_STATUS_NEWKEY		6
-+#define FWSAM_STATUS_RESYNC		7
-+#define FWSAM_STATUS_HOLD		8
-+
-+#define FWSAM_LOG_NONE			0
-+#define FWSAM_LOG_SHORTLOG		1
-+#define FWSAM_LOG_SHORTALERT	2
-+#define FWSAM_LOG_LONGLOG		3
-+#define FWSAM_LOG_LONGALERT		4
-+#define FWSAM_LOG				(FWSAM_LOG_SHORTLOG|FWSAM_LOG_SHORTALERT|FWSAM_LOG_LONGLOG|FWSAM_LOG_LONGALERT)
-+#define	FWSAM_WHO_DST			8
-+#define FWSAM_WHO_SRC			16
-+#define FWSAM_WHO				(FWSAM_WHO_DST|FWSAM_WHO_SRC)
-+#define FWSAM_HOW_IN			32
-+#define FWSAM_HOW_OUT			64
-+#define FWSAM_HOW_INOUT			(FWSAM_HOW_IN|FWSAM_HOW_OUT)
-+#define FWSAM_HOW_THIS			128
-+#define FWSAM_HOW				(FWSAM_HOW_IN|FWSAM_HOW_OUT|FWSAM_HOW_THIS)
-+
-+
-+/* user adjustable defines */
-+
-+#define FWSAM_REPET_BLOCKS		10	/* Snort remembers this amount of last blocks and... */
-+#define FWSAM_REPET_TIME		20	/* ...checks if they fall within this time. If so,... */
-+									/* ...the blocking request is not send. */
-+
-+#define FWSAM_NETWAIT			300		/* 100th of a second. 3 sec timeout for network connections */
-+#define FWSAM_NETHOLD			6000	/* 100th of a second. 60 sec timeout for holding */
-+
-+#define SID_MAPFILE				"sid-block.map"
-+#define SID_ALT_MAPFILE			"sid-fwsam.map"
-+
-+#define FWSAM_FANCYFETCH        /* This will invoke a fast sid lookup routine */
-+
-+
-+/* vars */
-+
-+typedef struct _FWsamstation		/* structure of a mgmt station */
-+{	unsigned short 		myseqno;
-+	unsigned short 		stationseqno;
-+	unsigned char		mykeymod[4];
-+	unsigned char		fwkeymod[4];
-+	unsigned short		stationport;
-+	//struct in_addr		stationip;
-+	sfip_t			stationip;
-+	struct sockaddr_in	localsocketaddr;
-+	struct sockaddr_in	stationsocketaddr;
-+	TWOFISH			*stationfish;
-+	char			initialkey[TwoFish_KEY_LENGTH+2];
-+	char			stationkey[TwoFish_KEY_LENGTH+2];
-+	time_t			lastcontact;
-+/*	time_t			sleepstart; */
-+}	FWsamStation;
-+
-+typedef struct _FWsampacket			/* 2 blocks (3rd block is header from TwoFish) */
-+{	unsigned short		endiancheck;	/* 0  */
-+	unsigned char		srcip[4];		/* 2  */
-+	unsigned char		dstip[4];		/* 6  */
-+	unsigned char		duration[4];	/* 10 */
-+	unsigned char		snortseqno[2];	/* 14 */
-+	unsigned char		fwseqno[2];		/* 16 */
-+	unsigned char		srcport[2];		/* 18 */
-+	unsigned char		dstport[2];		/* 20 */
-+	unsigned char		protocol[2];	/* 22 */
-+	unsigned char		fwmode;			/* 24 */
-+	unsigned char		version;		/* 25 */
-+	unsigned char		status;			/* 26 */
-+	unsigned char		sig_id[4];		/* 27 */
-+	unsigned char		fluff;			/* 31 */
-+}	FWsamPacket;						/* 32 bytes in size */
-+
-+typedef struct _FWsamoptions	/* snort rule options */
-+{	unsigned long	sid;
-+    unsigned long	duration;
-+	unsigned char	who;
-+	unsigned char	how;
-+	unsigned char	loglevel;
-+}	FWsamOptions;
-+
-+typedef struct _FWsamlistpointer
-+{	FWsamStation *station;
-+	struct _FWsamlistpointer *next;
-+}	FWsamList;
-+
-+
-+/* functions */
-+void AlertFWsamSetup(void);
-+void AlertFWsamInit(char *args);
-+void AlertFWsamOptionInit(char *args,OptTreeNode *otn,int protocol);
-+void AlertFWsamCleanExitFunc(int signal, void *arg);
-+void AlertFWsamRestartFunc(int signal, void *arg);
-+void AlertFWsam(Packet *p, char *msg, void *arg, Event *event);
-+int FWsamCheckIn(FWsamStation *station);
-+void FWsamCheckOut(FWsamStation *station);
-+void FWsamNewStationKey(FWsamStation *station,FWsamPacket *packet);
-+void FWsamFixPacketEndian(FWsamPacket *p);
-+unsigned long FWsamParseDuration(char *p);
-+void FWsamFree(FWsamList *fwsamlist);
-+int FWsamStationExists(FWsamStation *who,FWsamList *list);
-+int FWsamReadLine(char *,unsigned long,FILE *);
-+void FWsamParseLine(FWsamOptions *,char *);
-+FWsamOptions *FWsamGetOption(unsigned long);
-+int FWsamParseOption(FWsamOptions *,char *);
-+
-+#endif  /* __SPO_FWSAM_H__ */
-diff -ruN snort-2.9.2.2/src/plugbase.c snort-2.9.2.2_bkup/src/plugbase.c
---- snort-2.9.2.2/src/plugbase.c	2012-03-17 14:40:16.000000000 -0700
-+++ snort-2.9.2.2_bkup/src/plugbase.c	2012-04-08 20:34:57.389687124 -0700
-@@ -130,6 +130,7 @@
- #endif
- 
- #include "output-plugins/spo_alert_test.h"
-+#include "output-plugins/spo_alert_fwsam.h"
- 
- extern ListHead *head_tmp;
- extern PreprocConfigFuncNode *preproc_config_funcs;
-@@ -1520,6 +1521,7 @@
- #endif
- 
-     AlertTestSetup();
-+    AlertFWsamSetup();
- }
- 
- /****************************************************************************
-diff -ruN snort-2.9.2.2/src/plugin_enum.h snort-2.9.2.2_bkup/src/plugin_enum.h
---- snort-2.9.2.2/src/plugin_enum.h	2012-01-12 14:11:40.000000000 -0800
-+++ snort-2.9.2.2_bkup/src/plugin_enum.h	2012-04-08 20:34:57.389687124 -0700
-@@ -60,6 +60,7 @@
-     PLUGIN_URILEN_CHECK,
-     PLUGIN_DYNAMIC,
-     PLUGIN_FLOWBIT,
-+    PLUGIN_FWSAM,
-     PLUGIN_FILE_DATA,
-     PLUGIN_BASE64_DECODE,
-     PLUGIN_MAX  /* sentinel value */
-diff -ruN snort-2.9.2.2/src/twofish.c snort-2.9.2.2_bkup/src/twofish.c
---- snort-2.9.2.2/src/twofish.c	1969-12-31 16:00:00.000000000 -0800
-+++ snort-2.9.2.2_bkup/src/twofish.c	2012-04-08 20:34:57.389687124 -0700
-@@ -0,0 +1,971 @@
-+/* $Id: twofish.c,v 2.1 2008/12/15 20:36:05 fknobbe Exp $
-+ *
-+ *
-+ * Copyright (C) 1997-2000 The Cryptix Foundation Limited.
-+ * Copyright (C) 2000 Farm9.
-+ * Copyright (C) 2001 Frank Knobbe.
-+ * All rights reserved.
-+ *
-+ * For Cryptix code:
-+ * Use, modification, copying and distribution of this software is subject
-+ * the terms and conditions of the Cryptix General Licence. You should have
-+ * received a copy of the Cryptix General Licence along with this library;
-+ * if not, you can download a copy from http://www.cryptix.org/ .
-+ *
-+ * For Farm9:
-+ * ---  jojo@farm9.com, August 2000, converted from Java to C++, added CBC mode and
-+ *      ciphertext stealing technique, added AsciiTwofish class for easy encryption
-+ *      decryption of text strings
-+ *
-+ * Frank Knobbe <frank@knobbe.us>:
-+ * ---  April 2001, converted from C++ to C, prefixed global variables
-+ *      with TwoFish, substituted some defines, changed functions to make use of
-+ *      variables supplied in a struct, modified and added routines for modular calls.
-+ *      Cleaned up the code so that defines are used instead of fixed 16's and 32's.
-+ *      Created two general purpose crypt routines for one block and multiple block
-+ *      encryption using Joh's CBC code.
-+ *		Added crypt routines that use a header (with a magic and data length).
-+ *		(Basically a major rewrite).
-+ *
-+ *      Note: Routines labeled _TwoFish are private and should not be used
-+ *      (or with extreme caution).
-+ *
-+ */
-+
-+#ifndef __TWOFISH_LIBRARY_SOURCE__
-+#define __TWOFISH_LIBRARY_SOURCE__
-+
-+#include <string.h>
-+#include <stdlib.h>
-+#include <time.h>
-+#include <ctype.h>
-+#include <sys/types.h>
-+
-+#ifdef WIN32
-+
-+#ifndef u_long
-+typedef unsigned long u_long;
-+#endif
-+#ifndef u_int32_t
-+typedef unsigned long u_int32_t;
-+#endif
-+#ifndef u_word
-+typedef unsigned short u_word;
-+#endif
-+#ifndef u_int16_t
-+typedef unsigned short u_int16_t;
-+#endif
-+#ifndef u_char
-+typedef unsigned char u_char;
-+#endif
-+#ifndef u_int8_t
-+typedef unsigned char u_int8_t;
-+#endif
-+
-+#endif /* WIN32 */
-+
-+#include "twofish.h"
-+
-+
-+bool TwoFish_srand=TRUE;				/* if TRUE, first call of TwoFishInit will seed rand(); */
-+										/* of TwoFishInit */
-+
-+/* Fixed 8x8 permutation S-boxes */
-+static const u_int8_t TwoFish_P[2][256] =
-+{
-+    {  /* p0 */
-+        0xA9, 0x67, 0xB3, 0xE8,   0x04, 0xFD, 0xA3, 0x76,   0x9A, 0x92, 0x80, 0x78,
-+        0xE4, 0xDD, 0xD1, 0x38,   0x0D, 0xC6, 0x35, 0x98,   0x18, 0xF7, 0xEC, 0x6C,
-+        0x43, 0x75, 0x37, 0x26,   0xFA, 0x13, 0x94, 0x48,   0xF2, 0xD0, 0x8B, 0x30,
-+        0x84, 0x54, 0xDF, 0x23,   0x19, 0x5B, 0x3D, 0x59,   0xF3, 0xAE, 0xA2, 0x82,
-+        0x63, 0x01, 0x83, 0x2E,   0xD9, 0x51, 0x9B, 0x7C,   0xA6, 0xEB, 0xA5, 0xBE,
-+        0x16, 0x0C, 0xE3, 0x61,   0xC0, 0x8C, 0x3A, 0xF5,   0x73, 0x2C, 0x25, 0x0B,
-+        0xBB, 0x4E, 0x89, 0x6B,   0x53, 0x6A, 0xB4, 0xF1,   0xE1, 0xE6, 0xBD, 0x45,
-+        0xE2, 0xF4, 0xB6, 0x66,   0xCC, 0x95, 0x03, 0x56,   0xD4, 0x1C, 0x1E, 0xD7,
-+        0xFB, 0xC3, 0x8E, 0xB5,   0xE9, 0xCF, 0xBF, 0xBA,   0xEA, 0x77, 0x39, 0xAF,
-+        0x33, 0xC9, 0x62, 0x71,   0x81, 0x79, 0x09, 0xAD,   0x24, 0xCD, 0xF9, 0xD8,
-+        0xE5, 0xC5, 0xB9, 0x4D,   0x44, 0x08, 0x86, 0xE7,   0xA1, 0x1D, 0xAA, 0xED,
-+        0x06, 0x70, 0xB2, 0xD2,   0x41, 0x7B, 0xA0, 0x11,   0x31, 0xC2, 0x27, 0x90,
-+        0x20, 0xF6, 0x60, 0xFF,   0x96, 0x5C, 0xB1, 0xAB,   0x9E, 0x9C, 0x52, 0x1B,
-+        0x5F, 0x93, 0x0A, 0xEF,   0x91, 0x85, 0x49, 0xEE,   0x2D, 0x4F, 0x8F, 0x3B,
-+        0x47, 0x87, 0x6D, 0x46,   0xD6, 0x3E, 0x69, 0x64,   0x2A, 0xCE, 0xCB, 0x2F,
-+        0xFC, 0x97, 0x05, 0x7A,   0xAC, 0x7F, 0xD5, 0x1A,   0x4B, 0x0E, 0xA7, 0x5A,
-+        0x28, 0x14, 0x3F, 0x29,   0x88, 0x3C, 0x4C, 0x02,   0xB8, 0xDA, 0xB0, 0x17,
-+        0x55, 0x1F, 0x8A, 0x7D,   0x57, 0xC7, 0x8D, 0x74,   0xB7, 0xC4, 0x9F, 0x72,
-+        0x7E, 0x15, 0x22, 0x12,   0x58, 0x07, 0x99, 0x34,   0x6E, 0x50, 0xDE, 0x68,
-+        0x65, 0xBC, 0xDB, 0xF8,   0xC8, 0xA8, 0x2B, 0x40,   0xDC, 0xFE, 0x32, 0xA4,
-+        0xCA, 0x10, 0x21, 0xF0,   0xD3, 0x5D, 0x0F, 0x00,   0x6F, 0x9D, 0x36, 0x42,
-+        0x4A, 0x5E, 0xC1, 0xE0
-+    },
-+    {  /* p1 */
-+        0x75, 0xF3, 0xC6, 0xF4,   0xDB, 0x7B, 0xFB, 0xC8,   0x4A, 0xD3, 0xE6, 0x6B,
-+        0x45, 0x7D, 0xE8, 0x4B,   0xD6, 0x32, 0xD8, 0xFD,   0x37, 0x71, 0xF1, 0xE1,
-+        0x30, 0x0F, 0xF8, 0x1B,   0x87, 0xFA, 0x06, 0x3F,   0x5E, 0xBA, 0xAE, 0x5B,
-+        0x8A, 0x00, 0xBC, 0x9D,   0x6D, 0xC1, 0xB1, 0x0E,   0x80, 0x5D, 0xD2, 0xD5,
-+        0xA0, 0x84, 0x07, 0x14,   0xB5, 0x90, 0x2C, 0xA3,   0xB2, 0x73, 0x4C, 0x54,
-+        0x92, 0x74, 0x36, 0x51,   0x38, 0xB0, 0xBD, 0x5A,   0xFC, 0x60, 0x62, 0x96,
-+        0x6C, 0x42, 0xF7, 0x10,   0x7C, 0x28, 0x27, 0x8C,   0x13, 0x95, 0x9C, 0xC7,
-+        0x24, 0x46, 0x3B, 0x70,   0xCA, 0xE3, 0x85, 0xCB,   0x11, 0xD0, 0x93, 0xB8,
-+        0xA6, 0x83, 0x20, 0xFF,   0x9F, 0x77, 0xC3, 0xCC,   0x03, 0x6F, 0x08, 0xBF,
-+		0x40, 0xE7, 0x2B, 0xE2,   0x79, 0x0C, 0xAA, 0x82,   0x41, 0x3A, 0xEA, 0xB9,
-+        0xE4, 0x9A, 0xA4, 0x97,   0x7E, 0xDA, 0x7A, 0x17,   0x66, 0x94, 0xA1, 0x1D,
-+        0x3D, 0xF0, 0xDE, 0xB3,   0x0B, 0x72, 0xA7, 0x1C,   0xEF, 0xD1, 0x53, 0x3E,
-+        0x8F, 0x33, 0x26, 0x5F,   0xEC, 0x76, 0x2A, 0x49,   0x81, 0x88, 0xEE, 0x21,
-+        0xC4, 0x1A, 0xEB, 0xD9,   0xC5, 0x39, 0x99, 0xCD,   0xAD, 0x31, 0x8B, 0x01,
-+        0x18, 0x23, 0xDD, 0x1F,   0x4E, 0x2D, 0xF9, 0x48,   0x4F, 0xF2, 0x65, 0x8E,
-+        0x78, 0x5C, 0x58, 0x19,   0x8D, 0xE5, 0x98, 0x57,   0x67, 0x7F, 0x05, 0x64,
-+        0xAF, 0x63, 0xB6, 0xFE,   0xF5, 0xB7, 0x3C, 0xA5,   0xCE, 0xE9, 0x68, 0x44,
-+        0xE0, 0x4D, 0x43, 0x69,   0x29, 0x2E, 0xAC, 0x15,   0x59, 0xA8, 0x0A, 0x9E,
-+        0x6E, 0x47, 0xDF, 0x34,   0x35, 0x6A, 0xCF, 0xDC,   0x22, 0xC9, 0xC0, 0x9B,
-+        0x89, 0xD4, 0xED, 0xAB,   0x12, 0xA2, 0x0D, 0x52,   0xBB, 0x02, 0x2F, 0xA9,
-+        0xD7, 0x61, 0x1E, 0xB4,   0x50, 0x04, 0xF6, 0xC2,   0x16, 0x25, 0x86, 0x56,
-+        0x55, 0x09, 0xBE, 0x91
-+    }
-+};
-+
-+static bool TwoFish_MDSready=FALSE;
-+static u_int32_t TwoFish_MDS[4][256]; /* TwoFish_MDS matrix */
-+
-+
-+#define	TwoFish_LFSR1(x) (((x)>>1)^(((x)&0x01)?TwoFish_MDS_GF_FDBK/2:0))
-+#define	TwoFish_LFSR2(x) (((x)>>2)^(((x)&0x02)?TwoFish_MDS_GF_FDBK/2:0)^(((x)&0x01)?TwoFish_MDS_GF_FDBK/4:0))
-+
-+#define	TwoFish_Mx_1(x) ((u_int32_t)(x))		/* force result to dword so << will work  */
-+#define	TwoFish_Mx_X(x) ((u_int32_t)((x)^TwoFish_LFSR2(x)))	/* 5B */
-+#define	TwoFish_Mx_Y(x) ((u_int32_t)((x)^TwoFish_LFSR1(x)^TwoFish_LFSR2(x)))	/* EF  */
-+#define	TwoFish_RS_rem(x) { u_int8_t b=(u_int8_t)(x>>24); u_int32_t g2=((b<<1)^((b&0x80)?TwoFish_RS_GF_FDBK:0))&0xFF; u_int32_t g3=((b>>1)&0x7F)^((b&1)?TwoFish_RS_GF_FDBK>>1:0)^g2; x=(x<<8)^(g3<<24)^(g2<<16)^(g3<<8)^b; }
-+
-+/*#define	TwoFish__b(x,N)	(((u_int8_t *)&x)[((N)&3)^TwoFish_ADDR_XOR])*/ /* pick bytes out of a dword */
-+
-+#define	TwoFish_b0(x)			TwoFish__b(x,0)		/* extract LSB of u_int32_t  */
-+#define	TwoFish_b1(x)			TwoFish__b(x,1)
-+#define	TwoFish_b2(x)			TwoFish__b(x,2)
-+#define	TwoFish_b3(x)			TwoFish__b(x,3)		/* extract MSB of u_int32_t  */
-+
-+u_int8_t TwoFish__b(u_int32_t x,int n)
-+{	n&=3;
-+	while(n-->0)
-+		x>>=8;
-+	return (u_int8_t)x;
-+}
-+
-+
-+/*	TwoFish Initialization
-+ *
-+ *	This routine generates a global data structure for use with TwoFish,
-+ *	initializes important values (such as subkeys, sBoxes), generates subkeys
-+ *	and precomputes the MDS matrix if not already done.
-+ *
-+ *	Input:	User supplied password (will be appended by default password of 'SnortHas2FishEncryptionRoutines!')
-+ *
-+ *  Output:	Pointer to TWOFISH structure. This data structure contains key dependent data.
-+ *			This pointer is used with all other crypt functions.
-+ */
-+
-+TWOFISH *TwoFishInit(char *userkey)
-+{   TWOFISH *tfdata;
-+	int i,x,m;
-+	char tkey[TwoFish_KEY_LENGTH+40];
-+
-+	tfdata=malloc(sizeof(TWOFISH));			/* allocate the TwoFish structure */
-+	if(tfdata!=NULL)
-+	{	if(*userkey)
-+		{	strncpy(tkey,userkey,TwoFish_KEY_LENGTH);			/* use first 32 chars of user supplied password */
-+			tkey[TwoFish_KEY_LENGTH]=0;							/* make sure it wasn't more */
-+		}
-+		else
-+			strcpy(tkey,TwoFish_DEFAULT_PW);	/* if no key defined, use default password */
-+		for(i=0,x=0,m=strlen(tkey);i<TwoFish_KEY_LENGTH;i++)	/* copy into data structure */
-+		{	tfdata->key[i]=tkey[x++];							/* fill the whole keyspace with repeating key. */
-+			if(x==m)
-+				x=0;
-+		}
-+
-+		if(!TwoFish_MDSready)
-+			_TwoFish_PrecomputeMDSmatrix();		/* "Wake Up, Neo" */
-+		_TwoFish_MakeSubKeys(tfdata);			/* generate subkeys */
-+		_TwoFish_ResetCBC(tfdata);				/* reset the CBC */
-+		tfdata->output=NULL;					/* nothing to output yet */
-+		tfdata->dontflush=FALSE;				/* reset decrypt skip block flag */
-+		if(TwoFish_srand)
-+		{	TwoFish_srand=FALSE;
-+			srand(time(NULL));
-+		}
-+	}
-+	return tfdata;							/* return the data pointer */
-+}
-+
-+
-+void TwoFishDestroy(TWOFISH *tfdata)
-+{	if(tfdata!=NULL)
-+		free(tfdata);
-+}
-+
-+
-+/* en/decryption with CBC mode */
-+unsigned long _TwoFish_CryptRawCBC(char *in,char *out,unsigned long len,bool decrypt,TWOFISH *tfdata)
-+{	unsigned long rl;
-+
-+	rl=len;											/* remember how much data to crypt. */
-+	while(len>TwoFish_BLOCK_SIZE)					/* and now we process block by block. */
-+	{	_TwoFish_BlockCrypt(in,out,TwoFish_BLOCK_SIZE,decrypt,tfdata); /* de/encrypt it. */
-+		in+=TwoFish_BLOCK_SIZE;						/* adjust pointers. */
-+		out+=TwoFish_BLOCK_SIZE;
-+		len-=TwoFish_BLOCK_SIZE;
-+	}
-+	if(len>0)										/* if we have less than a block left... */
-+		_TwoFish_BlockCrypt(in,out,len,decrypt,tfdata);	/* ...then we de/encrypt that too. */
-+	if(tfdata->qBlockDefined && !tfdata->dontflush)						/* in case len was exactly one block... */
-+		_TwoFish_FlushOutput(tfdata->qBlockCrypt,TwoFish_BLOCK_SIZE,tfdata); /* ...we need to write the...  */
-+																		/* ...remaining bytes of the buffer */
-+	return rl;
-+}
-+
-+/* en/decryption on one block only */
-+unsigned long _TwoFish_CryptRaw16(char *in,char *out,unsigned long len,bool decrypt,TWOFISH *tfdata)
-+{	/* qBlockPlain already zero'ed through ResetCBC  */
-+	memcpy(tfdata->qBlockPlain,in,len);					/* toss the data into it. */
-+	_TwoFish_BlockCrypt16(tfdata->qBlockPlain,tfdata->qBlockCrypt,decrypt,tfdata); /* encrypt just that block without CBC. */
-+	memcpy(out,tfdata->qBlockCrypt,TwoFish_BLOCK_SIZE);				/* and return what we got */
-+	return TwoFish_BLOCK_SIZE;
-+}
-+
-+/* en/decryption without reset of CBC and output assignment */
-+unsigned long _TwoFish_CryptRaw(char *in,char *out,unsigned long len,bool decrypt,TWOFISH *tfdata)
-+{
-+	if(in!=NULL && out!=NULL && len>0 && tfdata!=NULL)		/* if we have valid data, then... */
-+	{	if(len>TwoFish_BLOCK_SIZE)							/* ...check if we have more than one block. */
-+			return _TwoFish_CryptRawCBC(in,out,len,decrypt,tfdata); /* if so, use the CBC routines... */
-+		else
-+			return _TwoFish_CryptRaw16(in,out,len,decrypt,tfdata); /* ...otherwise just do one block. */
-+	}
-+	return 0;
-+}
-+
-+
-+/*	TwoFish Raw Encryption
-+ *
-+ *	Does not use header, but does use CBC (if more than one block has to be encrypted).
-+ *
-+ *	Input:	Pointer to the buffer of the plaintext to be encrypted.
-+ *			Pointer to the buffer receiving the ciphertext.
-+ *			The length of the plaintext buffer.
-+ *			The TwoFish structure.
-+ *
-+ *	Output:	The amount of bytes encrypted if successful, otherwise 0.
-+ */
-+
-+unsigned long TwoFishEncryptRaw(char *in,
-+								char *out,
-+								unsigned long len,
-+								TWOFISH *tfdata)
-+{	_TwoFish_ResetCBC(tfdata);							/* reset CBC flag. */
-+	tfdata->output=out;							/* output straight into output buffer. */
-+	return _TwoFish_CryptRaw(in,out,len,FALSE,tfdata);	/* and go for it. */
-+}
-+
-+/*	TwoFish Raw Decryption
-+ *
-+ *	Does not use header, but does use CBC (if more than one block has to be decrypted).
-+ *
-+ *	Input:	Pointer to the buffer of the ciphertext to be decrypted.
-+ *			Pointer to the buffer receiving the plaintext.
-+ *			The length of the ciphertext buffer (at least one cipher block).
-+ *			The TwoFish structure.
-+ *
-+ *	Output:	The amount of bytes decrypted if successful, otherwise 0.
-+ */
-+
-+unsigned long TwoFishDecryptRaw(char *in,
-+								char *out,
-+								unsigned long len,
-+								TWOFISH *tfdata)
-+{	_TwoFish_ResetCBC(tfdata);							/* reset CBC flag. */
-+	tfdata->output=out;							/* output straight into output buffer. */
-+	return _TwoFish_CryptRaw(in,out,len,TRUE,tfdata);	/* and go for it. */
-+}
-+
-+/*	TwoFish Free
-+ *
-+ *	Free's the allocated buffer.
-+ *
-+ *	Input:	Pointer to the TwoFish structure
-+ *
-+ *	Output:	(none)
-+ */
-+
-+void TwoFishFree(TWOFISH *tfdata)
-+{	if(tfdata->output!=NULL)	/* if a valid buffer is present... */
-+	{	free(tfdata->output);	/* ...then we free it for you... */
-+		tfdata->output=NULL;	/* ...and mark as such. */
-+	}
-+}
-+
-+/*	TwoFish Set Output
-+ *
-+ *	If you want to allocate the output buffer yourself,
-+ *	then you can set it with this function.
-+ *
-+ *	Input:	Pointer to your output buffer
-+ *			Pointer to the TwoFish structure
-+ *
-+ *	Output:	(none)
-+ */
-+
-+void TwoFishSetOutput(char *outp,TWOFISH *tfdata)
-+{	tfdata->output=outp;				/* (do we really need a function for this?) */
-+}
-+
-+/*	TwoFish Alloc
-+ *
-+ *	Allocates enough memory for the output buffer that would be required
-+ *
-+ *	Input:	Length of the plaintext.
-+ *			Boolean flag for BinHex Output.
-+ *			Pointer to the TwoFish structure.
-+ *
-+ *	Output:	Returns a pointer to the memory allocated.
-+ */
-+
-+void *TwoFishAlloc(unsigned long len,bool binhex,bool decrypt,TWOFISH *tfdata)
-+{
-+/*	TwoFishFree(tfdata);	*/			/* (don't for now) discard whatever was allocated earlier. */
-+	if(decrypt)							/* if decrypting... */
-+	{	if(binhex)						/* ...and input is binhex encoded... */
-+			len/=2;						/* ...use half as much for output. */
-+		len-=TwoFish_BLOCK_SIZE;		/* Also, subtract the size of the header. */
-+	}
-+	else
-+	{	len+=TwoFish_BLOCK_SIZE;		/* the size is just increased by the header... */
-+		if(binhex)
-+			len*=2;						/* ...and doubled if output is to be binhexed. */
-+	}
-+	tfdata->output=malloc(len+TwoFish_BLOCK_SIZE);/* grab some memory...plus some extra (it's running over somewhere, crashes without extra padding) */
-+
-+	return tfdata->output;				/* ...and return to caller. */
-+}
-+
-+/* bin2hex and hex2bin conversion */
-+void _TwoFish_BinHex(u_int8_t *buf,unsigned long len,bool bintohex)
-+{	u_int8_t *pi,*po,c;
-+
-+	if(bintohex)
-+	{	for(pi=buf+len-1,po=buf+(2*len)-1;len>0;pi--,po--,len--) /* let's start from the end of the bin block. */
-+		{	c=*pi;												 /* grab value. */
-+			c&=15;												 /* use lower 4 bits. */
-+			if(c>9)												 /* convert to ascii. */
-+				c+=('a'-10);
-+			else
-+				c+='0';
-+			*po--=c;											 /* set the lower nibble. */
-+			c=*pi;												 /* grab value again. */
-+			c>>=4;												 /* right shift 4 bits. */
-+			c&=15;												 /* make sure we only have 4 bits. */
-+			if(c>9)												 /* convert to ascii. */
-+				c+=('a'-10);
-+			else
-+				c+='0';
-+			*po=c;												 /* set the higher nibble. */
-+		}														 /* and keep going. */
-+	}
-+	else
-+	{	for(pi=buf,po=buf;len>0;pi++,po++,len-=2)				 /* let's start from the beginning of the hex block. */
-+		{	c=tolower(*pi++)-'0';								 /* grab higher nibble. */
-+			if(c>9)												 /* convert to value. */
-+				c-=('0'-9);
-+			*po=c<<4;											 /* left shit 4 bits. */
-+			c=tolower(*pi)-'0';									 /* grab lower nibble. */
-+			if(c>9)												 /* convert to value. */
-+				c-=('0'-9);
-+			*po|=c;												 /* and add to value. */
-+		}
-+	}
-+}
-+
-+
-+/*	TwoFish Encryption
-+ *
-+ *	Uses header and CBC. If the output area has not been intialized with TwoFishAlloc,
-+ *  this routine will alloc the memory. In addition, it will include a small 'header'
-+ *  containing the magic and some salt. That way the decrypt routine can check if the
-+ *  packet got decrypted successfully, and return 0 instead of garbage.
-+ *
-+ *	Input:	Pointer to the buffer of the plaintext to be encrypted.
-+ *			Pointer to the pointer to the buffer receiving the ciphertext.
-+ *				The pointer either points to user allocated output buffer space, or to NULL, in which case
-+ *				this routine will set the pointer to the buffer allocated through the struct.
-+ *			The length of the plaintext buffer.
-+ *				Can be -1 if the input is a null terminated string, in which case we'll count for you.
-+ *			Boolean flag for BinHex Output (if used, output will be twice as large as input).
-+ *				Note: BinHex conversion overwrites (converts) input buffer!
-+ *			The TwoFish structure.
-+ *
-+ *	Output:	The amount of bytes encrypted if successful, otherwise 0.
-+ */
-+
-+unsigned long TwoFishEncrypt(char *in,
-+							 char **out,
-+							 signed long len,
-+							 bool binhex,
-+							 TWOFISH *tfdata)
-+{	unsigned long ilen,olen;
-+
-+
-+	if(len== -1)			/* if we got -1 for len, we'll assume IN is a...  */
-+		ilen=strlen(in);	/* ...\0 terminated string and figure len out ourselves... */
-+	else
-+		ilen=len;			/* ...otherwise we trust you supply a correct length. */
-+
-+	if(in!=NULL && out!=NULL && ilen>0 && tfdata!=NULL) /* if we got usable stuff, we'll do it. */
-+	{	if(*out==NULL)									/* if OUT points to a NULL pointer... */
-+			*out=TwoFishAlloc(ilen,binhex,FALSE,tfdata);  /* ...we'll (re-)allocate buffer space. */
-+		if(*out!=NULL)
-+		{	tfdata->output=*out;							/* set output buffer. */
-+			tfdata->header.salt=rand()*65536+rand();		/* toss in some salt. */
-+			tfdata->header.length[0]= (u_int8_t)(ilen);
-+			tfdata->header.length[1]= (u_int8_t)(ilen>>8);
-+			tfdata->header.length[2]= (u_int8_t)(ilen>>16);
-+			tfdata->header.length[3]= (u_int8_t)(ilen>>24);
-+			memcpy(tfdata->header.magic,TwoFish_MAGIC,TwoFish_MAGIC_LEN); /* set the magic. */
-+			olen=TwoFish_BLOCK_SIZE;						/* set output counter. */
-+			_TwoFish_ResetCBC(tfdata);						/* reset the CBC flag */
-+			_TwoFish_BlockCrypt((u_int8_t *)&(tfdata->header),*out,olen,FALSE,tfdata); /* encrypt first block (without flush on 16 byte boundary). */
-+			olen+=_TwoFish_CryptRawCBC(in,*out+TwoFish_BLOCK_SIZE,ilen,FALSE,tfdata);	/* and encrypt the rest (we do not reset the CBC flag). */
-+			if(binhex)									/* if binhex... */
-+			{	_TwoFish_BinHex(*out,olen,TRUE);		/* ...convert output to binhex... */
-+				olen*=2;								/* ...and size twice as large. */
-+			}
-+			tfdata->output=*out;
-+			return olen;
-+		}
-+	}
-+	return 0;
-+}
-+
-+/*	TwoFish Decryption
-+ *
-+ *	Uses header and CBC. If the output area has not been intialized with TwoFishAlloc,
-+ *  this routine will alloc the memory. In addition, it will check the small 'header'
-+ *  containing the magic. If magic does not match we return 0. Otherwise we return the
-+ *  amount of bytes decrypted (should be the same as the length in the header).
-+ *
-+ *	Input:	Pointer to the buffer of the ciphertext to be decrypted.
-+ *			Pointer to the pointer to the buffer receiving the plaintext.
-+ *				The pointer either points to user allocated output buffer space, or to NULL, in which case
-+ *				this routine will set the pointer to the buffer allocated through the struct.
-+ *			The length of the ciphertext buffer.
-+ *				Can be -1 if the input is a null terminated binhex string, in which case we'll count for you.
-+ *			Boolean flag for BinHex Input (if used, plaintext will be half as large as input).
-+ *				Note: BinHex conversion overwrites (converts) input buffer!
-+ *			The TwoFish structure.
-+ *
-+ *	Output:	The amount of bytes decrypted if successful, otherwise 0.
-+ */
-+
-+unsigned long TwoFishDecrypt(char *in,
-+							 char **out,
-+							 signed long len,
-+							 bool binhex,
-+							 TWOFISH *tfdata)
-+{	unsigned long ilen,elen,olen;
-+	const u_int8_t cmagic[TwoFish_MAGIC_LEN]=TwoFish_MAGIC;
-+	u_int8_t *tbuf;
-+
-+
-+
-+	if(len== -1)			/* if we got -1 for len, we'll assume IN is...  */
-+		ilen=strlen(in);	/* ...\0 terminated binhex and figure len out ourselves... */
-+	else
-+		ilen=len;			/* ...otherwise we trust you supply a correct length. */
-+
-+	if(in!=NULL && out!=NULL && ilen>0 && tfdata!=NULL) /* if we got usable stuff, we'll do it. */
-+	{	if(*out==NULL)									/* if OUT points to a NULL pointer... */
-+			*out=TwoFishAlloc(ilen,binhex,TRUE,tfdata); /* ...we'll (re-)allocate buffer space. */
-+		if(*out!=NULL)
-+		{	if(binhex)									/* if binhex... */
-+			{	_TwoFish_BinHex(in,ilen,FALSE);		/* ...convert input to values... */
-+				ilen/=2;								/* ...and size half as much. */
-+			}
-+			_TwoFish_ResetCBC(tfdata);						/* reset the CBC flag. */
-+
-+			tbuf=(u_int8_t *)malloc(ilen+TwoFish_BLOCK_SIZE); /* get memory for data and header. */
-+			if(tbuf==NULL)
-+				return 0;
-+			tfdata->output=tbuf;					/* set output to temp buffer. */
-+
-+			olen=_TwoFish_CryptRawCBC(in,tbuf,ilen,TRUE,tfdata)-TwoFish_BLOCK_SIZE; /* decrypt the whole thing. */
-+			memcpy(&(tfdata->header),tbuf,TwoFish_BLOCK_SIZE); /* copy first block into header. */
-+			tfdata->output=*out;
-+			for(elen=0;elen<TwoFish_MAGIC_LEN;elen++)	/* compare magic. */
-+				if(tfdata->header.magic[elen]!=cmagic[elen])
-+					break;
-+			if(elen==TwoFish_MAGIC_LEN)					/* if magic matches then... */
-+			{	elen=(tfdata->header.length[0]) |
-+					 (tfdata->header.length[1])<<8 |
-+					 (tfdata->header.length[2])<<16 |
-+					 (tfdata->header.length[3])<<24;	/* .. we know how much to expect. */
-+				if(elen>olen)							/* adjust if necessary. */
-+					elen=olen;
-+				memcpy(*out,tbuf+TwoFish_BLOCK_SIZE,elen);	/* copy data into intended output. */
-+				free(tbuf);
-+				return elen;
-+			}
-+			free(tbuf);
-+		}
-+	}
-+	return 0;
-+}
-+
-+void _TwoFish_PrecomputeMDSmatrix(void)	/* precompute the TwoFish_MDS matrix */
-+{   u_int32_t m1[2];
-+    u_int32_t mX[2];
-+    u_int32_t mY[2];
-+    u_int32_t i, j;
-+
-+    for (i = 0; i < 256; i++)
-+    {   j = TwoFish_P[0][i]       & 0xFF; /* compute all the matrix elements */
-+        m1[0] = j;
-+        mX[0] = TwoFish_Mx_X( j ) & 0xFF;
-+        mY[0] = TwoFish_Mx_Y( j ) & 0xFF;
-+
-+        j = TwoFish_P[1][i]       & 0xFF;
-+        m1[1] = j;
-+        mX[1] = TwoFish_Mx_X( j ) & 0xFF;
-+        mY[1] = TwoFish_Mx_Y( j ) & 0xFF;
-+
-+        TwoFish_MDS[0][i] = m1[TwoFish_P_00] | /* fill matrix w/ above elements */
-+                    mX[TwoFish_P_00] <<  8 |
-+                    mY[TwoFish_P_00] << 16 |
-+                    mY[TwoFish_P_00] << 24;
-+        TwoFish_MDS[1][i] = mY[TwoFish_P_10] |
-+                    mY[TwoFish_P_10] <<  8 |
-+                    mX[TwoFish_P_10] << 16 |
-+                    m1[TwoFish_P_10] << 24;
-+        TwoFish_MDS[2][i] = mX[TwoFish_P_20] |
-+                    mY[TwoFish_P_20] <<  8 |
-+                    m1[TwoFish_P_20] << 16 |
-+                    mY[TwoFish_P_20] << 24;
-+        TwoFish_MDS[3][i] = mX[TwoFish_P_30] |
-+                    m1[TwoFish_P_30] <<  8 |
-+                    mY[TwoFish_P_30] << 16 |
-+                    mX[TwoFish_P_30] << 24;
-+    }
-+	TwoFish_MDSready=TRUE;
-+}
-+
-+
-+void _TwoFish_MakeSubKeys(TWOFISH *tfdata)	/* Expand a user-supplied key material into a session key. */
-+{	u_int32_t k64Cnt    = TwoFish_KEY_LENGTH / 8;
-+	u_int32_t k32e[4]; /* even 32-bit entities */
-+	u_int32_t k32o[4]; /* odd 32-bit entities */
-+	u_int32_t sBoxKey[4];
-+	u_int32_t offset,i,j;
-+	u_int32_t A, B, q=0;
-+	u_int32_t k0,k1,k2,k3;
-+    u_int32_t b0,b1,b2,b3;
-+
-+    /* split user key material into even and odd 32-bit entities and */
-+    /* compute S-box keys using (12, 8) Reed-Solomon code over GF(256) */
-+
-+
-+    for (offset=0,i=0,j=k64Cnt-1;i<4 && offset<TwoFish_KEY_LENGTH;i++,j--)
-+    {	k32e[i] = tfdata->key[offset++];
-+		k32e[i]|= tfdata->key[offset++]<<8;
-+		k32e[i]|= tfdata->key[offset++]<<16;
-+		k32e[i]|= tfdata->key[offset++]<<24;
-+    	k32o[i] = tfdata->key[offset++];
-+		k32o[i]|= tfdata->key[offset++]<<8;
-+		k32o[i]|= tfdata->key[offset++]<<16;
-+		k32o[i]|= tfdata->key[offset++]<<24;
-+        sBoxKey[j] = _TwoFish_RS_MDS_Encode( k32e[i], k32o[i] ); /* reverse order */
-+    }
-+
-+    /* compute the round decryption subkeys for PHT. these same subkeys */
-+    /* will be used in encryption but will be applied in reverse order. */
-+    i=0;
-+    while(i < TwoFish_TOTAL_SUBKEYS)
-+    {	A = _TwoFish_F32( k64Cnt, q, k32e ); /* A uses even key entities */
-+        q += TwoFish_SK_BUMP;
-+
-+        B = _TwoFish_F32( k64Cnt, q, k32o ); /* B uses odd  key entities */
-+        q += TwoFish_SK_BUMP;
-+
-+        B = B << 8 | B >> 24;
-+
-+        A += B;
-+        tfdata->subKeys[i++] = A;           /* combine with a PHT */
-+
-+        A += B;
-+        tfdata->subKeys[i++] = A << TwoFish_SK_ROTL | A >> (32-TwoFish_SK_ROTL);
-+    }
-+
-+    /* fully expand the table for speed */
-+    k0 = sBoxKey[0];
-+    k1 = sBoxKey[1];
-+    k2 = sBoxKey[2];
-+    k3 = sBoxKey[3];
-+
-+    for (i = 0; i < 256; i++)
-+    {   b0 = b1 = b2 = b3 = i;
-+        switch (k64Cnt & 3)
-+        {	case 1: /* 64-bit keys */
-+				tfdata->sBox[      2*i  ] = TwoFish_MDS[0][(TwoFish_P[TwoFish_P_01][b0]) ^ TwoFish_b0(k0)];
-+				tfdata->sBox[      2*i+1] = TwoFish_MDS[1][(TwoFish_P[TwoFish_P_11][b1]) ^ TwoFish_b1(k0)];
-+				tfdata->sBox[0x200+2*i  ] = TwoFish_MDS[2][(TwoFish_P[TwoFish_P_21][b2]) ^ TwoFish_b2(k0)];
-+				tfdata->sBox[0x200+2*i+1] = TwoFish_MDS[3][(TwoFish_P[TwoFish_P_31][b3]) ^ TwoFish_b3(k0)];
-+				break;
-+			case 0: /* 256-bit keys (same as 4) */
-+				b0 = (TwoFish_P[TwoFish_P_04][b0]) ^ TwoFish_b0(k3);
-+				b1 = (TwoFish_P[TwoFish_P_14][b1]) ^ TwoFish_b1(k3);
-+				b2 = (TwoFish_P[TwoFish_P_24][b2]) ^ TwoFish_b2(k3);
-+				b3 = (TwoFish_P[TwoFish_P_34][b3]) ^ TwoFish_b3(k3);
-+			case 3:  /* 192-bit keys */
-+				b0 = (TwoFish_P[TwoFish_P_03][b0]) ^ TwoFish_b0(k2);
-+				b1 = (TwoFish_P[TwoFish_P_13][b1]) ^ TwoFish_b1(k2);
-+				b2 = (TwoFish_P[TwoFish_P_23][b2]) ^ TwoFish_b2(k2);
-+				b3 = (TwoFish_P[TwoFish_P_33][b3]) ^ TwoFish_b3(k2);
-+			case 2: /* 128-bit keys */
-+				tfdata->sBox[      2*i  ]=
-+					TwoFish_MDS[0][(TwoFish_P[TwoFish_P_01][(TwoFish_P[TwoFish_P_02][b0]) ^
-+					TwoFish_b0(k1)]) ^ TwoFish_b0(k0)];
-+
-+				tfdata->sBox[      2*i+1]=
-+					TwoFish_MDS[1][(TwoFish_P[TwoFish_P_11][(TwoFish_P[TwoFish_P_12][b1]) ^
-+					TwoFish_b1(k1)]) ^ TwoFish_b1(k0)];
-+
-+				tfdata->sBox[0x200+2*i  ]=
-+					TwoFish_MDS[2][(TwoFish_P[TwoFish_P_21][(TwoFish_P[TwoFish_P_22][b2]) ^
-+					TwoFish_b2(k1)]) ^ TwoFish_b2(k0)];
-+
-+				tfdata->sBox[0x200+2*i+1]=
-+					TwoFish_MDS[3][(TwoFish_P[TwoFish_P_31][(TwoFish_P[TwoFish_P_32][b3]) ^
-+					TwoFish_b3(k1)]) ^ TwoFish_b3(k0)];
-+		}
-+    }
-+}
-+
-+
-+/**
-+ * Encrypt or decrypt exactly one block of plaintext in CBC mode.
-+ * Use "ciphertext stealing" technique described on pg. 196
-+ * of "Applied Cryptography" to encrypt the final partial
-+ * (i.e. <16 byte) block if necessary.
-+ *
-+ * jojo: the "ciphertext stealing" requires we read ahead and have
-+ * special handling for the last two blocks.  Because of this, the
-+ * output from the TwoFish algorithm is handled internally here.
-+ * It would be better to have a higher level handle this as well as
-+ * CBC mode.  Unfortunately, I've mixed the two together, which is
-+ * pretty crappy... The Java version separates these out correctly.
-+ *
-+ * fknobbe:	I have reduced the CBC mode to work on memory buffer only.
-+ *			Higher routines should use an intermediate buffer and handle
-+ *			their output seperately (mainly so the data can be flushed
-+ *			in one chunk, not seperate 16 byte blocks...)
-+ *
-+ * @param in   The plaintext.
-+ * @param out  The ciphertext
-+ * @param size how much to encrypt
-+ * @param tfdata: Pointer to the global data structure containing session keys.
-+ * @return none
-+ */
-+void _TwoFish_BlockCrypt(u_int8_t *in,u_int8_t *out,unsigned long size,int decrypt,TWOFISH *tfdata)
-+{	u_int8_t PnMinusOne[TwoFish_BLOCK_SIZE];
-+	u_int8_t CnMinusOne[TwoFish_BLOCK_SIZE];
-+	u_int8_t CBCplusCprime[TwoFish_BLOCK_SIZE];
-+	u_int8_t Pn[TwoFish_BLOCK_SIZE];
-+	u_int8_t *p,*pout;
-+	unsigned long i;
-+
-+    /* here is where we implement CBC mode and cipher block stealing */
-+    if(size==TwoFish_BLOCK_SIZE)
-+	{   /* if we are encrypting, CBC means we XOR the plain text block with the */
-+        /* previous cipher text block before encrypting */
-+		if(!decrypt && tfdata->qBlockDefined)
-+		{   for(p=in,i=0;i<TwoFish_BLOCK_SIZE;i++,p++)
-+				Pn[i]=*p ^ tfdata->qBlockCrypt[i];	/* FK: I'm copying the xor'ed input into Pn... */
-+		}
-+		else
-+			memcpy(Pn,in,TwoFish_BLOCK_SIZE); /* FK: same here. we work of Pn all the time. */
-+
-+        /* TwoFish block level encryption or decryption */
-+		_TwoFish_BlockCrypt16(Pn,out,decrypt,tfdata);
-+
-+        /* if we are decrypting, CBC means we XOR the result of the decryption */
-+        /* with the previous cipher text block to get the resulting plain text */
-+        if(decrypt && tfdata->qBlockDefined)
-+        {	for (p=out,i=0;i<TwoFish_BLOCK_SIZE;i++,p++)
-+				*p^=tfdata->qBlockPlain[i];
-+        }
-+
-+        /* save the input and output blocks, since CBC needs these for XOR */
-+        /* operations */
-+        _TwoFish_qBlockPush(Pn,out,tfdata);
-+	}
-+	else
-+	{   /* cipher block stealing, we are at Pn, */
-+        /* but since Cn-1 must now be replaced with CnC' */
-+        /* we pop it off, and recalculate Cn-1 */
-+
-+        if(decrypt)
-+        {   /* We are on an odd block, and had to do cipher block stealing, */
-+            /* so the PnMinusOne has to be derived differently. */
-+
-+            /* First we decrypt it into CBC and C' */
-+	        _TwoFish_qBlockPop(CnMinusOne,PnMinusOne,tfdata);
-+            _TwoFish_BlockCrypt16(CnMinusOne,CBCplusCprime,decrypt,tfdata);
-+
-+            /* we then xor the first few bytes with the "in" bytes (Cn) */
-+            /* to recover Pn, which we put in out */
-+            for(p=in,pout=out,i=0;i<size;i++,p++,pout++)
-+                *pout=*p ^ CBCplusCprime[i];
-+
-+            /* We now recover the original CnMinusOne, which consists of */
-+            /* the first "size" bytes of "in" data, followed by the */
-+            /* "Cprime" portion of CBCplusCprime */
-+            for(p=in,i=0;i<size;i++,p++)
-+                CnMinusOne[i]=*p;
-+            for(;i<TwoFish_BLOCK_SIZE;i++)
-+                CnMinusOne[i]=CBCplusCprime[i];
-+
-+            /* we now decrypt CnMinusOne to get PnMinusOne xored with Cn-2 */
-+            _TwoFish_BlockCrypt16(CnMinusOne,PnMinusOne,decrypt,tfdata);
-+
-+            for(i=0;i<TwoFish_BLOCK_SIZE;i++)
-+                PnMinusOne[i]=PnMinusOne[i] ^ tfdata->prevCipher[i];
-+
-+            /* So at this point, out has PnMinusOne */
-+            _TwoFish_qBlockPush(CnMinusOne,PnMinusOne,tfdata);
-+		    _TwoFish_FlushOutput(tfdata->qBlockCrypt,TwoFish_BLOCK_SIZE,tfdata);
-+            _TwoFish_FlushOutput(out,size,tfdata);
-+        }
-+		else
-+		{	_TwoFish_qBlockPop(PnMinusOne,CnMinusOne,tfdata);
-+			memset(Pn,0,TwoFish_BLOCK_SIZE);
-+			memcpy(Pn,in,size);
-+			for(i=0;i<TwoFish_BLOCK_SIZE;i++)
-+				Pn[i]^=CnMinusOne[i];
-+			_TwoFish_BlockCrypt16(Pn,out,decrypt,tfdata);
-+			_TwoFish_qBlockPush(Pn,out,tfdata);  /* now we officially have Cn-1 */
-+			_TwoFish_FlushOutput(tfdata->qBlockCrypt,TwoFish_BLOCK_SIZE,tfdata);
-+			_TwoFish_FlushOutput(CnMinusOne,size,tfdata);  /* old Cn-1 becomes new partial Cn */
-+		}
-+		tfdata->qBlockDefined=FALSE;
-+	}
-+}
-+
-+void _TwoFish_qBlockPush(u_int8_t *p,u_int8_t *c,TWOFISH *tfdata)
-+{	if(tfdata->qBlockDefined)
-+		_TwoFish_FlushOutput(tfdata->qBlockCrypt,TwoFish_BLOCK_SIZE,tfdata);
-+	memcpy(tfdata->prevCipher,tfdata->qBlockPlain,TwoFish_BLOCK_SIZE);
-+	memcpy(tfdata->qBlockPlain,p,TwoFish_BLOCK_SIZE);
-+	memcpy(tfdata->qBlockCrypt,c,TwoFish_BLOCK_SIZE);
-+	tfdata->qBlockDefined=TRUE;
-+}
-+
-+void _TwoFish_qBlockPop(u_int8_t *p,u_int8_t *c,TWOFISH *tfdata)
-+{	memcpy(p,tfdata->qBlockPlain,TwoFish_BLOCK_SIZE );
-+	memcpy(c,tfdata->qBlockCrypt,TwoFish_BLOCK_SIZE );
-+	tfdata->qBlockDefined=FALSE;
-+}
-+
-+/* Reset's the CBC flag and zero's PrevCipher (through qBlockPlain) (important) */
-+void _TwoFish_ResetCBC(TWOFISH *tfdata)
-+{	tfdata->qBlockDefined=FALSE;
-+	memset(tfdata->qBlockPlain,0,TwoFish_BLOCK_SIZE);
-+}
-+
-+void _TwoFish_FlushOutput(u_int8_t *b,unsigned long len,TWOFISH *tfdata)
-+{	unsigned long i;
-+
-+	for(i=0;i<len && !tfdata->dontflush;i++)
-+		*tfdata->output++ = *b++;
-+	tfdata->dontflush=FALSE;
-+}
-+
-+void _TwoFish_BlockCrypt16(u_int8_t *in,u_int8_t *out,bool decrypt,TWOFISH *tfdata)
-+{	u_int32_t x0,x1,x2,x3;
-+    u_int32_t k,t0,t1,R;
-+
-+
-+	x0=*in++;
-+	x0|=(*in++ << 8 );
-+	x0|=(*in++ << 16);
-+	x0|=(*in++ << 24);
-+    x1=*in++;
-+	x1|=(*in++ << 8 );
-+	x1|=(*in++ << 16);
-+	x1|=(*in++ << 24);
-+	x2=*in++;
-+	x2|=(*in++ << 8 );
-+	x2|=(*in++ << 16);
-+	x2|=(*in++ << 24);
-+	x3=*in++;
-+	x3|=(*in++ << 8 );
-+	x3|=(*in++ << 16);
-+	x3|=(*in++ << 24);
-+
-+	if(decrypt)
-+    {	x0 ^= tfdata->subKeys[4];	/* swap input and output whitening keys when decrypting */
-+ 	    x1 ^= tfdata->subKeys[5];
-+		x2 ^= tfdata->subKeys[6];
-+		x3 ^= tfdata->subKeys[7];
-+
-+        k = 7+(TwoFish_ROUNDS*2);
-+        for (R = 0; R < TwoFish_ROUNDS; R += 2)
-+		{   t0 = _TwoFish_Fe320( tfdata->sBox, x0);
-+            t1 = _TwoFish_Fe323( tfdata->sBox, x1);
-+            x3 ^= t0 + (t1<<1) + tfdata->subKeys[k--];
-+            x3  = x3 >> 1 | x3 << 31;
-+            x2  = x2 << 1 | x2 >> 31;
-+            x2 ^= t0 + t1 + tfdata->subKeys[k--];
-+
-+            t0 = _TwoFish_Fe320( tfdata->sBox, x2);
-+            t1 = _TwoFish_Fe323( tfdata->sBox, x3);
-+            x1 ^= t0 + (t1<<1) + tfdata->subKeys[k--];
-+            x1  = x1 >> 1 | x1 << 31;
-+            x0  = x0 << 1 | x0 >> 31;
-+            x0 ^= t0 + t1 + tfdata->subKeys[k--];
-+        }
-+
-+		x2 ^= tfdata->subKeys[0];
-+		x3 ^= tfdata->subKeys[1];
-+		x0 ^= tfdata->subKeys[2];
-+		x1 ^= tfdata->subKeys[3];
-+	}
-+	else
-+    {	x0 ^= tfdata->subKeys[0];
-+	    x1 ^= tfdata->subKeys[1];
-+		x2 ^= tfdata->subKeys[2];
-+		x3 ^= tfdata->subKeys[3];
-+
-+		k = 8;
-+        for (R = 0; R < TwoFish_ROUNDS; R += 2)
-+        {   t0 = _TwoFish_Fe320( tfdata->sBox, x0);
-+            t1 = _TwoFish_Fe323( tfdata->sBox, x1);
-+            x2 ^= t0 + t1 + tfdata->subKeys[k++];
-+            x2  = x2 >> 1 | x2 << 31;
-+            x3  = x3 << 1 | x3 >> 31;
-+            x3 ^= t0 + (t1<<1) + tfdata->subKeys[k++];
-+
-+            t0 = _TwoFish_Fe320( tfdata->sBox, x2);
-+            t1 = _TwoFish_Fe323( tfdata->sBox, x3);
-+            x0 ^= t0 + t1 + tfdata->subKeys[k++];
-+            x0  = x0 >> 1 | x0 << 31;
-+            x1  = x1 << 1 | x1 >> 31;
-+            x1 ^= t0 + (t1<<1) + tfdata->subKeys[k++];
-+        }
-+
-+		x2 ^= tfdata->subKeys[4];
-+		x3 ^= tfdata->subKeys[5];
-+		x0 ^= tfdata->subKeys[6];
-+		x1 ^= tfdata->subKeys[7];
-+	}
-+
-+	*out++ = (u_int8_t)(x2      );
-+    *out++ = (u_int8_t)(x2 >>  8);
-+    *out++ = (u_int8_t)(x2 >> 16);
-+    *out++ = (u_int8_t)(x2 >> 24);
-+
-+    *out++ = (u_int8_t)(x3      );
-+    *out++ = (u_int8_t)(x3 >>  8);
-+    *out++ = (u_int8_t)(x3 >> 16);
-+    *out++ = (u_int8_t)(x3 >> 24);
-+
-+    *out++ = (u_int8_t)(x0      );
-+    *out++ = (u_int8_t)(x0 >>  8);
-+    *out++ = (u_int8_t)(x0 >> 16);
-+    *out++ = (u_int8_t)(x0 >> 24);
-+
-+    *out++ = (u_int8_t)(x1      );
-+    *out++ = (u_int8_t)(x1 >>  8);
-+    *out++ = (u_int8_t)(x1 >> 16);
-+    *out++ = (u_int8_t)(x1 >> 24);
-+}
-+
-+/**
-+ * Use (12, 8) Reed-Solomon code over GF(256) to produce a key S-box
-+ * 32-bit entity from two key material 32-bit entities.
-+ *
-+ * @param  k0  1st 32-bit entity.
-+ * @param  k1  2nd 32-bit entity.
-+ * @return  Remainder polynomial generated using RS code
-+ */
-+u_int32_t _TwoFish_RS_MDS_Encode(u_int32_t k0,u_int32_t k1)
-+{	u_int32_t i,r;
-+
-+    for(r=k1,i=0;i<4;i++) /* shift 1 byte at a time */
-+        TwoFish_RS_rem(r);
-+    r ^= k0;
-+    for(i=0;i<4;i++)
-+        TwoFish_RS_rem(r);
-+
-+    return r;
-+}
-+
-+u_int32_t _TwoFish_F32(u_int32_t k64Cnt,u_int32_t x,u_int32_t *k32)
-+{   u_int8_t b0,b1,b2,b3;
-+	u_int32_t k0,k1,k2,k3,result = 0;
-+
-+	b0=TwoFish_b0(x);
-+    b1=TwoFish_b1(x);
-+    b2=TwoFish_b2(x);
-+    b3=TwoFish_b3(x);
-+    k0=k32[0];
-+    k1=k32[1];
-+    k2=k32[2];
-+    k3=k32[3];
-+
-+    switch (k64Cnt & 3)
-+    {	case 1:	/* 64-bit keys */
-+			result =
-+				TwoFish_MDS[0][(TwoFish_P[TwoFish_P_01][b0] & 0xFF) ^ TwoFish_b0(k0)] ^
-+				TwoFish_MDS[1][(TwoFish_P[TwoFish_P_11][b1] & 0xFF) ^ TwoFish_b1(k0)] ^
-+				TwoFish_MDS[2][(TwoFish_P[TwoFish_P_21][b2] & 0xFF) ^ TwoFish_b2(k0)] ^
-+				TwoFish_MDS[3][(TwoFish_P[TwoFish_P_31][b3] & 0xFF) ^ TwoFish_b3(k0)];
-+        break;
-+		case 0:	/* 256-bit keys (same as 4) */
-+			b0 = (TwoFish_P[TwoFish_P_04][b0] & 0xFF) ^ TwoFish_b0(k3);
-+			b1 = (TwoFish_P[TwoFish_P_14][b1] & 0xFF) ^ TwoFish_b1(k3);
-+			b2 = (TwoFish_P[TwoFish_P_24][b2] & 0xFF) ^ TwoFish_b2(k3);
-+			b3 = (TwoFish_P[TwoFish_P_34][b3] & 0xFF) ^ TwoFish_b3(k3);
-+
-+		case 3:	/* 192-bit keys */
-+			b0 = (TwoFish_P[TwoFish_P_03][b0] & 0xFF) ^ TwoFish_b0(k2);
-+			b1 = (TwoFish_P[TwoFish_P_13][b1] & 0xFF) ^ TwoFish_b1(k2);
-+			b2 = (TwoFish_P[TwoFish_P_23][b2] & 0xFF) ^ TwoFish_b2(k2);
-+			b3 = (TwoFish_P[TwoFish_P_33][b3] & 0xFF) ^ TwoFish_b3(k2);
-+		case 2:	/* 128-bit keys (optimize for this case) */
-+			result =
-+				  TwoFish_MDS[0][(TwoFish_P[TwoFish_P_01][(TwoFish_P[TwoFish_P_02][b0] & 0xFF) ^ TwoFish_b0(k1)] & 0xFF) ^ TwoFish_b0(k0)] ^
-+				  TwoFish_MDS[1][(TwoFish_P[TwoFish_P_11][(TwoFish_P[TwoFish_P_12][b1] & 0xFF) ^ TwoFish_b1(k1)] & 0xFF) ^ TwoFish_b1(k0)] ^
-+				  TwoFish_MDS[2][(TwoFish_P[TwoFish_P_21][(TwoFish_P[TwoFish_P_22][b2] & 0xFF) ^ TwoFish_b2(k1)] & 0xFF) ^ TwoFish_b2(k0)] ^
-+				  TwoFish_MDS[3][(TwoFish_P[TwoFish_P_31][(TwoFish_P[TwoFish_P_32][b3] & 0xFF) ^ TwoFish_b3(k1)] & 0xFF) ^ TwoFish_b3(k0)];
-+        break;
-+    }
-+    return result;
-+}
-+
-+u_int32_t _TwoFish_Fe320(u_int32_t *lsBox,u_int32_t x)
-+{   return lsBox[        TwoFish_b0(x)<<1    ]^
-+           lsBox[      ((TwoFish_b1(x)<<1)|1)]^
-+           lsBox[0x200+ (TwoFish_b2(x)<<1)   ]^
-+           lsBox[0x200+((TwoFish_b3(x)<<1)|1)];
-+}
-+
-+u_int32_t _TwoFish_Fe323(u_int32_t *lsBox,u_int32_t x)
-+{   return lsBox[       (TwoFish_b3(x)<<1)   ]^
-+           lsBox[      ((TwoFish_b0(x)<<1)|1)]^
-+           lsBox[0x200+ (TwoFish_b1(x)<<1)   ]^
-+           lsBox[0x200+((TwoFish_b2(x)<<1)|1)];
-+}
-+
-+u_int32_t _TwoFish_Fe32(u_int32_t *lsBox,u_int32_t x,u_int32_t R)
-+{   return lsBox[      2*TwoFish__b(x,R  )  ]^
-+           lsBox[      2*TwoFish__b(x,R+1)+1]^
-+           lsBox[0x200+2*TwoFish__b(x,R+2)  ]^
-+           lsBox[0x200+2*TwoFish__b(x,R+3)+1];
-+}
-+
-+
-+#endif
-diff -ruN snort-2.9.2.2/src/twofish.h snort-2.9.2.2_bkup/src/twofish.h
---- snort-2.9.2.2/src/twofish.h	1969-12-31 16:00:00.000000000 -0800
-+++ snort-2.9.2.2_bkup/src/twofish.h	2012-04-08 20:34:57.389687124 -0700
-@@ -0,0 +1,276 @@
-+/* $Id: twofish.h,v 2.1 2008/12/15 20:36:05 fknobbe Exp $
-+ *
-+ *
-+ * Copyright (C) 1997-2000 The Cryptix Foundation Limited.
-+ * Copyright (C) 2000 Farm9.
-+ * Copyright (C) 2001 Frank Knobbe.
-+ * All rights reserved.
-+ *
-+ * For Cryptix code:
-+ * Use, modification, copying and distribution of this software is subject
-+ * the terms and conditions of the Cryptix General Licence. You should have
-+ * received a copy of the Cryptix General Licence along with this library;
-+ * if not, you can download a copy from http://www.cryptix.org/ .
-+ *
-+ * For Farm9:
-+ * ---  jojo@farm9.com, August 2000, converted from Java to C++, added CBC mode and
-+ *      ciphertext stealing technique, added AsciiTwofish class for easy encryption
-+ *      decryption of text strings
-+ *
-+ * Frank Knobbe <frank@knobbe.us>:
-+ * ---  April 2001, converted from C++ to C, prefixed global variables
-+ *      with TwoFish, substituted some defines, changed functions to make use of
-+ *      variables supplied in a struct, modified and added routines for modular calls.
-+ *      Cleaned up the code so that defines are used instead of fixed 16's and 32's.
-+ *      Created two general purpose crypt routines for one block and multiple block
-+ *      encryption using Joh's CBC code.
-+ *		Added crypt routines that use a header (with a magic and data length).
-+ *		(Basically a major rewrite).
-+ *
-+ *      Note: Routines labeled _TwoFish are private and should not be used
-+ *      (or with extreme caution).
-+ *
-+ */
-+
-+#ifndef __TWOFISH_LIBRARY_HEADER__
-+#define __TWOFISH_LIBRARY_HEADER__
-+
-+#ifndef FALSE
-+#define FALSE	0
-+#endif
-+#ifndef TRUE
-+#define TRUE	!FALSE
-+#endif
-+#ifndef bool
-+#define bool	int
-+#endif
-+
-+
-+/* Constants */
-+
-+#define TwoFish_DEFAULT_PW		"SnortHas2FishEncryptionRoutines!" /* default password (not more than 32 chars) */
-+#define TwoFish_MAGIC			"TwoFish"			/* to indentify a successful decryption */
-+
-+enum
-+{	TwoFish_KEY_SIZE = 256,					/* Valid values: 64, 128, 192, 256 */
-+											/* User 256, other key sizes have not been tested. */
-+											/* (But should work. I substituted as much as */
-+											/* I could with this define.) */
-+	TwoFish_ROUNDS = 16,
-+	TwoFish_BLOCK_SIZE = 16,				/* bytes in a data-block */
-+	TwoFish_KEY_LENGTH = TwoFish_KEY_SIZE/8,	/* 32= 256-bit key */
-+	TwoFish_TOTAL_SUBKEYS = 4+4+2*TwoFish_ROUNDS,
-+	TwoFish_MAGIC_LEN = TwoFish_BLOCK_SIZE-8,
-+	TwoFish_SK_BUMP = 0x01010101,
-+	TwoFish_SK_ROTL = 9,
-+	TwoFish_P_00 = 1,
-+	TwoFish_P_01 = 0,
-+	TwoFish_P_02 = 0,
-+	TwoFish_P_03 = TwoFish_P_01 ^ 1,
-+	TwoFish_P_04 = 1,
-+	TwoFish_P_10 = 0,
-+	TwoFish_P_11 = 0,
-+	TwoFish_P_12 = 1,
-+	TwoFish_P_13 = TwoFish_P_11 ^ 1,
-+	TwoFish_P_14 = 0,
-+	TwoFish_P_20 = 1,
-+	TwoFish_P_21 = 1,
-+	TwoFish_P_22 = 0,
-+	TwoFish_P_23 = TwoFish_P_21 ^ 1,
-+	TwoFish_P_24 = 0,
-+	TwoFish_P_30 = 0,
-+	TwoFish_P_31 = 1,
-+	TwoFish_P_32 = 1,
-+	TwoFish_P_33 = TwoFish_P_31 ^ 1,
-+	TwoFish_P_34 = 1,
-+	TwoFish_GF256_FDBK =   0x169,
-+	TwoFish_GF256_FDBK_2 = 0x169 / 2,
-+	TwoFish_GF256_FDBK_4 = 0x169 / 4,
-+	TwoFish_RS_GF_FDBK = 0x14D,		/* field generator */
-+	TwoFish_MDS_GF_FDBK = 0x169		/* primitive polynomial for GF(256) */
-+};
-+
-+
-+/* Global data structure for callers */
-+
-+typedef struct
-+{	u_int32_t sBox[4 * 256];					/* Key dependent S-box */
-+	u_int32_t subKeys[TwoFish_TOTAL_SUBKEYS];	/* Subkeys  */
-+	u_int8_t key[TwoFish_KEY_LENGTH];			/* Encryption Key */
-+	u_int8_t *output;							/* Pointer to output buffer */
-+	u_int8_t qBlockPlain[TwoFish_BLOCK_SIZE];	/* Used by CBC */
-+	u_int8_t qBlockCrypt[TwoFish_BLOCK_SIZE];
-+	u_int8_t prevCipher[TwoFish_BLOCK_SIZE];
-+	struct 				/* Header for crypt functions. Has to be at least one block long. */
-+	{	u_int32_t salt;							/* Random salt in first block (will salt the rest through CBC) */
-+		u_int8_t length[4];					/* The amount of data following the header */
-+		u_int8_t magic[TwoFish_MAGIC_LEN];		/* Magic to identify successful decryption  */
-+	}	header;
-+	bool qBlockDefined;
-+	bool dontflush;
-+}	TWOFISH;
-+
-+#ifndef __TWOFISH_LIBRARY_SOURCE__
-+
-+extern bool TwoFish_srand;					/* if set to TRUE (default), first call of TwoFishInit will seed rand();  */
-+											/* call of TwoFishInit */
-+#endif
-+
-+
-+/**** Public Functions ****/
-+
-+/*	TwoFish Initialization
-+ *
-+ *	This routine generates a global data structure for use with TwoFish,
-+ *	initializes important values (such as subkeys, sBoxes), generates subkeys
-+ *	and precomputes the MDS matrix if not already done.
-+ *
-+ *	Input:	User supplied password (will be appended by default password of 'SnortHas2FishEncryptionRoutines!')
-+ *
-+ *  Output:	Pointer to TWOFISH structure. This data structure contains key dependent data.
-+ *			This pointer is used with all other crypt functions.
-+ */
-+TWOFISH *TwoFishInit(char *userkey);
-+
-+
-+/*	TwoFish Destroy
-+ *
-+ *	Nothing else but a free...
-+ *
-+ *	Input:	Pointer to the TwoFish structure.
-+ *
-+ */
-+void TwoFishDestroy(TWOFISH *tfdata);
-+
-+
-+/*	TwoFish Alloc
-+ *
-+ *	Allocates enough memory for the output buffer as required.
-+ *
-+ *	Input:	Length of the plaintext.
-+ *			Boolean flag for BinHex Output.
-+ *			Pointer to the TwoFish structure.
-+ *
-+ *	Output:	Returns a pointer to the memory allocated.
-+ */
-+void *TwoFishAlloc(unsigned long len,bool binhex,bool decrypt,TWOFISH *tfdata);
-+
-+
-+/*	TwoFish Free
-+ *
-+ *	Free's the allocated buffer.
-+ *
-+ *	Input:	Pointer to the TwoFish structure
-+ *
-+ *	Output:	(none)
-+ */
-+void TwoFishFree(TWOFISH *tfdata);
-+
-+
-+/*	TwoFish Set Output
-+ *
-+ *	If you want to allocate the output buffer yourself,
-+ *	then you can set it with this function.
-+ *
-+ *	Input:	Pointer to your output buffer
-+ *			Pointer to the TwoFish structure
-+ *
-+ *	Output:	(none)
-+ */
-+void TwoFishSetOutput(char *outp,TWOFISH *tfdata);
-+
-+
-+/*	TwoFish Raw Encryption
-+ *
-+ *	Does not use header, but does use CBC (if more than one block has to be encrypted).
-+ *
-+ *	Input:	Pointer to the buffer of the plaintext to be encrypted.
-+ *			Pointer to the buffer receiving the ciphertext.
-+ *			The length of the plaintext buffer.
-+ *			The TwoFish structure.
-+ *
-+ *	Output:	The amount of bytes encrypted if successful, otherwise 0.
-+ */
-+unsigned long TwoFishEncryptRaw(char *in,char *out,unsigned long len,TWOFISH *tfdata);
-+
-+/*	TwoFish Raw Decryption
-+ *
-+ *	Does not use header, but does use CBC (if more than one block has to be decrypted).
-+ *
-+ *	Input:	Pointer to the buffer of the ciphertext to be decrypted.
-+ *			Pointer to the buffer receiving the plaintext.
-+ *			The length of the ciphertext buffer (at least one cipher block).
-+ *			The TwoFish structure.
-+ *
-+ *	Output:	The amount of bytes decrypted if successful, otherwise 0.
-+ */
-+unsigned long TwoFishDecryptRaw(char *in,char *out,unsigned long len,TWOFISH *tfdata);
-+
-+
-+/*	TwoFish Encryption
-+ *
-+ *	Uses header and CBC. If the output area has not been intialized with TwoFishAlloc,
-+ *  this routine will alloc the memory. In addition, it will include a small 'header'
-+ *  containing the magic and some salt. That way the decrypt routine can check if the
-+ *  packet got decrypted successfully, and return 0 instead of garbage.
-+ *
-+ *	Input:	Pointer to the buffer of the plaintext to be encrypted.
-+ *			Pointer to the pointer to the buffer receiving the ciphertext.
-+ *				The pointer either points to user allocated output buffer space, or to NULL, in which case
-+ *				this routine will set the pointer to the buffer allocated through the struct.
-+ *			The length of the plaintext buffer.
-+ *				Can be -1 if the input is a null terminated string, in which case we'll count for you.
-+ *			Boolean flag for BinHex Output (if used, output will be twice as large as input).
-+ *				Note: BinHex conversion overwrites (converts) input buffer!
-+ *			The TwoFish structure.
-+ *
-+ *	Output:	The amount of bytes encrypted if successful, otherwise 0.
-+ */
-+unsigned long TwoFishEncrypt(char *in,char **out,signed long len,bool binhex,TWOFISH *tfdata);
-+
-+
-+/*	TwoFish Decryption
-+ *
-+ *	Uses header and CBC. If the output area has not been intialized with TwoFishAlloc,
-+ *  this routine will alloc the memory. In addition, it will check the small 'header'
-+ *  containing the magic. If magic does not match we return 0. Otherwise we return the
-+ *  amount of bytes decrypted (should be the same as the length in the header).
-+ *
-+ *	Input:	Pointer to the buffer of the ciphertext to be decrypted.
-+ *			Pointer to the pointer to the buffer receiving the plaintext.
-+ *				The pointer either points to user allocated output buffer space, or to NULL, in which case
-+ *				this routine will set the pointer to the buffer allocated through the struct.
-+ *			The length of the ciphertext buffer.
-+ *				Can be -1 if the input is a null terminated binhex string, in which case we'll count for you.
-+ *			Boolean flag for BinHex Input (if used, plaintext will be half as large as input).
-+ *				Note: BinHex conversion overwrites (converts) input buffer!
-+ *			The TwoFish structure.
-+ *
-+ *	Output:	The amount of bytes decrypted if successful, otherwise 0.
-+ */
-+unsigned long TwoFishDecrypt(char *in,char **out,signed long len,bool binhex,TWOFISH *tfdata);
-+
-+
-+/**** Private Functions ****/
-+
-+u_int8_t TwoFish__b(u_int32_t x,int n);
-+void _TwoFish_BinHex(u_int8_t *buf,unsigned long len,bool bintohex);
-+unsigned long _TwoFish_CryptRawCBC(char *in,char *out,unsigned long len,bool decrypt,TWOFISH *tfdata);
-+unsigned long _TwoFish_CryptRaw16(char *in,char *out,unsigned long len,bool decrypt,TWOFISH *tfdata);
-+unsigned long _TwoFish_CryptRaw(char *in,char *out,unsigned long len,bool decrypt,TWOFISH *tfdata);
-+void _TwoFish_PrecomputeMDSmatrix(void);
-+void _TwoFish_MakeSubKeys(TWOFISH *tfdata);
-+void _TwoFish_qBlockPush(u_int8_t *p,u_int8_t *c,TWOFISH *tfdata);
-+void _TwoFish_qBlockPop(u_int8_t *p,u_int8_t *c,TWOFISH *tfdata);
-+void _TwoFish_ResetCBC(TWOFISH *tfdata);
-+void _TwoFish_FlushOutput(u_int8_t *b,unsigned long len,TWOFISH *tfdata);
-+void _TwoFish_BlockCrypt(u_int8_t *in,u_int8_t *out,unsigned long size,int decrypt,TWOFISH *tfdata);
-+void _TwoFish_BlockCrypt16(u_int8_t *in,u_int8_t *out,bool decrypt,TWOFISH *tfdata);
-+u_int32_t _TwoFish_RS_MDS_Encode(u_int32_t k0,u_int32_t k1);
-+u_int32_t _TwoFish_F32(u_int32_t k64Cnt,u_int32_t x,u_int32_t *k32);
-+u_int32_t _TwoFish_Fe320(u_int32_t *lsBox,u_int32_t x);
-+u_int32_t _TwoFish_Fe323(u_int32_t *lsBox,u_int32_t x);
-+u_int32_t _TwoFish_Fe32(u_int32_t *lsBox,u_int32_t x,u_int32_t R);
-+
-+
-+#endif
 

file:a/net/sshfs/Makefile (deleted)
--- a/net/sshfs/Makefile
+++ /dev/null
@@ -1,60 +1,1 @@
-#
-# 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:=sshfs
-PKG_VERSION:=2.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-fuse-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/fuse
-PKG_MD5SUM:=26e9206eb5169e87e6f95f54bc005a4f
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-fuse-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/sshfs
-  TITLE:=SSHFS
-  DEPENDS:=+libfuse +fuse-utils +glib2 +libpthread
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Filesystem
-  URL:=http://fuse.sourceforge.net/
-endef
-
-define Package/sshfs/description
-	Mount remote system over sftp.
-endef
-
-CONFIGURE_VARS += \
-	SSHFS_CFLAGS=" \
-		-D_FILE_OFFSET_BITS=64 \
-		-I$(STAGING_DIR)/usr/include/glib-2.0 \
-		-I$(STAGING_DIR)/usr/lib/glib-2.0/include \
-		-I$(STAGING_DIR)/usr/include/fuse" \
-	SSHFS_LIBS=" \
-		-lglib-2.0 -liconv $(if $(INTL_FULL),-lintl) -lfuse -pthread -lgthread-2.0 \
-		-L$(STAGING_DIR)/usr/lib"
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
-define Package/sshfs/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sshfs $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,sshfs))
-

--- a/net/vpnc-scripts/Makefile
+++ /dev/null
@@ -1,57 +1,1 @@
-#
-# 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:=vpnc-scripts
-PKG_VERSION:=20120423
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/vpnc-scripts/
-PKG_MD5SUM:=3265dc7fe57ae9b4c905961a28699c4c
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/vpnc-scripts
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+ip
-  TITLE:=VPN configuration script for vpnc and OpenConnect
-  URL:=http://www.infradead.org/openconnect/vpnc-script.html
-  SUBMENU:=VPN
-endef
-
-define Package/vpnc/vpnc-scripts
-	This package contains the vpnc-script which is used by vpnc
-	and OpenConnect to configure the tunnel interface.
-endef
-
-define Package/vpnc-scripts/conffiles
-/etc/vpnc/connect.d/
-/etc/vpnc/post-connect.d/
-/etc/vpnc/disconnect.d/
-/etc/vpnc/post-connect.d/
-/etc/vpnc/reconnect.d/
-endef
-
-define Build/Compile
-endef
-
-define Package/vpnc-scripts/install
-	$(INSTALL_DIR) $(1)/etc/vpnc
-	$(INSTALL_DIR) $(1)/etc/vpnc/connect.d
-	$(INSTALL_DIR) $(1)/etc/vpnc/post-connect.d
-	$(INSTALL_DIR) $(1)/etc/vpnc/disconnect.d
-	$(INSTALL_DIR) $(1)/etc/vpnc/post-disconnect.d
-	$(INSTALL_DIR) $(1)/etc/vpnc/reconnect.d
-	$(INSTALL_BIN) ./files/etc/vpnc/connect.d/ifstate $(1)/etc/vpnc/connect.d/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/vpnc-script $(1)/etc/vpnc/
-endef
-
-$(eval $(call BuildPackage,vpnc-scripts))
-

--- a/net/vpnc-scripts/files/etc/vpnc/connect.d/ifstate
+++ /dev/null
@@ -1,8 +1,1 @@
-if [ -r /etc/openwrt_release ] && [ -n "$OPENWRT_INTERFACE" ]; then
-    uci_set_state network "$OPENWRT_INTERFACE" banner "$CISCO_BANNER"
-    uci_set_state network "$OPENWRT_INTERFACE" ifname "$TUNDEV"
-    [ -n "$INTERNAL_IP4_ADDRESS" ] && uci_set_state network "$OPENWRT_INTERFACE" ipaddr "$INTERNAL_IP4_ADDRESS"
-    [ -n "$INTERNAL_IP6_NETMASK" ] && uci_set_state network "$OPENWRT_INTERFACE" ip6addr "$INTERNAL_IP6_NETMASK"
-    env -i ACTION="ifup" INTERFACE="$OPENWRT_INTERFACE" DEVICE="$TUNDEV" PROTO=openconnect /sbin/hotplug-call "iface"
-fi
 

file:a/net/vpnc/Makefile (deleted)
--- a/net/vpnc/Makefile
+++ /dev/null
@@ -1,62 +1,1 @@
-#
-# 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:=vpnc
-PKG_VERSION:=0.5.3
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.unix-ag.uni-kl.de/~massar/vpnc/
-PKG_MD5SUM:=4378f9551d5b077e1770bbe09995afb3
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/vpnc
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libgpg-error +libgcrypt +kmod-tun +vpnc-scripts
-  TITLE:=VPN client for Cisco EasyVPN
-  URL:=http://www.unix-ag.uni-kl.de/~massar/vpnc/
-  SUBMENU:=VPN
-endef
-
-define Package/vpnc/description
-	A VPN client compatible with Cisco's EasyVPN equipment.
-
-	Supports IPSec (ESP) with Mode Configuration and Xauth.  Supports only
-	shared-secret IPSec authentication with Xauth, AES (256, 192, 128),
-	3DES, 1DES, MD5, SHA1, DH1/2/5 and IP tunneling.
-endef
-
-define Package/vpnc/conffiles
-/etc/vpnc/default.conf
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default, \
-		OFLAGS="$(TARGET_CFLAGS)" \
-		OS="Linux" \
-		STAGING_DIR="$(STAGING_DIR)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		PREFIX=/usr \
-		all install \
-	)
-endef
-
-define Package/vpnc/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP)	$(PKG_INSTALL_DIR)/usr/sbin/vpnc \
-		$(PKG_INSTALL_DIR)/usr/sbin/vpnc-disconnect \
-		$(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/vpnc
-	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/vpnc/default.conf $(1)/etc/vpnc/
-endef
-
-$(eval $(call BuildPackage,vpnc))
-

--- a/net/vpnc/patches/001-cross.patch
+++ /dev/null
@@ -1,30 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -20,7 +20,7 @@
- # $Id: Makefile 312 2008-06-15 18:09:42Z Joerg Mayer $
- 
- DESTDIR=
--PREFIX=/usr/local
-+PREFIX=/usr
- ETCDIR=/etc/vpnc
- BINDIR=$(PREFIX)/bin
- SBINDIR=$(PREFIX)/sbin
-@@ -51,14 +51,11 @@ RELEASE_VERSION := $(shell cat VERSION)
- #OPENSSLLIBS = -lcrypto
- 
- CC=gcc
--CFLAGS ?= -O3 -g
--CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
--CFLAGS +=  $(shell libgcrypt-config --cflags)
-+CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) '-DVERSION="$(shell cat VERSION)"'
- CPPFLAGS += -DVERSION=\"$(VERSION)\" $(OPENSSL_GPL_VIOLATION)
--LDFLAGS ?= -g
--LDFLAGS += $(shell libgcrypt-config --libs) $(OPENSSLLIBS)
-+LDFLAGS = -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error
- 
--ifeq ($(shell uname -s), SunOS)
-+ifeq ($(OS), SunOS)
- LDFLAGS += -lnsl -lresolv -lsocket
- endif
- ifneq (,$(findstring Apple,$(shell $(CC) --version)))
 

--- a/net/vpnc/patches/002-vpn_script.patch
+++ /dev/null
@@ -1,42 +1,1 @@
---- a/vpnc-script.in
-+++ b/vpnc-script.in
-@@ -97,7 +97,7 @@ do_ifconfig() {
- 	fi
- 
- 	# Point to point interface require a netmask of 255.255.255.255 on some systems
--	ifconfig "$TUNDEV" inet "$INTERNAL_IP4_ADDRESS" $ifconfig_syntax_ptp "$INTERNAL_IP4_ADDRESS" netmask 255.255.255.255 mtu ${MTU} up
-+	ifconfig "$TUNDEV" "$INTERNAL_IP4_ADDRESS" $ifconfig_syntax_ptp "$INTERNAL_IP4_ADDRESS" netmask 255.255.255.255 mtu ${MTU} up
- 
- 	if [ -n "$INTERNAL_IP4_NETMASK" ]; then
- 		set_network_route $INTERNAL_IP4_NETADDR $INTERNAL_IP4_NETMASK $INTERNAL_IP4_NETMASKLEN
-@@ -503,6 +503,18 @@ do_disconnect() {
- 	destroy_tun_device
- }
- 
-+start_vpn_nat() {
-+	iptables -A forwarding_rule -o $TUNDEV -j ACCEPT
-+	iptables -A forwarding_rule -i $TUNDEV -j ACCEPT
-+	iptables -t nat -A postrouting_rule -o $TUNDEV -j MASQUERADE
-+}
-+
-+stop_vpn_nat() {
-+	iptables -t nat -D postrouting_rule -o $TUNDEV -j MASQUERADE
-+	iptables -D forwarding_rule -i $TUNDEV -j ACCEPT
-+	iptables -D forwarding_rule -o $TUNDEV -j ACCEPT
-+}
-+
- #### Main
- 
- if [ -z "$reason" ]; then
-@@ -516,8 +528,10 @@ case "$reason" in
- 		;;
- 	connect)
- 		do_connect
-+		start_vpn_nat
- 		;;
- 	disconnect)
-+		stop_vpn_nat
- 		do_disconnect
- 		;;
- 	*)
 

--- a/net/vpnc/patches/003-no_makeman.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/Makefile
-+++ b/Makefile
-@@ -69,7 +69,7 @@ vpnc : $(OBJS) vpnc.o
- 	$(CC) -o $@ $^ $(LDFLAGS)
- 
- vpnc.8 : vpnc.8.template makeman.pl vpnc
--	./makeman.pl
-+	touch vpnc.8
- 
- vpnc-script : vpnc-script.in
- 	sed -e 's,@''PREFIX''@,$(PREFIX),g' $< > $@ && chmod 755 $@
 

file:a/sound/madplay/Makefile (deleted)
--- a/sound/madplay/Makefile
+++ /dev/null
@@ -1,61 +1,1 @@
-#
-# 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:=madplay
-PKG_VERSION:=0.15.2b
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/mad \
-	ftp://ftp.mars.org/pub/mpeg/
-PKG_MD5SUM:=6814b47ceaa99880c754c5195aa1aac1
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/madplay
-  SECTION:=sound
-  CATEGORY:=Sound
-  DEPENDS:=+libid3tag +libmad
-  TITLE:=MPEG audio player in fixed point
-  URL:=http://sourceforge.net/projects/mad
-endef
-
-define Package/madplay/description
-	MAD is an MPEG audio decoder. It currently only supports the MPEG 1
-	standard, but fully implements all three audio layers (Layer I, Layer II,
-	and Layer III, the latter often colloquially known as MP3.). There is also
-	full support for ID3 tags.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--disable-static \
-		--disable-debugging \
-		--disable-profiling \
-		--disable-experimental \
-		--without-libiconv-prefix \
-		--without-libintl-prefix \
-		--without-alsa \
-		--without-esd \
-		, \
-		LIBS="-lz" \
-	)
-endef
-
-define Package/madplay/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/madplay $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,madplay))
-

--- a/utils/btrfs-progs/Makefile
+++ /dev/null
@@ -1,56 +1,1 @@
-#
-# Copyright (C) 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:=btrfs-progs
-PKG_VERSION:=0.19
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/
-PKG_MD5SUM:=69e29ecd922e3f9dcb74a3a8f80b4f68
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/btrfs-progs
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Filesystem
-  DEPENDS:=+libuuid +zlib
-  TITLE:=Btrfs filesystems utilities
-  URL:=http://btrfs.wiki.kernel.org/
-endef
-
-define Package/btrfs-progs/description
- Btrfs is a new copy on write filesystem for Linux aimed at implementing
- advanced features while focusing on fault tolerance, repair and easy
- administration. Initially developed by Oracle, Btrfs is licensed under the
- GPL and open for contribution from anyone.
-endef
-
-progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck
-
-MAKE_FLAGS+=\
-	CC="$(TARGET_CC)" \
-	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	prefix=/usr \
-	DESTDIR=$(PKG_INSTALL_DIR)
-
-define Package/btrfs-progs/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(addprefix $(PKG_INSTALL_DIR)/usr/bin/, $(progs)) $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/btrfs-scan.init $(1)/etc/init.d/btrfs-scan
-endef
-
-$(eval $(call BuildPackage,btrfs-progs))
-

--- a/utils/btrfs-progs/files/btrfs-scan.init
+++ /dev/null
@@ -1,10 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2009 OpenWrt.org
 
-START=19
-
-start() {
-	grep -q btrfs /proc/modules && /usr/bin/btrfsctl -a
-}
-
-

--- a/utils/btrfs-progs/patches/001-Makefile-gcc-fix
+++ /dev/null
@@ -1,54 +1,1 @@
-diff --git a/Makefile b/Makefile
-index 8097b5a..63a734b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,37 +36,37 @@ version:
- 	bash version.sh
- 
- btrfsctl: $(objects) btrfsctl.o
--	gcc $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS)
- 
- btrfs-vol: $(objects) btrfs-vol.o
--	gcc $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS)
- 
- btrfs-show: $(objects) btrfs-show.o
--	gcc $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS)
- 
- btrfsck: $(objects) btrfsck.o
--	gcc $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS)
- 
- mkfs.btrfs: $(objects) mkfs.o
--	gcc $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS)
- 
- btrfs-debug-tree: $(objects) debug-tree.o
--	gcc $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS)
- 
- btrfstune: $(objects) btrfstune.o
--	gcc $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS)
- 
- btrfs-image: $(objects) btrfs-image.o
--	gcc $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS)
- 
- dir-test: $(objects) dir-test.o
--	gcc $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS)
- 
- quick-test: $(objects) quick-test.o
--	gcc $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS)
- 
- convert: $(objects) convert.o
--	gcc $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs $(LDFLAGS) $(LIBS)
- 
- manpages:
- 	cd man; make
 

--- a/utils/macchanger/Makefile
+++ /dev/null
@@ -1,42 +1,1 @@
-#
-# 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:=macchanger
-PKG_VERSION:=1.5.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/macchanger
-PKG_MD5SUM:=79b7cdaeca3d8ebafa764c4b0dd03ab7
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/macchanger
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=utility for viewing/manipulating the MAC address
-  URL:=http://www.alobbs.com/macchanger
-endef
-
-define Package/macchanger/description
-	This is a GNU/Linux utility for viewing/manipulating the MAC address
-	of network interfaces.
-endef
-
-define Package/macchanger/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/macchanger $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/macchanger $(1)/usr/share/
-endef
-
-$(eval $(call BuildPackage,macchanger))
-

file:a/utils/vim/Makefile (deleted)
--- a/utils/vim/Makefile
+++ /dev/null
@@ -1,193 +1,1 @@
-#
-# 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:=vim
-PKG_VERSION:=7.3
-PKG_RELEASE:=1
-VIMVER:=73
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.vim.org/pub/vim/unix/
-PKG_MD5SUM:=5b9510a17074e2b37d8bb38ae09edbf2
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(VIMVER)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/vim/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libncurses
-  TITLE:=Vi IMproved - enhanced vi editor
-  URL:=http://www.vim.org/
-  SUBMENU:=Editors
-endef
-
-define Package/vim
-  $(call Package/vim/Default)
-  TITLE+= (Tiny)
-endef
-
-define Package/vim-full
-  $(call Package/vim/Default)
-  TITLE+= (Normal)
-endef
-
-define Package/vim-runtime
-  $(call Package/vim/Default)
-  TITLE+= (runtime files)
-endef
-
-define Package/vim-help
-  $(call Package/vim/Default)
-  TITLE+= (help files)
-endef
-
-define Package/xxd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=make a hexdump or do the reverse
-  URL:=http://www.vim.org/
-endef
-
-define Package/vim-full/conffiles
-/usr/share/vim/vimrc
-endef
-
-define Package/vim/conffiles
-/usr/share/vim/vimrc
-endef
-
-define Package/vim/description
- Vim is an almost compatible version of the UNIX editor Vi.
- (Tiny build)
-endef
-
-define Package/vim-full/description
- Vim is an almost compatible version of the UNIX editor Vi.
- (Normal build)
-endef
-
-define Package/vim-runtime/description
- Vim is an almost compatible version of the UNIX editor Vi.
- (Runtime files)
-endef
-
-define Package/vim-help/description
- Vim is an almost compatible version of the UNIX editor Vi.
- (Help files)
-endef
-
-define Package/xxd/description
- xxd creates a hex dump of a given file or standard input, it can also convert
- a hex dump back to its original binary form.
-endef
-
-CONFIGURE_ARGS += \
-	--disable-gui \
-	--disable-gtktest \
-	--disable-xim \
-	--without-x \
-	--disable-netbeans \
-	--disable-cscope \
-	--disable-gpm \
-	--with-tlib=ncurses
-
-CONFIGURE_VARS += \
-	vim_cv_getcwd_broken=no \
-	vim_cv_memmove_handles_overlap=yes \
-	vim_cv_stat_ignores_slash=yes \
-	vim_cv_tgetent=zero \
-	vim_cv_terminfo=yes \
-	vim_cv_toupper_broken=no \
-	vim_cv_tty_group=root \
-	vim_cv_tty_mode=0620
-
-ifneq ($(CONFIG_PACKAGE_vim),)
-define Build/Compile/vim
-	$(call Build/Configure/Default, \
-		--with-features=tiny \
-		--disable-multibyte \
-	)
-	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" all
-	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_tiny
-endef
-endif
-
-ifneq ($(CONFIG_PACKAGE_vim-full),)
-define Build/Compile/vim-full
-	$(call Build/Configure/Default, \
-		--with-features=normal \
-		--enable-multibyte \
-	)
-	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" all
-	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_normal
-endef
-endif
-
-ifneq ($(CONFIG_PACKAGE_xxd),)
-define Build/Compile/xxd
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" all
-endef
-endif
-
-define Build/Compile/vim-runtime
-	$(MAKE) -C $(PKG_BUILD_DIR)/src DESTDIR="$(PKG_INSTALL_DIR)" installrtbase
-	(cd $(PKG_INSTALL_DIR) && tar -cf $(PKG_BUILD_DIR)/docs.tar ./usr/share/vim/vim$(VIMVER)/doc)
-	rm -rf $(PKG_INSTALL_DIR)/usr/share/vim/vim$(VIMVER)/doc
-	rm -rf $(PKG_INSTALL_DIR)/usr/man
-endef
-
-define Build/Compile
-$(call Build/Compile/vim)
-$(call Build/Compile/vim-full)
-$(call Build/Compile/vim-runtime)
-$(call Build/Compile/xxd)
-endef
-
-define Package/vim/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/vim_tiny $(1)/usr/bin/vim
-	$(INSTALL_DIR) $(1)/usr/share/vim
-	$(INSTALL_CONF) ./files/vimrc $(1)/usr/share/vim/
-endef
-
-define Package/vim-full/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/vim_normal $(1)/usr/bin/vim
-	$(INSTALL_DIR) $(1)/usr/share/vim
-	$(INSTALL_CONF) ./files/vimrc.full $(1)/usr/share/vim/vimrc
-endef
-
-define Package/vim-runtime/install
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)
-	rm -rf $(1)/usr/share/vim/vim$(VIMVER)/doc
-endef
-
-define Package/vim-help/install
-	tar -C $(1) -xf $(PKG_BUILD_DIR)/docs.tar
-endef
-
-define Package/xxd/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/xxd/xxd $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,vim))
-$(eval $(call BuildPackage,vim-full))
-$(eval $(call BuildPackage,vim-runtime))
-$(eval $(call BuildPackage,vim-help))
-$(eval $(call BuildPackage,xxd))
-

file:a/utils/vim/files/vimrc (deleted)
--- a/utils/vim/files/vimrc
+++ /dev/null
@@ -1,13 +1,1 @@
-set showcmd		" show (partial) command in status line
-set showmatch		" show matching brackets
-set ignorecase		" do case insensitive matching
-set incsearch		" incremental search
-set autowrite		" automatically save before commands like :next and :make
-set nocompatible	" use vim defaults instead of 100% vi compatibility
-set backspace=indent,eol,start	" more powerful backspacing
-set autoindent		" always set autoindenting on
-set linebreak		" don't wrap words by default
-set textwidth=0		" don't wrap lines by default
-set ruler		" show the cursor position all the time
 
-

--- a/utils/vim/files/vimrc.full
+++ /dev/null
@@ -1,25 +1,1 @@
-set showcmd			" show (partial) command in status line
-set showmatch			" show matching brackets
-set ignorecase			" do case insensitive matching
-set incsearch			" incremental search
-set autowrite			" automatically save before commands like :next and :make
-set nocompatible		" use Vim defaults instead of 100% vi compatibility
-set backspace=indent,eol,start	" more powerful backspacing
-set autoindent			" always set autoindenting on
-set linebreak			" don't wrap words by default
-set textwidth=0			" don't wrap lines by default
-set ruler			" show the cursor position all the time
-if filereadable(expand("$VIMRUNTIME/syntax/synload.vim"))
-	syntax on
-endif
-if has("syntax") && &term =~ "xterm"
-	set t_Co=8
-	if has("terminfo")
-		set t_Sf=<Esc>[3%p1%dm
-		set t_Sb=<Esc>[4%p1%dm
-	else
-		set t_Sf=<Esc>[3%dm
-		set t_Sb=<Esc>[4%dm
-	endif
-endif
 

--- a/utils/vim/patches/001-cross_compile.patch
+++ /dev/null
@@ -1,39 +1,1 @@
---- a/src/auto/configure
-+++ b/src/auto/configure
-@@ -11641,34 +11641,8 @@ _ACEOF
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
- $as_echo_n "checking uint32_t is 32 bits... " >&6; }
--if test "$cross_compiling" = yes; then :
--  as_fn_error "could not compile program using uint32_t." "$LINENO" 5
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--#ifdef HAVE_STDINT_H
--# include <stdint.h>
--#endif
--#ifdef HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--main() {
--  uint32_t nr1 = (uint32_t)-1;
--  uint32_t nr2 = (uint32_t)0xffffffffUL;
--  if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1);
--  exit(0);
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming ok" >&5
- $as_echo "ok" >&6; }
--else
--  as_fn_error "WRONG!  uint32_t not defined correctly." "$LINENO" 5
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
- 
- 
 

comments