sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-05 21:00:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- new option WITH_OPENSSL_THREADS

Browse source 
- revert Configure
- bump shared libs
This commit is contained in:
Dirk Meyer 2010-01-13 13:30:27 +00:00
parent f9d169914b
commit d5539ce8ec
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=247813
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
security/openssl/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= openssl PORTNAME= openssl
PORTVERSION= 0.9.8l PORTVERSION= 0.9.8l
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= security devel CATEGORIES= security devel
MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \
ftp://ftp.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 \ SSE2 "Use runtime SSE2 detection" on \
ZLIB "Build with zlib compression" 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 EXTRACONFIGURE= enable-camellia
MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive
MAKE_ENV+= LIBRPATH="${PREFIX}/lib" 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_BASE_SONAME!= readlink ${DESTDIR}/usr/lib/libcrypto.so || true
OPENSSL_SHLIBVER_BASE= ${OPENSSL_BASE_SONAME:E} OPENSSL_SHLIBVER_BASE= ${OPENSSL_BASE_SONAME:E}
OPENSSL_BASE_SOPATH= ${OPENSSL_BASE_SONAME:H} OPENSSL_BASE_SOPATH= ${OPENSSL_BASE_SONAME:H}
OPENSSL_SHLIBVER?= 6 OPENSSL_SHLIBVER?= 7
.if !defined(WITHOUT_SSE2) .if !defined(WITHOUT_SSE2)
# disable runtime SSE2 detection # disable runtime SSE2 detection
@ -910,11 +905,19 @@ do-configure:
${RM} -f ${WRKSRC}/include/openssl/fips.h ${RM} -f ${WRKSRC}/include/openssl/fips.h
${RM} -f ${WRKSRC}/include/openssl/fips_rand.h ${RM} -f ${WRKSRC}/include/openssl/fips_rand.h
.endif .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} \ cd ${WRKSRC} \
&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \ && ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \ ./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
-L${PREFIX}/lib ${EXTRACONFIGURE} -L${PREFIX}/lib ${EXTRACONFIGURE}
.endif
.if defined(WITH_FIPS) .if defined(WITH_FIPS)
@${REINPLACE_CMD} \ @${REINPLACE_CMD} \
-e 's|^MANDIR=.*$$|MANDIR=$$(MANPREFIX)/man|' \ -e 's|^MANDIR=.*$$|MANDIR=$$(MANPREFIX)/man|' \

2
security/openssl/files/patch-Configure
View file

@ -5,7 +5,7 @@
# sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which # sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which
# seems to be sufficient? # seems to be sufficient?
-my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT"; -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 #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