summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2004-03-18 13:30:47 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2004-03-18 13:30:47 +0000
commit844edecab866d3f3a322e0aa9f8a5b427ffee393 (patch)
tree1788a247a6a4334e426db986bdcced43f110b06c /Mk
parentBROKEN on 4.x: Does not compile. Correct whitespace. (diff)
- update Security check
- use OPENSSL_VERSION_TEXT for detection. Security: version in base must be 0.9.7d or have fixes http://www.freebsd.org/cgi/cvsweb.cgi/src/crypto/openssl/crypto/opensslv.h
Notes
Notes: svn path=/head/; revision=104456
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.openssl.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk
index bf8a64a98d04..f93a58dec61b 100644
--- a/Mk/bsd.openssl.mk
+++ b/Mk/bsd.openssl.mk
@@ -2,7 +2,7 @@
# Date created: 31 May 2002
# Whom: dinoex
#
-# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.12 2004-01-20 09:14:09 marcus Exp $
+# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.13 2004-03-18 13:30:47 dinoex Exp $
#
# Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
#
@@ -48,11 +48,12 @@ WITH_OPENSSL_PORT=yes
!defined(WITH_OPENSSL_PORT) && \
!exists(${LOCALBASE}/lib/libcrypto.so) && \
exists(/usr/include/openssl/opensslv.h)
-# Security: version in base must be 0.9.7a
-OPENSSLVER!= ${AWK} '/OPENSSL_VERSION_NUMBER/ { print $$3 }' \
+# Security: version in base must be 0.9.7d or have fixes
+# http://www.freebsd.org/cgi/cvsweb.cgi/src/crypto/openssl/crypto/opensslv.h
+OPENSSLVER!= ${AWK} '/OPENSSL_VERSION_TEXT/ { print $$4; exit }' \
/usr/include/openssl/opensslv.h
# check for safe versions in the base
-.if ${OPENSSLVER} == 0x0090701fL || ${OPENSSLVER} == 0x0090702fL || ${OPENSSLVER} == 0x0090609fL || ${OPENSSLVER} == 0x0090703fL
+.if ${OPENSSLVER} == "0.9.7a-p1" || ${OPENSSLVER} == "0.9.7c-p1" || ${OPENSSLVER} == "0.9.7d"
WITH_OPENSSL_BASE=yes
.endif
.endif