From d5539ce8ecc804cf92491a50b8d19a84c6c55703 Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Wed, 13 Jan 2010 13:30:27 +0000
Subject: [PATCH] - new option WITH_OPENSSL_THREADS - revert Configure - bump
 shared libs

---
 security/openssl/Makefile              | 17 ++++++++++-------
 security/openssl/files/patch-Configure |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index d86637ad017f..9760ff44e455 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openssl
 PORTVERSION=	0.9.8l
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/%SUBDIR%/ \
 		ftp://ftp.openssl.org/%SUBDIR%/ \
@@ -33,11 +33,6 @@ OPTIONS=	I386	"Use optimzed assembler for 80386" off \
 		SSE2	"Use runtime SSE2 detection" on \
 		ZLIB	"Build with zlib compression" on \
 
-BROKEN=		coredumps on i386 and amd64
-DEPRECATED=	has unfixed vulnerabilities
-EXPIRATION_DATE=2010-01-12
-
-
 EXTRACONFIGURE=	enable-camellia
 MAKE_ARGS+=		WHOLE_ARCHIVE_FLAG=--whole-archive
 MAKE_ENV+=		LIBRPATH="${PREFIX}/lib"
@@ -860,7 +855,7 @@ MLINKS=	dgst.1 md4.1 \
 OPENSSL_BASE_SONAME!=	readlink ${DESTDIR}/usr/lib/libcrypto.so || true
 OPENSSL_SHLIBVER_BASE=	${OPENSSL_BASE_SONAME:E}
 OPENSSL_BASE_SOPATH=	${OPENSSL_BASE_SONAME:H}
-OPENSSL_SHLIBVER?=	6
+OPENSSL_SHLIBVER?=	7
 
 .if !defined(WITHOUT_SSE2)
 # disable runtime SSE2 detection
@@ -910,11 +905,19 @@ do-configure:
 	${RM} -f ${WRKSRC}/include/openssl/fips.h
 	${RM} -f ${WRKSRC}/include/openssl/fips_rand.h
 .endif
+.if defined(WITH_OPENSSL_THREADS)
+	cd ${WRKSRC} \
+	&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
+		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \
+	./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
+		-L${PREFIX}/lib ${EXTRACONFIGURE}
+.else
 	cd ${WRKSRC} \
 	&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 	./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
 		-L${PREFIX}/lib ${EXTRACONFIGURE}
+.endif
 .if defined(WITH_FIPS)
 	@${REINPLACE_CMD} \
 		-e 's|^MANDIR=.*$$|MANDIR=$$(MANPREFIX)/man|' \
diff --git a/security/openssl/files/patch-Configure b/security/openssl/files/patch-Configure
index 45e9385cab7d..b2cde1e0da59 100644
--- a/security/openssl/files/patch-Configure
+++ b/security/openssl/files/patch-Configure
@@ -5,7 +5,7 @@
  # sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which
  # seems to be sufficient?
 -my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT";
-+my $BSDthreads="$ENV{'PTHREAD_CFLAGS'}";
++my $BSDthreads="";
  
  #config-string	$cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags