This now requires USE_RSAREF2 to be set to YES or NO, and builds accordingly.

8 files changed, 72 insertions, 47 deletions

diff --git a/security/ssleay/Makefile b/security/ssleay/Makefile
index d10d92b8e8e..d90cc54952d 100644
--- a/security/ssleay/Makefile
+++ b/security/ssleay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/09/24 16:53:20 garbled Exp $
+# $NetBSD: Makefile,v 1.8 1998/09/30 20:08:21 cjs Exp $
 # FreeBSD: Makefile,v 1.20 1998/08/27 16:38:02 markm Exp
 #
 
@@ -10,7 +10,6 @@ MAINTAINER=		explorer@netbsd.org
 HOMEPAGE=		http://www.psy.uq.oz.au/~ftp/Crypto/
 
 ONLY_FOR_ARCHS=		i386 sparc m68k alpha
-DEPENDS=		rsaref-2.0:../../security/rsaref
 
 USE_PERL5=		yes
 
@@ -21,6 +20,32 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	util/NetBSD.sh
 CONFIGURE_ARGS=		${MACHINE_ARCH}
 
+PLIST_SRC=	${PKGDIR}/PLIST
+.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
+PLIST_SRC+=	${PKGDIR}/PLIST.rsaref2
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
+DEPENDS=		rsaref-2.0:../../security/rsaref
+.endif
+
+fetch-depends:
+.if !defined(USE_RSAREF2) || ${USE_RSAREF2} != YES && ${USE_RSAREF2} != NO
+	@${ECHO}
+	@${ECHO} The variable USE_RSAREF2 must be set to either YES or NO
+	@${ECHO} in order to build this package.  People with no RSA
+	@${ECHO} license MUST set this variable to YES.  Users outside
+	@${ECHO} the USA MUST set this variable to NO.  RSA licensees may
+	@${ECHO} choose -- NO is faster.
+	@${ECHO}
+	@${ECHO} You may also want to set DONT_USE_IDEA to YES if this program
+	@${ECHO} will be used for a commercial purpose.  There are other
+	@${ECHO} configure options\; look at the pkg Makefile for more info.
+	@${FALSE}
+.endif
+
 post-extract:
 	${SED} -e 's|@@@PREFIX@@@|${PREFIX}|g' < ${FILESDIR}/NetBSD.sh \
 		> ${WRKSRC}/util/NetBSD.sh
@@ -31,8 +56,13 @@ post-patch:
 	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' <${WRKSRC}/foo> ${WRKSRC}/Configure
 	@${RM} -f ${WRKSRC}/foo
 
+.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
 post-configure:
+	patch -d ${WRKSRC} <files/patch-rsaref-1
+	@${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' <files/patch-rsaref-2 |\
+	    patch -d ${WRKSRC}
 	${CP} ${WRKSRC}/rsaref/rsaref.h ${WRKSRC}/include/rsaref.h
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/security/ssleay/files/patch-rsaref-1 b/security/ssleay/files/patch-rsaref-1
new file mode 100644
index 00000000000..b30b2c17566
--- /dev/null
+++ b/security/ssleay/files/patch-rsaref-1
@@ -0,0 +1,12 @@
+$NetBSD: patch-rsaref-1,v 1.1 1998/09/30 20:08:21 cjs Exp $
+--- Makefile.ssl.orig	Fri Jun 26 01:25:25 1998
++++ Makefile.ssl	Wed Sep 16 14:33:49 1998
+@@ -175,7 +175,7 @@
+ 	VERSION PROBLEMS MINFO makefile.one e_os.h \
+ 	MICROSOFT makevms.com config PATENTS
+ WDIRS=  windows
+-LIBS=   libcrypto.a libssl.a 
++LIBS=	libcrypto.a libssl.a libRSAglue.a
+ 
+ GENERAL=        Makefile
+ BASENAME=       SSLeay
diff --git a/security/ssleay/files/patch-rsaref-2 b/security/ssleay/files/patch-rsaref-2
new file mode 100644
index 00000000000..4288eeea829
--- /dev/null
+++ b/security/ssleay/files/patch-rsaref-2
@@ -0,0 +1,18 @@
+$NetBSD: patch-rsaref-2,v 1.1 1998/09/30 20:08:22 cjs Exp $
+--- Configure.orig	Sat Sep 19 08:45:16 1998
++++ Configure	Sun Sep 20 08:45:45 1998
+@@ -129,10 +129,10 @@
+ "linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
+ "debug-linux-elf","gcc:-DREF_CHECK -DBN_ASM -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall:-lefence:BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
+ "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
+-"NetBSD-sparc",	"gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-sparc",	"gcc:-DTERMIOS -D_ANSI_SOURCE -DRSAref -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN:-lRSAglue -lrsaref:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+-"NetBSD-m86",	"gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-m86",	"gcc:-DTERMIOS -D_ANSI_SOURCE -DRSAref -O3 -fomit-frame-pointer -Wall -DB_ENDIAN:-lRSAglue -lrsaref:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+-"NetBSD-x86",	"gcc:-DTERMIOS -DL_ENDIAN -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
++"NetBSD-x86",	"gcc:-DTERMIOS -DRSAref -DL_ENDIAN -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall:-lRSAglue -lrsaref:BN_LLONG $x86_gcc_des $x86_gcc_opts:",
+-"NetBSD-alpha", "gcc:-DTERMIOS -D_ANSI_SOURCE -DL_ENDIAN -O3:-Wl,-RXXXPREFIXXXX/lib:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:asm/alpha.o::",
++"NetBSD-alpha", "gcc:-DTERMIOS -D_ANSI_SOURCE -DRSAref -DL_ENDIAN -O3:-Wl,-RXXXPREFIXXXX/lib -lRSAglue -lrsaref:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:asm/alpha.o::",
+ "FreeBSD",   "gcc:-DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
+ #"bsdi-gcc",     "gcc:-O3 -ffast-math -DBN_ASM -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gc_des $x86_gcc_opts:$x86_bsdi_asm",
+ "nextstep",	"cc:-O3 -Wall -DBN_ASM::BN_LLONG $x86_gcc_des $x86_gcc_opts:::",
diff --git a/security/ssleay/patches/patch-aa b/security/ssleay/patches/patch-aa
index f089e5efe4a..6dd2c49e841 100644
--- a/security/ssleay/patches/patch-aa
+++ b/security/ssleay/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/09/05 09:05:22 explorer Exp $
+$NetBSD: patch-aa,v 1.3 1998/09/30 20:08:22 cjs Exp $
 
 diff -udr ../SSLeay-0.8.1.ORIG/apps/ca.c ./apps/ca.c
 --- ../SSLeay-0.8.1.ORIG/apps/ca.c	Fri Jul 18 20:15:56 1997
@@ -11,30 +11,3 @@ diff -udr ../SSLeay-0.8.1.ORIG/apps/ca.c ./apps/ca.c
 +#define CONFIG_FILE "etc/ssleay.cnf"
  
  #define ENV_DEFAULT_CA		"default_ca"
- 
-diff -udr ../SSLeay-0.8.1.ORIG/util/ssldir.pl ./util/ssldir.pl
---- ../SSLeay-0.8.1.ORIG/util/ssldir.pl	Fri Jul 18 20:15:59 1997
-+++ ./util/ssldir.pl	Tue Feb 17 20:37:46 1998
-@@ -4,7 +4,6 @@
- @files=('crypto/cryptlib.h',
- 	'Makefile.ssl',
- 	'tools/c_rehash',
--	'util/mk1mf.pl',
- 	);
- 
- %cryptlib=(
-@@ -22,14 +21,9 @@
- 	'^DIR=',	'DIR=%s',
- 	);
- 
--%mk1mf=(
--	'^$INSTALLTOP=','$INSTALLTOP="%s";',
--	);
--
- &dofile("crypto/cryptlib.h",$ARGV[0],%cryptlib);
- &dofile("Makefile.ssl",$ARGV[0],%Makefile_ssl);
- &dofile("tools/c_rehash",$ARGV[0],%c_rehash);
--&dofile("util/mk1mf.pl",$ARGV[0],%mk1mf);
- 
- sub dofile
- 	{
diff --git a/security/ssleay/patches/patch-ab b/security/ssleay/patches/patch-ab
index 87d42ce4faa..6bd29858361 100644
--- a/security/ssleay/patches/patch-ab
+++ b/security/ssleay/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 1998/09/17 00:48:02 garbled Exp $
+$NetBSD: patch-ab,v 1.4 1998/09/30 20:08:22 cjs Exp $
 --- Makefile.ssl.orig	Fri Jun 26 01:25:25 1998
 +++ Makefile.ssl	Wed Sep 16 14:33:49 1998
 @@ -62,7 +62,7 @@
@@ -10,15 +10,6 @@ $NetBSD: patch-ab,v 1.3 1998/09/17 00:48:02 garbled Exp $
  EX_LIBS= 
  AR=ar r
  
-@@ -175,7 +175,7 @@
- 	VERSION PROBLEMS MINFO makefile.one e_os.h \
- 	MICROSOFT makevms.com config PATENTS
- WDIRS=  windows
--LIBS=   libcrypto.a libssl.a 
-+LIBS=	libcrypto.a libssl.a libRSAglue.a
- 
- GENERAL=        Makefile
- BASENAME=       SSLeay
 @@ -327,5 +327,6 @@
  		sh util/ranlib.sh $(INSTALLTOP)/lib/$$i; \
  		chmod 644 $(INSTALLTOP)/lib/$$i ); \
diff --git a/security/ssleay/patches/patch-ac b/security/ssleay/patches/patch-ac
index f9662a8b5b0..5a965fbb8ec 100644
--- a/security/ssleay/patches/patch-ac
+++ b/security/ssleay/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 1998/09/21 18:30:33 garbled Exp $
+$NetBSD: patch-ac,v 1.3 1998/09/30 20:08:22 cjs Exp $
 --- Configure.orig	Sat Sep 19 08:45:16 1998
 +++ Configure	Sun Sep 20 08:45:45 1998
 @@ -129,9 +129,10 @@
@@ -6,12 +6,12 @@ $NetBSD: patch-ac,v 1.2 1998/09/21 18:30:33 garbled Exp $
  "debug-linux-elf","gcc:-DREF_CHECK -DBN_ASM -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall:-lefence:BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
  "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -DBN_ASM -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
 -"NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-sparc",	"gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
 -"NetBSD-m86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
++"NetBSD-m86",	"gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
 -"NetBSD-x86",	"gcc:-DTERMIOS -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
-+"NetBSD-sparc",	"gcc:-DTERMIOS -D_ANSI_SOURCE -DRSAref -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN:-lRSAglue -lrsaref:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
-+"NetBSD-m86",	"gcc:-DTERMIOS -D_ANSI_SOURCE -DRSAref -O3 -fomit-frame-pointer -Wall -DB_ENDIAN:-lRSAglue -lrsaref:BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
-+"NetBSD-x86",	"gcc:-DTERMIOS -DRSAref -DL_ENDIAN -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall:-lRSAglue -lrsaref:BN_LLONG $x86_gcc_des $x86_gcc_opts:",
-+"NetBSD-alpha", "gcc:-DTERMIOS -D_ANSI_SOURCE -DRSAref -DL_ENDIAN -O3:-Wl,-RXXXPREFIXXXX/lib -lRSAglue -lrsaref:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:asm/alpha.o::",
++"NetBSD-x86",	"gcc:-DTERMIOS -DL_ENDIAN -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
++"NetBSD-alpha", "gcc:-DTERMIOS -D_ANSI_SOURCE -DL_ENDIAN -O3:-Wl,-RXXXPREFIXXXX/lib:SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:asm/alpha.o::",
  "FreeBSD",   "gcc:-DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
  #"bsdi-gcc",     "gcc:-O3 -ffast-math -DBN_ASM -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gc_des $x86_gcc_opts:$x86_bsdi_asm",
  "nextstep",	"cc:-O3 -Wall -DBN_ASM::BN_LLONG $x86_gcc_des $x86_gcc_opts:::",
diff --git a/security/ssleay/pkg/PLIST b/security/ssleay/pkg/PLIST
index 08a3a07b23f..fb3db2aca6b 100644
--- a/security/ssleay/pkg/PLIST
+++ b/security/ssleay/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1998/09/21 10:13:38 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/09/30 20:08:22 cjs Exp $
 bin/ssleay
 bin/asn1parse
 bin/base64
@@ -124,7 +124,6 @@ include/tls1.h
 lib/ssleay.cnf
 lib/libcrypto.a
 lib/libssl.a
-lib/libRSAglue.a
 share/doc/SSLeay/API.doc
 share/doc/SSLeay/a_verify.doc
 share/doc/SSLeay/apps.doc
diff --git a/security/ssleay/pkg/PLIST.rsaref2 b/security/ssleay/pkg/PLIST.rsaref2
new file mode 100644
index 00000000000..6b0b70be9c8
--- /dev/null
+++ b/security/ssleay/pkg/PLIST.rsaref2
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.rsaref2,v 1.1 1998/09/30 20:08:22 cjs Exp $
+lib/libRSAglue.a