UPDATE: security/swatch

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: security/swatch

Alexandre Anriot

update to 3.1.1, new modules and a few reliability fixes against 3.1 .
Comments, ok?


Index: Makefile
===================================================================
RCS file: /cvs/ports/security/swatch/Makefile,v
retrieving revision 1.20
diff -u -u -r1.20 Makefile
--- Makefile 2 May 2006 21:28:26 -0000 1.20
+++ Makefile 3 May 2006 06:48:49 -0000
@@ -2,8 +2,7 @@
 
 COMMENT= "simple WATCHdog log filtering program"
 
-DISTNAME= swatch-3.0.8
-PKGNAME= ${DISTNAME}p0
+DISTNAME= swatch-3.1.1
 CATEGORIES= security sysutils
 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=swatch/} \
  ftp://ftp.cert.dfn.de/pub/tools/audit/swatch/
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/swatch/distinfo,v
retrieving revision 1.3
diff -u -u -r1.3 distinfo
--- distinfo 5 Jan 2005 17:26:48 -0000 1.3
+++ distinfo 3 May 2006 06:48:49 -0000
@@ -1,4 +1,4 @@
-MD5 (swatch-3.0.8.tar.gz) = ccf80a0bd3a1f533ecced47a745c2268
-RMD160 (swatch-3.0.8.tar.gz) = f3aace8b9d3abacd1a8a70794362923d9dada07a
-SHA1 (swatch-3.0.8.tar.gz) = 07a076d7d9775d43303f818635f20ffbf67a74f3
-SIZE (swatch-3.0.8.tar.gz) = 25139
+MD5 (swatch-3.1.1.tar.gz) = fe38cc8d073e692a7426693837c3749d
+RMD160 (swatch-3.1.1.tar.gz) = 9a65522006607bcd569dcebfeb46027fddff4c60
+SHA1 (swatch-3.1.1.tar.gz) = c8e4ccaf74bc63119662d685866b1ea2d2b8cea3
+SIZE (swatch-3.1.1.tar.gz) = 29568
Index: patches/patch-swatch
===================================================================
RCS file: /cvs/ports/security/swatch/patches/patch-swatch,v
retrieving revision 1.3
diff -u -u -r1.3 patch-swatch
--- patches/patch-swatch 2 May 2006 21:28:26 -0000 1.3
+++ patches/patch-swatch 3 May 2006 06:48:49 -0000
@@ -1,35 +1,10 @@
---- swatch.orig Fri Apr  4 00:33:05 2003
-+++ swatch Tue May  2 23:00:12 2006
-@@ -372,7 +372,7 @@ sub parse_command_line {
-   die "$USAGE" if not GetOptions(
- "config-file|c=s" => \$opt_config_file,
- "daemon" => \$opt_daemon,
-- "debug-level=i" => $opt_debug_level,
-+ "debug-level=i" => \$opt_debug_level,
- "dump-script:s" => \$opt_dump_script,
- "examine|f=s" => \$opt_examine,
- "help|h" => \$opt_help,
-@@ -411,7 +411,7 @@ sub parse_command_line {
+$OpenBSD$
+--- swatch.orig Wed May  3 06:39:14 2006
++++ swatch Wed May  3 06:39:22 2006
+@@ -482,7 +482,7 @@ sub parse_command_line {
  sub dprint {
      my $msg_lev = shift;
      my $msg = shift;
 -    print STDERR "DEBUG($msg_lev): $msg\n" if ($msg_lev & $opt_debug_level);
 +    print STDERR "DEBUG($msg_lev): $msg\n" if ($msg_lev && $opt_debug_level);
  }
-
- ####### dprint end #######
-@@ -804,14 +804,11 @@ sub ring_bell {
-      'RINGS' => 1,
-      @_
-     );
--  my $sun_terminal = (`uname -s` eq 'SunOS\n');
--  
-   return if exists($args{'WHEN'}) and not inside_time_window($args{'WHEN'});
-  
-   my $bells = $args{'RINGS'};
-   for ( ; $bells > 0 ; $bells-- ) {
-     print $BELL;
--    sleep 1 if $sun_terminal; # SunOS needed this. Not sure about Solaris though
-   }
- }
-
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/security/swatch/pkg/DESCR,v
retrieving revision 1.3
diff -u -u -r1.3 DESCR
--- pkg/DESCR 8 Dec 2003 04:05:28 -0000 1.3
+++ pkg/DESCR 3 May 2006 06:48:49 -0000
@@ -1,6 +1,3 @@
-Swatch was originally written to actively monitor messages as they
-are written to a log file via the UNIX syslog utility. For a simple
-demonstration type "swatch --examine=FILENAME" with FILENAME
-being the file that you would like to see the contents of.  All
-this example will do is demonstrate the different text modes that
-are available with to the echo action.
+Swatch started out as the "simple watchdog" for activly monitoring log
+files produced by UNIX's syslog facility. It has since been evolving
+into a utility that can monitor just about any type of log.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/swatch/pkg/PLIST,v
retrieving revision 1.5
diff -u -u -r1.5 PLIST
--- pkg/PLIST 15 Sep 2004 18:36:03 -0000 1.5
+++ pkg/PLIST 3 May 2006 06:48:49 -0000
@@ -1,5 +1,12 @@
 @comment $OpenBSD: PLIST,v 1.5 2004/09/15 18:36:03 espie Exp $
 bin/swatch
-bin/swatch_oldrc2newrc
+${P5SITE}/Swatch/
+${P5SITE}/Swatch/Actions.pm
+${P5SITE}/Swatch/Throttle.pm
+${P5SITE}/auto/
+${P5SITE}/auto/Swatch/
+${P5SITE}/auto/Swatch/Actions/
+${P5SITE}/auto/Swatch/Actions/autosplit.ix
 @man man/man1/swatch.1
-@man man/man1/swatch_oldrc2newrc.1
+@man man/man3p/Swatch::Actions.3p
+@man man/man3p/Swatch::Throttle.3p

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: security/swatch

Alexandre Anriot
>
> update to 3.1.1, new modules and a few reliability fixes against 3.1 .
> Comments, ok?

I forgot the new depend, this diff is better.


Index: Makefile
===================================================================
RCS file: /cvs/ports/security/swatch/Makefile,v
retrieving revision 1.20
diff -u -u -r1.20 Makefile
--- Makefile 2 May 2006 21:28:26 -0000 1.20
+++ Makefile 3 May 2006 07:36:59 -0000
@@ -2,8 +2,7 @@
 
 COMMENT= "simple WATCHdog log filtering program"
 
-DISTNAME= swatch-3.0.8
-PKGNAME= ${DISTNAME}p0
+DISTNAME= swatch-3.1.1
 CATEGORIES= security sysutils
 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=swatch/} \
  ftp://ftp.cert.dfn.de/pub/tools/audit/swatch/
@@ -14,7 +13,8 @@
 
 RUN_DEPENDS= :p5-Date-Calc-*:devel/p5-Date-Calc \
  :p5-File-Tail-*:devel/p5-File-Tail \
- :p5-Time-TimeDate-*:devel/p5-Time-TimeDate
+ :p5-Time-TimeDate-*:devel/p5-Time-TimeDate \
+ :p5-DateManip-*:converters/p5-DateManip
 BUILD_DEPENDS= ${RUN_DEPENDS}
 
 # GPL
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/swatch/distinfo,v
retrieving revision 1.3
diff -u -u -r1.3 distinfo
--- distinfo 5 Jan 2005 17:26:48 -0000 1.3
+++ distinfo 3 May 2006 07:36:59 -0000
@@ -1,4 +1,4 @@
-MD5 (swatch-3.0.8.tar.gz) = ccf80a0bd3a1f533ecced47a745c2268
-RMD160 (swatch-3.0.8.tar.gz) = f3aace8b9d3abacd1a8a70794362923d9dada07a
-SHA1 (swatch-3.0.8.tar.gz) = 07a076d7d9775d43303f818635f20ffbf67a74f3
-SIZE (swatch-3.0.8.tar.gz) = 25139
+MD5 (swatch-3.1.1.tar.gz) = fe38cc8d073e692a7426693837c3749d
+RMD160 (swatch-3.1.1.tar.gz) = 9a65522006607bcd569dcebfeb46027fddff4c60
+SHA1 (swatch-3.1.1.tar.gz) = c8e4ccaf74bc63119662d685866b1ea2d2b8cea3
+SIZE (swatch-3.1.1.tar.gz) = 29568
Index: patches/patch-swatch
===================================================================
RCS file: /cvs/ports/security/swatch/patches/patch-swatch,v
retrieving revision 1.3
diff -u -u -r1.3 patch-swatch
--- patches/patch-swatch 2 May 2006 21:28:26 -0000 1.3
+++ patches/patch-swatch 3 May 2006 07:36:59 -0000
@@ -1,35 +1,10 @@
---- swatch.orig Fri Apr  4 00:33:05 2003
-+++ swatch Tue May  2 23:00:12 2006
-@@ -372,7 +372,7 @@ sub parse_command_line {
-   die "$USAGE" if not GetOptions(
- "config-file|c=s" => \$opt_config_file,
- "daemon" => \$opt_daemon,
-- "debug-level=i" => $opt_debug_level,
-+ "debug-level=i" => \$opt_debug_level,
- "dump-script:s" => \$opt_dump_script,
- "examine|f=s" => \$opt_examine,
- "help|h" => \$opt_help,
-@@ -411,7 +411,7 @@ sub parse_command_line {
+$OpenBSD$
+--- swatch.orig Wed May  3 06:39:14 2006
++++ swatch Wed May  3 06:39:22 2006
+@@ -482,7 +482,7 @@ sub parse_command_line {
  sub dprint {
      my $msg_lev = shift;
      my $msg = shift;
 -    print STDERR "DEBUG($msg_lev): $msg\n" if ($msg_lev & $opt_debug_level);
 +    print STDERR "DEBUG($msg_lev): $msg\n" if ($msg_lev && $opt_debug_level);
  }
-
- ####### dprint end #######
-@@ -804,14 +804,11 @@ sub ring_bell {
-      'RINGS' => 1,
-      @_
-     );
--  my $sun_terminal = (`uname -s` eq 'SunOS\n');
--  
-   return if exists($args{'WHEN'}) and not inside_time_window($args{'WHEN'});
-  
-   my $bells = $args{'RINGS'};
-   for ( ; $bells > 0 ; $bells-- ) {
-     print $BELL;
--    sleep 1 if $sun_terminal; # SunOS needed this. Not sure about Solaris though
-   }
- }
-
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/security/swatch/pkg/DESCR,v
retrieving revision 1.3
diff -u -u -r1.3 DESCR
--- pkg/DESCR 8 Dec 2003 04:05:28 -0000 1.3
+++ pkg/DESCR 3 May 2006 07:36:59 -0000
@@ -1,6 +1,3 @@
-Swatch was originally written to actively monitor messages as they
-are written to a log file via the UNIX syslog utility. For a simple
-demonstration type "swatch --examine=FILENAME" with FILENAME
-being the file that you would like to see the contents of.  All
-this example will do is demonstrate the different text modes that
-are available with to the echo action.
+Swatch started out as the "simple watchdog" for activly monitoring log
+files produced by UNIX's syslog facility. It has since been evolving
+into a utility that can monitor just about any type of log.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/swatch/pkg/PLIST,v
retrieving revision 1.5
diff -u -u -r1.5 PLIST
--- pkg/PLIST 15 Sep 2004 18:36:03 -0000 1.5
+++ pkg/PLIST 3 May 2006 07:36:59 -0000
@@ -1,5 +1,12 @@
 @comment $OpenBSD: PLIST,v 1.5 2004/09/15 18:36:03 espie Exp $
 bin/swatch
-bin/swatch_oldrc2newrc
+${P5SITE}/Swatch/
+${P5SITE}/Swatch/Actions.pm
+${P5SITE}/Swatch/Throttle.pm
+${P5SITE}/auto/
+${P5SITE}/auto/Swatch/
+${P5SITE}/auto/Swatch/Actions/
+${P5SITE}/auto/Swatch/Actions/autosplit.ix
 @man man/man1/swatch.1
-@man man/man1/swatch_oldrc2newrc.1
+@man man/man3p/Swatch::Actions.3p
+@man man/man3p/Swatch::Throttle.3p

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: security/swatch

Alexandre Anriot
In reply to this post by Alexandre Anriot
> Quoting Alexandre Anriot ([hidden email]):
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/security/swatch/Makefile,v
> > retrieving revision 1.20
> > diff -u -u -r1.20 Makefile
> > --- Makefile 2 May 2006 21:28:26 -0000 1.20
> > +++ Makefile 3 May 2006 07:36:59 -0000
> > @@ -2,8 +2,7 @@
> >  
> >  COMMENT= "simple WATCHdog log filtering program"
>
> I wonder if the comment could be changed to not mention watchdog, since
> people might confuse it with something related to watchdog(4).  What
> about something like this?
>
> simple log monitoring program

Yes, why not, and quickly displaying the matched patterns on the console
is probably not the main feature afterall, I will change this if no
objections.