Make this package work on Solaris.

3 files changed, 44 insertions, 15 deletions

diff --git a/security/tripwire/patches/patch-aa b/security/tripwire/patches/patch-aa
index 0c7d6cb78ad..92d631690ad 100644
--- a/security/tripwire/patches/patch-aa
+++ b/security/tripwire/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/11/17 16:27:25 agc Exp $
+$NetBSD: patch-aa,v 1.2 1999/04/09 10:46:56 agc Exp $
 
 Miscellaneous Makefile settings.
 
@@ -17,6 +17,17 @@ Miscellaneous Makefile settings.
  
  # system utilities
  LEX	= lex
+@@ -32,8 +32,8 @@
+ #SHELL	= /bin/bash		# For the GNU fanatics
+ 
+ # you can use ANSI C if you like, but K&R is equally fine.
+-CC     = cc			# common
+-#CC     = gcc			# also common
++#CC     = cc			# common
++CC     = gcc			# also common
+ #CC	= /usr/ccs/bin/cc	# Pyramid DC/OSx (SVR4)
+ 
+ CFLAGS = -O			# common 
 @@ -48,7 +48,7 @@
  #CFLAGS = -systype bsd43	# ETA/10 (SVR3)
  #CFLAGS = -systype bsd43	# MIPS RISC/OS 4.5x
@@ -26,3 +37,12 @@ Miscellaneous Makefile settings.
  #CFLAGS = -OG			# Pyramid OSx
  #CFLAGS = -O -Kold		# Pyramid DC/OSx (SVR4)
  #CFLAGS = -DTW_TYPE32='int'	# DEC OSF/1 Alpha (or any other architecture
+@@ -77,7 +77,7 @@
+ 
+ # If you don't have the install command, you need to replace
+ # the use of it later in the makefile with a cp and chmod
+-INSTALL= /usr/bin/install	# common
++#INSTALL= /usr/bin/install	# common
+ #INSTALL= /usr/ucb/install	# Pyramid DC/OSx (SVR4)
+ #INSTALL= /etc/install		# Pyramid OSx
+ #INSTALL= /bin/cp		# no install
diff --git a/security/tripwire/patches/patch-ab b/security/tripwire/patches/patch-ab
index bd6b33c4151..1dbde01090f 100644
--- a/security/tripwire/patches/patch-ab
+++ b/security/tripwire/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/11/17 16:27:25 agc Exp $
+$NetBSD: patch-ab,v 1.2 1999/04/09 10:46:57 agc Exp $
 
-NetBSD-specific paths for tripwire.
+NetBSD and Solaris specific paths for tripwire.
 
 --- include/config.h	1994/07/15 11:02:52	1.5
 +++ include/config.h	1998/11/17 14:40:02
@@ -9,7 +9,7 @@ NetBSD-specific paths for tripwire.
   ***/
  
 -#include "../configs/conf-svr4.h"
-+#include "../configs/conf-netbsd.h"
++#include "../configs/conf-@LOWER_OPSYS@.h"
  
  #ifdef TW_TYPE32
  typedef TW_TYPE32 int32;
@@ -20,8 +20,8 @@ NetBSD-specific paths for tripwire.
 -
 -#define CONFIG_PATH     "/tmp/genek"
 -#define DATABASE_PATH   "/tmp/genek"
-+# define CONFIG_PATH     "@localbase@/etc/tripwire"
-+# define DATABASE_PATH   "@localbase@/etc/tripwire/databases"
++# define CONFIG_PATH     "/usr/local/etc/tripwire"
++# define DATABASE_PATH   "/usr/local/etc/tripwire/databases"
  
  /******* name of Tripwire files **************************************
   *
diff --git a/security/tripwire/patches/patch-ac b/security/tripwire/patches/patch-ac
index a44ea8eb979..681fb05b43b 100644
--- a/security/tripwire/patches/patch-ac
+++ b/security/tripwire/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 1998/11/17 16:27:25 agc Exp $
+$NetBSD: patch-ac,v 1.2 1999/04/09 10:46:57 agc Exp $
 
 NetBSD defines both LITTLE_ENDIAN and BIG_ENDIAN, and sets the
 definition of BYTE_ORDER accordingly.  So check the value of
@@ -6,19 +6,28 @@ BYTE_ORDER in this file.
 
 --- sigs/sha/sha.c	1994/07/25 15:46:45	1.5
 +++ sigs/sha/sha.c	1998/11/17 15:59:20
-@@ -46,10 +46,7 @@
+@@ -46,10 +46,17 @@
  
  #include "sha.h"
  
 -#if BYTEORDER == 0x1234
 -#define LITTLE_ENDIAN
--#endif
--
++#ifdef __NetBSD__
 +#include <machine/endian.h>
++#elif (defined(__sun__) && defined(__svr4__))
++#define BIG_ENDIAN	4321
++#define LITTLE_ENDIAN	1234
++#if defined(__sparc__)
++#define BYTE_ORDER	BIG_ENDIAN
++#elif defined(__i386__)
++#define BYTE_ORDER	LITTLE_ENDIAN
++#endif
+ #endif
+-
  
  /* The SHS f()-functions */
  
-@@ -214,7 +211,7 @@
+@@ -214,7 +221,7 @@
      shsInfo->digest[ 4 ] += E;
      }
  
@@ -27,7 +36,7 @@ BYTE_ORDER in this file.
  
  /* When run on a little-endian CPU we need to perform byte reversal on an
     array of longwords.  It is possible to make the code endianness-
-@@ -258,7 +255,7 @@
+@@ -258,7 +265,7 @@
      while( count >= SHS_BLOCKSIZE )
  	{
  	memcpy( (char *) shsInfo->data, (char *) buffer, SHS_BLOCKSIZE );
@@ -36,7 +45,7 @@ BYTE_ORDER in this file.
  	byteReverse( shsInfo->data, SHS_BLOCKSIZE );
  #endif /* LITTLE_ENDIAN */
  	shsTransform( shsInfo );
-@@ -289,7 +286,7 @@
+@@ -289,7 +296,7 @@
  	{
  	/* Two lots of padding:  Pad the first block to 64 bytes */
  	memset( ( char * ) shsInfo->data + count, 0, 64 - count );
@@ -45,7 +54,7 @@ BYTE_ORDER in this file.
  	byteReverse( shsInfo->data, SHS_BLOCKSIZE );
  #endif /* LITTLE_ENDIAN */
  	shsTransform( shsInfo );
-@@ -300,7 +297,7 @@
+@@ -300,7 +307,7 @@
      else
  	/* Pad block to 56 bytes */
  	memset( ( char * ) shsInfo->data + count, 0, 56 - count );
@@ -54,7 +63,7 @@ BYTE_ORDER in this file.
      byteReverse( shsInfo->data, SHS_BLOCKSIZE );
  #endif /* LITTLE_ENDIAN */
  
-@@ -309,7 +306,7 @@
+@@ -309,7 +316,7 @@
      shsInfo->data[ 15 ] = lowBitcount;
  
      shsTransform( shsInfo );