update version for branch merge

README.md

@@ -113,6 +113,15 @@ We are pleased to announce the 3.0.0 release of the package, which has these fea
 * Cleaned up coverity errors and warnings.
 * Various bug fixes.
 
+### Release 4.0.1
+We are pleased to announce the 4.0.1 release of the package, which has these features:
+* Add additional API's for parent application processing of Flow Records and data features
+* Fixed TCP retransmission and out of order detection
+* Better identification of IDP packet
+* Fixed some memory usage issues
+* Fixed minor bugs
+* Removed dead code
+
 ### Release 4.0.0
 We are pleased to announce the 4.0.0 release of the package, which has these features:
 * Add support for building with autotools. ./configure;make clean;make

VERSION

@@ -1 +1 @@
-4.0.0
+4.0.1

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for joy 4.0.0.
+# Generated by GNU Autoconf 2.63 for joy 4.0.1.
 #
 # Report bugs to <[email protected]>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='joy'
 PACKAGE_TARNAME='joy'
-PACKAGE_VERSION='4.0.0'
-PACKAGE_STRING='joy 4.0.0'
+PACKAGE_VERSION='4.0.1'
+PACKAGE_STRING='joy 4.0.1'
 PACKAGE_BUGREPORT='[email protected]'
 
 ac_default_prefix=/usr/local/joy
@@ -1488,7 +1488,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 joy 4.0.0 to adapt to many kinds of systems.
+\`configure' configures joy 4.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1558,7 +1558,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of joy 4.0.0:";;
+     short | recursive ) echo "Configuration of joy 4.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1668,7 +1668,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-joy configure 4.0.0
+joy configure 4.0.1
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1682,7 +1682,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 joy $as_me 4.0.0, which was
+It was created by joy $as_me 4.0.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2536,7 +2536,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='joy'
- VERSION='4.0.0'
+ VERSION='4.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5616,7 +5616,7 @@ else
 fi
 
 ######################## PKG Versioning #######################
-PKG_VERSION_NUMBER="4:0:0"
+PKG_VERSION_NUMBER="4:0:1"
 
 
 cat >>confdefs.h <<\_ACEOF
@@ -5640,7 +5640,7 @@ _ACEOF
 # For each shared library
 #
               #joy.so age for version
-JOY_LIBRARY_VERSION="4:0:0"
+JOY_LIBRARY_VERSION="4:0:1"
 
 
 case `pwd` in
@@ -15956,7 +15956,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by joy $as_me 4.0.0, which was
+This file was extended by joy $as_me 4.0.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16019,7 +16019,7 @@ Report bugs to <[email protected]>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-joy config.status 4.0.0
+joy config.status 4.0.1
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

windows/include/win_types.h

@@ -3,7 +3,7 @@
 
 #include "stdint.h"
 
-#define VERSION "4.0.0"
+#define VERSION "4.0.1"
 
 #define PCAP_NETMASK_UNKNOWN    0xffffffff