[packages/vlogger] - rel 5; update debian patch

[arekm]

commit 1562b2176b668ba488d15bae5d1f0523cc364442
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Apr 8 21:15:12 2013 +0200

    - rel 5; update debian patch

 vlogger-debian.patch | 92 ++++++++++++++++++++++++++++++++++++++++++++++++----
 vlogger.spec         |  2 +-
 2 files changed, 87 insertions(+), 7 deletions(-)
---
diff --git a/vlogger.spec b/vlogger.spec
index 4013fce..064426a 100644
--- a/vlogger.spec
+++ b/vlogger.spec
@@ -3,7 +3,7 @@ Summary:	Virtual web logfile rotater/parser
 Summary(pl.UTF-8):	Narzędzie do rotacji i parsowania logów z wirtualnych hostów
 Name:		vlogger
 Version:	1.3
-Release:	4
+Release:	5
 License:	GPL
 Group:		Networking/Utilities
 Source0:	http://n0rp.chemlab.org/vlogger/%{name}-%{version}.tar.gz
diff --git a/vlogger-debian.patch b/vlogger-debian.patch
index 16ec938..92690a1 100644
--- a/vlogger-debian.patch
+++ b/vlogger-debian.patch
@@ -1,7 +1,39 @@
-diff -urbB vlogger-1.3.org/vlogger vlogger-1.3/vlogger
+diff -urN vlogger-1.3.org/vlogger vlogger-1.3/vlogger
 --- vlogger-1.3.org/vlogger	2005-03-18 15:43:34.000000000 +0100
-+++ vlogger-1.3/vlogger	2005-06-18 19:22:32.588302192 +0200
-@@ -380,6 +380,7 @@
++++ vlogger-1.3/vlogger	2013-04-08 21:14:10.816960935 +0200
+@@ -319,11 +319,12 @@
+ 
+ # pick a mode
+ if ( $OPTS{'e'} ) {
+-
++    my $logtime;
+     $0 = "vlogger (error log)";
+     # errorlog mode
++    $logtime=time();
+     open ELOG, ">>" . time2str( $TEMPLATE, time() )
+-      or die ( "can't open $LOGDIR/" . time2str( $TEMPLATE, time() ) );
++      or die ( "can't open $LOGDIR/" . time2str( $TEMPLATE, $logtime ) );
+ 
+     unless ( $OPTS{'a'} ) {
+         ELOG->autoflush(1);
+@@ -332,14 +333,14 @@
+         if ( -l $OPTS{'s'} ) {
+             unlink( $OPTS{'s'} );
+         }
+-        symlink( time2str( $TEMPLATE, time() ), $OPTS{'s'} );
++        symlink( time2str( $TEMPLATE, $logtime ), $OPTS{'s'} );
+     }
+ 
+     my $LASTWRITE = time();
+ 
+     while ( my $log_line = <STDIN> ) {
+         unless ( $OPTS{'n'} ) {
+-            if ( time2str( "%Y%m%d", time() ) >
++            if ( time2str( "%Y%m%d", $logtime ) >
+                 time2str( "%Y%m%d", $LASTWRITE ) )
+             {
+ 
+@@ -380,6 +381,7 @@
          if ( $vhost =~ m#[/\\]# ) { $vhost = "default" }
          $vhost =~ /(.*)/o;
          $vhost = $1;
@@ -9,7 +41,37 @@ diff -urbB vlogger-1.3.org/vlogger vlogger-1.3/vlogger
  
          if ( $OPTS{'i'} ) {
              $reqsize = $this_line[1] + $this_line[2];
-@@ -453,7 +454,7 @@
+@@ -409,7 +411,7 @@
+ 
+         # open a new log
+         if ( !$logs{$vhost} ) {
+-
++            my $logtime;
+             # check how many files we have open, close the oldest one
+             if ( keys(%logs) > $MAXFILES ) {
+                 my ( $key, $value ) =
+@@ -424,9 +426,10 @@
+             }
+ 
+             # open the file using the template
++            $logtime=time();
+             open $vhost, ">>${vhost}/" . time2str( $TEMPLATE, time() )
+               or die ( "can't open $LOGDIR/${vhost}/"
+-                . time2str( $TEMPLATE, time() ) );
++                . time2str( $TEMPLATE, $logtime ) );
+ 
+             # autoflush the handle unless -a
+             if ( !$OPTS{'a'} ) {
+@@ -439,7 +442,7 @@
+                 if ( -l $OPTS{'s'} ) {
+                     unlink( $OPTS{'s'} );
+                 }
+-                symlink( time2str( $TEMPLATE, time() ), $OPTS{'s'} );
++                symlink( time2str( $TEMPLATE, $logtime ), $OPTS{'s'} );
+                 chdir("..");
+             }
+         }
+@@ -453,7 +456,7 @@
              $log_line =~ s/^\S*\s+//o;
          }
  
@@ -18,9 +80,27 @@ diff -urbB vlogger-1.3.org/vlogger vlogger-1.3/vlogger
              $tracker{$vhost} += $reqsize;
          }
  
-diff -urbB vlogger-1.3.org/vlogger.1 vlogger-1.3/vlogger.1
+@@ -485,13 +488,15 @@
+ 
+ # sub to open new errorlog
+ sub open_errorlog {
+-    open ELOG, ">>" . time2str( $TEMPLATE, time() )
++    my $logtime;
++    $logtime=time();
++    open ELOG, ">>" . time2str( $TEMPLATE, $logtime )
+       or die ( "can't open $LOGDIR/" . time2str( $TEMPLATE, time() ) );
+     if ( $OPTS{'s'} ) {
+         if ( -l $OPTS{'s'} ) {
+             unlink( $OPTS{'s'} );
+         }
+-        symlink( time2str( $TEMPLATE, time() ), $OPTS{'s'} );
++        symlink( time2str( $TEMPLATE, $logtime ), $OPTS{'s'} );
+     }
+ 
+     # autoflush it unless -a
+diff -urN vlogger-1.3.org/vlogger.1 vlogger-1.3/vlogger.1
 --- vlogger-1.3.org/vlogger.1	2005-03-18 15:43:56.000000000 +0100
-+++ vlogger-1.3/vlogger.1	2005-06-18 19:22:29.060838448 +0200
++++ vlogger-1.3/vlogger.1	2013-04-08 21:13:58.493352838 +0200
 @@ -153,7 +153,7 @@
  .PP
  Then call it from a customlog:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vlogger.git/commitdiff/1562b2176b668ba488d15bae5d1f0523cc364442