Update openssl to 0.9.4.

1 files changed, 16 insertions, 18 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 5d7536f7ce0..faa2aaaae99 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.8 1999/08/24 07:46:41 simonb Exp $
+# $NetBSD: Makefile,v 1.9 1999/11/25 18:51:47 erh Exp $
 #
 
-DISTNAME=		openssl-0.9.2b
+DISTNAME=		openssl-0.9.4
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.openssl.org/source/
 
-PATCH_SITES=		${MASTER_SITES}
-PATCHFILES=		openssl-0.9.2b-rsaoaep.patch
-
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.openssl.org/
 
@@ -23,7 +20,8 @@ ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
 			NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-powerpc \
 			NetBSD-*-sparc NetBSD-*-vax
 
-CONFIGURE_ARGS=		-fPIC -DPIC ${LDFLAGS}
+CONFIGURE_ARGS=		-fPIC -DPIC --openssldir=${PREFIX} --prefix=${PREFIX} \
+			${LDFLAGS}
 #CONFIGURE_ENV=		PREFIX=${PREFIX}
 MAKE_ENV=		LD_LIBRARY_PATH=${WRKSRC} MAKELIB=${FILESDIR}/makelib
 
@@ -35,7 +33,7 @@ IGNORE=			requires shared object support
 
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
 DEPENDS=		rsaref-2.0p2:../../security/rsaref
-CONFIGURE_ARGS+=	-DRSAref -L${PREFIX}/lib -lrsaref ${LDFLAGS}
+CONFIGURE_ARGS+=	rsaref
 .endif
 
 fetch-depends:
@@ -52,7 +50,6 @@ fetch-depends:
 # The Perl stuff doesn't work yet (nor did it work properly in SSLeay...)
 do-configure:
 	@cd ${WRKSRC} && ${LOCALBASE}/bin/perl util/perlpath.pl ${LOCALBASE}/bin
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/perl util/ssldir.pl ${PREFIX}
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./config ${CONFIGURE_ARGS}
 #	@cd ${WRKSRC}/perl && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/perl \
 #		Makefile.PL
@@ -69,9 +66,9 @@ do-install:
 	des-ede-ofb des-ede3 des-ede3-cbc des-ede3-cfb des-ede3-ofb \
 	des-ofb des3 desx dgst dh dsa dsaparam enc errstr gendh gendsa \
 	genrsa idea idea-cbc idea-cfb idea-ecb idea-ofb md2 mdc2 nseq \
-	pkcs7 rc2 rc2-cbc rc2-cfb rc2-ecb rc2-ofb rc4 rc5 rc5-cbc rc5-cfb \
-	rc5-ecb rc5-ofb req rmd160 rsa s_client s_server s_time sess_id \
-	sha sha1 verify x509 ssleay; do \
+	pkcs12 pkcs7 pkcs8 rc2 rc2-cbc rc2-cfb rc2-ecb rc2-ofb rc4 rc5 \
+	rc5-cbc rc5-cfb rc5-ecb rc5-ofb req rmd160 rsa s_client s_server \
+	s_time sess_id sha sha1 speed verify version x509; do \
 		${LN} -sf openssl $$file; \
 	done
 	cd ${WRKSRC}/tools && ${INSTALL_SCRIPT} \
@@ -83,13 +80,14 @@ do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} libcrypto.so.?.0 libssl.so.?.0 ${PREFIX}/lib/
 	${INSTALL_DATA_DIR} ${PREFIX}/include/openssl
-	cd ${WRKSRC}/include && \
-	for file in asn1.h asn1_mac.h bio.h blowfish.h bn.h buffer.h \
-	cast.h comp.h conf.h cryptall.h crypto.h des.h dh.h dsa.h err.h \
-	evp.h hmac.h idea.h lhash.h md2.h md5.h mdc2.h objects.h \
-	opensslv.h pem.h pem2.h pkcs7.h rand.h rc2.h rc4.h rc5.h ripemd.h \
-	rsa.h sha.h ssl.h ssl2.h ssl23.h ssl3.h stack.h tls1.h tmdiff.h \
-	txt_db.h x509.h x509_vfy.h x509v3.h; do \
+	cd ${WRKSRC}/include/openssl && \
+	for file in \
+	asn1.h asn1_mac.h bio.h blowfish.h bn.h buffer.h cast.h comp.h conf.h \
+	crypto.h des.h dh.h dsa.h e_os.h e_os2.h ebcdic.h err.h evp.h hmac.h \
+	idea.h lhash.h md2.h md5.h mdc2.h objects.h opensslconf.h opensslv.h \
+	pem.h pem2.h pkcs12.h pkcs7.h rand.h rc2.h rc4.h rc5.h ripemd.h rsa.h \
+	safestack.h sha.h ssl.h ssl2.h ssl23.h ssl3.h stack.h tls1.h tmdiff.h \
+	txt_db.h x509.h x509_vfy.h x509v3.h ; do \
 		${INSTALL_DATA} $$file ${PREFIX}/include/openssl/; \
 	done
 #	@cd ${WRKSRC}/perl && ${MAKE} install