Merging upstream version 1:7.0.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 47 insertions, 37 deletions

diff --git a/configure b/configure
index fb5335d..d17b55d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for suricata 7.0.4.
+# Generated by GNU Autoconf 2.71 for suricata 7.0.5.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -682,8 +682,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='suricata'
 PACKAGE_TARNAME='suricata'
-PACKAGE_VERSION='7.0.4'
-PACKAGE_STRING='suricata 7.0.4'
+PACKAGE_VERSION='7.0.5'
+PACKAGE_STRING='suricata 7.0.5'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -745,6 +745,7 @@ e_logcertsdir
 e_logfilesdir
 e_rundir
 e_logdir
+RELEASE_DATE
 HAVE_GIT_CMD
 HAS_FUZZLDFLAGS_FALSE
 HAS_FUZZLDFLAGS_TRUE
@@ -1661,7 +1662,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 suricata 7.0.4 to adapt to many kinds of systems.
+\`configure' configures suricata 7.0.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1732,7 +1733,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of suricata 7.0.4:";;
+     short | recursive ) echo "Configuration of suricata 7.0.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1975,7 +1976,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-suricata configure 7.0.4
+suricata configure 7.0.5
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2567,7 +2568,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 suricata $as_me 7.0.4, which was
+It was created by suricata $as_me 7.0.5, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4062,7 +4063,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='suricata'
- VERSION='7.0.4'
+ VERSION='7.0.5'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -22946,7 +22947,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 suricata $as_me 7.0.4, which was
+This file was extended by suricata $as_me 7.0.5, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23014,7 +23015,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-suricata config.status 7.0.4
+suricata config.status 7.0.5
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
@@ -24917,19 +24918,19 @@ fi
         fi
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for htp >= 0.5.47" >&5
-printf %s "checking for htp >= 0.5.47... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for htp >= 0.5.48" >&5
+printf %s "checking for htp >= 0.5.48... " >&6; }
 
 if test -n "$LIBHTPMINVERSION_CFLAGS"; then
     pkg_cv_LIBHTPMINVERSION_CFLAGS="$LIBHTPMINVERSION_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"htp >= 0.5.47\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "htp >= 0.5.47") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"htp >= 0.5.48\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "htp >= 0.5.48") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBHTPMINVERSION_CFLAGS=`$PKG_CONFIG --cflags "htp >= 0.5.47" 2>/dev/null`
+  pkg_cv_LIBHTPMINVERSION_CFLAGS=`$PKG_CONFIG --cflags "htp >= 0.5.48" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -24941,12 +24942,12 @@ if test -n "$LIBHTPMINVERSION_LIBS"; then
     pkg_cv_LIBHTPMINVERSION_LIBS="$LIBHTPMINVERSION_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"htp >= 0.5.47\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "htp >= 0.5.47") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"htp >= 0.5.48\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "htp >= 0.5.48") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBHTPMINVERSION_LIBS=`$PKG_CONFIG --libs "htp >= 0.5.47" 2>/dev/null`
+  pkg_cv_LIBHTPMINVERSION_LIBS=`$PKG_CONFIG --libs "htp >= 0.5.48" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -24967,9 +24968,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-                LIBHTPMINVERSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "htp >= 0.5.47" 2>&1`
+                LIBHTPMINVERSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "htp >= 0.5.48" 2>&1`
         else
-                LIBHTPMINVERSION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "htp >= 0.5.47" 2>&1`
+                LIBHTPMINVERSION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "htp >= 0.5.48" 2>&1`
         fi
         # Put the nasty error message in config.log where it belongs
         echo "$LIBHTPMINVERSION_PKG_ERRORS" >&5
@@ -25060,7 +25061,7 @@ printf "%s\n" "yes" >&6; }
 fi
             if test "$libhtp_devver_found" = "no"; then
                 echo
-                echo "   ERROR! libhtp was found but it is neither >= 0.5.47, nor the dev 0.5.X"
+                echo "   ERROR! libhtp was found but it is neither >= 0.5.48, nor the dev 0.5.X"
                 echo
                 exit 1
             fi
@@ -34295,14 +34296,8 @@ else
 fi
 
 
-# get revision
-    if test -f ./revision; then
-        REVISION=`cat ./revision`
-
-printf "%s\n" "#define REVISION ${REVISION}" >>confdefs.h
-
-    else
-        # Extract the first word of "git", so it can be a program name with args.
+# get git revision and last commit date
+    # Extract the first word of "git", so it can be a program name with args.
 set dummy git; ac_word=$2
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
@@ -34348,18 +34343,33 @@ printf "%s\n" "no" >&6; }
 fi
 
 
-        if test "$HAVE_GIT_CMD" != "no"; then
-            if  test -d .git ; then
-                REVISION=`git rev-parse --short HEAD`
-                DATE=`git log -1 --date=short --pretty=format:%cd`
-                REVISION="$REVISION $DATE"
+    if test "$HAVE_GIT_CMD" != "no"; then
+        if  test -e .git ; then
+            REVISION=`git rev-parse --short HEAD`
+            LAST_COMMIT_DATE=`git log -1 --date=short --pretty=format:%cd`
+            REVISION="$REVISION $LAST_COMMIT_DATE"
 
 printf "%s\n" "#define REVISION ${REVISION}" >>confdefs.h
 
-            fi
         fi
     fi
 
+# Get the release date. If LAST_COMMIT_DATE was set in the previous
+# step, use it, otherwise parse it from the ChangeLog.
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for release date" >&5
+printf %s "checking for release date... " >&6; }
+    if test "x$LAST_COMMIT_DATE" != "x"; then
+	RELEASE_DATE=$LAST_COMMIT_DATE
+    else
+        RELEASE_DATE=`awk '/^[0-9\.]+ -- [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print $3; exit }' $srcdir/ChangeLog`
+        if test "x$RELEASE_DATE" = "x"; then
+            as_fn_error $? "Failed to determine release date" "$LINENO" 5
+        fi
+    fi
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${RELEASE_DATE}" >&5
+printf "%s\n" "${RELEASE_DATE}" >&6; }
+
+
 # get MAJOR_MINOR version for embedding in configuration file.
     MAJOR_MINOR=`expr "${PACKAGE_VERSION}" : "\([0-9]\+\.[0-9]\+\).*"`
 
@@ -35272,7 +35282,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 suricata $as_me 7.0.4, which was
+This file was extended by suricata $as_me 7.0.5, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -35340,7 +35350,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-suricata config.status 7.0.4
+suricata config.status 7.0.5
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"