Attachment 12337 Details for Bug 23911 – file.diff

[patch] file.diff

file.diff (text/plain), 6.31 KB, created by Joseph Scott on 2000-12-28 20:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Scott

Created: 2000-12-28 20:30:01 UTC

Size: 6.31 KB

patch

obsolete

>diff -ruN swatch/Makefile swatch.new/Makefile
>--- swatch/Makefile	Sat Dec 23 15:23:47 2000
>+++ swatch.new/Makefile	Thu Dec 28 12:08:33 2000
>@@ -6,18 +6,22 @@
> #
> 
> PORTNAME=	swatch
>-PORTVERSION=	2.2
>+PORTVERSION=	3.0.1
> CATEGORIES=	security sysutils
>-MASTER_SITES=	ftp://ftp.stanford.edu/general/security-tools/swatch/OLD/
>+MASTER_SITES=	ftp://ftp.stanford.edu/general/security-tools/swatch/
> 
> MAINTAINER=	joseph@randomnetworks.com
> 
>-NO_BUILD=	YES
>+BUILD_DEPENDS=	${site_perl}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
>+	${site_perl}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc \
>+	${site_perl}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail
> 
>-MAN5=		swatch.conf.5
>-MAN8=		swatch.8
>+site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
> 
>-do-install:
>-		@cd ${WRKSRC}; sh ${WRKSRC}/install.sh
>+USE_PERL5=	yes
>+PERL_CONFIGURE=	yes
>+CONFIGURE_ARGS+=	INSTALLMAN1DIR=${PREFIX}/man/man1
>+
>+MAN1=	swatch.1 swatch_oldrc2newrc.1
> 
> .include <bsd.port.mk>
>diff -ruN swatch/distinfo swatch.new/distinfo
>--- swatch/distinfo	Fri May  2 17:22:09 1997
>+++ swatch.new/distinfo	Thu Dec 28 12:09:11 2000
>@@ -1 +1 @@
>-MD5 (swatch-2.2.tar.gz) = 0d787edd73d358eefcf9e7a601fb7cb7
>+MD5 (swatch-3.0.1.tar.gz) = 7426301fe6fb621dd67481ef3f2abad3
>diff -ruN swatch/files/patch-aa swatch.new/files/patch-aa
>--- swatch/files/patch-aa	Fri May  2 17:22:09 1997
>+++ swatch.new/files/patch-aa	Wed Dec 31 16:00:00 1969
>@@ -1,75 +0,0 @@
>---- install.pl.orig	Thu Dec 14 17:17:23 1995
>-+++ install.pl	Fri May  2 20:13:32 1997
>-@@ -12,7 +12,7 @@
>- 
>- # usage: install.pl [full_path_to_perl]
>- #
>--$ENV{'PATH'} = '/usr/ucb:/usr/bin:/bin:/usr/local/bin' ;
>-+$ENV{'PATH'} = '/usr/bin:/bin:/usr/local/bin' ;
>- $ENV{'IFS'} = '' if $ENV{'IFS'} ne '' ;
>- 
>- 
>-@@ -21,8 +21,9 @@
>- ##
>-        $PERL_LIB_DIR = "/usr/local/lib/perl" ;
>-        $PERL_BIN_DIR = "/usr/local/bin" ;
>--     $SWATCH_BIN_DIR = "/usr/local/etc" ;
>-+     $SWATCH_BIN_DIR = "/usr/local/bin" ;
>-      $SWATCH_MAN_DIR = "/usr/local/man" ;
>-+     $SWATCH_LIB_DIR = "/usr/local/lib" ;
>- $SWATCH_PROG_MAN_EXT = "8" ;
>- $SWATCH_CONF_MAN_EXT = "5" ;
>-    $SWATCH_DATA_MODE = 444 ;
>-@@ -30,14 +31,15 @@
>-               $OWNER = "root" ;
>-               $GROUP = "wheel" ;
>-    $SWATCH_PROG_NAME = "swatch" ;
>-+   $SWATCH_CONF_NAME = "swatch.conf" ;
>-     $SWATCH_PROG_MAN = "swatch.prog.man" ;
>-     $SWATCH_CONF_MAN = "swatch.conf.man" ;
>-   $SWATCH_ACTION_LIB = "sw_actions.pl" ;
>-     $SWATCH_HIST_LIB = "sw_history.pl" ;
>- 
>-                 $SED = "/usr/bin/sed" ; 
>--               $COPY = "/usr/bin/cp" ;
>--	      $CHMOD = "/usr/bin/chmod" ;
>-+               $COPY = "/bin/cp" ;
>-+	      $CHMOD = "/bin/chmod" ;
>- 
>- if ( ! -f $SED ) {
>-     $SED = `which sed` ;
>-@@ -60,7 +62,7 @@
>- }
>- $PERL_BIN_DIR = substr($PERL_BIN_DIR, 0, rindex($PERL_BIN_DIR, '/')) ;
>- 
>--$ready = 0 ;
>-+$ready = 1 ;
>- while (!$ready) {
>-     &get_some_answers() ;
>-     &print_values() ;
>-@@ -69,14 +71,13 @@
>-     $ready = 1 if ($ans eq 'y' || $ans eq 'Y') ;
>- }
>- 
>--print "\nAre you ready for me to start the installation (y or n)? " ;
>--$ans = <STDIN> ; chop $ans ;
>--&do_the_install() if ($ans eq 'y' || $ans eq 'Y') ;
>-+&do_the_install();
>- 
>- 
>- ##
>- ##
>- ##
>-+
>- sub get_some_answers {
>-     local($question) ;
>- 
>-@@ -139,7 +140,7 @@
>-     &install_it($swatch_uid, $swatch_gid, $SWATCH_DATA_MODE,
>- 		$SWATCH_PROG_MAN, "$SWATCH_MAN_DIR/man$SWATCH_PROG_MAN_EXT/$SWATCH_PROG_NAME.$SWATCH_PROG_MAN_EXT") ;
>-     &install_it($swatch_uid, $swatch_gid, $SWATCH_DATA_MODE,
>--		$SWATCH_CONF_MAN, "$SWATCH_MAN_DIR/man$SWATCH_CONF_MAN_EXT/$SWATCH_PROG_NAME.$SWATCH_CONF_MAN_EXT") ;
>-+		$SWATCH_CONF_MAN, "$SWATCH_MAN_DIR/man$SWATCH_CONF_MAN_EXT/$SWATCH_CONF_NAME.$SWATCH_CONF_MAN_EXT") ;
>- }
>- 
>- 
>diff -ruN swatch/files/patch-ab swatch.new/files/patch-ab
>--- swatch/files/patch-ab	Sun Jul  6 11:28:05 1997
>+++ swatch.new/files/patch-ab	Wed Dec 31 16:00:00 1969
>@@ -1,23 +0,0 @@
>---- swatch.pl.orig	Thu Dec 14 21:01:08 1995
>-+++ swatch.pl	Sun Jul  6 19:22:13 1997
>-@@ -29,7 +29,7 @@
>- eval 'PERL_BIN_DIR/perl -S $0 ${1+"$@"}'
>-     if 0;
>- #
>--$ENV{'PATH'} = '/usr/ucb:/usr/bin:/bin:PERL_BIN_DIR';
>-+$ENV{'PATH'} = '/usr/bin:/bin:PERL_BIN_DIR';
>- $ENV{'IFS'} = '' if $ENV{'IFS'} ne '';
>- $0 = rindex($0, "/") > -1 ? substr($0, rindex($0, "/")+1) : $0;
>- 
>-@@ -44,8 +44,8 @@
>- 
>- # Some defaults
>- $PERL                   = 'PERL_BIN_DIR/perl';
>--$TAIL			= '/usr/ucb/tail -f';
>--$DEF_INPUT		= "$TAIL /var/log/syslog";
>-+$TAIL			= '/usr/bin/tail -f';
>-+$DEF_INPUT		= "$TAIL /var/log/messages";
>- $Pipe			= 1;
>- $ConfigFile		= "$ENV{'HOME'}/.swatchrc";
>- $PatternSeparator	= ',';
>-
>diff -ruN swatch/files/patch-ac swatch.new/files/patch-ac
>--- swatch/files/patch-ac	Sun Jul  6 11:28:06 1997
>+++ swatch.new/files/patch-ac	Wed Dec 31 16:00:00 1969
>@@ -1,13 +0,0 @@
>---- sw_actions.pl.orig	Thu Dec 14 04:32:19 1995
>-+++ sw_actions.pl	Sun Jul  6 19:23:20 1997
>-@@ -22,8 +22,8 @@
>- #
>- 
>- $BELL 	= "\007";
>--$MAILER = "/usr/lib/sendmail";
>--$WRITE 	= "/bin/write";
>-+$MAILER = "/usr/sbin/sendmail";
>-+$WRITE 	= "/usr/bin/write";
>- 
>- #
>- # do_bell -- send BELL(s) to the output.
>diff -ruN swatch/pkg-descr swatch.new/pkg-descr
>--- swatch/pkg-descr	Fri May  2 23:37:38 1997
>+++ swatch.new/pkg-descr	Thu Dec 28 12:22:10 2000
>@@ -1,23 +1,7 @@
> SWATCH - The Simple WATCHer and filter
> 
>-       Swatch is designed to  monitor  system  activity.   Swatch
>-       requires a configuration file which contains pattern(s) to
>-       look for and action(s) to do when each pattern is found.
>+Swatch is designed to  monitor  system  activity.   Swatch
>+requires a configuration file which contains pattern(s) to
>+look for and action(s) to do when each pattern is found.
> 
>-      The file contains four TAB separated fields:
>-
>-/pattern/[,/pattern/,...] action[,action,...] [[HH:]MM:]SS start:length
>-
>-       A pattern must be a regular expression which perl(1)  will
>-       accept,  which  is very similar to the regular expressions
>-       which egrep(1) accepts.
>-
>-       The following actions are acceptable:
>-
>-       echo[=mode]
>-       bell[=N]
>-       exec=command
>-       ignore
>-       mail[=address:address:...]
>-       pipe=command
>-       write[=user:user:...]
>+WWW: http://www.stanford.edu/~atkins/swatch/
>diff -ruN swatch/pkg-plist swatch.new/pkg-plist
>--- swatch/pkg-plist	Wed Aug 19 12:54:36 1998
>+++ swatch.new/pkg-plist	Thu Dec 28 12:16:56 2000
>@@ -1,3 +1,2 @@
> bin/swatch
>-lib/sw_actions.pl
>-lib/sw_history.pl
>+bin/swatch_oldrc2newrc

Actions: View | Diff

Attachments on bug 23911: 12337