diff options
| author | itojun <itojun> | 2002-08-10 05:27:30 +0000 |
|---|---|---|
| committer | itojun <itojun> | 2002-08-10 05:27:30 +0000 |
| commit | 6a8bab79d6a573a0bc7ac354a94c87a52761909f (patch) | |
| tree | 3b820250d9d5a11284debf0c0d433f85d7de2134 | |
| parent | 83b2c48261045008abfb9bda96955f9ac8c88625 (diff) | |
| download | pkgsrc-6a8bab79d6a573a0bc7ac354a94c87a52761909f.tar.gz | |
require 0.9.6f, at least
| -rw-r--r-- | security/openssl/buildlink.mk | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/security/openssl/buildlink.mk b/security/openssl/buildlink.mk index 760419461da..2e253f07813 100644 --- a/security/openssl/buildlink.mk +++ b/security/openssl/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.16 2002/08/09 17:12:51 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.17 2002/08/10 05:27:30 itojun Exp $ # # This Makefile fragment is included by packages that use OpenSSL. # @@ -24,9 +24,11 @@ OPENSSL_VERSION_096A= 0x0090601fL OPENSSL_VERSION_096B= 0x0090602fL OPENSSL_VERSION_096D= 0x0090604fL OPENSSL_VERSION_096E= 0x0090605fL +OPENSSL_VERSION_096F= 0x0090606fL +OPENSSL_VERSION_096G= 0x0090607fL # Check for a usable installed version of OpenSSL. Version must be greater -# than 0.9.6e, or else contain a fix for the 2002-07-30 security advisory. +# than 0.9.6f, or else contain a fix for the 2002-07-30 security advisory. # If a usable version isn't present, then use the pkgsrc OpenSSL package. # .include "../../mk/bsd.prefs.mk" @@ -42,13 +44,13 @@ _NEED_OPENSSL= YES .if exists(${_OPENSSLV_H}) && exists(${_SSL_H}) _IN_TREE_OPENSSL_HAS_FIX!= \ ${AWK} 'BEGIN { ans = "NO" } \ - /SSL_R_KEY_ARG_TOO_LONG/ { ans = "YES" } \ + /SSL_R_SSL2_CONNECTION_ID_TOO_LONG/ { ans = "YES" } \ END { print ans; exit 0 }' ${_SSL_H} . if ${_IN_TREE_OPENSSL_HAS_FIX} == "YES" -USE_OPENSSL_VERSION?= ${OPENSSL_VERSION_095A} +USE_OPENSSL_VERSION?= ${OPENSSL_VERSION_096F} . else -USE_OPENSSL_VERSION?= ${OPENSSL_VERSION_096E} +USE_OPENSSL_VERSION?= ${OPENSSL_VERSION_096G} . endif _OPENSSL_VERSION!= ${AWK} '/.*OPENSSL_VERSION_NUMBER.*/ { print $$3 }' \ @@ -86,6 +88,18 @@ _VALID_SSL_VERSIONS= ${OPENSSL_VERSION_096E} _VALID_SSL_VERSIONS+= ${OPENSSL_VERSION_096E} . endif +. if ${USE_OPENSSL_VERSION} == ${OPENSSL_VERSION_096F} # OpenSSL 0.9.6f +_VALID_SSL_VERSIONS= ${OPENSSL_VERSION_096F} +. else +_VALID_SSL_VERSIONS+= ${OPENSSL_VERSION_096F} +. endif + +. if ${USE_OPENSSL_VERSION} == ${OPENSSL_VERSION_096G} # OpenSSL 0.9.6g +_VALID_SSL_VERSIONS= ${OPENSSL_VERSION_096G} +. else +_VALID_SSL_VERSIONS+= ${OPENSSL_VERSION_096G} +. endif + . for PATTERN in ${_VALID_SSL_VERSIONS} . if ${_OPENSSL_VERSION:M${PATTERN}} != "" _NEED_OPENSSL= NO |