Release v1.6.15

This commit is contained in:
Peter Haag 2016-06-05 11:52:29 +02:00
parent 25138d83f6
commit 68d660e984
11 changed files with 333 additions and 326 deletions

View File

@ -1,3 +1,8 @@
2016-06-05 v.1.6.15
- Fix Security issue http://www.security-assessment.com/files/documents/advisory/Nfdump%20nfcapd%201.6.14%20-%20Multiple%20Vulnerabilities.pdf
- Fix obyte, opps and obps output records
- Fix wrong bps type case in cvs output. Fix opbs ipbs typos
2016-01-10 v.1.6.14
- Fix CentOS compile issues with flow-tools converter
- Fix FreeBSD,OpenBSD build problems

View File

@ -1,8 +1,8 @@
# nfdump
Stable Release v1.6.14
Stable Release v1.6.15
See the Changelog file for all changes in release 1.6.14
See the Changelog file for all changes in release 1.6.15
nfdump is a toolset in oder to collect and process netflow data, sent from netflow compatible devices. The toolset supports netflow __v1__, __v5/v7__ __v9__ and __IPFIX__. See the details below for a more details explanation.
The toolset also contains a collector to collect __sflow__ data. nfdump supports IPv4 as well as IPv6.
@ -37,6 +37,8 @@ is does not support the full IPFIX definition, however is considered stable.
### Building and config options
The toolset is build upon the autotools framework, which means __./configure ./make__ and __./make install__ should do the trick
In case of an autoconf error, run 'autoreconf -if' first to sync with your
local version of autotools
The following config options are available:

View File

@ -1,9 +1,9 @@
@%:@! /bin/sh
@%:@ From configure.ac Revision: 243 .
@%:@ Guess values for system-dependent variables and create Makefiles.
@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.14.
@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.15.
@%:@
@%:@ Report bugs to <phaag@users.sourceforge.net>.
@%:@ Report bugs to <peter@people.ops-trust.net>.
@%:@
@%:@
@%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -276,10 +276,10 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
$0: phaag@users.sourceforge.net about your system,
$0: including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
$0: peter@people.ops-trust.net about your system, including
$0: any error possibly output before this message. Then
$0: install a modern shell, or manually run the script
$0: under such a shell if you do have one."
fi
exit 1
fi
@ -591,9 +591,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='nfdump'
PACKAGE_TARNAME='nfdump'
PACKAGE_VERSION='1.6.14'
PACKAGE_STRING='nfdump 1.6.14'
PACKAGE_BUGREPORT='phaag@users.sourceforge.net'
PACKAGE_VERSION='1.6.15'
PACKAGE_STRING='nfdump 1.6.15'
PACKAGE_BUGREPORT='peter@people.ops-trust.net'
PACKAGE_URL=''
# Factoring default headers for most tests.
@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures nfdump 1.6.14 to adapt to many kinds of systems.
\`configure' configures nfdump 1.6.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1424,7 +1424,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of nfdump 1.6.14:";;
short | recursive ) echo "Configuration of nfdump 1.6.15:";;
esac
cat <<\_ACEOF
@ -1491,7 +1491,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <phaag@users.sourceforge.net>.
Report bugs to <peter@people.ops-trust.net>.
_ACEOF
ac_status=$?
fi
@ -1554,7 +1554,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
nfdump configure 1.6.14
nfdump configure 1.6.15
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1899,9 +1899,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## ------------------------------------------ ##
## Report this to phaag@users.sourceforge.net ##
## ------------------------------------------ ##"
( $as_echo "## ----------------------------------------- ##
## Report this to peter@people.ops-trust.net ##
## ----------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@ -2217,7 +2217,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by nfdump $as_me 1.6.14, which was
It was created by nfdump $as_me 1.6.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3087,7 +3087,7 @@ fi
# Define the identity of the package.
PACKAGE='nfdump'
VERSION='1.6.14'
VERSION='1.6.15'
cat >>confdefs.h <<_ACEOF
@ -17242,7 +17242,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by nfdump $as_me 1.6.14, which was
This file was extended by nfdump $as_me 1.6.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -17302,13 +17302,13 @@ $config_headers
Configuration commands:
$config_commands
Report bugs to <phaag@users.sourceforge.net>."
Report bugs to <peter@people.ops-trust.net>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
nfdump config.status 1.6.14
nfdump config.status 1.6.15
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

View File

@ -1,9 +1,9 @@
@%:@! /bin/sh
@%:@ From configure.ac Revision: 243 .
@%:@ Guess values for system-dependent variables and create Makefiles.
@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.14.
@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.15.
@%:@
@%:@ Report bugs to <phaag@users.sourceforge.net>.
@%:@ Report bugs to <peter@people.ops-trust.net>.
@%:@
@%:@
@%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -276,10 +276,10 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
$0: phaag@users.sourceforge.net about your system,
$0: including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
$0: peter@people.ops-trust.net about your system, including
$0: any error possibly output before this message. Then
$0: install a modern shell, or manually run the script
$0: under such a shell if you do have one."
fi
exit 1
fi
@ -591,9 +591,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='nfdump'
PACKAGE_TARNAME='nfdump'
PACKAGE_VERSION='1.6.14'
PACKAGE_STRING='nfdump 1.6.14'
PACKAGE_BUGREPORT='phaag@users.sourceforge.net'
PACKAGE_VERSION='1.6.15'
PACKAGE_STRING='nfdump 1.6.15'
PACKAGE_BUGREPORT='peter@people.ops-trust.net'
PACKAGE_URL=''
# Factoring default headers for most tests.
@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures nfdump 1.6.14 to adapt to many kinds of systems.
\`configure' configures nfdump 1.6.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1424,7 +1424,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of nfdump 1.6.14:";;
short | recursive ) echo "Configuration of nfdump 1.6.15:";;
esac
cat <<\_ACEOF
@ -1491,7 +1491,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <phaag@users.sourceforge.net>.
Report bugs to <peter@people.ops-trust.net>.
_ACEOF
ac_status=$?
fi
@ -1554,7 +1554,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
nfdump configure 1.6.14
nfdump configure 1.6.15
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1899,9 +1899,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## ------------------------------------------ ##
## Report this to phaag@users.sourceforge.net ##
## ------------------------------------------ ##"
( $as_echo "## ----------------------------------------- ##
## Report this to peter@people.ops-trust.net ##
## ----------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@ -2217,7 +2217,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by nfdump $as_me 1.6.14, which was
It was created by nfdump $as_me 1.6.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3087,7 +3087,7 @@ fi
# Define the identity of the package.
PACKAGE='nfdump'
VERSION='1.6.14'
VERSION='1.6.15'
cat >>confdefs.h <<_ACEOF
@ -17246,7 +17246,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by nfdump $as_me 1.6.14, which was
This file was extended by nfdump $as_me 1.6.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -17306,13 +17306,13 @@ $config_headers
Configuration commands:
$config_commands
Report bugs to <phaag@users.sourceforge.net>."
Report bugs to <peter@people.ops-trust.net>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
nfdump config.status 1.6.14
nfdump config.status 1.6.15
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

View File

@ -34,47 +34,47 @@
'configure.ac'
],
{
'_m4_warn' => 1,
'_AM_PROG_CC_C_O' => 1,
'AM_DEP_TRACK' => 1,
'_AM_AUTOCONF_VERSION' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'include' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AU_DEFUN' => 1,
'm4_pattern_forbid' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
'_AM_SET_OPTION' => 1,
'AM_SANITY_CHECK' => 1,
'AC_DEFUN_ONCE' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_MISSING_PROG' => 1,
'_AM_PROG_TAR' => 1,
'AM_MAKE_INCLUDE' => 1,
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'_AM_SET_OPTIONS' => 1,
'_AM_DEPENDENCIES' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'm4_include' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AM_PROG_INSTALL_SH' => 1,
'AM_SILENT_RULES' => 1,
'AM_RUN_LOG' => 1,
'_AM_MANGLE_OPTION' => 1,
'_AM_IF_OPTION' => 1,
'AM_SUBST_NOTMAKE' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_CONDITIONAL' => 1,
'AM_MISSING_HAS_RUN' => 1,
'm4_pattern_allow' => 1,
'AM_SET_LEADING_DOT' => 1,
'AC_DEFUN' => 1,
'_AM_CONFIG_MACRO_DIRS' => 1,
'AM_PROG_CC_C_O' => 1,
'_AM_PROG_CC_C_O' => 1,
'AM_MISSING_HAS_RUN' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
'AM_SUBST_NOTMAKE' => 1,
'AM_SANITY_CHECK' => 1,
'_AM_AUTOCONF_VERSION' => 1,
'AC_DEFUN_ONCE' => 1,
'AM_CONDITIONAL' => 1,
'include' => 1,
'AM_SET_DEPDIR' => 1,
'AC_CONFIG_MACRO_DIR' => 1
'm4_pattern_forbid' => 1,
'_AM_DEPENDENCIES' => 1,
'_AM_IF_OPTION' => 1,
'AM_DEP_TRACK' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'AM_PROG_INSTALL_SH' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AU_DEFUN' => 1,
'_AM_SET_OPTIONS' => 1,
'AM_MISSING_PROG' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_SILENT_RULES' => 1,
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'AM_RUN_LOG' => 1,
'm4_pattern_allow' => 1,
'_m4_warn' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AM_MAKE_INCLUDE' => 1,
'AC_CONFIG_MACRO_DIR' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'm4_include' => 1,
'_AM_MANGLE_OPTION' => 1,
'_AM_PROG_TAR' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'_AM_CONFIG_MACRO_DIRS' => 1,
'_AM_SET_OPTION' => 1,
'AM_PROG_CC_C_O' => 1,
'AM_SET_LEADING_DOT' => 1
}
], 'Autom4te::Request' ),
bless( [
@ -89,65 +89,65 @@
'configure.ac'
],
{
'AM_EXTRA_RECURSIVE_TARGETS' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_POT_TOOLS' => 1,
'LT_SUPPORTED_TAG' => 1,
'AC_FC_FREEFORM' => 1,
'AC_INIT' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'_AM_COND_ELSE' => 1,
'AC_SUBST_TRACE' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
'AC_CANONICAL_BUILD' => 1,
'AM_PROG_MOC' => 1,
'_m4_warn' => 1,
'AH_OUTPUT' => 1,
'm4_pattern_forbid' => 1,
'AM_PATH_GUILE' => 1,
'AM_XGETTEXT_OPTION' => 1,
'_LT_AC_TAGCONFIG' => 1,
'AC_CONFIG_HEADERS' => 1,
'AM_PROG_AR' => 1,
'include' => 1,
'_AM_COND_IF' => 1,
'AC_CANONICAL_HOST' => 1,
'AC_SUBST' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'm4_pattern_allow' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AM_CONDITIONAL' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_ENABLE_MULTILIB' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_FC_PP_SRCEXT' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AM_PROG_CXX_C_O' => 1,
'AC_LIBSOURCE' => 1,
'AC_CANONICAL_TARGET' => 1,
'sinclude' => 1,
'AM_PROG_MKDIR_P' => 1,
'AM_MAINTAINER_MODE' => 1,
'm4_sinclude' => 1,
'AM_SILENT_RULES' => 1,
'AM_NLS' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_FILES' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
'm4_include' => 1,
'AC_SUBST' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'_AM_COND_ENDIF' => 1,
'AC_FC_PP_SRCEXT' => 1,
'AM_SILENT_RULES' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_SUBST_TRACE' => 1,
'AM_PROG_AR' => 1,
'AH_OUTPUT' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'_m4_warn' => 1,
'm4_pattern_allow' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'LT_SUPPORTED_TAG' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_NLS' => 1,
'AC_FC_FREEFORM' => 1,
'AM_PATH_GUILE' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AM_EXTRA_RECURSIVE_TARGETS' => 1,
'AC_CANONICAL_HOST' => 1,
'AM_PROG_CC_C_O' => 1,
'AM_PROG_F77_C_O' => 1,
'AC_FC_PP_DEFINE' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
'_LT_AC_TAGCONFIG' => 1,
'm4_include' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AM_CONDITIONAL' => 1,
'_AM_COND_ELSE' => 1,
'AM_POT_TOOLS' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_PROG_MOC' => 1,
'sinclude' => 1,
'AM_PROG_CXX_C_O' => 1,
'_AM_COND_ENDIF' => 1,
'AC_CANONICAL_BUILD' => 1,
'AC_LIBSOURCE' => 1,
'm4_pattern_forbid' => 1,
'include' => 1,
'AM_PROG_MKDIR_P' => 1,
'AM_ENABLE_MULTILIB' => 1,
'AC_CONFIG_LINKS' => 1,
'AM_MAINTAINER_MODE' => 1,
'AC_CANONICAL_TARGET' => 1,
'AM_PROG_FC_C_O' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_HEADERS' => 1,
'AM_XGETTEXT_OPTION' => 1,
'AC_FC_PP_DEFINE' => 1,
'_AM_COND_IF' => 1,
'AC_CONFIG_FILES' => 1,
'AC_FC_SRCEXT' => 1,
'LT_INIT' => 1
'AC_INIT' => 1,
'LT_INIT' => 1,
'AM_GNU_GETTEXT' => 1,
'm4_sinclude' => 1
}
], 'Autom4te::Request' ),
bless( [
@ -188,185 +188,185 @@
'configure.ac'
],
{
'AM_PROG_INSTALL_STRIP' => 1,
'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
'_LT_REQUIRED_DARWIN_CHECKS' => 1,
'_AM_SET_OPTION' => 1,
'LTOPTIONS_VERSION' => 1,
'LT_SYS_MODULE_PATH' => 1,
'LT_FUNC_DLSYM_USCORE' => 1,
'AC_LTDL_SHLIBEXT' => 1,
'AC_LTDL_SYMBOL_USCORE' => 1,
'AC_LIBTOOL_DLOPEN' => 1,
'AC_LTDL_ENABLE_INSTALL' => 1,
'LT_OUTPUT' => 1,
'_AM_SET_OPTIONS' => 1,
'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
'AM_ENABLE_SHARED' => 1,
'LT_SYS_MODULE_EXT' => 1,
'_LT_PROG_ECHO_BACKSLASH' => 1,
'AC_LTDL_SYSSEARCHPATH' => 1,
'LT_CMD_MAX_LEN' => 1,
'AU_DEFUN' => 1,
'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
'AM_CONDITIONAL' => 1,
'AC_LIBTOOL_F77' => 1,
'AC_DISABLE_SHARED' => 1,
'_LT_AC_LOCK' => 1,
'AC_PATH_MAGIC' => 1,
'AC_LIBTOOL_COMPILER_OPTION' => 1,
'AC_DEPLIBS_CHECK_METHOD' => 1,
'LT_LIB_M' => 1,
'AM_ENABLE_STATIC' => 1,
'AC_PROG_LD_RELOAD_FLAG' => 1,
'AC_LIBTOOL_CXX' => 1,
'_LT_AC_SHELL_INIT' => 1,
'AM_DISABLE_STATIC' => 1,
'_LT_AC_SYS_COMPILER' => 1,
'LTSUGAR_VERSION' => 1,
'_AM_MANGLE_OPTION' => 1,
'AC_LTDL_OBJDIR' => 1,
'AM_SUBST_NOTMAKE' => 1,
'AM_SANITY_CHECK' => 1,
'LT_SYS_DLOPEN_DEPLIBS' => 1,
'AC_LTDL_DLSYM_USCORE' => 1,
'AM_MAKE_INCLUDE' => 1,
'_AM_PROG_TAR' => 1,
'_LT_COMPILER_OPTION' => 1,
'_LT_AC_LANG_CXX' => 1,
'AC_LIBTOOL_CONFIG' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'AC_LTDL_SHLIBPATH' => 1,
'_AM_PROG_CC_C_O' => 1,
'_LT_AC_PROG_CXXCPP' => 1,
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
'AC_LTDL_DLLIB' => 1,
'_LT_AC_TAGCONFIG' => 1,
'_LT_AC_LANG_GCJ' => 1,
'LT_LIB_DLLOAD' => 1,
'm4_pattern_forbid' => 1,
'_LT_AC_LANG_F77' => 1,
'AC_PROG_LIBTOOL' => 1,
'_LT_AC_FILE_LTDLL_C' => 1,
'_LT_PREPARE_SED_QUOTE_VARS' => 1,
'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
'AM_MISSING_HAS_RUN' => 1,
'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
'_m4_warn' => 1,
'_LT_AC_TAGVAR' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'LTDL_CONVENIENCE' => 1,
'AC_ENABLE_STATIC' => 1,
'_LT_LINKER_BOILERPLATE' => 1,
'm4_pattern_allow' => 1,
'AC_LIBTOOL_DLOPEN_SELF' => 1,
'AC_LIBLTDL_INSTALLABLE' => 1,
'_AM_MANGLE_OPTION' => 1,
'_AM_SET_OPTION' => 1,
'AC_DISABLE_SHARED' => 1,
'AM_PROG_LIBTOOL' => 1,
'_LT_AC_TAGCONFIG' => 1,
'_LT_LIBOBJ' => 1,
'LT_SUPPORTED_TAG' => 1,
'AM_PROG_LD' => 1,
'AC_LIBTOOL_LANG_C_CONFIG' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AM_PROG_NM' => 1,
'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
'LT_LIB_DLLOAD' => 1,
'_AM_DEPENDENCIES' => 1,
'LTDL_INSTALLABLE' => 1,
'_LT_AC_LANG_F77_CONFIG' => 1,
'AC_CHECK_LIBM' => 1,
'LT_AC_PROG_GCJ' => 1,
'AC_DEFUN_ONCE' => 1,
'LT_AC_PROG_SED' => 1,
'AM_MISSING_HAS_RUN' => 1,
'LTSUGAR_VERSION' => 1,
'AC_PROG_LIBTOOL' => 1,
'LT_OUTPUT' => 1,
'LT_INIT' => 1,
'AM_MISSING_PROG' => 1,
'AC_LTDL_SHLIBPATH' => 1,
'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
'_LT_PROG_LTMAIN' => 1,
'_LT_AC_LANG_CXX' => 1,
'_AC_PROG_LIBTOOL' => 1,
'AC_LIBTOOL_F77' => 1,
'AC_LIBTOOL_PICMODE' => 1,
'LT_LANG' => 1,
'AC_LTDL_OBJDIR' => 1,
'AC_LTDL_SHLIBEXT' => 1,
'AC_LIBTOOL_COMPILER_OPTION' => 1,
'_LT_CC_BASENAME' => 1,
'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
'AC_DEFUN' => 1,
'AC_LIBTOOL_SETUP' => 1,
'LT_CMD_MAX_LEN' => 1,
'AC_LIBTOOL_LINKER_OPTION' => 1,
'LT_PROG_GO' => 1,
'LT_PATH_LD' => 1,
'AC_LTDL_SYMBOL_USCORE' => 1,
'_AM_PROG_TAR' => 1,
'LT_FUNC_DLSYM_USCORE' => 1,
'm4_include' => 1,
'AM_ENABLE_SHARED' => 1,
'AC_LIBLTDL_CONVENIENCE' => 1,
'_LT_AC_LANG_RC_CONFIG' => 1,
'_LT_AC_LANG_GCJ' => 1,
'_LT_AC_LANG_CXX_CONFIG' => 1,
'AC_LIBTOOL_OBJDIR' => 1,
'AC_CONFIG_MACRO_DIR' => 1,
'LT_SYS_DLOPEN_DEPLIBS' => 1,
'AM_DEP_TRACK' => 1,
'_AM_IF_OPTION' => 1,
'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
'AC_ENABLE_FAST_INSTALL' => 1,
'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
'_AM_AUTOCONF_VERSION' => 1,
'AM_SANITY_CHECK' => 1,
'AM_CONDITIONAL' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
'AC_DEFUN' => 1,
'AU_DEFUN' => 1,
'_LT_AC_PROG_ECHO_BACKSLASH' => 1,
'LT_LIB_M' => 1,
'AC_PROG_LD_RELOAD_FLAG' => 1,
'AC_LTDL_DLLIB' => 1,
'_LT_COMPILER_BOILERPLATE' => 1,
'AC_LIBTOOL_RC' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'LTOPTIONS_VERSION' => 1,
'LT_PATH_NM' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
'm4_pattern_allow' => 1,
'AM_RUN_LOG' => 1,
'LT_PROG_RC' => 1,
'_LT_WITH_SYSROOT' => 1,
'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
'_LT_PREPARE_SED_QUOTE_VARS' => 1,
'AM_SILENT_RULES' => 1,
'AC_PROG_NM' => 1,
'_LT_DLL_DEF_P' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
'_LT_AC_LANG_GCJ_CONFIG' => 1,
'_LT_AC_LANG_C_CONFIG' => 1,
'AM_PROG_CC_C_O' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'_AM_CONFIG_MACRO_DIRS' => 1,
'_LT_PROG_F77' => 1,
'LT_SYS_DLSEARCH_PATH' => 1,
'm4_include' => 1,
'AM_INIT_AUTOMAKE' => 1,
'_LT_AC_TRY_DLOPEN_SELF' => 1,
'LT_INIT' => 1,
'LT_PATH_LD' => 1,
'AC_DISABLE_FAST_INSTALL' => 1,
'AC_LIBTOOL_WIN32_DLL' => 1,
'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
'LT_AC_PROG_GCJ' => 1,
'LT_PROG_GCJ' => 1,
'AC_LIBTOOL_OBJDIR' => 1,
'LT_AC_PROG_SED' => 1,
'AC_PROG_NM' => 1,
'LTVERSION_VERSION' => 1,
'AC_DEFUN_ONCE' => 1,
'AC_PATH_TOOL_PREFIX' => 1,
'AM_MISSING_PROG' => 1,
'_LT_PATH_TOOL_PREFIX' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
'LTDL_INIT' => 1,
'AC_LIBTOOL_LANG_C_CONFIG' => 1,
'_LT_PROG_CXX' => 1,
'LT_SYS_SYMBOL_USCORE' => 1,
'AM_PROG_LIBTOOL' => 1,
'AC_LTDL_ENABLE_INSTALL' => 1,
'_LT_AC_CHECK_DLFCN' => 1,
'AC_LIBTOOL_CONFIG' => 1,
'AC_LTDL_SYSSEARCHPATH' => 1,
'_LT_AC_SYS_COMPILER' => 1,
'AC_DISABLE_FAST_INSTALL' => 1,
'LT_AC_PROG_RC' => 1,
'LTOBSOLETE_VERSION' => 1,
'_LT_AC_FILE_LTDLL_C' => 1,
'AM_MAKE_INCLUDE' => 1,
'AC_PROG_LD' => 1,
'LT_FUNC_ARGZ' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'AC_LIBTOOL_DLOPEN' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1,
'LT_AC_PROG_EGREP' => 1,
'AC_LIB_LTDL' => 1,
'_m4_warn' => 1,
'_LT_AC_LANG_RC_CONFIG' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
'_LT_AC_LANG_F77_CONFIG' => 1,
'LT_LANG' => 1,
'LT_PATH_NM' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
'_LT_AC_LANG_F77' => 1,
'AM_SET_DEPDIR' => 1,
'include' => 1,
'AC_LIBLTDL_INSTALLABLE' => 1,
'_LT_PATH_TOOL_PREFIX' => 1,
'AC_LIBTOOL_DLOPEN_SELF' => 1,
'm4_pattern_forbid' => 1,
'LT_SYS_DLSEARCH_PATH' => 1,
'_LT_LINKER_BOILERPLATE' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
'_LT_AC_PROG_CXXCPP' => 1,
'AC_LIBTOOL_GCJ' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_PROG_EGREP' => 1,
'AC_LTDL_DLSYM_USCORE' => 1,
'AM_DISABLE_STATIC' => 1,
'_LT_LINKER_OPTION' => 1,
'LT_SYS_SYMBOL_USCORE' => 1,
'AC_LTDL_PREOPEN' => 1,
'AC_DEPLIBS_CHECK_METHOD' => 1,
'_LT_PROG_FC' => 1,
'LT_SYS_DLOPEN_SELF' => 1,
'LT_FUNC_ARGZ' => 1,
'LT_AC_PROG_RC' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AM_PROG_LD' => 1,
'LT_PROG_GO' => 1,
'AC_ENABLE_FAST_INSTALL' => 1,
'_LT_AC_LANG_CXX_CONFIG' => 1,
'LTOBSOLETE_VERSION' => 1,
'AM_SET_DEPDIR' => 1,
'AC_CONFIG_MACRO_DIR' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
'AM_PROG_INSTALL_SH' => 1,
'AC_WITH_LTDL' => 1,
'AM_SILENT_RULES' => 1,
'AM_RUN_LOG' => 1,
'_LT_LINKER_OPTION' => 1,
'AM_PROG_NM' => 1,
'AC_LTDL_PREOPEN' => 1,
'AC_LIBTOOL_PICMODE' => 1,
'_AM_IF_OPTION' => 1,
'AC_PROG_EGREP' => 1,
'AC_LIBTOOL_LINKER_OPTION' => 1,
'_LT_WITH_SYSROOT' => 1,
'AC_CHECK_LIBM' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'LTDL_CONVENIENCE' => 1,
'AC_PROG_LD_GNU' => 1,
'AC_LIBTOOL_WIN32_DLL' => 1,
'_LT_AC_TRY_DLOPEN_SELF' => 1,
'LT_PROG_GCJ' => 1,
'AC_PATH_MAGIC' => 1,
'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
'LT_WITH_LTDL' => 1,
'_LT_COMPILER_BOILERPLATE' => 1,
'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1,
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'LT_SUPPORTED_TAG' => 1,
'_AM_DEPENDENCIES' => 1,
'AC_DISABLE_STATIC' => 1,
'AM_DISABLE_SHARED' => 1,
'_LT_LIBOBJ' => 1,
'_AM_AUTOCONF_VERSION' => 1,
'AM_DEP_TRACK' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_LIBTOOL_RC' => 1,
'_LT_AC_LANG_C_CONFIG' => 1,
'_LT_AC_PROG_ECHO_BACKSLASH' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'_LT_DLL_DEF_P' => 1,
'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
'_LTDL_SETUP' => 1,
'AM_SET_LEADING_DOT' => 1,
'AC_LIBTOOL_GCJ' => 1,
'LT_PROG_RC' => 1,
'LTDL_INSTALLABLE' => 1,
'AC_LIBTOOL_PROG_CC_C_O' => 1,
'AC_WITH_LTDL' => 1,
'LT_WITH_LTDL' => 1,
'AC_LIB_LTDL' => 1,
'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
'AC_DISABLE_STATIC' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'_LTDL_SETUP' => 1,
'_LT_COMPILER_OPTION' => 1,
'_LT_PROG_CXX' => 1,
'LT_SYS_MODULE_EXT' => 1,
'_LT_AC_LOCK' => 1,
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
'AC_ENABLE_SHARED' => 1,
'_LT_PROG_LTMAIN' => 1,
'_AC_PROG_LIBTOOL' => 1,
'AC_PROG_LD' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'_LT_AC_LANG_GCJ_CONFIG' => 1,
'_LT_AC_TAGVAR' => 1,
'_LT_CC_BASENAME' => 1,
'AC_PROG_LD_GNU' => 1,
'_LT_AC_SHELL_INIT' => 1,
'AC_LIBTOOL_PROG_CC_C_O' => 1,
'_AM_PROG_CC_C_O' => 1,
'AC_LIBTOOL_CXX' => 1,
'AC_LIBTOOL_FC' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1
'AC_PATH_TOOL_PREFIX' => 1,
'AM_SUBST_NOTMAKE' => 1,
'LTVERSION_VERSION' => 1,
'AM_ENABLE_STATIC' => 1,
'_AM_SET_OPTIONS' => 1,
'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
'_LT_PROG_ECHO_BACKSLASH' => 1,
'AM_DISABLE_SHARED' => 1,
'LT_SYS_MODULE_PATH' => 1,
'AM_PROG_INSTALL_SH' => 1,
'LTDL_INIT' => 1,
'AC_LIBTOOL_SETUP' => 1
}
], 'Autom4te::Request' )
);

View File

@ -1,4 +1,4 @@
m4trace:configure.ac:6: -1- AC_INIT([nfdump], [1.6.14], [phaag@users.sourceforge.net])
m4trace:configure.ac:6: -1- AC_INIT([nfdump], [1.6.15], [peter@people.ops-trust.net])
m4trace:configure.ac:6: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:6: -1- m4_pattern_forbid([_AC_])
m4trace:configure.ac:6: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])

View File

@ -60,7 +60,7 @@ launch = launch.c launch.h
lib_LTLIBRARIES = libnfdump.la
libnfdump_la_SOURCES = $(common) $(util) $(filelzo) $(nflist) $(filter) $(exporter)
#libnfdump_la_LIBADD = -lz
libnfdump_la_LDFLAGS = -release 1.6.14
libnfdump_la_LDFLAGS = -release 1.6.15
nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \

View File

@ -719,7 +719,7 @@ launch = launch.c launch.h
lib_LTLIBRARIES = libnfdump.la
libnfdump_la_SOURCES = $(common) $(util) $(filelzo) $(nflist) $(filter) $(exporter)
#libnfdump_la_LIBADD = -lz
libnfdump_la_LDFLAGS = -release 1.6.14
libnfdump_la_LDFLAGS = -release 1.6.15
nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \
$(nflowcache) $(nfprof)

42
configure vendored
View File

@ -1,9 +1,9 @@
#! /bin/sh
# From configure.ac Revision: 243 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for nfdump 1.6.14.
# Generated by GNU Autoconf 2.69 for nfdump 1.6.15.
#
# Report bugs to <phaag@users.sourceforge.net>.
# Report bugs to <peter@people.ops-trust.net>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -276,10 +276,10 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
$0: phaag@users.sourceforge.net about your system,
$0: including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
$0: peter@people.ops-trust.net about your system, including
$0: any error possibly output before this message. Then
$0: install a modern shell, or manually run the script
$0: under such a shell if you do have one."
fi
exit 1
fi
@ -591,9 +591,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='nfdump'
PACKAGE_TARNAME='nfdump'
PACKAGE_VERSION='1.6.14'
PACKAGE_STRING='nfdump 1.6.14'
PACKAGE_BUGREPORT='phaag@users.sourceforge.net'
PACKAGE_VERSION='1.6.15'
PACKAGE_STRING='nfdump 1.6.15'
PACKAGE_BUGREPORT='peter@people.ops-trust.net'
PACKAGE_URL=''
# Factoring default headers for most tests.
@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures nfdump 1.6.14 to adapt to many kinds of systems.
\`configure' configures nfdump 1.6.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1424,7 +1424,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of nfdump 1.6.14:";;
short | recursive ) echo "Configuration of nfdump 1.6.15:";;
esac
cat <<\_ACEOF
@ -1491,7 +1491,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <phaag@users.sourceforge.net>.
Report bugs to <peter@people.ops-trust.net>.
_ACEOF
ac_status=$?
fi
@ -1554,7 +1554,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
nfdump configure 1.6.14
nfdump configure 1.6.15
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1899,9 +1899,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## ------------------------------------------ ##
## Report this to phaag@users.sourceforge.net ##
## ------------------------------------------ ##"
( $as_echo "## ----------------------------------------- ##
## Report this to peter@people.ops-trust.net ##
## ----------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@ -2217,7 +2217,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by nfdump $as_me 1.6.14, which was
It was created by nfdump $as_me 1.6.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3087,7 +3087,7 @@ fi
# Define the identity of the package.
PACKAGE='nfdump'
VERSION='1.6.14'
VERSION='1.6.15'
cat >>confdefs.h <<_ACEOF
@ -17242,7 +17242,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by nfdump $as_me 1.6.14, which was
This file was extended by nfdump $as_me 1.6.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -17302,13 +17302,13 @@ $config_headers
Configuration commands:
$config_commands
Report bugs to <phaag@users.sourceforge.net>."
Report bugs to <peter@people.ops-trust.net>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
nfdump config.status 1.6.14
nfdump config.status 1.6.15
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

View File

@ -3,7 +3,7 @@
AC_PREREQ(2.59)
AC_REVISION($Revision: 243 $)dnl
AC_INIT(nfdump, 1.6.14, phaag@users.sourceforge.net)
AC_INIT(nfdump, 1.6.15, peter@people.ops-trust.net)
# $Date: 2014-11-16 14:10:20 +0100 (Sun, 16 Nov 2014) $
#AC_CONFIG_SRCDIR([grammar.y])
AC_CONFIG_HEADER([config.h])

View File

@ -1,6 +1,6 @@
Name: nfdump
Summary: A set of command-line tools to collect and process netflow data
Version: 1.6.14
Version: 1.6.15
Release: 1
License: BSD
Group: Applications/System