From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 29 Jan 2014 15:09:04 +0000 (+0100)
Subject: Do not use REVISION anymore
X-Git-Tag: AWSTATS_7_3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6e5460f5545d279c08998f85b162815ca0b9815;p=thirdparty%2FAWStats.git

Do not use REVISION anymore
---

diff --git a/make/makepack-awstats.pl b/make/makepack-awstats.pl
index cc9a3177..9ec6d18f 100755
--- a/make/makepack-awstats.pl
+++ b/make/makepack-awstats.pl
@@ -49,7 +49,7 @@ if (-d "/home/ldestail/rpmbuild") {
     $RPMDIR="/home/ldestail/rpmbuild";
 }
 use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision$'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='20140126';
 $VERSION="1.0 (build $REVISION)";
 
 
diff --git a/make/makepack-awstats_webmin.pl b/make/makepack-awstats_webmin.pl
index 6e82c085..086785bd 100755
--- a/make/makepack-awstats_webmin.pl
+++ b/make/makepack-awstats_webmin.pl
@@ -36,7 +36,7 @@ if (-d "/usr/src/RPM") {
     $RPMDIR="/usr/src/RPM";
 }
 use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision$'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$REVISION';
 $VERSION="1.0 (build $REVISION)";
 
 
diff --git a/tools/awstats_buildstaticpages.pl b/tools/awstats_buildstaticpages.pl
index 78bad6eb..82f4f268 100644
--- a/tools/awstats_buildstaticpages.pl
+++ b/tools/awstats_buildstaticpages.pl
@@ -14,8 +14,7 @@ use Time::Local;	# use Time::Local 'timelocal_nocheck' is faster but not support
 #------------------------------------------------------------------------------
 # Defines
 #------------------------------------------------------------------------------
-my $REVISION = '20140126';
-$REVISION =~ /\s(.*)\s/; $REVISION=$1;
+my $REVISION='20140126';
 my $VERSION="1.2 (build $REVISION)";
 
 # ---------- Init variables --------
diff --git a/tools/awstats_configure.pl b/tools/awstats_configure.pl
index a6f69301..6dc1660d 100644
--- a/tools/awstats_configure.pl
+++ b/tools/awstats_configure.pl
@@ -45,8 +45,7 @@ my $reg;
 eval('use Win32::TieRegistry ( Delimiter=>"/", TiedRef=>\$reg )');
 
 use vars qw/ $REVISION $VERSION /;
-$REVISION = '20140126';
-$REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='20140126';
 $VERSION="1.0 (build $REVISION)";
 
 use vars qw/
diff --git a/tools/awstats_exportlib.pl b/tools/awstats_exportlib.pl
index 5bd73c8a..40a4fb20 100644
--- a/tools/awstats_exportlib.pl
+++ b/tools/awstats_exportlib.pl
@@ -14,9 +14,8 @@ use strict;no strict "refs";
 # Defines
 #-----------------------------------------------------------------------------
 use vars qw/ $REVISION $VERSION /;
-$REVISION = '20140126';
-$REVISION =~ /\s(.*)\s/; $REVISION=$1;
-my $VERSION="5.1 (build $REVISION)";
+$REVISION='20140126';
+$VERSION="5.1 (build $REVISION)";
 
 # ---------- Init variables -------
 # Constants
diff --git a/tools/awstats_updateall.pl b/tools/awstats_updateall.pl
index 6fa39dfd..07ec4c1f 100644
--- a/tools/awstats_updateall.pl
+++ b/tools/awstats_updateall.pl
@@ -9,7 +9,6 @@
 # Defines
 #------------------------------------------------------------------------------
 my $REVISION = '20140126';
-$REVISION =~ /\s(.*)\s/; $REVISION=$1;
 my $VERSION="1.0 (build $REVISION)";
 
 # Default value of DIRCONFIG
diff --git a/tools/geoip_generator.pl b/tools/geoip_generator.pl
index da8b7841..2961cc8e 100644
--- a/tools/geoip_generator.pl
+++ b/tools/geoip_generator.pl
@@ -13,7 +13,6 @@ use Switch;
 # Defines
 #------------------------------------------------------------------------------
 my $REVISION = '20140126';
-$REVISION =~ /\s(.*)\s/; $REVISION=$1;
 my $VERSION="0.5 (build $REVISION)";
 
 use vars qw/
diff --git a/tools/logresolvemerge.pl b/tools/logresolvemerge.pl
index bfb088d8..39cd068d 100644
--- a/tools/logresolvemerge.pl
+++ b/tools/logresolvemerge.pl
@@ -36,7 +36,6 @@ my %TmpDNSLookup = ();
 # ---------- Init variables --------
 use vars qw/ $REVISION $VERSION /;
 $REVISION = '20140126';
-$REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.2 (build $REVISION)";
 
 use vars qw/ $NBOFLINESFORBENCHMARK /;
diff --git a/tools/maillogconvert.pl b/tools/maillogconvert.pl
index 2bd2ae05..5ab463c1 100644
--- a/tools/maillogconvert.pl
+++ b/tools/maillogconvert.pl
@@ -20,7 +20,6 @@ use strict;no strict "refs";
 #-------------------------------------------------------
 use vars qw/ $REVISION $VERSION /;
 $REVISION = '20140126';
-$REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.2 (build $REVISION)";
 
 use vars qw/
diff --git a/tools/urlaliasbuilder.pl b/tools/urlaliasbuilder.pl
index 4ca5eecb..c0f65096 100644
--- a/tools/urlaliasbuilder.pl
+++ b/tools/urlaliasbuilder.pl
@@ -17,7 +17,6 @@ use strict;no strict "refs";
 
 # variables, etc
 my $REVISION = '20140126';
-$REVISION =~ /\s(.*)\s/; $REVISION=$1;
 my $VERSION="1.0 (build $REVISION)";
 
 ############### EDIT HERE ###############
diff --git a/wwwroot/cgi-bin/awredir.pl b/wwwroot/cgi-bin/awredir.pl
index 0d641ded..3c560b93 100755
--- a/wwwroot/cgi-bin/awredir.pl
+++ b/wwwroot/cgi-bin/awredir.pl
@@ -27,8 +27,7 @@ use Digest::MD5 qw(md5 md5_hex md5_base64);
 # Defines
 #-------------------------------------------------------
 use vars qw/ $REVISION $VERSION /;
-$REVISION = '20140126';
-$REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='20140126';
 $VERSION="1.2 (build $REVISION)";
 
 use vars qw / $DIR $PROG $Extension $DEBUG $DEBUGFILE $REPLOG $DEBUGRESET $SITE $REPCONF /;
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 0156dde3..8e70e9df 100755
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -37,8 +37,6 @@ use File::Spec;
 #------------------------------------------------------------------------------
 use vars qw/ $REVISION $VERSION /;
 $REVISION = '20140126';
-$REVISION =~ /\s(.*)\s/;
-$REVISION = $1;
 $VERSION  = "7.3 (build $REVISION)";
 
 # ----- Constants -----