[Pkg-awstats-commits] [awstats] 03/04: Refresh patches

Sergey Kirpichev sk-guest at moszumanska.debian.org
Fri Feb 7 15:45:59 UTC 2014


This is an automated email from the git hooks/post-receive script.

sk-guest pushed a commit to branch master
in repository awstats.

commit a01154a6cf9da707dd8bedb2ebfa13cb2784eb76
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Fri Feb 7 18:30:59 2014 +0400

    Refresh patches
---
 debian/patches/0007_russian_lang.patch             | 11 ++-------
 debian/patches/1003_redirect_to_STDERR.patch       | 14 +++++------
 debian/patches/1004_perl_version.patch             |  4 ++--
 debian/patches/1008_extrasections_with_top.patch   |  4 ++--
 debian/patches/1010_dirdata_permissions.patch      |  2 +-
 debian/patches/1012_ipv6_strip_trailing_dot.patch  |  2 +-
 debian/patches/1013_yahoo_search.patch             |  4 ++--
 debian/patches/1014_websec_robot.patch             |  4 ++--
 debian/patches/1019_allow_frame_resize.patch       |  2 +-
 debian/patches/1020_LogFile_usage_docs.patch       |  2 +-
 debian/patches/2001_awstatsprog_path.patch         |  2 +-
 .../patches/2002_nboflastupdatelookuptosave.patch  |  4 ++--
 debian/patches/2003_awstats.conf.patch             | 28 +++++++++++-----------
 debian/patches/2005_remove_donation.patch          |  2 +-
 14 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/debian/patches/0007_russian_lang.patch b/debian/patches/0007_russian_lang.patch
index 5ad38e5..d4247b8 100644
--- a/debian/patches/0007_russian_lang.patch
+++ b/debian/patches/0007_russian_lang.patch
@@ -3,18 +3,11 @@ Author: Sergey B Kirpichev <skirpichev at gmail.com>
 Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3199735&group_id=13764&atid=113764
 
 ---
- wwwroot/cgi-bin/lang/awstats-ru.txt |   40 ++++++++++++++++++------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
+ wwwroot/cgi-bin/lang/awstats-ru.txt |   38 ++++++++++++++++++------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
 
 --- a/wwwroot/cgi-bin/lang/awstats-ru.txt
 +++ b/wwwroot/cgi-bin/lang/awstats-ru.txt
-@@ -1,5 +1,5 @@
- # Russian message file
--# $Revision: 1.15 $ - $Date: 2009/10/25 11:12:35 $
-+# $Revision$ - $Date$
- PageCode=utf-8
- message0=Неизвестный
- message1=Неизвестный
 @@ -61,18 +61,18 @@
  message57=Хиты
  message58=Версии
diff --git a/debian/patches/1003_redirect_to_STDERR.patch b/debian/patches/1003_redirect_to_STDERR.patch
index 8a89e86..aee9af6 100644
--- a/debian/patches/1003_redirect_to_STDERR.patch
+++ b/debian/patches/1003_redirect_to_STDERR.patch
@@ -13,7 +13,7 @@ Bug-Debian: http://bugs.debian.org/296435
 
 --- a/tools/awstats_buildstaticpages.pl
 +++ b/tools/awstats_buildstaticpages.pl
-@@ -80,7 +80,7 @@
+@@ -79,7 +79,7 @@
  # Return:		None
  #------------------------------------------------------------------------------
  sub error {
@@ -22,7 +22,7 @@ Bug-Debian: http://bugs.debian.org/296435
      exit 1;
  }
  
-@@ -100,7 +100,7 @@
+@@ -99,7 +99,7 @@
  #    		print "$messagestring<br />\n";
  #    	}
  #    	else {
@@ -33,7 +33,7 @@ Bug-Debian: http://bugs.debian.org/296435
  }
 --- a/tools/awstats_configure.pl
 +++ b/tools/awstats_configure.pl
-@@ -88,7 +88,7 @@
+@@ -87,7 +87,7 @@
  # error
  #-------------------------------------------------------
  sub error {
@@ -44,7 +44,7 @@ Bug-Debian: http://bugs.debian.org/296435
  
 --- a/tools/awstats_exportlib.pl
 +++ b/tools/awstats_exportlib.pl
-@@ -93,8 +93,8 @@
+@@ -92,8 +92,8 @@
  	my $thirdmessage=shift||"";
  	my $donotshowsetupinfo=shift||0;
  	if ($Debug) { debug("$message $secondmessage $thirdmessage",1); }
@@ -57,7 +57,7 @@ Bug-Debian: http://bugs.debian.org/296435
  
 --- a/tools/awstats_updateall.pl
 +++ b/tools/awstats_updateall.pl
-@@ -37,7 +37,7 @@
+@@ -36,7 +36,7 @@
  # Return:		None
  #------------------------------------------------------------------------------
  sub error {
@@ -68,7 +68,7 @@ Bug-Debian: http://bugs.debian.org/296435
  
 --- a/tools/logresolvemerge.pl
 +++ b/tools/logresolvemerge.pl
-@@ -131,7 +131,7 @@
+@@ -130,7 +130,7 @@
  # Return:		None
  #------------------------------------------------------------------------------
  sub error {
@@ -77,7 +77,7 @@ Bug-Debian: http://bugs.debian.org/296435
      exit 1;
  }
  
-@@ -160,7 +160,7 @@
+@@ -159,7 +159,7 @@
  sub warning {
  	my $messagestring=shift;
  	if ($Debug) { debug("$messagestring",1); }
diff --git a/debian/patches/1004_perl_version.patch b/debian/patches/1004_perl_version.patch
index 2fdcab9..c44380a 100644
--- a/debian/patches/1004_perl_version.patch
+++ b/debian/patches/1004_perl_version.patch
@@ -11,7 +11,7 @@ Bug-Debian: http://bugs.debian.org/519319
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -1867,7 +1867,7 @@
+@@ -1868,7 +1868,7 @@
  					$includeFile = "$1$includeFile";
  				}
  			}
@@ -22,7 +22,7 @@ Bug-Debian: http://bugs.debian.org/519319
  				);
 --- a/tools/awstats_buildstaticpages.pl
 +++ b/tools/awstats_buildstaticpages.pl
-@@ -192,7 +192,7 @@
+@@ -191,7 +191,7 @@
  			    # Correct relative include files
  				if ($FileConfig =~ /^(.*[\\\/])[^\\\/]*$/) { $includeFile = "$1$includeFile"; }
  			}
diff --git a/debian/patches/1008_extrasections_with_top.patch b/debian/patches/1008_extrasections_with_top.patch
index 760f932..95ebd38 100644
--- a/debian/patches/1008_extrasections_with_top.patch
+++ b/debian/patches/1008_extrasections_with_top.patch
@@ -8,7 +8,7 @@ Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1844793&group_id=1
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -11651,7 +11651,7 @@
+@@ -11654,7 +11654,7 @@
  			if ($Debug) { debug( "ExtraName$extranum", 2 ); }
  			print "$Center<a name=\"extra$extranum\"> </a><br />";
  			my $title = $ExtraName[$extranum];
@@ -17,7 +17,7 @@ Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1844793&group_id=1
  			print "<tr bgcolor=\"#$color_TableBGRowTitle\">";
  			print "<th>" . $ExtraFirstColumnTitle[$extranum] . "</th>";
  
-@@ -16687,7 +16687,7 @@
+@@ -16690,7 +16690,7 @@
  	if ($Debug) { debug( "ExtraName$extranum", 2 ); }
  	print "$Center<a name=\"extra$extranum\"> </a><br />";
  	my $title = $ExtraName[$extranum];
diff --git a/debian/patches/1010_dirdata_permissions.patch b/debian/patches/1010_dirdata_permissions.patch
index 5d233f3..eb0da0c 100644
--- a/debian/patches/1010_dirdata_permissions.patch
+++ b/debian/patches/1010_dirdata_permissions.patch
@@ -8,7 +8,7 @@ Bug-Debian: http://bugs.debian.org/299148
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -2993,7 +2993,7 @@
+@@ -2994,7 +2994,7 @@
  	if ( !$MigrateStats && !-d $DirData ) {
  		if ($CreateDirDataIfNotExists) {
  			if ($Debug) { debug( " Make directory $DirData", 2 ); }
diff --git a/debian/patches/1012_ipv6_strip_trailing_dot.patch b/debian/patches/1012_ipv6_strip_trailing_dot.patch
index 8cb9764..928c764 100644
--- a/debian/patches/1012_ipv6_strip_trailing_dot.patch
+++ b/debian/patches/1012_ipv6_strip_trailing_dot.patch
@@ -8,7 +8,7 @@ Bug-Debian: http://bugs.debian.org/397544
 
 --- a/wwwroot/cgi-bin/plugins/ipv6.pm
 +++ b/wwwroot/cgi-bin/plugins/ipv6.pm
-@@ -64,6 +64,7 @@
+@@ -63,6 +63,7 @@
  	my $query = $resolver->query($reverseip, "PTR");
  	if (! defined($query)) { return; }
  	my @result=split(/\s/, ($query->answer)[0]->string);
diff --git a/debian/patches/1013_yahoo_search.patch b/debian/patches/1013_yahoo_search.patch
index d6564a6..2473bd0 100644
--- a/debian/patches/1013_yahoo_search.patch
+++ b/debian/patches/1013_yahoo_search.patch
@@ -8,8 +8,8 @@ Bug-Debian: http://bugs.debian.org/347426
 
 --- a/wwwroot/cgi-bin/lib/search_engines.pm
 +++ b/wwwroot/cgi-bin/lib/search_engines.pm
-@@ -437,7 +437,7 @@
- 'google\.'=>'translate\.google\.',
+@@ -475,7 +475,7 @@
+ 'google\.'=>'code\.google\.',
  'msn\.'=>'hotmail\.msn\.',
  'tiscali\.'=>'mail\.tiscali\.',
 -'yahoo\.'=>'mail\.yahoo\.',
diff --git a/debian/patches/1014_websec_robot.patch b/debian/patches/1014_websec_robot.patch
index 199b0d3..0aca0cd 100644
--- a/debian/patches/1014_websec_robot.patch
+++ b/debian/patches/1014_websec_robot.patch
@@ -8,7 +8,7 @@ Bug-Debian: http://bugs.debian.org/284149
 
 --- a/wwwroot/cgi-bin/lib/browsers.pm
 +++ b/wwwroot/cgi-bin/lib/browsers.pm
-@@ -255,7 +255,8 @@
+@@ -254,7 +254,8 @@
  'POE\-Component\-Client\-HTTP',
  'mozilla',				# Must be at end because a lot of browsers contains mozilla in string
  'libwww',				# Must be at end because some browser have both 'browser id' and 'libwww'
@@ -18,7 +18,7 @@ Bug-Debian: http://bugs.debian.org/284149
  );
  
  # BrowsersHashIDLib
-@@ -483,7 +484,8 @@
+@@ -482,7 +483,8 @@
  'POE\-Component\-Client\-HTTP','HTTP user-agent for POE (portable networking framework for Perl)',
  'mozilla','Mozilla',
  'libwww','LibWWW',
diff --git a/debian/patches/1019_allow_frame_resize.patch b/debian/patches/1019_allow_frame_resize.patch
index cbdb94a..ff3c60d 100644
--- a/debian/patches/1019_allow_frame_resize.patch
+++ b/debian/patches/1019_allow_frame_resize.patch
@@ -8,7 +8,7 @@ Debian-Bug: http://bugs.debian.org/293218
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -17575,10 +17575,10 @@
+@@ -17583,10 +17583,10 @@
  	print "<frameset cols=\"$FRAMEWIDTH,*\">\n";
  	print "<frame name=\"mainleft\" src=\""
  	  . XMLEncode("$AWScript${NewLinkParams}framename=mainleft")
diff --git a/debian/patches/1020_LogFile_usage_docs.patch b/debian/patches/1020_LogFile_usage_docs.patch
index 5e3f2c1..24473ab 100644
--- a/debian/patches/1020_LogFile_usage_docs.patch
+++ b/debian/patches/1020_LogFile_usage_docs.patch
@@ -20,7 +20,7 @@ Bug-Debian: http://bugs.debian.org/435028
  <br>#
 --- a/wwwroot/cgi-bin/awstats.model.conf
 +++ b/wwwroot/cgi-bin/awstats.model.conf
-@@ -44,7 +44,7 @@
+@@ -43,7 +43,7 @@
  # Example: "/var/log/access_log.%YYYY-0%MM-0%DD-0.log"
  # Example: "C:/WINNT/system32/LogFiles/W3SVC1/ex%YY-24%MM-24%DD-24.log"
  # You can also use a pipe if log file come from a pipe :
diff --git a/debian/patches/2001_awstatsprog_path.patch b/debian/patches/2001_awstatsprog_path.patch
index c67824e..38443de 100644
--- a/debian/patches/2001_awstatsprog_path.patch
+++ b/debian/patches/2001_awstatsprog_path.patch
@@ -7,7 +7,7 @@ Author: Sergey B Kirpichev <skirpichev at gmail.com>
 
 --- a/tools/awstats_buildstaticpages.pl
 +++ b/tools/awstats_buildstaticpages.pl
-@@ -308,8 +308,8 @@
+@@ -307,8 +307,8 @@
  # Check if AWSTATS prog is found
  my $AwstatsFound=0;
  if (-s "$Awstats") { $AwstatsFound=1; }
diff --git a/debian/patches/2002_nboflastupdatelookuptosave.patch b/debian/patches/2002_nboflastupdatelookuptosave.patch
index 7040dab..95af7e7 100644
--- a/debian/patches/2002_nboflastupdatelookuptosave.patch
+++ b/debian/patches/2002_nboflastupdatelookuptosave.patch
@@ -9,7 +9,7 @@ Bug-Debian: http://bugs.debian.org/600225
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -16926,6 +16926,7 @@
+@@ -16929,6 +16929,7 @@
  	'showsteps',          'showdropped',
  	'showcorrupted',      'showunknownorigin',
  	'showdirectorigin',   'limitflush',
@@ -17,7 +17,7 @@ Bug-Debian: http://bugs.debian.org/600225
  	'confdir',            'updatefor',
  	'hostfilter',         'hostfilterex',
  	'urlfilter',          'urlfilterex',
-@@ -17141,6 +17142,7 @@
+@@ -17144,6 +17145,7 @@
  	foreach ( split( /,/, $2 ) ) { $NoLoadPlugin{ &Sanitize( "$_", 1 ) } = 1; }
  }
  if ( $QueryString =~ /(^|&|&)limitflush=(\d+)/i ) { $LIMITFLUSH = $2; }
diff --git a/debian/patches/2003_awstats.conf.patch b/debian/patches/2003_awstats.conf.patch
index f66ab21..7fd19d7 100644
--- a/debian/patches/2003_awstats.conf.patch
+++ b/debian/patches/2003_awstats.conf.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/wwwroot/cgi-bin/awstats.model.conf
 +++ b/wwwroot/cgi-bin/awstats.model.conf
-@@ -48,7 +48,7 @@
+@@ -47,7 +47,7 @@
  # If there are several log files from load balancing servers :
  # Example: "/pathtotools/logresolvemerge.pl *.log |"
  #
@@ -17,7 +17,7 @@ Forwarded: not-needed
  
  
  # Enter the log file type you want to analyze.
-@@ -120,7 +120,7 @@
+@@ -119,7 +119,7 @@
  # Example for IIS:
  # LogFormat = 2
  #
@@ -26,7 +26,7 @@ Forwarded: not-needed
  
  
  # If your log field's separator is not a space, you can change this parameter.
-@@ -166,7 +166,7 @@
+@@ -165,7 +165,7 @@
  # Note: You can also use @/mypath/myfile if list of aliases are in a file.
  # Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]"
  #
@@ -35,7 +35,7 @@ Forwarded: not-needed
  
  
  # If you want to have hosts reported by name instead of ip address, AWStats
-@@ -186,7 +186,7 @@
+@@ -185,7 +185,7 @@
  # 2 - DNS Lookup is made only from static DNS cache file (if it exists)
  # Default: 2
  # 
@@ -44,7 +44,7 @@ Forwarded: not-needed
  
  
  # When AWStats updates its statistics, it stores results of its analysis in 
-@@ -201,7 +201,7 @@
+@@ -200,7 +200,7 @@
  # Example: "C:/awstats_data_dir"
  # Default: "."          (means same directory as awstats.pl)
  #
@@ -53,7 +53,7 @@ Forwarded: not-needed
  
  
  # Relative or absolute web URL of your awstats cgi-bin directory.
-@@ -220,7 +220,7 @@
+@@ -219,7 +219,7 @@
  # Example: "../icon"
  # Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon")
  #
@@ -62,7 +62,7 @@ Forwarded: not-needed
  
  
  # When this parameter is set to 1, AWStats adds a button on report page to
-@@ -917,7 +917,7 @@
+@@ -916,7 +916,7 @@
  # Example: "/usr/share/awstats/lang"
  # Default: "./lang" (means lang directory is in same location than awstats.pl)
  #
@@ -71,7 +71,7 @@ Forwarded: not-needed
  
  
  # Show menu header with reports' links
-@@ -1313,7 +1313,7 @@
+@@ -1312,7 +1312,7 @@
  # DESCRIPTION: AWStats DNS cache files are read/saved as native hash files. 
  # This increases DNS cache files loading speed, above all for very large web sites.
  #
@@ -80,7 +80,7 @@ Forwarded: not-needed
  
  
  # PLUGIN: UserInfo
-@@ -1426,7 +1426,7 @@
+@@ -1425,7 +1425,7 @@
  # table with country name
  # Replace spaces in the path of geoip data file with string "%20".
  #
@@ -89,7 +89,7 @@ Forwarded: not-needed
  
  # PLUGIN: GeoIP_City_Maxmind
  # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
-@@ -1435,7 +1435,7 @@
+@@ -1434,7 +1434,7 @@
  # and hits by city including regions.
  # Replace spaces in the path of geoip data file with string "%20".
  #
@@ -98,7 +98,7 @@ Forwarded: not-needed
  
  # PLUGIN: GeoIP_ASN_Maxmind
  # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
-@@ -1455,7 +1455,7 @@
+@@ -1454,7 +1454,7 @@
  # Canada can be detected.
  # Replace spaces in the path of geoip data file with string "%20".
  #
@@ -107,7 +107,7 @@ Forwarded: not-needed
  
  # PLUGIN: GeoIP_ISP_Maxmind
  # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
-@@ -1463,7 +1463,7 @@
+@@ -1462,7 +1462,7 @@
  # DESCRIPTION: This plugin adds a chart of hits by ISP.
  # Replace spaces in the path of geoip data file with string "%20".
  #
@@ -116,7 +116,7 @@ Forwarded: not-needed
  
  # PLUGIN: GeoIP_Org_Maxmind
  # REQUIRED MODULES: Geo::IP or Geo::IP::PurePerl (from Maxmind)
-@@ -1471,7 +1471,7 @@
+@@ -1470,7 +1470,7 @@
  # DESCRIPTION: This plugin add a chart of hits by Organization name
  # Replace spaces in the path of geoip data file with string "%20".
  #
@@ -125,7 +125,7 @@ Forwarded: not-needed
  
  
  #-----------------------------------------------------------------------------
-@@ -1554,5 +1554,5 @@
+@@ -1553,5 +1553,5 @@
  # parameters that are lists of values.
  #
  
diff --git a/debian/patches/2005_remove_donation.patch b/debian/patches/2005_remove_donation.patch
index 38fd6dc..705e750 100644
--- a/debian/patches/2005_remove_donation.patch
+++ b/debian/patches/2005_remove_donation.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/docs/index.html
 +++ b/docs/index.html
-@@ -167,14 +167,6 @@
+@@ -144,14 +144,6 @@
  
  <hr color="DDDDDD">
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/awstats.git



More information about the Pkg-awstats-commits mailing list