head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.2.2.2
	OPENPKG_E1_FP:1.2.2.2
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.2.2.2
	OPENPKG_2_STABLE:1.2.0.2
	OPENPKG_CW_FP:1.2;
locks; strict;
comment	@# @;
expand	@o@;


1.2
date	2004.12.18.21.50.35;	author rse;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2004.12.18.21.37.12;	author rse;	state Exp;
branches;
next	;

1.2.2.1
date	2004.12.18.21.50.35;	author rse;	state dead;
branches;
next	1.2.2.2;
commitid	iZxwRSmmWscPXUQr;

1.2.2.2
date	2006.10.16.14.50.02;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.2
log
@remove crap from patch
@
text
@Index: flowscan.in
--- flowscan.in.orig	2001-02-16 22:17:31 +0100
+++ flowscan.in	2004-12-18 19:11:35 +0100
@@@@ -22,13 +22,13 @@@@
 
 require 5.004; # for UNIVERSAL::can method
 use FindBin;
+use lib $FindBin::Bin;
 use Cflow qw(:flowvars 1.017);
 use Benchmark;
 use Getopt::Std;
 use POSIX; # for strftime
 use File::Basename;
 use ConfigReader::DirectiveStyle;
-use lib $FindBin::Bin;
 use FlowScan; # for mutt_mktime, etc.
 
 '$Revision: 1.1 $' =~ m/(\d+)\.(\d+)/ && (( $VERSION ) = sprintf("%d.%03d", $1, $2));
Index: FlowScan.pm
--- FlowScan.pm.orig	2001-02-11 21:41:47 +0100
+++ FlowScan.pm	2004-12-18 20:01:03 +0100
@@@@ -93,7 +93,7 @@@@
 sub file2time_t {
    my $file = shift;
    if ($file =~
-	     m/(\d\d\d\d)(\d\d)(\d\d)_(\d\d):(\d\d):(\d\d)([+-])(\d\d)(\d\d)/) {
+             m/(\d\d\d\d)-?(\d\d)-?(\d\d)[_.](\d\d):?(\d\d):?(\d\d)([+-])(\d\d)(\d\d)/) {
       # The file name contains an "hours east of GMT" component
       my(@@tm) = ($6, $5, $4, $3, $2-1, $1-1900, 0, 0, -1);
       my($tm_sec, $tm_min, $tm_hour, $tm_mday, $tm_mon, $tm_year,
@@@@ -105,7 +105,7 @@@@
       }
       mutt_normalize_time(@@tm);
       return mutt_mktime(@@tm, -1, 0)
-   } elsif ($file =~ m/(\d\d\d\d)(\d\d)(\d\d)_(\d\d):(\d\d):(\d\d)$/) {
+   } elsif ($file =~ m/(\d\d\d\d)-?(\d\d)-?(\d\d)[_.](\d\d):?(\d\d):?(\d\d)$/) {
       # The file name contains just the plain old localtime
       return mutt_mktime($6, $5, $4, $3, $2-1, $1-1900, 0, 0, -1, 1)
    } else {
@@@@ -157,9 +157,9 @@@@
          RRA:AVERAGE:0:1:600
          RRA:AVERAGE:0:6:600
          RRA:AVERAGE:0:24:600
-         RRA:AVERAGE:0:288:732
+         RRA:AVERAGE:0:288:1827
          RRA:MAX:0:24:600
-         RRA:MAX:0:288:732
+         RRA:MAX:0:288:1827
 	 )
       );
    my $err=RRDs::error;
@


1.2.2.1
log
@file flowscan.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:50:02 +0000
@
text
@d1 51
@


1.2.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 51
Index: flowscan.in
--- flowscan.in.orig	2001-02-16 22:17:31 +0100
+++ flowscan.in	2004-12-18 19:11:35 +0100
@@@@ -22,13 +22,13 @@@@
 
 require 5.004; # for UNIVERSAL::can method
 use FindBin;
+use lib $FindBin::Bin;
 use Cflow qw(:flowvars 1.017);
 use Benchmark;
 use Getopt::Std;
 use POSIX; # for strftime
 use File::Basename;
 use ConfigReader::DirectiveStyle;
-use lib $FindBin::Bin;
 use FlowScan; # for mutt_mktime, etc.
 
 '$Revision: 1.2 $' =~ m/(\d+)\.(\d+)/ && (( $VERSION ) = sprintf("%d.%03d", $1, $2));
Index: FlowScan.pm
--- FlowScan.pm.orig	2001-02-11 21:41:47 +0100
+++ FlowScan.pm	2004-12-18 20:01:03 +0100
@@@@ -93,7 +93,7 @@@@
 sub file2time_t {
    my $file = shift;
    if ($file =~
-	     m/(\d\d\d\d)(\d\d)(\d\d)_(\d\d):(\d\d):(\d\d)([+-])(\d\d)(\d\d)/) {
+             m/(\d\d\d\d)-?(\d\d)-?(\d\d)[_.](\d\d):?(\d\d):?(\d\d)([+-])(\d\d)(\d\d)/) {
       # The file name contains an "hours east of GMT" component
       my(@@tm) = ($6, $5, $4, $3, $2-1, $1-1900, 0, 0, -1);
       my($tm_sec, $tm_min, $tm_hour, $tm_mday, $tm_mon, $tm_year,
@@@@ -105,7 +105,7 @@@@
       }
       mutt_normalize_time(@@tm);
       return mutt_mktime(@@tm, -1, 0)
-   } elsif ($file =~ m/(\d\d\d\d)(\d\d)(\d\d)_(\d\d):(\d\d):(\d\d)$/) {
+   } elsif ($file =~ m/(\d\d\d\d)-?(\d\d)-?(\d\d)[_.](\d\d):?(\d\d):?(\d\d)$/) {
       # The file name contains just the plain old localtime
       return mutt_mktime($6, $5, $4, $3, $2-1, $1-1900, 0, 0, -1, 1)
    } else {
@@@@ -157,9 +157,9 @@@@
          RRA:AVERAGE:0:1:600
          RRA:AVERAGE:0:6:600
          RRA:AVERAGE:0:24:600
-         RRA:AVERAGE:0:288:732
+         RRA:AVERAGE:0:288:1827
          RRA:MAX:0:24:600
-         RRA:MAX:0:288:732
+         RRA:MAX:0:288:1827
 	 )
       );
    my $err=RRDs::error;
@


1.1
log
@new package: flowscan 1.006 (NetFlow Scanning and Graphing Frontend)
@
text
@d18 1
a18 1
 '$Revision: 1.20 $' =~ m/(\d+)\.(\d+)/ && (( $VERSION ) = sprintf("%d.%03d", $1, $2));
a21 18
@@@@ -15,7 +15,7 @@@@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-# $Id: FlowScan.pm,v 1.5 2001/02/11 20:41:19 dplonka Exp $
+# $Id: FlowScan.pm,v 1.6 2001/03/27 20:48:01 dplonka Exp $
 # Dave Plonka <plonka@@doit.wisc.edu>
 
 use strict;
@@@@ -29,7 +29,7 @@@@
 @@FlowScan::ISA=qw(Exporter);
 @@FlowScan::EXPORT_OK=qw(ip2name);
 # convert the RCS revision to a reasonable Exporter VERSION:
-'$Revision: 1.5 $' =~ m/(\d+)\.(\d+)/ && (( $FlowScan::VERSION ) = sprintf("%d.%03d", $1, $2));
+'$Revision: 1.6 $' =~ m/(\d+)\.(\d+)/ && (( $FlowScan::VERSION ) = sprintf("%d.%03d", $1, $2));
 
 =head1 NAME
 
a51 9
@@@@ -190,7 +190,7 @@@@
 
 =head1 VERSION
 
-The version number is the module file RCS revision number (B<$Revision: 1.5 $>)
+The version number is the module file RCS revision number (B<$Revision: 1.6 $>)
 with the minor number printed right justified with leading zeroes to 3
 decimal places.  For instance, RCS revision 1.1 would yield a package version
 number of 1.001.
@