Clarification of some points of the ChangeLog.

Version number changed to 2.2.7.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcd3f7fae2e9e1d112564850ecf3d6beb65d0ea0..ffac54fd5fde3811d12996d459e17fce0f4802b7 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
 PROJECT(sarg C)
 SET(sarg_VERSION 2)
 SET(sarg_REVISION 2)
-SET(sarg_BUILD "7rc1")
-SET(sarg_BUILDDATE "Jan-22-2010")
+SET(sarg_BUILD "7")
+SET(sarg_BUILDDATE "Jan-26-2010")
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFile)

diff --git a/ChangeLog b/ChangeLog
index 0136d27f7bdd3957ef7874defc551626d7c87d08..24e6e1def41bcc654e987d6957c27e1776caac1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 SARG ChangeLog
 
-Jan-22-2010 Version 2.2.7
+Jan-26-2010 Version 2.2.7
                - Extra compile and run time protection (FORTIFY_SOURCE) fixed in configure.
                - Use tabulations as columns separator in intermediary files to avoid problems when a field of the log contains a space.
                - Input log file type detection partly rewritten to clearly distinguish which type is processed where.
@@ -14,11 +14,11 @@ Jan-22-2010 Version 2.2.7
                - Accept an absolute path for the language file in sarg.conf.
                - Experimental: Can show the backtrace of the program when a getword loop is detected to help in locating the origin of the error.
                - Protect the creation of the index against invalid directories.
-               - Only copy the files when creating the directory with the images to link the reports to.
+               - Only copy the files (not the subdirs) when creating the directory with the images to include in the reports.
                - Directories deleted without using the rm system command.
                - Index created using an internal sort algorithm instead of a system call.
-               - Fixed exclude_hosts to exclude subdomains and IPv4 subnets.
-               - Replace --enable-htmldir by --enable-sargphp to avoid confusion on the name.
+               - Fixed Debian bug #408577 (changed exclude_hosts to exclude subdomains and IPv4 subnets).
+               - Replace --enable-htmldir by --enable-sargphp to avoid confusion on the name (thanks to Peter Nixon).
                - Installation of sarg-php can be disabled with --disable-sargphp.
                - Fixed empty entries in squidGuard log when the URL doesn't start with protocol://.
                - Fixed regressions in creation and reading of a sarg parsed log (thanks to Joao Alves).

diff --git a/configure b/configure
index 86ac585d71a42a2c9b9c7b477045ddcd45bd691e..91c4fd9a51d2533f0062d090f5ac61bf620d70da 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for sarg 2.2.7rc1.
+# Generated by GNU Autoconf 2.61 for sarg 2.2.7.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sarg'
 PACKAGE_TARNAME='sarg'
-PACKAGE_VERSION='2.2.7rc1'
-PACKAGE_STRING='sarg 2.2.7rc1'
+PACKAGE_VERSION='2.2.7'
+PACKAGE_STRING='sarg 2.2.7'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="log.c"
@@ -1188,7 +1188,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 sarg 2.2.7rc1 to adapt to many kinds of systems.
+\`configure' configures sarg 2.2.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1253,7 +1253,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sarg 2.2.7rc1:";;
+     short | recursive ) echo "Configuration of sarg 2.2.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1354,7 +1354,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sarg configure 2.2.7rc1
+sarg configure 2.2.7
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1368,7 +1368,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 sarg $as_me 2.2.7rc1, which was
+It was created by sarg $as_me 2.2.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -7078,7 +7078,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 sarg $as_me 2.2.7rc1, which was
+This file was extended by sarg $as_me 2.2.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7121,7 +7121,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sarg config.status 2.2.7rc1
+sarg config.status 2.2.7
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index b72186ccbc335972c2b12f0e232555a19e806dbc..fdb31c76b185e6aeea615fe3ffb16be93e63b743 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([sarg],[2.2.7rc1])
+AC_INIT([sarg],[2.2.7])
 AC_CONFIG_SRCDIR([log.c])
 AC_CONFIG_AUX_DIR(cfgaux)
 

diff --git a/include/info.h b/include/info.h
index 45a38c8484a93ea622b92e2f9fb7fa4d8a2c12e2..1fb8de39e01b254e2ab0baba4c03716ae2ab7275 100755 (executable)
--- a/include/info.h
+++ b/include/info.h
@@ -1,3 +1,3 @@
-#define VERSION PACKAGE_VERSION" Jan-22-2010"
+#define VERSION PACKAGE_VERSION" Jan-26-2010"
 #define PGM PACKAGE_NAME
 #define URL "http://sarg.sourceforge.net"