From 061f17afe746837588f341f15eb0002fc6d9c8df Mon Sep 17 00:00:00 2001
From: dinoex <dinoex@FreeBSD.org>
Date: Sun, 8 Dec 2002 19:51:50 +0000
Subject: - regression test on panther successfull

---
 security/pgpin/files/patch-crypto.c | 25 +++++++++++++++++++++++++
 security/pgpin/files/patch-global.h | 10 ++++++++++
 security/pgpin/files/patch-makefile |  6 +++---
 security/pgpin/files/patch-md5.h    | 11 +++++++++++
 security/pgpin/files/patch-usuals.h | 11 +++++++++++
 5 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 security/pgpin/files/patch-crypto.c
 create mode 100644 security/pgpin/files/patch-global.h
 create mode 100644 security/pgpin/files/patch-md5.h
 create mode 100644 security/pgpin/files/patch-usuals.h

(limited to 'security')

diff --git a/security/pgpin/files/patch-crypto.c b/security/pgpin/files/patch-crypto.c
new file mode 100644
index 000000000000..1c2317c409fe
--- /dev/null
+++ b/security/pgpin/files/patch-crypto.c
@@ -0,0 +1,25 @@
+--- crypto.c.orig	Tue Jan 20 09:54:51 1998
++++ crypto.c	Sun Dec  8 11:43:11 2002
+@@ -181,7 +181,7 @@
+ 	if (timestamp != NULL) {
+ 		/* first, fill array in external byte order: */
+ 		put_word32(t, timestamp);
+-		convert_byteorder(timestamp,4);
++		convert_byteorder(timestamp,SIZEOF_TIMESTAMP);
+ 				/* convert to internal byteorder */
+ 	}
+ 
+@@ -850,11 +850,11 @@
+    LANG("\n\007Error: System clock/calendar is set wrong.\n"));
+ 			return -1;
+ 		}
+-		convert_byteorder(timestamp,4); /* convert to external form */
++		convert_byteorder(timestamp,SIZEOF_TIMESTAMP); /* convert to external form */
+ 
+ 	/* Finish off message digest calculation with this information */
+ 	MD_addbuffer (MD, &class, 1, 0);
+-	MD_addbuffer (MD, timestamp, 4, md5buf);
++	MD_addbuffer (MD, timestamp, SIZEOF_TIMESTAMP, md5buf);
+ /* We wrote the digest to a static variable because we want to keep it around
+    for random number generation later.   Also make a note of that fact. */
+ 	already_have_md5 = 1;
diff --git a/security/pgpin/files/patch-global.h b/security/pgpin/files/patch-global.h
new file mode 100644
index 000000000000..e801c1bb69e8
--- /dev/null
+++ b/security/pgpin/files/patch-global.h
@@ -0,0 +1,10 @@
+--- global.h.orig	Mon Jan 12 00:13:04 1998
++++ global.h	Sun Dec  8 11:49:27 2002
+@@ -1,6 +1,6 @@
+ /* Needed by RSAREF */
+ 
+-#ifdef __alpha
++#if defined(__alpha) || defined(__sparc64__)
+ typedef unsigned UINT4;
+ #else
+ typedef unsigned long UINT4;
diff --git a/security/pgpin/files/patch-makefile b/security/pgpin/files/patch-makefile
index a1b7952f7d31..839984b72376 100644
--- a/security/pgpin/files/patch-makefile
+++ b/security/pgpin/files/patch-makefile
@@ -1,12 +1,12 @@
 --- makefile.orig	Fri Mar 23 02:44:58 2001
-+++ makefile	Sun Dec  8 09:39:12 2002
++++ makefile	Sun Dec  8 11:18:52 2002
 @@ -79,7 +79,8 @@
  	@echo "where <system> can be:"
  	@echo "	386bsd, 3b1, 3b1_asm, aix370, aix386, amix-68k-gcc, apollo,"
  	@echo "	apollo-gcc, atari,aux(*), aux-gcc, bsd, bsdgcc, convexos,"
 -	@echo "	dgux, djgpp, encore, freebsd, hpux-68k(*), hpux-68k-ansi,"
 +	@echo "	dgux, djgpp, encore, freebsd-{alpha,i386,sparc64},"
-+	@echo " hpux-68k(*), hpux-68k-ansi,"
++	@echo "	hpux-68k(*), hpux-68k-ansi,"
  	@echo "	hpux-68k-gcc, hpux-pa(*), hpux-pa-ansi, hpux-pa-gcc, hpux9-pa-ansi,"
  	@echo "	irix, irix_asm, isc, isc_asm, linux, linux-aout, linux-68k,"
  	@echo "	machten, mach_386, mips-ultrix, netbsd, netbsd_68k, newsasm,"
@@ -29,7 +29,7 @@
 +freebsd-sparc64:
 +	$(MAKE) all LD="$(CC) -s" \
 +	CFLAGS="$(RSAINCDIR) $(OS_CFLAGS) -DPORTABLE -DUNIX -DIDEA32 \
-+	-DHIGHFIRST -DMAX_NAMELEN=255"
++	-DHIGHFIRST -DMERRITT -DMAX_NAMELEN=255"
  
  386bsd:
  	$(MAKE) all CC=gcc LD=gcc OBJS_EXT="_80386.o _zmatch.o" \
diff --git a/security/pgpin/files/patch-md5.h b/security/pgpin/files/patch-md5.h
new file mode 100644
index 000000000000..9b6b9e293352
--- /dev/null
+++ b/security/pgpin/files/patch-md5.h
@@ -0,0 +1,11 @@
+--- md5.h.orig	Mon Jan 12 00:13:05 1998
++++ md5.h	Sun Dec  8 11:50:50 2002
+@@ -1,7 +1,7 @@
+ #ifndef MD5_H
+ #define MD5_H
+ 
+-#ifdef __alpha
++#if defined(__alpha) || defined(__sparc64__)
+ typedef unsigned int uint32;
+ #else
+ typedef unsigned long uint32;
diff --git a/security/pgpin/files/patch-usuals.h b/security/pgpin/files/patch-usuals.h
new file mode 100644
index 000000000000..61a02b04a81c
--- /dev/null
+++ b/security/pgpin/files/patch-usuals.h
@@ -0,0 +1,11 @@
+--- usuals.h.orig	Mon Jan 12 00:13:07 1998
++++ usuals.h	Sun Dec  8 11:34:50 2002
+@@ -8,7 +8,7 @@
+ typedef byte *byteptr;	/* pointer to byte */
+ typedef char *string;	/* pointer to ASCII character string */
+ typedef unsigned short word16;	/* values are 0-65535 */
+-#ifdef __alpha
++#if defined(__alpha) || defined(__sparc64__)
+ typedef unsigned int word32;	/* values are 0-4294967295 */
+ #else
+ typedef unsigned long word32;	/* values are 0-4294967295 */
-- 
cgit