--- snort-2.3.3.orig/configure.in
+++ snort-2.3.3/configure.in
@@ -2,6 +2,10 @@
 AC_PREREQ(2.50)
 AC_INIT(src/snort.c)
 AM_CONFIG_HEADER(config.h)
+
+# Added to change the output of aclocal and automake.
+AM_MAINTAINER_MODE
+
 # When changing the snort version, please also update the VERSION
 # definition in "src/win32/WIN32-Includes/config.h"
 AM_INIT_AUTOMAKE(snort,2.3.3)
@@ -288,7 +292,7 @@
   echo "   http://www.tcpdump.org"
   echo "   or use the --with-libpcap-* options, if you have it installed"
   echo "   in unusual place"
-  exit
+  exit 1
 fi
 
 default_directory="/usr /usr/local"
@@ -304,7 +308,7 @@
    done
    echo "**********************************************"
    echo
-   exit
+   exit 1
 ])
 
 AC_ARG_WITH(libpcre_includes,
@@ -335,7 +339,7 @@
   echo
   echo "   ERROR!  Libpcre header not found, go get it from"
   echo "   http://www.pcre.org"
-  exit
+  exit 1
 fi
 
 # Verify that we have the library
@@ -346,7 +350,7 @@
     echo "    ERROR!  Libpcre library not found, go get it from"
     echo "    http://www.pcre.org"
     echo
-    exit
+    exit 1
 fi
 
 AC_ARG_WITH(libnet_includes,
@@ -511,6 +515,11 @@
     [ with_postgresql="$withval" ],
     [ with_postgresql=no ])
 
+AC_ARG_WITH(pgsql_includes,
+    [  --with-pgsql-includes=DIR  postgresql include directory],
+    [with_pgsql_includes="$withval" ],
+    [with_pgsql_includes=no ])
+
 if test "$with_postgresql" != "no"; then
   if test "$with_postgresql" = "yes"; then
     postgresql_directory="$default_directory /usr/local/pgsql /usr/pgsql /usr/local"
@@ -525,54 +534,76 @@
 
   AC_MSG_CHECKING(for postgresql)
 
-  for i in $postgresql_directory; do
-    if test -r $i/include/pgsql/libpq-fe.h; then
-      POSTGRESQL_DIR=$i
-      POSTGRESQL_INC_DIR=$i/include/pgsql
-    elif test -r $i/include/libpq-fe.h; then
-      POSTGRESQL_DIR=$i
-      POSTGRESQL_INC_DIR=$i/include
-    elif test -r $i/include/postgresql/libpq-fe.h; then
-      POSTGRESQL_DIR=$i
-      POSTGRESQL_INC_DIR=$i/include/postgresql
-    fi
-  done
+  if test "$with_pgsql_includes" != "no"; then
+    for i in $with_pgsql_includes $postgresql_directory; do
+      if test -r $i/libpq-fe.h; then
+        POSTGRESQL_INC_DIR=$i
+      elif test -r $i/include/pgsql/libpq-fe.h; then
+        POSTGRESQL_INC_DIR=$i/include/pgsql
+      elif test -r $i/include/libpq-fe.h; then
+        POSTGRESQL_INC_DIR=$i/include
+      elif test -r $i/include/postgresql/libpq-fe.h; then
+        POSTGRESQL_INC_DIR=$i/include/postgresql
+      fi
+    done
+  fi
 
-  if test -z "$POSTGRESQL_DIR"; then
+  if test -z "$POSTGRESQL_INC_DIR"; then
+    for i in $postgresql_directory; do
+      if test -r $i/include/pgsql/libpq-fe.h; then
+        POSTGRESQL_DIR=$i
+        POSTGRESQL_INC_DIR=$i/include/pgsql
+      elif test -r $i/include/libpq-fe.h; then
+        POSTGRESQL_DIR=$i
+        POSTGRESQL_INC_DIR=$i/include
+      elif test -r $i/include/postgresql/libpq-fe.h; then
+        POSTGRESQL_DIR=$i
+        POSTGRESQL_INC_DIR=$i/include/postgresql
+      fi
+    done
+  fi
+
+  if test -z "$POSTGRESQL_INC_DIR"; then
     if test "$postgresql_fail" != "no"; then
       tmp=""
-      for i in $postgesql_directory; do
+      if test "$with_pgsql_includes" != "no"; then
+        tmp="$tmp $with_pgsql_includes"
+      fi
+      for i in $postgresql_directory; do
         tmp="$tmp $i/include $i/include/pgsql"
       done
       FAIL_MESSAGE("postgresql header file (libpq-fe.h)", $tmp)
     else
       AC_MSG_RESULT(no)
     fi
-  else
+  fi
 
-    for i in lib lib/pgsql; do
-      str="$POSTGRESQL_DIR/$i/libpq.*"
-      for j in `echo $str`; do
-        if test -r $j; then
-          POSTGRESQL_LIB_DIR="$POSTGRESQL_DIR/$i"
-          break 2
-        fi
-      done
-    done
+  if test -z "$POSTGRESQL_DIR"; then
+    for dir in $postgresql_directory; do
+       for i in lib lib/pgsql; do
+         str="$dir/$i/libpq.*"
+         for j in `echo $str`; do
+           if test -r $j; then
+  	     POSTGRESQL_LIB_DIR="$dir/$i"
+             break 2
+           fi
+         done
+       done
+   done
+  fi
 
-    if test -z "$POSTGRESQL_LIB_DIR"; then
-      if test "$postgresql_fail" != "no"; then
-        FAIL_MESSAGE("postgresql library libpq",
-        "$POSTGRESQL_DIR/lib $POSTGRESQL_DIR/lib/pgsql")
-      else
-        AC_MSG_RESULT(no);
-      fi
-    else
-      AC_MSG_RESULT(yes)
-      LDFLAGS="${LDFLAGS} -L${POSTGRESQL_LIB_DIR}"
-      CPPFLAGS="${CPPFLAGS} -I${POSTGRESQL_INC_DIR} -DENABLE_POSTGRESQL"
-      LIBS="${LIBS} -lpq"
-    fi
+  if test -z "$POSTGRESQL_LIB_DIR"; then
+     if test "$postgresql_fail" != "no"; then
+       FAIL_MESSAGE("postgresql library libpq",
+       "$POSTGRESQL_DIR/lib $POSTGRESQL_DIR/lib/pgsql")
+     else
+       AC_MSG_RESULT(no);
+     fi
+  else
+     AC_MSG_RESULT(yes)
+     LDFLAGS="${LDFLAGS} -L${POSTGRESQL_LIB_DIR}"
+     CPPFLAGS="${CPPFLAGS} -I${POSTGRESQL_INC_DIR} -DENABLE_POSTGRESQL"
+     LIBS="${LIBS} -lpq"
   fi
 fi
 
@@ -681,7 +712,7 @@
                echo "   www.netfilter.org or use the --with-libipq-* options, "
                echo "   if you have it installed in unusual place"
                echo
-               exit
+               exit 1
            fi
         fi
 
@@ -737,7 +768,7 @@
     echo "   http://www.packetfactory.net/projects/libnet/"
     echo "   or use the --with-libnet-* options, if you have it installed"
     echo "   in unusual place"
-    exit
+    exit 1
   fi
 
   AC_MSG_CHECKING(for libnet version 1.0.2a)
@@ -781,7 +812,7 @@
     echo "   http://www.packetfactory.net/projects/libnet/"
     echo "   or use the --with-libnet-* options, if you have it installed"
     echo "   in unusual place"
-    exit
+    exit 1
   fi
 
 fi
--- snort-2.3.3.orig/aclocal.m4
+++ snort-2.3.3/aclocal.m4
@@ -1,7 +1,7 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,385 +11,32 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# 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, 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.
-
-AC_PREREQ([2.52])
-
-# serial 6
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  We must strip everything past the first ":",
-# and everything past the last "/".
-
-# _AM_DIRNAME(PATH)
-# -----------------
-# Like AS_DIRNAME, only do it during macro expansion
-AC_DEFUN([_AM_DIRNAME],
-       [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
-	      m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
-		    m4_if(regexp([$1], [^/.*]), -1,
-			  [.],
-			  patsubst([$1], [^\(/\).*], [\1])),
-		    patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
-	      patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
-])# _AM_DIRNAME
-
-
-# The stamp files are numbered to have different names.
-# We could number them on a directory basis, but that's additional
-# complications, let's have a unique counter.
-m4_define([_AM_STAMP_Count], [0])
-
-
-# _AM_STAMP(HEADER)
-# -----------------
-# The name of the stamp file for HEADER.
-AC_DEFUN([_AM_STAMP],
-[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
-AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
-                               [:.*])))/stamp-h[]_AM_STAMP_Count])
-
-
-# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
-# ------------------------------------------------------------
-# We used to try to get a real timestamp in stamp-h.  But the fear is that
-# that will cause unnecessary cvs conflicts.
-AC_DEFUN([_AM_CONFIG_HEADER],
-[# Add the stamp file to the list of files AC keeps track of,
-# along with our hook.
-AC_CONFIG_HEADERS([$1],
-                  [# update the timestamp
-echo 'timestamp for $1' >"_AM_STAMP([$1])"
-$2],
-                  [$3])
-])# _AM_CONFIG_HEADER
-
-
-# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
-# --------------------------------------------------------------
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
-])# AM_CONFIG_HEADER
-
-# Do all the work for Automake.                            -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-
-# 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, 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.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-AC_PREREQ([2.52])
-
-# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_][CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_][CC],
-                          defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_][CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_][CXX],
-                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# 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, 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
+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.6.3])])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright 2001, 2002  Free Software Foundation, Inc.
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
 
-# 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, or (at your option)
-# any later version.
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# 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.
-
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-#
-# Check to make sure that the build environment is sane.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
-
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# 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, 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.
-
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-#  -*- Autoconf -*-
-
-
-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
-
-# 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, 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.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# 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, 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 is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
@@ -429,98 +76,78 @@
 # absolute PATH.  The drawback is that using absolute paths prevent a
 # configured tree to be moved without reconfiguration.
 
-# Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_AUX_DIR_EXPAND], [
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 ])
 
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
 
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# 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, or (at your option)
-# any later version.
+# serial 4
 
-# 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 was merged into AC_PROG_CC in Autoconf.
 
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
+AU_DEFUN([AM_PROG_CC_STDC],
+[AC_PROG_CC
+AC_DIAGNOSE([obsolete], [$0:
+	your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
+	`ac_cv_prog_cc_stdc'.  Remove this warning and the assignment when
+	you adjust the code.  You can also remove the above call to
+	AC_PROG_CC if you already called it elsewhere.])
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+])
+AU_DEFUN([fp_PROG_CC_STDC])
 
-# AM_PROG_INSTALL_STRIP
+# AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# 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, or (at your option)
-# any later version.
+# serial 7
 
-# 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.
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
 
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# serial 4						-*- Autoconf -*-
-
-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
 
-# 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, 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.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# serial 8
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -529,7 +156,6 @@
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
 
-
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
@@ -565,18 +191,34 @@
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_$1_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -594,13 +236,25 @@
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      am_cv_$1_dependencies_compiler_type=$depmode
-      break
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
     fi
   done
 
@@ -611,6 +265,9 @@
 fi
 ])
 AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
 ])
 
 
@@ -619,16 +276,8 @@
 # Choose a directory name for dependency files.
 # This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
-[rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
-  DEPDIR=.deps
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-AC_SUBST([DEPDIR])
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 ])
 
 
@@ -636,8 +285,8 @@
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
 [AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors])
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
@@ -646,26 +295,16 @@
 AC_SUBST([AMDEPBACKSLASH])
 ])
 
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-# 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, 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.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-#serial 2
+#serial 3
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
@@ -684,27 +323,21 @@
   else
     continue
   fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
@@ -730,33 +363,215 @@
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright 2001 Free Software Foundation, Inc.             -*- Autoconf -*-
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# 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, or (at your option)
-# any later version.
+# serial 8
 
-# 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.
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 12
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.58])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $1 | $1:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # serial 2
 
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
 AC_DEFUN([AM_MAKE_INCLUDE],
 [am_make=${MAKE-make}
 cat > confinc << 'END'
-doit:
+am__doit:
 	@echo done
+.PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
 AC_MSG_CHECKING([for style of include used by $am_make])
@@ -770,7 +585,7 @@
 # In particular we don't look at `^make:' because GNU make might
 # be invoked under some other name (usually "gmake"), in which
 # case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
    am__include=include
    am__quote=
    _am_result=GNU
@@ -784,159 +599,316 @@
       _am_result=BSD
    fi
 fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# AM_CONDITIONAL                                              -*- Autoconf -*-
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
+# serial 4
 
-# 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, or (at your option)
-# any later version.
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
 
-# 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.
 
-# serial 5
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
 
-AC_PREREQ(2.52)
+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
+# AM_PROG_MKDIR_P
+# ---------------
+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+#
+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+# created by `make install' are always world readable, even if the
+# installer happens to have an overly restrictive umask (e.g. 077).
+# This was a mistake.  There are at least two reasons why we must not
+# use `-m 0755':
+#   - it causes special bits like SGID to be ignored,
+#   - it may be too restrictive (some setups expect 775 directories).
+#
+# Do not use -m 0755 and let people choose whatever they expect by
+# setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out.  Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
+AC_DEFUN([AM_PROG_MKDIR_P],
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
+  #   $(mkdir_p) $(somedir)
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
 else
-  $1_TRUE='#'
-  $1_FALSE=
+  # On NextStep and OpenStep, the `mkdir' command does not
+  # recognize any option.  It will interpret all options as
+  # directories to create, and then abort because `.' already
+  # exists.
+  for d in ./-p ./--version;
+  do
+    test -d $d && rmdir $d
+  done
+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+  if test -f "$ac_aux_dir/mkinstalldirs"; then
+    mkdir_p='$(mkinstalldirs)'
+  else
+    mkdir_p='$(install_sh) -d'
+  fi
 fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional \"$1\" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
+AC_SUBST([mkdir_p])])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
 
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Copyright 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+# serial 3
 
-# 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, or (at your option)
-# any later version.
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
-# 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.
-
-# serial 1
-
-# @defmac AC_PROG_CC_STDC
-# @maindex PROG_CC_STDC
-# @ovindex CC
-# If the C compiler in not in ANSI C mode by default, try to add an option
-# to output variable @code{CC} to make it so.  This macro tries various
-# options that select ANSI C on some system or another.  It considers the
-# compiler to be in ANSI C mode if it handles function prototypes correctly.
-#
-# If you use this macro, you should check after calling it whether the C
-# compiler has been set to accept ANSI C; if not, the shell variable
-# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
-# code in ANSI C, you can make an un-ANSIfied copy of it by using the
-# program @code{ansi2knr}, which comes with Ghostscript.
-# @end defmac
-
-AC_DEFUN([AM_PROG_CC_STDC],
-[AC_REQUIRE([AC_PROG_CC])
-AC_BEFORE([$0], [AC_C_INLINE])
-AC_BEFORE([$0], [AC_C_CONST])
-dnl Force this before AC_PROG_CPP.  Some cpp's, eg on HPUX, require
-dnl a magic option to avoid problems with ANSI preprocessor commands
-dnl like #elif.
-dnl FIXME: can't do this because then AC_AIX won't work due to a
-dnl circular dependency.
-dnl AC_BEFORE([$0], [AC_PROG_CPP])
-AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
-AC_CACHE_VAL(am_cv_prog_cc_stdc,
-[am_cv_prog_cc_stdc=no
-ac_save_CC="$CC"
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  AC_TRY_COMPILE(
-[#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-], [
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-],
-[am_cv_prog_cc_stdc="$ac_arg"; break])
-done
-CC="$ac_save_CC"
-])
-if test -z "$am_cv_prog_cc_stdc"; then
-  AC_MSG_RESULT([none needed])
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
 else
-  AC_MSG_RESULT([$am_cv_prog_cc_stdc])
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
 fi
-case "x$am_cv_prog_cc_stdc" in
-  x|xno) ;;
-  *) CC="$CC $am_cv_prog_cc_stdc" ;;
-esac
-])
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
 
--- snort-2.3.3.orig/rpm/Makefile.in
+++ snort-2.3.3/rpm/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,74 +13,129 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = rpm
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 EXTRA_DIST = Makefile.am \
 CHANGES.rpms \
 generate-all-rpms \
@@ -92,38 +147,59 @@
 snort.org.spec \
 snort.sysconfig
 
-subdir = rpm
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  rpm/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  rpm/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 tags: TAGS
 TAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
 
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -141,9 +217,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -155,7 +229,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -163,7 +237,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -173,13 +247,15 @@
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -195,22 +271,31 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic uninstall uninstall-am uninstall-info-am
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/schemas/create_mysql
+++ snort-2.3.3/schemas/create_mysql
@@ -20,10 +20,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-CREATE TABLE schema ( vseq        INT      UNSIGNED NOT NULL,
+CREATE TABLE `schema` ( vseq        INT      UNSIGNED NOT NULL,
                       ctime       DATETIME NOT NULL,
                       PRIMARY KEY (vseq));
-INSERT INTO schema  (vseq, ctime) VALUES ('106', now());       
+INSERT INTO `schema`  (vseq, ctime) VALUES ('106', now());       
 
 CREATE TABLE event  ( sid 	  INT 	   UNSIGNED NOT NULL,
                       cid 	  INT 	   UNSIGNED NOT NULL,
--- snort-2.3.3.orig/schemas/Makefile.in
+++ snort-2.3.3/schemas/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,112 +13,188 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = schemas
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 EXTRA_DIST = Makefile.am \
 create_mssql \
 create_mysql \
 create_oracle.sql \
 create_postgresql
 
-subdir = schemas
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  schemas/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  schemas/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 tags: TAGS
 TAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
 
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -136,9 +212,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -150,7 +224,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -158,7 +232,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -168,13 +242,15 @@
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -190,22 +266,31 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic uninstall uninstall-am uninstall-info-am
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/config.sub
+++ snort-2.3.3/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2002-01-02'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@
 #
 # 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.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +71,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +100,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,7 +119,8 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,7 +146,7 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -228,34 +230,55 @@
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 \
+	| ip2k | iq2000 \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| ms1 \
+	| msp430 \
 	| ns16k | ns32k \
-	| openrisc \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[34] | sh[34]eb | shbe | shle \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic80 | tron \
+	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -281,41 +304,63 @@
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cray2-* | cydra-* \
-	| d10v-* | d30v-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| ms1-* \
+	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -332,6 +377,9 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -346,6 +394,12 @@
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -377,6 +431,10 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -397,24 +455,31 @@
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
+	cray | j90)
+		basic_machine=j90-cray
 		os=-unicos
 		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
 		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
-		os=-unicos
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -437,6 +502,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -609,24 +678,12 @@
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -714,6 +771,13 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -736,49 +800,55 @@
 	pbb)
 		basic_machine=m68k-tti
 		;;
-        pc532 | pc532-*)
+	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-	        ;;
+		;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-	        ;;
+		;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
+		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
-	        ;;
+		;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -809,6 +879,16 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -816,6 +896,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -883,13 +966,25 @@
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=t3e-cray
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -903,6 +998,10 @@
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -924,8 +1023,8 @@
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+		basic_machine=f301-fujitsu
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -946,17 +1045,17 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
 		;;
-        xps | xps100)
+	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -977,16 +1076,12 @@
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1003,13 +1098,13 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-        cydra)
+	cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1024,10 +1119,6 @@
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1083,17 +1174,21 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* | -morphos*)
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1105,16 +1200,21 @@
 			;;
 		esac
 		;;
+	-nto-qnx*)
+		;;
 	-nto*)
-		os=-nto-qnx
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1127,6 +1227,9 @@
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1148,14 +1251,20 @@
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
 	-ns2 )
-	        os=-nextstep2
+		os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1167,6 +1276,9 @@
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1194,8 +1306,17 @@
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
 		;;
 	-none)
 		;;
@@ -1228,11 +1349,14 @@
 	arm*-semi)
 		os=-aout
 		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-        pdp11-*)
+	pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1259,6 +1383,9 @@
 	mips*-*)
 		os=-elf
 		;;
+	or32-*)
+		os=-coff
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1268,9 +1395,15 @@
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1322,19 +1455,19 @@
 	*-next)
 		os=-nextstep3
 		;;
-        *-gould)
+	*-gould)
 		os=-sysv
 		;;
-        *-highlevel)
+	*-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-        *-sgi)
+	*-sgi)
 		os=-irix
 		;;
-        *-siemens)
+	*-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1403,10 +1536,16 @@
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)
@@ -1430,7 +1569,7 @@
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- snort-2.3.3.orig/src/generators.h
+++ snort-2.3.3/src/generators.h
@@ -91,6 +91,8 @@
 #define     STREAM4_MULTIPLE_ACKED              18
 #define     STREAM4_EMERGENCY                   19
 #define     STREAM4_SUSPEND                     20
+/* Some missing here which were introduced in 2.4.0 */
+#define     STREAM4_EVASIVE_FIN                 24
 
 #define GENERATOR_SPP_ARPSPOOF      112
 #define     ARPSPOOF_UNICAST_ARP_REQUEST         1
@@ -306,6 +308,7 @@
 "(spp_stream4) TCP TOO FAST RETRANSMISSION WITH DIFFERENT DATA SIZE (possible fragroute) detection"
 #define STREAM4_EMERGENCY_STR "(spp_stream4) Shifting to Emergency Session Mode"
 #define STREAM4_SUSPEND_STR "(spp_stream4) Shifting to Suspend Mode"
+#define STREAM4_EVASIVE_FIN_STR "(spp_stream4) possible EVASIVE FIN detection"
 
 
 #define DECODE_NOT_IPV4_DGRAM_STR "(snort_decoder) WARNING: Not IPv4 datagram!"
--- snort-2.3.3.orig/src/win32/Makefile.in
+++ snort-2.3.3/src/win32/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,72 +13,128 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/win32
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 
 # $Id: Makefile.am,v 1.10 2004/06/23 15:01:01 jhewlett Exp $
 AUTOMAKE_OPTIONS = foreign no-dependencies
@@ -176,39 +232,60 @@
 ./WIN32-Prj/snort.dsw \
 ./WIN32-Prj/snort.mak
 
-subdir = src/win32
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/win32/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/win32/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 tags: TAGS
 TAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
 
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkinstalldirs) $(distdir)/./WIN32-Code $(distdir)/./WIN32-Includes $(distdir)/./WIN32-Includes/NET $(distdir)/./WIN32-Includes/NETINET $(distdir)/./WIN32-Includes/libnet $(distdir)/./WIN32-Includes/mysql $(distdir)/./WIN32-Includes/rpc $(distdir)/./WIN32-Libraries $(distdir)/./WIN32-Libraries/libnet $(distdir)/./WIN32-Libraries/mysql $(distdir)/./WIN32-Prj
-	@list='$(DISTFILES)'; for file in $$list; do \
+	$(mkdir_p) $(distdir)/./WIN32-Code $(distdir)/./WIN32-Includes $(distdir)/./WIN32-Includes/NET $(distdir)/./WIN32-Includes/NETINET $(distdir)/./WIN32-Includes/libnet $(distdir)/./WIN32-Includes/mysql $(distdir)/./WIN32-Includes/rpc $(distdir)/./WIN32-Libraries $(distdir)/./WIN32-Libraries/libnet $(distdir)/./WIN32-Libraries/mysql $(distdir)/./WIN32-Prj
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -226,9 +303,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -240,7 +315,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -248,7 +323,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -258,13 +333,15 @@
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -280,22 +357,31 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic uninstall uninstall-am uninstall-info-am
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/log.c
+++ snort-2.3.3/src/log.c
@@ -1478,8 +1478,10 @@
                 {
                     for(j = 0; j < p->ip_options[i].len; j++)
                     {
-                        fprintf(fp, "%02X", p->ip_options[i].data[j]);
-                        
+			if (p->ip_options[i].data)
+				fprintf(fp, "%02X", p->ip_options[i].data[j]);
+			else
+				fprintf(fp, "%02X", 0);
                         if((j % 2) == 0)
                             fprintf(fp, " ");
                     }
@@ -1522,7 +1524,8 @@
             case TCPOPT_MAXSEG:
                 bzero((char *) tmp, 5);
                 fwrite("MSS: ", 5, 1, fp);
-                memcpy(tmp, p->tcp_options[i].data, 2);
+                if (p->tcp_options[i].data)
+			memcpy(tmp, p->tcp_options[i].data, 2);
                 fprintf(fp, "%u ", EXTRACT_16BITS(tmp));
                 break;
 
@@ -1535,15 +1538,20 @@
                 break;
 
             case TCPOPT_WSCALE:
-                fprintf(fp, "WS: %u ", p->tcp_options[i].data[0]);
+                if (p->tcp_options[i].data)
+			fprintf(fp, "WS: %u ", p->tcp_options[i].data[0]);
+                else
+			fprintf(fp, "WS: %u ", 0);
                 break;
 
             case TCPOPT_SACK:
                 bzero((char *) tmp, 5);
-                memcpy(tmp, p->tcp_options[i].data, 2);
+		if (p->tcp_options[i].data)
+			memcpy(tmp, p->tcp_options[i].data, 2);
                 fprintf(fp, "Sack: %u@", EXTRACT_16BITS(tmp));
                 bzero((char *) tmp, 5);
-                memcpy(tmp, (p->tcp_options[i].data) + 2, 2);
+		if (p->tcp_options[i].data)
+                	memcpy(tmp, (p->tcp_options[i].data) + 2, 2);
                 fprintf(fp, "%u ", EXTRACT_16BITS(tmp));
                 break;
 
@@ -1553,40 +1561,47 @@
 
             case TCPOPT_ECHO:
                 bzero((char *) tmp, 5);
-                memcpy(tmp, p->tcp_options[i].data, 4);
+		if (p->tcp_options[i].data)
+			memcpy(tmp, p->tcp_options[i].data, 4);
                 fprintf(fp, "Echo: %u ", EXTRACT_32BITS(tmp));
                 break;
 
             case TCPOPT_ECHOREPLY:
                 bzero((char *) tmp, 5);
-                memcpy(tmp, p->tcp_options[i].data, 4);
+		if (p->tcp_options[i].data)
+			memcpy(tmp, p->tcp_options[i].data, 4);
                 fprintf(fp, "Echo Rep: %u ", EXTRACT_32BITS(tmp));
                 break;
 
             case TCPOPT_TIMESTAMP:
                 bzero((char *) tmp, 5);
-                memcpy(tmp, p->tcp_options[i].data, 4);
+		if (p->tcp_options[i].data)
+			memcpy(tmp, p->tcp_options[i].data, 4);
                 fprintf(fp, "TS: %u ", EXTRACT_32BITS(tmp));
                 bzero((char *) tmp, 5);
-                memcpy(tmp, (p->tcp_options[i].data) + 4, 4);
+		if (p->tcp_options[i].data)
+			memcpy(tmp, (p->tcp_options[i].data) + 4, 4);
                 fprintf(fp, "%u ", EXTRACT_32BITS(tmp));
                 break;
 
             case TCPOPT_CC:
                 bzero((char *) tmp, 5);
-                memcpy(tmp, p->tcp_options[i].data, 4);
+		if (p->tcp_options[i].data)
+			memcpy(tmp, p->tcp_options[i].data, 4);
                 fprintf(fp, "CC %u ", EXTRACT_32BITS(tmp));
                 break;
 
             case TCPOPT_CCNEW:
                 bzero((char *) tmp, 5);
-                memcpy(tmp, p->tcp_options[i].data, 4);
+		if (p->tcp_options[i].data)
+			memcpy(tmp, p->tcp_options[i].data, 4);
                 fprintf(fp, "CCNEW: %u ", EXTRACT_32BITS(tmp));
                 break;
 
             case TCPOPT_CCECHO:
                 bzero((char *) tmp, 5);
-                memcpy(tmp, p->tcp_options[i].data, 4);
+		if (p->tcp_options[i].data)
+			memcpy(tmp, p->tcp_options[i].data, 4);
                 fprintf(fp, "CCECHO: %u ", EXTRACT_32BITS(tmp));
                 break;
 
@@ -1598,7 +1613,10 @@
 
                     for(j = 0; j < p->tcp_options[i].len; j++)
                     {
-                        fprintf(fp, "%02X", p->tcp_options[i].data[j]);
+			if (p->tcp_options[i].data)
+				fprintf(fp, "%02X", p->tcp_options[i].data[j]);
+			else
+				fprintf(fp, "%02X", 0);
                         
                         if((j % 2) == 0)
                             fprintf(fp, " ");
--- snort-2.3.3.orig/src/parser/Makefile.in
+++ snort-2.3.3/src/parser/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,116 +13,179 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/parser
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libparser_a_AR = $(AR) $(ARFLAGS)
+libparser_a_LIBADD =
+am_libparser_a_OBJECTS = IpAddrSet.$(OBJEXT)
+libparser_a_OBJECTS = $(am_libparser_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libparser_a_SOURCES)
+DIST_SOURCES = $(libparser_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libparser.a
-
 libparser_a_SOURCES = IpAddrSet.c IpAddrSet.h
-subdir = src/parser
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libparser_a_AR = $(AR) cru
-libparser_a_LIBADD =
-am_libparser_a_OBJECTS = IpAddrSet.$(OBJEXT)
-libparser_a_OBJECTS = $(am_libparser_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libparser_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libparser_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/parser/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/parser/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -132,23 +195,18 @@
 	$(RANLIB) libparser.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -157,6 +215,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -168,8 +227,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -178,19 +253,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -208,9 +285,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -222,7 +297,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -230,7 +305,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -240,7 +315,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -248,6 +323,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -263,24 +340,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/detection-plugins/Makefile.in
+++ snort-2.3.3/src/detection-plugins/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,158 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/detection-plugins
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libspd_a_AR = $(AR) $(ARFLAGS)
+libspd_a_LIBADD =
+am_libspd_a_OBJECTS = sp_dsize_check.$(OBJEXT) \
+	sp_icmp_code_check.$(OBJEXT) sp_icmp_id_check.$(OBJEXT) \
+	sp_icmp_seq_check.$(OBJEXT) sp_icmp_type_check.$(OBJEXT) \
+	sp_ip_fragbits.$(OBJEXT) sp_ip_id_check.$(OBJEXT) \
+	sp_ip_proto.$(OBJEXT) sp_ip_same_check.$(OBJEXT) \
+	sp_ip_tos_check.$(OBJEXT) sp_ipoption_check.$(OBJEXT) \
+	sp_pattern_match.$(OBJEXT) sp_react.$(OBJEXT) \
+	sp_respond.$(OBJEXT) sp_rpc_check.$(OBJEXT) \
+	sp_session.$(OBJEXT) sp_tcp_ack_check.$(OBJEXT) \
+	sp_tcp_flag_check.$(OBJEXT) sp_tcp_seq_check.$(OBJEXT) \
+	sp_tcp_win_check.$(OBJEXT) sp_ttl_check.$(OBJEXT) \
+	sp_clientserver.$(OBJEXT) sp_byte_check.$(OBJEXT) \
+	sp_byte_jump.$(OBJEXT) sp_pcre.$(OBJEXT) sp_isdataat.$(OBJEXT) \
+	sp_flowbits.$(OBJEXT) sp_asn1.$(OBJEXT)
+libspd_a_OBJECTS = $(am_libspd_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libspd_a_SOURCES)
+DIST_SOURCES = $(libspd_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libspd.a
-
 libspd_a_SOURCES = sp_dsize_check.c sp_dsize_check.h sp_icmp_code_check.c      \
 sp_icmp_code_check.h sp_icmp_id_check.c sp_icmp_id_check.h sp_icmp_seq_check.c \
 sp_icmp_seq_check.h sp_icmp_type_check.c sp_icmp_type_check.h sp_ip_fragbits.c \
@@ -99,57 +180,39 @@
 sp_byte_jump.c sp_byte_jump.h sp_pcre.c sp_pcre.h sp_isdataat.c sp_isdataat.h  \
 sp_flowbits.c sp_flowbits.h sp_asn1.c sp_asn1.h
 
-subdir = src/detection-plugins
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libspd_a_AR = $(AR) cru
-libspd_a_LIBADD =
-am_libspd_a_OBJECTS = sp_dsize_check.$(OBJEXT) \
-	sp_icmp_code_check.$(OBJEXT) sp_icmp_id_check.$(OBJEXT) \
-	sp_icmp_seq_check.$(OBJEXT) sp_icmp_type_check.$(OBJEXT) \
-	sp_ip_fragbits.$(OBJEXT) sp_ip_id_check.$(OBJEXT) \
-	sp_ip_proto.$(OBJEXT) sp_ip_same_check.$(OBJEXT) \
-	sp_ip_tos_check.$(OBJEXT) sp_ipoption_check.$(OBJEXT) \
-	sp_pattern_match.$(OBJEXT) sp_react.$(OBJEXT) \
-	sp_respond.$(OBJEXT) sp_rpc_check.$(OBJEXT) \
-	sp_session.$(OBJEXT) sp_tcp_ack_check.$(OBJEXT) \
-	sp_tcp_flag_check.$(OBJEXT) sp_tcp_seq_check.$(OBJEXT) \
-	sp_tcp_win_check.$(OBJEXT) sp_ttl_check.$(OBJEXT) \
-	sp_clientserver.$(OBJEXT) sp_byte_check.$(OBJEXT) \
-	sp_byte_jump.$(OBJEXT) sp_pcre.$(OBJEXT) sp_isdataat.$(OBJEXT) \
-	sp_flowbits.$(OBJEXT) sp_asn1.$(OBJEXT)
-libspd_a_OBJECTS = $(am_libspd_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libspd_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libspd_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/detection-plugins/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/detection-plugins/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -159,23 +222,18 @@
 	$(RANLIB) libspd.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -184,6 +242,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -195,8 +254,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -205,19 +280,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -235,9 +312,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -249,7 +324,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -257,7 +332,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -267,7 +342,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -275,6 +350,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -290,24 +367,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/server/Makefile.in
+++ snort-2.3.3/src/preprocessors/HttpInspect/server/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,145 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/HttpInspect/server
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libhi_server_a_AR = $(AR) $(ARFLAGS)
+libhi_server_a_LIBADD =
+am_libhi_server_a_OBJECTS = hi_server.$(OBJEXT)
+libhi_server_a_OBJECTS = $(am_libhi_server_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhi_server_a_SOURCES)
+DIST_SOURCES = $(libhi_server_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libhi_server.a
-
 libhi_server_a_SOURCES = \
 hi_server.c \
 ../include/hi_ad.h \
@@ -106,44 +174,39 @@
 ../include/hi_util_kmap.h \
 ../include/hi_util_xmalloc.h
 
-subdir = src/preprocessors/HttpInspect/server
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libhi_server_a_AR = $(AR) cru
-libhi_server_a_LIBADD =
-am_libhi_server_a_OBJECTS = hi_server.$(OBJEXT)
-libhi_server_a_OBJECTS = $(am_libhi_server_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libhi_server_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libhi_server_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/server/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/server/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -153,23 +216,18 @@
 	$(RANLIB) libhi_server.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -178,6 +236,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -189,8 +248,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -199,19 +274,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -229,9 +306,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -243,7 +318,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -251,7 +326,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -261,7 +336,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -269,6 +344,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -284,24 +361,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/anomaly_detection/Makefile.in
+++ snort-2.3.3/src/preprocessors/HttpInspect/anomaly_detection/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,145 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/HttpInspect/anomaly_detection
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libhi_ad_a_AR = $(AR) $(ARFLAGS)
+libhi_ad_a_LIBADD =
+am_libhi_ad_a_OBJECTS = hi_ad.$(OBJEXT)
+libhi_ad_a_OBJECTS = $(am_libhi_ad_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhi_ad_a_SOURCES)
+DIST_SOURCES = $(libhi_ad_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libhi_ad.a
-
 libhi_ad_a_SOURCES = \
 hi_ad.c \
 ../include/hi_ad.h \
@@ -106,44 +174,39 @@
 ../include/hi_util_kmap.h \
 ../include/hi_util_xmalloc.h
 
-subdir = src/preprocessors/HttpInspect/anomaly_detection
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libhi_ad_a_AR = $(AR) cru
-libhi_ad_a_LIBADD =
-am_libhi_ad_a_OBJECTS = hi_ad.$(OBJEXT)
-libhi_ad_a_OBJECTS = $(am_libhi_ad_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libhi_ad_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libhi_ad_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/anomaly_detection/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/anomaly_detection/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -153,23 +216,18 @@
 	$(RANLIB) libhi_ad.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -178,6 +236,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -189,8 +248,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -199,19 +274,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -229,9 +306,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -243,7 +318,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -251,7 +326,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -261,7 +336,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -269,6 +344,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -284,24 +361,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/user_interface/Makefile.in
+++ snort-2.3.3/src/preprocessors/HttpInspect/user_interface/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,146 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/HttpInspect/user_interface
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libhi_ui_a_AR = $(AR) $(ARFLAGS)
+libhi_ui_a_LIBADD =
+am_libhi_ui_a_OBJECTS = hi_ui_config.$(OBJEXT) \
+	hi_ui_server_lookup.$(OBJEXT) hi_ui_iis_unicode_map.$(OBJEXT)
+libhi_ui_a_OBJECTS = $(am_libhi_ui_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhi_ui_a_SOURCES)
+DIST_SOURCES = $(libhi_ui_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libhi_ui.a
-
 libhi_ui_a_SOURCES = \
 hi_ui_config.c \
 hi_ui_server_lookup.c \
@@ -108,45 +177,39 @@
 ../include/hi_util_kmap.h \
 ../include/hi_util_xmalloc.h
 
-subdir = src/preprocessors/HttpInspect/user_interface
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libhi_ui_a_AR = $(AR) cru
-libhi_ui_a_LIBADD =
-am_libhi_ui_a_OBJECTS = hi_ui_config.$(OBJEXT) \
-	hi_ui_server_lookup.$(OBJEXT) hi_ui_iis_unicode_map.$(OBJEXT)
-libhi_ui_a_OBJECTS = $(am_libhi_ui_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libhi_ui_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libhi_ui_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/user_interface/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/user_interface/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -156,23 +219,18 @@
 	$(RANLIB) libhi_ui.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -181,6 +239,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -192,8 +251,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -202,19 +277,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -232,9 +309,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -246,7 +321,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -254,7 +329,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -264,7 +339,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -272,6 +347,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -287,24 +364,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/mode_inspection/Makefile.in
+++ snort-2.3.3/src/preprocessors/HttpInspect/mode_inspection/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,145 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/HttpInspect/mode_inspection
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libhi_mi_a_AR = $(AR) $(ARFLAGS)
+libhi_mi_a_LIBADD =
+am_libhi_mi_a_OBJECTS = hi_mi.$(OBJEXT)
+libhi_mi_a_OBJECTS = $(am_libhi_mi_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhi_mi_a_SOURCES)
+DIST_SOURCES = $(libhi_mi_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libhi_mi.a
-
 libhi_mi_a_SOURCES = \
 hi_mi.c \
 ../include/hi_ad.h \
@@ -106,44 +174,39 @@
 ../include/hi_util_kmap.h \
 ../include/hi_util_xmalloc.h
 
-subdir = src/preprocessors/HttpInspect/mode_inspection
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libhi_mi_a_AR = $(AR) cru
-libhi_mi_a_LIBADD =
-am_libhi_mi_a_OBJECTS = hi_mi.$(OBJEXT)
-libhi_mi_a_OBJECTS = $(am_libhi_mi_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libhi_mi_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libhi_mi_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/mode_inspection/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/mode_inspection/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -153,23 +216,18 @@
 	$(RANLIB) libhi_mi.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -178,6 +236,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -189,8 +248,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -199,19 +274,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -229,9 +306,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -243,7 +318,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -251,7 +326,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -261,7 +336,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -269,6 +344,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -284,24 +361,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/event_output/hi_eo_log.c
+++ snort-2.3.3/src/preprocessors/HttpInspect/event_output/hi_eo_log.c
@@ -64,7 +64,9 @@
     {HI_EO_CLIENT_PROXY_USE, HI_EO_LOW_PRIORITY,
         HI_EO_CLIENT_PROXY_USE_STR },
     {HI_EO_CLIENT_WEBROOT_DIR, HI_EO_HIGH_PRIORITY,
-        HI_EO_CLIENT_WEBROOT_DIR_STR }
+        HI_EO_CLIENT_WEBROOT_DIR_STR },
+    { HI_EO_CLIENT_CR_IN_URI, HI_EO_MED_PRIORITY,
+        HI_EO_CLIENT_CR_IN_URI_STR },
 };
 
 static HI_EVENT_INFO anom_server_event_info[HI_EO_ANOM_SERVER_EVENT_NUM] = {
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/event_output/Makefile.in
+++ snort-2.3.3/src/preprocessors/HttpInspect/event_output/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,145 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/HttpInspect/event_output
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libhi_eo_a_AR = $(AR) $(ARFLAGS)
+libhi_eo_a_LIBADD =
+am_libhi_eo_a_OBJECTS = hi_eo_log.$(OBJEXT)
+libhi_eo_a_OBJECTS = $(am_libhi_eo_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhi_eo_a_SOURCES)
+DIST_SOURCES = $(libhi_eo_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libhi_eo.a
-
 libhi_eo_a_SOURCES = \
 hi_eo_log.c \
 ../include/hi_ad.h \
@@ -106,44 +174,39 @@
 ../include/hi_util_kmap.h \
 ../include/hi_util_xmalloc.h
 
-subdir = src/preprocessors/HttpInspect/event_output
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libhi_eo_a_AR = $(AR) cru
-libhi_eo_a_LIBADD =
-am_libhi_eo_a_OBJECTS = hi_eo_log.$(OBJEXT)
-libhi_eo_a_OBJECTS = $(am_libhi_eo_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libhi_eo_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libhi_eo_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/event_output/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/event_output/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -153,23 +216,18 @@
 	$(RANLIB) libhi_eo.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -178,6 +236,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -189,8 +248,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -199,19 +274,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -229,9 +306,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -243,7 +318,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -251,7 +326,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -261,7 +336,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -269,6 +344,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -284,24 +361,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/normalization/Makefile.in
+++ snort-2.3.3/src/preprocessors/HttpInspect/normalization/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,145 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/HttpInspect/normalization
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libhi_norm_a_AR = $(AR) $(ARFLAGS)
+libhi_norm_a_LIBADD =
+am_libhi_norm_a_OBJECTS = hi_norm.$(OBJEXT)
+libhi_norm_a_OBJECTS = $(am_libhi_norm_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhi_norm_a_SOURCES)
+DIST_SOURCES = $(libhi_norm_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libhi_norm.a
-
 libhi_norm_a_SOURCES = \
 hi_norm.c \
 ../include/hi_ad.h \
@@ -106,44 +174,39 @@
 ../include/hi_util_kmap.h \
 ../include/hi_util_xmalloc.h
 
-subdir = src/preprocessors/HttpInspect/normalization
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libhi_norm_a_AR = $(AR) cru
-libhi_norm_a_LIBADD =
-am_libhi_norm_a_OBJECTS = hi_norm.$(OBJEXT)
-libhi_norm_a_OBJECTS = $(am_libhi_norm_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libhi_norm_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libhi_norm_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/normalization/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/normalization/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -153,23 +216,18 @@
 	$(RANLIB) libhi_norm.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -178,6 +236,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -189,8 +248,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -199,19 +274,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -229,9 +306,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -243,7 +318,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -251,7 +326,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -261,7 +336,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -269,6 +344,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -284,24 +361,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/client/Makefile.in
+++ snort-2.3.3/src/preprocessors/HttpInspect/client/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,146 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/HttpInspect/client
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libhi_client_a_AR = $(AR) $(ARFLAGS)
+libhi_client_a_LIBADD =
+am_libhi_client_a_OBJECTS = hi_client.$(OBJEXT) \
+	hi_client_norm.$(OBJEXT)
+libhi_client_a_OBJECTS = $(am_libhi_client_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhi_client_a_SOURCES)
+DIST_SOURCES = $(libhi_client_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libhi_client.a
-
 libhi_client_a_SOURCES = \
 hi_client.c \
 hi_client_norm.c \
@@ -107,44 +176,39 @@
 ../include/hi_util_kmap.h \
 ../include/hi_util_xmalloc.h
 
-subdir = src/preprocessors/HttpInspect/client
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libhi_client_a_AR = $(AR) cru
-libhi_client_a_LIBADD =
-am_libhi_client_a_OBJECTS = hi_client.$(OBJEXT) hi_client_norm.$(OBJEXT)
-libhi_client_a_OBJECTS = $(am_libhi_client_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libhi_client_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libhi_client_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/client/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/client/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -154,23 +218,18 @@
 	$(RANLIB) libhi_client.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -179,6 +238,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -190,8 +250,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -200,19 +276,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -230,9 +308,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -244,7 +320,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -252,7 +328,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -262,7 +338,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -270,6 +346,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -285,24 +363,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/client/hi_client.c
+++ snort-2.3.3/src/preprocessors/HttpInspect/client/hi_client.c
@@ -82,6 +82,8 @@
 */
 static LOOKUP_FCN lookup_table[256];
 static int hex_lookup[256];
+static int NextNonWhiteSpace(HI_SESSION *Session, u_char *start,
+        u_char *end, u_char **ptr, URI_PTR *uri_ptr);
 
 /*
 **  NAME
@@ -452,7 +454,7 @@
         return URI_END;
     }
 
-    return NO_URI;
+    return NextNonWhiteSpace(Session, start, end, ptr, uri_ptr);
 }
 
 /*
@@ -663,7 +665,7 @@
             (*ptr)++;
             continue;
         }
-        else if((**ptr == '\t'))
+        else if((**ptr == '\t') || (**ptr == '\r'))
         {
             if(ServerConf->apache_whitespace.on)
             {
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/include/hi_eo_events.h
+++ snort-2.3.3/src/preprocessors/HttpInspect/include/hi_eo_events.h
@@ -24,13 +24,14 @@
 #define HI_EO_CLIENT_LARGE_CHUNK    15  /* done */
 #define HI_EO_CLIENT_PROXY_USE      16  /* done */
 #define HI_EO_CLIENT_WEBROOT_DIR    17  /* done */
+#define HI_EO_CLIENT_CR_IN_URI      18  /* done */
 
 /*
 **  IMPORTANT:
 **  Every time you add a client event, this number must be
 **  incremented.
 */
-#define HI_EO_CLIENT_EVENT_NUM      18
+#define HI_EO_CLIENT_EVENT_NUM      19
 
 /*
 **  These defines are the alert names for each event
@@ -71,6 +72,8 @@
     "(http_inspect) UNAUTHORIZED PROXY USE DETECTED"
 #define HI_EO_CLIENT_WEBROOT_DIR_STR                    \
     "(http_inspect) WEBROOT DIRECTORY TRAVERSAL"
+#define HI_EO_CLIENT_CR_IN_URI_STR                       \
+    "(http_inspect) NON-STD CARRIAGE RETURN IN URI"
 
 /*
 **  Anomalous Server Events
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/include/Makefile.in
+++ snort-2.3.3/src/preprocessors/HttpInspect/include/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,74 +13,129 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/HttpInspect/include
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 EXTRA_DIST = \
 hi_ad.h \
 hi_client.h \
@@ -102,38 +157,59 @@
 hi_util_kmap.h \
 hi_util_xmalloc.h
 
-subdir = src/preprocessors/HttpInspect/include
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/include/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/include/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 tags: TAGS
 TAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
 
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -151,9 +227,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -165,7 +239,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -173,7 +247,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -183,13 +257,15 @@
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -205,22 +281,31 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic uninstall uninstall-am uninstall-info-am
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/session_inspection/Makefile.in
+++ snort-2.3.3/src/preprocessors/HttpInspect/session_inspection/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,145 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/HttpInspect/session_inspection
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libhi_si_a_AR = $(AR) $(ARFLAGS)
+libhi_si_a_LIBADD =
+am_libhi_si_a_OBJECTS = hi_si.$(OBJEXT)
+libhi_si_a_OBJECTS = $(am_libhi_si_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhi_si_a_SOURCES)
+DIST_SOURCES = $(libhi_si_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libhi_si.a
-
 libhi_si_a_SOURCES = \
 hi_si.c \
 ../include/hi_ad.h \
@@ -106,44 +174,39 @@
 ../include/hi_util_kmap.h \
 ../include/hi_util_xmalloc.h
 
-subdir = src/preprocessors/HttpInspect/session_inspection
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libhi_si_a_AR = $(AR) cru
-libhi_si_a_LIBADD =
-am_libhi_si_a_OBJECTS = hi_si.$(OBJEXT)
-libhi_si_a_OBJECTS = $(am_libhi_si_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libhi_si_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libhi_si_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/session_inspection/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/session_inspection/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -153,23 +216,18 @@
 	$(RANLIB) libhi_si.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -178,6 +236,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -189,8 +248,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -199,19 +274,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -229,9 +306,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -243,7 +318,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -251,7 +326,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -261,7 +336,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -269,6 +344,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -284,24 +361,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/Makefile.in
+++ snort-2.3.3/src/preprocessors/HttpInspect/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,83 +13,164 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/HttpInspect
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libhttp_inspect_a_AR = $(AR) $(ARFLAGS)
+libhttp_inspect_a_DEPENDENCIES = user_interface/hi_ui_config.o \
+	user_interface/hi_ui_server_lookup.o \
+	user_interface/hi_ui_iis_unicode_map.o \
+	session_inspection/hi_si.o mode_inspection/hi_mi.o \
+	anomaly_detection/hi_ad.o utils/hi_util_kmap.o \
+	utils/hi_util_xmalloc.o utils/hi_util_hbm.o \
+	event_output/hi_eo_log.o client/hi_client.o \
+	client/hi_client_norm.o server/hi_server.o \
+	normalization/hi_norm.o
+am_libhttp_inspect_a_OBJECTS =
+libhttp_inspect_a_OBJECTS = $(am_libhttp_inspect_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhttp_inspect_a_SOURCES)
+DIST_SOURCES = $(libhttp_inspect_a_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libhttp_inspect.a
-
 libhttp_inspect_a_SOURCES = 
-
 SUBDIRS = include utils user_interface session_inspection mode_inspection  \
           anomaly_detection event_output server client normalization 
 
-
 libhttp_inspect_a_LIBADD = \
 user_interface/hi_ui_config.o \
 user_interface/hi_ui_server_lookup.o \
@@ -106,57 +187,38 @@
 server/hi_server.o \
 normalization/hi_norm.o 
 
-subdir = src/preprocessors/HttpInspect
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libhttp_inspect_a_AR = $(AR) cru
-libhttp_inspect_a_DEPENDENCIES = user_interface/hi_ui_config.o \
-	user_interface/hi_ui_server_lookup.o \
-	user_interface/hi_ui_iis_unicode_map.o \
-	session_inspection/hi_si.o mode_inspection/hi_mi.o \
-	anomaly_detection/hi_ad.o utils/hi_util_kmap.o \
-	utils/hi_util_xmalloc.o utils/hi_util_hbm.o \
-	event_output/hi_eo_log.o client/hi_client.o \
-	client/hi_client_norm.o server/hi_server.o \
-	normalization/hi_norm.o
-am_libhttp_inspect_a_OBJECTS =
-libhttp_inspect_a_OBJECTS = $(am_libhttp_inspect_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libhttp_inspect_a_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-	uninstall-info-recursive all-recursive install-data-recursive \
-	install-exec-recursive installdirs-recursive install-recursive \
-	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libhttp_inspect_a_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -166,7 +228,7 @@
 	$(RANLIB) libhttp_inspect.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -179,7 +241,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -191,7 +259,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -199,7 +267,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -220,17 +294,16 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -240,14 +313,23 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -256,8 +338,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -266,19 +364,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -293,15 +393,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -311,7 +413,6 @@
 all-am: Makefile $(LIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -323,7 +424,7 @@
 installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -331,7 +432,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -341,7 +442,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -349,6 +450,8 @@
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
@@ -364,31 +467,37 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-generic clean-noinstLIBRARIES clean-recursive distclean \
-	distclean-compile distclean-generic distclean-recursive \
-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-recursive \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-noinstLIBRARIES clean-recursive \
+	ctags ctags-recursive distclean distclean-compile \
+	distclean-generic distclean-recursive distclean-tags distdir \
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/HttpInspect/utils/Makefile.in
+++ snort-2.3.3/src/preprocessors/HttpInspect/utils/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,146 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/HttpInspect/utils
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libhi_utils_a_AR = $(AR) $(ARFLAGS)
+libhi_utils_a_LIBADD =
+am_libhi_utils_a_OBJECTS = hi_util_kmap.$(OBJEXT) \
+	hi_util_xmalloc.$(OBJEXT) hi_util_hbm.$(OBJEXT)
+libhi_utils_a_OBJECTS = $(am_libhi_utils_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libhi_utils_a_SOURCES)
+DIST_SOURCES = $(libhi_utils_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libhi_utils.a
-
 libhi_utils_a_SOURCES = hi_util_kmap.c \
 hi_util_xmalloc.c \
 hi_util_hbm.c \
@@ -107,45 +176,39 @@
 ../include/hi_util_kmap.h \
 ../include/hi_util_xmalloc.h
 
-subdir = src/preprocessors/HttpInspect/utils
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libhi_utils_a_AR = $(AR) cru
-libhi_utils_a_LIBADD =
-am_libhi_utils_a_OBJECTS = hi_util_kmap.$(OBJEXT) \
-	hi_util_xmalloc.$(OBJEXT) hi_util_hbm.$(OBJEXT)
-libhi_utils_a_OBJECTS = $(am_libhi_utils_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libhi_utils_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libhi_utils_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/utils/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/HttpInspect/utils/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -155,23 +218,18 @@
 	$(RANLIB) libhi_utils.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -180,6 +238,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -191,8 +250,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -201,19 +276,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -231,9 +308,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -245,7 +320,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -253,7 +328,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -263,7 +338,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -271,6 +346,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -286,24 +363,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/flow/portscan/Makefile.in
+++ snort-2.3.3/src/preprocessors/flow/portscan/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,123 +13,186 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/flow/portscan
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libportscan_a_AR = $(AR) $(ARFLAGS)
+libportscan_a_LIBADD =
+am_libportscan_a_OBJECTS = flowps.$(OBJEXT) scoreboard.$(OBJEXT) \
+	unique_tracker.$(OBJEXT) flowps_snort.$(OBJEXT) \
+	server_stats.$(OBJEXT)
+libportscan_a_OBJECTS = $(am_libportscan_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libportscan_a_SOURCES)
+DIST_SOURCES = $(libportscan_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libportscan.a
-
 libportscan_a_SOURCES = flowps.h flowps.c \
                     scoreboard.h scoreboard.c \
                     unique_tracker.h unique_tracker.c\
                     flowps_snort.h flowps_snort.c \
                     server_stats.c server_stats.h
 
-subdir = src/preprocessors/flow/portscan
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libportscan_a_AR = $(AR) cru
-libportscan_a_LIBADD =
-am_libportscan_a_OBJECTS = flowps.$(OBJEXT) scoreboard.$(OBJEXT) \
-	unique_tracker.$(OBJEXT) flowps_snort.$(OBJEXT) \
-	server_stats.$(OBJEXT)
-libportscan_a_OBJECTS = $(am_libportscan_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libportscan_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libportscan_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/flow/portscan/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/flow/portscan/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -139,23 +202,18 @@
 	$(RANLIB) libportscan.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -164,6 +222,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -175,8 +234,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -185,19 +260,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -215,9 +292,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -229,7 +304,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -237,7 +312,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -247,7 +322,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -255,6 +330,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -270,24 +347,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/flow/int-snort/Makefile.in
+++ snort-2.3.3/src/preprocessors/flow/int-snort/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,116 +13,179 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/flow/int-snort
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libintsnort_a_AR = $(AR) $(ARFLAGS)
+libintsnort_a_LIBADD =
+am_libintsnort_a_OBJECTS = flow_packet.$(OBJEXT)
+libintsnort_a_OBJECTS = $(am_libintsnort_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libintsnort_a_SOURCES)
+DIST_SOURCES = $(libintsnort_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libintsnort.a
-
 libintsnort_a_SOURCES = flow_packet.h flow_packet.c
-subdir = src/preprocessors/flow/int-snort
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libintsnort_a_AR = $(AR) cru
-libintsnort_a_LIBADD =
-am_libintsnort_a_OBJECTS = flow_packet.$(OBJEXT)
-libintsnort_a_OBJECTS = $(am_libintsnort_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libintsnort_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libintsnort_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/flow/int-snort/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/flow/int-snort/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -132,23 +195,18 @@
 	$(RANLIB) libintsnort.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -157,6 +215,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -168,8 +227,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -178,19 +253,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -208,9 +285,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -222,7 +297,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -230,7 +305,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -240,7 +315,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -248,6 +323,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -263,24 +340,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/flow/Makefile.in
+++ snort-2.3.3/src/preprocessors/flow/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,154 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors/flow
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libflow_a_AR = $(AR) $(ARFLAGS)
+libflow_a_LIBADD =
+am_libflow_a_OBJECTS = flow.$(OBJEXT) flow_cache.$(OBJEXT) \
+	flow_callback.$(OBJEXT) flow_class.$(OBJEXT) \
+	flow_stat.$(OBJEXT) flow_hash.$(OBJEXT) flow_print.$(OBJEXT)
+libflow_a_OBJECTS = $(am_libflow_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libflow_a_SOURCES)
+DIST_SOURCES = $(libflow_a_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 SUBDIRS = portscan int-snort
-
 noinst_LIBRARIES = libflow.a
-
 libflow_a_SOURCES = common_defs.h \
                     flow.c flow.h \
                     flow_cache.c flow_cache.h \
@@ -95,56 +172,39 @@
                     flow_hash.c flow_hash.h \
                     flow_print.c flow_print.h
 
-subdir = src/preprocessors/flow
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libflow_a_AR = $(AR) cru
-libflow_a_LIBADD =
-am_libflow_a_OBJECTS = flow.$(OBJEXT) flow_cache.$(OBJEXT) \
-	flow_callback.$(OBJEXT) flow_class.$(OBJEXT) \
-	flow_stat.$(OBJEXT) flow_hash.$(OBJEXT) flow_print.$(OBJEXT)
-libflow_a_OBJECTS = $(am_libflow_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/flow.Po ./$(DEPDIR)/flow_cache.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/flow_callback.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/flow_class.Po ./$(DEPDIR)/flow_hash.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/flow_print.Po ./$(DEPDIR)/flow_stat.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libflow_a_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-	uninstall-info-recursive all-recursive install-data-recursive \
-	install-exec-recursive installdirs-recursive install-recursive \
-	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libflow_a_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/preprocessors/flow/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  src/preprocessors/flow/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -154,7 +214,7 @@
 	$(RANLIB) libflow.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -167,21 +227,19 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flow_print.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flow_stat.Po@am__quote@
 
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
 .c.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -191,7 +249,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -203,7 +267,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -211,7 +275,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -232,17 +302,16 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -252,14 +321,23 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -268,8 +346,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -278,19 +372,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -305,15 +401,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -323,7 +421,6 @@
 all-am: Makefile $(LIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -335,7 +432,7 @@
 installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -343,7 +440,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -353,14 +450,17 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-tags
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
@@ -376,32 +476,38 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-generic clean-noinstLIBRARIES clean-recursive distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-noinstLIBRARIES clean-recursive \
+	ctags ctags-recursive distclean distclean-compile \
+	distclean-generic distclean-recursive distclean-tags distdir \
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
 	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/preprocessors/xlink2state.c
+++ snort-2.3.3/src/preprocessors/xlink2state.c
@@ -41,7 +41,7 @@
 
 /* Pointer to current session data */
 XLINK2STATE *_xlink;
-static u_int       _xlink2state_ports[65535];
+static u_int       _xlink2state_ports[65536];
 static u_int       _xlink2state_disabled = 0;
 static u_int       _xlink2state_drop = 0;
 static Packet      *_xlink2state_pkt = NULL;
@@ -70,9 +70,6 @@
     /*  Set up commands we will watch for */
     SearchInit(1);
     
-    /*  Set up commands we will watch for */
-    SearchInit(1);
-    
     SearchAdd(0, "X-LINK2STATE", 0);
     
     SearchPrepPatterns(0);
--- snort-2.3.3.orig/src/preprocessors/spp_stream4.c
+++ snort-2.3.3/src/preprocessors/spp_stream4.c
@@ -337,7 +337,7 @@
 void PreprocCleanExitFunction(int);
 static INLINE int isBetween(u_int32_t low, u_int32_t high, u_int32_t cur);
 static INLINE int NotForStream4(Packet *p);
-static INLINE int SetFinSent(Packet *p, Session *ssn, int direction);
+static INLINE int SetFinSent(Session *ssn, int direction, u_int32_t pkt_seq, Packet *p);
 static INLINE int WithinSessionLimits(Packet *p, Stream *stream);
 
  /* helpers for dealing with session byte_counters */
@@ -1445,32 +1445,115 @@
     }
 }
 
+/**
+ * Check a FIN is valid within the window
+ *
+ * @param s stream to set the next_seq on 
+ * @param direction direction of the packet
+ * @param pkt_seq sequence number for the packet
+ * @param p packet to grab the session from
+ * 
+ * @return 0 if everything went ok
+ */
+static INLINE int CheckFin(Stream *s, int direction, u_int32_t pkt_seq, Packet *p)
+{
+    DEBUG_WRAP(DebugMessage(DEBUG_STREAM, "CheckFin() called for %s\n",
+                            direction ? "FROM_CLIENT":"FROM_SERVER"););
+
+    /* If not tracking state ignore it */
+    if( !s4data.stateful_inspection_flag )
+        return 0;
+
+    /*
+     *  We want to make sure the FIN has the next valid sequence that 
+     *  this side should be sending 
+     *  If the pkt_seq < next_seq it's essentially a duplicate 
+     *  sequence, and is probably going to be discarded, it certainly 
+     *  should be. Also, the base sequence includes the SYN sequence count.
+     *  If the packet seq is after the next seq than we should queue the 
+     *  packet for later, in case an out of order packet arrives. We 
+     *  should also honor the FIN-ACK requirements.
+     *
+     *  Ignoring a FIN implies we won't shutdown this session due to it.
+     *  
+     *  This is a standard TCP/IP stack 'in the window' check, but it's 
+     *  not always the way stacks handle FIN's:
+     *  
+     *  if(SEQ_LT(pkt_seq,s->base_seq+s->bytes_tracked) || 
+     *     SEQ_GEQ(pkt_seq,(s->last_ack+s->win_size))) 
+     *  
+     */
+    if(SEQ_LT(pkt_seq,s->base_seq+s->bytes_tracked) || 
+       SEQ_GEQ(pkt_seq,(s->last_ack+s->win_size))) 
+    {
+        DEBUG_WRAP(DebugMessage(DEBUG_STREAM, 
+                    "Bad FIN packet, bad sequence!\n"
+                    "pkt seq: 0x%X   last_ack: 0x%X  win: 0x%X\n",
+                    pkt_seq, s->last_ack, s->win_size););
+
+        /* we should probably alert here */
+        if(s4data.evasion_alerts)
+        {
+            SnortEventqAdd(GENERATOR_SPP_STREAM4, /* GID */
+                    STREAM4_EVASIVE_FIN, /* SID */
+                    1,                      /* Rev */
+                    0,                      /* classification */
+                    3,                      /* priority (low) */
+                    STREAM4_EVASIVE_FIN_STR, /* msg string */
+                    0);
+        }
+        return 1;
+    }
+    return 0;
+}
+
+
 /** 
  * Set that this side of the session has sent a fin.
  *
  * This overloads the next_seq variable to also be used to tell how
  * far forward we can acknowledge data.
  * 
- * @param p packet to grab the session from
  * @param s stream to set the next_seq on 
+ * @param direction direction of the packet
+ * @param pkt_seq sequence number for the packet
+ * @param p packet to grab the session from
  * 
  * @return 0 if everything went ok
  */
-static INLINE int SetFinSent(Packet *p, Session *ssn, int direction)
+static INLINE int SetFinSent(Session *ssn, int direction, u_int32_t pkt_seq, Packet *p)
 {
     Stream *stream;
 
     DEBUG_WRAP(DebugMessage(DEBUG_STREAM, "SetFinSet() called for %s\n",
                             direction ? "FROM_CLIENT":"FROM_SERVER"););
 
+    /* If not tracking state ignore it */
+    if( !s4data.stateful_inspection_flag )
+        return 0;
+
     if(direction == FROM_SERVER)
-    {
+    {        
         stream = &ssn->server;
+        DEBUG_WRAP(DebugMessage(DEBUG_STREAM,"--RST From Server!\n"););
+    }
+    else
+    {        
+        stream = &ssn->client;
+        DEBUG_WRAP(DebugMessage(DEBUG_STREAM,"--RST From Client!\n"););
+    }
+
+    if (CheckFin(stream, direction, pkt_seq, p))
+    {
+        return 0;
+    }
+
+    if(direction == FROM_SERVER)
+    {
         ssn->session_flags |= SSNFLAG_SERVER_FIN;
     }
     else
     {
-        stream = &ssn->client;
         ssn->session_flags |= SSNFLAG_CLIENT_FIN;
     }
     
@@ -2188,14 +2271,6 @@
 
     direction = GetDirection(ssn, p);
 
-    if(p->tcph->th_flags & TH_FIN)
-    {
-        DEBUG_WRAP(DebugMessage(DEBUG_STREAM, 
-                    "Marking that a fin was was sent %s\n",
-                    (direction ? "FROM_CLIENT" : "FROM_SERVER")););
-        SetFinSent(p, ssn, direction);
-    }
-
     if(direction == FROM_SERVER)
     {
         ssn->session_flags |= SSNFLAG_SEEN_SERVER;
@@ -2230,6 +2305,15 @@
                     "   %s state: %s\n", l, state_names[listener->state]););
     }
 
+    if(p->tcph->th_flags & TH_FIN)
+    {
+        DEBUG_WRAP(DebugMessage(DEBUG_STREAM, 
+                    "Marking that a fin was was sent %s\n",
+                    (direction ? "FROM_CLIENT" : "FROM_SERVER")););
+
+        SetFinSent(ssn, direction, pkt_seq, p);
+    }
+
     StreamSegmentAdd(talker, p->dsize); 
 
     if(talker->state == ESTABLISHED)
@@ -2332,10 +2416,13 @@
 
             if((p->tcph->th_flags & TH_FIN) == TH_FIN)
             {
-                talker->state = FIN_WAIT_1;
-                DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,  
-                            "   %s Transition: FIN_WAIT_1\n", t););
-                QueueState(CLOSE_WAIT, listener, TH_ACK, pkt_seq, CHK_SEQ);
+                if (!CheckFin(talker, direction, pkt_seq, p))
+                {
+                    talker->state = FIN_WAIT_1;
+                    DEBUG_WRAP(DebugMessage(DEBUG_STREAM_STATE,  
+                                "   %s Transition: FIN_WAIT_1\n", t););
+                    QueueState(CLOSE_WAIT, listener, TH_ACK, pkt_seq, CHK_SEQ);
+                }
             }
 
             break;
--- snort-2.3.3.orig/src/preprocessors/Makefile.in
+++ snort-2.3.3/src/preprocessors/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,79 +13,163 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/preprocessors
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libspp_a_AR = $(AR) $(ARFLAGS)
+libspp_a_LIBADD =
+am_libspp_a_OBJECTS = spp_arpspoof.$(OBJEXT) spp_bo.$(OBJEXT) \
+	spp_frag2.$(OBJEXT) spp_portscan.$(OBJEXT) \
+	spp_rpc_decode.$(OBJEXT) spp_stream4.$(OBJEXT) \
+	spp_telnet_negotiation.$(OBJEXT) spp_perfmonitor.$(OBJEXT) \
+	spp_conversation.$(OBJEXT) spp_portscan2.$(OBJEXT) \
+	perf.$(OBJEXT) perf-base.$(OBJEXT) perf-flow.$(OBJEXT) \
+	perf-event.$(OBJEXT) sfprocpidstats.$(OBJEXT) \
+	spp_httpinspect.$(OBJEXT) snort_httpinspect.$(OBJEXT) \
+	spp_flow.$(OBJEXT) portscan.$(OBJEXT) spp_sfportscan.$(OBJEXT) \
+	spp_xlink2state.$(OBJEXT) xlink2state.$(OBJEXT) \
+	str_search.$(OBJEXT)
+libspp_a_OBJECTS = $(am_libspp_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libspp_a_SOURCES)
+DIST_SOURCES = $(libspp_a_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libspp.a
-
 SUBDIRS = flow HttpInspect
-
 libspp_a_SOURCES = spp_arpspoof.c spp_arpspoof.h spp_bo.c spp_bo.h \
 spp_frag2.c spp_frag2.h \
 spp_portscan.c spp_portscan.h spp_rpc_decode.c spp_rpc_decode.h  \
@@ -108,60 +192,39 @@
 str_search.c str_search.h \
 stream.h
 
-subdir = src/preprocessors
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libspp_a_AR = $(AR) cru
-libspp_a_LIBADD =
-am_libspp_a_OBJECTS = spp_arpspoof.$(OBJEXT) spp_bo.$(OBJEXT) \
-	spp_frag2.$(OBJEXT) spp_portscan.$(OBJEXT) \
-	spp_rpc_decode.$(OBJEXT) spp_stream4.$(OBJEXT) \
-	spp_telnet_negotiation.$(OBJEXT) spp_perfmonitor.$(OBJEXT) \
-	spp_conversation.$(OBJEXT) spp_portscan2.$(OBJEXT) \
-	perf.$(OBJEXT) perf-base.$(OBJEXT) perf-flow.$(OBJEXT) \
-	perf-event.$(OBJEXT) sfprocpidstats.$(OBJEXT) \
-	spp_httpinspect.$(OBJEXT) snort_httpinspect.$(OBJEXT) \
-	spp_flow.$(OBJEXT) portscan.$(OBJEXT) spp_sfportscan.$(OBJEXT) \
-	spp_xlink2state.$(OBJEXT) xlink2state.$(OBJEXT) \
-	str_search.$(OBJEXT)
-libspp_a_OBJECTS = $(am_libspp_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libspp_a_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-	uninstall-info-recursive all-recursive install-data-recursive \
-	install-exec-recursive installdirs-recursive install-recursive \
-	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libspp_a_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/preprocessors/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/preprocessors/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -171,16 +234,16 @@
 	$(RANLIB) libspp.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -190,7 +253,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -202,7 +271,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -210,7 +279,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -231,17 +306,16 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -251,14 +325,23 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -267,8 +350,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -277,19 +376,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -304,15 +405,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -322,7 +425,6 @@
 all-am: Makefile $(LIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
-
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -334,7 +436,7 @@
 installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -342,7 +444,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -352,7 +454,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -360,6 +462,8 @@
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
@@ -375,31 +479,37 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-generic clean-noinstLIBRARIES clean-recursive distclean \
-	distclean-compile distclean-generic distclean-recursive \
-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-recursive \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-noinstLIBRARIES clean-recursive \
+	ctags ctags-recursive distclean distclean-compile \
+	distclean-generic distclean-recursive distclean-tags distdir \
+	dvi dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/sfutil/Makefile.in
+++ snort-2.3.3/src/sfutil/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,151 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/sfutil
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libsfutil_a_AR = $(AR) $(ARFLAGS)
+libsfutil_a_LIBADD =
+am_libsfutil_a_OBJECTS = sfghash.$(OBJEXT) sfhashfcn.$(OBJEXT) \
+	sflsq.$(OBJEXT) sfmemcap.$(OBJEXT) sfthd.$(OBJEXT) \
+	sfxhash.$(OBJEXT) ipobj.$(OBJEXT) mwm.$(OBJEXT) \
+	sfksearch.$(OBJEXT) acsmx.$(OBJEXT) acsmx2.$(OBJEXT) \
+	mpse.$(OBJEXT) util_math.$(OBJEXT) util_net.$(OBJEXT) \
+	util_str.$(OBJEXT) asn1.$(OBJEXT) sfeventq.$(OBJEXT) \
+	sfsnprintfappend.$(OBJEXT)
+libsfutil_a_OBJECTS = $(am_libsfutil_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libsfutil_a_SOURCES)
+DIST_SOURCES = $(libsfutil_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libsfutil.a
-
 libsfutil_a_SOURCES = sfghash.c sfghash.h \
                       sfhashfcn.c sfhashfcn.h \
                       sflsq.c sflsq.h \
@@ -104,50 +178,39 @@
                       sfeventq.c sfeventq.h \
                       sfsnprintfappend.c sfsnprintfappend.h
 
-subdir = src/sfutil
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libsfutil_a_AR = $(AR) cru
-libsfutil_a_LIBADD =
-am_libsfutil_a_OBJECTS = sfghash.$(OBJEXT) sfhashfcn.$(OBJEXT) \
-	sflsq.$(OBJEXT) sfmemcap.$(OBJEXT) sfthd.$(OBJEXT) \
-	sfxhash.$(OBJEXT) ipobj.$(OBJEXT) mwm.$(OBJEXT) \
-	sfksearch.$(OBJEXT) acsmx.$(OBJEXT) acsmx2.$(OBJEXT) \
-	mpse.$(OBJEXT) util_math.$(OBJEXT) util_net.$(OBJEXT) \
-	util_str.$(OBJEXT) asn1.$(OBJEXT) sfeventq.$(OBJEXT) \
-	sfsnprintfappend.$(OBJEXT)
-libsfutil_a_OBJECTS = $(am_libsfutil_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libsfutil_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libsfutil_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/sfutil/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/sfutil/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -157,23 +220,18 @@
 	$(RANLIB) libsfutil.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -182,6 +240,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -193,8 +252,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -203,19 +278,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -233,9 +310,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -247,7 +322,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -255,7 +330,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -265,7 +340,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -273,6 +348,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -288,24 +365,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/Makefile.in
+++ snort-2.3.3/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,164 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+bin_PROGRAMS = snort$(EXEEXT)
+subdir = src
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_snort_OBJECTS = codes.$(OBJEXT) debug.$(OBJEXT) decode.$(OBJEXT) \
+	log.$(OBJEXT) mstring.$(OBJEXT) parser.$(OBJEXT) \
+	plugbase.$(OBJEXT) snort.$(OBJEXT) snprintf.$(OBJEXT) \
+	strlcatu.$(OBJEXT) strlcpyu.$(OBJEXT) tag.$(OBJEXT) \
+	ubi_BinTree.$(OBJEXT) ubi_SplayTree.$(OBJEXT) util.$(OBJEXT) \
+	detect.$(OBJEXT) signature.$(OBJEXT) mempool.$(OBJEXT) \
+	sf_sdlist.$(OBJEXT) fpcreate.$(OBJEXT) fpdetect.$(OBJEXT) \
+	pcrm.$(OBJEXT) byte_extract.$(OBJEXT) sfthreshold.$(OBJEXT) \
+	packet_time.$(OBJEXT) event_wrapper.$(OBJEXT) \
+	event_queue.$(OBJEXT) inline.$(OBJEXT)
+snort_OBJECTS = $(am_snort_OBJECTS)
+snort_DEPENDENCIES = output-plugins/libspo.a \
+	detection-plugins/libspd.a preprocessors/libspp.a \
+	preprocessors/flow/portscan/libportscan.a \
+	preprocessors/flow/libflow.a parser/libparser.a \
+	preprocessors/HttpInspect/libhttp_inspect.a sfutil/libsfutil.a
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(snort_SOURCES)
+DIST_SOURCES = $(snort_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
-bin_PROGRAMS = snort
-
 snort_SOURCES = cdefs.h \
 event.h \
 fatal.h \
@@ -128,7 +215,6 @@
 event_queue.c event_queue.h \
 inline.c inline.h
 
-
 snort_LDADD = output-plugins/libspo.a \
 detection-plugins/libspd.a            \
 preprocessors/libspp.a                \
@@ -138,75 +224,50 @@
 preprocessors/HttpInspect/libhttp_inspect.a \
 sfutil/libsfutil.a
 
-
 SUBDIRS = sfutil win32 output-plugins detection-plugins preprocessors parser
-subdir = src
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = snort$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_snort_OBJECTS = codes.$(OBJEXT) debug.$(OBJEXT) decode.$(OBJEXT) \
-	log.$(OBJEXT) mstring.$(OBJEXT) parser.$(OBJEXT) \
-	plugbase.$(OBJEXT) snort.$(OBJEXT) snprintf.$(OBJEXT) \
-	strlcatu.$(OBJEXT) strlcpyu.$(OBJEXT) tag.$(OBJEXT) \
-	ubi_BinTree.$(OBJEXT) ubi_SplayTree.$(OBJEXT) util.$(OBJEXT) \
-	detect.$(OBJEXT) signature.$(OBJEXT) mempool.$(OBJEXT) \
-	sf_sdlist.$(OBJEXT) fpcreate.$(OBJEXT) fpdetect.$(OBJEXT) \
-	pcrm.$(OBJEXT) byte_extract.$(OBJEXT) sfthreshold.$(OBJEXT) \
-	packet_time.$(OBJEXT) event_wrapper.$(OBJEXT) \
-	event_queue.$(OBJEXT) inline.$(OBJEXT)
-snort_OBJECTS = $(am_snort_OBJECTS)
-snort_DEPENDENCIES = output-plugins/libspo.a detection-plugins/libspd.a \
-	preprocessors/libspp.a \
-	preprocessors/flow/portscan/libportscan.a \
-	preprocessors/flow/libflow.a parser/libparser.a \
-	preprocessors/HttpInspect/libhttp_inspect.a sfutil/libsfutil.a
-snort_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(snort_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-	uninstall-info-recursive all-recursive install-data-recursive \
-	install-exec-recursive installdirs-recursive install-recursive \
-	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(snort_SOURCES)
-
 all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -214,8 +275,8 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
 
 clean-binPROGRAMS:
@@ -225,16 +286,16 @@
 	$(LINK) $(snort_LDFLAGS) $(snort_OBJECTS) $(snort_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -244,7 +305,13 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -256,7 +323,7 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -264,7 +331,13 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
 	dot_seen=no; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -285,17 +358,16 @@
 	    local_target="$$target"; \
 	  fi; \
 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -305,14 +377,23 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -321,8 +402,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -331,19 +428,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -358,15 +457,17 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -376,8 +477,9 @@
 all-am: Makefile $(PROGRAMS)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -389,7 +491,7 @@
 installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -397,7 +499,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -407,7 +509,7 @@
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-recursive
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -415,6 +517,8 @@
 
 dvi-am:
 
+html: html-recursive
+
 info: info-recursive
 
 info-am:
@@ -430,32 +534,38 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
 uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-binPROGRAMS clean-generic clean-recursive distclean \
-	distclean-compile distclean-generic distclean-recursive \
-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-binPROGRAMS \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
+	ctags-recursive distclean distclean-compile distclean-generic \
+	distclean-recursive distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
 	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/src/output-plugins/spo_alert_full.c
+++ snort-2.3.3/src/output-plugins/spo_alert_full.c
@@ -236,12 +236,12 @@
     SpoAlertFullData *data;
 
     data = (SpoAlertFullData *)SnortAlloc(sizeof(SpoAlertFullData));
-    DEBUG_WRAP(DebugMessage(DEBUG_LOG,"ParseAlertFullArgs: %s\n", args););
     if(args == NULL)
     {
         data->file = OpenAlertFile(NULL);
         return data;
     }
+    DEBUG_WRAP(DebugMessage(DEBUG_LOG,"ParseAlertFullArgs: %s\n", args););
 
     toks = mSplit(args, " ", 2, &num_toks, 0);
     if(strcasecmp("stdout", toks[0]) == 0)
--- snort-2.3.3.orig/src/output-plugins/spo_alert_fast.c
+++ snort-2.3.3/src/output-plugins/spo_alert_fast.c
@@ -243,14 +243,14 @@
 
     data = (SpoAlertFastData *)SnortAlloc(sizeof(SpoAlertFastData));
 
-    DEBUG_WRAP(DebugMessage(DEBUG_LOG, "ParseAlertFastArgs: %s\n", args););
-
     if(args == NULL)
     {
         data->file = OpenAlertFile(NULL);
         return data;
     }
 
+    DEBUG_WRAP(DebugMessage(DEBUG_LOG, "ParseAlertFastArgs: %s\n", args););
+
     toks = mSplit(args, " ", 2, &num_toks, 0);
     if(strcasecmp("stdout", toks[0]) == 0)
         data->file = stdout;
--- snort-2.3.3.orig/src/output-plugins/spo_database.c
+++ snort-2.3.3/src/output-plugins/spo_database.c
@@ -1896,8 +1896,8 @@
 
    select0 = (char *) SnortAlloc(MAX_QUERY_LENGTH+1);
 
-#if defined(ENABLE_MSSQL) || defined(ENABLE_ODBC)
-   if ( data->shared->dbtype_id == DB_MSSQL ||
+#if defined(ENABLE_MSSQL) || defined(ENABLE_ODBC) 
+   if ( data->shared->dbtype_id == DB_MSSQL || 
         (data->shared->dbtype_id==DB_ODBC && data->u_underlying_dbtype_id==DB_MSSQL) )
    {
       /* "schema" is a keyword in SQL Server, so use square brackets
@@ -1910,9 +1910,23 @@
    else
 #endif
    {
+#if defined(ENABLE_MYSQL)
+      if (data->shared->dbtype_id == DB_MYSQL)
+      {
+         /* "schema" is a keyword in MYSQL, so use `schema`
+          *  to indicate that we are referring to the table
+          */
+         snprintf(select0, MAX_QUERY_LENGTH,
+               "SELECT vseq "
+               "FROM `schema`");
+     }
+     else
+#endif
+      {
       snprintf(select0, MAX_QUERY_LENGTH,
                "SELECT vseq "
                "FROM schema");
+      }
    }
 
    schema_version = Select(select0,data);
--- snort-2.3.3.orig/src/output-plugins/Makefile.in
+++ snort-2.3.3/src/output-plugins/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,77 +13,150 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = src/output-plugins
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+AR = ar
+ARFLAGS = cru
+libspo_a_AR = $(AR) $(ARFLAGS)
+libspo_a_LIBADD =
+am_libspo_a_OBJECTS = spo_alert_fast.$(OBJEXT) \
+	spo_alert_full.$(OBJEXT) spo_alert_syslog.$(OBJEXT) \
+	spo_alert_unixsock.$(OBJEXT) spo_csv.$(OBJEXT) \
+	spo_database.$(OBJEXT) spo_log_null.$(OBJEXT) \
+	spo_log_tcpdump.$(OBJEXT) spo_unified.$(OBJEXT) \
+	spo_log_ascii.$(OBJEXT) spo_alert_sf_socket.$(OBJEXT)
+libspo_a_OBJECTS = $(am_libspo_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libspo_a_SOURCES)
+DIST_SOURCES = $(libspo_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 noinst_LIBRARIES = libspo.a
-
 libspo_a_SOURCES = spo_alert_fast.c spo_alert_fast.h \
 spo_alert_full.c spo_alert_full.h \
 spo_alert_syslog.c spo_alert_syslog.h spo_alert_unixsock.c     \
@@ -92,48 +165,39 @@
 spo_log_tcpdump.h spo_unified.c spo_unified.h spo_log_ascii.c spo_log_ascii.h \
 spo_alert_sf_socket.h spo_alert_sf_socket.c
 
-subdir = src/output-plugins
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libspo_a_AR = $(AR) cru
-libspo_a_LIBADD =
-am_libspo_a_OBJECTS = spo_alert_fast.$(OBJEXT) spo_alert_full.$(OBJEXT) \
-	spo_alert_syslog.$(OBJEXT) spo_alert_unixsock.$(OBJEXT) \
-	spo_csv.$(OBJEXT) spo_database.$(OBJEXT) spo_log_null.$(OBJEXT) \
-	spo_log_tcpdump.$(OBJEXT) spo_unified.$(OBJEXT) \
-	spo_log_ascii.$(OBJEXT) spo_alert_sf_socket.$(OBJEXT)
-libspo_a_OBJECTS = $(am_libspo_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libspo_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libspo_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/output-plugins/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  src/output-plugins/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -143,23 +207,18 @@
 	$(RANLIB) libspo.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
 .c.o:
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `cygpath -w $<`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -168,6 +227,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -179,8 +239,24 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -189,19 +265,21 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -219,9 +297,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -233,7 +309,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -241,7 +317,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -251,7 +327,7 @@
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -259,6 +335,8 @@
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -274,24 +352,33 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic tags \
-	uninstall uninstall-am uninstall-info-am
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/contrib/Makefile.in
+++ snort-2.3.3/contrib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,109 +13,185 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = contrib
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 INCLUDES = @INCLUDES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
 extra_incl = @extra_incl@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-
 EXTRA_DIST = Makefile.am \
 README 
 
-subdir = contrib
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
-DIST_SOURCES =
-DIST_COMMON = README Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  contrib/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  contrib/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 tags: TAGS
 TAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
 
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -133,9 +209,7 @@
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -147,7 +221,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -155,7 +229,7 @@
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -165,13 +239,15 @@
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -187,22 +263,31 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic uninstall uninstall-am uninstall-info-am
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- snort-2.3.3.orig/debian/snort-common.dirs
+++ snort-2.3.3/debian/snort-common.dirs
@@ -0,0 +1,3 @@
+/etc/cron.daily
+/etc/snort
+/usr/sbin
--- snort-2.3.3.orig/debian/README.Maintainer
+++ snort-2.3.3/debian/README.Maintainer
@@ -0,0 +1,24 @@
+#
+# files modified outside the debian directory
+#
+snort-lib:
+	* Activated alert_syslog LOG_AUTH LOG_ALERT
+	* Activated output log_tcpdump snort.log # easier for logrotate
+	* Activated preprocessor defrag
+	* Commented out the HOME_NET variable - this will be set in
+	  snort-startup-script.
+	* Commented out the DNS_SERVER variable. What's the benefit?
+	* Added 'include local-first' as first include and
+	  'include local-last' as last include for user-specific
+          extensions.
+	* Commented out backdoor-lib completely. Too many false positives.
+	* Commented out ping-lib completely. Too many false positives.
+
+I commented out the following detections as they either generated too many
+false positives or generate too much noise for harmless things like 
+traceroutes or nmap fingerprint attempts. (marked by s/^/#debian#/)
+scan-lib:
+ "detect fingerprinting attempts"
+ "Windows Traceroutes"
+ "Standard Traceroutes"
+ "dst port 8080" # http proxy
--- snort-2.3.3.orig/debian/snort-pgsql.examples
+++ snort-2.3.3/debian/snort-pgsql.examples
@@ -0,0 +1 @@
+debian/my/snort_rules_update
--- snort-2.3.3.orig/debian/snort-mysql.manpages
+++ snort-2.3.3/debian/snort-mysql.manpages
@@ -0,0 +1 @@
+snort.8
--- snort-2.3.3.orig/debian/snort.default
+++ snort-2.3.3/debian/snort.default
@@ -0,0 +1,25 @@
+# Parameters for the daemon
+# Add any additional parameteres here.
+PARAMS="-m 027 -D -d "
+#
+# Snort user
+# This user will be used to launch snort. Notice that the 
+# preinst script of the package might do changes to the user 
+# (home directory, User Name) when the package is upgraded or
+# reinstalled.  So, do *not* change this to 'root' or to any other user 
+# unless you are sure there is no problem with those changes being introduced.
+# 
+SNORTUSER="snort"
+#
+# Logging directory
+# Snort logs will be dropped here and this will be the home
+# directory for the SNORTUSER. If you change this value you should
+# change the /etc/logrotate.d/snort definition too, otherwise logs
+# will not be rotated properly.
+#
+LOGDIR="/var/log/snort"
+#
+# Snort group
+# This is the group that the snort user will be added to.
+#
+SNORTGROUP="snort"
--- snort-2.3.3.orig/debian/snort.manpages
+++ snort-2.3.3/debian/snort.manpages
@@ -0,0 +1 @@
+snort.8
--- snort-2.3.3.orig/debian/snort-mysql.templates
+++ snort-2.3.3/debian/snort-mysql.templates
@@ -0,0 +1,186 @@
+Template: snort-mysql/startup
+Type: select
+_Choices: boot, dialup, manual
+Default: boot
+_Description: When should Snort be started?
+ Snort can be started during boot, when connecting to the net with pppd or
+ only when you manually start it via /usr/sbin/snort.
+
+Template: snort-mysql/interface
+Type: string
+Default: eth0
+_Description: On which interface(s) should Snort listen?
+ Please enter the name(s) of the interface(s) which Snort should listen on. 
+ The names of the available interfaces are provided by either running 
+ 'ip link show' of 'ifconfig'.
+ This value usually is 'eth0', but you might want to vary this depending
+ on your environment, if you are using a dialup connection 'ppp0' might
+ be more appropiate.
+ .
+ Notice that Snort is usually configured to inspect all traffic coming
+ from the Internet, so the interface you add here is usually the same the
+ 'default route' is on.  You can determine which interface is used
+ for this running either '/sbin/ip ro sh' or '/sbin/route -n' (look for
+ 'default' or '0.0.0.0').
+ .
+ It is also not uncommon to run Snort on an interface with no IP
+ and configured in promiscuous mode, if this is your case, select the
+ interface in this system that is physically connected to the network
+ you want to inspect, enable promiscuous mode later on and make sure
+ that the network traffic is sent to this interface (either connected
+ to a 'port mirroring/spanning' port in a switch, to a hub or to a tap)
+ .
+ You can configure multiple interfaces here, just by adding more than
+ one interface name separated by spaces. Each interface can have its
+ specific configuration.
+
+Template: snort-mysql/address_range
+Type: string
+Default: 192.168.0.0/16
+_Description: Please enter the address range that Snort will listen on.
+ You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or
+ 192.168.1.42/32 for just one. Specify multiple addresses on a single line
+ separated by ',' (comma characters), no spaces allowed!
+ .
+ If you want you can specify 'any', to not trust any side of the network.
+ .
+ Notice that if you are using multiple interfaces this definition will
+ be used as the HOME_NET definition of all of them.
+
+Template: snort-mysql/disable_promiscuous
+Type: boolean
+Default: false
+_Description: Should Snort disable promiscuous mode on the interface?
+ Disabling promiscuous mode means that Snort will only see packets
+ addressed to it's own interface. Enabling it allows Snort to check 
+ every packet that passes ethernet segment even if it's a connection
+ between two other computers.
+ .
+ Disable promiscuous mode if you are configuring Snort on an interface
+ without a configured IP address.
+
+Template: snort-mysql/reverse_order
+Type: boolean
+Default: false
+_Description: Should Snort's rules testing order be changed to Pass|Alert|Log?
+ If you change Snort's rules testing order to Pass|Alert|Log, they will be
+ applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log.
+ This will prevent people from having to make huge Berky Packet Filter
+ command line arguments to filter their alert rules.
+
+Template: snort-mysql/send_stats
+Type: boolean
+Default: true
+_Description: Should daily summaries be sent by e-mail?
+ This Snort installation provides a cron job that runs daily and
+ summarises the information of Snort logs to a selected email address.
+ If you want to disable this feature say 'no' here.
+
+Template: snort-mysql/stats_rcpt
+Type: string
+Default: root
+_Description: Who should receive the daily statistics mails?
+ A cron job running daily will summarise the information of the logs
+ generated by Snort using a script called 'snort-stat'. Introduce
+ here the recipient of these mails. The default value is the system
+ administrator. If you keep this value, make sure that the mail of
+ the administrator is redirected to a user that actually reads those
+ mails.
+
+
+Template: snort-mysql/options
+Type: string
+_Description: If you want to specify custom options to Snort, please specify them here.
+
+Template: snort-mysql/stats_treshold
+Type: string
+Default: 1
+_Description: An alert needs to appear more times than this number to be included in the daily statistics.
+
+Template: snort-mysql/config_parameters
+Type: note
+_Description: This system uses an obsolete configuration file
+ Your system has an obsolete configuration file
+ (/etc/snort/snort.common.parameters)
+ which has been automatically converted into the new configuration
+ file format (at /etc/default/snort). Please review the new configuration
+ and remove the obsolete one. Until you do this, the init.d script
+ will not use the new configuration and you will not take advantage
+ of the benefits introduced in newer releases.
+
+Template: snort-mysql/configure_db
+Type: boolean
+Default: true
+_Description: Do you want to set up a database for snort-mysql to log to?
+ You only need to do this the first time you install snort-mysql. Before
+ you go on, make sure you have (1) the hostname of a machine running a
+ mysql server set up to allow tcp connections from this host, (2) a
+ database on that server, (3) a username and password to access the
+ database. If you don't have _all_ of these, either select 'no' and run
+ with regular file logging support, or fix this first. You can always
+ configure database logging later, by reconfiguring the snort-mysql
+ package with 'dpkg-reconfigure -plow snort-mysql'
+
+Template: snort-mysql/needs_db_config
+Type: note
+_Description: Snort needs a configured database to log to before it starts.
+ Snort needs a configured database before it can successfully start up.
+ In order to create the structure you need to run the following commands
+ AFTER the package is installed:
+  cd /usr/share/doc/snort-mysql/
+  zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>
+ Fill in the correct values for the user, host, and database names.
+ MySQL will prompt you for the password.
+ .
+ After you created the database structure, you will need to start Snort
+ manually.
+
+Template: snort-mysql/db_host
+Type: string
+_Description: Please enter the hostname of the mysql database server to use.
+ Make sure it has been set up correctly to allow incoming connections from
+ this host!
+
+Template: snort-mysql/db_database
+Type: string
+_Description: Please enter the name of the database to use.
+ Make sure this database has been created and your database user has write
+ access to this database.
+
+Template: snort-mysql/db_user
+Type: string
+_Description: Please enter the name of the database user you want to use.
+ Make sure this user has been created and has write access.
+
+Template: snort-mysql/db_pass
+Type: password
+_Description: Please enter the password for the database connection.
+ Please enter a password to connect to the Snort Alert database.
+
+Template: snort-mysql/please_restart_manually
+Type: note
+_Description: You are running Snort manually.
+ Please restart Snort using:
+  /etc/init.d/snort start
+ to let the settings take effect.
+
+Template: snort-mysql/config_error
+Type: note
+_Description: There is an error in your configuration
+ Your Snort configuration is not correct and Snort will not be able to start
+ up normally. Please review your configuration and fix it. If you do not
+ do this, Snort package upgrades will probably break. To check which error
+ is being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf'
+ (or point to an alternate configuration file if you are using different
+ files for different interfaces)
+
+Template: snort-mysql/config_parameters
+Type: note
+_Description: This system uses an obsolete configuration file
+ Your system has an obsolete configuration file
+ (/etc/snort/snort.common.parameters)
+ which has been automatically converted into the new configuration
+ file format (at /etc/default/snort). Please review the new configuration
+ and remove the obsolete one. Until you do this, the init.d script
+ will not use the new configuration and you will not take advantage
+ of the benefits introduced in newer releases.
--- snort-2.3.3.orig/debian/NEWS
+++ snort-2.3.3/debian/NEWS
@@ -0,0 +1,17 @@
+snort (2.3.2-1) unstable; urgency=medium
+
+  * In Snort version 2.3.0 and later the preferred configuration method
+    uses /etc/default/snort rather than /etc/snort/snort.common.parameters.
+    The new approach makes it possible to introduce improvements in the
+    init.d script, such as sanity checks for common misconfigurations.
+
+  * Upgrading automatically generates the file /etc/default/snort
+    from /etc/snort/snort.common.parameters. 
+
+  * Since the automatically generated file may not be correct, you should 
+    inspect it or create a new one to your liking.  If the configuration
+    file is correct, delete /etc/snort/snort.common.parameters and restart
+    the server to use the new file. The system will run Snort with the old
+    configuration file until you do so.
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Tue,  8 Feb 2005 23:55:57 +0100
--- snort-2.3.3.orig/debian/snort.dirs
+++ snort-2.3.3/debian/snort.dirs
@@ -0,0 +1,11 @@
+etc/cron.daily
+etc/init.d
+etc/logrotate.d
+etc/default
+etc/ppp/ip-down.d
+etc/ppp/ip-up.d
+etc/snort
+usr/sbin
+usr/share/doc/snort
+usr/share/man/man8
+var/log/snort
--- snort-2.3.3.orig/debian/TODO
+++ snort-2.3.3/debian/TODO
@@ -0,0 +1,78 @@
+
+TODO things for Snort in Debian
+-------------------------------
+
+- Offer the user an option to automatically create the database since
+  the schemas (at /usr/share/doc/snort*) stuff is not available on installation.
+  Review what other packages (gnudip? horde? imp? sitebar? openwebmail?)
+  have done and consider the use of the generic user for database
+  administration.  Note that database permissions for the 'snort' 
+  user need to be properly setup!
+  Also see: http://lists.debian.org/debian-devel/2004/08/msg01104.html
+  http://lists.debian.org/debian-devel/2004/10/msg00340.html
+  and
+  http://lists.debian.org/debian-devel/2004/10/msg00962.html
+
+  I probably need to take a look at how wwwconfig-common or use the
+  new dbconfig-common information does it...
+
+- Include Rpm improvements to the init.d file suchas :
+
+   * The init.d file could use separate LOGDIR files per interface instead of
+     one for all instances (bound to break) just like it's done in the RedHat
+     init script. The check_logdir function should be called per possible LOGDIR
+     definition. If the LOGDIR did not exist it should be created with proper
+     permissions.
+
+     Note: logrotate definitions will need to be changed if this is changed
+
+   * stats option in the init.d file
+   * Additional /etc/default/snort parameters similar to the RPM ones for
+     compatibility
+
+- Include ntop improvements to init.d script: check if interface is up
+
+- Use LSB functions in Init.d script
+
+- Use ucf to integrate changes by the maintainer when upgrading
+
+- Break up the init.d script into reusable functions 
+  Also: add a check in order to determine if the snort sensor started
+  up properly or it did not.
+
+- The check_log_dir check in the init.d script could best check if the
+  LOGDIR directory is writable by the snort user. It might not be good
+  (security-wise) to force it's owned by the snort user (since then
+  it would be able to remove its own logs)
+
+- Check if --enable-flexresp works with libnet 1.1.x
+
+- The snort-common package currently does not check if you _accepted_ the
+  config file provided, this is related to bug #247665 which is partially
+  fixed by the snort-common Source-Version depends introduced in 2.2.0-2
+
+- Provide support to avoid specifying the address range for multiple
+  interfaces (or skip this if you have more than once and substitute
+  by a note telling the admin to configure this in the snort.$IFACE.conf 
+  file).  This could be done using 'ip addr show $IFACE' and extracting
+  the vaule from the 'inet' component.
+
+- Rewrite the "address range" question. It actually does not explain what
+  it is actually used for (HOME_NET)
+
+- Determine, if the interface is configured and up and has an assigned
+  IP address, the address range for the sensor in an automatic way
+  This should also handle multiple interfaces.
+  (see bug #248000)
+
+- Add some common logcheck rules (see #222584, and #217175)
+
+DONE
+
+- Have a way in preinst to migragte from the old common.parameters to the
+  new /etc/default/snort so that all users can benefit from it. 
+
+- Provide an update script, as required in #191105
+  Done: snort-rules-default currently recommends: 'oinkmaster' better
+  that than maintaining a separate update script unmaintained upstream.
+
--- snort-2.3.3.orig/debian/snort.debian.conf
+++ snort-2.3.3/debian/snort.debian.conf
@@ -0,0 +1,12 @@
+# This file is used for options that are changed by Debian to leave
+# the original lib files untouched.
+# You have to use "dpkg-reconfigure snort(-flavour)?" to change them.
+#
+# Replace (-flavour)? by pgsql, mysql or keep it empty depending on
+# what flavour of Snort you run.
+#
+DEBIAN_SNORT_STARTUP=boot
+DEBIAN_SNORT_HOME_NET="192.168.0.0/16"
+DEBIAN_SNORT_OPTIONS="-i eth0"
+DEBIAN_SNORT_STATS_RCPT="root"
+DEBIAN_SNORT_STATS_THRESHOLD="1"
--- snort-2.3.3.orig/debian/snort.init.d
+++ snort-2.3.3/debian/snort.init.d
@@ -0,0 +1,254 @@
+#!/bin/sh -e
+
+test $DEBIAN_SCRIPT_DEBUG && set -v -x
+
+DAEMON=/usr/sbin/snort
+NAME=snort
+DESC="Network Intrusion Detection System"
+
+CONFIG=/etc/snort/snort.debian.conf
+# Old (obsolete) way to provide parameters
+if [ -r /etc/snort/snort.common.parameters ] ; then
+	COMMON=`cat /etc/snort/snort.common.parameters`
+elif [ -r /etc/default/snort ] ; then
+# Only read this if the old configuration is not present
+	. /etc/default/snort
+	COMMON="$PARAMS -l $LOGDIR -u $SNORTUSER -g $SNORTGROUP"
+fi
+
+test -x $DAEMON || exit 0
+test -f $CONFIG && . $CONFIG
+test -z "$DEBIAN_SNORT_HOME_NET" && DEBIAN_SNORT_HOME_NET="192.168.0.0/16"
+
+# to find the lib files
+cd /etc/snort
+
+check_log_dir() {
+# Does the logging directory belong to Snort?
+	# If we cannot determine the logdir return without error
+	# (we will not check it)
+	# This will only be used by people using /etc/default/snort
+	[ -n "$LOGDIR" ] || return 0
+	[ -n "$SNORTUSER" ] || return 0
+	if [ ! -e "$LOGDIR" ] ; then
+		echo -n "ERR: logging directory $LOGDIR does not exist"
+		return 1
+	elif [ ! -d "$LOGDIR" ] ; then
+		echo -n "ERR: logging directory $LOGDIR does not exist"
+		return 1
+	else
+		real_log_user=`stat -c %U $LOGDIR`
+	# An alternative way is to check if the snort user can create 
+	# a file there...
+		if [ "$real_log_user" != "$SNORTUSER" ] ; then
+			echo -n "ERR: logging directory $LOGDIR does not belong to the snort user $SNORTUSER"
+			return 1
+		fi
+	fi
+	return 0
+}
+
+case "$1" in
+  start)
+        if [ -e /etc/snort/db-pending-config ] ; then
+		echo "WARN: /etc/snort/db-pending-config file found"
+		echo "WARN: Snort will not start as its database is not yet configured."
+		echo "WARN: Please configure the database as described in"
+		echo "WARN: /usr/share/doc/snort-{pgsql,mysql}/README-database.Debian"
+		echo "WARN: and remove /etc/snort/db-pending-config"
+		exit 1
+	fi
+
+	echo -n "Starting $DESC: "
+        if ! check_log_dir; then
+		echo " will not start $DESC!"
+		exit 1
+	fi
+	if [ "$DEBIAN_SNORT_STARTUP" = "dialup" ]; then
+		shift
+		set +e
+		/etc/ppp/ip-up.d/snort "$@"
+		exit $?
+	fi
+
+	# Usually, we start all interfaces
+	interfaces="$DEBIAN_SNORT_INTERFACE"
+
+	# If we are requested to start a specific interface...
+	test "$2" && interfaces="$2"
+
+	myret=0
+	got_instance=0
+	for interface in $interfaces; do
+		got_instance=1
+		echo -n "$NAME($interface)"
+
+		PIDFILE=/var/run/snort_$interface.pid
+
+		fail="failed (check /var/log/daemon.log)"
+		/sbin/start-stop-daemon --stop --signal 0 --quiet \
+			--pidfile "$PIDFILE" --exec $DAEMON >/dev/null &&
+				fail="already running"
+
+		CONFIGFILE=/etc/snort/snort.$interface.conf
+		if [ ! -e "$CONFIGFILE" ]; then
+			echo "No /etc/snort/snort.$interface.conf, defaulting to snort.conf"
+			CONFIGFILE=/etc/snort/snort.conf
+		fi
+
+		set +e
+		/sbin/start-stop-daemon --start --quiet --pidfile "$PIDFILE" \
+			--exec $DAEMON -- $COMMON $DEBIAN_SNORT_OPTIONS \
+			-c $CONFIGFILE \
+			-S "HOME_NET=[$DEBIAN_SNORT_HOME_NET]" \
+			-i $interface >/dev/null
+		ret=$?
+		set -e
+		case "$ret" in
+			0)
+				echo "."
+				;;
+			*)
+				echo "...$fail."
+				myret=$(expr "$myret" + 1)
+				;;
+		esac
+	done
+
+	if [ "$got_instance" = 0 ]; then
+		echo "No snort instance found to be started!" >&2
+		exit 1
+	fi
+
+	exit $myret
+	;;
+  stop)
+	if [ "$DEBIAN_SNORT_STARTUP" = "dialup" ]; then
+		shift
+		set +e
+		/etc/ppp/ip-down.d/snort "$@"
+		exit $?
+	fi
+
+	# Usually, we stop all current running interfaces
+	pidpattern=/var/run/snort_*.pid
+
+	# If we are requested to stop a specific interface...
+	test "$2" && pidpattern=/var/run/snort_"$2".pid
+
+	got_instance=0
+	for PIDFILE in $pidpattern; do
+		# This check is also needed, if the above pattern doesn't match
+		test -f "$PIDFILE" || continue
+
+		got_instance=1
+		interface=$(basename "$PIDFILE" .pid | sed -e 's/^snort_//')
+
+		echo -n "Stopping $DESC: $NAME($interface)"
+
+		/sbin/start-stop-daemon --stop --retry 5 --quiet --oknodo \
+			--pidfile "$PIDFILE" --exec $DAEMON >/dev/null
+		rm -f "$PIDFILE"
+
+		echo "."
+	done
+
+	if [ "$got_instance" = 0 ]; then
+		echo "No snort instance found to be stopped!" >&2
+	fi
+	;;
+  restart|force-restart|reload|force-reload)
+	# Usually, we restart all current running interfaces
+	pidpattern=/var/run/snort_*.pid
+
+	# If we are requested to restart a specific interface...
+	test "$2" && pidpattern=/var/run/snort_"$2".pid
+
+	got_instance=0
+	for PIDFILE in $pidpattern; do
+		# This check is also needed, if the above pattern doesn't match
+		test -f "$PIDFILE" || continue
+
+		got_instance=1
+		interface=$(basename "$PIDFILE" .pid | sed -e 's/^snort_//')
+		$0 stop $interface || true
+		$0 start $interface || true
+	done
+
+	if [ "$got_instance" = 0 ]; then
+		echo "No snort instance found to be restarted!" >&2
+	fi
+	;;
+  status)
+        echo -n "Status of snort daemon(s):"
+	interfaces="$DEBIAN_SNORT_INTERFACE"
+	# If we are requested to check for a specific interface...
+	test "$2" && interfaces="$2"
+	for interface in $interfaces; do
+                echo -n " $interface "
+                pidfile=/var/run/snort_$interface.pid
+                if [ -f  "$pidfile" ] ; then
+ 	                pidval=`cat $pidfile`
+		        if ps -p $pidval | grep -q snort; then
+		       		echo -n "(ok)"
+			else
+				echo -n "(nok!)"
+			fi
+                 else
+                        echo -n "(nok!)"
+                 fi
+        done
+        echo "."
+        ;;
+  config-check)
+	if [ "$DEBIAN_SNORT_STARTUP" = "dialup" ]; then
+		echo "Config-check is currently not supported for snort in Dialup configuration"
+		exit 0
+	fi
+
+	# usually, we test all interfaces
+	interfaces="$DEBIAN_SNORT_INTERFACE"
+	# if we are requested to test a specific interface...
+	test "$2" && interfaces="$2"
+
+	myret=0
+	got_instance=0
+	for interface in $interfaces; do
+		got_instance=1
+		echo -n "checking $desc config: $name($interface)"
+
+		CONFIGFILE=/etc/snort/snort.$interface.conf
+		if [ ! -e "$CONFIGFILE" ]; then
+			CONFIGFILE=/etc/snort/snort.conf
+		fi
+		COMMON=`echo $COMMON | sed -e 's/-D//'`
+		set +e
+		$DAEMON -T $COMMON $DEBIAN_SNORT_OPTIONS \
+			-c $CONFIGFILE \
+			-S "HOME_NET=[$DEBIAN_SNORT_HOME_NET]" \
+			-i $interface >/dev/null 2>&1
+		ret=$?
+		set -e
+		case "$ret" in
+			0)
+				echo ".ok."
+				;;
+			*)
+				echo "...failed."
+				myret=$(expr "$myret" + 1)
+				;;
+		esac
+	done
+	if [ "$got_instance" = 0 ]; then
+		echo "no snort instance found to be started!" >&2
+		exit 1
+	fi
+
+	exit $myret
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|force-restart|reload|force-reload|status|config-check}"
+	exit 1
+	;;
+esac
+exit 0
--- snort-2.3.3.orig/debian/snort-common.templates
+++ snort-2.3.3/debian/snort-common.templates
@@ -0,0 +1,11 @@
+Template: snort/deprecated_config
+Type: note
+_Description: Your configuration file is deprecated
+ Your Snort configuration file (/etc/snort/snort.conf) uses deprecated
+ options no longer available for this Snort release. 
+ Snort will not be able to start unless you provide a correct configuration
+ file. You can substitute your configuration file with the one provided
+ in this package or fix it manually by removing deprecated options.
+ .
+ The following deprecated options were found in your configuration file:
+ ${DEP_CONFIG}
--- snort-2.3.3.orig/debian/snort.common.parameters
+++ snort-2.3.3/debian/snort.common.parameters
@@ -0,0 +1 @@
+-m 027 -D -l /var/log/snort -d -u snort -g snort
--- snort-2.3.3.orig/debian/snort-doc.dirs
+++ snort-2.3.3/debian/snort-doc.dirs
@@ -0,0 +1 @@
+/usr/share/doc/snort
--- snort-2.3.3.orig/debian/snort-doc.doc-base.paper
+++ snort-2.3.3/debian/snort-doc.doc-base.paper
@@ -0,0 +1,16 @@
+Document: snort-paper
+Title: Snort - Lightweight Intrusion Detection for Networks
+Author: Martin Roesch
+Abstract: An overview of Snort NIDS
+ Network intrusion detection systems (NIDS) are an important part of any
+ network security architecture.  They provide a layer of defense which
+ monitors network traffic for predefined suspicious activity or patterns, and
+ alert system administrators when potential hostile traffic is detected.
+ Commercial NIDS have many differences, but Information Systems departments
+ must face the commonalities that they share such as significant system
+ footprint, complex deployment and high monetary cost.  Snort was designed to
+ address these issues.
+Section: Apps/Net
+
+Format: text
+Files: /usr/share/doc/snort-doc/lisapaper.txt.gz
--- snort-2.3.3.orig/debian/snort-common.manpages
+++ snort-2.3.3/debian/snort-common.manpages
@@ -0,0 +1 @@
+debian/snort-stat.8
--- snort-2.3.3.orig/debian/snort.config
+++ snort-2.3.3/debian/snort.config
@@ -0,0 +1,117 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+[ -r /etc/snort/snort.debian.conf ] && . /etc/snort/snort.debian.conf
+
+check_interfaces() {
+# Check the interface status, abort with error if a configured one is not
+# available
+      [ -z "$INTERFACES" ] && return 0
+      ints=`echo $INTERFACES | sed -e  's/,/ /g'`
+      for iface in $ints; do
+	      if ! ifconfig "$iface" | grep -w UP >/dev/null; then
+		      return 1
+	     fi
+      done
+      return 0
+}
+
+db_input low snort/startup || true
+db_go
+
+# /etc/ppp/ip-up.d/snort is called with interface and IP number
+db_get snort/startup
+if [ "$RET" = "dialup" ]; then
+  db_set snort/interface ""
+  db_set snort/address_range ""
+  db_set snort/disable_promiscuous true
+else
+  db_beginblock
+  # Interface default in case the configuration file does not exist
+  if [ -z "$DEBIAN_SNORT_INTERFACE" ] ; then
+  	INTERFACES=eth0
+  else 
+  	INTERFACES=$DEBIAN_SNORT_INTERFACE
+  fi
+
+  # Ask for a valid set of interfaces
+  ok=''
+  count=0
+  while [ ! "$ok" ] && [ "$count" -lt 2 ]; do
+  # Depending on whether the default interface is up or down we set the
+  # question priority
+        priority='medium'
+	if ! check_interfaces
+	then
+	    priority='high'
+	    db_fset snort/interface seen false 
+	fi
+	set +e
+	db_input $priority snort/interface
+        if [ $? -eq 30 ]; then
+	# User is not being shown the question, break out
+	     break
+	fi
+	set -e
+	db_go || true
+   # Check the interfaces
+	db_get snort/interface
+	INTERFACES=$RET
+	if ! check_interfaces ; then
+	  db_fset snort/invalid_interface seen false 
+	  db_input critical snort/invalid_interface
+	else
+	  ok='yes'
+        fi
+	# Increment the count, we only go through this two times
+	count=$(($count+1))
+  done
+
+  db_input high snort/address_range || true
+  db_input low snort/disable_promiscuous || true
+  db_endblock
+  db_go
+fi
+
+db_beginblock
+db_input low snort/reverse_order || true
+db_input low snort/options || true
+db_endblock
+db_go
+
+db_beginblock
+db_input low snort/send_stats || true
+db_go
+
+db_get snort/send_stats
+if [ $RET = true ]; then
+# TODO: This values should not be empty (even
+# if we default to 'root' and '1' in the scripts)
+# so the config script should check wether the 
+# values here are legitimate.
+	db_beginblock
+	db_input medium snort/stats_rcpt || true
+	db_input low snort/stats_treshold || true
+	db_endblock
+	db_go
+fi
+
+db_get snort/startup
+if [ $RET = "manual" ]; then
+	db_beginblock
+	db_input medium snort/please_restart_manually || true
+	db_endblock
+	db_go
+fi
+
+DEFAULT=/etc/default/snort
+PARAMETERS=/etc/snort/snort.common.parameters
+if [ -e "$DEFAULT" ] && [ -e "$PARAMETERS" ] ; then
+	db_beginblock
+	db_input medium snort/config_parameters || true
+	db_endblock
+	db_go
+fi
+
+db_stop
--- snort-2.3.3.orig/debian/po/de.po
+++ snort-2.3.3/debian/po/de.po
@@ -0,0 +1,634 @@
+# translation of snort_2.3.3-9_de.po to German
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+#
+# Erik Schanze <eriks@debian.org>, 2004-2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: snort_2.3.3-9_de\n"
+"Report-Msgid-Bugs-To: jfs@computer.org\n"
+"POT-Creation-Date: 2006-12-28 23:00+0100\n"
+"PO-Revision-Date: 2006-11-04 13:28+0100\n"
+"Last-Translator: Erik Schanze <eriks@debian.org>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: select
+#. Choices
+#: ../snort.templates:1001 ../snort-mysql.templates:1001
+#: ../snort-pgsql.templates:1001
+msgid "boot, dialup, manual"
+msgstr "Systemstart, Einwahl, Manuell"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid "When should Snort be started?"
+msgstr "Wann soll Snort gestartet werden?"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid ""
+"Snort can be started during boot, when connecting to the net with pppd or "
+"only when you manually start it via /usr/sbin/snort."
+msgstr ""
+"Snort kann beim Systemstart, bei der Einwahl ins Internet mit Pppd oder nur "
+"manuell mittels /usr/sbin/snort gestartet werden."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid "On which interface(s) should Snort listen?"
+msgstr ""
+"An welcher Schnittstelle bzw. welchen Schnittstellen soll Snort lauschen?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Please enter the name(s) of the interface(s) which Snort should listen on.  "
+"The names of the available interfaces are provided by either running  'ip "
+"link show' of 'ifconfig'. This value usually is 'eth0', but you might want "
+"to vary this depending on your environment, if you are using a dialup "
+"connection 'ppp0' might be more appropiate."
+msgstr ""
+"Bitte geben Sie den/die Namen der Schnittstelle(n) ein, an denen Snort "
+"lauschen soll. Die Namen der verfÃ¼gbaren Schnittstellen werden durch den "
+"Befehl 'ip link show' oder 'ifconfig' angezeigt. Normalerweise ist das "
+"Â»eth0,Â« aber Sie kÃ¶nnen das an Ihre Anforderungen anpassen. Wenn Sie eine "
+"Einwahlverbindung benutzen, sollten Sie Â»ppp0 Â«verwenden."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Notice that Snort is usually configured to inspect all traffic coming from "
+"the Internet, so the interface you add here is usually the same the 'default "
+"route' is on.  You can determine which interface is used for this running "
+"either '/sbin/ip ro sh' or '/sbin/route -n' (look for 'default' or "
+"'0.0.0.0')."
+msgstr ""
+"Beachten Sie, dass Snort normalerweise so eingestellt ist, dass es den "
+"gesamten ankommenden Verkehr aus dem Internet untersucht, deshalb sollte die "
+"Standard-Route auf die Schnittstelle zeigen, die Sie hier angeben. Sie "
+"kÃ¶nnen diese Schnittstelle mit dem Kommando '/sbin/ip ro sh' oder '/sbin/"
+"route -n' herausfinden (suchen Sie nach Â»defaultÂ« oder Â»0.0.0.0Â«)."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"It is also not uncommon to run Snort on an interface with no IP and "
+"configured in promiscuous mode, if this is your case, select the interface "
+"in this system that is physically connected to the network you want to "
+"inspect, enable promiscuous mode later on and make sure that the network "
+"traffic is sent to this interface (either connected to a 'port mirroring/"
+"spanning' port in a switch, to a hub or to a tap)"
+msgstr ""
+"Es ist auch Ã¼blich, Snort an einer Schnittstelle ohne IP-Adresse im Modus "
+"Â»promiscuousÂ« zu betreiben. Wenn Sie das wollen, wÃ¤hlen Sie die "
+"Schnittstelle aus, die physisch mit dem Netzwerk verbunden ist, das Sie "
+"Ã¼berwachen wollen, und schalten den Modus Â»promiscuousÂ« spÃ¤ter ein. Stellen "
+"Sie sicher, dass der Netzwerkverkehr die Schnittstelle erreicht (entweder "
+"angeschlossen an einen Anschluss Â»port mirroring/spanningÂ« eines Switches, "
+"einen Hub oder einen Tap). "
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"You can configure multiple interfaces here, just by adding more than one "
+"interface name separated by spaces. Each interface can have its specific "
+"configuration."
+msgstr ""
+"Sie mehrere Schnittstellennamen durch Leerzeichen getrennt eingeben. Jede "
+"Schnittstelle kann ihre eigenen Einstellungen haben."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid "Please enter the address range that Snort will listen on."
+msgstr "Bitte geben Sie den Adressbereich ein, an dem Snort lauschen soll."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+"192.168.1.42/32 for just one. Specify multiple addresses on a single line "
+"separated by ',' (comma characters), no spaces allowed!"
+msgstr ""
+"Sie mÃ¼ssen das CIDR-Format benutzen, z. B. 192.168.1.0/24 fÃ¼r einen Block "
+"von 256 IP-Adressen oder 192.168.1.42/32 fÃ¼r nur eine. Trennen Sie mehrere "
+"IP-Adressen in einer Zeile durch Komma, Leerzeichen sind nicht erlaubt!"
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"If you want you can specify 'any', to not trust any side of the network."
+msgstr ""
+"Sie kÃ¶nnen Â»anyÂ« eingeben, um keiner Seite des Netzwerkes zu vertrauen."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"Notice that if you are using multiple interfaces this definition will be "
+"used as the HOME_NET definition of all of them."
+msgstr ""
+"Beachten Sie, wenn Sie mehrere Schnittstellen benutzen, wird diese "
+"Festlegung als HOME_NET-Definition fÃ¼r alle verwendet."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid "Should Snort disable promiscuous mode on the interface?"
+msgstr "Soll Snort den Modus Â»promiscuousÂ« an der Schnittstelle ausschalten?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disabling promiscuous mode means that Snort will only see packets addressed "
+"to it's own interface. Enabling it allows Snort to check  every packet that "
+"passes ethernet segment even if it's a connection between two other "
+"computers."
+msgstr ""
+"Das Ausschalten des Modus' Â»promiscuousÂ« bedeutet, dass Snort nur die Pakete "
+"sehen wird, die an seine eigene Schnittstelle adressiert sind. Das "
+"Einschalten ermÃ¶glicht es Snort, alle Pakete, die ein Netzwerk-Segment "
+"durchlaufen, zu Ã¼berprÃ¼fen, auch wenn es eine Verbindung zwischen zwei "
+"anderen Rechnern ist."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disable promiscuous mode if you are configuring Snort on an interface "
+"without a configured IP address."
+msgstr ""
+"Schalten Sie den Modus Â»promiscuousÂ« aus, wenn Sie Snort fÃ¼r eine "
+"Schnittstelle einrichten, an der keine IP-Adresse eingestellt ist."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid "Invalid interface"
+msgstr "UngÃ¼ltige Schnittstelle"
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"One of the interfaces you specified is not valid (it might not exist on the "
+"system or be down). Please introduce a valid interface when answering the "
+"question of which interface(s) should Snort listen on."
+msgstr ""
+"Eine der Schnittstellen, die Sie angegeben haben, ist ungÃ¼ltig (es gibt sie "
+"nicht in dem System oder sie ist heruntergefahren). Bitte geben Sie auf die "
+"Frage nach der Schnittstelle bzw. den Schnittstellen, an der bzw. denen "
+"Snort lauschen soll, nur gÃ¼ltige Schnittstellen ein."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"If you did not configure an interface then the package is trying to use the "
+"default ('eth0') which does not seem to be valid in your system."
+msgstr ""
+"Wenn Sie keine Schnittstelle eingeben, verwendet das Paket die "
+"Standardschnittstelle (eth0). Das scheint bei Ihrem System nicht richtig zu "
+"sein."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid "Should Snort's rules testing order be changed to Pass|Alert|Log?"
+msgstr ""
+"Soll Snorts Reihenfolge der Testregeln auf Pass|Alert|Log geÃ¤ndert werden?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid ""
+"If you change Snort's rules testing order to Pass|Alert|Log, they will be "
+"applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+"This will prevent people from having to make huge Berky Packet Filter "
+"command line arguments to filter their alert rules."
+msgstr ""
+"Wenn Sie Snorts Reihenfolge der Testregeln auf Pass|Alert|Log Ã¤ndern, werden "
+"sie in der Reihenfolge Pass->Alert->Log angewendet, anstelle des Standards "
+"Alert->Pass->Log. Das bewahrt die Leute davor, eine groÃŸe Menge an "
+"Kommandozeilen-Argumenten des Berky-Paket-Filters angeben zu mÃ¼ssen, um ihre "
+"Alarmregeln zu filtern."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid "Should daily summaries be sent by e-mail?"
+msgstr "Soll eine tÃ¤gliche Statistik per E-Mail verschickt werden?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid ""
+"This Snort installation provides a cron job that runs daily and summarises "
+"the information of Snort logs to a selected email address. If you want to "
+"disable this feature say 'no' here."
+msgstr ""
+"Diese Snort-Installation stellt einen Cronjob zur VerfÃ¼gung, der tÃ¤glich "
+"ausgefÃ¼hrt wird und zusammengefasste Informationen aus den Protokolldateien "
+"von Snort an eine eingestellte E-Mail-Adresse schickt. Wenn Sie das nicht "
+"wollen, lehnen Sie das hier ab."
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid "Who should receive the daily statistics mails?"
+msgstr "Wer soll die tÃ¤glichen Statistik-E-Mails erhalten?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid ""
+"A cron job running daily will summarise the information of the logs "
+"generated by Snort using a script called 'snort-stat'. Introduce here the "
+"recipient of these mails. The default value is the system administrator. If "
+"you keep this value, make sure that the mail of the administrator is "
+"redirected to a user that actually reads those mails."
+msgstr ""
+"Ein Cronjob, der tÃ¤glich lÃ¤uft, fasst die Informationen aus den "
+"Protokolldateien, die Snort erzeugt, durch das Skript Â»snort-statÂ« zusammen. "
+"Geben Sie hier den EmpfÃ¤nger dieser E-Mails ein. StandardmÃ¤ÃŸig ist das der "
+"Systemadministrator. Wenn Sie das so lassen, sorgen Sie dafÃ¼r, dass die E-"
+"Mails an den Administrator an einen Benutzer weitergeleitet werden, der "
+"momentan solche E-Mails liest."
+
+#. Type: string
+#. Description
+#: ../snort.templates:9001 ../snort-mysql.templates:8001
+#: ../snort-pgsql.templates:8001
+msgid ""
+"If you want to specify custom options to Snort, please specify them here."
+msgstr ""
+"Wenn Sie Snort besondere Optionen mitgeben wollen, geben Sie die hier ein."
+
+#. Type: string
+#. Description
+#: ../snort.templates:10001 ../snort-mysql.templates:9001
+#: ../snort-pgsql.templates:9001
+msgid ""
+"An alert needs to appear more times than this number to be included in the "
+"daily statistics."
+msgstr ""
+"Ein Alarm muss Ã¶fter als dieser Wert auftreten, um in die tÃ¤gliche Statistik "
+"aufgenommen zu werden."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid "You are running Snort manually."
+msgstr "Sie lassen Snort manuell laufen."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid ""
+"Please restart Snort using:\n"
+" /etc/init.d/snort start\n"
+"to let the settings take effect."
+msgstr ""
+"Bitte starten Sie Snort neu mittels:\n"
+" /etc/init.d/snort start\n"
+"damit die Einstellungen wirksam werden."
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid "There is an error in your configuration"
+msgstr "Fehler in Ihren Einstellungen"
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid ""
+"Your Snort configuration is not correct and Snort will not be able to start "
+"up normally. Please review your configuration and fix it. If you do not do "
+"this, Snort package upgrades will probably break. To check which error is "
+"being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf' (or point "
+"to an alternate configuration file if you are using different files for "
+"different interfaces)"
+msgstr ""
+"Ihre Einstellungen von Snort sind nicht richtig und Snort wird nicht normal "
+"starten kÃ¶nnen. Bitte berichtigen Sie das. Wenn Sie das nicht beheben, "
+"werden Paketaktualisierungen von Snort wahrscheinlich abbrechen. Um den "
+"Fehler zu Ã¼berprÃ¼fen, starten Sie '/usr/sbin/snort -T -c /etc/snort/snort."
+"conf' (oder geben eine andere Konfigurationsdatei an, wenn Sie verschiedene "
+"Dateien fÃ¼r verschiedene Schnittstellen benutzen). "
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid "This system uses an obsolete configuration file"
+msgstr "Das System benutzt eine veraltete Konfigurationsdatei. "
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid ""
+"Your system has an obsolete configuration file (/etc/snort/snort.common."
+"parameters) which has been automatically converted into the new "
+"configuration file format (at /etc/default/snort). Please review the new "
+"configuration and remove the obsolete one. Until you do this, the init.d "
+"script will not use the new configuration and you will not take advantage of "
+"the benefits introduced in newer releases."
+msgstr ""
+"Ihr System hat eine veraltete Konfigurationsdatei (/etc/snort/snort.common."
+"parameters), die automatisch in das neue Format (nach /etc/default/snort) "
+"umgewandelt wurde. Bitte Ã¼berprÃ¼fen Sie die neue Konfigurationsdatei und "
+"lÃ¶schen Sie die veraltete. Bis dahin wird das Startskript (in /etc/init.d) "
+"die neuen Einstellungen nicht verwenden und Sie kÃ¶nnen die Vorteile der "
+"neuen Version nicht nutzen."
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid "Do you want to set up a database for snort-mysql to log to?"
+msgstr ""
+"Wollen Sie fÃ¼r snort-mysql eine Datenbank einrichten, in die es "
+"protokolliert?"
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-mysql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a mysql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-mysql package with 'dpkg-"
+"reconfigure -plow snort-mysql'"
+msgstr ""
+"Das ist nur bei der ersten Installation von snort-mysql nÃ¶tig. Bevor Sie "
+"weiter machen, stellen Sie sicher, dass Sie (1) den Namen des Rechners "
+"kennen, auf dem ein MySQL-Server lÃ¤uft und der TCP-Verbindungen von Ihrem "
+"Rechner annimmt, dass (2) es eine Datenbank auf diesem Server gibt und dass "
+"(3) Sie einen Datenbank-Benutzernamen mit Passwort kennen. Wenn Sie nicht "
+"_alle_ dieser Angaben haben, besorgen Sie sich diese zuerst oder lehnen hier "
+"ab und arbeiten mit Protokollierung in eine normale Datei. Sie kÃ¶nnen das "
+"Protokollieren in eine Datenbank spÃ¤ter einschalten, indem Sie das Paket "
+"snort-mysql mit dem Kommando 'dpkg-reconfigure -plow snort-mysql' neu "
+"einrichten. "
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid "Snort needs a configured database to log to before it starts."
+msgstr "Snort benÃ¶tigt zum Starten eine eingerichtete Protokoll-Datenbank."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+"Fill in the correct values for the user, host, and database names. MySQL "
+"will prompt you for the password."
+msgstr ""
+"Snort benÃ¶tigt eine eingerichtete Datenbank, bevor Sie es nutzen kÃ¶nnen. Um "
+"diese aufzubauen, mÃ¼ssen Sie folgende Kommandos NACH der Installation "
+"ausfÃ¼hren:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <Benutzer> -h <Rechner> -p <DB-Name>\n"
+"Geben Sie die korrekten Werte fÃ¼r Benutzer, Rechner und Datenbankname ein. "
+"MySQL wird Sie nach dem Passwort fragen."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid ""
+"After you created the database structure, you will need to start Snort "
+"manually."
+msgstr ""
+"Wenn Sie die Datenbankstruktur angelegt haben, mÃ¼ssen Sie Snort noch starten."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001
+msgid "Please enter the hostname of the mysql database server to use."
+msgstr ""
+"Bitte den Rechnernamen des verwendeten MySQL-Datenbank-Servers eingeben."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001 ../snort-pgsql.templates:13001
+msgid ""
+"Make sure it has been set up correctly to allow incoming connections from "
+"this host!"
+msgstr ""
+"Stellen Sie sicher, dass er so eingerichtet ist, dass er Verbindungen von "
+"diesem Rechner annimmt!"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid "Please enter the name of the database to use."
+msgstr "Bitte den Namen der verwendeten Datenbank eingeben."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid ""
+"Make sure this database has been created and your database user has write "
+"access to this database."
+msgstr ""
+"Stellen Sie sicher, dass die Datenbank angelegt wurde und Ihr Benutzer "
+"Schreibzugriff auf die Datenbank hat."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Please enter the name of the database user you want to use."
+msgstr "Bitte den Namen des verwendeten Datenbank-Benutzers eingeben."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Make sure this user has been created and has write access."
+msgstr ""
+"Stellen Sie sicher, dass der Benutzer angelegt wurde und Schreibzugriff auf "
+"die Datenbank hat."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter the password for the database connection."
+msgstr "Bitte das Passwort fÃ¼r die Datenbankverbindung eingeben."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter a password to connect to the Snort Alert database."
+msgstr ""
+"Bitte das Passwort fÃ¼r die Verbindung zur Alarm-Datenbank von Snort eingeben."
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid "Do you want to set up a database for snort-pgsql to log to?"
+msgstr ""
+"Wollen Sie fÃ¼r snort-pgsql eine Datenbank einrichten, in die es "
+"protokolliert?"
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-pgsql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a pgsql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-pgsql package with 'dpkg-"
+"reconfigure -plow snort-pgsql'"
+msgstr ""
+"Das ist nur bei der ersten Installation von snort-pgsql nÃ¶tig. Bevor Sie "
+"weiter machen, stellen Sie sicher, dass Sie (1) den Namen des Rechners "
+"kennen, auf dem ein PostgreSQL-Server lÃ¤uft und der TCP-Verbindungen von "
+"Ihrem Rechner annimmt, dass (2) es eine Datenbank auf diesem Server gibt und "
+"dass (3) Sie einen Datenbank-Benutzernamen mit Passwort kennen. Wenn Sie "
+"nicht _alle_ dieser Angaben haben, besorgen Sie sich diese zuerst oder "
+"lehnen hier ab und arbeiten mit Protokollierung in eine normale Datei. Sie "
+"kÃ¶nnen das Protokollieren in eine Datenbank spÃ¤ter einschalten, indem Sie "
+"das Paket snort-pgsql mit dem Kommando 'dpkg-reconfigure -plow snort-pgsql' "
+"neu einrichten. "
+
+#. Type: note
+#. Description
+#: ../snort-pgsql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+"Fill in the correct values for the user, host, and database names. "
+"PostgreSQL will prompt you for the password."
+msgstr ""
+"Snort benÃ¶tigt eine eingerichtete Datenbank, bevor Sie es nutzen kÃ¶nnen. Um "
+"diese aufzubauen, mÃ¼ssen Sie folgende Kommandos NACH der Installation "
+"ausfÃ¼hren:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <Benutzer> -h <Rechner> -W <DB-Name>\n"
+"Geben Sie die korrekten Werte fÃ¼r Benutzer, Rechner und Datenbankname ein. "
+"PostgreSQL wird Sie nach dem Passwort fragen."
+
+#. Type: string
+#. Description
+#: ../snort-pgsql.templates:13001
+msgid "Please enter the hostname of the pgsql database server to use."
+msgstr ""
+"Bitte den Rechnernamen des verwendeten PostgreSQL-Datenbank-Servers eingeben."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid "Your configuration file is deprecated"
+msgstr "Ihre Konfigurationsdatei ist veraltet. "
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"Your Snort configuration file (/etc/snort/snort.conf) uses deprecated "
+"options no longer available for this Snort release.  Snort will not be able "
+"to start unless you provide a correct configuration file. You can substitute "
+"your configuration file with the one provided in this package or fix it "
+"manually by removing deprecated options."
+msgstr ""
+"Ihre Snort-Konfigurationsdatei (/etc/snort/snort.conf) nutzt veraltete "
+"Optionen, die ab dieser Version von Snort nicht mehr gÃ¼ltig sind. Snort kann "
+"solange nicht starten, bis Sie eine richtige Konfigurationsdatei erstellen. "
+"Sie kÃ¶nnen Ihre Konfigurationsdatei durch die des Pakets ersetzen oder durch "
+"entfernen der veralteten Optionen manuell berichtigen."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"The following deprecated options were found in your configuration file: "
+"${DEP_CONFIG}"
+msgstr ""
+"Folgende veraltete Optionen wurden in Ihrer Konfigurationsdatei gefunden: "
+"${DEP_CONFIG}"
+
+#~ msgid ""
+#~ "Your system has an obsolete configuration file  (/etc/snort/snort.common."
+#~ "parameters) which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "Ihr System hat eine veraltete Konfigurationsdatei (/etc/snort/snort."
+#~ "common.parameters), die automatisch in das neue Format (nach /etc/default/"
+#~ "snort) umgewandelt wurde. Bitte Ã¼berprÃ¼fen Sie die neue "
+#~ "Konfigurationsdatei und lÃ¶schen Sie die veraltete. Bis dahin wird das "
+#~ "Startskript (in /etc/init.d) die neuen Einstellungen nicht verwenden und "
+#~ "Sie kÃ¶nnen die Vorteile der neuen Version nicht nutzen."
--- snort-2.3.3.orig/debian/po/sv.po
+++ snort-2.3.3/debian/po/sv.po
@@ -0,0 +1,604 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: snort 2.3.3-1\n"
+"Report-Msgid-Bugs-To: jfs@computer.org\n"
+"POT-Creation-Date: 2006-12-28 23:00+0100\n"
+"PO-Revision-Date: 2005-09-30 01:58-0700\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../snort.templates:1001 ../snort-mysql.templates:1001
+#: ../snort-pgsql.templates:1001
+msgid "boot, dialup, manual"
+msgstr "boot, dialup, manuellt"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid "When should Snort be started?"
+msgstr "När ska Snort startas?"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid ""
+"Snort can be started during boot, when connecting to the net with pppd or "
+"only when you manually start it via /usr/sbin/snort."
+msgstr ""
+"Snort kan startas vid uppstart, när uppkoppling mot nätverk sker (pppd) "
+"eller bara när du manuellt startat den med /usr/sbin/snort."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid "On which interface(s) should Snort listen?"
+msgstr "På vilket/vilka interface ska Snort lyssna?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Please enter the name(s) of the interface(s) which Snort should listen on.  "
+"The names of the available interfaces are provided by either running  'ip "
+"link show' of 'ifconfig'. This value usually is 'eth0', but you might want "
+"to vary this depending on your environment, if you are using a dialup "
+"connection 'ppp0' might be more appropiate."
+msgstr ""
+"Ange namn(en) på de interface som Snort ska lyssna på.  Namnen på de "
+"tillgängliga interfacen får du fram genom att köra 'ip link show' eller "
+"'ifconfig'.Detta värde är oftast 'eth0' men du kanske vill välja en annan "
+"beroende på din miljö.Om du använder en uppringd förbindelse är antagligen "
+"'ppp0' det bästa valet."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Notice that Snort is usually configured to inspect all traffic coming from "
+"the Internet, so the interface you add here is usually the same the 'default "
+"route' is on.  You can determine which interface is used for this running "
+"either '/sbin/ip ro sh' or '/sbin/route -n' (look for 'default' or "
+"'0.0.0.0')."
+msgstr ""
+"Notera att Snort är normalt konfigurerad att inspektera all trafik som "
+"kommer från Internet så interfacet du lägger till här är normalt det samma "
+"som din standard gateway är på.  Du kan ta fram denna information genom att "
+"köra '/sbin/ip ro sh' eller '/sbin/route -n' (leta efter 'default' eller "
+"'0.0.0.0')."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"It is also not uncommon to run Snort on an interface with no IP and "
+"configured in promiscuous mode, if this is your case, select the interface "
+"in this system that is physically connected to the network you want to "
+"inspect, enable promiscuous mode later on and make sure that the network "
+"traffic is sent to this interface (either connected to a 'port mirroring/"
+"spanning' port in a switch, to a hub or to a tap)"
+msgstr ""
+"Det är inte helt onormalt att köra Snort på ett interface utan IP-address "
+"och som är konfigurerat i promiscuousläge. Om det är det du vill, välj "
+"interface på detta system som är fysiskt kopplad till nätverket du vill "
+"inspektera. Aktivera promiscuousläget efter det och kontrollera att "
+"nätverkstrafiken skickas till detta interface (antingen kopplade till en "
+"'port mirror/spanning'-port i en switch, en hub eller en tap)"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"You can configure multiple interfaces here, just by adding more than one "
+"interface name separated by spaces. Each interface can have its specific "
+"configuration."
+msgstr ""
+"Du kan konfigurera flera interface här, bara att lägga till fler än ett "
+"interfacenamn separerade med mellanslag. Varje interface kan ha sin egen "
+"specifika konfiguration."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid "Please enter the address range that Snort will listen on."
+msgstr "Vänligen ange addressrymden som Snort ska lyssna på."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+"192.168.1.42/32 for just one. Specify multiple addresses on a single line "
+"separated by ',' (comma characters), no spaces allowed!"
+msgstr ""
+"Du ska använda CIDR-formatet, typ 192.168.1.0/24 för ett block av 256 IP "
+"eller 192.168.1.42/32 för bara en av dom. Specificera flera adresser på "
+"samma rad separerade med ',' (komma-tecken), mellanslag är inte tillåtna!"
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"If you want you can specify 'any', to not trust any side of the network."
+msgstr ""
+"Om du vill kan du specifisera 'any' för att inte lita på någon sida av "
+"nätverket."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"Notice that if you are using multiple interfaces this definition will be "
+"used as the HOME_NET definition of all of them."
+msgstr ""
+"Notera att om du använder flera interface kommer denna definition att "
+"användas som HOME_NET definition på alla av dom."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid "Should Snort disable promiscuous mode on the interface?"
+msgstr "Ska Snort stänga av promiscuousläget på interfacet?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disabling promiscuous mode means that Snort will only see packets addressed "
+"to it's own interface. Enabling it allows Snort to check  every packet that "
+"passes ethernet segment even if it's a connection between two other "
+"computers."
+msgstr ""
+"Avaktivera promiscuousläget betyder att Snort bara kommer att se paket "
+"addresserade till sitt eget interface. Aktivera det tillåter Snort att "
+"undersöka  varje paket som passerar Ethernet-segmentet även om det är "
+"anslutning mellan två andra datorer."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disable promiscuous mode if you are configuring Snort on an interface "
+"without a configured IP address."
+msgstr ""
+"Avaktivera promiscuousläget om du konfigurerar Snort på ett interface som "
+"inte har en konfigurerad IP-address."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid "Invalid interface"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"One of the interfaces you specified is not valid (it might not exist on the "
+"system or be down). Please introduce a valid interface when answering the "
+"question of which interface(s) should Snort listen on."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"If you did not configure an interface then the package is trying to use the "
+"default ('eth0') which does not seem to be valid in your system."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid "Should Snort's rules testing order be changed to Pass|Alert|Log?"
+msgstr "Ska testordningen för reglerna i Snort ändras til Pass|Alert|Log?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid ""
+"If you change Snort's rules testing order to Pass|Alert|Log, they will be "
+"applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+"This will prevent people from having to make huge Berky Packet Filter "
+"command line arguments to filter their alert rules."
+msgstr ""
+"Om du ändrar testordningen på Snort's regler till Pass|Alert|Log, kommer de "
+"tillämpas i ordningen Pass->Alert->Log istället för standardordningen Alert-"
+">Pass->Log. Detta förebygger folk från att skapa stora Berky Packet Filter "
+"kommandolinje-argument för att filtrera deras alert-regler."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid "Should daily summaries be sent by e-mail?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid ""
+"This Snort installation provides a cron job that runs daily and summarises "
+"the information of Snort logs to a selected email address. If you want to "
+"disable this feature say 'no' here."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid "Who should receive the daily statistics mails?"
+msgstr "Vem ska ta emot de dagliga e-postrapporterna?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid ""
+"A cron job running daily will summarise the information of the logs "
+"generated by Snort using a script called 'snort-stat'. Introduce here the "
+"recipient of these mails. The default value is the system administrator. If "
+"you keep this value, make sure that the mail of the administrator is "
+"redirected to a user that actually reads those mails."
+msgstr ""
+"Ett cronjob körs dagligen skapar en rapport av information i loggarna som "
+"Snort genererar genom ett att köra ett skript som heter 'snort-stat'. Ange "
+"här vem som ska ta emot dessa rapporter (via e-post). Standardvärden här är "
+"systemadministratören. Om du behåller detta värde, kontrollera att e-posten "
+"till administratören är omdirigerad till en användare som har möjlighet att "
+"läsa e-posten."
+
+#. Type: string
+#. Description
+#: ../snort.templates:9001 ../snort-mysql.templates:8001
+#: ../snort-pgsql.templates:8001
+msgid ""
+"If you want to specify custom options to Snort, please specify them here."
+msgstr "Om du vill, kan du specifisera egna inställningar för Snort här."
+
+#. Type: string
+#. Description
+#: ../snort.templates:10001 ../snort-mysql.templates:9001
+#: ../snort-pgsql.templates:9001
+msgid ""
+"An alert needs to appear more times than this number to be included in the "
+"daily statistics."
+msgstr ""
+"Ett alarm behöver dyka upp fler gånger än detta nummer för att bli "
+"inkluderade i den dagliga rapporten."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid "You are running Snort manually."
+msgstr "Du kör Snort manuellt."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid ""
+"Please restart Snort using:\n"
+" /etc/init.d/snort start\n"
+"to let the settings take effect."
+msgstr ""
+"Vänligen starta om Snort med:\n"
+" /etc/init.d/snort start\n"
+"för att ändringarna ska aktiveras."
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid "There is an error in your configuration"
+msgstr "Det är ett fel i din konfiguration"
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid ""
+"Your Snort configuration is not correct and Snort will not be able to start "
+"up normally. Please review your configuration and fix it. If you do not do "
+"this, Snort package upgrades will probably break. To check which error is "
+"being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf' (or point "
+"to an alternate configuration file if you are using different files for "
+"different interfaces)"
+msgstr ""
+"Din Snort-konfiguration är inte korrekt och Snort kommer inte att starta upp "
+"normalt. Vänligen kontrollera din konfiguration och lös problemen. Om du "
+"inte gör något åt detta kommer antagligen uppgraderingar av Snort-paket att "
+"fallera. Att kontrollera vad som är fel kan göras med att köra '/usr/sbin/"
+"snort -T -c /etc/snort/snort.conf' (eller peka på en alternativ "
+"konfigurationsfil om du använder olika filer för olika interface)."
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid "This system uses an obsolete configuration file"
+msgstr "Detta system använder en gammal konfigurationsfil"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid ""
+"Your system has an obsolete configuration file (/etc/snort/snort.common."
+"parameters) which has been automatically converted into the new "
+"configuration file format (at /etc/default/snort). Please review the new "
+"configuration and remove the obsolete one. Until you do this, the init.d "
+"script will not use the new configuration and you will not take advantage of "
+"the benefits introduced in newer releases."
+msgstr ""
+"Ditt system har en gammal konfigurationsfil (/etc/snort/snort.common."
+"parameters) vilken har blivit automatiskt konverterar till en ny "
+"konfigurationsfil med nytt format (i /etc/default/snort). Kontrollera den "
+"nya konfiguration och ta bort den gamla. Fram till att du gör detta kommer "
+"init.d-skriptet inte använda den nya konfigurationen och du kan inte använda "
+"de nya fördelarna i den nya versionen."
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid "Do you want to set up a database for snort-mysql to log to?"
+msgstr "Vill du konfigurera en databas för snort-mysql att logga in på?"
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-mysql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a mysql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-mysql package with 'dpkg-"
+"reconfigure -plow snort-mysql'"
+msgstr ""
+"Du behöver bara göra detta den första gången du installerar snort-mysql. "
+"Före den fortsätter, kontrollera att du har (1) värdnamnet på maskinen som "
+"kör MySQL-servern och som tillåter TCP-anslutningar från denna värd, (2) en "
+"databas på den server, (3) ett användarnamn och lösenord för att koppla sig "
+"mot databasen. Om du inte har _alla_ av dessa, antingen säg 'nej' och kör "
+"med vanlig loggning mot fil eller lös problemet. Du kan alltid konfigurera "
+"databasloggning senare genom att konfigurera om snort-mysql paketet med "
+"kommandot 'dpkg-reconfigure -plow snort-mysql'."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid "Snort needs a configured database to log to before it starts."
+msgstr ""
+"Snort behöver en konfigurerad databas att logga in på före den startas."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+"Fill in the correct values for the user, host, and database names. MySQL "
+"will prompt you for the password."
+msgstr ""
+"Snort behöver en konfigurerad databas före den kan starta korrekt. För att "
+"skapa databasstrukturen behöver du köra följande kommandon EFTER att paketet "
+"har installerats:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <användare> -h <värd> -p <databasnamn>\n"
+"Fyll i de korrekta värdena för användaren, värd och databasens namn. MySQL "
+"kommer att fråga dig efter lösenordet."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid ""
+"After you created the database structure, you will need to start Snort "
+"manually."
+msgstr ""
+"Efter att du skapat databasstrukturen behöver du starta Snort manuellt."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001
+msgid "Please enter the hostname of the mysql database server to use."
+msgstr "Ange värdnamnet på servern som kör mysql databasen."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001 ../snort-pgsql.templates:13001
+msgid ""
+"Make sure it has been set up correctly to allow incoming connections from "
+"this host!"
+msgstr ""
+"Kontrollera att den har satts upp korrekt och att den tillåter inkommande "
+"uppkopplingar från denna värd!"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid "Please enter the name of the database to use."
+msgstr "Ange namnet på databasen som ska användas."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid ""
+"Make sure this database has been created and your database user has write "
+"access to this database."
+msgstr ""
+"Kontrollera att denna databas har skapats och att din databas-användare har "
+"skrivrättigheter till denna databas."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Please enter the name of the database user you want to use."
+msgstr "Ange namnet på databas-användaren som ska användas."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Make sure this user has been created and has write access."
+msgstr "Kontrollera att denna användaren har skapats och har skrivrättigheter."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter the password for the database connection."
+msgstr "Ange lösenordet för databasuppkopplingen."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter a password to connect to the Snort Alert database."
+msgstr "Ange ett lösenord för uppkoppling mot Snort's Alert-databas."
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid "Do you want to set up a database for snort-pgsql to log to?"
+msgstr "Vill du konfigurera en databas för snort-pgsql att logga in på?"
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-pgsql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a pgsql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-pgsql package with 'dpkg-"
+"reconfigure -plow snort-pgsql'"
+msgstr ""
+"Du behöver bara göra detta den första gången du installerar snort-pgsql. "
+"Före den fortsätter, kontrollera att du har (1) värdnamnet på maskinen som "
+"kör pgsql-servern och som tillåter TCP-anslutningar från denna värd, (2) en "
+"databas på den server, (3) ett användarnamn och lösenord för att koppla sig "
+"mot databasen. Om du inte har _alla_ av dessa, antingen säg 'nej' och kör "
+"med vanlig loggning mot fil eller lös problemet. Du kan alltid konfigurera "
+"databasloggning senare genom att konfigurera om snort-pgsql paketet med "
+"kommandot 'dpkg-reconfigure -plow snort-pgsql'."
+
+#. Type: note
+#. Description
+#: ../snort-pgsql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+"Fill in the correct values for the user, host, and database names. "
+"PostgreSQL will prompt you for the password."
+msgstr ""
+"Snort behöver en konfigurerad databas före den kan starta korrekt. För att "
+"skapa databasstrukturen behöver du köra följande kommandon EFTER att paketet "
+"har installerats:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <användare> -h <värd> -W <databasnamn>\n"
+"Fyll i de korrekta värdena för användaren, värd och databasens namn. "
+"PostgresSQL kommer att fråga dig efter lösenordet."
+
+#. Type: string
+#. Description
+#: ../snort-pgsql.templates:13001
+msgid "Please enter the hostname of the pgsql database server to use."
+msgstr "Ange värdnamnet på servern som kör pgsql databasen."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid "Your configuration file is deprecated"
+msgstr "Din konfigurationsfil är inte användbar"
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"Your Snort configuration file (/etc/snort/snort.conf) uses deprecated "
+"options no longer available for this Snort release.  Snort will not be able "
+"to start unless you provide a correct configuration file. You can substitute "
+"your configuration file with the one provided in this package or fix it "
+"manually by removing deprecated options."
+msgstr ""
+"Din Snort-konfigurationsfil (/etc/snort/snort.conf) använder gamla "
+"inställningar som inte längre används i denna Snort utgåva.  Snort kan inte "
+"starta om du har felaktigheter i konfigurationsfilen. Du kan byta ut din "
+"konfigurationsfil med den som följer med detta paket eller lösa problemet "
+"manuellt genom att ta bort de felaktiga inställningarna."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"The following deprecated options were found in your configuration file: "
+"${DEP_CONFIG}"
+msgstr ""
+"De följande inställningarna som hittades i din konfigurationsfil är inte "
+"längre giltiga: ${DEP_CONFIG}"
+
+#~ msgid ""
+#~ "Your system has an obsolete configuration file  (/etc/snort/snort.common."
+#~ "parameters) which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "Ditt system har en gammal konfigurationsfil (/etc/snort/snort.common."
+#~ "parameters) vilken har blivit automatiskt konverterar till en ny "
+#~ "konfigurationsfil med nytt format (i /etc/default/snort). Kontrollera den "
+#~ "nya konfiguration och ta bort den gamla. Fram till att du gör detta "
+#~ "kommer init.d-skriptet inte använda den nya konfigurationen och du kan "
+#~ "inte använda de nya fördelarna i den nya versionen."
--- snort-2.3.3.orig/debian/po/ca.po
+++ snort-2.3.3/debian/po/ca.po
@@ -0,0 +1,815 @@
+# snort (debconf) translation to Catalan.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Aleix Badia i Bosch <a.badia@callusdigital.org> 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: snort_2.0.1-2_templates\n"
+"Report-Msgid-Bugs-To: jfs@computer.org\n"
+"POT-Creation-Date: 2006-12-28 23:00+0100\n"
+"PO-Revision-Date: 2005-02-26 10:41+0100\n"
+"Last-Translator: Aleix Badia i Bosch <a.badia@callusdigital.org>\n"
+"Language-Team: Debian L10n Catalan <debian-l10n-catalan@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../snort.templates:1001 ../snort-mysql.templates:1001
+#: ../snort-pgsql.templates:1001
+msgid "boot, dialup, manual"
+msgstr "arrencada, marcatge directe, manual"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid "When should Snort be started?"
+msgstr "Quan s'hauria d'iniciar el Snort?"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid ""
+"Snort can be started during boot, when connecting to the net with pppd or "
+"only when you manually start it via /usr/sbin/snort."
+msgstr ""
+"El Snort es pot iniciar a l'arrencada del sistema, quan el sistema es "
+"connecti a la xarxa a través de pppd o iniciar-lo manualment via /usr/sbin/"
+"snort."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid "On which interface(s) should Snort listen?"
+msgstr "Quina interfície(s) hauria d'escoltar el Snort?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+#, fuzzy
+msgid ""
+"Please enter the name(s) of the interface(s) which Snort should listen on.  "
+"The names of the available interfaces are provided by either running  'ip "
+"link show' of 'ifconfig'. This value usually is 'eth0', but you might want "
+"to vary this depending on your environment, if you are using a dialup "
+"connection 'ppp0' might be more appropiate."
+msgstr ""
+"Introduïu el nom de la interfície(s) que hauria d'escoltar el snort. El nom "
+"de les interfícies disponibles el podeu aconseguir executant l'ordre 'ip "
+"link show'. El valor acostuma a ser 'eth0', però us pot interessar modificar-"
+"lo en funció de l'entorn, si utilitzeu el marcatge directe probablement us "
+"interessi més el valor 'ppp0'."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Notice that Snort is usually configured to inspect all traffic coming from "
+"the Internet, so the interface you add here is usually the same the 'default "
+"route' is on.  You can determine which interface is used for this running "
+"either '/sbin/ip ro sh' or '/sbin/route -n' (look for 'default' or "
+"'0.0.0.0')."
+msgstr ""
+"Recordeu que el Snort acostuma a estar configurat per analitzar tot el "
+"tràfic d'internet, la interfície a afegir acostuma a ser la mateixa que la "
+"de la 'ruta per defecte'. Podeu obtenir la interfície executant l'ordre '/"
+"sbin/ip ro sh' o '/sbin/route -n' (cerqueu 'default' o '0.0.0.0'). "
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"It is also not uncommon to run Snort on an interface with no IP and "
+"configured in promiscuous mode, if this is your case, select the interface "
+"in this system that is physically connected to the network you want to "
+"inspect, enable promiscuous mode later on and make sure that the network "
+"traffic is sent to this interface (either connected to a 'port mirroring/"
+"spanning' port in a switch, to a hub or to a tap)"
+msgstr ""
+"També es pot donar la situació d'executar el Snort en una interfície sense "
+"IP i configurada en mode promiscu, si és el vostre cas, seleccioneu la "
+"interfície que està físicament connectada a la xarxa que voleu analitzar, "
+"posteriorment habiliteu el mode promiscu i assegureu-vos que el tràfic de la "
+"xarxa s'envia a la interfície (connectada a un port 'port mirroring/"
+"spanning' d'un commutador, a un concentrador o a un tap)"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"You can configure multiple interfaces here, just by adding more than one "
+"interface name separated by spaces. Each interface can have its specific "
+"configuration."
+msgstr ""
+"Podeu configurar múltiples interfície afegint més d'un nom d'interfície "
+"separat per espais. Cada interfície pot tenir una configuració específica."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid "Please enter the address range that Snort will listen on."
+msgstr "Introduïu el rang d'adreces que escoltarà el Snort."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+"192.168.1.42/32 for just one. Specify multiple addresses on a single line "
+"separated by ',' (comma characters), no spaces allowed!"
+msgstr ""
+"Heu d'utilitzar el format CIDR, ex. 192.168.1.0/24 per un bloc de 256 IPs o "
+"192.268.1.42/32 per una.  Especifiqueu múltiples adreces separades per "
+"',' (caràcters de coma) en una sola línia, no utilitzeu espais."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"If you want you can specify 'any', to not trust any side of the network."
+msgstr ""
+"Per no establir una relació de confiança amb cap part de la xarxa, podeu "
+"especificar 'any'."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"Notice that if you are using multiple interfaces this definition will be "
+"used as the HOME_NET definition of all of them."
+msgstr ""
+"Recordeu que si utilitzeu múltiples interfícies aquesta definició "
+"s'utilitzarà com a definició HOME_NET de totes."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid "Should Snort disable promiscuous mode on the interface?"
+msgstr "S'hauria d'inhabilitar el mode promiscu de la interfície?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disabling promiscuous mode means that Snort will only see packets addressed "
+"to it's own interface. Enabling it allows Snort to check  every packet that "
+"passes ethernet segment even if it's a connection between two other "
+"computers."
+msgstr ""
+"Si s'inhabilita el mode promiscu, el Snort únicament veurà els paquets "
+"adreçats a la seva pròpia interfície. Si s'habilita, el Snort pot comprovar "
+"cada paquet que passa pel segment ethernet, encara que sigui entre d'altres "
+"ordinador."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disable promiscuous mode if you are configuring Snort on an interface "
+"without a configured IP address."
+msgstr ""
+"Si esteu configurant el Snort en una interfície sense una adreça d'IP "
+"inhabiliteu el mode promiscu."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid "Invalid interface"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"One of the interfaces you specified is not valid (it might not exist on the "
+"system or be down). Please introduce a valid interface when answering the "
+"question of which interface(s) should Snort listen on."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"If you did not configure an interface then the package is trying to use the "
+"default ('eth0') which does not seem to be valid in your system."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid "Should Snort's rules testing order be changed to Pass|Alert|Log?"
+msgstr ""
+"S'hauria de canviar l'ordre de comprovació de les regles del Snort per Pass|"
+"Alert|Log?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid ""
+"If you change Snort's rules testing order to Pass|Alert|Log, they will be "
+"applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+"This will prevent people from having to make huge Berky Packet Filter "
+"command line arguments to filter their alert rules."
+msgstr ""
+"Si canvieu l'ordre de comprovació de les regles del Snort per Pass|Alert|"
+"Log, s'aplicaran en l'ordre Pass->Alert->Log, en comptes de l'estàndard "
+"Alert->Pass->Log. Aquesta opció permetrà que els usuaris no hagin "
+"d'utilitzar una gran quantitat d'arguments de la línia d'ordres del Berky "
+"Packet Filter per filtrar les regles d'alerta."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid "Should daily summaries be sent by e-mail?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid ""
+"This Snort installation provides a cron job that runs daily and summarises "
+"the information of Snort logs to a selected email address. If you want to "
+"disable this feature say 'no' here."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid "Who should receive the daily statistics mails?"
+msgstr "Qui hauria de rebre els missatges estadístics diaris?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid ""
+"A cron job running daily will summarise the information of the logs "
+"generated by Snort using a script called 'snort-stat'. Introduce here the "
+"recipient of these mails. The default value is the system administrator. If "
+"you keep this value, make sure that the mail of the administrator is "
+"redirected to a user that actually reads those mails."
+msgstr ""
+"Una tasca programada diàriament resumirà la informació dels registres del "
+"Snort utilitzant una seqüència anomenada 'snort-stat'. Introduïu el "
+"destinatari dels correus electrònics. El valor predeterminat és "
+"l'administrador del sistema. Si manteniu el valor assegureu-vos que el "
+"correu electrònic de l'administrador es redireccioni a una usuari que "
+"llegeixi els missatges."
+
+#. Type: string
+#. Description
+#: ../snort.templates:9001 ../snort-mysql.templates:8001
+#: ../snort-pgsql.templates:8001
+msgid ""
+"If you want to specify custom options to Snort, please specify them here."
+msgstr "Si voleu definir opcions personalitzades del Snort, feu-ho aquí."
+
+#. Type: string
+#. Description
+#: ../snort.templates:10001 ../snort-mysql.templates:9001
+#: ../snort-pgsql.templates:9001
+msgid ""
+"An alert needs to appear more times than this number to be included in the "
+"daily statistics."
+msgstr ""
+"Una alerta s'inclourà a les estadístiques diàries quan aparegui un nombre de "
+"vegades superior a l'indicat."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid "You are running Snort manually."
+msgstr "Esteu executant el Snort manualment."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid ""
+"Please restart Snort using:\n"
+" /etc/init.d/snort start\n"
+"to let the settings take effect."
+msgstr ""
+"Per fer efectius els canvis reinicieu el Snort utilitzant:\n"
+" /etc/init.d/snort start"
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid "There is an error in your configuration"
+msgstr "Hi ha una error en la configuració"
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid ""
+"Your Snort configuration is not correct and Snort will not be able to start "
+"up normally. Please review your configuration and fix it. If you do not do "
+"this, Snort package upgrades will probably break. To check which error is "
+"being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf' (or point "
+"to an alternate configuration file if you are using different files for "
+"different interfaces)"
+msgstr ""
+"La configuració del Snort no és correcte i no es podrà iniciar correctament. "
+"Reviseu la configuració i arregleu-ne els errors. Si no ho feu probablement "
+"no es podran realitzar correctament les actualitzacions del paquet Snort. "
+"Per comprovar l'error executeu l'ordre '/usr/sbin/snort -T -c /etc/snort/"
+"snort.conf' (si utilitzeu diferents fitxers per a diferents interfícies feu "
+"referència a un altre fitxer de configuració)"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid "This system uses an obsolete configuration file"
+msgstr "El sistema utilitza un fitxer de configuració obsolet"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+#, fuzzy
+msgid ""
+"Your system has an obsolete configuration file (/etc/snort/snort.common."
+"parameters) which has been automatically converted into the new "
+"configuration file format (at /etc/default/snort). Please review the new "
+"configuration and remove the obsolete one. Until you do this, the init.d "
+"script will not use the new configuration and you will not take advantage of "
+"the benefits introduced in newer releases."
+msgstr ""
+"El sistema té un fitxer de configuració obsolet (/etc/snort/snort.common."
+"parameters) que s'ha convertit automàticament al nou format de fitxer de "
+"configuració (a /etc/default/snort). Comproveu el nou fitxer de configuració "
+"i suprimiu l'obsolet. Fins que no ho feu, la seqüència de l'init.d no "
+"utilitzarà la nova configuració i no podreu utilitzar les característiques "
+"afegides en les noves versions."
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid "Do you want to set up a database for snort-mysql to log to?"
+msgstr ""
+"Voleu configurar una base de dades on el snort-mysql hi registri dades?"
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-mysql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a mysql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-mysql package with 'dpkg-"
+"reconfigure -plow snort-mysql'"
+msgstr ""
+"Aquestes tasques només les heu de realitzar la primera vegada que instal·leu "
+"el snort-mysql. Abans de continuar assegureu-vos de tenir(1) el nom d'un "
+"servidor central on s'estigui executant un servidor de mysql que permeti "
+"connexions tcp d'aquest ordinador. (2) una base de dades, (3) un nom "
+"d'usuari i una contrasenya per accedir-hi. Si no teniu tots els elements de "
+"la llista, solucioneu-ho o seleccioneu l'opció 'no' i utilitzeu el suport "
+"tradicional de registre per fitxer. Posteriorment, sempre podreu configurar "
+"el mode de registre reconfigurant el paquet snort-mysql utilitzant 'dpkg-"
+"reconfigure -plow snort-mysql'"
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+#, fuzzy
+msgid "Snort needs a configured database to log to before it starts."
+msgstr ""
+"El Snort necessita una base de dades configurada per registrar-hi les dades."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001
+#, fuzzy
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+"Fill in the correct values for the user, host, and database names. MySQL "
+"will prompt you for the password."
+msgstr ""
+"Creeu l'estructura de la base de dades utilitzant la següent ordre:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <usuari> -h <ordinador central> -p <nom "
+"base de dades>\n"
+"Ompliu correctament les dades de l'usuari, ordinador central i nom de la "
+"base de dades. El MySQL us demanarà la contrasenya."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+#, fuzzy
+msgid ""
+"After you created the database structure, you will need to start Snort "
+"manually."
+msgstr ""
+"Un cop creada l'estructura de la base de dades, premeu 'd'acord' per "
+"continuar."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001
+msgid "Please enter the hostname of the mysql database server to use."
+msgstr ""
+"Introduïu el nom de l'ordinador central del servidor de base de dades de "
+"MySQL a utilitzar."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001 ../snort-pgsql.templates:13001
+msgid ""
+"Make sure it has been set up correctly to allow incoming connections from "
+"this host!"
+msgstr ""
+"Abans de permetre les connexions a aquest ordinador, assegureu-vos que "
+"estigui configurat correctament."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid "Please enter the name of the database to use."
+msgstr "Introduïu el nom de la base de dades a utilitzar."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid ""
+"Make sure this database has been created and your database user has write "
+"access to this database."
+msgstr ""
+"Assegureu-vos que la base de dades existeixi i que el vostre usuari hi "
+"tingui permís d'escriptura."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Please enter the name of the database user you want to use."
+msgstr "Introduïu el nom de usuari de la base de dades que voleu utilitzar."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Make sure this user has been created and has write access."
+msgstr "Assegureu-vos que l'usuari estigui creat i tingui permís d'escriptura."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter the password for the database connection."
+msgstr "Introduïu la contrasenya per a la connexió amb la base de dades."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter a password to connect to the Snort Alert database."
+msgstr ""
+"Introduïu la contrasenya per connectar-vos a la base de dades d'alertes del "
+"Snort."
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid "Do you want to set up a database for snort-pgsql to log to?"
+msgstr ""
+"Voleu configurar una base de dades on el snort-pgsql hi registri dades?"
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-pgsql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a pgsql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-pgsql package with 'dpkg-"
+"reconfigure -plow snort-pgsql'"
+msgstr ""
+"Aquestes tasques només les heu de dur a terme la primera vegada que "
+"instal·leu el snort-pgsql. Abans de continuar assegureu-vos de tenir(1) el "
+"nom d'un servidor central on s'estigui executant el servidor de pgsql i que "
+"permeti connexions tcp d'aquest ordinador. (2) una base de dades en aquest "
+"servidor. (3) un nom d'usuari i una contrasenya per accedir a la base de "
+"dades. Si no teniu tots els elements de la llista, solucioneu-ho o "
+"seleccioneu l'opció 'no' i utilitzeu el suport tradicional de registre per "
+"fitxer. Posteriorment, sempre podreu configurar el mode de registre "
+"reconfigurant el paquet snort-pgsql a través de l'ordre 'dpkg-reconfigure -"
+"plow snort-pgsql'"
+
+#. Type: note
+#. Description
+#: ../snort-pgsql.templates:12001
+#, fuzzy
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+"Fill in the correct values for the user, host, and database names. "
+"PostgreSQL will prompt you for the password."
+msgstr ""
+"Creeu l'estructura de la base de dades utilitzant l'ordre següent:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_pgsql.gz | pgsql -U <usuari> -h <ordinador central> -W <nom "
+"base de dades>\n"
+"Ompliu correctament les dades de l'usuari, ordinador central i nom de la "
+"base de dades. El PostgreSQL us demanarà la contrasenya."
+
+#. Type: string
+#. Description
+#: ../snort-pgsql.templates:13001
+msgid "Please enter the hostname of the pgsql database server to use."
+msgstr ""
+"Introduïu el nom de l'ordinador central del servidor de base de dades de "
+"pgsql  a utilitzar."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid "Your configuration file is deprecated"
+msgstr "El fitxer de configuració és obsolet"
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"Your Snort configuration file (/etc/snort/snort.conf) uses deprecated "
+"options no longer available for this Snort release.  Snort will not be able "
+"to start unless you provide a correct configuration file. You can substitute "
+"your configuration file with the one provided in this package or fix it "
+"manually by removing deprecated options."
+msgstr ""
+"El fitxer de configuració actual (/etc/snort/snort.conf) utilitza opcions "
+"obsoletes que ja no estaran disponibles per a aquesta versió del Snort. No "
+"el podreu iniciar si no utilitzeu un fitxer de configuració correcte. Podeu "
+"substituir el fitxer de configuració pel proporcionat pel paquet o arreglar-"
+"lo manualment suprimint les opcions obsoletes."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"The following deprecated options were found in your configuration file: "
+"${DEP_CONFIG}"
+msgstr ""
+"S'han trobat les opcions obsoletes següents:\n"
+"${DEP_CONFIG}"
+
+#~ msgid ""
+#~ "Your system has an obsolete configuration file  (/etc/snort/snort.common."
+#~ "parameters) which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "El sistema té un fitxer de configuració obsolet (/etc/snort/snort.common."
+#~ "parameters) que s'ha convertit automàticament al nou format de fitxer de "
+#~ "configuració (a /etc/default/snort). Comproveu el nou fitxer de "
+#~ "configuració i suprimiu l'obsolet. Fins que no ho feu, la seqüència de "
+#~ "l'init.d no utilitzarà la nova configuració i no podreu utilitzar les "
+#~ "característiques afegides en les noves versions."
+
+#, fuzzy
+#~ msgid ""
+#~ "Your system has an obsolete configuration file  (/etc/snort/snort.common."
+#~ "parameters)  which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "El sistema té un fitxer de configuració obsolet (/etc/snort/snort.common."
+#~ "parameters) que s'ha convertit automàticament al nou format de fitxer de "
+#~ "configuració (a /etc/default/snort). Comproveu el nou fitxer de "
+#~ "configuració i suprimiu l'obsolet. Fins que no ho feu, la seqüència de "
+#~ "l'init.d no utilitzarà la nova configuració i no podreu utilitzar les "
+#~ "característiques afegides en les noves versions."
+
+#, fuzzy
+#~ msgid ""
+#~ "Your system has an obsolete configuration file   (/etc/snort/snort.common."
+#~ "parameters)  which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "El sistema té un fitxer de configuració obsolet (/etc/snort/snort.common."
+#~ "parameters) que s'ha convertit automàticament al nou format de fitxer de "
+#~ "configuració (a /etc/default/snort). Comproveu el nou fitxer de "
+#~ "configuració i suprimiu l'obsolet. Fins que no ho feu, la seqüència de "
+#~ "l'init.d no utilitzarà la nova configuració i no podreu utilitzar les "
+#~ "característiques afegides en les noves versions."
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name(s) of the interface(s) which Snort should listen "
+#~ "on. The names of the available interfaces are provided by either running "
+#~ "'ip link show' of 'ifconfig'. This value usually is 'eth0', but you might "
+#~ "want to vary this depending on your environment, if you are using a "
+#~ "dialup connection 'ppp0' might be more appropiate."
+#~ msgstr ""
+#~ "Introduïu el nom de la interfície(s) que hauria d'escoltar el snort. El "
+#~ "nom de les interfícies disponibles el podeu aconseguir executant l'ordre "
+#~ "'ip link show'. El valor acostuma a ser 'eth0', però us pot interessar "
+#~ "modificar-lo en funció de l'entorn, si utilitzeu el marcatge directe "
+#~ "probablement us interessi més el valor 'ppp0'."
+
+#~ msgid "On which interface should Snort listen?"
+#~ msgstr "Quina interfície hauria d'escoltar el Snort?"
+
+#~ msgid ""
+#~ "Please enter the interface name which snort should listen on. The name of "
+#~ "the available interfaces are provided by running 'ip link show'. This "
+#~ "value usually is 'eth0', but you might want to vary this depending on "
+#~ "your environment, if you are using a dialup connection 'ppp0' might be "
+#~ "more appropiate."
+#~ msgstr ""
+#~ "Introduïu el nom de la interfície que haurà d'escoltar el snort. El nom "
+#~ "de les interfícies disponibles el podeu aconseguir executant l'ordre 'ip "
+#~ "link show'. El valor acostuma a ser 'eth0', però us pot interessar "
+#~ "modificar-lo en funció de l'entorn, si utilitzeu el marcatge directe "
+#~ "probablement us interessi més el valor 'ppp0'."
+
+#~ msgid ""
+#~ "Notice that Snort is usually configured to inspect all traffic coming "
+#~ "from the Internet, so the interface you add here is usually the same the "
+#~ "'default route' is on.  You can determine which interface is used for "
+#~ "this running either 'ip route show' or '/sbin/route -n' (look for "
+#~ "'default' or '0.0.0.0')."
+#~ msgstr ""
+#~ "Recordeu que el Snort acostuma a estar configurat per analitzar tot el "
+#~ "tràfic d'internet, la interfície a afegir acostuma a ser la mateixa que "
+#~ "la de la 'ruta per defecte'. Podeu obtenir-la executant l'ordre 'ip route "
+#~ "show' o '/sbin/route -n' (cerqueu 'default' o '0.0.0.0')."
+
+#~ msgid "Should Snort disable promiscous mode on the interface?"
+#~ msgstr "S'hauria d'inhabilitar el mode promiscu de la interfície?"
+
+#~ msgid "On which interface Snort should listen? (only one!)"
+#~ msgstr "Quina interfície hauria d'escoltar el Snort? (només una!)"
+
+#~ msgid "What address range should Snort consider to be local?"
+#~ msgstr "Quin rang d'adreces hauria de considerar local el Snort?"
+
+#~ msgid ""
+#~ "You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+#~ "192.168.1.42/32 for just one.  Specify multiple addresses on a single "
+#~ "line, seperated by ',' (comma characters). No spaces allowed!"
+#~ msgstr ""
+#~ "Heu d'utilitzar el format CIDR, ex. 192.168.1.0/24 per un bloc de 256 IPs "
+#~ "o 192.268.1.42/32 per únicament una.  Especifiqueu múltiples adreces "
+#~ "separades per ',' (caràcters de coma) i en una sola línia. Els espais no "
+#~ "estan permesos!"
+
+#~ msgid ""
+#~ "Disabling the promiscuous mode means that Snort will only see packets "
+#~ "addressed to its own interface. Enabling allows it to check every packet "
+#~ "that passes the ethernet even if it's a connection between two other "
+#~ "computers"
+#~ msgstr ""
+#~ "Si s'inhabilita el mode promiscu, el Snort únicament veurà els paquets "
+#~ "adreçats a la seva pròpia interfície. Cal que l'habiliteu per comprovar "
+#~ "cada paquet que passa per la xarxa ethernet, encara que sigui entre "
+#~ "altres ordinadors."
+
+#~ msgid "When should snort be started?"
+#~ msgstr "Quan s'hauria d'iniciar el Snort?"
+
+#~ msgid "Please enter the address range that snort will listen on."
+#~ msgstr "Introduïu el rang d'adreces que escoltarà el Snort."
+
+#~ msgid ""
+#~ "You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+#~ "192.168.1.42/32 for just one. Specify multiple addresses on a single "
+#~ "line, separated by ',' (comma characters). No spaces allowed!"
+#~ msgstr ""
+#~ "Heu d'utilitzar el format CIDR, ex. 192.168.1.0/24 per un bloc de 256 IPs "
+#~ "o 192.268.1.42/32 per únicament una.  Especifiqueu múltiples adreces "
+#~ "separades per ',' (caràcters de coma) i en una sola línia. Els espais no "
+#~ "estan permesos!"
+
+#~ msgid ""
+#~ "Disabling the promiscuous mode means that snort will only see packets "
+#~ "addressed to it's own interface. Enabling allows it to check every packet "
+#~ "that passes the ethernet even if it's a connection between two other "
+#~ "computers"
+#~ msgstr ""
+#~ "Si s'inhabilita el mode promiscu, el Snort únicament veurà els paquets "
+#~ "adreçats a la seva pròpia interfície. Cal que l'habiliteu per comprovar "
+#~ "cada paquet que passa per la xarxa ethernet, encara que sigui entre "
+#~ "altres ordinadors."
+
+#~ msgid "Should snort's rules testing order be changed to Pass|Alert|Log?"
+#~ msgstr ""
+#~ "S'hauria de canviar l'ordre de comprovació de les regles del Snort per "
+#~ "Pass|Alert|Log?"
+
+#~ msgid ""
+#~ "If you change snort's rules testing order to Pass|Alert|Log, they will be "
+#~ "applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+#~ "This will prevent people from having to make huge BPF command line "
+#~ "arguments to filter their alert rules."
+#~ msgstr ""
+#~ "Si canvieu l'ordre de comprovació de les regles del Snort per Pass|Alert|"
+#~ "Log, s'aplicaran en l'ordre Pass->Alert->Log, en compte del estàndard "
+#~ "Alert->Pass->Log. Aquesta opció permetrà que els usuaris no hagin "
+#~ "d'utilitzar una grna quantitat d'arguments de la línia d'ordres de BPF "
+#~ "per filtrar les regles d'alerta."
+
+#~ msgid ""
+#~ "You only need to do this the first time you install snort-pgsql. Before "
+#~ "you go on, make sure you have the following things at hand: - The "
+#~ "hostname of a machine running a pgsql server, set up to allow TCP\n"
+#~ "  connections to the database (from this host).\n"
+#~ "- A database on the database server - A username and password for a user "
+#~ "that has write access to this database. If you don't have _all_ of these, "
+#~ "either select 'no' and run with regular file logging support, or fix this "
+#~ "first. You can always configure database logging later, by reconfiguring "
+#~ "the snort-pgsql package."
+#~ msgstr ""
+#~ "Aquestes tasques només les heu de realitzar la primera vegada que "
+#~ "instal·leu el snort-mysql. Abans de continuar assegureu-vos de tenir(1) "
+#~ "el nom d'un servidor central on s'estigui executant el servidor de PgSQL "
+#~ "i que permeti connexions tcp d'aquest ordinador. (2) una base de dades en "
+#~ "aquest servidor. (3) un nom d'usuari i una contrasenya per accedir a la "
+#~ "base de dades. Si no teniu tots els elements de la llista, solucioneu-ho "
+#~ "o seleccioneu l'opció 'no' i utilitzeu el suport tradicional de registre "
+#~ "per fitxer. Posteriorment, sempre podreu configurar el mode de registre "
+#~ "reconfigurant el paquet snort-pgsql."
+
+#~ msgid ""
+#~ "Please create the database structure now, using the following command:\n"
+#~ " cd /usr/share/doc/snort-pgsql/\n"
+#~ " zcat create_postgresql.gz | psql -u <user> -h <host> <databasename>\n"
+#~ "Filling in the correct values for the user, host, and database names. The "
+#~ "pgsql tool will prompt you for the password."
+#~ msgstr ""
+#~ "Creeu l'estructura de la base de dades utilitzant la següent ordre:\n"
+#~ " cd /usr/share/doc/snort-pgsql/\n"
+#~ " zcat create_postgresql.gz | pgsql -u <usuari> -h <ordinador central> "
+#~ "<nom base de dades>\n"
+#~ "Omplint correctament les dades de l'usuari, ordinador central i nom de la "
+#~ "base de dades. El PgSQL us demanarà la contrasenya."
+
+#~ msgid "Please enter the password for the database connection"
+#~ msgstr "Introduïu la contrasenya per la connexió amb la base de dades."
+
+#~ msgid "Please enter a password to connect to the SNORT Alert database"
+#~ msgstr ""
+#~ "Introduïu la contrasenya per la connexió a la base dades d'alerta de "
+#~ "l'Stnort"
+
+#~ msgid "You are running snort manually."
+#~ msgstr "Esteu executant el Snort manualment."
+
+#~ msgid ""
+#~ "Please restart snort using:\n"
+#~ " /etc/init.d/snort start\n"
+#~ "to let the settings take effect."
+#~ msgstr ""
+#~ "Per l'efectivitat dels canvis reinicieu el Snort utilitzant:\n"
+#~ " /etc/init.d/snort start\n"
--- snort-2.3.3.orig/debian/po/ja.po
+++ snort-2.3.3/debian/po/ja.po
@@ -0,0 +1,637 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+# 
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# 
+#    Developers do not need to manually edit POT or PO files.
+# 
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: snort 2.3.3-9\n"
+"Report-Msgid-Bugs-To: jfs@computer.org\n"
+"POT-Creation-Date: 2006-12-28 23:00+0100\n"
+"PO-Revision-Date: 2006-10-09 00:52+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../snort.templates:1001 ../snort-mysql.templates:1001
+#: ../snort-pgsql.templates:1001
+msgid "boot, dialup, manual"
+msgstr "èµ·å‹•æ™‚, ãƒ€ã‚¤ãƒ¤ãƒ«ã‚¢ãƒƒãƒ—æ™‚, æ‰‹å‹•"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid "When should Snort be started?"
+msgstr "ã�„ã�¤ Snort ã‚’èµ·å‹•ã�—ã�¾ã�™ã�‹?"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid ""
+"Snort can be started during boot, when connecting to the net with pppd or "
+"only when you manually start it via /usr/sbin/snort."
+msgstr ""
+"Snort ã�¯ã€�ã‚·ã‚¹ãƒ†ãƒ èµ·å‹•ä¸­ã€�pppd ã‚’åˆ©ç”¨ã�—ã�¦ãƒ�ãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã�«æŽ¥ç¶šã�—ã�Ÿæ™‚ã€�ã�¾ã�Ÿã�¯ \"/"
+"usr/sbin/snort\" ã�¨æ‰‹å‹•ã�§å®Ÿè¡Œã�—ã�Ÿæ™‚ã�®ã�¿ã€�ã�®ã�„ã�šã‚Œã�‹ã�§èµ·å‹•ã�§ã��ã�¾ã�™ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid "On which interface(s) should Snort listen?"
+msgstr "Snort ã�¯ã�©ã�®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�§ listen ã�—ã�¾ã�™ã�‹?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Please enter the name(s) of the interface(s) which Snort should listen on.  "
+"The names of the available interfaces are provided by either running  'ip "
+"link show' of 'ifconfig'. This value usually is 'eth0', but you might want "
+"to vary this depending on your environment, if you are using a dialup "
+"connection 'ppp0' might be more appropiate."
+msgstr ""
+"Snort ã�Œ listen ã�™ã�¹ã��ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹å��ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚æŒ‡å®šå�¯èƒ½ã�ªã‚¤ãƒ³"
+"ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�¯ 'ifconfig' ã‚’å®Ÿè¡Œã�™ã‚‹ã€�ã�‚ã‚‹ã�„ã�¯ 'ip link show' ã‚’å®Ÿè¡Œã�™ã‚‹ã�“ã�¨"
+"ã�§ç¢ºèª�ã�§ã��ã�¾ã�™ã€‚ã�“ã�®å€¤ã�¯å¤§æŠµã�®å ´å�ˆ 'eth0' ã�§ã�™ã�Œã€�ã�“ã‚Œã�¯ç’°å¢ƒã�«ã�¨ã�¦ã‚‚ä¾�å­˜ã�™ã‚‹"
+"ã�®ã�§ã€�ãƒ€ã‚¤ãƒ¤ãƒ«ã‚¢ãƒƒãƒ—æŽ¥ç¶šã‚’åˆ©ç”¨ã�—ã�¦ã�„ã‚‹å ´å�ˆã�¯ 'ppp0' ã�®ã�»ã�†ã�Œã‚ˆã‚Šé�©åˆ‡ã�‹ã‚‚ã�—ã‚Œ"
+"ã�¾ã�›ã‚“ ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Notice that Snort is usually configured to inspect all traffic coming from "
+"the Internet, so the interface you add here is usually the same the 'default "
+"route' is on.  You can determine which interface is used for this running "
+"either '/sbin/ip ro sh' or '/sbin/route -n' (look for 'default' or "
+"'0.0.0.0')."
+msgstr ""
+"é€šå¸¸ã€�Snort ã�¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ�ãƒƒãƒˆã�‹ã‚‰ã‚„ã�£ã�¦æ�¥ã‚‹ã�™ã�¹ã�¦ã�®ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚’å�—ã�‘å�–ã‚‹ã‚ˆã�†"
+"ã�«è¨­å®šã�•ã‚Œã‚‹ã�®ã�§ã€�ã�“ã�“ã�§è¿½åŠ ã�—ã�Ÿã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�¯å¤§æŠµ 'default route' ã�Œå­˜åœ¨"
+"ã�™ã‚‹ã‚‚ã�®ã�¨å�Œã�˜ã�§ã�‚ã‚‹ã�®ã�«æ³¨æ„�ã�—ã�¦ã��ã� ã�•ã�„ã€‚'/sbin/ip ro sh' ã�¾ã�Ÿã�¯ '/sbin/"
+"route -n' ã‚’å®Ÿè¡Œã�— ('default' ã�¾ã�Ÿã�¯ '0.0.0.0' ã‚’æŽ¢ã�—ã�¦)ã€�ã�©ã�®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤"
+"ã‚¹ã‚’ä½¿ã�†ã�‹ã‚’æ±ºã‚�ã‚‰ã‚Œã�¾ã�™ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"It is also not uncommon to run Snort on an interface with no IP and "
+"configured in promiscuous mode, if this is your case, select the interface "
+"in this system that is physically connected to the network you want to "
+"inspect, enable promiscuous mode later on and make sure that the network "
+"traffic is sent to this interface (either connected to a 'port mirroring/"
+"spanning' port in a switch, to a hub or to a tap)"
+msgstr ""
+"IP ã‚’ä»˜ä¸Žã�—ã�¦ã�„ã�ªã�„ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ä¸Šã�§ promiscuous ãƒ¢ãƒ¼ãƒ‰ã�® Snort ã‚’å‹•ä½œã�•ã�›"
+"ã‚‹ã�®ã�¯ã�‚ã�¾ã‚Šä¸€èˆ¬çš„ã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“ã€‚ã�“ã‚Œã�«å½“ã�¦ã�¯ã�¾ã‚‹ã‚ˆã�†ã�ªå ´å�ˆã€�å�—ä¿¡ã‚’è¡Œã�„ã�Ÿã�„"
+"ãƒ�ãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã�«å¯¾ã�—ã�¦ç‰©ç�†çš„ã�«æŽ¥ç¶šã�•ã‚Œã�¦ã�„ã‚‹ã�“ã�®ã‚·ã‚¹ãƒ†ãƒ ä¸Šã�®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã‚’"
+"é�¸æŠžã�—ã€�å¾Œã�»ã�© promiscuous ãƒ¢ãƒ¼ãƒ‰ã‚’æœ‰åŠ¹ã�«ã�—ã�¦ãƒ�ãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã�Œã�“ã�®ã‚¤"
+"ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ (ã‚¹ã‚¤ãƒƒãƒ�ã�® 'port mirrorin' ãƒ�ãƒ¼ãƒˆãƒ»'spanning' ãƒ�ãƒ¼ãƒˆã�‹ãƒªãƒ”ãƒ¼"
+"ã‚¿ãƒ¼ãƒ�ãƒ–ã€�ã�‚ã‚‹ã�„ã�¯ãƒ�ãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¿ãƒƒãƒ—ã�«æŽ¥ç¶šã�•ã‚Œã�¦ã�„ã�¾ã�™) ã�«æµ�ã‚Œã�¦ã�„ã‚‹ã�®ã‚’ç¢ºèª�"
+"ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"You can configure multiple interfaces here, just by adding more than one "
+"interface name separated by spaces. Each interface can have its specific "
+"configuration."
+msgstr ""
+"ã�“ã�“ã�§ã�¯å�˜ã�«ä¸€ã�¤ä»¥ä¸Šã�®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹å��ã‚’ç©ºç™½ã�§åŒºåˆ‡ã‚‹ã�“ã�¨ã�§ã€�è¤‡æ•°ã�®ã‚¤ãƒ³ã‚¿ãƒ¼"
+"ãƒ•ã‚§ã‚¤ã‚¹ã‚’è¨­å®šã�§ã��ã�¾ã�™ã€‚ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�”ã�¨ã�«å›ºæœ‰ã�®è¨­å®šã�Œå�¯èƒ½ã�§ã�™ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid "Please enter the address range that Snort will listen on."
+msgstr "Snort ã�Œ listen ã�™ã‚‹ã‚¢ãƒ‰ãƒ¬ã‚¹ã�®ç¯„å›²ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+"192.168.1.42/32 for just one. Specify multiple addresses on a single line "
+"separated by ',' (comma characters), no spaces allowed!"
+msgstr ""
+"CIDR å½¢å¼�ã�§ã�®è¨˜è¿°ã�Œå¿…è¦�ã�§ã�™ã€‚ä¾‹ã�ˆã�° 192.168.1.0/24 ã�¯ 256 å€‹ã�® IP ãƒ–ãƒ­ãƒƒã‚¯"
+"ã�§ã€�192.168.1.42/32 ã�¯ IP 1 å€‹ã�¨ã�ªã‚Šã�¾ã�™ã€‚è¤‡æ•°ã�®ã‚¢ãƒ‰ãƒ¬ã‚¹ã�¯ 1 è¡Œã�§ ',' (ã‚«ãƒ³"
+"ãƒž) ã�§åŒºåˆ‡ã�£ã�¦è¨˜è¿°ã�—ã�¾ã�™ã€‚ã‚¹ãƒšãƒ¼ã‚¹ (ç©ºç™½) ã�¯ä½¿ã�ˆã�¾ã�›ã‚“!"
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"If you want you can specify 'any', to not trust any side of the network."
+msgstr ""
+"ãƒ­ãƒ¼ã‚«ãƒ«ãƒ�ãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒ»å…¬é–‹ãƒ�ãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã�®ã�©ã�¡ã‚‰ã�®ãƒ�ãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚‚ä¿¡é ¼ã�—ã�¦ã�„ã�ªã�„"
+"å ´å�ˆã€� 'any' ã�¨æŒ‡å®šã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"Notice that if you are using multiple interfaces this definition will be "
+"used as the HOME_NET definition of all of them."
+msgstr ""
+"è¤‡æ•°ã�®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã‚’ä½¿ã�£ã�¦ã�„ã‚‹å ´å�ˆã€�ã�“ã�®å®šç¾©ã�¯å…¨ã�¦ã�®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�® "
+"HOME_NET å®šç¾©ã�¨ã�—ã�¦åˆ©ç”¨ã�•ã‚Œã‚‹ã�“ã�¨ã�«æ³¨æ„�ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid "Should Snort disable promiscuous mode on the interface?"
+msgstr "Snort ã�¯ã€�ã�“ã�®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�§ promiscous ãƒ¢ãƒ¼ãƒ‰ã‚’ç„¡åŠ¹ã�«ã�—ã�¾ã�™ã�‹?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disabling promiscuous mode means that Snort will only see packets addressed "
+"to it's own interface. Enabling it allows Snort to check  every packet that "
+"passes ethernet segment even if it's a connection between two other "
+"computers."
+msgstr ""
+"promiscuous ãƒ¢ãƒ¼ãƒ‰ã‚’ç„¡åŠ¹ã�«ã�™ã‚‹ã�“ã�¨ã�«ã‚ˆã�£ã�¦ Snort ã�¯è‡ªèº«ã�®æŒ�ã�¤ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹"
+"ã�¸å�‘ã�‘ã‚‰ã‚Œã�Ÿãƒ‘ã‚±ãƒƒãƒˆã�®ã�¿ã‚’ç›£è¦–ã�—ã�¾ã�™ã€‚æœ‰åŠ¹ã�«ã�™ã‚‹ã�¨ã€�ä»–ã�®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿é–“ã�®ã‚„ã‚Š"
+"å�–ã‚Šã‚’å�«ã‚�ã�Ÿã‚¤ãƒ¼ã‚µãƒ�ãƒƒãƒˆã‚»ã‚°ãƒ¡ãƒ³ãƒˆä¸Šã�®å…¨ã�¦ã�®ãƒ‘ã‚±ãƒƒãƒˆã‚’ãƒ�ã‚§ãƒƒã‚¯ã�™ã‚‹ã‚ˆã�†ã�«ã�ªã‚Š"
+"ã�¾ã�™ã€‚"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disable promiscuous mode if you are configuring Snort on an interface "
+"without a configured IP address."
+msgstr ""
+"IP ã‚¢ãƒ‰ãƒ¬ã‚¹ã�®è¨­å®šã�Œã�•ã‚Œã�¦ã�„ã�ªã�„ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ä¸Šã�§ Snort ã‚’è¨­å®šã�™ã‚‹å ´å�ˆã�¯ "
+"promiscuous ãƒ¢ãƒ¼ãƒ‰ã‚’ç„¡åŠ¹ã�«ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid "Invalid interface"
+msgstr "ä¸�æ­£ã�ªã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹"
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"One of the interfaces you specified is not valid (it might not exist on the "
+"system or be down). Please introduce a valid interface when answering the "
+"question of which interface(s) should Snort listen on."
+msgstr ""
+"æŒ‡å®šã�•ã‚Œã�Ÿã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�Œæ­£ã�—ã��ã�‚ã‚Šã�¾ã�›ã‚“ (ã‚·ã‚¹ãƒ†ãƒ ã�«å­˜åœ¨ã�—ã�¦ã�„ã�ªã�„ã�‹ãƒ€ã‚¦"
+"ãƒ³ã�—ã�¦ã�„ã�¾ã�™)ã€‚Snort ã�Œã�©ã�®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã‚’ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚‹ã�‹ã�¨ã�„ã�†è³ªå•�ã�«ç­”ã�ˆ"
+"ã‚‹éš›ã�¯æ­£ã�—ã�„å€¤ã‚’å…¥ã‚Œã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"If you did not configure an interface then the package is trying to use the "
+"default ('eth0') which does not seem to be valid in your system."
+msgstr ""
+"ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã‚’è¨­å®šã�—ã�¦ã�„ã�ªã�‹ã�£ã�Ÿå ´å�ˆã€�ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã�¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆ ('eth0') ã‚’"
+"ã‚·ã‚¹ãƒ†ãƒ ã�§ã�®æ­£ã�—ã�„ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�¨ã�—ã�¦åˆ©ç”¨ã�—ã�¾ã�™ã€‚"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid "Should Snort's rules testing order be changed to Pass|Alert|Log?"
+msgstr "Snort ã�®ãƒ«ãƒ¼ãƒ«ã‚»ãƒƒãƒˆã�®ãƒ†ã‚¹ãƒˆé †ã‚’ Pass|Alert|Log ã�«å¤‰æ›´ã�—ã�¾ã�™ã�‹?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid ""
+"If you change Snort's rules testing order to Pass|Alert|Log, they will be "
+"applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+"This will prevent people from having to make huge Berky Packet Filter "
+"command line arguments to filter their alert rules."
+msgstr ""
+"Snort ã�®ãƒ«ãƒ¼ãƒ«ã‚»ãƒƒãƒˆã�®ãƒ†ã‚¹ãƒˆé †ã‚’ Pass|Alert|Log ã�«å¤‰æ›´ã�—ã�Ÿå ´å�ˆã€�ãƒ«ãƒ¼ãƒ«ã‚»ãƒƒãƒˆ"
+"ã�¯ é€šå¸¸ã�® Alert->Pass->Log ã�§ã�¯ã�ªã�� Pass->Alert->Log ã�®é †ç•ªã�§é�©ç”¨ã�•ã‚Œã�¾ã�™ã€‚ã�“"
+"ã�†ã�™ã‚‹ã�“ã�¨ã�§ alert ãƒ«ãƒ¼ãƒ«ã�®ãƒ•ã‚£ãƒ«ã‚¿ã�™ã‚‹ã�Ÿã‚�ã�«é•·å¤§ã�ª Berky Packet Filter ã‚³ãƒž"
+"ãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã‚’æŒ‡å®šã�—ã�ªã��ã�¨ã‚‚ã‚ˆã��ã�ªã‚Šã�¾ã�™ã€‚"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid "Should daily summaries be sent by e-mail?"
+msgstr "ãƒ¡ãƒ¼ãƒ«ã�§æ¯Žæ—¥ã‚µãƒžãƒªã‚’é€�ã‚Šã�¾ã�™ã�‹?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid ""
+"This Snort installation provides a cron job that runs daily and summarises "
+"the information of Snort logs to a selected email address. If you want to "
+"disable this feature say 'no' here."
+msgstr ""
+"ä»Šå›žã�® Snort ã�®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�§ã�¯ã€�æ¯Žæ—¥å‹•ã�„ã�¦ Snort ã�®ãƒ­ã‚°æƒ…å ±ã‚’è¦�ç´„ã�—ã�¦è¨­å®šã�—"
+"ã�Ÿã‚¢ãƒ‰ãƒ¬ã‚¹ã�«é€�ã‚‹ cron ã‚¸ãƒ§ãƒ–ã‚’è¨­å®šã�—ã�¾ã�™ã€‚ã�“ã�®æ©Ÿèƒ½ã‚’ç„¡åŠ¹ã�«ã�—ã�Ÿã�„å ´å�ˆã�¯ã�“ã�“ã�§"
+"ã€Œã�„ã�„ã�ˆã€�ã�¨ç­”ã�ˆã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid "Who should receive the daily statistics mails?"
+msgstr "èª°ã�Œæ—¥æ¬¡çµ±è¨ˆã�®ãƒ¡ãƒ¼ãƒ«ã‚’å�—ã�‘å�–ã‚Šã�¾ã�™ã�‹?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid ""
+"A cron job running daily will summarise the information of the logs "
+"generated by Snort using a script called 'snort-stat'. Introduce here the "
+"recipient of these mails. The default value is the system administrator. If "
+"you keep this value, make sure that the mail of the administrator is "
+"redirected to a user that actually reads those mails."
+msgstr ""
+"æ¯Žæ—¥å®Ÿè¡Œã�•ã‚Œã‚‹ cronjob ã�¯ 'snort-stat' ã�¨å‘¼ã�°ã‚Œã‚‹ã‚¹ã‚¯ãƒªãƒ—ãƒˆã‚’ä½¿ã�„ã€�Snort ã�«"
+"ã‚ˆã�£ã�¦ç”Ÿæˆ�ã�•ã‚Œã‚‹ãƒ­ã‚°ã�®æƒ…å ±ã‚’è¦�ç´„ã�—ã�¾ã�™ã€‚ã�“ã�“ã�§ã€�ã�“ã‚Œã‚‰ã�®ãƒ¡ãƒ¼ãƒ«ã‚’å�—ã�‘å�–ã‚Šäººã‚’"
+"æŒ‡å®šã�—ã�¦ã��ã� ã�•ã�„ã€‚æ¨™æº–ã�®å€¤ã�¯ã‚·ã‚¹ãƒ†ãƒ ç®¡ç�†è€…ã�§ã�™ã€‚ã�“ã�®å€¤ã�®ã�¾ã�¾ã�«ã�—ã�¦ã�Šã��ã�Ÿã�„å ´"
+"å�ˆã�¯ã€�ç®¡ç�†è€…ã�®ãƒ¡ãƒ¼ãƒ«ã�Œã�“ã‚Œã‚‰ã�®ãƒ¡ãƒ¼ãƒ«ã‚’èª­ã‚€ãƒ¦ãƒ¼ã‚¶ã�«å®Ÿéš›ã�«è»¢é€�ã�•ã‚Œã�¦ã�„ã‚‹ã�®ã‚’ç¢º"
+"èª�ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort.templates:9001 ../snort-mysql.templates:8001
+#: ../snort-pgsql.templates:8001
+msgid ""
+"If you want to specify custom options to Snort, please specify them here."
+msgstr "Snort ã�«ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’æŒ‡å®šã�—ã�Ÿã�„å ´å�ˆã€�ã�“ã�“ã�§å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort.templates:10001 ../snort-mysql.templates:9001
+#: ../snort-pgsql.templates:9001
+msgid ""
+"An alert needs to appear more times than this number to be included in the "
+"daily statistics."
+msgstr ""
+"æ—¥æ™‚çµ±è¨ˆã�¸å��æ˜ ã�•ã‚Œã‚‹ç‚ºã�«ã�¯ã€�ã�“ã�®å›žæ•°ã‚ˆã‚Šã‚‚ã‚¢ãƒ©ãƒ¼ãƒˆã�Œå¤šã��ç�¾ã‚Œã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾"
+"ã�™ã€‚"
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid "You are running Snort manually."
+msgstr "æ‰‹å‹•ã�§ Snort ã‚’å‹•ä½œã�•ã�›ã�¦ã�„ã�¾ã�™ã€‚"
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid ""
+"Please restart Snort using:\n"
+" /etc/init.d/snort start\n"
+"to let the settings take effect."
+msgstr ""
+"è¨­å®šå¤‰æ›´ã‚’å��æ˜ ã�™ã‚‹ã�Ÿã‚�ã�«\n"
+" /etc/init.d/snort restart\n"
+" ã�¨ã�—ã�¦ Snort ã‚’å†�èµ·å‹•ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid "There is an error in your configuration"
+msgstr "è¨­å®šã�«ã‚¨ãƒ©ãƒ¼ã�Œã�‚ã‚Šã�¾ã�™"
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid ""
+"Your Snort configuration is not correct and Snort will not be able to start "
+"up normally. Please review your configuration and fix it. If you do not do "
+"this, Snort package upgrades will probably break. To check which error is "
+"being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf' (or point "
+"to an alternate configuration file if you are using different files for "
+"different interfaces)"
+msgstr ""
+"Snort ã�®è¨­å®šã�Œæ­£ã�—ã��ã�ªã�„ã�®ã�§ã€�ã��ã�®ã�¾ã�¾ã� ã�¨ Snort ã�Œèµ·å‹•ã�§ã��ã�ªã��ã�ªã‚Šã�¾ã�™ã€‚è¨­å®š"
+"ã‚’è¦‹ç›´ã�—ã�¦ä¿®æ­£ã�—ã�¦ã��ã� ã�•ã�„ã€‚è¡Œã‚�ã�ªã�„å ´å�ˆã�¯ Snort ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã�®ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã�Œ"
+"ã�§ã��ã�ªã��ã�ªã‚‹ã�§ã�—ã‚‡ã�†ã€‚ã�©ã�“ã�§ã‚¨ãƒ©ãƒ¼ã�Œèµ·ã�“ã�£ã�¦ã�„ã‚‹ã�®ã�‹ã‚’ãƒ�ã‚§ãƒƒã‚¯ã�™ã‚‹ã�«ã�¯ '/usr/"
+"sbin/snort -T -c /etc/snort/snort.conf' ã‚’å®Ÿè¡Œã�—ã�¦ã��ã� ã�•ã�„ (ç•°ã�ªã�£ã�Ÿã‚¤ãƒ³ã‚¿ãƒ¼"
+"ãƒ•ã‚§ã‚¤ã‚¹ã�”ã�¨ã�«åˆ¥ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä½¿ã�£ã�¦ã�„ã‚‹ã�¨ã�„ã�†å ´å�ˆã�¯ã€�ä»–ã�®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŒ‡å®šã�—"
+"ã�¦ã��ã� ã�•ã�„)ã€‚"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid "This system uses an obsolete configuration file"
+msgstr "å�¤ã�„è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�Œã�“ã�®ã‚·ã‚¹ãƒ†ãƒ ã�§ã�¯ä½¿ã‚�ã‚Œã�¦ã�„ã�¾ã�™ã€‚"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid ""
+"Your system has an obsolete configuration file (/etc/snort/snort.common."
+"parameters) which has been automatically converted into the new "
+"configuration file format (at /etc/default/snort). Please review the new "
+"configuration and remove the obsolete one. Until you do this, the init.d "
+"script will not use the new configuration and you will not take advantage of "
+"the benefits introduced in newer releases."
+msgstr ""
+"ã‚·ã‚¹ãƒ†ãƒ ã�«æ—¢ã�«åˆ©ç”¨ã�§ã��ã�ªã�„è¨­å®šãƒ•ã‚¡ã‚¤ãƒ« (/etc/snort/snort.common.parameters) "
+"ã�Œã�‚ã‚Šã�¾ã�™ã€‚ã�“ã‚Œã�¯è‡ªå‹•çš„ã�«æ–°ã�—ã�„è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«å½¢å¼� (/etc/default/snort ã�«ã�‚ã‚Šã�¾"
+"ã�™) ã�«å¤‰æ�›ã�•ã‚Œã�¦ã�„ã�¾ã�™ã€‚æ–°ã�—ã�„è¨­å®šã‚’ç¢ºèª�ã�—ã�¦ã€�å�¤ã�„è¨­å®šã‚’å‰Šé™¤ã�—ã�¦ã��ã� ã�•ã�„ã€‚å‰Š"
+"é™¤ã�•ã‚Œã‚‹ã�¾ã�§ã€�init.d ã‚¹ã‚¯ãƒªãƒ—ãƒˆã�¯æ–°ã�—ã�„è¨­å®šã‚’ä½¿ã�Šã�†ã�¨ã�¯ã�—ã�ªã�„ã�®ã�§ã€�æ–°ã�—ã�„ãƒª"
+"ãƒªãƒ¼ã‚¹ã�®æ�©æ�µã‚’äº«å�—ã�™ã‚‹ã�“ã�¨ã�¯ã�§ã��ã�¾ã�›ã‚“ã€‚"
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid "Do you want to set up a database for snort-mysql to log to?"
+msgstr "snort-mysql ã‚’åˆ©ç”¨ã�—ã�¦ãƒ­ã‚°ã�«è¨˜éŒ²ã�™ã‚‹ã�Ÿã‚�ã€�ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’è¨­å®šã�—ã�¾ã�™ã�‹?"
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-mysql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a mysql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-mysql package with 'dpkg-"
+"reconfigure -plow snort-mysql'"
+msgstr ""
+"åˆ�ã‚�ã�¦ snort-mysql ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�—ã�Ÿæ™‚ã�®ã�¿ã€�ã�“ã�®è¨­å®šã‚’è¡Œã�†å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚ç¶š"
+"è¡Œã�®å‰�ã�«ã€�(1) ã�“ã�®ãƒ›ã‚¹ãƒˆã�‹ã‚‰ã�® TCP æŽ¥ç¶šã�Œè¨±å�¯ã�•ã‚Œã�¦ã�„ã‚‹ mysql ã‚µãƒ¼ãƒ�ã�®ãƒ›ã‚¹ãƒˆ"
+"å��ã€�(2) ã��ã�®ã‚µãƒ¼ãƒ�ã�§ã�®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹å��ã€�(3) ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã�«ã‚¢ã‚¯ã‚»ã‚¹ã�™ã‚‹ã�Ÿã‚�ã�®"
+"ãƒ¦ãƒ¼ã‚¶å��ã�¨ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ ã‚’ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„ã€‚ã�“ã‚Œã‚‰ã�Œã€Œã�™ã�¹ã�¦ã€�ã��ã‚�ã�£ã�¦ã�„ã�ªã�„å ´"
+"å�ˆã€� 'no' ã‚’é�¸æŠžã�—ã�¦é€šå¸¸ã�®ãƒ•ã‚¡ã‚¤ãƒ«ã�¸ã�®ãƒ­ã‚°è¨˜éŒ²ã‚’è¡Œã�†ã�‹ã€�ã�¾ã�šæ�¡ä»¶ã‚’ç¢ºèª�ã�—ã�¦ã��"
+"ã� ã�•ã�„ã€‚ã�®ã�¡ã�»ã�© 'dpkg-reconfigure -plow snort-mysql' ã�¨ã�—ã�¦ snort-mysql ãƒ‘ãƒƒ"
+"ã‚±ãƒ¼ã‚¸ã‚’å†�è¨­å®šã�—ã�¦ã€�ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã�§ã�®ãƒ­ã‚°è¨˜éŒ²è¨­å®šã�®å¤‰æ›´ã�Œã�„ã�¤ã�§ã‚‚å�¯èƒ½ã�§ã�™ã€‚"
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid "Snort needs a configured database to log to before it starts."
+msgstr "Snort ã�¯èµ·å‹•ã�™ã‚‹å‰�ã�«ãƒ­ã‚°ã‚’è¨˜éŒ²ã�™ã‚‹ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã�®è¨­å®šã�Œå¿…è¦�ã�§ã�™ã€‚"
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+"Fill in the correct values for the user, host, and database names. MySQL "
+"will prompt you for the password."
+msgstr ""
+"Snort ã�Œæ­£ã�—ã��å‹•ä½œã�™ã‚‹å‰�ã�«ã�¯ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã�®è¨­å®šã�Œå¿…è¦�ã�§ã�™ã€‚ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’ä½œæˆ�"
+"ã�™ã‚‹ã�«ã�¯ã€�ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã€Œå¾Œã€�ã�«ä»¥ä¸‹ã�®ã‚³ãƒžãƒ³ãƒ‰ã‚’å…¥åŠ›ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾"
+"ã�™: \n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+" ãƒ¦ãƒ¼ã‚¶å��ã€�ãƒ›ã‚¹ãƒˆå��ã€�ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹å��ã�¯é�©å½“ã�ªã‚‚ã�®ã‚’å½“ã�¦ã�¯ã‚�ã�¦å…¥åŠ›ã�—ã�¦ã��ã� ã�•"
+"ã�„ã€‚ MySQL ã�Œãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’è¦�æ±‚ã�™ã‚‹ã�¯ã�šã�§ã�™ã€‚"
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid ""
+"After you created the database structure, you will need to start Snort "
+"manually."
+msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ä½œæˆ�å¾Œã€�æ‰‹å‹•ã�§ Snrot ã‚’èµ·å‹•ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001
+msgid "Please enter the hostname of the mysql database server to use."
+msgstr "mysql ã‚µãƒ¼ãƒ�ã�®ãƒ›ã‚¹ãƒˆå��ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001 ../snort-pgsql.templates:13001
+msgid ""
+"Make sure it has been set up correctly to allow incoming connections from "
+"this host!"
+msgstr ""
+"ã�“ã�®ãƒ›ã‚¹ãƒˆã�‹ã‚‰ã�®æŽ¥ç¶šè¦�æ±‚ã�Œè¨±å�¯ã�•ã‚Œã‚‹ã‚ˆã�†ã�«ã€�è¨­å®šã‚’æ­£ã�—ã��è¡Œã�£ã�¦ã��ã� ã�•ã�„!"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid "Please enter the name of the database to use."
+msgstr "ä½¿ç”¨ã�™ã‚‹ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹å��ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid ""
+"Make sure this database has been created and your database user has write "
+"access to this database."
+msgstr ""
+"ã�“ã�®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã�Œæ—¢ã�«ä½œã‚‰ã‚Œã�¦ã�Šã‚Šã€�ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãƒ¦ãƒ¼ã‚¶ã�«æ›¸ã��è¾¼ã�¿æ¨©é™�ã�Œã�‚ã‚‹ã�®"
+"ã‚’ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Please enter the name of the database user you want to use."
+msgstr "ä½¿ç”¨ã�™ã‚‹ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã�®ãƒ¦ãƒ¼ã‚¶å��ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Make sure this user has been created and has write access."
+msgstr ""
+"ãƒ¦ãƒ¼ã‚¶ã�Œæ—¢ã�«ä½œã‚‰ã‚Œã�¦ã�Šã‚Šã€�æ›¸ã��è¾¼ã�¿æ¨©é™�ã‚’ã‚‚ã�£ã�¦ã�„ã‚‹ã�“ã�¨ã‚’ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter the password for the database connection."
+msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹æŽ¥ç¶šã�«ä½¿ç”¨ã�™ã‚‹ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter a password to connect to the Snort Alert database."
+msgstr ""
+"Snort ã‚¢ãƒ©ãƒ¼ãƒˆãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ ã�«æŽ¥ç¶šã�™ã‚‹éš›ã�«ä½¿ç”¨ã�™ã‚‹ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•"
+"ã�„ã€‚"
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid "Do you want to set up a database for snort-pgsql to log to?"
+msgstr "snort-pqsql ã‚’åˆ©ç”¨ã�—ã�¦ãƒ­ã‚°ã�«è¨˜éŒ²ã�™ã‚‹ã�Ÿã‚�ã€�ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’è¨­å®šã�—ã�¾ã�™ã�‹?"
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-pgsql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a pgsql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-pgsql package with 'dpkg-"
+"reconfigure -plow snort-pgsql'"
+msgstr ""
+"åˆ�ã‚�ã�¦ snort-pgsql ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã�—ã�Ÿæ™‚ã�®ã�¿ã€�ã�“ã�®è¨­å®šã‚’è¡Œã�†å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚ç¶š"
+"è¡Œã�®å‰�ã�«ã€�(1) ã�“ã�®ãƒ›ã‚¹ãƒˆã�‹ã‚‰ã�® TCP æŽ¥ç¶šã�Œè¨±å�¯ã�•ã‚Œã�¦ã�„ã‚‹ pgsql ã‚µãƒ¼ãƒ�ã�®ãƒ›ã‚¹ãƒˆ"
+"å��ã€�(2) ã��ã�®ã‚µãƒ¼ãƒ�ã�§ã�®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹å��ã€�(3) ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã�«ã‚¢ã‚¯ã‚»ã‚¹ã�™ã‚‹ã�Ÿã‚�ã�®"
+"ãƒ¦ãƒ¼ã‚¶å��ã�¨ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ ã‚’ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„ã€‚ã�“ã‚Œã‚‰ã�Œã€Œã�™ã�¹ã�¦ã€�ã��ã‚�ã�£ã�¦ã�„ã�ªã�„å ´"
+"å�ˆã€� 'no' ã‚’é�¸æŠžã�—ã�¦é€šå¸¸ã�®ãƒ­ã‚°è¨˜éŒ²ã‚’è¡Œã�†ã�‹ã€�ã�¾ã�šæ�¡ä»¶ã‚’ç¢ºèª�ã�—ã�¦ã��ã� ã�•ã�„ã€‚ã�®ã�¡"
+"ã�»ã�© 'dpkg-reconfigure -plow snort-pgsql' ã�¨å®Ÿè¡Œã�— snort-mysql ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’å†�"
+"è¨­å®šã�—ã�¦ã€�ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã�§ã�®ãƒ­ã‚°è¨˜éŒ²è¨­å®šã�®å¤‰æ›´ã�Œã�„ã�¤ã�§ã‚‚å�¯èƒ½ã�§ã�™ã€‚"
+
+#. Type: note
+#. Description
+#: ../snort-pgsql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+"Fill in the correct values for the user, host, and database names. "
+"PostgreSQL will prompt you for the password."
+msgstr ""
+"Snort ã�Œæ­£ã�—ã��å‹•ä½œã�™ã‚‹å‰�ã�«ã�¯ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã�®è¨­å®šã�Œå¿…è¦�ã�§ã�™ã€‚ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’ä½œæˆ�"
+"ã�™ã‚‹ã�«ã�¯ã€�ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã€Œå¾Œã€�ã�«ä»¥ä¸‹ã�®ã‚³ãƒžãƒ³ãƒ‰ã‚’å…¥åŠ›ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾"
+"ã�™: \n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+" ãƒ¦ãƒ¼ã‚¶å��ã€�ãƒ›ã‚¹ãƒˆå��ã€�ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹å��ã�¯é�©å½“ã�ªã‚‚ã�®ã‚’å½“ã�¦ã�¯ã‚�ã�¦å…¥åŠ›ã�—ã�¦ã��ã� ã�•"
+"ã�„ã€‚ PostgreSQL ã�Œãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’è¦�æ±‚ã�™ã‚‹ã�¯ã�šã�§ã�™ã€‚"
+
+#. Type: string
+#. Description
+#: ../snort-pgsql.templates:13001
+msgid "Please enter the hostname of the pgsql database server to use."
+msgstr "PostgreSQL ã‚µãƒ¼ãƒ�ã�®ãƒ›ã‚¹ãƒˆå��ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚"
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid "Your configuration file is deprecated"
+msgstr "ç„¡åŠ¹ã�ªè¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�§ã�™"
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"Your Snort configuration file (/etc/snort/snort.conf) uses deprecated "
+"options no longer available for this Snort release.  Snort will not be able "
+"to start unless you provide a correct configuration file. You can substitute "
+"your configuration file with the one provided in this package or fix it "
+"manually by removing deprecated options."
+msgstr ""
+"Snort ã�®è¨­å®šãƒ•ã‚¡ã‚¤ãƒ« (/etc/snort/snort.conf) ã�«ã�¦ã€�ä»Šå›žã�®ãƒªãƒªãƒ¼ã‚¹ã�‹ã‚‰ä½¿ã�ˆã�ªã��"
+"ã�ªã�£ã�Ÿç„¡åŠ¹ã�ªã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’æŒ‡å®šã�—ã�¦ã�„ã�¾ã�™ã€‚è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿®æ­£ã�—ã�ªã�„é™�ã‚Šèµ·å‹•ã�§ã��"
+"ã�ªã��ã�ªã‚Šã�¾ã�™ã€‚è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã�“ã�®ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã�Œæ��ä¾›ã�—ã�¦ã�„ã‚‹ã‚‚ã�®ã�«ç½®æ�›ã�™ã‚‹ã�‹ã€�ç„¡"
+"åŠ¹ã�ªã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’æ‰‹å‹•ã�§å‰Šé™¤ã�™ã‚‹ã�‹ã�—ã�¦å›žé�¿ã�§ã��ã�¾ã�™ã€‚"
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"The following deprecated options were found in your configuration file: "
+"${DEP_CONFIG}"
+msgstr "è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã�§ä»¥ä¸‹ã�®ç„¡åŠ¹ã�ªã‚ªãƒ—ã‚·ãƒ§ãƒ³ã�Œè¦‹ã�¤ã�‹ã‚Šã�¾ã�—ã�Ÿ: ${DEP_CONFIG}"
+
+#~ msgid ""
+#~ "Your system has an obsolete configuration file  (/etc/snort/snort.common."
+#~ "parameters) which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "ã‚·ã‚¹ãƒ†ãƒ ã�«æ—¢ã�«åˆ©ç”¨ã�§ã��ã�ªã�„è¨­å®šãƒ•ã‚¡ã‚¤ãƒ« (/etc/snort/snort.common."
+#~ "parameters) ã�Œã�‚ã‚Šã�¾ã�™ã€‚ã�“ã‚Œã�¯è‡ªå‹•çš„ã�«æ–°ã�—ã�„è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«å½¢å¼� (/etc/"
+#~ "default/snort ã�«ã�‚ã‚Šã�¾ã�™) ã�«å¤‰æ�›ã�•ã‚Œã�¦ã�„ã�¾ã�™ã€‚æ–°ã�—ã�„è¨­å®šã‚’ç¢ºèª�ã�—ã�¦ã€�å�¤ã�„è¨­"
+#~ "å®šã‚’å‰Šé™¤ã�—ã�¦ã��ã� ã�•ã�„ã€‚å‰Šé™¤ã�•ã‚Œã‚‹ã�¾ã�§ã€�init.d ã‚¹ã‚¯ãƒªãƒ—ãƒˆã�¯æ–°ã�—ã�„è¨­å®šã‚’ä½¿ã�Š"
+#~ "ã�†ã�¨ã�¯ã�—ã�ªã�„ã�®ã�§ã€�æ–°ã�—ã�„ãƒªãƒªãƒ¼ã‚¹ã�®æ�©æ�µã‚’äº«å�—ã�™ã‚‹ã�“ã�¨ã�¯ã�§ã��ã�¾ã�›ã‚“ã€‚"
+
+#~ msgid "On which interface should Snort listen?"
+#~ msgstr "Snort ã�¯ã�©ã�®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�§ listen ã�—ã�¾ã�™ã�‹?"
+
+#~ msgid ""
+#~ "Please enter the interface name which snort should listen on. The name of "
+#~ "the available interfaces are provided by running 'ip link show'. This "
+#~ "value usually is 'eth0', but you might want to vary this depending on "
+#~ "your environment, if you are using a dialup connection 'ppp0' might be "
+#~ "more appropiate."
+#~ msgstr ""
+#~ "Snort ã�Œ listen ã�™ã�¹ã��ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹å��ã‚’å…¥åŠ›ã�—ã�¦ã��ã� ã�•ã�„ã€‚æŒ‡å®šå�¯èƒ½ã�ªã‚¤ãƒ³"
+#~ "ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�¯ 'ip link show' ã‚’å®Ÿè¡Œã�™ã‚‹ã�¨ç¢ºèª�ã�§ã��ã�¾ã�™ã€‚ã�“ã�®å€¤ã�¯å¤§æŠµã�®å ´"
+#~ "å�ˆ 'eth0' ã�§ã�™ã�Œã€�ã�“ã‚Œã�¯ç’°å¢ƒã�«ã�¨ã�¦ã‚‚ä¾�å­˜ã�™ã‚‹ã�®ã�§ã€�ãƒ€ã‚¤ãƒ¤ãƒ«ã‚¢ãƒƒãƒ—æŽ¥ç¶šã‚’åˆ©ç”¨"
+#~ "ã�—ã�¦ã�„ã‚‹å ´å�ˆã�¯ 'ppp0' ã�®ã�»ã�†ã�Œã‚ˆã‚Šé�©åˆ‡ã�‹ã‚‚ã�—ã‚Œã�¾ã�›ã‚“ ã€‚"
+
+#~ msgid ""
+#~ "Notice that Snort is usually configured to inspect all traffic coming "
+#~ "from the Internet, so the interface you add here is usually the same the "
+#~ "'default route' is on.  You can determine which interface is used for "
+#~ "this running either 'ip route show' or '/sbin/route -n' (look for "
+#~ "'default' or '0.0.0.0')."
+#~ msgstr ""
+#~ "é€šå¸¸ã€�Snort ã�¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ�ãƒƒãƒˆã�‹ã‚‰ã‚„ã�£ã�¦æ�¥ã‚‹ã�™ã�¹ã�¦ã�®ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚’å�—ã�‘å�–ã‚‹ã‚ˆ"
+#~ "ã�†ã�«è¨­å®šã�•ã‚Œã‚‹ã�®ã�§ã€�ã�“ã�“ã�§è¿½åŠ ã�—ã�Ÿã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�¯å¤§æŠµ 'default route' "
+#~ "ã�Œå­˜åœ¨ã�™ã‚‹ã‚‚ã�®ã�¨å�Œã�˜ã�¨ã�„ã�†ã�“ã�¨ã�«æ³¨æ„�ã�—ã�¦ã��ã� ã�•ã�„ã€‚'ip route show' ã�¾ã�Ÿã�¯ "
+#~ "'/sbin/route -n' ã‚’å®Ÿè¡Œã�— ('default' ã�¾ã�Ÿã�¯ '0.0.0.0' ã‚’æŽ¢ã�—ã�¦)ã€�ã�©ã�®ã‚¤ãƒ³"
+#~ "ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã‚’ä½¿ã�†ã�‹ã‚’æ±ºã‚�ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™ã€‚"
+
+#~ msgid "Should Snort disable promiscous mode on the interface?"
+#~ msgstr "ã�“ã�®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ã�§ promiscous ãƒ¢ãƒ¼ãƒ‰ã‚’ç„¡åŠ¹ã�«ã�—ã�¾ã�™ã�‹?"
--- snort-2.3.3.orig/debian/po/templates.pot
+++ snort-2.3.3/debian/po/templates.pot
@@ -0,0 +1,479 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: jfs@computer.org\n"
+"POT-Creation-Date: 2006-12-28 23:00+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../snort.templates:1001 ../snort-mysql.templates:1001
+#: ../snort-pgsql.templates:1001
+msgid "boot, dialup, manual"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid "When should Snort be started?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid ""
+"Snort can be started during boot, when connecting to the net with pppd or "
+"only when you manually start it via /usr/sbin/snort."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid "On which interface(s) should Snort listen?"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Please enter the name(s) of the interface(s) which Snort should listen on.  "
+"The names of the available interfaces are provided by either running  'ip "
+"link show' of 'ifconfig'. This value usually is 'eth0', but you might want "
+"to vary this depending on your environment, if you are using a dialup "
+"connection 'ppp0' might be more appropiate."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Notice that Snort is usually configured to inspect all traffic coming from "
+"the Internet, so the interface you add here is usually the same the 'default "
+"route' is on.  You can determine which interface is used for this running "
+"either '/sbin/ip ro sh' or '/sbin/route -n' (look for 'default' or "
+"'0.0.0.0')."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"It is also not uncommon to run Snort on an interface with no IP and "
+"configured in promiscuous mode, if this is your case, select the interface "
+"in this system that is physically connected to the network you want to "
+"inspect, enable promiscuous mode later on and make sure that the network "
+"traffic is sent to this interface (either connected to a 'port mirroring/"
+"spanning' port in a switch, to a hub or to a tap)"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"You can configure multiple interfaces here, just by adding more than one "
+"interface name separated by spaces. Each interface can have its specific "
+"configuration."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid "Please enter the address range that Snort will listen on."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+"192.168.1.42/32 for just one. Specify multiple addresses on a single line "
+"separated by ',' (comma characters), no spaces allowed!"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"If you want you can specify 'any', to not trust any side of the network."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"Notice that if you are using multiple interfaces this definition will be "
+"used as the HOME_NET definition of all of them."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid "Should Snort disable promiscuous mode on the interface?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disabling promiscuous mode means that Snort will only see packets addressed "
+"to it's own interface. Enabling it allows Snort to check  every packet that "
+"passes ethernet segment even if it's a connection between two other "
+"computers."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disable promiscuous mode if you are configuring Snort on an interface "
+"without a configured IP address."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid "Invalid interface"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"One of the interfaces you specified is not valid (it might not exist on the "
+"system or be down). Please introduce a valid interface when answering the "
+"question of which interface(s) should Snort listen on."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"If you did not configure an interface then the package is trying to use the "
+"default ('eth0') which does not seem to be valid in your system."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid "Should Snort's rules testing order be changed to Pass|Alert|Log?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid ""
+"If you change Snort's rules testing order to Pass|Alert|Log, they will be "
+"applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+"This will prevent people from having to make huge Berky Packet Filter "
+"command line arguments to filter their alert rules."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid "Should daily summaries be sent by e-mail?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid ""
+"This Snort installation provides a cron job that runs daily and summarises "
+"the information of Snort logs to a selected email address. If you want to "
+"disable this feature say 'no' here."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid "Who should receive the daily statistics mails?"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid ""
+"A cron job running daily will summarise the information of the logs "
+"generated by Snort using a script called 'snort-stat'. Introduce here the "
+"recipient of these mails. The default value is the system administrator. If "
+"you keep this value, make sure that the mail of the administrator is "
+"redirected to a user that actually reads those mails."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:9001 ../snort-mysql.templates:8001
+#: ../snort-pgsql.templates:8001
+msgid ""
+"If you want to specify custom options to Snort, please specify them here."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:10001 ../snort-mysql.templates:9001
+#: ../snort-pgsql.templates:9001
+msgid ""
+"An alert needs to appear more times than this number to be included in the "
+"daily statistics."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid "You are running Snort manually."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid ""
+"Please restart Snort using:\n"
+" /etc/init.d/snort start\n"
+"to let the settings take effect."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid "There is an error in your configuration"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid ""
+"Your Snort configuration is not correct and Snort will not be able to start "
+"up normally. Please review your configuration and fix it. If you do not do "
+"this, Snort package upgrades will probably break. To check which error is "
+"being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf' (or point "
+"to an alternate configuration file if you are using different files for "
+"different interfaces)"
+msgstr ""
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid "This system uses an obsolete configuration file"
+msgstr ""
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid ""
+"Your system has an obsolete configuration file (/etc/snort/snort.common."
+"parameters) which has been automatically converted into the new "
+"configuration file format (at /etc/default/snort). Please review the new "
+"configuration and remove the obsolete one. Until you do this, the init.d "
+"script will not use the new configuration and you will not take advantage of "
+"the benefits introduced in newer releases."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid "Do you want to set up a database for snort-mysql to log to?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-mysql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a mysql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-mysql package with 'dpkg-"
+"reconfigure -plow snort-mysql'"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid "Snort needs a configured database to log to before it starts."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+"Fill in the correct values for the user, host, and database names. MySQL "
+"will prompt you for the password."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid ""
+"After you created the database structure, you will need to start Snort "
+"manually."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001
+msgid "Please enter the hostname of the mysql database server to use."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001 ../snort-pgsql.templates:13001
+msgid ""
+"Make sure it has been set up correctly to allow incoming connections from "
+"this host!"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid "Please enter the name of the database to use."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid ""
+"Make sure this database has been created and your database user has write "
+"access to this database."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Please enter the name of the database user you want to use."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Make sure this user has been created and has write access."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter the password for the database connection."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter a password to connect to the Snort Alert database."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid "Do you want to set up a database for snort-pgsql to log to?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-pgsql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a pgsql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-pgsql package with 'dpkg-"
+"reconfigure -plow snort-pgsql'"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort-pgsql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+"Fill in the correct values for the user, host, and database names. "
+"PostgreSQL will prompt you for the password."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort-pgsql.templates:13001
+msgid "Please enter the hostname of the pgsql database server to use."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid "Your configuration file is deprecated"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"Your Snort configuration file (/etc/snort/snort.conf) uses deprecated "
+"options no longer available for this Snort release.  Snort will not be able "
+"to start unless you provide a correct configuration file. You can substitute "
+"your configuration file with the one provided in this package or fix it "
+"manually by removing deprecated options."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"The following deprecated options were found in your configuration file: "
+"${DEP_CONFIG}"
+msgstr ""
--- snort-2.3.3.orig/debian/po/cs.po
+++ snort-2.3.3/debian/po/cs.po
@@ -0,0 +1,635 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: snort\n"
+"Report-Msgid-Bugs-To: jfs@computer.org\n"
+"POT-Creation-Date: 2006-12-28 23:00+0100\n"
+"PO-Revision-Date: 2005-08-06 18:52+0200\n"
+"Last-Translator: Jan Outrata <outrataj@upcase.inf.upol.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../snort.templates:1001 ../snort-mysql.templates:1001
+#: ../snort-pgsql.templates:1001
+msgid "boot, dialup, manual"
+msgstr "boot, dialup, ruènì"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid "When should Snort be started?"
+msgstr "Kdy má být Snort spou¹tìn?"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid ""
+"Snort can be started during boot, when connecting to the net with pppd or "
+"only when you manually start it via /usr/sbin/snort."
+msgstr ""
+"Snort mù¾e být spu¹tìn bìhem startu systému (boot), pøi pøipojování k síti "
+"pomocí pppd (dialup) nebo jen kdy¾ jej spustíte ruènì pøes /usr/sbin/snort."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid "On which interface(s) should Snort listen?"
+msgstr "Na kterém (kterých) rozhraní (rozhraních) má Snort naslouchat?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+#, fuzzy
+msgid ""
+"Please enter the name(s) of the interface(s) which Snort should listen on.  "
+"The names of the available interfaces are provided by either running  'ip "
+"link show' of 'ifconfig'. This value usually is 'eth0', but you might want "
+"to vary this depending on your environment, if you are using a dialup "
+"connection 'ppp0' might be more appropiate."
+msgstr ""
+"Zadejte jméno (jména) rozhraní, na kterém (kterých) má snort naslouchat. "
+"Jména dostupných rozhraní získáte spu¹tìním 'ip link show'. Tato hodnota je "
+"obvykle 'eth0', ale mù¾ete chtít jinou v závislosti na va¹em prostøedí, "
+"pokud pou¾íváte vytáèené pøipojení, 'ppp0' mù¾e být vhodnìj¹í."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Notice that Snort is usually configured to inspect all traffic coming from "
+"the Internet, so the interface you add here is usually the same the 'default "
+"route' is on.  You can determine which interface is used for this running "
+"either '/sbin/ip ro sh' or '/sbin/route -n' (look for 'default' or "
+"'0.0.0.0')."
+msgstr ""
+"Snort je obvykle konfigurován pro sledování ve¹kerého provozu pøicházejícího "
+"z Internetu, tak¾e rozhraní, které zde pøidáte, je obvykle stejné jako je "
+"'výchozí smìrování (default route)'. Které rozhraní se pro toto pou¾ívá, "
+"mù¾ete zjistit spu¹tìním buï '/sbin/ip ro sh' nebo '/sbin/route -"
+"n' (hledejte 'default' nebo '0.0.0.0')."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"It is also not uncommon to run Snort on an interface with no IP and "
+"configured in promiscuous mode, if this is your case, select the interface "
+"in this system that is physically connected to the network you want to "
+"inspect, enable promiscuous mode later on and make sure that the network "
+"traffic is sent to this interface (either connected to a 'port mirroring/"
+"spanning' port in a switch, to a hub or to a tap)"
+msgstr ""
+"Také není neobvyklé spustit Snort na rozhraní bez IP adresy a nastaveném do "
+"promiskuitního módu, pokud je to vá¹ pøípad, vyberte rozhraní systému "
+"fyzicky pøipojené k síti a které chcete sledovat, potom povolte promiskuitní "
+"mód a ujistìte se, ¾e je sí»ový provoz posílán na toto rozhraní (buï "
+"pøipojené k 'port mirroring/spanning' portu switche, k hubu nebo k tap "
+"rozhraní."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"You can configure multiple interfaces here, just by adding more than one "
+"interface name separated by spaces. Each interface can have its specific "
+"configuration."
+msgstr ""
+"Mù¾ete zde také zadat více rozhraní, jednodu¹e zapsáním více ne¾ jednoho "
+"jména rozhraní, oddìlených mezerami. Ka¾dé rozhraní mù¾e mít své specifické "
+"nastavení."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid "Please enter the address range that Snort will listen on."
+msgstr "Zadejte adresní rozsah, na kterém bude Snort naslouchat."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+"192.168.1.42/32 for just one. Specify multiple addresses on a single line "
+"separated by ',' (comma characters), no spaces allowed!"
+msgstr ""
+"Musíte pou¾ít zápis CIDR, t.j. 192.168.1.0/24 pro blok 256 IP adres nebo "
+"192.168.1.42/32 pro jednu jedinou adresu. Více adres zadejte na jednom øádku "
+"oddìlené ',' (èárka), bez mezer!"
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"If you want you can specify 'any', to not trust any side of the network."
+msgstr ""
+"Jestli chcete, mù¾ete zadat 'any', pokud nedùvìøujete ¾ádné stranì sítì."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"Notice that if you are using multiple interfaces this definition will be "
+"used as the HOME_NET definition of all of them."
+msgstr ""
+"Pokud pou¾íváte více rozhraní, bude tato definice pou¾ita jako definice "
+"HOME_NET pro v¹echna z nich."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid "Should Snort disable promiscuous mode on the interface?"
+msgstr "Má Snort zakázat promiskuitní mód na tomto rozhraní?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disabling promiscuous mode means that Snort will only see packets addressed "
+"to it's own interface. Enabling it allows Snort to check  every packet that "
+"passes ethernet segment even if it's a connection between two other "
+"computers."
+msgstr ""
+"Zakázání promiskuitního módu znamená, ¾e Snort uvidí jen pakety adresované "
+"jeho vlastnímu rozhraní. Povolení dovoluje Snortu kontrolovat ka¾dý paket, "
+"který prochází ethernetovým segmentem, i kdy¾ je to spojení mezi jinými "
+"dvìma poèítaèi."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disable promiscuous mode if you are configuring Snort on an interface "
+"without a configured IP address."
+msgstr ""
+"Zaka¾te promiskuitní mód, jestli¾e konfigurujete Snort na rozhraní bez "
+"nastavené IP adresy."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid "Invalid interface"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"One of the interfaces you specified is not valid (it might not exist on the "
+"system or be down). Please introduce a valid interface when answering the "
+"question of which interface(s) should Snort listen on."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"If you did not configure an interface then the package is trying to use the "
+"default ('eth0') which does not seem to be valid in your system."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid "Should Snort's rules testing order be changed to Pass|Alert|Log?"
+msgstr "Má být poøadí testovacích pravidel Snortu zmìnìno na Pass|Alert|Log?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid ""
+"If you change Snort's rules testing order to Pass|Alert|Log, they will be "
+"applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+"This will prevent people from having to make huge Berky Packet Filter "
+"command line arguments to filter their alert rules."
+msgstr ""
+"Jestli¾e zmìníte poøadí testovacích pravidel Snortu na Pass|Alert|Log "
+"(Propustit|Upozornit|Logovat), budou aplikována v poøadí Pass->Alert->Log, "
+"místo standardního Alert->Pass->Log. Tím pøedejdete nutnosti vytváøet "
+"rozsáhlé parametry pøíkazového øádku Berkeley Packet Filtru pro filtrování "
+"upozoròovacích pravidel."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid "Should daily summaries be sent by e-mail?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid ""
+"This Snort installation provides a cron job that runs daily and summarises "
+"the information of Snort logs to a selected email address. If you want to "
+"disable this feature say 'no' here."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid "Who should receive the daily statistics mails?"
+msgstr "Kdo má dostávat denní maily se statistikami?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid ""
+"A cron job running daily will summarise the information of the logs "
+"generated by Snort using a script called 'snort-stat'. Introduce here the "
+"recipient of these mails. The default value is the system administrator. If "
+"you keep this value, make sure that the mail of the administrator is "
+"redirected to a user that actually reads those mails."
+msgstr ""
+"Úloha pro cron spou¹tìná dennì shrnuje pomocí skriptu 'snort-stat' informace "
+"z logù generovaných Snortem. Uveïte zde pøíjemnce tìchto mailù. Výchozí "
+"hodnota je administrátor systému. Pokud tuto hodnotu zachováte, ujistìte se, "
+"¾e po¹ta pro administrátora je pøesmìrována u¾ivateli, který ve skuteènosti "
+"ète tyto maily."
+
+#. Type: string
+#. Description
+#: ../snort.templates:9001 ../snort-mysql.templates:8001
+#: ../snort-pgsql.templates:8001
+msgid ""
+"If you want to specify custom options to Snort, please specify them here."
+msgstr "Pokud chcete zadat vlastní parametry Snortu, zadejte je zde."
+
+#. Type: string
+#. Description
+#: ../snort.templates:10001 ../snort-mysql.templates:9001
+#: ../snort-pgsql.templates:9001
+msgid ""
+"An alert needs to appear more times than this number to be included in the "
+"daily statistics."
+msgstr ""
+"Upozornìní se musí vyskytnout vícekrát ne¾ toto èíslo, aby bylo obsa¾eno v "
+"denní statistice."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid "You are running Snort manually."
+msgstr "Spou¹títe Snort ruènì."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid ""
+"Please restart Snort using:\n"
+" /etc/init.d/snort start\n"
+"to let the settings take effect."
+msgstr ""
+"Restartujte Snort pomocí:\n"
+" /etc/init.d/snort start\n"
+"aby nastavení nabyla platnosti."
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid "There is an error in your configuration"
+msgstr "Ve va¹í konfiguraci je chyba"
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid ""
+"Your Snort configuration is not correct and Snort will not be able to start "
+"up normally. Please review your configuration and fix it. If you do not do "
+"this, Snort package upgrades will probably break. To check which error is "
+"being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf' (or point "
+"to an alternate configuration file if you are using different files for "
+"different interfaces)"
+msgstr ""
+"Va¹e konfigurace Snortu není správná a proto se nebude moci normálnì "
+"spustit. Zkontrolujte konfiguraci a opravte to. Pokud to neudìláte, "
+"aktualizace balíèku Snortu pravdìpodobnì skonèí s chybou. Pro zji¹tìní, jaká "
+"chyba je generována, spus»te '/usr/sbin/snort -T -c /etc/snort/snort."
+"conf' (nebo zadejte jiný konfiguraèní soubor, jestli¾e pou¾íváte rùzné "
+"soubory pro rùzná rozhraní)"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid "This system uses an obsolete configuration file"
+msgstr "Tento systém pou¾ívá zastaralý konfiguraèní soubor"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+#, fuzzy
+msgid ""
+"Your system has an obsolete configuration file (/etc/snort/snort.common."
+"parameters) which has been automatically converted into the new "
+"configuration file format (at /etc/default/snort). Please review the new "
+"configuration and remove the obsolete one. Until you do this, the init.d "
+"script will not use the new configuration and you will not take advantage of "
+"the benefits introduced in newer releases."
+msgstr ""
+"Vá¹ systém obsahuje zastaralý konfiguraèní soubor (/etc/snort/snort.common."
+"parameters), který byl automaticky pøeveden do nového formátu konfiguraèního "
+"souboru (v /etc/default/snort). Zkontrolujte novou konfiguraci a odstraòte "
+"tu zastaralou. Dokud to neudìláte, skript init.d nebude pou¾ívat novou "
+"konfiguraci a nevyu¾ijete tak výhod pøedstavených v nových verzích."
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid "Do you want to set up a database for snort-mysql to log to?"
+msgstr "Chcete nastavit databázi, ke které se má snort-mysql pøihlásit?"
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-mysql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a mysql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-mysql package with 'dpkg-"
+"reconfigure -plow snort-mysql'"
+msgstr ""
+"Toto je potøeba udìlat jen pøi první instalaci snort-mysql. Ne¾ budete "
+"pokraèovat, ujistìte se, ¾e máte (1) jméno poèítaèe, na kterém bì¾í mysql "
+"server, nastaveno pro povolení tcp spojení z tohoto poèítaèe, (2) databázi "
+"na tom serveru, (3) u¾ivatelské jméno a heslo pro pøístup do databáze. Pokud "
+"nemáte tohle _v¹echno_, zvolte 'ne' a spokojte se s podporou logování do "
+"normálního souboru, nebo to nejdøív napravte. V¾dycky mù¾ete nastavit "
+"logování do databáze pozdìji rekonfigurováním balíèku snort-mysql pomocí "
+"'dpkg-reconfigure -plow snort-mysql'"
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+#, fuzzy
+msgid "Snort needs a configured database to log to before it starts."
+msgstr "Snort potøebuje nastavit databázi, ke které se má pøihlásit."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001
+#, fuzzy
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+"Fill in the correct values for the user, host, and database names. MySQL "
+"will prompt you for the password."
+msgstr ""
+"Vytvoøte nyní strukturu databáze, pomocí následujícího pøíkazu:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <uzivatel> -h <pocitac> -p <jmenodatabaze>\n"
+"Doplòte správné hodnoty pro u¾ivatele, poèítaè a jméno databáze. MySQL se "
+"vás zeptá na heslo."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+#, fuzzy
+msgid ""
+"After you created the database structure, you will need to start Snort "
+"manually."
+msgstr "Po vytvoøení struktury databáze zmáèknìte 'ok' pro pokraèování."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001
+msgid "Please enter the hostname of the mysql database server to use."
+msgstr ""
+"Zadejte jméno poèítaèe s mysql databázovým serverem, který se má pou¾ít."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001 ../snort-pgsql.templates:13001
+msgid ""
+"Make sure it has been set up correctly to allow incoming connections from "
+"this host!"
+msgstr ""
+"Ujistìte se, ¾e bylo správnì nastaveno povolení pøíchozích spojení z tohoto "
+"poèítaèe!"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid "Please enter the name of the database to use."
+msgstr "Zadejte jméno databáze, která se má pou¾ít."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid ""
+"Make sure this database has been created and your database user has write "
+"access to this database."
+msgstr ""
+"Ujistìte se, ¾e byla tato databáze vytvoøena a ¾e má databázový u¾ivatel "
+"právo zápisu do této databáze."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Please enter the name of the database user you want to use."
+msgstr "Zadejte jméno databázového u¾ivatele, které chcete pou¾ít."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Make sure this user has been created and has write access."
+msgstr "Ujistìte se, ¾e byl tento u¾ivatel vytvoøen a ¾e má právo zápisu."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter the password for the database connection."
+msgstr "Zadejte heslo pro pøipojení k databázi."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter a password to connect to the Snort Alert database."
+msgstr "Zadejte heslo pro pøipojení k Snort Alert databázi."
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid "Do you want to set up a database for snort-pgsql to log to?"
+msgstr "Chcete nastavit databázi, ke které se má snort-pgsql pøihlásit?"
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-pgsql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a pgsql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-pgsql package with 'dpkg-"
+"reconfigure -plow snort-pgsql'"
+msgstr ""
+"Toto je potøeba udìlat jen pøi první instalaci snort-pgsql. Ne¾ budete "
+"pokraèovat, ujistìte se, ¾e máte (1) jméno poèítaèe, na kterém bì¾í pgsql "
+"server, nastaveno pro povolení tcp spojení z tohoto poèítaèe, (2) databázi "
+"na tom serveru, (3) u¾ivatelské jméno a heslo pro pøístup do databáze. Pokud "
+"nemáte tohle _v¹echno_, zvolte 'ne' a spokojte se s podporou logování do "
+"normálního souboru, nebo to nejdøív napravte. V¾dycky mù¾ete nastavit "
+"logování do databáze pozdìji rekonfigurováním balíèku snort-pgsql pomocí "
+"'dpkg-reconfigure -plow snort-pgsql'"
+
+#. Type: note
+#. Description
+#: ../snort-pgsql.templates:12001
+#, fuzzy
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+"Fill in the correct values for the user, host, and database names. "
+"PostgreSQL will prompt you for the password."
+msgstr ""
+"Vytvoøte nyní strukturu databáze, pomocí následujícího pøíkazu:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_pgsql.gz | psql -U <uzivatel> -h <pocitac> -W <jmenodatabaze>\n"
+"Doplòte správné hodnoty pro u¾ivatele, poèítaè a jméno databáze. PostgreSQL "
+"se vás zeptá na heslo."
+
+#. Type: string
+#. Description
+#: ../snort-pgsql.templates:13001
+msgid "Please enter the hostname of the pgsql database server to use."
+msgstr ""
+"Zadejte jméno poèítaèe s pgsql databázovým serverem, který se má pou¾ít."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid "Your configuration file is deprecated"
+msgstr "Vá¹ konfiguraèní soubor obsahuje zru¹ené volby."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"Your Snort configuration file (/etc/snort/snort.conf) uses deprecated "
+"options no longer available for this Snort release.  Snort will not be able "
+"to start unless you provide a correct configuration file. You can substitute "
+"your configuration file with the one provided in this package or fix it "
+"manually by removing deprecated options."
+msgstr ""
+"Vá¹ konfiguraèní soubor Snortu (/etc/snort/snort.conf) pou¾ívá zru¹ené "
+"volby, které ji¾ nejsou v tomto vydání Snortu dostupné. Snort se nebude moci "
+"spustit, pokud neposkytnete korektní konfiruraèní soubor. Mù¾ete nahradit "
+"vá¹ konfiguraèní soubor souborem obsa¾eným v tomto balíèku nebo to opravit "
+"ruènì odstranìním zru¹ených voleb."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"The following deprecated options were found in your configuration file: "
+"${DEP_CONFIG}"
+msgstr ""
+"Ve va¹em konfiguraèním souboru byly nalezeny následující zru¹ené volby: "
+"${DEP_CONFIG}"
+
+#~ msgid ""
+#~ "Your system has an obsolete configuration file  (/etc/snort/snort.common."
+#~ "parameters) which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "Vá¹ systém obsahuje zastaralý konfiguraèní soubor (/etc/snort/snort."
+#~ "common.parameters), který byl automaticky pøeveden do nového formátu "
+#~ "konfiguraèního souboru (v /etc/default/snort). Zkontrolujte novou "
+#~ "konfiguraci a odstraòte tu zastaralou. Dokud to neudìláte, skript init.d "
+#~ "nebude pou¾ívat novou konfiguraci a nevyu¾ijete tak výhod pøedstavených v "
+#~ "nových verzích."
+
+#~ msgid "On which interface should Snort listen?"
+#~ msgstr "Na kterém rozhraní má Snort naslouchat?"
+
+#~ msgid ""
+#~ "Please enter the interface name which snort should listen on. The name of "
+#~ "the available interfaces are provided by running 'ip link show'. This "
+#~ "value usually is 'eth0', but you might want to vary this depending on "
+#~ "your environment, if you are using a dialup connection 'ppp0' might be "
+#~ "more appropiate."
+#~ msgstr ""
+#~ "Zadejte jméno rozhraní, na kterém má snort naslouchat. Jména dostupných "
+#~ "rozhraní získáte spu¹tìním 'ip link show'. Tato hodnota je obvykle "
+#~ "'eth0', ale mù¾ete chtít jinou v závislosti na va¹em prostøedí, pokud "
+#~ "pou¾íváte vytáèené pøipojení, 'ppp0' mù¾e být vhodnìj¹í."
+
+#~ msgid ""
+#~ "Notice that Snort is usually configured to inspect all traffic coming "
+#~ "from the Internet, so the interface you add here is usually the same the "
+#~ "'default route' is on.  You can determine which interface is used for "
+#~ "this running either 'ip route show' or '/sbin/route -n' (look for "
+#~ "'default' or '0.0.0.0')."
+#~ msgstr ""
+#~ "Snort je obvykle konfigurován pro sledování ve¹kerého provozu "
+#~ "pøicházejícího z Internetu, tak¾e rozhraní, které zde pøidáte, je obvykle "
+#~ "stejné jako je 'výchozí smìrování (default route)'. Které rozhraní se pro "
+#~ "toto pou¾ívá, mù¾ete zjistit spu¹tìním buï 'ip route show' nebo '/sbin/"
+#~ "route -n' (hledejte 'default' nebo '0.0.0.0')."
+
+#~ msgid "Should Snort disable promiscous mode on the interface?"
+#~ msgstr "Má Snort zakázat promiskuitní mód na tomto rozhraní?"
--- snort-2.3.3.orig/debian/po/pt_BR.po
+++ snort-2.3.3/debian/po/pt_BR.po
@@ -0,0 +1,803 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: snort\n"
+"Report-Msgid-Bugs-To: jfs@computer.org\n"
+"POT-Creation-Date: 2006-12-28 23:00+0100\n"
+"PO-Revision-Date: 2004-08-07 22:06-0300\n"
+"Last-Translator: André Luís Lopes <andrelop@ig.com.br>\n"
+"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../snort.templates:1001 ../snort-mysql.templates:1001
+#: ../snort-pgsql.templates:1001
+msgid "boot, dialup, manual"
+msgstr "inicialização, discagem, manual"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid "When should Snort be started?"
+msgstr "Quando o Snort deve ser iniciado ?"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid ""
+"Snort can be started during boot, when connecting to the net with pppd or "
+"only when you manually start it via /usr/sbin/snort."
+msgstr ""
+"O Snort pode ser iniciado durante a inicialização da máquina, quando "
+"conectando a Internet com o pppd ou somente quando você iniciar manualmente "
+"através do comando /usr/sbin/snort."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+#, fuzzy
+msgid "On which interface(s) should Snort listen?"
+msgstr "Em qual interface de rede o Snort deve ouvir ?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+#, fuzzy
+msgid ""
+"Please enter the name(s) of the interface(s) which Snort should listen on.  "
+"The names of the available interfaces are provided by either running  'ip "
+"link show' of 'ifconfig'. This value usually is 'eth0', but you might want "
+"to vary this depending on your environment, if you are using a dialup "
+"connection 'ppp0' might be more appropiate."
+msgstr ""
+"Por favor, informe o nome da interface na qual o snort deverá ouvir. O nome "
+"das interfaces disponíveis podem ser visualizados executando-se o comando "
+"'ip link show'. Esse valor geralmente é 'eth0', mas você pode querer variar "
+"isso dependendo de seu ambiente, caso você esteja usando uma conexão "
+"discada, 'ppp0' pode ser mais apropriado."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Notice that Snort is usually configured to inspect all traffic coming from "
+"the Internet, so the interface you add here is usually the same the 'default "
+"route' is on.  You can determine which interface is used for this running "
+"either '/sbin/ip ro sh' or '/sbin/route -n' (look for 'default' or "
+"'0.0.0.0')."
+msgstr ""
+"Note que o Snort é geralmente configurado para inspecionar todo tráfego "
+"chegando da Internet, de modo que a interface que você adicionar aqui "
+"geralmente é a mesma onde a 'rota padrão' está. Você pode determinar qual "
+"interface é usada para isso executando o comando '/sbin/ip ro sh' ou '/sbin/"
+"route -n' (procure por 'default' ou '0.0.0.0')."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"It is also not uncommon to run Snort on an interface with no IP and "
+"configured in promiscuous mode, if this is your case, select the interface "
+"in this system that is physically connected to the network you want to "
+"inspect, enable promiscuous mode later on and make sure that the network "
+"traffic is sent to this interface (either connected to a 'port mirroring/"
+"spanning' port in a switch, to a hub or to a tap)"
+msgstr ""
+"Também não é incomum executar o Snort em uma interface sem endereço IP e "
+"configurada em modo promíscuo, caso esse seja seu caso, selecione a "
+"interface neste sistema que esteja fisicamente conectada a rede que você "
+"quer inspecionar, habilite o modo promíscuo depois e certifique-se de que o "
+"tráfego de rede seja enviada para essa interface (conectado a uma porta "
+"'port mirroring/spanning' em um switch, a um hub ou a uma tap)"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"You can configure multiple interfaces here, just by adding more than one "
+"interface name separated by spaces. Each interface can have its specific "
+"configuration."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid "Please enter the address range that Snort will listen on."
+msgstr "Por favor, especifique a faixa de endereços na qual o Snort irá ouvir."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+"192.168.1.42/32 for just one. Specify multiple addresses on a single line "
+"separated by ',' (comma characters), no spaces allowed!"
+msgstr ""
+"Você precisará usar a notação CIDR, ou seja, 192.168.1.0/24 para um bloco de "
+"256 IPs ou 192.168.1.42/32 para um único host. Especifique múltiplos "
+"endereços em uma única linha separados por ',' (caracter vírgula). Espaços "
+"não são permitidos !"
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"If you want you can specify 'any', to not trust any side of the network."
+msgstr ""
+"Caso você queira, é possível especificar 'any', para não confiar em nenhum "
+"dos lados da rede."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"Notice that if you are using multiple interfaces this definition will be "
+"used as the HOME_NET definition of all of them."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid "Should Snort disable promiscuous mode on the interface?"
+msgstr "O Snort deve desabilitar o modo promíscuo na interface ?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disabling promiscuous mode means that Snort will only see packets addressed "
+"to it's own interface. Enabling it allows Snort to check  every packet that "
+"passes ethernet segment even if it's a connection between two other "
+"computers."
+msgstr ""
+"Desabilitar o modo promíscuo significa que o Snort irá somente ver pacotes "
+"destinados a sua própria interface. Habilitar o modo promíscuo permitirá que "
+"o Snort cheque cada pacote que passa pelo segmento ethernet mesmo caso os "
+"pacotes façam parte de uma conexão entre dois outros computadores."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disable promiscuous mode if you are configuring Snort on an interface "
+"without a configured IP address."
+msgstr ""
+"Desabilite o modo promíscuo caso você esteja configurando o Snort em uma "
+"interface sem um endereço IP configurado."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid "Invalid interface"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"One of the interfaces you specified is not valid (it might not exist on the "
+"system or be down). Please introduce a valid interface when answering the "
+"question of which interface(s) should Snort listen on."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"If you did not configure an interface then the package is trying to use the "
+"default ('eth0') which does not seem to be valid in your system."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid "Should Snort's rules testing order be changed to Pass|Alert|Log?"
+msgstr ""
+"A ordem de teste das regras do Snort deve ser mudada para Passar|Alertar|"
+"Logar ?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid ""
+"If you change Snort's rules testing order to Pass|Alert|Log, they will be "
+"applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+"This will prevent people from having to make huge Berky Packet Filter "
+"command line arguments to filter their alert rules."
+msgstr ""
+"Caso você mude a ordem de teste das regras do Snort para Passar|Alertar|"
+"Logar, as regras serão aplicadas na ordem Passar->Alertar->Logar, ao invés "
+"da ordem padrão Alertar->Passar->Logar. Isso evitará que os usuários do "
+"Snort tenham que fazer grandes argumentos de linha de comando Berkely Packet "
+"Filtering para filtrar suas regras de alerta."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid "Should daily summaries be sent by e-mail?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid ""
+"This Snort installation provides a cron job that runs daily and summarises "
+"the information of Snort logs to a selected email address. If you want to "
+"disable this feature say 'no' here."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid "Who should receive the daily statistics mails?"
+msgstr "Quem deverá receber os e-mails de estatísticas diárias ?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid ""
+"A cron job running daily will summarise the information of the logs "
+"generated by Snort using a script called 'snort-stat'. Introduce here the "
+"recipient of these mails. The default value is the system administrator. If "
+"you keep this value, make sure that the mail of the administrator is "
+"redirected to a user that actually reads those mails."
+msgstr ""
+"Um job cron executado diariamente irá sumarizar a informação dos logs "
+"gerados pelo Snort usando um script chamado 'snort-stat'. Informe aqui o "
+"destinatário dessas mensagens. O valor padrão é o administrador do sistema. "
+"Caso você mantenha esse valor, certifique-se de que as mensagens para o "
+"administrador sejam redirecionadas para um usuário que na verdade leia essas "
+"mensagens."
+
+#. Type: string
+#. Description
+#: ../snort.templates:9001 ../snort-mysql.templates:8001
+#: ../snort-pgsql.templates:8001
+msgid ""
+"If you want to specify custom options to Snort, please specify them here."
+msgstr ""
+"Caso você queira especificar opções personalizadas para o Snort, por favor, "
+"especifique-os aqui."
+
+#. Type: string
+#. Description
+#: ../snort.templates:10001 ../snort-mysql.templates:9001
+#: ../snort-pgsql.templates:9001
+msgid ""
+"An alert needs to appear more times than this number to be included in the "
+"daily statistics."
+msgstr ""
+"Um alerta precisa aparecer mais do que esta quantidade de vezes para ser "
+"considerado nas estatísticas diárias."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid "You are running Snort manually."
+msgstr "Você está executando o Snort manualmente."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid ""
+"Please restart Snort using:\n"
+" /etc/init.d/snort start\n"
+"to let the settings take effect."
+msgstr ""
+"Por favor reinicie o Snort usando :\n"
+" /etc/init.d/snort start\n"
+"para fazer com que as configurações tenham efeito."
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid "There is an error in your configuration"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid ""
+"Your Snort configuration is not correct and Snort will not be able to start "
+"up normally. Please review your configuration and fix it. If you do not do "
+"this, Snort package upgrades will probably break. To check which error is "
+"being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf' (or point "
+"to an alternate configuration file if you are using different files for "
+"different interfaces)"
+msgstr ""
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid "This system uses an obsolete configuration file"
+msgstr ""
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid ""
+"Your system has an obsolete configuration file (/etc/snort/snort.common."
+"parameters) which has been automatically converted into the new "
+"configuration file format (at /etc/default/snort). Please review the new "
+"configuration and remove the obsolete one. Until you do this, the init.d "
+"script will not use the new configuration and you will not take advantage of "
+"the benefits introduced in newer releases."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid "Do you want to set up a database for snort-mysql to log to?"
+msgstr ""
+"Você deseja configurar uma base de dados para o snort-mysql armazenar seus "
+"logs ?"
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-mysql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a mysql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-mysql package with 'dpkg-"
+"reconfigure -plow snort-mysql'"
+msgstr ""
+"Você precisa fazer isso somente na primeira vez que você instalar o snort-"
+"mysql. Antes de prosseguir, certifique-se de possuir (1) o hostname da "
+"máquina executando um servidor mysql, configurado para permitir conexões tcp "
+"originadas desse host, (2) uma base de dados nesse servidor, (3) um nome de "
+"usuário e senha para acessar a base de dados. Caso você não tenha _tudo_ "
+"isso, selecione 'não' e execute o snort com o suporte comum de logging em "
+"arquivo ou providencie tudo o que é necessário antecipadamente. Você poderá "
+"sempre configurar o logging em base de dados posteriormente, reconfigurando "
+"o pacote snort-mysql com o comando 'dpkg-reconfigure -plow snort-mysql'"
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+#, fuzzy
+msgid "Snort needs a configured database to log to before it starts."
+msgstr ""
+"O Snort depende de um base de dados configuradas para armazenar seus logs."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001
+#, fuzzy
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+"Fill in the correct values for the user, host, and database names. MySQL "
+"will prompt you for the password."
+msgstr ""
+"Por favor, crie a estrutura da base de dados agora, usando o comando a "
+"seguir :\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <usuário> -h <host> -p <nome_da_base>\n"
+"Informando os valores corretos para usuário, host e nome da base de dados. O "
+"MySQL irá solicitar a senha."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+#, fuzzy
+msgid ""
+"After you created the database structure, you will need to start Snort "
+"manually."
+msgstr ""
+"Depois de ter criado a estrutura da base de dados, pressione 'ok' para "
+"continuar."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001
+msgid "Please enter the hostname of the mysql database server to use."
+msgstr ""
+"Por favor, informe o hostname do servidor de base de dados mysql a ser "
+"utilizado."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001 ../snort-pgsql.templates:13001
+msgid ""
+"Make sure it has been set up correctly to allow incoming connections from "
+"this host!"
+msgstr ""
+"Certifique-se de ter configurado a base de dados corretamente para permitir "
+"conexões originadas deste host !"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid "Please enter the name of the database to use."
+msgstr "Por favor, informe o nome da base de dados a ser usada."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid ""
+"Make sure this database has been created and your database user has write "
+"access to this database."
+msgstr ""
+"Certifique-se de que essa base de dados tenha sido criada e que seu usuário "
+"tenha acesso de escrita nessa base de dados."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Please enter the name of the database user you want to use."
+msgstr ""
+"Por favor, informe o nome do usuário desejado para acessar a base dados."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Make sure this user has been created and has write access."
+msgstr ""
+"Certifique-se que esse usuário tenha sido criado e tenha acesso de escrita."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter the password for the database connection."
+msgstr "Por favor, informe a senha para conexão na base de dados."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter a password to connect to the Snort Alert database."
+msgstr ""
+"Por favor, informe uma senha para conexão na base de dados de Alertas do "
+"Snort."
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid "Do you want to set up a database for snort-pgsql to log to?"
+msgstr ""
+"Você deseja configurar uma base de dados para o snort-pgsql armazenar seus "
+"logs ?"
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-pgsql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a pgsql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-pgsql package with 'dpkg-"
+"reconfigure -plow snort-pgsql'"
+msgstr ""
+"Você precisa fazer isso somente na primeira vez que você instalar o snort-"
+"pgsql. Antes de prosseguir, certifique-se de possuir (1) o hostname da "
+"máquina executando um servidor pgsql, configurado para permitir conexões tcp "
+"originadas desse host, (2) uma base de dados nesse servidor, (3) um nome de "
+"usuário e senha para acessar a base de dados. Caso você não tenha _tudo_ "
+"isso, selecione 'não' e execute o snort com o suporte comum de logging em "
+"arquivo ou providencie tudo o que é necessário antecipadamente. Você poderá "
+"sempre configurar o logging em base de dados posteriormente, reconfigurando "
+"o pacote snort-pgsql com o comando 'dpkg-reconfigure -plow snort-pgsql'"
+
+#. Type: note
+#. Description
+#: ../snort-pgsql.templates:12001
+#, fuzzy
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+"Fill in the correct values for the user, host, and database names. "
+"PostgreSQL will prompt you for the password."
+msgstr ""
+"Por favor, crie a estrutura da base de dados agora, usando o comando a "
+"seguir :\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_pgsql.gz | psql -U <usuário> -h <host> -W <nome_da_base>\n"
+"Informando os valores corretos para usuário, host e nome da base de dados. O "
+"PostgreSQL irá solicitar a senha."
+
+#. Type: string
+#. Description
+#: ../snort-pgsql.templates:13001
+msgid "Please enter the hostname of the pgsql database server to use."
+msgstr ""
+"Por favor, informe o hostname do servidor de base de dados pgsql a ser "
+"utilizado."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid "Your configuration file is deprecated"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"Your Snort configuration file (/etc/snort/snort.conf) uses deprecated "
+"options no longer available for this Snort release.  Snort will not be able "
+"to start unless you provide a correct configuration file. You can substitute "
+"your configuration file with the one provided in this package or fix it "
+"manually by removing deprecated options."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"The following deprecated options were found in your configuration file: "
+"${DEP_CONFIG}"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter the name(s) of the interface(s) which Snort should listen "
+#~ "on. The names of the available interfaces are provided by either running "
+#~ "'ip link show' of 'ifconfig'. This value usually is 'eth0', but you might "
+#~ "want to vary this depending on your environment, if you are using a "
+#~ "dialup connection 'ppp0' might be more appropiate."
+#~ msgstr ""
+#~ "Por favor, informe o nome da interface na qual o snort deverá ouvir. O "
+#~ "nome das interfaces disponíveis podem ser visualizados executando-se o "
+#~ "comando 'ip link show'. Esse valor geralmente é 'eth0', mas você pode "
+#~ "querer variar isso dependendo de seu ambiente, caso você esteja usando "
+#~ "uma conexão discada, 'ppp0' pode ser mais apropriado."
+
+#~ msgid "On which interface should Snort listen?"
+#~ msgstr "Em qual interface de rede o Snort deve ouvir ?"
+
+#~ msgid ""
+#~ "Please enter the interface name which snort should listen on. The name of "
+#~ "the available interfaces are provided by running 'ip link show'. This "
+#~ "value usually is 'eth0', but you might want to vary this depending on "
+#~ "your environment, if you are using a dialup connection 'ppp0' might be "
+#~ "more appropiate."
+#~ msgstr ""
+#~ "Por favor, informe o nome da interface na qual o snort deverá ouvir. O "
+#~ "nome das interfaces disponíveis podem ser visualizados executando-se o "
+#~ "comando 'ip link show'. Esse valor geralmente é 'eth0', mas você pode "
+#~ "querer variar isso dependendo de seu ambiente, caso você esteja usando "
+#~ "uma conexão discada, 'ppp0' pode ser mais apropriado."
+
+#~ msgid ""
+#~ "Notice that Snort is usually configured to inspect all traffic coming "
+#~ "from the Internet, so the interface you add here is usually the same the "
+#~ "'default route' is on.  You can determine which interface is used for "
+#~ "this running either 'ip route show' or '/sbin/route -n' (look for "
+#~ "'default' or '0.0.0.0')."
+#~ msgstr ""
+#~ "Note que o Snort é geralmente configurado para inspecionar todo tráfego "
+#~ "chegando da Internet, de modo que a interface que você adicionar aqui "
+#~ "geralmente é a mesma onde a 'rota padrão' está. Você pode determinar qual "
+#~ "interface é usada para isso executando o comando '/sbin/ip ro sh' ou '/"
+#~ "sbin/route -n' (procure por 'default' ou '0.0.0.0')."
+
+#~ msgid "Should Snort disable promiscous mode on the interface?"
+#~ msgstr "O Snort deve desabilitar o modo promíscuo na interface ?"
+
+#~ msgid "On which interface Snort should listen? (only one!)"
+#~ msgstr "Em qual interface de rede o Snort deve ouvir ? (somente uma !)"
+
+#~ msgid "What address range should Snort consider to be local?"
+#~ msgstr "Qual faixa de endereços o Snort deve considerar local ?"
+
+#~ msgid ""
+#~ "You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+#~ "192.168.1.42/32 for just one.  Specify multiple addresses on a single "
+#~ "line, seperated by ',' (comma characters). No spaces allowed!"
+#~ msgstr ""
+#~ "Você precisa usar o formato CIDR, ou seja, 192.168.1.0/24 para um bloco "
+#~ "de 256 IPs ou 192.168.1.42/32 para um único host. Especifique múltiplos "
+#~ "endereços em uma única linha, separados por ',' (caracter de vírgula). "
+#~ "Espaços não são permitidos !"
+
+#~ msgid ""
+#~ "Disabling the promiscuous mode means that Snort will only see packets "
+#~ "addressed to its own interface. Enabling allows it to check every packet "
+#~ "that passes the ethernet even if it's a connection between two other "
+#~ "computers"
+#~ msgstr ""
+#~ "Desabilitar o modo promíscuo significa que o Snort irá somente ver "
+#~ "pacotes destinados a sua própria interface. Habilitar o modo promíscuo "
+#~ "permitirá que o Snort cheque cada pacote que passa pela ethernet mesmo "
+#~ "caso os pacotes façam parte de uma conexão entre dois outros computadores."
+
+#~ msgid "When should snort be started?"
+#~ msgstr "Quando o Snort deve ser iniciado ?"
+
+#~ msgid "Please enter the address range that snort will listen on."
+#~ msgstr ""
+#~ "Por favor especifique a faixa de endereços na qual o Snort irá ouvir."
+
+#~ msgid ""
+#~ "You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+#~ "192.168.1.42/32 for just one. Specify multiple addresses on a single "
+#~ "line, separated by ',' (comma characters). No spaces allowed!"
+#~ msgstr ""
+#~ "Você precisará usar a notação CIDR, ou seja, 192.168.1.0/24 para um bloco "
+#~ "de 256 IPs ou 192.168.1.42/32 para um único host. Especifique múltiplos "
+#~ "endereços em uma única linha separados por ',' (caracter vírgula). "
+#~ "Espaços não são permitidos !"
+
+#~ msgid ""
+#~ "Disabling the promiscuous mode means that snort will only see packets "
+#~ "addressed to it's own interface. Enabling allows it to check every packet "
+#~ "that passes the ethernet even if it's a connection between two other "
+#~ "computers"
+#~ msgstr ""
+#~ "Desabilitar o modo promíscuo significa que o Snort irá somente ver "
+#~ "pacotes destinados a sua própria interface. Habilitar o modo promíscuo "
+#~ "permitirá que o Snort cheque cada pacote que passa pela ethernet mesmo "
+#~ "caso os pacotes façam parte de uma conexão entre dois outros computadores."
+
+#~ msgid "Should snort's rules testing order be changed to Pass|Alert|Log?"
+#~ msgstr ""
+#~ "A ordem de teste das regras do Snort devem ser mudadas para Passar|"
+#~ "Alertar|Logar ?"
+
+#~ msgid ""
+#~ "If you change snort's rules testing order to Pass|Alert|Log, they will be "
+#~ "applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+#~ "This will prevent people from having to make huge BPF command line "
+#~ "arguments to filter their alert rules."
+#~ msgstr ""
+#~ "Caso você mude a ordem de teste das regras do Snort para Passar|Alertar|"
+#~ "Logar as regras serão aplicadas na ordem Passar->Alertar->Logar ao invés "
+#~ "da ordem padrão Alertar->Passar->Logar. Isso evitará que os usuários do "
+#~ "Snort tenham que fazer grandes argumentos de linha de comando BFP para "
+#~ "filtrar suas regras de alerta."
+
+#~ msgid ""
+#~ "You only need to do this the first time you install snort-pgsql. Before "
+#~ "you go on, make sure you have the following things at hand: - The "
+#~ "hostname of a machine running a pgsql server, set up to allow TCP\n"
+#~ "  connections to the database (from this host).\n"
+#~ "- A database on the database server - A username and password for a user "
+#~ "that has write access to this database. If you don't have _all_ of these, "
+#~ "either select 'no' and run with regular file logging support, or fix this "
+#~ "first. You can always configure database logging later, by reconfiguring "
+#~ "the snort-pgsql package."
+#~ msgstr ""
+#~ "Você precisa fazer isso somente na primeira vez que você instalar o Snort-"
+#~ "MySQL. Antes de prosseguir, certifique-se de ter em mãos as seguintes "
+#~ "informações : \n"
+#~ "- O hostname da máquina onde se encontra o servidor PostgreSQL, "
+#~ "configurado para permitir conexões TCP originadas desse host.\n"
+#~ "- Uma base de dados nesse servidor PostgreSQL.\n"
+#~ "- Um nome de usuário que possua acesso de escrita na base dados e sua "
+#~ "senha.\n"
+#~ " . Caso você não possua _tudo_ isso, selecione 'Não' e execute o Snort "
+#~ "com o suporte comum de logging em arquivo ou providencie tudo o que é "
+#~ "necessário antecipadamente. Você poderá sempre configurar o logging em "
+#~ "base de dados posteriormente, reconfigurando o pacote snort-pgsql."
+
+#~ msgid ""
+#~ "Please create the database structure now, using the following command:\n"
+#~ " cd /usr/share/doc/snort-pgsql/\n"
+#~ " zcat create_postgresql.gz | psql -u <user> -h <host> <databasename>\n"
+#~ "Filling in the correct values for the user, host, and database names. The "
+#~ "pgsql tool will prompt you for the password."
+#~ msgstr ""
+#~ "Por favor crie a estrutura da base de dados agora, usando o comando a "
+#~ "seguir :\n"
+#~ " cd /usr/share/doc/snort-pgsql/\n"
+#~ " zcat create_postgresql.gz | psql -u <usuário> -h <host> <nome_da_base>\n"
+#~ "Informando os valores corretos para usuário, host e nome da base de "
+#~ "dados. O PostgreSQL irá solicitar a senha."
+
+#~ msgid "Please enter the password for the database connection"
+#~ msgstr ""
+#~ "Por favor informe a senha a ser usada pelo Snort para a conexão com a "
+#~ "base de dados"
+
+#~ msgid "Please enter a password to connect to the SNORT Alert database"
+#~ msgstr ""
+#~ "Por favor informe uma senha para se conectar a base de dados de Alertas "
+#~ "do Snort."
+
+#~ msgid "You are running snort manually."
+#~ msgstr "Você está executando o Snort manualmente."
+
+#~ msgid ""
+#~ "Please restart snort using:\n"
+#~ " /etc/init.d/snort start\n"
+#~ "to let the settings take effect."
+#~ msgstr ""
+#~ "Por favor reinicie o Snort usando :\n"
+#~ " /etc/init.d/snort start\n"
+#~ "para fazer com que as configurações tenham efeito."
+
+#~ msgid "MIB-File addition for snmpd"
+#~ msgstr "Adição de Arquivo-MIB para o snmpd"
+
+#~ msgid ""
+#~ "Snort-common comes with two MIB-files for your snmpd to load, so it knows "
+#~ "about Snort's information. It is impossible for me to add these MIB-files "
+#~ "to your snmpd automatically. So if you want to have snort information "
+#~ "from your snmpd, please read the documentation that came with your snmpd "
+#~ "on how to install external MIB additions."
+#~ msgstr ""
+#~ "O Snort-common é fornecido com dois arquivos-MIB para seu servidor snmpd "
+#~ "carregar, de forma que seu servidor snmpd obtenha informações sobre o "
+#~ "Snort. É impossível para esse assistente adicionar esses arquivos-MIB "
+#~ "automaticamente em seu snmpd. Portanto caso você queira obter informações "
+#~ "do Snort a partir de seu snmpd, por favor leia a documentação que "
+#~ "acompanha seu snmpd sobre como instalar adições MIB externas."
+
+#~ msgid "Snort-common placed these two MIB-files in /usr/share/snmp/mibs/"
+#~ msgstr ""
+#~ "O Snort-common colocou esses dois arquivos-MIB em /usr/share/snmpd/mibs/"
+
+#~ msgid "eth0"
+#~ msgstr "eth0"
+
+#~ msgid "192.168.0.0/16"
+#~ msgstr "192.168.0.0/16"
+
+#~ msgid "root"
+#~ msgstr "root"
+
+#~ msgid "1"
+#~ msgstr "1"
--- snort-2.3.3.orig/debian/po/nl.po
+++ snort-2.3.3/debian/po/nl.po
@@ -0,0 +1,705 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# Bart Cornelis <cobaco@linux.be>, 2005.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: snort\n"
+"Report-Msgid-Bugs-To: jfs@computer.org\n"
+"POT-Creation-Date: 2006-12-28 23:00+0100\n"
+"PO-Revision-Date: 2006-12-25 21:42+0100\n"
+"Last-Translator: Peter Vandenabeele <peter@vandenabeele.com>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#  Type: select
+#  Choices
+#. Type: select
+#. Choices
+#: ../snort.templates:1001 ../snort-mysql.templates:1001
+#: ../snort-pgsql.templates:1001
+msgid "boot, dialup, manual"
+msgstr "bij het opstarten, bij het inbellen, handmatig"
+
+#  Type: select
+#  Description
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid "When should Snort be started?"
+msgstr "Wanneer dient Snort opgestart te worden?"
+
+#  Type: select
+#  Description
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid ""
+"Snort can be started during boot, when connecting to the net with pppd or "
+"only when you manually start it via /usr/sbin/snort."
+msgstr ""
+"Snort kan opgestart worden tijdens het opstarten van de computer, bij het "
+"openen van de netwerkverbinding door pppd of wanneer u het handmatig opstart."
+"via /usr/bin/snort."
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid "On which interface(s) should Snort listen?"
+msgstr "Op welke interface(s) moet Snort luisteren?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Please enter the name(s) of the interface(s) which Snort should listen on.  "
+"The names of the available interfaces are provided by either running  'ip "
+"link show' of 'ifconfig'. This value usually is 'eth0', but you might want "
+"to vary this depending on your environment, if you are using a dialup "
+"connection 'ppp0' might be more appropiate."
+msgstr ""
+"Gelieve de naam in te geven van de interface(s) waarop Snort dient te "
+"luisteren. U kan de namen van de beschikbare interfaces te weten komen met "
+"het commando 'ip link show' of 'ifconfig'. Gewoonlijk is deze waarde 'eth0', "
+"maar afhankelijk van uw omgeving wilt u dit misschien aanpassen. Als u een "
+"inbelverbinding gebruikt, is 'ppp0' waarschijnlijk meer van toepassing."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Notice that Snort is usually configured to inspect all traffic coming from "
+"the Internet, so the interface you add here is usually the same the 'default "
+"route' is on.  You can determine which interface is used for this running "
+"either '/sbin/ip ro sh' or '/sbin/route -n' (look for 'default' or "
+"'0.0.0.0')."
+msgstr ""
+"Merk op dat snort normaal ingesteld is om alle van het Internet afkomstige "
+"verkeer te onderzoeken. Bijgevolg is de hier opgegeven interface normaal "
+"dezelfde die de 'default route' heeft. Om te bepalen welke interface "
+"gebruikt wordt, kunt u '/sbin/ip ro sh' of '/sbin/route -n' uitvoeren (zoek "
+"naar 'default' of '0.0.0.0')."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"It is also not uncommon to run Snort on an interface with no IP and "
+"configured in promiscuous mode, if this is your case, select the interface "
+"in this system that is physically connected to the network you want to "
+"inspect, enable promiscuous mode later on and make sure that the network "
+"traffic is sent to this interface (either connected to a 'port mirroring/"
+"spanning' port in a switch, to a hub or to a tap)"
+msgstr ""
+"Het is ook niet ongewoon om Snort te draaien op een interface zonder IP en "
+"geconfigureerd in promiscue modus. In dat geval selecteert u de interface "
+"die fysiek verbonden is met het netwerk dat u wilt onderzoeken, activeert u "
+"later de promiscue modus en verzekert u zich ervan dat het netwerkverkeer "
+"naar deze interface verzonden wordt (dus deze dient verbonden te zijn via "
+"een 'port mirroring/spanning'-poort op een switch, via een hub, of via een "
+"tap)"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"You can configure multiple interfaces here, just by adding more than one "
+"interface name separated by spaces. Each interface can have its specific "
+"configuration."
+msgstr ""
+"U kunt hier verschillende interfaces definiëren, door meer dan één naam van "
+"een interface te vermelden, gescheiden door spaties. Elke interface kan zijn "
+"eigen specifieke configuratie hebben."
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid "Please enter the address range that Snort will listen on."
+msgstr "Op welk adresbereik dient Snort te luisteren?"
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+"192.168.1.42/32 for just one. Specify multiple addresses on a single line "
+"separated by ',' (comma characters), no spaces allowed!"
+msgstr ""
+"U dient de CIDR-vorm te gebruiken (dit is 192.168.1.0/24 voor een blok van "
+"256 IP-adressen of 192.168.1.42/32 voor één enkel IP-adres). U kunt meerdere "
+"adressen opgeven op één regel door ze te scheiden met kommas; spaties zijn "
+"hierbij niet toegestaan!"
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"If you want you can specify 'any', to not trust any side of the network."
+msgstr ""
+"Wanneer u geen enkel deel van het netwerk wilt vertrouwen, kunt 'any' "
+"opgeven."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"Notice that if you are using multiple interfaces this definition will be "
+"used as the HOME_NET definition of all of them."
+msgstr ""
+"Merk op dat als u meerdere interfaces gebruikt, deze definitie gebruikt zal "
+"worden als de HOME_NET definitie van al deze interfaces."
+
+#  Type: boolean
+#  Description
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid "Should Snort disable promiscuous mode on the interface?"
+msgstr "Wilt u dat Snort de promiscue modus van de interface uitschakelt?"
+
+#  Type: boolean
+#  Description
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disabling promiscuous mode means that Snort will only see packets addressed "
+"to it's own interface. Enabling it allows Snort to check  every packet that "
+"passes ethernet segment even if it's a connection between two other "
+"computers."
+msgstr ""
+"Uitschakelen van de promiscue modus betekent dat Snort enkel die pakketten "
+"ziet die bestemd zijn voor zijn eigen interface. Het inschakelen van de "
+"promiscue modus laat Snort toe om elk op dit ethernet-segment langskomend "
+"pakket te controleren, zelfs als het een pakket is van een verbinding tussen "
+"twee andere computers."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disable promiscuous mode if you are configuring Snort on an interface "
+"without a configured IP address."
+msgstr ""
+"Als u Snort instelt op een interface zonder IP-adres dient u de promiscue "
+"modus uit te schakelen."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid "Invalid interface"
+msgstr "Ongeldige interface"
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"One of the interfaces you specified is not valid (it might not exist on the "
+"system or be down). Please introduce a valid interface when answering the "
+"question of which interface(s) should Snort listen on."
+msgstr ""
+"Een van de interfaces die u hebt gespecifieerd is niet geldig "
+"(misschienbestaat het niet op het systeem of is het niet actief). Gelieve "
+"een geldigeinterface op te geven wanneer u de vraag beantwoordt op welke "
+"interfacesSnort moet luisteren."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"If you did not configure an interface then the package is trying to use the "
+"default ('eth0') which does not seem to be valid in your system."
+msgstr ""
+"Als u geen interface hebt geconfigureerd, dan zal het programma proberenom "
+"de standaard interface ('eth0') te gebruiken die niet actief schijnt te "
+"zijnop dit systeem."
+
+#  Type: boolean
+#  Description
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid "Should Snort's rules testing order be changed to Pass|Alert|Log?"
+msgstr ""
+"Moet de volgorde van het testen van de regels van Snort aangepast worden "
+"naar Pass|Alert|Log (doorlaten|alarmeren|loggen) ?"
+
+#  Type: boolean
+#  Description
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid ""
+"If you change Snort's rules testing order to Pass|Alert|Log, they will be "
+"applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+"This will prevent people from having to make huge Berky Packet Filter "
+"command line arguments to filter their alert rules."
+msgstr ""
+"Wanneer u de volgorde van het testen van de regels van Snort verandert naar "
+"'Pass|Alert|Log', zullen de regels toegepast worden in de volgorde Pass-"
+">Alert->Log, in plaats van Alert->Pass->Log. Dit voorkomt dat men enorme "
+"'Berky Packet Filter' commandoregel-argumenten dient te gebruiken om de "
+"'alert'-regels uit te filteren."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid "Should daily summaries be sent by e-mail?"
+msgstr "Moeten de dagelijkse samenvattingen per e-mail worden verstuurd ?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid ""
+"This Snort installation provides a cron job that runs daily and summarises "
+"the information of Snort logs to a selected email address. If you want to "
+"disable this feature say 'no' here."
+msgstr ""
+"Deze Snort installatie voorziet een cron job die dagelijks loopt en diede "
+"informatie van de Snort logs samenvat en verstuurt naar een geselecteerd e-"
+"mail adres. Als u deze functie wil desactiveren, zegt udan 'no' bij deze "
+"functie."
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid "Who should receive the daily statistics mails?"
+msgstr "Naar wie dienen de dagelijkse statistieken verstuurd te worden?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid ""
+"A cron job running daily will summarise the information of the logs "
+"generated by Snort using a script called 'snort-stat'. Introduce here the "
+"recipient of these mails. The default value is the system administrator. If "
+"you keep this value, make sure that the mail of the administrator is "
+"redirected to a user that actually reads those mails."
+msgstr ""
+"Een dagelijks uitgevoerde taak (cron job) vat de informatie in de door snort "
+"gegenereerde logboeken samen met een script (genaamd 'snort-stat'). Hier "
+"geeft u aan wie deze e-mails zal ontvangen. De standaardwaarde is de "
+"systeembeheerder. Als u dit zo laat, dient u ervoor te zorgen dat de e-mail "
+"van de beheerder omgeleid wordt naar een gebruiker die deze berichten ook "
+"daadwerkelijk nakijkt."
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort.templates:9001 ../snort-mysql.templates:8001
+#: ../snort-pgsql.templates:8001
+msgid ""
+"If you want to specify custom options to Snort, please specify them here."
+msgstr ""
+"Als u speciale opties aan Snort wil meegeven, kunt u deze hier opgeven."
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort.templates:10001 ../snort-mysql.templates:9001
+#: ../snort-pgsql.templates:9001
+msgid ""
+"An alert needs to appear more times than this number to be included in the "
+"daily statistics."
+msgstr ""
+"Opdat een waarschuwing weergegeven zou worden in de dagelijkse statistieken "
+"dient het vaker dan het hier opgeven aantal keer voor te komen."
+
+#  Type: note
+#  Description
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid "You are running Snort manually."
+msgstr "U voert Snort handmatig uit."
+
+#  Type: note
+#  Description
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid ""
+"Please restart Snort using:\n"
+" /etc/init.d/snort start\n"
+"to let the settings take effect."
+msgstr ""
+"Gelieve Snort te herstarten via:\n"
+" /etc/init.d/snort restart\n"
+"om de instellingen in werking te doen treden."
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid "There is an error in your configuration"
+msgstr "Er is een fout in uw configuratie"
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid ""
+"Your Snort configuration is not correct and Snort will not be able to start "
+"up normally. Please review your configuration and fix it. If you do not do "
+"this, Snort package upgrades will probably break. To check which error is "
+"being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf' (or point "
+"to an alternate configuration file if you are using different files for "
+"different interfaces)"
+msgstr ""
+"Uw Snort configuratie is niet correct en Snort zal niet in staat zijn om "
+"normaal op te starten. Gelieve uw configuratiebestand na te kijken en te "
+"corrigeren. Als u dit niet doet, zullen latere opwaarderingen vermoedelijk "
+"niet correct werken. Voer dan '/usr/sbin/snort -T -c /etc/snort/snort.conf' "
+"uit om te controleren welke fout wordt gegenereerd (of verwijs naar een "
+"alternatief configuratiebestand als u verschillende configuratiebestanden "
+"gebruikt voor verschillende interfaces)."
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid "This system uses an obsolete configuration file"
+msgstr "Dit systeem gebruikt een verouderd configuratie bestand"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid ""
+"Your system has an obsolete configuration file (/etc/snort/snort.common."
+"parameters) which has been automatically converted into the new "
+"configuration file format (at /etc/default/snort). Please review the new "
+"configuration and remove the obsolete one. Until you do this, the init.d "
+"script will not use the new configuration and you will not take advantage of "
+"the benefits introduced in newer releases."
+msgstr ""
+"Uw systeem heeft een verouderd configuratiebestand (/etc/snort/snort.common."
+"parameters) dat nu automatisch is omgezet in een nieuw "
+"configuratiebestandsformaat (in /etc/default/snort). Kijkt u aub het nieuwe "
+"configuratiebestand na en verwijder het verouderde bestand. Tot u dit doet, "
+"zal het init.d script de nieuwe configratie niet gebruiken en zal u niet "
+"kunnen genieten van de voordelen die de nieuwere versies bieden."
+
+#  Type: boolean
+#  Description
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid "Do you want to set up a database for snort-mysql to log to?"
+msgstr ""
+"Wilt u een een database opzetten waar snort-mysql het logboek in kan "
+"bijhouden?"
+
+#  Type: boolean
+#  Description
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-mysql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a mysql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-mysql package with 'dpkg-"
+"reconfigure -plow snort-mysql'"
+msgstr ""
+"Dit dient enkel de eerste keer dat u snort-mysql installeert te gebeuren. "
+"Voordat u verder gaat, dient u over de volgende informatie te beschikken:\n"
+"  (1) de computernaam van een mysql-databaseserver die verbindingen van deze "
+"machine aanvaardt\n"
+"  (2) een database op die server\n"
+"  (3) een gebruikersnaam en wachtwoord die toegang verlenen tot die "
+"database\n"
+"Als u niet over _al_ deze informatie beschikt, kunt u daar ofwel eerst voor "
+"zorgen, ofwel 'nee' kiezen en het logboek gewoon in een bestand opslaan. U "
+"kunt het databaselogboek altijd later instellen via het commando 'dpkg-"
+"reconfigure -plow snort-mysql'"
+
+#  Type: note
+#  Description
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid "Snort needs a configured database to log to before it starts."
+msgstr ""
+"Snort heeft voor het starten een geconfigureerde database nodig voor het "
+"logboek."
+
+#  Type: note
+#  Description
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+"Fill in the correct values for the user, host, and database names. MySQL "
+"will prompt you for the password."
+msgstr ""
+"Snort heeft een geconfigureerde database nodig voor het succesvol kan "
+"opstarten. Om de structuur aan te maken, moet u volgende commando's "
+"uitvoeren NADAT het pakket is geinstalleerd:\n"
+"  cd /usr/share/doc/snort-mysql/\n"
+"  zcat create_mysql.gz | mysql -u <gebruiker> -h <server> -p <databasenaam>\n"
+"Hierbij dient u de juiste waarden voor <gebruiker>, <server>, en "
+"<databasenaam> in te vullen. MySQL vraagt u om het wachtwoord."
+
+#  Type: note
+#  Description
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid ""
+"After you created the database structure, you will need to start Snort "
+"manually."
+msgstr ""
+"Nadat u de database struktuur heeft aangemaakt, moet u Snort manueel starten."
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001
+msgid "Please enter the hostname of the mysql database server to use."
+msgstr "Wat is de computernaam van de te gebruiken MySQL-databaseserver?"
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001 ../snort-pgsql.templates:13001
+msgid ""
+"Make sure it has been set up correctly to allow incoming connections from "
+"this host!"
+msgstr ""
+"U dient ervoor te zorgen dat deze correct is ingesteld is om inkomende "
+"verbindingen van deze computer te aanvaarden!"
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid "Please enter the name of the database to use."
+msgstr "Wat is de naam van de te gebruiken database?"
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid ""
+"Make sure this database has been created and your database user has write "
+"access to this database."
+msgstr ""
+"U dient ervoor te zorgen dat de database aangemaakt is en uw "
+"databasegebruiker schrijfrechten heeft voor deze database."
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Please enter the name of the database user you want to use."
+msgstr "Wat is de naam van de te gebruiken databasegebruiker?"
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Make sure this user has been created and has write access."
+msgstr ""
+"U dient ervoor te zorgen dat deze gebruiker aangemaakt is en schrijfrechten "
+"heeft."
+
+#  Type: password
+#  Description
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter the password for the database connection."
+msgstr "Wat is het wachtwoord voor de databaseverbinding?"
+
+#  Type: password
+#  Description
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter a password to connect to the Snort Alert database."
+msgstr ""
+"Wat is het wachtwoord om verbinding te maken met de Snort-Alertdatabase?"
+
+#  Type: boolean
+#  Description
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid "Do you want to set up a database for snort-pgsql to log to?"
+msgstr ""
+"Wilt u een database opzetten waar snort-pgsql het logboek in kan bijhouden?"
+
+#  Type: boolean
+#  Description
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-pgsql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a pgsql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-pgsql package with 'dpkg-"
+"reconfigure -plow snort-pgsql'"
+msgstr ""
+"Dit dient enkel de eerste keer dat u snort-pgsql installeert te gebeuren. "
+"Voordat u verder gaat, dient u over de volgende informatie te beschikken:\n"
+"  (1) de computernaam van een pgql-databaseserver die verbindingen van deze "
+"machine aanvaardt\n"
+"  (2) een database op die server\n"
+"  (3) een gebruikersnaam en wachtwoord die toegang verlenen tot die "
+"database\n"
+"Als u niet over _al_ deze informatie beschikt, kunt u daar ofwel eerst voor "
+"zorgen, ofwel 'nee' kiezen en het logboek gewoon in een bestand opslaan. U "
+"kunt het databaselogboek altijd later instellen via het commando 'dpkg-"
+"reconfigure -plow snort-pgsql"
+
+#  Type: note
+#  Description
+#. Type: note
+#. Description
+#: ../snort-pgsql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+"Fill in the correct values for the user, host, and database names. "
+"PostgreSQL will prompt you for the password."
+msgstr ""
+"Snort heeft een geconfigureerde database nodig voor het succesvol kan "
+"opstarten. Om de struktuur aan te maken, moet u volgende commando's "
+"uitvoeren NADAT het pakket is geinstalleerd:\n"
+"  cd /usr/share/doc/snort-pgsql/\n"
+"  zcat create_postgresql.gz | psql -U <gebruiker> -h <server> -W "
+"<databasenaam>\n"
+"Hierbij dient u de juiste waarden voor <gebruiker>, <computer>, en "
+"<dtabasenaam> in te vullen. PostgreSQL vraagt u om het wachtwoord."
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../snort-pgsql.templates:13001
+msgid "Please enter the hostname of the pgsql database server to use."
+msgstr "Wat is de computernaam van de te gebruiken pgsql-databaseserver?"
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid "Your configuration file is deprecated"
+msgstr "Uw configuratiebestand is verouderd"
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"Your Snort configuration file (/etc/snort/snort.conf) uses deprecated "
+"options no longer available for this Snort release.  Snort will not be able "
+"to start unless you provide a correct configuration file. You can substitute "
+"your configuration file with the one provided in this package or fix it "
+"manually by removing deprecated options."
+msgstr ""
+"Uw snort-configuratiebestand (/etc/snort/snort.conf) maakt gebruik van "
+"verouderde opties die door deze versie niet meer ondersteund worden. Met een "
+"onjuist configuratiebestand kan snort niet opstarten. U kunt uw bestaande "
+"configuratiebestand vervangen met het door dit pakket meegeleverde bestand, "
+"of u kunt de verouderde opties handmatig verwijderen."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"The following deprecated options were found in your configuration file: "
+"${DEP_CONFIG}"
+msgstr ""
+"De in uw configuratiebestand aangetroffen verouderde opties zijn: "
+"${DEP_CONFIG}"
+
+#~ msgid ""
+#~ "Your system has an obsolete configuration file  (/etc/snort/snort.common."
+#~ "parameters) which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "Uw systeem heeft een verouderd configratiebestand (/etc/snort/snort."
+#~ "common.parameters) dat automatisch is omgezet in het nieuwe "
+#~ "configuratiebestandsformaat (in /etc/default/snort). Gelieve de nieuwe "
+#~ "configuratie na te kijken en de verouderde configuratie te verwijderen. "
+#~ "Zolang dit niet is gebeurd, zal het init.d script de nieuwe configuratie "
+#~ "niet gebruiken en zal u geen gebruik kunnen maken van de voordelen die "
+#~ "zijn geintroduceerd in de nieuwe versies."
--- snort-2.3.3.orig/debian/po/POTFILES.in
+++ snort-2.3.3/debian/po/POTFILES.in
@@ -0,0 +1,4 @@
+[type: gettext/rfc822deb] snort.templates
+[type: gettext/rfc822deb] snort-mysql.templates
+[type: gettext/rfc822deb] snort-pgsql.templates
+[type: gettext/rfc822deb] snort-common.templates
--- snort-2.3.3.orig/debian/po/vi.po
+++ snort-2.3.3/debian/po/vi.po
@@ -0,0 +1,624 @@
+# Vietnamese translation for snort.
+# Copyright Â© 2006 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2006.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: snort 2.3.3-9\n"
+"Report-Msgid-Bugs-To: jfs@computer.org\n"
+"POT-Creation-Date: 2006-12-28 23:00+0100\n"
+"PO-Revision-Date: 2006-12-26 19:21+1030\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.6fc1\n"
+
+#. Type: select
+#. Choices
+#: ../snort.templates:1001 ../snort-mysql.templates:1001
+#: ../snort-pgsql.templates:1001
+msgid "boot, dialup, manual"
+msgstr "khá»Ÿi Ä‘á»™ng, quay sá»‘, báº±ng tay"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid "When should Snort be started?"
+msgstr "Khi nÃ o nÃªn khá»Ÿi cháº¡y Snort?"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid ""
+"Snort can be started during boot, when connecting to the net with pppd or "
+"only when you manually start it via /usr/sbin/snort."
+msgstr ""
+"CÃ³ thá»ƒ khá»Ÿi cháº¡y Snort trong khi khá»Ÿi Ä‘á»™ng mÃ¡y, khi káº¿t ná»‘i Ä‘áº¿n Máº¡ng báº±ng "
+"pppd, hoáº·c chá»‰ khi báº¡n tá»± khá»Ÿi cháº¡y nÃ³ thÃ´ng qua Â« /usr/sbin/snort Â»."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid "On which interface(s) should Snort listen?"
+msgstr "Snort nÃªn láº¯ng nghe trÃªn nhá»¯ng giao diá»‡n nÃ o?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Please enter the name(s) of the interface(s) which Snort should listen on.  "
+"The names of the available interfaces are provided by either running  'ip "
+"link show' of 'ifconfig'. This value usually is 'eth0', but you might want "
+"to vary this depending on your environment, if you are using a dialup "
+"connection 'ppp0' might be more appropiate."
+msgstr ""
+"HÃ£y nháº­p tÃªn cá»§a nhá»¯ng giao diá»‡n trÃªn chÃºng trÃ¬nh Snort nÃªn láº¯ng nghe. (CÃ³ "
+"thá»ƒ xem tÃªn cá»§a má»�i giao diá»‡n sáºµn sÃ ng báº±ng cÃ¡ch cháº¡y lá»‡nh Â« ip link show Â» "
+"cá»§a Â« ifconfig Â».) GiÃ¡ trá»‹ nÃ y thÆ°á»�ng lÃ  Â« eth0 Â», nhÆ°ng mÃ  báº¡n cÃ³ thá»ƒ chá»�n "
+"giÃ¡ trá»‹ thÃ­ch há»£p vá»›i mÃ´i trÆ°á»�ng cá»§a mÃ¬nh. Cháº³ng háº¡n, náº¿u báº¡n quay sá»‘ Ä‘á»ƒ káº¿t "
+"ná»‘i, giÃ¡ trá»‹ Â« ppp0 Â» cÃ³ thá»ƒ lÃ  thÃ­ch há»£p hÆ¡n."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Notice that Snort is usually configured to inspect all traffic coming from "
+"the Internet, so the interface you add here is usually the same the 'default "
+"route' is on.  You can determine which interface is used for this running "
+"either '/sbin/ip ro sh' or '/sbin/route -n' (look for 'default' or "
+"'0.0.0.0')."
+msgstr ""
+"Ghi chÃº ráº±ng trÃ¬nh Snort thÆ°á»�ng Ä‘Æ°á»£c cáº¥u hÃ¬nh Ä‘á»ƒ kiá»ƒm tra táº¥t cáº£ cÃ¡c táº£i cho "
+"Máº¡ng, vÃ¬ váº­y giao diá»‡n báº¡n thÃªm vÃ o Ä‘Ã¢y thÆ°á»�ng lÃ  cÃ¹ng má»™t giao diá»‡n vá»›i "
+"Ä‘iá»�u trÃªn Ä‘Ã³ cÃ³ Â« Ä‘Æ°á»�ng máº·c Ä‘á»‹nh Â» (default route). Báº¡n cÃ³ thá»ƒ quyáº¿t Ä‘á»‹nh "
+"giao diá»‡n nÃ o Ä‘Æ°á»£c dÃ¹ng nhÆ° tháº¿ báº±ng cÃ¡ch cháº¡y lá»‡nh Â« /sbin/ip ro sh Â» hay "
+"Â« /sbin/route -n Â» (tÃ¬m Â« default Â» hay Â« 0.0.0.0 Â»)."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"It is also not uncommon to run Snort on an interface with no IP and "
+"configured in promiscuous mode, if this is your case, select the interface "
+"in this system that is physically connected to the network you want to "
+"inspect, enable promiscuous mode later on and make sure that the network "
+"traffic is sent to this interface (either connected to a 'port mirroring/"
+"spanning' port in a switch, to a hub or to a tap)"
+msgstr ""
+"CÅ©ng thÆ°á»�ng cháº¡y trÃ¬nh Snort trÃªn má»™t giao diá»‡n khÃ´ng cÃ³ Ä‘á»‹a chá»‰ IP vÃ  Ä‘Æ°á»£c "
+"cáº¥u hÃ¬nh trong cháº¿ Ä‘á»™ khÃ´ng phÃ¢n biá»‡t (promiscuous mode). Náº¿u báº¡n lÃ m nhÆ° "
+"tháº¿, hÃ£y chá»�n giao diá»‡n trong há»‡ thá»‘ng nÃ y cÃ³ káº¿t ná»‘i váº­t cháº¥t Ä‘áº¿n máº¡ng báº¡n "
+"muá»‘n kiá»ƒm tra, hiá»‡u lá»±c cháº¿ Ä‘á»™ khÃ´ng phÃ¢n biá»‡t vÃ o lÃºc sau, vÃ  Ä‘áº£m báº£o táº¥t "
+"cáº£ cÃ¡c táº£i cho máº¡ng Ä‘Æ°á»£c gá»­i cho giao diá»‡n nÃ y (hoáº·c Ä‘Æ°á»£c káº¿t ná»‘i Ä‘áº¿n má»™t "
+"cá»•ng kiá»ƒu Â« nhÃ¢n báº£n/ná»‘i Â» trong cÃ´ng táº¯t, Ä‘áº¿n thiáº¿t bá»‹ trung tÃ¢m máº¡ng, hoáº·c "
+"Ä‘áº¿n dÃ¢y ráº½)."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"You can configure multiple interfaces here, just by adding more than one "
+"interface name separated by spaces. Each interface can have its specific "
+"configuration."
+msgstr ""
+"á»ž Ä‘Ã¢y báº¡n cÃ³ kháº£ nÄƒng cáº¥u hÃ¬nh nhiá»�u giao diá»‡n, liá»‡t kÃª cÃ¡c giao diá»‡n Ä‘á»‹nh "
+"giá»›i báº±ng dáº¥u cÃ¡ch. Cho phÃ©p má»—i giao diá»‡n cÃ³ cáº¥u hÃ¬nh riÃªng."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid "Please enter the address range that Snort will listen on."
+msgstr "HÃ£y nháº­p pháº¡m vá»‹ Ä‘á»‹a chá»‰ trÃªn Ä‘Ã³ trÃ¬nh Snort cáº§n láº¯ng nghe."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+"192.168.1.42/32 for just one. Specify multiple addresses on a single line "
+"separated by ',' (comma characters), no spaces allowed!"
+msgstr ""
+"Báº¡n cáº§n pháº£i sá»­ dá»¥ng dáº¡ng CIDR, tá»©c lÃ  Â« 192.168.1.0/24 Â» cho má»™t khá»‘i 256 "
+"Ä‘á»‹a chá»‰ IP, hay Â« 192.168.1.42/32 Â» cho chá»‰ má»™t Ä‘iá»�u. HÃ£y ghi rÃµ nhiá»�u Ä‘á»‹a "
+"chá»‰ trong cÃ¹ng má»™t dÃ²ng riÃªng láº», Ä‘á»‹nh giá»›i báº±ng dáº¥u pháº©y Â« , Â», khÃ´ng cho "
+"phÃ©p dáº¥u cÃ¡ch nÃ o."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"If you want you can specify 'any', to not trust any side of the network."
+msgstr ""
+"Náº¿u báº¡n muá»‘n, cÅ©ng cÃ³ thá»ƒ ghi rÃµ Â« any Â» (báº¥t cá»© Ä‘iá»�u nÃ o), Ä‘á»ƒ khÃ´ng tin báº¥t "
+"cá»© bÃªn máº¡ng nÃ o."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"Notice that if you are using multiple interfaces this definition will be "
+"used as the HOME_NET definition of all of them."
+msgstr ""
+"Ghi chÃº ráº±ng náº¿u báº¡n Ä‘ang sá»­ dá»¥ng nhiá»�u giao diá»‡n, lá»�i Ä‘á»‹nh nghÄ©a nÃ y sáº½ "
+"Ä‘Æ°á»£c dÃ¹ng nhÆ° lÃ  lá»�i Ä‘á»‹nh nghÄ©a Â« HOME_NET Â» cá»§a táº¥t cáº£ Ä‘iá»�u."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid "Should Snort disable promiscuous mode on the interface?"
+msgstr ""
+"TrÃ¬nh Snort nÃªn vÃ´ hiá»‡u hÃ³a cháº¿ Ä‘á»™ khÃ´ng phÃ¢n biá»‡t trong giao diá»‡n nÃ y khÃ´ng?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disabling promiscuous mode means that Snort will only see packets addressed "
+"to it's own interface. Enabling it allows Snort to check  every packet that "
+"passes ethernet segment even if it's a connection between two other "
+"computers."
+msgstr ""
+"VÃ´ hiá»‡u hÃ³a cháº¿ Ä‘á»™ khÃ´ng phÃ¢n biá»‡t cÃ³ nghÄ©a lÃ  trÃ¬nh Snort sáº½ chá»‰ xem nhá»¯ng "
+"gÃ³i tin Ä‘Æ°á»£c gá»­i cho giao diá»‡n cá»§a chÃ­nh nÃ³. Viá»‡c hiá»‡u lá»±c cháº¿ Ä‘á»™ nÃ y thÃ¬ "
+"cho phÃ©p trÃ¬nh Snort kiá»ƒm tra má»�i gÃ³i tin Ä‘i qua Ä‘oáº¡n Ethernet, thÃ¢Ì£m chÃ­ nÃªÌ�u "
+"nÃ³ lÃ  káº¿t ná»‘i giá»¯a hai mÃ¡y tÃ­nh khÃ¡c."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disable promiscuous mode if you are configuring Snort on an interface "
+"without a configured IP address."
+msgstr ""
+"HÃ£y vÃ´ hiá»‡u hÃ³a cháº¿ Ä‘á»™ khÃ´ng phÃ¢n biá»‡t náº¿u báº¡n Ä‘ang cáº¥u hÃ¬nh trÃ¬nh Snort "
+"trÃªn má»™t giao diá»‡n khÃ´ng cÃ³ Ä‘á»‹a chá»‰ IP Ä‘Ã£ cáº¥u hÃ¬nh."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid "Invalid interface"
+msgstr "Giao diá»‡n khÃ´ng há»£p lá»‡"
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"One of the interfaces you specified is not valid (it might not exist on the "
+"system or be down). Please introduce a valid interface when answering the "
+"question of which interface(s) should Snort listen on."
+msgstr ""
+"Báº¡n Ä‘Ã£ xÃ¡c Ä‘á»‹nh má»™t giao diá»‡n khÃ´ng há»£p lá»‡ (cÃ³ láº½ nÃ³ hiá»‡n thá»�i khÃ´ng tá»“n táº¡i "
+"trÃªn há»‡ thá»‘ng hoáº·c khÃ´ng hoáº¡t Ä‘á»™ng). HÃ£y giá»›i thiá»‡u má»™t giao diá»‡n há»£p lá»‡ khi "
+"tráº£ lá»�i cÃ¢u há»�i vá»� nhá»¯ng giao diá»‡n trÃªn chÃºng trÃ¬nh Snort cáº§n láº¯ng nghe."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"If you did not configure an interface then the package is trying to use the "
+"default ('eth0') which does not seem to be valid in your system."
+msgstr ""
+"ChÆ°a cáº¥u hÃ¬nh giao diá»‡n thÃ¬ gÃ³i Ä‘ang cá»‘ sá»­ dá»¥ng giao diá»‡n máº·c Ä‘á»‹nh (eth0) cÃ³ "
+"váº» lÃ  khÃ´ng há»£p lá»‡ trÃªn há»‡ thá»‘ng cá»§a báº¡n."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid "Should Snort's rules testing order be changed to Pass|Alert|Log?"
+msgstr ""
+"Thá»© tá»± kiá»ƒm tra quy táº¯c cá»§a Snort nÃªn thay Ä‘á»•i thÃ nh Â« Pass|Alert|Log Â» "
+"khÃ´ng?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid ""
+"If you change Snort's rules testing order to Pass|Alert|Log, they will be "
+"applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+"This will prevent people from having to make huge Berky Packet Filter "
+"command line arguments to filter their alert rules."
+msgstr ""
+"Náº¿u báº¡n thay Ä‘á»•i thá»© tá»± kiá»ƒm tra quy táº¯c cá»§a trÃ¬nh Snort thÃ nh Â« Pass|Alert|"
+"Log Â», nÃ³ sáº½ Ã¡p dá»¥ng cÃ¡c quy táº¯c theo thá»© tá»± Â« Pass > Alert > Log Â» (Ä‘i qua "
+"> bÃ¡o Ä‘á»™ng > ghi lÆ°u), thay vÃ o thá»© tá»± chuáº©n Â« Alert > Pass > Log Â» (bÃ¡o "
+"Ä‘á»™ng > Ä‘i qua > ghi lÆ°u). Viá»‡c nÃ y sáº½ ngÄƒn cáº£n ngÆ°á»�i cáº§n pháº£i táº¡o Ä‘á»‘i sá»‘ "
+"dÃ²ng lá»‡nh kiá»ƒu Â« Berky Packet Filter Â» (bá»™ lá»�c gÃ³i tin Berky) ráº¥t lá»›n Ä‘á»ƒ lá»�c "
+"nhá»¯ng quy táº¯c bÃ¡o Ä‘á»™ng cá»§a há»�."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid "Should daily summaries be sent by e-mail?"
+msgstr "CÃ³ nÃªn gá»­i hÃ ng ngÃ y thÆ° Ä‘Ã­nh kÃ¨m báº£n tÃ³m táº¯t khÃ´ng?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid ""
+"This Snort installation provides a cron job that runs daily and summarises "
+"the information of Snort logs to a selected email address. If you want to "
+"disable this feature say 'no' here."
+msgstr ""
+"Báº£n cÃ i Ä‘áº·t Snort cung cáº¥p má»™t cÃ´ng viá»‡c Ä‘á»‹nh ká»³ (cron job) cháº¡y hÃ ng ngÃ y "
+"vÃ  tÃ³m táº¯t thÃ´ng tin trong cÃ¡c báº£n ghi Snort cho má»™t Ä‘á»‹a chá»‰ thÆ° Ä‘iá»‡n tá»­ Ä‘Ã£ "
+"chá»�n. Náº¿u báº¡n muá»‘n táº¯t kháº£ nÄƒng nÃ y, nÃ³i Â« KhÃ´ng Â» á»Ÿ Ä‘Ã¢y."
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid "Who should receive the daily statistics mails?"
+msgstr "Ai nÃªn nháº­n nhá»¯ng thÆ° thá»‘ng kÃª hÃ ng ngÃ y?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid ""
+"A cron job running daily will summarise the information of the logs "
+"generated by Snort using a script called 'snort-stat'. Introduce here the "
+"recipient of these mails. The default value is the system administrator. If "
+"you keep this value, make sure that the mail of the administrator is "
+"redirected to a user that actually reads those mails."
+msgstr ""
+"Má»™t cÃ´ng viá»‡c Ä‘á»‹nh ká»· (cron job) cháº¡y hÃ ng ngÃ y sáº½ tÃ³m táº¯t thÃ´ng tin cá»§a cÃ¡c "
+"báº£n ghi do trÃ¬nh Snort táº¡o ra, dÃ¹ng má»™t vÄƒn lá»‡nh Ä‘Æ°á»£c gá»�i nhÆ° lÃ  Â« snort-"
+"stat Â». á»ž Ä‘Ã¢y hÃ£y nháº­p tÃªn cá»§a ngÆ°á»�i sáº½ nháº­n cÃ¡c thÆ° nÃ y. GiÃ¡ trá»‹ máº·c Ä‘á»‹nh "
+"lÃ  quáº£n trá»‹ há»‡ thá»‘ng. Náº¿u báº¡n giá»¯ giÃ¡ trá»‹ nÃ y, hÃ£y Ä‘áº£m báº£o cÃ¡c thÆ° Ä‘Æ°á»£c gá»­i "
+"cho quáº£n trá»‹ há»‡ thá»‘ng thÃ¬ Ä‘Æ°á»£c chuyá»ƒn tiáº¿p cho má»™t ngÆ°á»�i dÃ¹ng tháº­t sá»± Ä‘á»�c "
+"chÃºng."
+
+#. Type: string
+#. Description
+#: ../snort.templates:9001 ../snort-mysql.templates:8001
+#: ../snort-pgsql.templates:8001
+msgid ""
+"If you want to specify custom options to Snort, please specify them here."
+msgstr "Náº¿u báº¡n muá»‘n ghi rÃµ tÃ¹y chá»�n riÃªng cho trÃ¬nh Snort, hÃ£y nháº­p vÃ o Ä‘Ã¢y."
+
+#. Type: string
+#. Description
+#: ../snort.templates:10001 ../snort-mysql.templates:9001
+#: ../snort-pgsql.templates:9001
+msgid ""
+"An alert needs to appear more times than this number to be included in the "
+"daily statistics."
+msgstr ""
+"Má»™t bÃ¡o Ä‘á»™ng cáº§n xuáº¥t hiá»‡n sá»‘ láº§n hÆ¡n sá»‘ nÃ y Ä‘á»ƒ Ä‘Æ°á»£c gá»“m trong thá»‘ng kÃª hÃ ng "
+"ngÃ y."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid "You are running Snort manually."
+msgstr "Báº¡n Ä‘ang tá»± cháº¡y trÃ¬nh Snort."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid ""
+"Please restart Snort using:\n"
+" /etc/init.d/snort start\n"
+"to let the settings take effect."
+msgstr ""
+"HÃ£y khá»Ÿi cháº¡y láº¡i trÃ¬nh Snort báº±ng:\n"
+"Â« /etc/init.d/snort start Â»\n"
+"Ä‘á»ƒ kÃ­ch hoáº¡t thiáº¿t láº­p."
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid "There is an error in your configuration"
+msgstr "Gáº·p lá»—i trong cáº¥u hÃ¬nh cá»§a báº¡n."
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid ""
+"Your Snort configuration is not correct and Snort will not be able to start "
+"up normally. Please review your configuration and fix it. If you do not do "
+"this, Snort package upgrades will probably break. To check which error is "
+"being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf' (or point "
+"to an alternate configuration file if you are using different files for "
+"different interfaces)"
+msgstr ""
+"Báº¡n cÃ³ cáº¥u hÃ¬nh Snort khÃ´ng Ä‘Ãºng nÃªn trÃ¬nh Snort sáº½ khÃ´ng thá»ƒ khá»Ÿi cháº¡y láº¡i "
+"má»™t cÃ¡ch bÃ¬nh thÆ°á»�ng. HÃ£y xem láº¡i cáº¥u hÃ¬nh rá»“i sá»­a chá»¯a nÃ³. KhÃ´ng sá»­a thÃ¬ "
+"ráº¥t cÃ³ thá»ƒ lÃ  cÃ¡c viá»‡c nÃ¢ng cáº¥p gÃ³i Snort sáº½ bá»‹ lá»—i. Ä�á»ƒ kiá»ƒm tra xem lá»—i nÃ o "
+"Ä‘Æ°á»£c táº¡o ra, cháº¡y lá»‡nh Â« /usr/sbin/snort -T -c /etc/snort/snort.conf Â» (hoáº·c "
+"chá»‰ tá»›i má»™t táº­p tin cáº¥u hÃ¬nh khÃ¡c, náº¿u báº¡n sá»­ dá»¥ng táº­p tin Ä‘áº·t trÆ°ng cho "
+"giao diá»‡n)."
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid "This system uses an obsolete configuration file"
+msgstr "Há»‡ thá»‘ng nÃ y dÃ¹ng má»™t táº­p tin cáº¥u hÃ¬nh cÅ©"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid ""
+"Your system has an obsolete configuration file (/etc/snort/snort.common."
+"parameters) which has been automatically converted into the new "
+"configuration file format (at /etc/default/snort). Please review the new "
+"configuration and remove the obsolete one. Until you do this, the init.d "
+"script will not use the new configuration and you will not take advantage of "
+"the benefits introduced in newer releases."
+msgstr ""
+"Há»‡ thá»‘ng cá»§a báº¡n cÃ³ má»™t táº­p tin cáº¥u hÃ¬nh cÅ© (/etc/snort/snort.common."
+"parameters) Ä‘Ã£ Ä‘Æ°á»£c chuyá»ƒn Ä‘á»•i tá»± Ä‘á»™ng sang Ä‘á»‹nh dáº¡ng táº­p tin cáº¥u hÃ¬nh má»›i "
+"(á»Ÿ Â« /etc/default/snort Â»). Báº¡n xem láº¡i cáº¥u hÃ¬nh má»›i, rá»“i gá»¡ bá»� táº­p tin cÅ©. "
+"KhÃ´ng thÃ¬ vÄƒn lá»‡nh Â« init.d Â» sáº½ khÃ´ng dÃ¹ng cáº¥u hÃ¬nh má»›i vÃ  báº¡n sáº½ khÃ´ng thá»ƒ "
+"nhá»› dá»‹p cÃ¡c lá»£i Ã­ch Ä‘Æ°á»£c giá»›i thiá»‡u trong phiÃªn báº£n má»›i."
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid "Do you want to set up a database for snort-mysql to log to?"
+msgstr ""
+"Báº¡n cÃ³ muá»‘n thiáº¿t láº­p má»™t cÆ¡ sá»Ÿ dá»¯ liá»‡u vÃ o Ä‘Ã³ snort-mysql Ä‘Äƒng nháº­p khÃ´ng?"
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-mysql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a mysql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-mysql package with 'dpkg-"
+"reconfigure -plow snort-mysql'"
+msgstr ""
+"Cáº§n pháº£i lÃ m viá»‡c thiáº¿t láº­p nÃ y chá»‰ láº§n Ä‘áº§u tiÃªn cÃ i Ä‘áº·t gÃ³i snort-mysql. "
+"TrÆ°á»›c khi tiáº¿p tá»¥c, báº¡n hÃ£y Ä‘áº£m báº£o cÃ³ thÃ´ng tin nÃ y:\n"
+" 1. tÃªn mÃ¡y cá»§a mÃ¡y cÃ³ cháº¡y má»™t trÃ¬nh phá»¥c vá»¥ MySQL Ä‘Æ°á»£c thiáº¿t láº­p Ä‘á»ƒ cho "
+"phÃ©p sá»± káº¿t ná»‘i TCP tá»« mÃ¡y nÃ y;\n"
+" 2. cÆ¡ sá»Ÿ dá»¯ liá»‡u trÃªn trÃ¬nh phá»¥c vá»¥ Ä‘Ã³ ;\n"
+" 3. tÃªn ngÆ°á»�i dÃ¹ng vÃ  máº­t kháº©u cÃ³ quyá»�n truy cáº­p cÆ¡ sá»Ÿ dá»¯ liá»‡u Ä‘Ã³.\n"
+"ChÆ°a cÃ³ _táº¥t cáº£_ cÃ¡c Ä‘iá»�u nÃ y thÃ¬ hoáº·c chá»�n Â« KhÃ´ng Â» (no) vÃ  cháº¡y vá»›i kháº£ "
+"nÄƒng ghi lÆ°u vÃ o táº­p tin kiá»ƒu chuáº©n, hoáº·c táº­p há»£p thÃ´ng tin bá»‹ thiáº¿u trÆ°á»›c "
+"khi tiáº¿p tá»¥c. Báº¡n lÃºc sau váº«n cÃ³ thá»ƒ cáº¥u hÃ¬nh kháº£ nÄƒng ghi lÆ°u cÆ¡ sá»Ÿ dá»¯ "
+"liá»‡u, báº±ng cÃ¡ch cáº¥u hÃ¬nh láº¡i gÃ³i snort-mysql báº±ng lá»‡nh Â« dpkg-reconfigure -"
+"plow snort-mysql Â»."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid "Snort needs a configured database to log to before it starts."
+msgstr ""
+"Ä�á»ƒ khá»Ÿi cháº¡y Ä‘Æ°á»£c, trÃ¬nh Snort cáº§n thiáº¿t má»™t cÆ¡ sá»Ÿ dá»¯ liá»‡u Ä‘Ã£ cáº¥u hÃ¬nh vÃ o "
+"Ä‘Ã³ Ä‘á»ƒ ghi lÆ°u."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+"Fill in the correct values for the user, host, and database names. MySQL "
+"will prompt you for the password."
+msgstr ""
+"TrÃ¬nh Snort cáº§n thiáº¿t má»™t cÆ¡ sá»Ÿ dá»¯ liá»‡u Ä‘Ã£ cáº¥u hÃ¬nh, trÆ°á»›c khi nÃ³ khá»Ÿi cháº¡y "
+"Ä‘Æ°á»£c. Ä�á»ƒ táº¡o cáº¥u trÃºc nÃ y, hÃ£y cháº¡y nhá»¯ng lá»‡nh theo Ä‘Ã¢y SAU KHI cÃ i Ä‘áº·t xong "
+"gÃ³i nÃ y:\n"
+"Â« cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <ngÆ°á»�i_dÃ¹ng> -h <mÃ¡y> -p "
+"<tÃªn_cÆ¡_sá»Ÿ_dá»¯_liá»‡u> Â»\n"
+"HÃ£y Ä‘iá»�n vÃ o cÃ¡c giÃ¡ trá»‹ Ä‘Ãºng cho tÃªn ngÆ°á»�i dÃ¹ng, tÃªn mÃ¡y vÃ  tÃªn cÆ¡ sá»Ÿ dá»¯ "
+"liá»‡u. TrÃ¬nh MySQL sáº½ nháº¯c báº¡n nháº­p máº­t kháº©u."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid ""
+"After you created the database structure, you will need to start Snort "
+"manually."
+msgstr ""
+"Sau khi táº¡o cáº¥u trÃºc cÆ¡ sá»Ÿ dá»¯ liá»‡u, báº¡n cáº§n pháº£i tá»± khá»Ÿi cháº¡y trÃ¬nh Snort."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001
+msgid "Please enter the hostname of the mysql database server to use."
+msgstr ""
+"HÃ£y nháº­p tÃªn mÃ¡y cá»§a mÃ¡y cháº¡y trÃ¬nh phá»¥c vá»¥ cÆ¡ sá»Ÿ dá»¯ liá»‡u MySQL cáº§n dÃ¹ng."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001 ../snort-pgsql.templates:13001
+msgid ""
+"Make sure it has been set up correctly to allow incoming connections from "
+"this host!"
+msgstr ""
+"Ä�áº£m báº£o nÃ³ Ä‘Ã£ Ä‘Æ°á»£c thiáº¿t láº­p cho Ä‘Ãºng Ä‘á»ƒ cho phÃ©p cÃ¡c sá»± káº¿t ná»‘i gá»­i Ä‘áº¿n tá»« "
+"mÃ¡y nÃ y !"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid "Please enter the name of the database to use."
+msgstr "HÃ£y nháº­p tÃªn cá»§a cÆ¡ sá»Ÿ dá»¯ liá»‡u cáº§n dÃ¹ng."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid ""
+"Make sure this database has been created and your database user has write "
+"access to this database."
+msgstr ""
+"Ä�áº£m báº£o cÆ¡ sá»Ÿ dá»¯ liá»‡u nÃ y Ä‘Ã£ Ä‘Æ°á»£c táº¡o, vÃ  ngÆ°á»�i dÃ¹ng cÆ¡ sá»Ÿ dá»¯ liá»‡u cÃ³ quyá»�n "
+"ghi vÃ o nÃ³."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Please enter the name of the database user you want to use."
+msgstr "HÃ£y nháº­p tÃªn cá»§a ngÆ°á»�i dÃ¹ng cÆ¡ sá»Ÿ dá»¯ liá»‡u báº¡n muá»‘n dÃ¹ng."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Make sure this user has been created and has write access."
+msgstr "Ä�áº£m báº£o ngÆ°á»�i dÃ¹ng nÃ y Ä‘Ã£ Ä‘Æ°á»£c táº¡o, cÅ©ng cÃ³ quyá»�n ghi."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter the password for the database connection."
+msgstr "HÃ£y nháº­p máº­t kháº©u cho sá»± káº¿t ná»‘i cÆ¡ sá»Ÿ dá»¯ liá»‡u."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter a password to connect to the Snort Alert database."
+msgstr "HÃ£y nháº­p máº­t kháº©u Ä‘á»ƒ káº¿t ná»‘i Ä‘áº¿n cÆ¡ sá»Ÿ dá»¯ liá»‡u BÃ¡o Ä�á»™ng Snort."
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid "Do you want to set up a database for snort-pgsql to log to?"
+msgstr ""
+"Báº¡n cÃ³ muá»‘n thiáº¿t láº­p má»™t cÆ¡ sá»Ÿ dá»¯ liá»‡u vÃ o Ä‘Ã³ snort-pgsql sáº½ ghi lÆ°u khÃ´ng?"
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-pgsql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a pgsql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-pgsql package with 'dpkg-"
+"reconfigure -plow snort-pgsql'"
+msgstr ""
+"Cáº§n pháº£i lÃ m viá»‡c thiáº¿t láº­p nÃ y chá»‰ láº§n Ä‘áº§u tiÃªn cÃ i Ä‘áº·t gÃ³i snort-pgsql. "
+"TrÆ°á»›c khi tiáº¿p tá»¥c, báº¡n hÃ£y Ä‘áº£m báº£o cÃ³ thÃ´ng tin nÃ y:\n"
+" 1. tÃªn mÃ¡y cá»§a mÃ¡y cÃ³ cháº¡y má»™t trÃ¬nh phá»¥c vá»¥ PostgreSQL Ä‘Æ°á»£c thiáº¿t láº­p Ä‘á»ƒ "
+"cho phÃ©p sá»± káº¿t ná»‘i TCP tá»« mÃ¡y nÃ y;\n"
+" 2. cÆ¡ sá»Ÿ dá»¯ liá»‡u trÃªn trÃ¬nh phá»¥c vá»¥ Ä‘Ã³ ;\n"
+" 3. tÃªn ngÆ°á»�i dÃ¹ng vÃ  máº­t kháº©u cÃ³ quyá»�n truy cáº­p cÆ¡ sá»Ÿ dá»¯ liá»‡u Ä‘Ã³.\n"
+"ChÆ°a cÃ³ _táº¥t cáº£_ cÃ¡c Ä‘iá»�u nÃ y thÃ¬ hoáº·c chá»�n Â« KhÃ´ng Â» (no) vÃ  cháº¡y vá»›i kháº£ "
+"nÄƒng ghi lÆ°u vÃ o táº­p tin kiá»ƒu chuáº©n, hoáº·c táº­p há»£p thÃ´ng tin bá»‹ thiáº¿u trÆ°á»›c "
+"khi tiáº¿p tá»¥c. Báº¡n lÃºc sau váº«n cÃ³ thá»ƒ cáº¥u hÃ¬nh kháº£ nÄƒng ghi lÆ°u cÆ¡ sá»Ÿ dá»¯ "
+"liá»‡u, báº±ng cÃ¡ch cáº¥u hÃ¬nh láº¡i gÃ³i snort-pgsql báº±ng lá»‡nh Â« dpkg-reconfigure -"
+"plow snort-pgsql Â»."
+
+#. Type: note
+#. Description
+#: ../snort-pgsql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+"Fill in the correct values for the user, host, and database names. "
+"PostgreSQL will prompt you for the password."
+msgstr ""
+"TrÃ¬nh Snort cáº§n thiáº¿t má»™t cÆ¡ sá»Ÿ dá»¯ liá»‡u Ä‘Ã£ cáº¥u hÃ¬nh, trÆ°á»›c khi nÃ³ khá»Ÿi cháº¡y "
+"Ä‘Æ°á»£c. Ä�á»ƒ táº¡o cáº¥u trÃºc nÃ y, hÃ£y cháº¡y nhá»¯ng lá»‡nh theo Ä‘Ã¢y SAU KHI cÃ i Ä‘áº·t xong "
+"gÃ³i nÃ y:\n"
+"Â« cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_pgsql.gz | psql -u <ngÆ°á»�i_dÃ¹ng> -h <mÃ¡y> -p <tÃªn_cÆ¡_sá»Ÿ_dá»¯_liá»‡u> "
+"Â»\n"
+"Báº¡n hÃ£y Ä‘iá»�n vÃ o cÃ¡c giÃ¡ trá»‹ Ä‘Ãºng cho tÃªn ngÆ°á»�i dÃ¹ng, tÃªn mÃ¡y vÃ  tÃªn cÆ¡ sá»Ÿ "
+"dá»¯ liá»‡u. TrÃ¬nh PostgreSQL sáº½ nháº¯c báº¡n nháº­p máº­t kháº©u."
+
+#. Type: string
+#. Description
+#: ../snort-pgsql.templates:13001
+msgid "Please enter the hostname of the pgsql database server to use."
+msgstr ""
+"HÃ£y nháº­p tÃªn mÃ¡y cá»§a mÃ¡y cháº¡y trÃ¬nh phá»¥c vá»¥ cÆ¡ sá»Ÿ dá»¯ liá»‡u PostgreSQL cáº§n "
+"dÃ¹ng."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid "Your configuration file is deprecated"
+msgstr "Táº­p tin cáº¥u hÃ¬nh bá»‹ pháº£n Ä‘á»‘i"
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"Your Snort configuration file (/etc/snort/snort.conf) uses deprecated "
+"options no longer available for this Snort release.  Snort will not be able "
+"to start unless you provide a correct configuration file. You can substitute "
+"your configuration file with the one provided in this package or fix it "
+"manually by removing deprecated options."
+msgstr ""
+"Táº­p tin cáº¥u hÃ¬nh Snort (/etc/snort/snort.conf) cÃ³ dÃ¹ng cÃ¡c tÃ¹y chá»�n bá»‹ pháº£n "
+"Ä‘á»‘i khÃ´ng cÃ²n sáºµn sÃ ng láº¡i cho phiÃªn báº£n Snort nÃ y. TrÃ¬nh Snort sáº½ khÃ´ng thá»ƒ "
+"khá»Ÿi cháº¡y náº¿u báº¡n khÃ´ng cung cáº¥p má»™t táº­p tin cáº¥u hÃ¬nh Ä‘Ãºng. Báº¡n cÃ³ kháº£ nÄƒng "
+"thay tháº¿ táº­p tin cáº¥u hÃ¬nh cÅ© báº±ng Ä‘iá»�u Ä‘Æ°á»£c cung cáº¥p trong gÃ³i nÃ y, hoáº·c tá»± "
+"sá»­a chá»¯a nÃ³ báº±ng cÃ¡ch gá»¡ bá»� cÃ¡c tÃ¹y chá»�n bá»‹ pháº£n Ä‘á»‘i."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"The following deprecated options were found in your configuration file: "
+"${DEP_CONFIG}"
+msgstr ""
+"Trong táº­p tin cáº¥u hÃ¬nh, tÃ¬m tháº¥y nhá»¯ng tÃ¹y chá»�n bá»‹ pháº£n Ä‘á»‘i nÃ y:\n"
+"${DEP_CONFIG}"
+
+#~ msgid ""
+#~ "Your system has an obsolete configuration file  (/etc/snort/snort.common."
+#~ "parameters) which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "Há»‡ thá»‘ng cá»§a báº¡n cÃ³ má»™t táº­p tin cáº¥u hÃ¬nh cÅ© (/etc/snort/snort.common."
+#~ "parameters) Ä‘Ã£ Ä‘Æ°á»£c chuyá»ƒn Ä‘á»•i tá»± Ä‘á»™ng sang Ä‘á»‹nh dáº¡ng táº­p tin cáº¥u hÃ¬nh "
+#~ "má»›i (á»Ÿ Â« /etc/default/snort Â»). Báº¡n xem láº¡i cáº¥u hÃ¬nh má»›i, rá»“i gá»¡ bá»� táº­p "
+#~ "tin cÅ©. KhÃ´ng thÃ¬ vÄƒn lá»‡nh Â« init.d Â» sáº½ khÃ´ng dÃ¹ng cáº¥u hÃ¬nh má»›i vÃ  báº¡n "
+#~ "sáº½ khÃ´ng thá»ƒ nhá»› dá»‹p cÃ¡c lá»£i Ã­ch Ä‘Æ°á»£c giá»›i thiá»‡u trong phiÃªn báº£n má»›i."
--- snort-2.3.3.orig/debian/po/es.po
+++ snort-2.3.3/debian/po/es.po
@@ -0,0 +1,717 @@
+# snort debconf translation to Spanish
+# Copyright (C) 2004 Software in the Public Interest
+# This file is distributed under the same license as the snort package.
+#
+# Changes:
+# - Initial translation
+# 	Javier Fernandez-Sanguino Peña <jfs@debian.org>, 2004
+#
+#
+#  Traductores, si no conoce el formato PO, merece la pena leer la 
+#  documentación de gettext, especialmente las secciones dedicadas a este
+#  formato, por ejemplo ejecutando:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor, lean antes de traducir
+# los siguientes documentos:
+# 
+# - El proyecto de traducción de Debian al español
+#   http://www.debian.org/intl/spanish/coordinacion
+#   especialmente las notas de traducción en
+#   http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+#   /usr/share/doc/po-debconf/README-trans
+#   o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: snort debconf 2.1.0-4.1\n"
+"Report-Msgid-Bugs-To: jfs@computer.org\n"
+"POT-Creation-Date: 2006-12-28 23:00+0100\n"
+"PO-Revision-Date: 2006-12-21 19:48+0100\n"
+"Last-Translator: Javier Fernandez-Sanguino Peña <jfs@debian.org>\n"
+"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../snort.templates:1001 ../snort-mysql.templates:1001
+#: ../snort-pgsql.templates:1001
+msgid "boot, dialup, manual"
+msgstr "arranque, conexión, manual"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid "When should Snort be started?"
+msgstr "¿Cuando debería arrancarse Snort?"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid ""
+"Snort can be started during boot, when connecting to the net with pppd or "
+"only when you manually start it via /usr/sbin/snort."
+msgstr ""
+"Snort se puede arrancar snort en el arranque del sistema, cuando el sistema "
+"se conecte a Internet con pppd o sólo cuando lo arranque  manualmente "
+"ejecutandolo con «/usr/sbin/snort»."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid "On which interface(s) should Snort listen?"
+msgstr "¿En qué interfaz(ces) debería escuchar Snort?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Please enter the name(s) of the interface(s) which Snort should listen on.  "
+"The names of the available interfaces are provided by either running  'ip "
+"link show' of 'ifconfig'. This value usually is 'eth0', but you might want "
+"to vary this depending on your environment, if you are using a dialup "
+"connection 'ppp0' might be more appropiate."
+msgstr ""
+"Por favor, introduzca el nombre de la interfaz o interfaces en la que Snort "
+"debe escuchar. Puede obtener los nombres de las interfaces ejecutando «ip "
+"link show». Este valor suele ser «eth0», pero quizás desee variarlo "
+"dependiendo de su entorno. Si está utilizando una conexión telefónica a "
+"Internet basada en PPP puede ser más apropiado utilizar «ppp0»."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Notice that Snort is usually configured to inspect all traffic coming from "
+"the Internet, so the interface you add here is usually the same the 'default "
+"route' is on.  You can determine which interface is used for this running "
+"either '/sbin/ip ro sh' or '/sbin/route -n' (look for 'default' or "
+"'0.0.0.0')."
+msgstr ""
+"Tenga en cuenta que generalmente se configura a Snort para que analice todo "
+"el tráfico que viene de Internet, así que la interfaz que se añade aquí es "
+"generalmente la misma que tiene definida la ruta por omisión. Para "
+"determinar qué interfaz se está utilizando para esto, ejecute bien «/sbin/ip "
+"ro sh» o bien «/sbin/route -n» (busque aquellos valores asociados a "
+"«default» o «0.0.0.0»)."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"It is also not uncommon to run Snort on an interface with no IP and "
+"configured in promiscuous mode, if this is your case, select the interface "
+"in this system that is physically connected to the network you want to "
+"inspect, enable promiscuous mode later on and make sure that the network "
+"traffic is sent to this interface (either connected to a 'port mirroring/"
+"spanning' port in a switch, to a hub or to a tap)"
+msgstr ""
+"Tampoco es infrecuente ejecutar Snort en una interfaz sin dirección IP que "
+"esté configurada en modo promiscuo. Si este es su caso, seleccione el "
+"interfaz en el sistema que está físicamente conectado a la red que quiere "
+"inspeccionar, active el modo promíscuo más adelante y asegúrese que el "
+"tráfico de dicha red se está enviado a esa interfaz (bien conectándola a un "
+"puerto del switch en modo «port mirroring/spanning», bien conectado a un hub "
+"o a un tup)"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"You can configure multiple interfaces here, just by adding more than one "
+"interface name separated by spaces. Each interface can have its specific "
+"configuration."
+msgstr ""
+"Puede configurar múltiples interfaces simplemente añadiendo más de un nombre "
+"y separándolo por espacios. Cada interfaz tiene su propia configuración."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid "Please enter the address range that Snort will listen on."
+msgstr "Introduzca el intervalo de direcciones que monitorizará Snort."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+"192.168.1.42/32 for just one. Specify multiple addresses on a single line "
+"separated by ',' (comma characters), no spaces allowed!"
+msgstr ""
+"Tiene que utilizar el formato CIDR, esto es, 192.168.1.0/24 para un bloque "
+"de 256 IPs o  192.168.1.42/32 para sólo una dirección. Indique múltiples "
+"direcciones en una sola línea separados por «,» (comas). No se permiten "
+"espacios en blanco."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"If you want you can specify 'any', to not trust any side of the network."
+msgstr ""
+"Si quiere, puede especificar «any» (cualquiera) si no confía en ningún lado "
+"de su red."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"Notice that if you are using multiple interfaces this definition will be "
+"used as the HOME_NET definition of all of them."
+msgstr ""
+"Tenga en cuenta que si está utilizando múltiples interfaces se utilizará "
+"esta definición como valor de «HOME_NET» para todos ellos."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid "Should Snort disable promiscuous mode on the interface?"
+msgstr "¿Debería Snort deshabilitar el modo promíscuo en la interfaz?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disabling promiscuous mode means that Snort will only see packets addressed "
+"to it's own interface. Enabling it allows Snort to check  every packet that "
+"passes ethernet segment even if it's a connection between two other "
+"computers."
+msgstr ""
+"Al deshabilitar el modo promíscuo snort sólo estará a la escucha de paquetes "
+"dirigidos a su propia interfaz. Si lo activa le permitirá comprobar cada "
+"paquete que pase el medio ethernet incluso aunque sea una conexión entre "
+"otros dos sistemas."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disable promiscuous mode if you are configuring Snort on an interface "
+"without a configured IP address."
+msgstr ""
+"Debería deshabilitar el modo promíscuo si está configurando Snort en una "
+"interfaz sin direcciones IP."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid "Invalid interface"
+msgstr "Interfaz inválida"
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"One of the interfaces you specified is not valid (it might not exist on the "
+"system or be down). Please introduce a valid interface when answering the "
+"question of which interface(s) should Snort listen on."
+msgstr ""
+"Una de las interfaces que ha especificado no es válida (puede que no exista "
+"en su sistema o no tenga enlace). Debe introducir una interfaz válida cuando "
+"se le pregunte en qué interfaz (o interfaces) debería escuchar Snort."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"If you did not configure an interface then the package is trying to use the "
+"default ('eth0') which does not seem to be valid in your system."
+msgstr ""
+"El paquete ha intentado utilizar la interfaz por omisión («eth0») si no ha "
+"configurado un interfaz aquí, y esta interfaz para que no es válida en su "
+"sistema."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid "Should Snort's rules testing order be changed to Pass|Alert|Log?"
+msgstr "¿Deberían cambiarse de orden las reglas de Pasar|Alertar|Registrar?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid ""
+"If you change Snort's rules testing order to Pass|Alert|Log, they will be "
+"applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+"This will prevent people from having to make huge Berky Packet Filter "
+"command line arguments to filter their alert rules."
+msgstr ""
+"Si cambia el orden de prueba de las reglas de snort a Pasar|Alertar|"
+"Registrar,  se aplicar?n el orden Pasar->Alertar->Registrar en lugar del "
+"modo estándar Alertar->Pasar->Registrar. Esto evita que se tengan que "
+"incluir muchos argumentos de línea de comandos con filtrado de paquetes para "
+"filtrar sus propias reglas de alertas."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid "Should daily summaries be sent by e-mail?"
+msgstr "¿Deberían enviarse resúmenes por correo electrónico?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid ""
+"This Snort installation provides a cron job that runs daily and summarises "
+"the information of Snort logs to a selected email address. If you want to "
+"disable this feature say 'no' here."
+msgstr ""
+"Esta instalación de Snort incluye una tarea del «cron» que se ejecuta "
+"diariamente y realiza un resumen de información de los registros de Snort "
+"que luego envía por correo electrónico a la dirección indicada. Responda "
+"«no» a esta pregunta si desea deshabilitar esta funcionalidad."
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid "Who should receive the daily statistics mails?"
+msgstr "¿Quién debería recibir las estadísticas diarias?"
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid ""
+"A cron job running daily will summarise the information of the logs "
+"generated by Snort using a script called 'snort-stat'. Introduce here the "
+"recipient of these mails. The default value is the system administrator. If "
+"you keep this value, make sure that the mail of the administrator is "
+"redirected to a user that actually reads those mails."
+msgstr ""
+"Se ejecuta diariamente una tarea del «cron» para resumir la información de "
+"los registros generados por Snort utilizando un programa llamado «snort-"
+"stat». Indique aquí el receptor de dichos mensajes. El valor por defecto es "
+"el administrator del sistema. Si mantiene este valor asegúrese de que los "
+"correos de dicha cuenta son reenviados o leídos por algún usuario."
+
+#. Type: string
+#. Description
+#: ../snort.templates:9001 ../snort-mysql.templates:8001
+#: ../snort-pgsql.templates:8001
+msgid ""
+"If you want to specify custom options to Snort, please specify them here."
+msgstr "Si quiere aadir opciones adicionales a Snort, especifiquelas aquí:"
+
+#. Type: string
+#. Description
+#: ../snort.templates:10001 ../snort-mysql.templates:9001
+#: ../snort-pgsql.templates:9001
+msgid ""
+"An alert needs to appear more times than this number to be included in the "
+"daily statistics."
+msgstr ""
+"Una alerta debe aparecer más de éste número de veces para aparecer en las "
+"estadísticas."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid "You are running Snort manually."
+msgstr "Está ejecutando Snort manualmente."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid ""
+"Please restart Snort using:\n"
+" /etc/init.d/snort start\n"
+"to let the settings take effect."
+msgstr ""
+"Por favor reinicie a Snort con:\n"
+" /etc/init.d/snort start\n"
+"para que los cambios tengan efecto."
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid "There is an error in your configuration"
+msgstr "Su configuración tiene un error"
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid ""
+"Your Snort configuration is not correct and Snort will not be able to start "
+"up normally. Please review your configuration and fix it. If you do not do "
+"this, Snort package upgrades will probably break. To check which error is "
+"being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf' (or point "
+"to an alternate configuration file if you are using different files for "
+"different interfaces)"
+msgstr ""
+"Su configuración de Snort no es correcta y no se podrá arrancar éste con "
+"normalidad. Por favor, revise su configuración y arreglela. Las "
+"actualizaciones del paquete Snort fallarán si no lo hace. Para comprobar el "
+"error que se genera ejecute «/usr/sbin/snort -T -c /etc/snort/snort.conf» (o "
+"utilice otro fichero de configuración si utiliza ficheros distintos para "
+"distintas interfaces)"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid "This system uses an obsolete configuration file"
+msgstr "Este sistema utiliza un fichero de configuración obsoleto"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid ""
+"Your system has an obsolete configuration file (/etc/snort/snort.common."
+"parameters) which has been automatically converted into the new "
+"configuration file format (at /etc/default/snort). Please review the new "
+"configuration and remove the obsolete one. Until you do this, the init.d "
+"script will not use the new configuration and you will not take advantage of "
+"the benefits introduced in newer releases."
+msgstr ""
+"Su sistema tiene un fichero de configuración obsoleto (/etc/snort/snort."
+"common.parameters) que ha sido convertido de forma automática al nuevo "
+"formato de fichero de configuración (en /etc/default/snort). Por favor, "
+"revise el nuevo fichero de configuración y borre el antigüo. El guión del "
+"init.d no utilizará la nueva configuración hasta que lo borre y no podrá "
+"aprovecharse de las ventajas introducidas en nuevas versiones."
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid "Do you want to set up a database for snort-mysql to log to?"
+msgstr ""
+"¿Quiere configurar una base de datos a la que snort-mysql enviará los "
+"registros?"
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-mysql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a mysql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-mysql package with 'dpkg-"
+"reconfigure -plow snort-mysql'"
+msgstr ""
+"Sólo tiene que hacer ésto la primera vez que instale snort-mysql. Andes de "
+"seguir adelante asegúrese de que (1) el nombre de servidor del equipo que "
+"ejecuta la base de datos mysql permite realizar conexiones tcp desde éste "
+"equipo, (2) hay una base de datos en ese servidor, (3) el nombre de usuario "
+"y contraseña de acceso a la base de datos. Si no tiene _todos_ estos, escoja "
+"«no» y continúe con la configuración habitual de registro, o arregle esto. "
+"Siempre puede configurar la base de datos más adelante reconfigurando snort-"
+"mysql utilizando: «dpkg-reconfigure -plow snort-mysql»"
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid "Snort needs a configured database to log to before it starts."
+msgstr "Snort necesita tener una base de datos configurada antes de arrancar."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+"Fill in the correct values for the user, host, and database names. MySQL "
+"will prompt you for the password."
+msgstr ""
+"Snort necesita una base de datos correctamente configurada para poder "
+"arrancar. Para poder crear la estructura debe ejecutar las órdenes mostradas "
+"a continuación DESPUÉS de instalar el paquete:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <usuario> -h <servidor> -p <base_de_datos>\n"
+"Rellene correctamente los valores para el usuario, servidor y nombre de la "
+"base de datos. MySQL le solicitará la contraseña."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid ""
+"After you created the database structure, you will need to start Snort "
+"manually."
+msgstr ""
+"Deberá arrancar Snort manualmente después de haber creado la estructura de "
+"la base de datos."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001
+msgid "Please enter the hostname of the mysql database server to use."
+msgstr ""
+"Introduzca el nombre de servidor de la base de datos mysql que va a utilizar."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001 ../snort-pgsql.templates:13001
+msgid ""
+"Make sure it has been set up correctly to allow incoming connections from "
+"this host!"
+msgstr ""
+"¡Asegúrese de que se ha configurado correctamente para permitir conexiones "
+"entrantes desde este servidor!"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid "Please enter the name of the database to use."
+msgstr "Por favor, indique el nombre de la base de datos a utilizar."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid ""
+"Make sure this database has been created and your database user has write "
+"access to this database."
+msgstr ""
+"Asegúrese de que la base de datos ha sido creada y de que su usuario tiene "
+"acceso de escritura a esta base de datos."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Please enter the name of the database user you want to use."
+msgstr ""
+"Por favor, introduzca el nombre de usuario de la base de datos que quiere "
+"utilizar."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Make sure this user has been created and has write access."
+msgstr ""
+"Asegúrese de que el usuario ha sido creado y tiene permisos de escritura."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter the password for the database connection."
+msgstr ""
+"Por favor, introduzca la contraseña para la conexión con la base de datos."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter a password to connect to the Snort Alert database."
+msgstr ""
+"Por favor, introduzca la contraseña para conectarse a la base de datos de "
+"alertas de Snort."
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid "Do you want to set up a database for snort-pgsql to log to?"
+msgstr "¿Quiere preparar una base de datos para que la utilice snort-pgsql?"
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-pgsql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a pgsql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-pgsql package with 'dpkg-"
+"reconfigure -plow snort-pgsql'"
+msgstr ""
+"Sólo tiene que hacer ésto la primera vez que instale snort-pgsql. Andes de "
+"seguir adelante asegúrese de que (1) el nombre de servidor del equipo que "
+"ejecuta la base de datos mysql permite realizar conexiones tcp desde éste "
+"equipo, (2) hay una base de datos en ese servidor, (3) el nombre de usuario "
+"y contraseña de acceso a la base de datos. Si no tiene _todos_ estos, escoja "
+"«no» y continúe con la configuración habitual de registro, o arregle esto. "
+"Siempre puede configurar la base de datos más adelante reconfigurando snort-"
+"pgsql utilizando: «dpkg-reconfigure -plow snort-pgsql»"
+
+#. Type: note
+#. Description
+#: ../snort-pgsql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+"Fill in the correct values for the user, host, and database names. "
+"PostgreSQL will prompt you for the password."
+msgstr ""
+"Snort necesita una base de datos correctamente configurada para poder "
+"arrancar.Para poder crear la estructura debe ejecutar las órdenes mostradas "
+"a continuación DESPUÉS de instalar el paquete:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_pgsql.gz | psql -U <usuario> -h <servidor> -W <base_de_datos>\n"
+"Rellene correctamente los valores para el usuario, servidor y nombre de la "
+"base de datos. PostgreSQL le solicitará la contraseña."
+
+#. Type: string
+#. Description
+#: ../snort-pgsql.templates:13001
+msgid "Please enter the hostname of the pgsql database server to use."
+msgstr ""
+"Introduzca el nombre de servidor de la base de datos psql que va a utilizar."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid "Your configuration file is deprecated"
+msgstr "Su fichero de configuración es obsoleto"
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"Your Snort configuration file (/etc/snort/snort.conf) uses deprecated "
+"options no longer available for this Snort release.  Snort will not be able "
+"to start unless you provide a correct configuration file. You can substitute "
+"your configuration file with the one provided in this package or fix it "
+"manually by removing deprecated options."
+msgstr ""
+"Su fichero de configuración de Snort (/etc/snort/snort.conf) utiliza "
+"opciones obsoletas que ya no están disponibles en esta versión de Snort. "
+"Snort no podrá arrancar a menos que tenga un fichero de configuración "
+"correcto. Puede sustituir este fichero de configuración por el que ofrece "
+"este paquete o arreglarlo manualmente eliminando las opciones obsoletas."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"The following deprecated options were found in your configuration file: "
+"${DEP_CONFIG}"
+msgstr ""
+"Se encontraron las siguientes opciones obsoletas en el fichero de "
+"configuración: ${DEP_CONFIG}"
+
+#~ msgid ""
+#~ "Your system has an obsolete configuration file  (/etc/snort/snort.common."
+#~ "parameters) which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "Su sistema tiene un fichero de configuración obsoleto (/etc/snor/snort."
+#~ "common.parameters) que ha sido convertido de forma automática al nuevo "
+#~ "formato de fichero de configuración (en /etc/default/snort). Por favor, "
+#~ "revise el nuevo fichero de configuración y borre el antigüo. El guión del "
+#~ "init.d no utilizará la nueva configuración hasta que lo borre y no podrá "
+#~ "aprovecharse de las ventajas introducidas en nuevas versiones."
+
+#~ msgid ""
+#~ "Your system has an obsolete configuration file  (/etc/snort/snort.common."
+#~ "parameters)  which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "Su sistema tiene un fichero de configuración obsoleto (/etc/snor/snort."
+#~ "common.parameters) que ha sido convertido de forma automática al nuevo "
+#~ "formato de fichero de configuración (en /etc/default/snort). Por favor, "
+#~ "revise el nuevo fichero de configuración y borre el antigüo. El guión del "
+#~ "init.d no utilizará la nueva configuración hasta que lo borre y no podrá "
+#~ "aprovecharse de las ventajas introducidas en nuevas versiones."
+
+#~ msgid ""
+#~ "Please enter the name(s) of the interface(s) which Snort should listen "
+#~ "on. The names of the available interfaces are provided by either running "
+#~ "'ip link show' of 'ifconfig'. This value usually is 'eth0', but you might "
+#~ "want to vary this depending on your environment, if you are using a "
+#~ "dialup connection 'ppp0' might be more appropiate."
+#~ msgstr ""
+#~ "Por favor, introduzca el nombre de la interfaz o interfaces en la que "
+#~ "Snort debe escuchar. Puede obtener los nombres de las interfaces "
+#~ "ejecutando «ip link show». Este valor suele ser «eth0», pero quizás desee "
+#~ "variarlo dependiendo de su entorno. Si está utilizando una conexión "
+#~ "telefónica a Internet basada en PPP puede ser más apropiado utilizar "
+#~ "«ppp0»."
+
+#~ msgid "On which interface should Snort listen?"
+#~ msgstr "¿En qué interfaz debería escuchar Snort?"
+
+#~ msgid ""
+#~ "Please enter the interface name which snort should listen on. The name of "
+#~ "the available interfaces are provided by running 'ip link show'. This "
+#~ "value usually is 'eth0', but you might want to vary this depending on "
+#~ "your environment, if you are using a dialup connection 'ppp0' might be "
+#~ "more appropiate."
+#~ msgstr ""
+#~ "Por favor, introduzca el nombre de la interfaz en la que Snort debe "
+#~ "escuchar. Puede obtener los nombres de las interfaces ejecutando «ip link "
+#~ "show». Este valor suele ser «eth0», pero quizás desee variarlo "
+#~ "dependiendo de su entorno. Si está utilizando una conexión de teléfono "
+#~ "mediante PPP a Internet puede ser más apropiado utilizar «ppp0»."
+
+#~ msgid ""
+#~ "Notice that Snort is usually configured to inspect all traffic coming "
+#~ "from the Internet, so the interface you add here is usually the same the "
+#~ "'default route' is on.  You can determine which interface is used for "
+#~ "this running either 'ip route show' or '/sbin/route -n' (look for "
+#~ "'default' or '0.0.0.0')."
+#~ msgstr ""
+#~ "Tenga en cuenta que generalmente se configura a Snort para que analice "
+#~ "todo el tráfico que viene de Internet, así que la interfaz que se añade "
+#~ "aquí es generalmente la misma que tiene definida la ruta por omisión. "
+#~ "Para determinar qué interfaz se está utilizando para esto, ejecute bien "
+#~ "«ip route show» o bien «/sbin/route -n» (busque aquellos valores "
+#~ "asociados a «default» o «0.0.0.0»)."
+
+#~ msgid "Should Snort disable promiscous mode on the interface?"
+#~ msgstr "¿Debería Snort deshabilitar el modo promíscuo en la interfaz?"
+
+#~ msgid ""
+#~ "The configuration file found the following deprecated content:  "
+#~ "${DEP_CONFIG}"
+#~ msgstr ""
+#~ "Se encontraron las siguientes opciones obsoletas en el fichero de "
+#~ "configuración: ${DEP_CONFIG}"
+
+#~ msgid ""
+#~ "Please enter the interface name wich snort should listen on. F.e. eth0 "
+#~ "Usually this is the interface the 'default route' is on.  See  '/sbin/ip "
+#~ "ro sh' or '/sbin/route -n' and look for 'default' or '0.0.0.0'."
+#~ msgstr "Introduzca el nombre de la interfaz "
--- snort-2.3.3.orig/debian/po/fr.po
+++ snort-2.3.3/debian/po/fr.po
@@ -0,0 +1,644 @@
+# translation of fr.po to French
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+# Christian Perrier <bubulle@debian.org>, 2004, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: jfs@computer.org\n"
+"POT-Creation-Date: 2006-12-28 23:00+0100\n"
+"PO-Revision-Date: 2006-03-24 19:35+0100\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#. Type: select
+#. Choices
+#: ../snort.templates:1001 ../snort-mysql.templates:1001
+#: ../snort-pgsql.templates:1001
+msgid "boot, dialup, manual"
+msgstr "Au démarrage, À la connexion, Manuellement "
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid "When should Snort be started?"
+msgstr "Méthode de lancement de Snort :"
+
+#. Type: select
+#. Description
+#: ../snort.templates:1002 ../snort-mysql.templates:1002
+#: ../snort-pgsql.templates:1002
+msgid ""
+"Snort can be started during boot, when connecting to the net with pppd or "
+"only when you manually start it via /usr/sbin/snort."
+msgstr ""
+"Snort peut être lancé au démarrage du système, lors de la connexion au "
+"réseau avec pppd ou à la demande via la commande « /usr/sbin/snort »."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid "On which interface(s) should Snort listen?"
+msgstr "Interface(s) où Snort sera à l'écoute :"
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Please enter the name(s) of the interface(s) which Snort should listen on.  "
+"The names of the available interfaces are provided by either running  'ip "
+"link show' of 'ifconfig'. This value usually is 'eth0', but you might want "
+"to vary this depending on your environment, if you are using a dialup "
+"connection 'ppp0' might be more appropiate."
+msgstr ""
+"Veuillez indiquer sur quelle(s) interface(s) Snort doit être à l'écoute. Le "
+"nom des interfaces actuellement disponibles peut être obtenu avec la "
+"commande « ip link show » ou « ifconfig ». La valeur la plus usuelle est "
+"« eth0 » mais elle peut varier selon votre environnement : ainsi, si vous "
+"utilisez une connexion ponctuelle (« dialup »), « ppp0 » est probablement "
+"plus adapté."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"Notice that Snort is usually configured to inspect all traffic coming from "
+"the Internet, so the interface you add here is usually the same the 'default "
+"route' is on.  You can determine which interface is used for this running "
+"either '/sbin/ip ro sh' or '/sbin/route -n' (look for 'default' or "
+"'0.0.0.0')."
+msgstr ""
+"Veuillez noter que Snort est en général configuré pour analyser tout le "
+"trafic issu de l'Internet. En conséquence, l'interface à ajouter ici est "
+"celle qu'utilise votre route par défaut. Vous pouvez obtenir cette "
+"information avec les commandes « /sbin/ip ro sh » ou « /sbin/route -"
+"n » (rechercher « default » ou « 0.0.0.0 »)."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"It is also not uncommon to run Snort on an interface with no IP and "
+"configured in promiscuous mode, if this is your case, select the interface "
+"in this system that is physically connected to the network you want to "
+"inspect, enable promiscuous mode later on and make sure that the network "
+"traffic is sent to this interface (either connected to a 'port mirroring/"
+"spanning' port in a switch, to a hub or to a tap)"
+msgstr ""
+"Il est également fréquent d'utiliser Snort sur une interface sans adresse "
+"IP, configuré en mode « promiscuous ». Dans ce cas, choisissez l'interface "
+"connectée au réseau que vous voulez analyser et activez ce mode plus tard. "
+"Assurez-vous que le trafic réseau est bien envoyé à cette interface (soit "
+"connectée à un port de miroir ou de répartition, « mirroring/spanning port » "
+"sur un commutateur réseau, soit connectée à un répartiteur ou à un « tap »)."
+
+#. Type: string
+#. Description
+#: ../snort.templates:2001 ../snort-mysql.templates:2001
+#: ../snort-pgsql.templates:2001
+msgid ""
+"You can configure multiple interfaces here, just by adding more than one "
+"interface name separated by spaces. Each interface can have its specific "
+"configuration."
+msgstr ""
+"Il est possible de configurer plusieurs interfaces en les mentionnant "
+"toutes, séparées par des espaces. Chacune d'elles pourra avoir une "
+"configuration différente."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid "Please enter the address range that Snort will listen on."
+msgstr "Plage d'adresses surveillées par Snort :"
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"You have to use CIDR form, i.e. 192.168.1.0/24 for a block of 256 IPs or "
+"192.168.1.42/32 for just one. Specify multiple addresses on a single line "
+"separated by ',' (comma characters), no spaces allowed!"
+msgstr ""
+"Vous devez utiliser le format CIDR, c'est-à-dire 192.168.1.0/24 pour un bloc "
+"de 256 adresses IP ou 192.168.1.42/32 pour une seule adresse. Il est "
+"possible d'indiquer plusieurs adresses sur une seule ligne en les séparant "
+"par des virgules. Attention, les espaces ne sont pas autorisés !"
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"If you want you can specify 'any', to not trust any side of the network."
+msgstr ""
+"Vous pouvez, si vous le souhaitez, indiquer « any » (n'importe lesquelles) "
+"pour n'accorder votre confiance à aucune partie du réseau."
+
+#. Type: string
+#. Description
+#: ../snort.templates:3001 ../snort-mysql.templates:3001
+#: ../snort-pgsql.templates:3001
+msgid ""
+"Notice that if you are using multiple interfaces this definition will be "
+"used as the HOME_NET definition of all of them."
+msgstr ""
+"Veuillez noter que si vous utilisez plusieurs interfaces, la valeur définie "
+"ici sera la valeur HOME_NET pour chacune d'elles."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid "Should Snort disable promiscuous mode on the interface?"
+msgstr "Faut-il désactiver le mode « promiscuous » sur l'interface ?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disabling promiscuous mode means that Snort will only see packets addressed "
+"to it's own interface. Enabling it allows Snort to check  every packet that "
+"passes ethernet segment even if it's a connection between two other "
+"computers."
+msgstr ""
+"Si le mode « promiscuous » est désactivé, Snort ne verra que les paquets "
+"adressés à sa propre interface. S'il est activé, il vérifiera chaque paquet "
+"transitant sur l'Ethernet même s'il s'agit d'échanges entres deux autres "
+"ordinateurs."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:4001 ../snort-mysql.templates:4001
+#: ../snort-pgsql.templates:4001
+msgid ""
+"Disable promiscuous mode if you are configuring Snort on an interface "
+"without a configured IP address."
+msgstr ""
+"Désactivez cette option si vous configurez Snort sur une interface sans "
+"adresse IP."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid "Invalid interface"
+msgstr "Interface non valable"
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"One of the interfaces you specified is not valid (it might not exist on the "
+"system or be down). Please introduce a valid interface when answering the "
+"question of which interface(s) should Snort listen on."
+msgstr ""
+"Une des interfaces que vous avez indiquées n'est pas valable (soit elle "
+"n'existe pas sur le système soit elle n'est pas actuellement active). "
+"Veuillez indiquer uniquement des interfaces valables."
+
+#. Type: note
+#. Description
+#: ../snort.templates:5001
+msgid ""
+"If you did not configure an interface then the package is trying to use the "
+"default ('eth0') which does not seem to be valid in your system."
+msgstr ""
+"Si vous ne configurez pas d'interface, le paquet tentera d'utiliser "
+"l'interface par défaut (« eth0 ») qui ne semble pas valable sur votre "
+"système."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid "Should Snort's rules testing order be changed to Pass|Alert|Log?"
+msgstr ""
+"Faut-il modifier l'ordre de vérification de Snort en « Pass|Alert|Log » ?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:6001 ../snort-mysql.templates:5001
+#: ../snort-pgsql.templates:5001
+msgid ""
+"If you change Snort's rules testing order to Pass|Alert|Log, they will be "
+"applied in Pass->Alert->Log order, instead of standard Alert->Pass->Log. "
+"This will prevent people from having to make huge Berky Packet Filter "
+"command line arguments to filter their alert rules."
+msgstr ""
+"Si vous changez l'ordre de vérification de Snort en « Pass|Alert|"
+"Log » (faire passer, alerter puis journaliser), les règles seront appliquées "
+"dans cet ordre plutôt que l'ordre habituel Alert->Pass->Log (alerter, faire "
+"passer puis journaliser). Cela permet d'éviter à certains l'utilisation "
+"d'arguments complexes de ligne de commande Berky Packet Filter pour filtrer "
+"les alarmes reçues."
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid "Should daily summaries be sent by e-mail?"
+msgstr "Faut-il envoyer des rapports quotidiens par courriel ?"
+
+#. Type: boolean
+#. Description
+#: ../snort.templates:7001 ../snort-mysql.templates:6001
+#: ../snort-pgsql.templates:6001
+msgid ""
+"This Snort installation provides a cron job that runs daily and summarises "
+"the information of Snort logs to a selected email address. If you want to "
+"disable this feature say 'no' here."
+msgstr ""
+"Le paquet de Snort permet d'utiliser une tâche quotidienne de cron qui "
+"résume les informations contenues dans les journaux de Snort et l'envoie ç "
+"une adresse électronique donnée. Ne choisissez pas cette option si vous ne "
+"voulez pas recevoir ces rapports."
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid "Who should receive the daily statistics mails?"
+msgstr "Destinataire des courriers électroniques quotidiens de statistiques :"
+
+#. Type: string
+#. Description
+#: ../snort.templates:8001 ../snort-mysql.templates:7001
+#: ../snort-pgsql.templates:7001
+msgid ""
+"A cron job running daily will summarise the information of the logs "
+"generated by Snort using a script called 'snort-stat'. Introduce here the "
+"recipient of these mails. The default value is the system administrator. If "
+"you keep this value, make sure that the mail of the administrator is "
+"redirected to a user that actually reads those mails."
+msgstr ""
+"Une tâche quotidienne de cron générera un résumé de l'information des "
+"journaux de Snort avec un script appelé « snort-stat ». Veuillez indiquer le "
+"destinataire de ces courriels. Par défaut, ce sera le super-utilisateur. Si "
+"vous conservez ce choix, veuillez vous assurer que les courriels qui lui "
+"sont destinés sont redirigés vers un utilisateur qui les lira effectivement."
+
+#. Type: string
+#. Description
+#: ../snort.templates:9001 ../snort-mysql.templates:8001
+#: ../snort-pgsql.templates:8001
+msgid ""
+"If you want to specify custom options to Snort, please specify them here."
+msgstr ""
+"Si vous souhaitez utiliser des options personnelles avec Snort, veuillez les "
+"indiquer ici."
+
+#. Type: string
+#. Description
+#: ../snort.templates:10001 ../snort-mysql.templates:9001
+#: ../snort-pgsql.templates:9001
+msgid ""
+"An alert needs to appear more times than this number to be included in the "
+"daily statistics."
+msgstr ""
+"Une alerte doit apparaître une nombre de fois supérieur à celui indiqué pour "
+"être comptabilisée dans les statistiques quotidiennes."
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid "You are running Snort manually."
+msgstr "Redémarrage nécessaire pour prise en compte des modifications"
+
+#. Type: note
+#. Description
+#: ../snort.templates:11001 ../snort-mysql.templates:17001
+#: ../snort-pgsql.templates:17001
+msgid ""
+"Please restart Snort using:\n"
+" /etc/init.d/snort start\n"
+"to let the settings take effect."
+msgstr ""
+"Veuillez redémarrer Snort avec :\n"
+" /etc/init.d/snort restart\n"
+"afin que ce réglage soit pris en compte."
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid "There is an error in your configuration"
+msgstr "Erreur dans la configuration"
+
+#. Type: note
+#. Description
+#: ../snort.templates:12001 ../snort-mysql.templates:18001
+#: ../snort-pgsql.templates:18001
+msgid ""
+"Your Snort configuration is not correct and Snort will not be able to start "
+"up normally. Please review your configuration and fix it. If you do not do "
+"this, Snort package upgrades will probably break. To check which error is "
+"being generated run '/usr/sbin/snort -T -c /etc/snort/snort.conf' (or point "
+"to an alternate configuration file if you are using different files for "
+"different interfaces)"
+msgstr ""
+"Votre configuration de Snort est incorrecte, ce qui l'empêchera de démarrer "
+"normalement. Veuillez la relire et la corriger. Dans le cas contraire, les "
+"mises à niveau du paquet de Snort échoueront probablement. Pour découvrir "
+"quelle est l'erreur, vous pouvez utiliser la commande « /usr/sbin/snort -T -"
+"c /etc/snort/snort.conf » (au besoin en adaptant le chemin vers le fichier "
+"de configuration si vous utilisez différents fichiers pour différentes "
+"interfaces)."
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid "This system uses an obsolete configuration file"
+msgstr "Fichier de configuration obsolète"
+
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#. Type: note
+#. Description
+#: ../snort.templates:13001 ../snort-mysql.templates:10001
+#: ../snort-mysql.templates:19001 ../snort-pgsql.templates:10001
+#: ../snort-pgsql.templates:19001
+msgid ""
+"Your system has an obsolete configuration file (/etc/snort/snort.common."
+"parameters) which has been automatically converted into the new "
+"configuration file format (at /etc/default/snort). Please review the new "
+"configuration and remove the obsolete one. Until you do this, the init.d "
+"script will not use the new configuration and you will not take advantage of "
+"the benefits introduced in newer releases."
+msgstr ""
+"Votre système utilise un fichier de configuration obsolète (/etc/snort/snort."
+"common.parameters) qui a été automatiquement converti vers le nouveau format "
+"(dans /etc/default/snort). Veuillez vérifier le nouveau fichier de "
+"configuration et supprimer l'ancien. Tant que cela n'aura pas été fait, le "
+"script de démarrage n'utilisera pas la nouvelle configuration et vous ne "
+"bénéficierez pas des améliorations des versions plus récentes."
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid "Do you want to set up a database for snort-mysql to log to?"
+msgstr ""
+"Faut-il configurer une base de données pour la journalisation de snort-"
+"mysql ?"
+
+#. Type: boolean
+#. Description
+#: ../snort-mysql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-mysql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a mysql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-mysql package with 'dpkg-"
+"reconfigure -plow snort-mysql'"
+msgstr ""
+"Cela ne doit être fait qu'une fois, à l'installation de snort-mysql. Avant "
+"de continuer, assurez-vous d'avoir :\n"
+"  - le nom d'hôte d'un serveur de bases de données MySQL (qui doit accepter "
+"les connexions TCP de cette machine) ;\n"
+"  - une base de données sur ce serveur ;\n"
+"  - un nom d'utilisateur et un mot de passe pour accéder à cette base de "
+"données.\n"
+"Si vous n'avez pas l'ensemble de ces informations, vous pouvez refuser ici "
+"et continuer avec une journalisation simple dans un fichier ou bien corriger "
+"cela au préalable. Il vous sera toujours possible de mettre en place la "
+"journalisation dans une base de données ultérieurement en reconfigurant le "
+"paquet snort-mysql avec la commande « dpkg-reconfigure snort-mysql »."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid "Snort needs a configured database to log to before it starts."
+msgstr "Base de données existante indispensable pour les journaux"
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>\n"
+"Fill in the correct values for the user, host, and database names. MySQL "
+"will prompt you for the password."
+msgstr ""
+"Snort a besoin d'une base de données configurée pour pouvoir démarrer. "
+"Veuillez créer la structure de base de données APRÈS l'installation du "
+"paquet :\n"
+" cd /usr/share/doc/snort-mysql/\n"
+" zcat create_mysql.gz | mysql -u <utilisateur> -h <hôte> -p <base de "
+"données>\n"
+"Vous devez indiquer les valeurs appropriées pour l'utilisateur, l'hôte et le "
+"nom de la base de données. MySQL vous demandera ensuite le mot de passe."
+
+#. Type: note
+#. Description
+#: ../snort-mysql.templates:12001 ../snort-pgsql.templates:12001
+msgid ""
+"After you created the database structure, you will need to start Snort "
+"manually."
+msgstr ""
+"Après avoir créé la structure de base de données de cette manière, validez "
+"pour continuer."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001
+msgid "Please enter the hostname of the mysql database server to use."
+msgstr "Nom d'hôte du serveur de bases de données MySQL :"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:13001 ../snort-pgsql.templates:13001
+msgid ""
+"Make sure it has been set up correctly to allow incoming connections from "
+"this host!"
+msgstr ""
+"Vérifiez qu'il a été configuré de manière appropriée et qu'il accepte les "
+"connexions entrantes depuis cette machine."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid "Please enter the name of the database to use."
+msgstr "Nom de la base de données :"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:14001 ../snort-pgsql.templates:14001
+msgid ""
+"Make sure this database has been created and your database user has write "
+"access to this database."
+msgstr ""
+"Vérifiez que cette base de données a été créée et que l'utilisateur que vous "
+"indiquez a le droit d'y écrire."
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Please enter the name of the database user you want to use."
+msgstr "Identifiant de connexion pour la base de données :"
+
+#. Type: string
+#. Description
+#: ../snort-mysql.templates:15001 ../snort-pgsql.templates:15001
+msgid "Make sure this user has been created and has write access."
+msgstr ""
+"Vérifiez que cet utilisateur existe et qu'il possède des droits d'écriture "
+"sur la base de données."
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter the password for the database connection."
+msgstr "Mot de passe de connexion à la base de données :"
+
+#. Type: password
+#. Description
+#: ../snort-mysql.templates:16001 ../snort-pgsql.templates:16001
+msgid "Please enter a password to connect to the Snort Alert database."
+msgstr ""
+"Veuillez indiquer un mot de passe pour la connexion à la base de données "
+"pour les alertes de Snort."
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid "Do you want to set up a database for snort-pgsql to log to?"
+msgstr ""
+"Faut-il configurer une base de données pour la journalisation de snort-"
+"pgsql ?"
+
+#. Type: boolean
+#. Description
+#: ../snort-pgsql.templates:11001
+msgid ""
+"You only need to do this the first time you install snort-pgsql. Before you "
+"go on, make sure you have (1) the hostname of a machine running a pgsql "
+"server set up to allow tcp connections from this host, (2) a database on "
+"that server, (3) a username and password to access the database. If you "
+"don't have _all_ of these, either select 'no' and run with regular file "
+"logging support, or fix this first. You can always configure database "
+"logging later, by reconfiguring the snort-pgsql package with 'dpkg-"
+"reconfigure -plow snort-pgsql'"
+msgstr ""
+"Cela ne doit être fait qu'une fois, à l'installation de snort-pgsql. Avant "
+"de continuer, assurez-vous d'avoir :\n"
+"  - le nom d'hôte d'un serveur de bases de données PostgreSQL (qui doit "
+"accepter les connexions TCP de cette machine) ;\n"
+"  - une base de données sur ce serveur ;\n"
+"  - un nom d'utilisateur et un mot de passe pour accéder à cette base de "
+"données.\n"
+"Si vous n'avez pas l'ensemble de ces informations, vous pouvez refuser ici "
+"et continuer avec une journalisation simple dans un fichier ou bien corriger "
+"cela au préalable. Il vous sera toujours possible de mettre en place la "
+"journalisation dans une base de données ultérieurement en reconfigurant le "
+"paquet snort-pgsql avec la commande « dpkg-reconfigure snort-pgsql »."
+
+#. Type: note
+#. Description
+#: ../snort-pgsql.templates:12001
+msgid ""
+"Snort needs a configured database before it can successfully start up. In "
+"order to create the structure you need to run the following commands AFTER "
+"the package is installed:\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>\n"
+"Fill in the correct values for the user, host, and database names. "
+"PostgreSQL will prompt you for the password."
+msgstr ""
+"Snort a besoin d'une base de données configurée pour pouvoir démarrer. "
+"Veuillez créer la structure de base de données APRÈS l'installation du "
+"paquet :\n"
+" cd /usr/share/doc/snort-pgsql/\n"
+" zcat create_pgsql.gz | psql -U <utilisateur> -h <hôte> -W <base de "
+"données>\n"
+"Vous devez indiquer les valeurs appropriées pour l'utilisateur, l'hôte et le "
+"nom de la base de données. PostgreSQL vous demandera ensuite le mot de passe."
+
+#. Type: string
+#. Description
+#: ../snort-pgsql.templates:13001
+msgid "Please enter the hostname of the pgsql database server to use."
+msgstr "Nom d'hôte du serveur de bases de données PostgreSQL :"
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid "Your configuration file is deprecated"
+msgstr "Fichier de configuration obsolète"
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"Your Snort configuration file (/etc/snort/snort.conf) uses deprecated "
+"options no longer available for this Snort release.  Snort will not be able "
+"to start unless you provide a correct configuration file. You can substitute "
+"your configuration file with the one provided in this package or fix it "
+"manually by removing deprecated options."
+msgstr ""
+"Votre fichier de configuration pour Snort (/etc/snort/snort.conf) utilise "
+"des options qui ne sont plus disponibles dans cette version du logiciel. "
+"Snort ne pourra pas démarrer tant que le fichier de configuration ne sera "
+"pas corrigé. Vous pouvez remplacer ce fichier par celui fourni avec ce "
+"paquet ou le corriger vous-même pour supprimer les options obsolètes."
+
+#. Type: note
+#. Description
+#: ../snort-common.templates:1001
+msgid ""
+"The following deprecated options were found in your configuration file: "
+"${DEP_CONFIG}"
+msgstr ""
+"Liste des options obsolètes dans votre fichier de configuration : "
+"${DEP_CONFIG}."
+
+#~ msgid ""
+#~ "Your system has an obsolete configuration file  (/etc/snort/snort.common."
+#~ "parameters) which has been automatically converted into the new "
+#~ "configuration file format (at /etc/default/snort). Please review the new "
+#~ "configuration and remove the obsolete one. Until you do this, the init.d "
+#~ "script will not use the new configuration and you will not take advantage "
+#~ "of the benefits introduced in newer releases."
+#~ msgstr ""
+#~ "Votre système utilise un fichier de configuration obsolète (/etc/snort/"
+#~ "snort.common.parameters) qui a été automatiquement converti vers le "
+#~ "nouveau format (dans /etc/default/snort). Veuillez vérifier le nouveau "
+#~ "fichier de configuration et supprimer l'ancien. Tant que cela n'aura pas "
+#~ "été fait, le script de démarrage n'utilisera pas la nouvelle "
+#~ "configuration et vous ne bénéficierez pas des améliorations des versions "
+#~ "plus récentes. "
--- snort-2.3.3.orig/debian/snort-mysql.postinst
+++ snort-2.3.3/debian/snort-mysql.postinst
@@ -0,0 +1,251 @@
+#!/bin/sh -e
+
+CONFIG=/etc/snort/snort.debian.conf
+
+. /usr/share/debconf/confmodule
+test $DEBIAN_SCRIPT_DEBUG && set -v -x
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    install)
+	;;
+    upgrade)
+	db_get snort-mysql/startup || true
+	if [ "$RET" = "manual" ]; then
+		#db_fset snort-mysql/please_restart_manually seen false
+		db_beginblock
+		db_input high snort-mysql/please_restart_manually || true
+		db_endblock
+		db_go
+		db_stop
+	fi
+	;;
+    configure)
+	# edit config file
+	db_get snort-mysql/startup || true; 		STARTUP=$RET
+	db_get snort-mysql/interface || true; 	INTERFACE="$RET"
+	db_get snort-mysql/address_range || true;	ADDRESS_RANGE="$RET"
+	db_get snort-mysql/disable_promiscuous || true; DISABLE_PROMISCUOUS=$RET
+	db_get snort-mysql/reverse_order || true;	REVERSE_ORDER=$RET
+        db_get snort-mysql/send_stats || true;        STATS_SEND="$RET"
+	db_get snort-mysql/stats_rcpt || true;	STATS_RCPT="$RET"
+	db_get snort-mysql/stats_treshold || true;	STATS_THRESHOLD="$RET"
+	db_get snort-mysql/options || true;		OPTIONS="$RET"
+
+	test "$DISABLE_PROMISCUOUS" = "true" && OPTIONS="$OPTIONS -p"
+	test "$REVERSE_ORDER" = "true" && OPTIONS="$OPTIONS -o"
+	# Failsafe in case the values above are blank (jfs)
+	[ -z "$STATS_RCPT" ] && STATS_RCPT=root
+	[ -z "$STATS_THRESHOLD" ] && STATS_THRESHOLD=1
+	#STATS_RCPT=`echo "$STATS_RCPT" | sed -e 's/@/\\\\@/g' -e 's/,/\\\\,/g'`
+
+	cat <<EOF >$CONFIG
+# This file is used for options that are changed by Debian to leave
+# the original lib files untouched.
+# You have to use "dpkg-reconfigure snort" to change them.
+
+DEBIAN_SNORT_STARTUP="$STARTUP"
+DEBIAN_SNORT_HOME_NET="$ADDRESS_RANGE"
+DEBIAN_SNORT_OPTIONS="$OPTIONS"
+DEBIAN_SNORT_INTERFACE="$INTERFACE"
+DEBIAN_SNORT_SEND_STATS="$STATS_SEND"
+DEBIAN_SNORT_STATS_RCPT="$STATS_RCPT"
+DEBIAN_SNORT_STATS_THRESHOLD="$STATS_THRESHOLD"
+EOF
+
+	if [ -f /etc/snort/snort.conf ]; then
+		# insert database config stuff in the configuration file,
+		# or configure it for syslog-logging.
+		db_get snort-mysql/configure_db
+		if  [ "$RET" = "true" ]; then
+			db_get snort-mysql/db_host || true; DB_HOST=$RET
+			db_get snort-mysql/db_database || true; DB_DATABASE=$RET
+			db_get snort-mysql/db_user || true; DB_USER=$RET
+			db_get snort-mysql/db_pass || true; DB_PASS=$RET
+
+			# Here we put the database stuff in the config file.
+			TEMPFILE=`mktemp`
+			cat /etc/snort/snort.conf | while read LINE
+			do
+				if [ "$LINE" = "# (#DBSTART#)" ]
+				then
+					echo "# (#DBSTART#)" >> $TEMPFILE
+					echo -n "output database: log, mysql, " >> $TEMPFILE
+					if [ $DB_USER ]
+					then
+						echo -n "user=$DB_USER " >> $TEMPFILE
+					fi
+					if [ $DB_PASS ]
+					then
+						echo -n "password=$DB_PASS " >> $TEMPFILE
+					fi
+					if [ $DB_DATABASE ]
+					then
+						echo -n "dbname=$DB_DATABASE " >> $TEMPFILE
+					fi
+					if [ $DB_HOST ]
+					then
+						echo -n "host=$DB_HOST " >> $TEMPFILE
+					fi
+					echo " " >> $TEMPFILE
+					echo "# (#DBEND#)" >> $TEMPFILE
+					break
+				else
+					echo $LINE >> $TEMPFILE
+				fi
+			done
+
+			WRITE=0
+			cat /etc/snort/snort.conf | while read LINE
+			do
+				if [ $WRITE -eq 1 ]
+				then
+					echo $LINE >> $TEMPFILE
+				fi
+
+				if [ "$LINE" = "# (#DBEND#)" ]
+				then
+					WRITE=1
+				fi
+			done
+			mv -f $TEMPFILE /etc/snort/snort.conf
+		fi
+
+		# Ensure the config file is readable by root.root and mode 600
+		if ! dpkg-statoverride --list /etc/snort/snort.conf >/dev/null
+		then
+			chown root:snort /etc/snort/snort.conf
+			chmod 640 /etc/snort/snort.conf
+		fi
+	fi
+
+	db_stop
+
+	# Check for left-over files from woody packages.
+	OLDCONF=/etc/snort/snort.rules.conf
+	if [ -f $OLDCONF ]; then
+		mv $OLDCONF $OLDCONF.OBSOLETE
+	fi
+
+	# Update the rc.d's
+	update-rc.d snort defaults >/dev/null
+
+	# in the case we reconfigure we have to restart and not just to start.
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+		invoke-rc.d snort stop || true
+	else
+		/etc/init.d/snort stop || true
+	fi
+	;;
+    abort-upgrade)
+	;;
+    *)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 0
+	;;
+esac
+
+if [ "$STARTUP" = "dialup" ]; then
+
+	# Try to guess environments for all pppds we have no .env for...
+	for PPPD_PID in $(pidof pppd ipppd); do
+		# If we got an empty PID (however), we break here
+		test "$PPPD_PID" || continue
+
+		#
+		# This is a lot of shell voodoo, let's try to figure it out:
+		# 1. egrep:
+		#    It greps for our current pppd PID in all pppd and ipppd
+		#    pidfiles.
+		#    It *should* return exactly one file name: the one with
+		#    our current pppd PID in it; however, to be safe, we fence
+		#    it with a head -1.
+		# 2. basename $(egrep ...) .pid:
+		#    It takes the file name from the egrep and strips off its
+		#    path and the .pid suffix
+		# 3. sed:
+		#    Unfortunately the filenames of pppd and ipppd differ:
+		#    pppd uses $INTERFACE.pid, while ipppd uses
+		#    ipppd.$INTERFACE.pid.
+		#    The .pid is already stripped off by basename, thus, we
+		#    just strip off any "ipppd." prefix and end up in the
+		#    plain interface name.
+		#    Maybe pppd decides to change it's pidfile naming
+		#    convention according to ipppd somewhere in the future,
+		#    thus, we use '^i\?pppd\.' (sed eregex) and thus strip
+		#    off all "ipppd." and all "pppd." prefixes. This doesn't
+		#    harm anyways.
+		#    Because of the pppd pidfile naming convention, our
+		#    approach works always with ipppd and mostly with pppd:
+		#    the latter only, if the user did not decide to rename
+		#    his ppp interface to something else than ppp*
+		#    (not possible currently, afaics).
+		#
+		PPP_IFACE=$(basename $(egrep -l "^[[:space:]]*$PPPD_PID[[:space:]]*\$" /var/run/ppp*.pid /var/run/ipppd.*.pid 2> /dev/null | head -1) .pid | sed -e 's/^i\?pppd\.//')
+
+		#
+		# If we got no interface from pidfiles (because there are no
+		# pidfiles, for example), we assume the most common case:
+		# one pppd with default route set.
+		# This is ugly, but there is no other chance. Let's hope,
+		# nobody ever manages multiple pppds without pidfiles for
+		# them.
+		#
+		test "$PPP_IFACE" || PPP_IFACE=$(route -n |	awk '/^0\.0\.0\.0 / { print $8 }')
+
+		# If we couldn't discover an interface name, we break here
+		test "$PPP_IFACE" || continue
+
+		PPP_LOCAL=$(ifconfig $PPP_IFACE | awk '/inet addr:/ { gsub("addr:", ""); print $2 }')
+
+		# If we couldn't discover a local IP, we break here
+		test "$PPP_LOCAL" || continue
+
+		ENVFILE=/var/run/snort_$PPP_IFACE.env
+
+		# If we already have an .env for that interface, we break here
+		test -e "$ENVFILE" && continue
+
+		# Write .env for that interface
+		echo "Creating missing $ENVFILE"
+		echo "PPPD_PID=$PPPD_PID"    > "$ENVFILE"
+		echo "PPP_IFACE=$PPP_IFACE" >> "$ENVFILE"
+		echo "PPP_LOCAL=$PPP_LOCAL" >> "$ENVFILE"
+
+		# If such a snort is still running, just kill it
+		ps -ef | grep /usr/sbin/snort | grep "$PPP_LOCAL" |
+			grep "$PPP_IFACE" | awk '{ print $2 }' |
+			xargs --no-run-if-empty kill -s KILL >/dev/null
+	done
+fi
+
+if [ "$STARTUP" = "boot" ] || [ "$STARTUP" = "dialup" ]; then
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+		invoke-rc.d snort start || true
+	else
+		/etc/init.d/snort start || true
+	fi
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- snort-2.3.3.orig/debian/copyright
+++ snort-2.3.3/debian/copyright
@@ -0,0 +1,28 @@
+This package was adopted by Sander Smeenk <ssmeenk@debian.org>
+Tue,  4 Jun 2002 21:56:15 +0200
+
+This package was debianized by Robert van der Meulen <rvdm@debian.org>
+Sun Feb  4 17:20:36 CET 2001.
+
+It was downloaded from http://www.snort.org/
+
+Upstream Author: Martin Roesch <roesch@clark.net>
+
+Copyright:
+
+   This package 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; version 2 dated June, 1991.
+
+   This package 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 package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA  02110-1301  USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- snort-2.3.3.orig/debian/CVS/Repository
+++ snort-2.3.3/debian/CVS/Repository
@@ -0,0 +1 @@
+snort/debian
--- snort-2.3.3.orig/debian/CVS/Entries
+++ snort-2.3.3/debian/CVS/Entries
@@ -0,0 +1,51 @@
+/README.Debian/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/README.Maintainer/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/chown/1.1.1.1/Fri Aug 22 11:01:25 2003//
+/copyright/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/rules/1.5/Sun Aug 24 11:07:51 2003//
+/snort-common.conffiles/1.1.1.1/Fri Aug 22 11:01:25 2003//
+/snort-common.dirs/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-doc.dirs/1.1.1.1/Fri Aug 22 11:01:25 2003//
+/snort-doc.doc-base.manual/1.1.1.1/Fri Aug 22 11:01:25 2003//
+/snort-doc.doc-base.paper/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-doc.docs/1.1.1.1/Fri Aug 22 11:01:25 2003//
+/snort-mysql.conffiles/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-mysql.config/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-mysql.dirs/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-mysql.preinst/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-mysql.prerm/1.1.1.1/Fri Aug 22 11:01:25 2003//
+/snort-mysql.templates/1.2/Sun Aug 24 09:35:27 2003//
+/snort-pgsql.conffiles/1.1.1.1/Fri Aug 22 11:01:25 2003//
+/snort-pgsql.config/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-pgsql.dirs/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-pgsql.preinst/1.1.1.1/Fri Aug 22 11:01:25 2003//
+/snort-pgsql.prerm/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-pgsql.templates/1.2/Sun Aug 24 09:35:27 2003//
+/snort-rules-default.conffiles/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-rules-default.dirs/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-rules-default.preinst/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort-stat.8/1.1.1.1/Fri Aug 22 11:01:25 2003//
+/snort.conffiles/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort.config/1.1.1.1/Fri Aug 22 11:01:25 2003//
+/snort.cron.daily/1.2/Sun Aug 24 12:57:48 2003//
+/snort.debian.conf/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort.dirs/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort.docs/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort.examples/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort.logrotate/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort.preinst/1.1.1.1/Fri Aug 22 11:01:25 2003//
+/snort.prerm/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort.snort/1.1.1.1/Fri Aug 22 11:01:26 2003//
+/snort.templates/1.2/Sun Aug 24 09:35:27 2003//
+D/my////
+D/po////
+/control/1.4/Mon Sep  8 17:39:19 2003//
+/snort-mysql.postinst/1.3/Mon Sep  8 17:39:19 2003//
+/snort-mysql.postrm/1.2/Mon Sep  8 17:39:19 2003//
+/snort-pgsql.postinst/1.2/Mon Sep  8 17:39:19 2003//
+/snort-pgsql.postrm/1.2/Mon Sep  8 17:39:19 2003//
+/snort-rules-default.postrm/1.1/Wed Aug 27 07:54:23 2003//
+/snort.postinst/1.2/Mon Sep  8 17:39:19 2003//
+/snort.postrm/1.2/Mon Sep  8 17:39:19 2003//
+/changelog/1.7/Mon Sep  8 19:18:39 2003//
+/snort.init.d/1.4/Mon Sep  8 22:04:19 2003//
--- snort-2.3.3.orig/debian/CVS/Root
+++ snort-2.3.3/debian/CVS/Root
@@ -0,0 +1 @@
+:ext:ssmeenk@cvs.alioth.debian.org:/cvsroot/pkg-snort
--- snort-2.3.3.orig/debian/snort-rules-default.preinst
+++ snort-2.3.3/debian/snort-rules-default.preinst
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# Preinst for snort-common-rules, currently only handles
+# migration from old /etc/snort to new /etc/snort setup
+#
+
+check_md5() {
+# if the MD5sum matches the user has not modified it, remove it
+# if it does not match then just move it to the new location
+    [ ! -f "$1" ] && return 1
+    [ -z "$2" ] && return 1
+    if md5sum $1 2>/dev/null |grep -q $2; then
+    	    echo "Removing $1 since it has not been changed"
+            rm -f $1
+    else
+    # Optionally move to a directory
+    	    if [ -n "$3" ] && [ -d "$3" ] ; then
+	    	    echo "Moving $1 to $3"
+    		    mv $1 $3
+	    fi
+    fi
+}
+
+
+if [ ! -d /etc/snort/rules ]
+then
+	mkdir -p /etc/snort/rules
+	chown root:root /etc/snort/rules
+	chmod 755 /etc/snort/rules
+fi
+
+case "$1" in
+    install|upgrade)
+        if [ "x$2" != "x" ] ; then
+            if dpkg --compare-versions $2 lt 1.9.0beta4-1 ; then
+		if [ ! -z "`ls /etc/snort/*.rules 2>/dev/null | head -1`" ]
+		then
+			echo "Checking if old rulefiles have been changed"
+			echo "
+3bc265bef3ff5fc675f9f1acf8ea6390  attack-responses.rules
+3bc265bef3ff5fc675f9f1acf8ea6390  attack-responses.rules
+c20eb0f3f140b7659ebd37f2e3553f2d  backdoor.rules
+08b710276367c03fcd26d1b3512a870d  bad-traffic.rules
+48683f29e6452e4e43f1af004f537485  ddos.rules
+f605e07289ace0adc279aa46225834a5  dns.rules
+b231ab5af973df5f06201f16be8a37ff  dos.rules
+31788f18caaed776f021e5029bdd6757  exploit.rules
+3f0c90491298edd0dfc37a6afc9ffac6  finger.rules
+a2f2068460b622a85624b664d9108b36  ftp.rules
+c580f094d32435915f893c2661fb73dc  icmp-info.rules
+3abbb384dd222225560ec87b324b63ce  icmp.rules
+9159fed0eda9c16245f4c6edb94c0d7c  info.rules
+8005f28d5e2400c474a7b765029eefb5  local.rules
+8204b5ce028496bca3f95a06dfca10b9  misc.rules
+f63f7c3c9a9f627521b0dcce1e134f1f  netbios.rules
+fe402fc3c9e795ea22af59be84683be5  policy.rules
+00b1e66fe86b46bf94460320ca71d972  porn.rules
+c23be32425937a87219ccd0ee4f85813  rpc.rules
+82a173d9144a11ea1e686fcec730549a  rservices.rules
+c9dd621a43c896dde6dd2da09575897f  scan.rules
+55a0e660ea08c314cf4d5c19f7973f83  shellcode.rules
+b304d4b570e94112d6b025d6a55007c1  smtp.rules
+ccff2e48615eb7d27466b26a9dd66b66  sql.rules
+f68e3bee2ab97ce729f20a0f4751ca04  telnet.rules
+a263d7e4526e8012aafd9daf62690519  tftp.rules
+2abd1c03364a8a1c01650764cf2af2f1  virus.rules
+fe239ae24a682d3d47251c28689fc9ec  web-attacks.rules
+2e99d333c4ab20bfd3f5694915b6d591  web-cgi.rules
+3051d9dda0ed859487580733b2a318d2  web-coldfusion.rules
+b7fc9e8371d04b5ec203651c15135657  web-frontpage.rules
+e7100df55b15a262f45d0a2940594d1f  web-iis.rules
+028a217dbdc67fea026a1f7c3dd6560b  web-misc.rules
+6e85b6a55b84bffc29fd58b8e6747b65  x11.rules
+c20eb0f3f140b7659ebd37f2e3553f2d  backdoor.rules
+08b710276367c03fcd26d1b3512a870d  bad-traffic.rules
+48683f29e6452e4e43f1af004f537485  ddos.rules
+f605e07289ace0adc279aa46225834a5  dns.rules
+b231ab5af973df5f06201f16be8a37ff  dos.rules
+31788f18caaed776f021e5029bdd6757  exploit.rules
+3f0c90491298edd0dfc37a6afc9ffac6  finger.rules
+a2f2068460b622a85624b664d9108b36  ftp.rules
+c580f094d32435915f893c2661fb73dc  icmp-info.rules
+3abbb384dd222225560ec87b324b63ce  icmp.rules
+9159fed0eda9c16245f4c6edb94c0d7c  info.rules
+8005f28d5e2400c474a7b765029eefb5  local.rules
+8204b5ce028496bca3f95a06dfca10b9  misc.rules
+f63f7c3c9a9f627521b0dcce1e134f1f  netbios.rules
+fe402fc3c9e795ea22af59be84683be5  policy.rules
+00b1e66fe86b46bf94460320ca71d972  porn.rules
+c23be32425937a87219ccd0ee4f85813  rpc.rules
+82a173d9144a11ea1e686fcec730549a  rservices.rules
+c9dd621a43c896dde6dd2da09575897f  scan.rules
+55a0e660ea08c314cf4d5c19f7973f83  shellcode.rules
+b304d4b570e94112d6b025d6a55007c1  smtp.rules
+ccff2e48615eb7d27466b26a9dd66b66  sql.rules
+f68e3bee2ab97ce729f20a0f4751ca04  telnet.rules
+a263d7e4526e8012aafd9daf62690519  tftp.rules
+2abd1c03364a8a1c01650764cf2af2f1  virus.rules
+fe239ae24a682d3d47251c28689fc9ec  web-attacks.rules
+2e99d333c4ab20bfd3f5694915b6d591  web-cgi.rules
+3051d9dda0ed859487580733b2a318d2  web-coldfusion.rules
+b7fc9e8371d04b5ec203651c15135657  web-frontpage.rules
+e7100df55b15a262f45d0a2940594d1f  web-iis.rules
+028a217dbdc67fea026a1f7c3dd6560b  web-misc.rules
+6e85b6a55b84bffc29fd58b8e6747b65  x11.rules 
+" |
+			while read md5sum file ; do
+				check_md5 /etc/snort/$file $md5sum /etc/snort/rules/
+			done
+			echo "Finished check of old rulefiles"
+			# Classification config modified?
+			check_md5 /etc/snort/classification.config 183a351fc8c3a60ed9fbbb8194e4eda1
+		fi
+            fi
+        fi
+    ;;
+    abort-upgrade)
+    ;;
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+
+#DEBHELPER#
--- snort-2.3.3.orig/debian/snort-pgsql.dirs
+++ snort-2.3.3/debian/snort-pgsql.dirs
@@ -0,0 +1,11 @@
+etc/cron.daily
+etc/init.d
+etc/logrotate.d
+etc/default
+etc/ppp/ip-down.d
+etc/ppp/ip-up.d
+etc/snort
+usr/sbin
+usr/share/doc/snort
+usr/share/man/man8
+var/log/snort
--- snort-2.3.3.orig/debian/snort-pgsql.manpages
+++ snort-2.3.3/debian/snort-pgsql.manpages
@@ -0,0 +1 @@
+snort.8
--- snort-2.3.3.orig/debian/snort-pgsql.prerm
+++ snort-2.3.3/debian/snort-pgsql.prerm
@@ -0,0 +1,52 @@
+#! /bin/sh
+# prerm script for snort
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+
+case "$1" in
+    remove|upgrade|deconfigure)
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+		invoke-rc.d snort stop || true
+	else
+		/etc/init.d/snort stop || true
+	fi
+	;;
+    failed-upgrade)
+	;;
+    *)
+	echo "prerm called with unknown argument \`$1'" >&2
+	exit 0
+	;;
+esac
+
+# no matter if dialup, manual or boot modus!
+#if [ -x /usr/sbin/invoke-rc.d ]; then
+#	invoke-rc.d snort stop || true
+#else
+#	/etc/init.d/snort stop || true
+#fi
+# this used to be done with /etc/init.d/snort.
+# Older versions of snort just kill every process with 'snort' in the
+# name, so also 'snort.prerm'. This fixes that. 
+ps cax | grep ' snort$' | awk '{print $1}' |
+	xargs --no-run-if-empty kill -s KILL >/dev/null
+rm -f /var/run/snort_*.pid
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- snort-2.3.3.orig/debian/snort.logrotate
+++ snort-2.3.3/debian/snort.logrotate
@@ -0,0 +1,12 @@
+/var/log/snort/portscan.log /var/log/snort/alert /var/log/snort/portscan2.log {
+    daily
+    rotate 7
+    compress
+    missingok
+    notifempty
+    create 0640 snort adm
+    sharedscripts
+    postrotate
+        /etc/init.d/snort restart > /dev/null 2>&1
+    endscript
+}
--- snort-2.3.3.orig/debian/README.Debian
+++ snort-2.3.3/debian/README.Debian
@@ -0,0 +1,151 @@
+
+ SNORT WITH DATABASE SUPPORT
+------------------------------
+ If you are using snort-pgsql or snort-mysql please notice that you have
+ to create the database structure right after installing the package
+ and start Snort manually.
+
+ In order to create the database structure do:
+
+ - if using PostgreSQL
+   $ cd /usr/share/doc/snort-pgsql/
+   $  zcat create_postgresql.gz | psql -U <user> -h <host> -W <databasename>
+
+ - if using MySQL
+   $ cd /usr/share/doc/snort-mysql/
+   $ zcat create_mysql.gz | mysql -u <user> -h <host> -p <databasename>
+
+ In either case fill in the correct values for the user, host, and 
+ database names. Depending on the user priviledges set on the database
+ you can use the same user that Snort will use to access the
+ database or an admin user. In either case, the user you use should
+ have priviledges to create tables and indexes. Once created you have
+ to grant the user your configured in Debconf so that it has priviledges
+ over the tables created through the schema.
+
+ Once you have setup the database, you will need to start Snort manually
+ since it was left unstarted after the installation. To do this
+ remove the file '/etc/snort/db-pending-config' and then
+ do '/etc/init.d/snort start'. Confirm that snort is working and up
+ by running '/etc/init.d/snort status' and reviewing the messages in
+ the /var/log/daemon.log syslog file.
+
+ SNORT ON MULTIPLE INTERFACES
+------------------------------
+
+This package of snort is capable of managing multiple interfaces.  The
+current init.d script is capable of launching more than one snort
+instance. You just need to answer the debconf question "On which
+interface(s) should snort listen on" with a list (separated by spaces
+of interafes you want to use). This actually modifies the value of 
+DEBIAN_SNORT_INTERFACE definition in /etc/snort/snort.debian.conf.
+
+Afterwards, you need to create different
+/etc/snort/snort.$INTERFACE.conf configuration files (where $INTERFACE
+is your interface names, e.g., eth0 or eth1) for each interface you
+want Snort to listen on. All sensors can use the same rule set so it's
+easy to update them and all your sensors simultaneously. If no
+/etc/snort/snort.$INTERFACE.conf file exists for a given interface,
+then the regular /etc/snort/snort.conf file is used.
+
+Notice, however, that the same HOME_NET definition will be used for
+all interfaces (the answer to the "address range snort will listen
+on"). The debconf scripts don't currently support a way to give
+different HOME_NET definitions to different interfaces.
+
+This is still work in progress. Please file bugs to the snort package.
+
+-----------------------------------------------------------------------------
+
+ DATABASE CHANGES
+------------------
+
+The database layout has changed a bit since 1.9.0beta4:
+
+         - DB schema v106
+         - Added the sensor.last_cid field to the schema so the
+           database can store the last used cid for a given sensor.
+           This field will ensure that a cid will never be reused.
+
+           Upgrading from v105 -> v106 is as simple as:
+
+           mysql> ALTER TABLE sensor ADD last_cid INT UNSIGNED NOT NULL;
+           mysql> UPDATE schema SET vseq=106;
+
+            psql> ALTER TABLE sensor ADD last_cid INT8;
+            psql> UPDATE schema SET vseq=106;
+
+-----------------------------------------------------------------------------
+
+ FREQUENT QUESTIONS AND ANSWERS
+---------------------------------
+
+Q.  I want to use FLEXRESP rules, but snort won't start with those rules
+    enabled! What is wrong, what should I do?
+A.	FLEXRESP rules need root-priviledges to access raw ethernet interface.
+    To resolve this, start snort as root.
+
+Q0. I can reconfigure snort as often as I want but it won't ask me any
+    questions!
+A0. You are probably victim of a bug in an older version of debconf. Just do:
+    dpkg-reconfigure --priority=low debconf; dpkg-reconfigure snort
+
+Q1. How can I test snort without having an ethernet card or a connection
+    to other computers ?
+A1. You have to use routing between two dummy devices:
+    # modprobe -a dummy    (The dummy device has to be build by the kernel)
+    # ifconfig dummy0   192.168.0.1
+    # ifconfig dummy0:0 192.168.0.2
+    # telnet 192.168.0.3 12345
+
+    It's important that the second IP is on the same interface and not
+    e.g. dummy1 or dummy2 and that the IP you try to access is *not* one
+    of those you put on the interfaces. Use snort's ability to hear in
+    promiscuous mode on an IP address range. (HOMEDIR=192.168.0.0/16)
+
+Q2. I saw that syslog logging is enabled, but I can't see any warnings in
+    /var/log/syslog ?
+A2. That's because /etc/syslog.conf directs every output for the syslog
+    facility LOG_AUTH to the /var/log/auth.log file. You can still find
+    detail information about every logged scan in /var/log/snort/.
+
+Q3. You told me about the files in /var/log/snort, but I can't read them!
+A3. For performance reasons they are logged in tcpdump-binary format. You 
+    can read them with "tcpdump -r /var/log/snort/snort.log" or 
+	mkdir /tmp/dir
+    	cd /etc/snort
+	. snort.conf
+	snort -r /var/log/snort/snort.log \
+		-S "HOME_NET=$DEBIAN_SNORT_HOME_NET" \
+		-c /etc/snort/snort.conf-lib \
+		-l /tmp/dir
+    The "-l /tmp/dir" creates the files in the /tmp/dir directory which MUST
+    be existing. You can use -s instead for logging to /var/log/auth.log.
+    
+Q4. It seems you disabled some checks and modified snort-lib, why?
+A4. Because they either generated too many false positives or generate too 
+    much noise for harmless things like traceroutes or nmap fingerprint 
+    attempts. These modifications are marked by a leading #debian#.
+    For more information see /usr/share/doc/snort/README.Maintainer.
+
+Q5. How can I update my rule database with the Debian packages? 
+    (Hint: I'm running stable)
+A5. Signature updates are provided by the snort-rules-default package but
+    if you are using stable, you will not see any changes in that package
+    since they are not allowed for stable releases. If you want to keep
+    your ruleset up-to-date you have two options:
+
+    	- Use the snort-rules-default from the unstable distribution, this
+	  might work as long as it does not belong to a different Snort
+	  release since in between releases snort rules might be updated
+	  in such a way that they are not backwards compatible.
+	- Use a script to manage rule updates, such as 'oinkmaster' (currently
+	  provided as a Debian package) or 'updateSnort'
+	- Use a backported version of Snort which includes these signatures.
+
+   Always make sure that your new rules will be loaded fine by the sensor
+   by using 'snort -T' 
+
+   See also upstreams Snort FAQ item 3.18
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>, Wed Dec  1 17:01:30 2004
--- snort-2.3.3.orig/debian/snort-mysql.preinst
+++ snort-2.3.3/debian/snort-mysql.preinst
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+
+DEFAULT=/etc/default/snort
+PARAMETERS=/etc/snort/snort.common.parameters
+
+check_parameters() {
+# Check if the old parameters file is there and this is
+# an upgrade (default is not)
+	# Abort if either the old parameters file does not exist
+	# or if the new default has already been installed
+	[ ! -r "$PARAMETERS" ] && return 
+	[ -r "$DEFAULT" ] && return 
+	
+	# Extract our values from there
+	logdir=`cat $PARAMETERS | perl -ne 'print $1 if /-l\s+([\w\/]+)/'`
+	user_snort=`cat $PARAMETERS | perl -ne 'print $1 if /-u\s+(\w+)/'`
+	group_snort=`cat $PARAMETERS | perl -ne 'print $1 if /-g\s+(\w+)/'`
+	extraparms=`cat $PARAMETERS  | sed -e 's/-l[[:space:]]\+[\/[:alnum:]]\+[[:space:]]\+//g; s/-u[[:space:]]\+[[:alnum:]]\+[[:space:]]*//g; s/-g[[:space:]]\+[[:alnum:]]\+[[:space:]]*//g;'`
+	echo "Creating new $DEFAULT configuration based on $PARAMETERS"
+	cat <<EOF >$DEFAULT
+# Parameters for the daemon
+PARAMS="$extraparms"
+# Logging directory
+LOGDIR="$logdir"
+# Snort user
+SNORTUSER="$user_snort"
+# Snort group
+SNORTGROUP="$group_snort"
+EOF
+	return
+}
+
+case "$1" in
+    install|upgrade)
+
+	check_parameters
+	[ -r "$DEFAULT" ] && . $DEFAULT
+	# Sane defaults, just in case
+	[ -z "$SNORTUSER" ] && SNORTUSER=snort
+	[ -z "$SNORTGROUP" ] && SNORTGROUP=snort
+	[ -z "$LOGDIR" ] && LOGDIR=/var/log/snort
+
+	# create snort user to avoid running snort as root
+	# 1. create group if not existing
+	if ! getent group | grep -q "^$SNORTGROUP:" ; then
+		addgroup --quiet --system $SNORTGROUP 2>/dev/null || true
+	fi
+	# 2. create homedir if not existing
+	test -d $LOGDIR || mkdir $LOGDIR
+	# 3. create user if not existing
+	if ! getent passwd | grep -q "^$SNORTUSER:"; then
+	adduser --quiet \
+	        --system \
+		--ingroup $SNORTGROUP \
+		--no-create-home \
+		--disabled-password \
+		$SNORTUSER 2>/dev/null || true
+	fi
+	# 4. adjust passwd entry
+	usermod -c "Snort IDS" \
+		-d $LOGDIR \
+		-g $SNORTGROUP \
+		$SNORTUSER
+	# 5. adjust file and directory permissions
+	if ! dpkg-statoverride --list $LOGDIR >/dev/null
+	then
+		chown -R $SNORTUSER:adm $LOGDIR
+		chmod u=rwx,g=rxs,o= $LOGDIR
+	fi
+		
+	# setup /etc/snort
+	test -d /etc/snort || mkdir /etc/snort
+
+	# move config file to new location
+	if [ -e /etc/snort.conf ]; then
+	    mv /etc/snort.conf /etc/snort/snort.conf
+	fi
+
+	# rename probably existing cron job with old name
+	if [ -e /etc/cron.daily/snort ]; then
+	    mv /etc/cron.daily/snort /etc/cron.daily/5snort
+	fi
+
+	# If this is the first time we are installation then create
+	# the /etc/snort/db-pending-config
+	if [ "$1" = "install" ] && [ -z "$2" ] ; then
+	touch /etc/snort/db-pending-config
+	fi
+
+    ;;
+    configure)
+    ;;
+    abort-upgrade)
+    ;;
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- snort-2.3.3.orig/debian/snort-pgsql.postinst
+++ snort-2.3.3/debian/snort-pgsql.postinst
@@ -0,0 +1,253 @@
+#!/bin/sh -e
+
+CONFIG=/etc/snort/snort.debian.conf
+
+. /usr/share/debconf/confmodule
+test $DEBIAN_SCRIPT_DEBUG && set -v -x
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    install)
+	;;
+    upgrade)
+	db_get snort-pgsql/startup || true
+	if [ "$RET" = "manual" ]; then
+		#db_fset snort-pgsql/please_restart_manually seen false
+		db_beginblock
+		db_input high snort-pgsql/please_restart_manually || true
+		db_endblock
+		db_go
+		db_stop
+	fi
+	;;
+    configure)
+	# edit config file
+	db_get snort-pgsql/startup || true; 		STARTUP=$RET
+	db_get snort-pgsql/interface || true; 	INTERFACE="$RET"
+	db_get snort-pgsql/address_range || true;	ADDRESS_RANGE="$RET"
+	db_get snort-pgsql/disable_promiscuous || true; DISABLE_PROMISCUOUS=$RET
+	db_get snort-pgsql/reverse_order || true;	REVERSE_ORDER=$RET
+        db_get snort-pgsql/send_stats || true;        STATS_SEND="$RET"
+	db_get snort-pgsql/stats_rcpt || true;	STATS_RCPT="$RET"
+	db_get snort-pgsql/stats_treshold || true;	STATS_THRESHOLD="$RET"
+	db_get snort-pgsql/options || true;		OPTIONS="$RET"
+
+	test "$DISABLE_PROMISCUOUS" = "true" && OPTIONS="$OPTIONS -p"
+	test "$REVERSE_ORDER" = "true" && OPTIONS="$OPTIONS -o"
+	# Failsafe in case the values above are blank (jfs)
+	[ -z "$STATS_RCPT" ] && STATS_RCPT=root
+	[ -z "$STATS_THRESHOLD" ] && STATS_THRESHOLD=1
+	#STATS_RCPT=`echo "$STATS_RCPT" | sed -e 's/@/\\\\@/g' -e 's/,/\\\\,/g'`
+
+	cat <<EOF >$CONFIG
+# This file is used for options that are changed by Debian to leave
+# the original lib files untouched.
+# You have to use "dpkg-reconfigure snort" to change them.
+
+DEBIAN_SNORT_STARTUP="$STARTUP"
+DEBIAN_SNORT_HOME_NET="$ADDRESS_RANGE"
+DEBIAN_SNORT_OPTIONS="$OPTIONS"
+DEBIAN_SNORT_INTERFACE="$INTERFACE"
+DEBIAN_SNORT_SEND_STATS="$STATS_SEND"
+DEBIAN_SNORT_STATS_RCPT="$STATS_RCPT"
+DEBIAN_SNORT_STATS_THRESHOLD="$STATS_THRESHOLD"
+EOF
+
+	if [ -f /etc/snort/snort.conf ]; then
+		# insert database config stuff in the configuration file,
+		# or configure it for syslog-logging.
+		db_get snort-pgsql/configure_db
+		if  [ "$RET" = "true" ]; then
+			db_get snort-pgsql/db_host || true; DB_HOST=$RET
+			db_get snort-pgsql/db_database || true; DB_DATABASE=$RET
+			db_get snort-pgsql/db_user || true; DB_USER=$RET
+			db_get snort-pgsql/db_pass || true; DB_PASS=$RET
+
+			# Here we put the database stuff in the config file.
+			TEMPFILE=`mktemp`
+			cat /etc/snort/snort.conf | while read LINE
+			do
+				if [ "$LINE" = "# (#DBSTART#)" ]
+				then
+					echo "# (#DBSTART#)" >> $TEMPFILE
+					echo -n "output database: log, postgresql, " >> $TEMPFILE
+					if [ $DB_USER ]
+					then
+						echo -n "user=$DB_USER " >> $TEMPFILE
+					fi
+					if [ $DB_PASS ]
+					then
+						echo -n "password=$DB_PASS " >> $TEMPFILE
+					fi
+					if [ $DB_DATABASE ]
+					then
+						echo -n "dbname=$DB_DATABASE " >> $TEMPFILE
+					fi
+					if [ $DB_HOST ]
+					then
+						echo -n "host=$DB_HOST " >> $TEMPFILE
+					fi
+					echo " " >> $TEMPFILE
+					echo "# (#DBEND#)" >> $TEMPFILE
+					break
+				else
+					echo $LINE >> $TEMPFILE
+				fi
+			done
+
+			WRITE=0
+			cat /etc/snort/snort.conf | while read LINE
+			do
+				if [ $WRITE -eq 1 ]
+				then
+					echo $LINE >> $TEMPFILE
+				fi
+
+				if [ "$LINE" = "# (#DBEND#)" ]
+				then
+					WRITE=1
+				fi
+			done
+			mv -f $TEMPFILE /etc/snort/snort.conf
+		fi
+
+		# Ensure the config file is readable by root.root and mode 600
+		if ! dpkg-statoverride --list /etc/snort/snort.conf >/dev/null
+		then
+			chown root:snort /etc/snort/snort.conf
+			chmod 640 /etc/snort/snort.conf
+		fi
+	fi
+
+	db_stop
+
+	# Check for left-over files from woody packages.
+	OLDCONF=/etc/snort/snort.rules.conf
+	if [ -f $OLDCONF ]; then
+		mv $OLDCONF $OLDCONF.OBSOLETE
+	fi
+
+	# Update the rc.d's
+	update-rc.d snort defaults >/dev/null
+
+	# in the case we reconfigure we have to restart and not just to start.
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+		invoke-rc.d snort stop || true
+	else
+		/etc/init.d/snort stop || true
+	fi
+	;;
+    abort-upgrade)
+	;;
+    *)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 0
+	;;
+esac
+
+if [ "$STARTUP" = "dialup" ]; then
+
+	# Try to guess environments for all pppds we have no .env for...
+	for PPPD_PID in $(pidof pppd ipppd); do
+		# If we got an empty PID (however), we break here
+		test "$PPPD_PID" || continue
+
+		#
+		# This is a lot of shell voodoo, let's try to figure it out:
+		# 1. egrep:
+		#    It greps for our current pppd PID in all pppd and ipppd
+		#    pidfiles.
+		#    It *should* return exactly one file name: the one with
+		#    our current pppd PID in it; however, to be safe, we fence
+		#    it with a head -1.
+		# 2. basename $(egrep ...) .pid:
+		#    It takes the file name from the egrep and strips off its
+		#    path and the .pid suffix
+		# 3. sed:
+		#    Unfortunately the filenames of pppd and ipppd differ:
+		#    pppd uses $INTERFACE.pid, while ipppd uses
+		#    ipppd.$INTERFACE.pid.
+		#    The .pid is already stripped off by basename, thus, we
+		#    just strip off any "ipppd." prefix and end up in the
+		#    plain interface name.
+		#    Maybe pppd decides to change it's pidfile naming
+		#    convention according to ipppd somewhere in the future,
+		#    thus, we use '^i\?pppd\.' (sed eregex) and thus strip
+		#    off all "ipppd." and all "pppd." prefixes. This doesn't
+		#    harm anyways.
+		#    Because of the pppd pidfile naming convention, our
+		#    approach works always with ipppd and mostly with pppd:
+		#    the latter only, if the user did not decide to rename
+		#    his ppp interface to something else than ppp*
+		#    (not possible currently, afaics).
+		#
+		PPP_IFACE=$(basename $(egrep -l "^[[:space:]]*$PPPD_PID[[:space:]]*\$" /var/run/ppp*.pid /var/run/ipppd.*.pid 2> /dev/null | head -1) .pid | sed -e 's/^i\?pppd\.//')
+
+		#
+		# If we got no interface from pidfiles (because there are no
+		# pidfiles, for example), we assume the most common case:
+		# one pppd with default route set.
+		# This is ugly, but there is no other chance. Let's hope,
+		# nobody ever manages multiple pppds without pidfiles for
+		# them.
+		#
+		test "$PPP_IFACE" || PPP_IFACE=$(route -n |
+			awk '/^0\.0\.0\.0 / { print $8 }')
+
+		# If we couldn't discover an interface name, we break here
+		test "$PPP_IFACE" || continue
+
+		PPP_LOCAL=$(ifconfig $PPP_IFACE |
+			awk '/inet addr:/ { gsub("addr:", ""); print $2 }')
+
+		# If we couldn't discover a local IP, we break here
+		test "$PPP_LOCAL" || continue
+
+		ENVFILE=/var/run/snort_$PPP_IFACE.env
+
+		# If we already have an .env for that interface, we break here
+		test -e "$ENVFILE" && continue
+
+		# Write .env for that interface
+		echo "Creating missing $ENVFILE"
+		echo "PPPD_PID=$PPPD_PID"    > "$ENVFILE"
+		echo "PPP_IFACE=$PPP_IFACE" >> "$ENVFILE"
+		echo "PPP_LOCAL=$PPP_LOCAL" >> "$ENVFILE"
+
+		# If such a snort is still running, just kill it
+		ps -ef | grep /usr/sbin/snort | grep "$PPP_LOCAL" |
+			grep "$PPP_IFACE" | awk '{ print $2 }' |
+			xargs --no-run-if-empty kill -s KILL >/dev/null
+	done
+fi
+
+if [ "$STARTUP" = "boot" ] || [ "$STARTUP" = "dialup" ]; then
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+		invoke-rc.d snort start || true
+	else
+		/etc/init.d/snort start || true
+	fi
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- snort-2.3.3.orig/debian/snort-doc.examples
+++ snort-2.3.3/debian/snort-doc.examples
@@ -0,0 +1 @@
+debian/my/snort_rules_update
--- snort-2.3.3.orig/debian/snort-stat.8
+++ snort-2.3.3/debian/snort-stat.8
@@ -0,0 +1,21 @@
+.Dd January 3, 1999
+.Dt SNORT-STAT 8
+.Os Gnu/Linux
+.Sh NAME
+.Nm snort-stat
+.Nd generates statistic of scans detected by snort
+.Sh SYNOPSIS
+.Nm cat /var/log/auth.log | /usr/sbin/snort-stat 
+.Sh DESCRIPTION
+.Nm snort-stat
+is a small script that generates a nice statistic on the port scans that
+were detected by snort and reported via /var/log/snort/alert.log.
+The output of this script is mailed to a user that is setup in 
+/etc/snort/snort.debian.conf.
+The cron script /etc/cron.daily/5snort uses this script.
+.Sh SEE ALSO
+.Xr snort 8
+.Sh AUTHORS
+The script is mostly based on the snort-stat from Yen-Ming Chen <chenym+@CMU.EDU>.
+The hostname resolving, the big shrinkage and this manpage were done by 
+Christian Hammers <ch@debian.org>.
--- snort-2.3.3.orig/debian/changelog
+++ snort-2.3.3/debian/changelog
@@ -0,0 +1,1574 @@
+snort (2.3.3-11~bpo.1) sarge-backports; urgency=low
+
+  * backport to sarge
+  * build-depend on libmysqlclient12-dev instead of libmysqlclient15-dev
+    and postgresql-dev instead of libpq-dev
+
+ -- Tom Geissler <Tom@d7031.de>  Tue, 16 Jan 2007 20:43:46 +0100
+
+snort (2.3.3-11) unstable; urgency=low
+
+  * Restore German translation (somehow removed in previous upload), courtesy
+    of Erik Schanze (Closes: #397017)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Tue,  2 Jan 2007 17:26:10 +0100
+
+snort (2.3.3-10) unstable; urgency=low
+
+  * Fix snort-mysql template to prevent translators from duplicating work
+    (two templates were nearly identical except for a double space)
+  [ Translations update ]
+  * Updated Spanish translation
+  * Updated Japanese translation, courtesy of Hideki Yamane (Closes: #391894)
+  * Updated German translation, courtesy of Erik Schanze (Closes: #397017)
+  * Updated Dutch translation, courtesy of Peter Vandenabeele.
+  * Updated Vietnamese translation, courtesy of Clytie Siddall
+  * Fix error in Catalan translation (which made msgstat fail)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Thu, 21 Dec 2006 19:52:38 +0100
+
+snort (2.3.3-9) unstable; urgency=low
+
+  * Do not try to remove /etc/snort in postrm if it does not exist anymore
+    when purging (Closes: #389766)
+  * Simplify coreutils dependencies (Closes: #381836)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Sun,  1 Oct 2006 23:29:20 +0200
+
+snort (2.3.3-8) unstable; urgency=medium
+
+  * Fix security issue CVE-2006-2769, potential evasion in URI content
+    buffers. This evasion only applies to Apache protected servers since
+    that server supports some characters. The patch used is from 2.4.5
+    and is *not* the one provided by Demarc (which is not fully
+    comprehensive and is much more intrusive).
+    Since this is an evasion issue and not a real security issue 
+    thus the 'medium' urgency even though it fixes security bug (Closes:
+    #381726)
+
+    From upstream (snort.org webpage, News item "Possible Evasion in
+    http_inspect"): 
+
+     «The Apache web server supports special characters in HTTP requests that
+     do not affect the processing of the particular request. The current
+     target-based profiles for Apache in the http_inspect preprocessor do not
+     properly handle these requests, resulting in the possibility that an
+     attacker can bypass detection of rules that use the "uricontent" keyword
+     by embedding special characters in a HTTP request.»
+
+     «It is important to note that this is an evasion and not a vulnerability.
+     This means that while it is possible for an attacker to bypass detection,
+     Snort sensors and the networks they protect are not at a heightened risk
+     of other attacks.»
+
+  * Backport fix of another (different) potential evasion in Stream4 (also in
+    the Snort 2.4.5 release, no CVE name)
+  * Relocate Czech translation, it was not under debian/po
+  * Add a warning in /etc/default/snort that the SNORT_USER will be 
+    modified (with usermod) every time you reinstall the package
+    (don't change it to 'root'!)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Thu, 10 Aug 2006 00:44:36 +0200
+
+snort (2.3.3-7) unstable; urgency=low
+
+  * *Really* recompile to use latest libmysqlclient libraries (Closes:
+    #366748)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Sat,  3 Jun 2006 15:20:57 +0200
+
+snort (2.3.3-6) unstable; urgency=medium
+
+  * Recompile to use latest libmysqlclient libraries (Closes: #366748)
+  * Remove the following unused dependencies as suggested by  Stefan Huehner:
+    libsnmp4.2-dev and libssl-dev (and their --with calls in debian/rules) . I'm
+    still keeping the coreutils | fileutils dependency since I still want to
+    compile this package in woody.(Closes: #365874)
+  * Also remove DH_COMPAT from debian/rules as suggested by  Stefan Huehner in
+    #365874
+  * Move 'debian/my/lisapaper.txt' to snort-doc.docs and remove from snort,
+    snort-pgsql and snort-mysql doc files (Closes: #340091)
+  * Have faq.tex use hyperref.sty instead of latex2html's html.sty and comment
+    the \latexonly definitions. This makes latex2html unnecessary to
+    build the package (Closes: #365872)
+  * doc-base files now point to the compressed PDF documents (lintian fix)
+  * Updated debconf translations:
+    - French translation provided by Christian Perrier (Closes: #359285)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Mon, 29 May 2006 20:05:29 +0200
+
+snort (2.3.3-5) unstable; urgency=low
+
+  * Updated Build-Dependencies to use libmysqlclient15-dev instead of the 
+    old libmysqlclient10 library (Closes: #356706)
+  * Add a 'DEBIAN_SNORT_SEND_STATS' option (controlled by debconf) to allow
+    users to define if snort should send daily stats. Users that want to
+    change the frequency should manually move over the cron.daily script
+    to other cron.XXX locations (Closes: #353035)
+  * Updated debconf translations:
+    - Dutch translation with patch provided by Peter Vandenabeele
+    - Spanish Debconf translation ('send_stats' template)
+  * Do not indent '@' in the e-mail of users that receive the stats (Closes: #335803)
+  * Preliminary code (only in snort.config) to detect if the default interface
+    is up when configuring Snort, the Debconf question priority is raised if
+    the interface is not up or it does not exist and the user is pestered
+    if he still provides an invalid answer (unless he doesn't see the
+    question, which is the case if running with debconf priority set to
+    'high', in this case, we bail out)
+    Note: will introduce this in the DB packages after it gets some testing
+    out there.
+  * Change the Debconf priority of the note that warns that  the configuration
+    is not working to 'critical' (was 'high')
+  * Acknowledge NMU made by Margarita:
+    * Drop automake1.6 dependency in Build-Depends (Closes: #335143)
+    * Updated config.guess and config.sub with the latest versions available
+      to prevent FTBFS on GNU/k*BSD (Closes: #342446)
+    * Updated german debconf translation with patch provided by Erik Schanze 
+      (Closes: #345855)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed, 22 Mar 2006 02:09:01 +0100
+
+snort (2.3.3-4) unstable; urgency=low
+
+  * Build-Depend on newer automake version: 1.7 (Closes: #335143)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Tue, 17 Jan 2006 02:10:41 +0100
+
+snort (2.3.3-3) unstable; urgency=low
+
+  * Properly remove the snort user on purge.
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Thu, 20 Oct 2005 01:13:47 +0200
+
+snort (2.3.3-2.1) unstable; urgency=low
+
+  * NMU to drop automake1.6 dependency (Closes: #335143)
+  * Updated config.guess and config.sub (Closes: #342446)
+  * Updated german debconf translation (Closes: #345855)
+
+ -- Margarita Manterola <marga@debian.org>  Sun, 22 Jan 2006 21:54:43 -0300
+
+snort (2.3.3-2) unstable; urgency=high
+
+  * Backport the following changes introduced in 2.4.1. Upstream changelog:
+      * src/log.c:
+        Fix problem in sniffer mode when incomplete TCP option data is received.
+        Thanks A Hernandez for the find.
+    (Closes: #328134)
+    Note: This is a "security" bug but no CVE is assigned, it is actually
+    something that can happen only if a Snort user willingly shoots himself
+    on the foot (uses ASCII logging mode) or if he uses the fast output
+    mode with some non-default options.
+    For a detailed view see:
+    Martin Roesch's mail "Snort DoS Fallacies" to snort-users and bugtraq:
+    http://marc.theaimsgroup.com/?l=bugtraq&m=112665341207363&w=2
+    http://marc.theaimsgroup.com/?l=snort-users&m=112657845119746&w=2
+    http://marc.theaimsgroup.com/?l=snort-users&m=112667020331513&w=2
+    http://marc.theaimsgroup.com/?l=snort-devel&m=112672013010948&w=2
+    and also
+    http://www.snort.org/pub-bin/snortnews.cgi#58
+    To summarise: The only recommended alert methods in a production sensor
+    are unified, syslog or database. And unified is The Right Way to run
+    a sensor (others have important performance issues under high load )
+    NOTE to Debian Security teams: I don't believe this bug merits a DSA 
+    (or a DTSA for that matter)
+    (Closes: #328134)
+  * Backport the following changes introduced in 2.4.2. Upstream changelog:
+      * src/output-plugins/spo_log_database.c:
+      * schemas/create_mysql:
+        Fixes to address schema being a keyword in MySQL 5.0.  Thanks Wes Young,
+        Adolfo Gomez, and Aleem Mawji for the updates.
+    (Closes: #327791)
+  * Added Swedish translation provided by Daniel Nylander (Closes: #330834)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Fri, 30 Sep 2005 21:21:43 +0200
+
+snort (2.3.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Use upstream's FAQ in PDF format instead of debian/my/FAQ.txt, also
+    have the FAQ available only in the snort-doc package (after fixing 
+    the Makefile so that the faq.tex file does not get removed on distclean)
+  * Fix typo in snort.8 manpage (Closes: #326538)
+  * Fixed address of the FSF in debian/copyright
+  * Updated debconf translations:
+    - Vietnamese provided by Clytie Siddall
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed, 31 Aug 2005 19:47:16 +0200
+
+snort (2.3.2-8) unstable; urgency=low
+
+  * _Really_ use debhelper compat version 4 now
+  * Remove debian/*conffiles since debhelper now marks them as config files
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Sat, 27 Aug 2005 01:50:40 +0200
+
+snort (2.3.2-7) unstable; urgency=low
+
+  * Fix lintian warnings
+  * Fix error in database config scripts (when not upgrading, the
+    wait_for_db_config key does not exist) (Closes: #325223)
+  * Updated debconf translations:
+     - French provided by Christian Perrier
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Thu, 25 Aug 2005 21:52:19 +0200
+
+snort (2.3.2-6) unstable; urgency=low
+
+  * Add Dependency on "debconf | debconf-2.0" as requested by Joey Hess
+  * Use Debhelper compatibility version 4
+  * New mechanism for database packages:
+    - Introduce a mechanism to create /etc/snort/db-pending-config on
+      initial installation of the database packages.
+    - Have the init.d script abort the start attempt if the 
+      /etc/snort/db-pending-config file exists.
+    - Describe how to setup the database support in README-database.Debian
+      and install this document in the database packages.
+      (Closes: #205683, #219696, #265735, #265878, #290104, #291616)
+  * po-debconf changes:
+    (still waiting a little bit before switching to dbconfig-common)
+    - Sinchronise all the debconf templates of the different snort 
+      variants.
+    - Change the wait_for_db_config message, now called 'needs_db_config'
+      and provides slightly different information.
+    - Fixed typos in German debconf translation courtesy of Jens Seidel
+      (Closes: #313906)
+    - Added Japanese translation contributed by Hideki Yamane
+      (Closes: #310096)
+    - Added Vietnamese translation contributed by Clytie Siddall 
+      (Closes: #318695)
+    - Added Czech translation contributed by Jan Outrata (Closes: #321738)
+    - Updated the Spanish translation.
+    - Improve the debconf dialog with suggestions from Justin B Rye
+      (Closes: #306269)
+    - Fix the templates so that all the files use the same strings, that
+      should reduce the workload of translating almost identical lines.
+      (but also fuzzies more of the translations above)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Thu, 25 Aug 2005 14:59:29 +0200
+
+snort (2.3.2-5) unstable; urgency=medium
+
+  * Medium priority since it seems some buildds are not auto building
+    snort ok and this changes fix it.
+  * Use PostgreSQL 8.0 now as requested by Martin Pitt. Basicly just
+    changed the build-depends and use 'pg_config --includedir' when
+    setting the location of the PostgreSQL location. 
+  * Changes to configure.in: (Closes: #313499)
+    * Fixed configure.in so that it uses the --with dir directly first
+      (intead of looking for $i/include and stuff like that). 
+    * Fixed configure.in so that it outputs the PostgreSQL directories 
+      it tested by fixing a typo.
+    * Have all ERROR messages abort with an exit 1 so that the Makefile breaks
+      and we will notice the error if doing an automatic build.
+
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Tue, 14 Jun 2005 19:33:49 +0200
+
+snort (2.3.2-4) unstable; urgency=low
+
+  * Snort, snort-pgsql and snort-mysql now depend on either coreutils
+    or earlier packages which provided 'stat'. This should prevent
+    partial-upgrades of woody systems which prevent snort's init scripts
+    from running (Closes: #311616)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Fri,  3 Jun 2005 16:24:50 +0200
+
+snort (2.3.2-3) unstable; urgency=high
+
+  * Pre-Depend on adduser since we use it on preinst
+  * Changed debian/TODO
+  * Snort-common now Replaces old snort versions (1.8.4beta1-1) since
+    the configuration files where moved there from snort. 
+    Save for the ppp configuration file which was moved from snort-common to
+    snort. Snort now Replaces snort-common versions previous to 2.0.2-3, 
+    that introduced the change, cannot conflict since we will end up with
+    circular dependencies. (Closes: #311257)
+  * Check MD5sums before rule files are moved from the old location to the
+    new one in snort-rules-default's preinst when upgrading.
+    If the files have not been changed from the ones provided
+    by the woody version then remove them (Closes: #311263)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed,  1 Jun 2005 09:47:04 +0200
+
+snort (2.3.2-2) unstable; urgency=low
+
+  * Have snort-common Conflict on versions prior to the Source-Version to
+    prevent users upgrading snort-common without upgrading snort.
+    (Closes: #300785
+  * Fixed homepage location of Snort (Closes: #300727)
+  * Fixed snort-stat so it can be used when the -y option is used with Snort,
+    thanks to the patch provided by Chirik (Closes: #200276)
+  * Updated German translation courtesy of Erik Schanze 
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Tue, 22 Mar 2005 01:26:55 +0100
+
+snort (2.3.2-1) unstable; urgency=low
+
+  * New upstream release. 
+    - Fixes some bugs in preprocessors
+    - Rules updates
+  * Fixed format of NEWS file, updated the version of the changelog entry so
+    that everybody will read it on next upgrade (Closes: #299334) 
+  * Added debconf french translation provided by Christian Perrier (Closes: #299016)
+  * Updated debconf dutch translation provided by  Peter Vandenabeele (Closes: #296152)
+  * The PPP script will now use the new /etc/default/snort mechanism 
+    (Closes: 298003
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Mon, 14 Mar 2005 13:26:45 +0100
+
+snort (2.3.0-7) unstable; urgency=low
+
+  * Do not change the permissions of /var/log/snort/ and 
+    /etc/snort/snort.conf if the administrator has setup an override
+    using dpkg-statoverride (Closes: #296927)
+  * Updated translation to Catalan with the one provided by Aleix Badia i
+    Bosch
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Sat, 26 Feb 2005 13:09:14 +0100
+
+snort (2.3.0-6) unstable; urgency=low
+
+  * Added tetex-extra to Build-Depends (Closes: #296814)
+  * Refer to the proper file in debconf template (Closes: #296809)
+  * Updated the spanish debconf translation.
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Fri, 25 Feb 2005 00:43:19 +0100
+
+snort (2.3.0-5) unstable; urgency=low
+
+  * Upload of the experimental package to unstable
+    Even though I don't get to fix #205683 and friends (and I would
+    like to, before the release)
+    This release Closes #283816, #241995, #289405, #247603
+  * Do not rotate log files if empty (Closes: #193299)
+  * Added dutch translation (Closes: #247603)
+  * Added yet another TODO item
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Tue, 22 Feb 2005 21:36:40 +0100
+
+snort (2.3.0-4) experimental; urgency=low
+
+  * Call dh_installdocs with -i or -a depending on target, rename
+    (Closes: #295228, #294755)
+  *  NEWS.Debian file to NEWS 
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Tue, 15 Feb 2005 08:33:34 +0100
+
+snort (2.3.0-3) experimental; urgency=low
+
+  * Create manual in build-indep location (Closes: #294755) 
+  * Fixed location of snort_manual and lisapaper in their respective
+    doc-base files.
+  * Added a reference to the FAQ through a new doc-base file.
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Sat, 12 Feb 2005 12:23:35 +0100
+
+snort (2.3.0-2) experimental; urgency=low
+
+  * Improved postrm purge action by removing also obsolete configuration
+  (since it's no longer in the conffiles) and the group. Also, synced all
+  postrm scripts (mysql did not included the rmdir /etc/snort code)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed,  9 Feb 2005 08:44:05 +0100
+
+snort (2.3.0-1) experimental; urgency=low
+
+  (First attempt at experimental, to avoid breaking installations running sid)
+  * New upstream release 
+  * This version now uses libnet1, changed Build-Depends (Closes: #241995)
+  * Introduced /etc/default/snort and removed /etc/snort/common.parameters
+    this makes it easier to check for common situations (parsing the parameter
+    file is quite complicated). The old common.parameters file is moved
+    over to /etc/default/snort automatically, but retained in case
+    the parsing has not been done properly (and will not be used until
+    the common.parameters file is removed). This is described in the
+    NEWS.Debian file.
+  * Fixed the postint call so that the passwd and group are checked before
+    they are created. Also fix chown call (still used '.' instead of ':')
+  * Introduce a check for the status of Snort's logdirectory, it checks if
+    it belongs to Snort (Closes: #247603)
+  * This release provides debconf support for snort sensors in 
+    multiple interfaces (Closes: #283816)
+  * Run update-debconf, seems I had not done this when I last made changes
+    in the templates in 2.2.0-8
+  * Included the documentation available, including signatures. Also
+    added the LaTeX manual included as well as the additional Build-Depends
+    on tetex-bin and gs-common
+  * Updated the FAQ (was about time!) from http://www.snort.org/docs/FAQ.txt
+  * Added a README.docs file (pointing people to more documents)
+  * Updated translations:
+    - German, provided by Erik Schanze (Closes: #289405)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed, 26 Jan 2005 09:18:53 +0100
+
+snort (2.2.0-9) unstable; urgency=low
+
+  * Removed old (obsolete) converstion of PPPENV in /var/tmp in postinst
+    which actually might open up security holes when using dialup access
+    and installing/upgrading the package.
+  * Updated translations:
+    - Japanese, provided by Hideki Yamane (closes: #283128)
+    - French, provided by Christian Perrier (closes: #284559)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Mon, 20 Dec 2004 01:35:21 +0100
+
+snort (2.2.0-8) unstable; urgency=low
+
+  * Updated the README.Debian file with proper information on how to setup
+    multiple interfaces and rewrote the Debconf question to specify that
+    it can be used to define multiple interfaces (Closes: #283816) 
+  * Added some additional TODO notes
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed,  1 Dec 2004 17:04:38 +0100
+
+snort (2.2.0-7) unstable; urgency=low
+
+  * Make snort-common Arch: all (Closes: #278987) 
+  * The installation will now check if you are using a configuration that
+    will not be able to work with the current Snort version and will forewarn
+    you. The package installation will still fail (if Snort is started
+    automatically) but the administrator will be pointed to where the
+    error is (Closes: #165107)
+  * Use dh_installman instead of dh_installmanpages and provide proper
+    PACKAGE.manpages file since dh_installmanpages now fails to create the
+    snort-common package properly.
+  * Updated to the latest rules snapshot
+  * Added an 'update-rules' target in debian/rules that downloads the 
+    latest rules snapshot and installs it in the package.
+  [ Translations ]
+  * Dutch update, provided by cobaco (Closes: #278719)
+  * Japanese update, provided by Hideki Yamane (Closes: #279028)
+  * French update, provided by Christian Perrier (Closes: #279833)
+  * German update, provided by Erik Schanze (Closes: #280964)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Sat, 30 Oct 2004 22:47:34 +0200
+
+snort (2.2.0-6) unstable; urgency=low
+
+  * Added a 'config-check' option in init.d to test the user's configuration
+    file. This could be used to determine (in postinst) if snort should be
+    restarted and warn the user (not yet done). This will help fix #165107,
+    #165351 (since similar user mistakes would be detected), #276565 and
+    #247665.
+  * Added more information to the TODOs
+  * Moved DEBIAN_TRESHOLD to DEBIAN_THRESHOLD (save for the debconf value
+    in order to avoid reseting it) (Closes: #256581)
+  * Removed double space in template (Closes: #275936)
+  * The snort-rules package now Suggests: snort instead of depending on it
+    (Closes: #249697)
+  * Updated rules with the latest snapshot.
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Mon, 25 Oct 2004 23:47:45 +0200
+
+snort (2.2.0-5) unstable; urgency=low
+
+  * Rules update 
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed, 13 Oct 2004 12:11:21 +0200
+
+snort (2.2.0-4) unstable; urgency=medium
+
+  * Fix typo introduced in previous upload that prevents
+    ppp init script from loading properly common.parameters (Closes: #275439)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Fri,  8 Oct 2004 09:50:06 +0200
+
+snort (2.2.0-3) unstable; urgency=high
+
+  * Added config-file discovery to ppp init.scripts so that Snort is
+    started (-c) with the proper configuration file if available or 
+    snort.conf if not. Setting high severity so that users running
+    Snort with PPP don't end up with a full /var filesystem (Closes: #268707)
+  * Fixed bashism in /etc/ppp/if-up.d/snort
+  * Modified the init.d an if-up.d scripts so that
+    /etc/snort/snort.common.parameters is only used if it exists.
+  * Snort-rules-default now Recommends: oinkmaster 
+    now that it is in the archive (accepted 01 Oct 2004), this does not
+    close #191105 since IMHO a better signature update mechanism should 
+    be introduced. Also updated the related TODO item.
+  * Added a FAQ Q&A regarding rule updates in README.Debian
+  * Added code to detect for deprecated preprocessors and warn the user,
+    curretnly the code will not touch the configuration files himself and
+    will not detect if you are using the standard package configuration file.
+    It will prevent users from having configuration issues, however
+    (Closes: #247665)
+  * Modified the init.d file so you can use 'status' to determine if
+    the Snort sensors are up or not.
+  * Updated the 2.2 rule set with the snapshot provided at snort.org, new rules
+    include detection of the recent JPEG exploit (Closes: #274244)
+  * Fixed typo in templates (unfuzzied modified entries) and updated
+    JA translation provided by Hideki Yamane (Closes: #273138)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Sat,  2 Oct 2004 12:41:50 +0200
+
+snort (2.2.0-2) unstable; urgency=low
+
+  * Taking over maintainership of this package (Closes: #265343)
+  * Have  Snort{,-mysql,-pgsql} depend on the same versions of the
+    common packages (was not done in the previous release)
+  * Updated JA translation (Closes: #271755)
+  * Added a list of todo items in debian/TODO
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Wed, 15 Sep 2004 10:42:43 +0200
+
+snort (2.2.0-1) unstable; urgency=low
+
+  + The 'Please Adopt Me!' release.
+
+  + Fixed build-depends on libpcap0.8-dev closes: #263923
+  + Fixed failure to start on multiple interfaces, each interface
+    now uses it's own configuration file. Closes: #248908
+  + Snort{,-mysql,-pgsql} depend on the same versioned rules + common
+    Closes: #257078
+  + NL, DE, pt_BR, FR, JA translations added
+    Closes: #265508, #264301, #246553, #246374, #239206
+  + New upstream release closes: #262297
+ 
+ -- Sander Smeenk <ssmeenk@debian.org>  Sun, 15 Aug 2004 15:24:39 +0200
+  
+snort (2.1.2-2) unstable; urgency=low
+
+  ! Once again: Thanks Mario 'BitKoenig' Holbe for your great help:
+    + Moved 'dialup' interface guessing from ppp/ip-up to postinst
+  + Cleanup restart: only restart current running interfaces
+    This also cleans up: 'dialup' logcheck failure, if no snort running
+  + Prepare for multisensor support
+  + Use start-stop-daemon --retry instead of sleep and kill -9
+  + Use invoke-rc.d only, if it exists
+    Closes: #191574
+  + Correct please_restart to please_restart_manually
+  + Re-Unified prerm and postinst scripts
+  + Fix the backward-compatible just-kill-them-all in prerm;
+    do we really need it? It definitely didn't work before and
+    since the old-package prerm is called anyways, we shouldn't.
+  + Simplify snort.debian.conf creation
+
+  + snort-doc/examples now has a snort-rules auto-update script!
+    Closes: #242521, thanks Marcel!
+  + Updated fr.po by Christian Perrier
+    Closes: #244048, thanks Christian!
+  + Recent changes to init / ip-{up,down} scripts fixed this bug:
+    Closes: #226236
+  + Fixed database schema's in {pg,my}sql packages. This does not fix
+    the 'schema is not installed when debconf prompts for it'-problem.
+    Closes: #244017
+  + Problem with snort-pgsql.template fixed.
+    Closes: #244175
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Sun, 18 Apr 2004 14:39:19 +0200
+
+snort (2.1.2-1) unstable; urgency=low
+
+  + New upstream release
+  + Templates corrected (reflect same text at shared options, typos)
+  
+  + -b switch removed from snort startup, log_tcpdump changed to snort.log
+    Closes: #241425, #171190
+  + French debconf translation by Christian Perrier
+    Closes: #241991
+  + Added checks on purge of snort-rules-default. Fixed breakage
+    Closes: #239542
+  + Firewall interaction is explained in the FAQ
+    Closes: #217174
+  + Snort now has snort.common.options, and no -b anymore.
+    Closes: #217244
+  + Changed helptext in snort.debian.conf to be more generic.
+    Closes: #196694
+  + Improved dialup suppport. MANY Thanks to Mario 'BitKoenig' Holbe for
+    his great work on this subject and the changes to the init script!
+    Closes: #226236
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Sun,  4 Apr 2004 15:12:27 +0100
+
+snort (2.1.1-1) unstable; urgency=low
+
+  + New upstream release
+    Closes: #238427
+  + Added catalan debconf templates (debian/po/ca.po)
+    Closes: #236644
+  + Fixed packaging bugs.
+  + Applied following changes by Javier FernÃ¡ndez-Sanguino PeÃ±a. Thanks!!
+      * Snort group is now created using --system in all packages
+        Closes: #231580
+      * Both the cron.daily script and the postinst scripts set a default
+        value for STATS_RCPT and STATS_TRESHOLD to avoid buggy behaviours
+        if the user does not setup a proper value when interfacing with
+        debconf. Still, these values should be checked in the config 
+        scripts. (Closes: #173331)
+      * Snort-stat now exists if there are no results which will avoid
+        it from sending empty emails 
+        (Closes: #217913, #174508, #192401, #172529)
+      * Improved the explanations in several templates (Closes: #217173)
+      * Updated Japanese translation (and fixed some po format errors,
+        hopefully without damaging the po file) (Closes: #226680)
+      * Included Catalan debconf translation (Closes: #236644)
+      * Updated pt-BR debconf translation (Closes: #228244)
+      * Re-Added (partial) spanish debconf translation (it seems that 
+        the work I did back in december 2001 has not been moved to po-debconf!)
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Wed, 17 Mar 2004 18:46:28 +0100
+ 
+snort (2.1.0-4) unstable; urgency=low
+
+  + Fixed FTBFS with -B flag specified to dpkg-buildpackage
+    Thanks Pascal Hakim.
+  + Restart target in init.d script requires a sleep on slow systems.
+    Thanks Marco Gaiarin.
+  + Updated the ja.po templates 
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Wed, 1 Mar 2004 00:00:00 +0100
+  
+snort (2.1.0-3) unstable; urgency=low
+
+  + Split binary-indep packages from binary-arch target
+    Closes: #226072, #157708, #185806
+  + ip-up.d script now correctly guesses the PPPENV settings
+    Closes: #225956
+  + Updated the fr.po templates
+    Closes: #225906
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Sun, 04 Jan 2004 12:51:38 +0100
+
+snort (2.1.0-2) unstable; urgency=low
+
+  + Added example init.d script to manage multiple sensors.
+  + No longer kills custom daemons at init.d stop
+    Closes: #181637
+  + Fixed build-dependency on libpcre3-dev
+    Closes: #225707
+  + Fixed manpage to reflect new SIGHUP handling
+    Closes: #122689
+  + Already implemented 'statesaving' dialup scripts
+    Closes: #101725
+  + Changed default flow-portscan configuration
+    Closes: #225506
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Fri, 02 Jan 2004 13:01:54 +0100
+
+snort (2.1.0-1) unstable; urgency=low
+
+  + New upstream version
+  + Depend on perl-modules for perlscripts
+    Closes: #212805
+  + Fixed breakage of upgrades when conffiles were removed by user
+    Closes: #207970
+  + Added japanese translation of templates
+    Closes: #224191
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Sun, 21 Dec 2003 15:48:55 +0100
+
+snort (2.0.2-3) unstable; urgency=low
+
+  * ip-up.d/snort and init.d/snort now use the same startup arguments
+    with an extra config file that holds the common parameters.
+    Closes: #217244
+  + ip-{up,down}.d/snort moved from snort-common to snort{,-mysql,-pgsql}
+  * Clarified debconf questions. Fixed typos, corrected grammar.
+    Closes: #217173
+  * Updated what documenation files are included.
+    Closes: #217174
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Fri, 24 Oct 2003 18:05:26 +0200
+
+snort (2.0.2-2) unstable; urgency=low
+
+  * Fixed 'native package' problem
+  	Closes: #216326
+
+  * Fixed syntaxerrors in init script
+    Closes: #215142
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Sun, 19 Oct 2003 16:11:09 +0200
+
+snort (2.0.2-1) unstable; urgency=low
+
+  Pascal:
+  * Make snort-rules-default depend on a recent version of snort
+    Closes: #135603
+  * Delete configuration files and log files on purge.
+    Closes: #180043
+
+  Sander:
+  * Fixed the init.d script to not start snort in dialup mode at boot. 
+    Closes: #207291, #208003
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Wed, 08 Oct 2003 21:09:34 +1000
+
+snort (2.0.1-3) unstable; urgency=low
+
+  + Fixed FTBFS: automake1.6 dependency (Closes: #207010)
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Mon, 25 Aug 2003 10:45:31 +0200
+
+snort (2.0.1-2) unstable; urgency=low
+  
+  + Snort now co-maintained by Pascal Hakim
+  
+  + fr.po added, forgot the NMU by Christian Perrier
+  + Untranslatable strings marked for translation fixed
+    Closes: #206972, #192952
+  + create_postgresql.gz has been updated and now uses 'TIMESTAMP'
+    Closes: #206372
+  + Changed the init.d's "start" section to support dialup mode
+    Closes: #205873
+  + SNMP support has been removed upstream, I forgot to remove the MIB
+    message from snort-common
+    Closes: #206668
+  + Since the MIB note was removed, this also fixes inapropriate use of
+    debconf, which Closes: #205085
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Sun, 24 Aug 2003 11:41:23 +0200
+
+snort (2.0.1-1) unstable; urgency=low
+
+  + New upstream source
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Tue, 19 Aug 2003 16:32:46 +0200
+
+snort (2.0.0-3.1) unstable; urgency=low
+
+  + Eeps! Forgot my versioned dependencies!
+
+ -- Sander Smeenk <ssmeenk@debian.org>  Mon, 05 May 2003 21:02:13 +0200
+
+snort (2.0.0-3) unstable; urgency=low
+
+  + Added 'Provides: Snort' to snort-{pg,my}sql (Closes: #190064)
+  + Moved parameter -b to snort.conf (Closes: #190748)
+  + Seems fixed, according 