[Pkg-awstats-commits] [awstats] 05/08: Refresh patches

Sergey Kirpichev sk-guest at moszumanska.debian.org
Sat Dec 28 20:50:57 UTC 2013


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

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

commit e271820c64575baa128dd81847b27db9eb344186
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Fri Oct 18 02:47:04 2013 +0400

    Refresh patches
---
 debian/patches/1003_redirect_to_STDERR.patch         | 4 ++--
 debian/patches/1004_perl_version.patch               | 2 +-
 debian/patches/1008_extrasections_with_top.patch     | 4 ++--
 debian/patches/1010_dirdata_permissions.patch        | 2 +-
 debian/patches/1013_yahoo_search.patch               | 2 +-
 debian/patches/1019_allow_frame_resize.patch         | 2 +-
 debian/patches/2002_nboflastupdatelookuptosave.patch | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/1003_redirect_to_STDERR.patch b/debian/patches/1003_redirect_to_STDERR.patch
index 2ed9cda..8a89e86 100644
--- a/debian/patches/1003_redirect_to_STDERR.patch
+++ b/debian/patches/1003_redirect_to_STDERR.patch
@@ -68,7 +68,7 @@ Bug-Debian: http://bugs.debian.org/296435
  
 --- a/tools/logresolvemerge.pl
 +++ b/tools/logresolvemerge.pl
-@@ -111,7 +111,7 @@
+@@ -131,7 +131,7 @@
  # Return:		None
  #------------------------------------------------------------------------------
  sub error {
@@ -77,7 +77,7 @@ Bug-Debian: http://bugs.debian.org/296435
      exit 1;
  }
  
-@@ -140,7 +140,7 @@
+@@ -160,7 +160,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 a49e70e..2fdcab9 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
-@@ -1848,7 +1848,7 @@
+@@ -1867,7 +1867,7 @@
  					$includeFile = "$1$includeFile";
  				}
  			}
diff --git a/debian/patches/1008_extrasections_with_top.patch b/debian/patches/1008_extrasections_with_top.patch
index a9fe682..760f932 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
-@@ -11621,7 +11621,7 @@
+@@ -11651,7 +11651,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>";
  
-@@ -16657,7 +16657,7 @@
+@@ -16687,7 +16687,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 64da0da..5d233f3 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
-@@ -2974,7 +2974,7 @@
+@@ -2993,7 +2993,7 @@
  	if ( !$MigrateStats && !-d $DirData ) {
  		if ($CreateDirDataIfNotExists) {
  			if ($Debug) { debug( " Make directory $DirData", 2 ); }
diff --git a/debian/patches/1013_yahoo_search.patch b/debian/patches/1013_yahoo_search.patch
index 47ce7d3..d6564a6 100644
--- a/debian/patches/1013_yahoo_search.patch
+++ b/debian/patches/1013_yahoo_search.patch
@@ -8,7 +8,7 @@ Bug-Debian: http://bugs.debian.org/347426
 
 --- a/wwwroot/cgi-bin/lib/search_engines.pm
 +++ b/wwwroot/cgi-bin/lib/search_engines.pm
-@@ -364,7 +364,7 @@
+@@ -437,7 +437,7 @@
  'google\.'=>'translate\.google\.',
  'msn\.'=>'hotmail\.msn\.',
  'tiscali\.'=>'mail\.tiscali\.',
diff --git a/debian/patches/1019_allow_frame_resize.patch b/debian/patches/1019_allow_frame_resize.patch
index 72f2741..cbdb94a 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
-@@ -17545,10 +17545,10 @@
+@@ -17575,10 +17575,10 @@
  	print "<frameset cols=\"$FRAMEWIDTH,*\">\n";
  	print "<frame name=\"mainleft\" src=\""
  	  . XMLEncode("$AWScript${NewLinkParams}framename=mainleft")
diff --git a/debian/patches/2002_nboflastupdatelookuptosave.patch b/debian/patches/2002_nboflastupdatelookuptosave.patch
index 9276f0d..7040dab 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
-@@ -16896,6 +16896,7 @@
+@@ -16926,6 +16926,7 @@
  	'showsteps',          'showdropped',
  	'showcorrupted',      'showunknownorigin',
  	'showdirectorigin',   'limitflush',
@@ -17,7 +17,7 @@ Bug-Debian: http://bugs.debian.org/600225
  	'confdir',            'updatefor',
  	'hostfilter',         'hostfilterex',
  	'urlfilter',          'urlfilterex',
-@@ -17111,6 +17112,7 @@
+@@ -17141,6 +17142,7 @@
  	foreach ( split( /,/, $2 ) ) { $NoLoadPlugin{ &Sanitize( "$_", 1 ) } = 1; }
  }
  if ( $QueryString =~ /(^|&|&)limitflush=(\d+)/i ) { $LIMITFLUSH = $2; }

-- 
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