Upgrade to 1.3.1, beta version.

PR:	18964
Submitted by:	Cy Schubert <Cy.Schubert@uumail.gov.bc.ca>

10 files changed, 143 insertions, 67 deletions

diff --git a/security/tripwire-131/files/conf-freebsd2.h b/security/tripwire-131/files/conf-freebsd2.h
index d8f2942118e3..20b3f331e8bd 100644
--- a/security/tripwire-131/files/conf-freebsd2.h
+++ b/security/tripwire-131/files/conf-freebsd2.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id: conf-freebsd2.h,v 1.1.1.1 1997/04/01 04:44:00 jdp Exp $ */
 
 /*
  * conf-freebsd2.h
diff --git a/security/tripwire-131/files/patch-aa b/security/tripwire-131/files/patch-aa
index 81238bf9ae3a..d3ad42fc3b81 100644
--- a/security/tripwire-131/files/patch-aa
+++ b/security/tripwire-131/files/patch-aa
@@ -22,8 +22,8 @@
   #endif
   */
   
-! #define CONFIG_PATH     "/tmp/genek"
-! #define DATABASE_PATH   "/tmp/genek"
+! #define CONFIG_PATH     "/usr/local/bin/tw"
+! #define DATABASE_PATH   "/var/tripwire"
   
   /******* name of Tripwire files **************************************
    *
diff --git a/security/tripwire-131/files/patch-ab b/security/tripwire-131/files/patch-ab
index 7dcf3348984f..506acec409d5 100644
--- a/security/tripwire-131/files/patch-ab
+++ b/security/tripwire-131/files/patch-ab
@@ -1,62 +1,29 @@
-*** Makefile	Mon Jul 25 10:59:41 1994
---- Makefile	Thu Jan  2 12:04:35 1997
-***************
-*** 34,36 ****
-  # you can use ANSI C if you like, but K&R is equally fine.
-! CC     = cc			# common
-  #CC     = gcc			# also common
---- 34,36 ----
-  # you can use ANSI C if you like, but K&R is equally fine.
-! #CC     = cc			# common
-  #CC     = gcc			# also common
-***************
-*** 38,40 ****
-  
-! CFLAGS = -O			# common 
-  #CFLAGS = -g 			# common 
---- 38,40 ----
-  
-! #CFLAGS = -O			# common 
-  #CFLAGS = -g 			# common 
-***************
-*** 60,66 ****
-  #CPP	= /lib/cpp		# on older systems
-  
-  # make sure libraries are not linked dynamically (as a security measure)
-! LDFLAGS=			# common
-  #LDFLAGS= -non_shared		# OSF/1
-  #LDFLAGS= -Bstatic		# SunOS 4 (cannot statically link tripwire
-                            	#          on Solaris 2.3)
---- 60,67 ----
-  #CPP	= /lib/cpp		# on older systems
-  
-  # make sure libraries are not linked dynamically (as a security measure)
-! LDFLAGS= -static
-! #LDFLAGS=			# common
-  #LDFLAGS= -non_shared		# OSF/1
-  #LDFLAGS= -Bstatic		# SunOS 4 (cannot statically link tripwire
-                            	#          on Solaris 2.3)
-
-
---- src/Makefile.orig	Mon Jul 25 10:40:54 1994
-+++ src/Makefile	Sun May 28 15:52:25 2000
-@@ -3,7 +3,7 @@
- # 	Tripwire build
- #
+--- Makefile.orig	Tue May  4 01:31:00 1999
++++ Makefile	Thu May 11 19:44:50 2000
+@@ -10,11 +10,11 @@
+ ###
  
--CFLAGS = -O
-+#CFLAGS = -O
+ # destination directory for final executables
+-DESTDIR = /usr/local/bin/tw
+-DATADIR = /var/tripwire
++DESTDIR = /usr/local/bin
++DATADIR = /var/adm/tcheck
  
- OFILES = 	config.parse.o main.o list.o ignorevec.o dbase.build.o \
- 		utils.o preen.o preen.interp.o preen.report.o \
-@@ -103,8 +103,9 @@
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
+ # destination for man pages
+-MANDIR  = /usr/man		# This needs to change to reflect the path
++MANDIR  = /usr/local/man	# This needs to change to reflect the path
+                         # on your system
  
--install:	tripwire
-+install:	tripwire siggen
- 	$(INSTALL) tripwire $(DESTDIR)
-+	$(INSTALL) siggen $(DESTDIR)
+ # system utilities
+@@ -109,10 +109,8 @@
+ 	$(INSTALL) -d $(DESTDIR)
+ 	(cd src; make INSTALL=$(INSTALL) DESTDIR=$(DESTDIR) install)
+ 	(cd man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install)
+-	(cd configs; $(INSTALL) -m 444 tw.config $(DESTDIR))
+-	chmod 555 $(DESTDIR)
+ 	$(INSTALL) -m 0755 -d $(DATADIR)
+-	$(INSTALL) -m 444 tests/tw.db_TEST $(DATADIR)
++	(cd configs; $(INSTALL) -m 444 tw.config $(DATADIR))
  
- clean:
- 	-rm -f $(OFILES) config.lex.c config.pre.c y.tab.c lex.yy.c help.c \
+ test:	all
+ 	(cd tests; make HOSTNAME=$(HOSTNAME) DIST=$(DIST) SHELL=$(SHELL) \
diff --git a/security/tripwire-131/files/patch-ad b/security/tripwire-131/files/patch-ad
new file mode 100644
index 000000000000..883b3552f4a4
--- /dev/null
+++ b/security/tripwire-131/files/patch-ad
@@ -0,0 +1,13 @@
+--- src/Makefile.orig	Tue May  4 01:31:00 1999
++++ src/Makefile	Thu May 11 19:49:21 2000
+@@ -104,8 +104,8 @@
+ 	$(CC) $(CFLAGS) -c $<
+ 
+ install:	tripwire
+-	$(INSTALL) -m 555 tripwire $(DESTDIR)
+-	$(INSTALL) -m 555 siggen $(DESTDIR) 
++	$(INSTALL) -f noschg -s -m 555 tripwire $(DESTDIR)
++	$(INSTALL) -f noschg -s -m 555 siggen $(DESTDIR)
+ 
+ clean:
+ 	-rm -f $(OFILES) config.lex.c config.pre.c y.tab.c lex.yy.c help.c \
diff --git a/security/tripwire-131/files/patch-ae b/security/tripwire-131/files/patch-ae
new file mode 100644
index 000000000000..3611ee8012cc
--- /dev/null
+++ b/security/tripwire-131/files/patch-ae
@@ -0,0 +1,13 @@
+--- Makefile.orig	Tue May  4 01:31:00 1999
++++ Makefile	Thu May 11 19:51:30 2000
+@@ -60,8 +60,8 @@
+ #CPP	= /lib/cpp		# on older systems
+ 
+ # make sure libraries are not linked dynamically (as a security measure)
+-#LDFLAGS= -static        # Most systems, Linux / RedHat 5.2 and previous
+-LDFLAGS= -ldl          # Solaris 2.x, Redhat 6.0
++LDFLAGS= -static        # Most systems, Linux / RedHat 5.2 and previous
++#LDFLAGS= -ldl          # Solaris 2.x, Redhat 6.0
+ # common
+ #LDFLAGS= -non_shared		# OSF/1
+ #LDFLAGS= -Bstatic		# SunOS 4 (cannot statically link tripwire
diff --git a/security/tripwire-131/files/patch-ba b/security/tripwire-131/files/patch-ba
new file mode 100644
index 000000000000..1148d21c0890
--- /dev/null
+++ b/security/tripwire-131/files/patch-ba
@@ -0,0 +1,21 @@
+--- src/config.parse.c.orig	Tue Jun 13 23:24:14 2000
++++ src/config.parse.c	Tue Jun 13 23:30:35 2000
+@@ -55,7 +55,6 @@
+ #endif
+ 
+ /* prototypes */
+-char *mktemp();
+ static void configfile_descend();
+ 
+ #ifndef L_tmpnam
+@@ -105,8 +104,8 @@
+     };
+     (void) strcpy(tmpfilename, TEMPFILE_TEMPLATE);
+ 
+-    if ((char *) mktemp(tmpfilename) == NULL) {
+-	perror("configfile_read: mktemp()");
++    if (mkstemp(tmpfilename) == -1) {
++	perror("configfile_read: mkstemp()");
+ 	exit(1);
+     }
+ 
diff --git a/security/tripwire-131/files/patch-bb b/security/tripwire-131/files/patch-bb
new file mode 100644
index 000000000000..8cc8988284fb
--- /dev/null
+++ b/security/tripwire-131/files/patch-bb
@@ -0,0 +1,32 @@
+--- src/dbase.build.c.orig	Tue May  4 17:31:00 1999
++++ src/dbase.build.c	Tue Jun 13 23:40:06 2000
+@@ -60,7 +60,6 @@
+ int files_scanned_num = 0;
+ 
+ /* prototypes */
+-char *mktemp();
+ 
+ /* new database checking routines */
+ static void 	database_record_write();
+@@ -135,8 +134,8 @@
+ 	    die_with_err("malloc() failed in database_build", (char *) NULL);
+ 	(void) strcpy(tmpfilename, TEMPFILE_TEMPLATE);
+ 
+-	if ((char *) mktemp(tmpfilename) == NULL)
+-	    die_with_err("database_build: mktemp()", (char *) NULL);
++	if (mkstemp(tmpfilename) == -1)
++	    die_with_err("database_build: mkstemp()", (char *) NULL);
+ 
+ 	(void) strcpy(tempdatabase_file, tmpfilename);
+ 	(void) strcpy(database, tempdatabase_file);
+@@ -814,8 +813,8 @@
+     /* build temporary file name */
+     (void) strcpy(backup_name, TEMPFILE_TEMPLATE);
+ 
+-    if ((char *) mktemp(backup_name) == NULL) {
+-	die_with_err("copy_database_to_backup: mktemp() failed!", NULL);
++    if (mkstemp(backup_name) == -1) {
++	die_with_err("copy_database_to_backup: mkstemp() failed!", NULL);
+     }
+ 
+     strcpy (database_backupfile, backup_name);
diff --git a/security/tripwire-131/files/patch-bc b/security/tripwire-131/files/patch-bc
new file mode 100644
index 000000000000..8bc36ac70a0e
--- /dev/null
+++ b/security/tripwire-131/files/patch-bc
@@ -0,0 +1,21 @@
+--- src/siggen.c.orig	Tue Jun 13 23:42:53 2000
++++ src/siggen.c	Tue Jun 13 23:43:27 2000
+@@ -52,7 +52,6 @@
+ 
+ extern int optind;
+ int debuglevel = 0;
+-char *mktemp();
+ 
+ int (*pf_signatures [NUM_SIGS]) () = {
+ 					SIG0FUNC,
+@@ -172,8 +171,8 @@
+ 	};
+ 	(void) strcpy(tmpfilename, "/tmp/twzXXXXXX");
+ 
+-	if ((char *) mktemp(tmpfilename) == NULL) {
+-	    perror("siggen: mktemp()");
++	if (mkstemp(tmpfilename) == -1) {
++	    perror("siggen: mkstemp()");
+ 	    exit(1);
+ 	}
+ 
diff --git a/security/tripwire-131/files/patch-bd b/security/tripwire-131/files/patch-bd
new file mode 100644
index 000000000000..3b025e3b07ce
--- /dev/null
+++ b/security/tripwire-131/files/patch-bd
@@ -0,0 +1,13 @@
+--- src/utils.c.orig	Tue Jun 13 23:43:01 2000
++++ src/utils.c	Tue Jun 13 23:43:50 2000
+@@ -856,8 +856,8 @@
+     int fd;
+ 
+     (void) strcpy(tmp, TEMPFILE_TEMPLATE);
+-    if ((char *) mktemp(tmp) == NULL) {
+-	perror("tempfilename_generate: mktemp()");
++    if (mkstemp(tmp) == -1) {
++	perror("tempfilename_generate: mkstemp()");
+ 	exit(1);
+     }
+ 
diff --git a/security/tripwire-131/files/tw.conf.freebsd2 b/security/tripwire-131/files/tw.conf.freebsd2
index c195f38872e2..1f452b2cecd7 100644
--- a/security/tripwire-131/files/tw.conf.freebsd2
+++ b/security/tripwire-131/files/tw.conf.freebsd2
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id: tw.conf.freebsd2,v 1.3 1998/07/28 17:54:21 obrien Exp $
 #
 # tripwire.config
 # Generic version for FreeBSD
@@ -107,12 +107,8 @@
 # /home
 =/home
 
-# /lkm and /modules
+# /lkm
 /lkm			R-2
-/modules		R-2
-
-# /boot
-/boot			R-2
 
 # /root
 /root			R-2