[pkgsrc/trunk]: pkgsrc/security/openssl If the built-in OpenSSL software is 0...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f376e91ce45c
branches:  trunk
changeset: 463678:f376e91ce45c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Nov 25 06:56:08 2003 +0000

description:
If the built-in OpenSSL software is 0.9.6g, then check whether it
contains the 0.9.6g -> 0.9.6l security fixes pulled up to netbsd-1-6 on
2003-11-07 by checking for the presence of the preprocessor symbol
OPENSSL_HAS_20031107_FIX.  If it does, then allow the built-in OpenSSL to
satisfy dependencies for openssl>=0.9.6l.

diffstat:

 security/openssl/buildlink2.mk |  20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r afe20f9fef8e -r f376e91ce45c security/openssl/buildlink2.mk
--- a/security/openssl/buildlink2.mk    Tue Nov 25 02:28:07 2003 +0000
+++ b/security/openssl/buildlink2.mk    Tue Nov 25 06:56:08 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.11 2003/11/17 15:25:57 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2003/11/25 06:56:08 jlam Exp $
 
 .if !defined(OPENSSL_BUILDLINK2_MK)
 OPENSSL_BUILDLINK2_MK= # defined
@@ -16,7 +16,6 @@
 BUILDLINK_CHECK_BUILTIN.openssl?=      NO
 
 _OPENSSL_OPENSSLV_H=   /usr/include/openssl/opensslv.h
-_OPENSSL_SSL_H=                /usr/include/openssl/ssl.h
 
 .if !defined(BUILDLINK_IS_BUILTIN.openssl)
 BUILDLINK_IS_BUILTIN.openssl=  NO
@@ -68,6 +67,23 @@
        ' ${_OPENSSL_OPENSSLV_H}
 _OPENSSL_VERSION=      ${_OPENSSL_MAJOR}${_OPENSSL_MINOR}${_OPENSSL_TEENY}${_OPENSSL_PATCHLEVEL}
 _OPENSSL_PKG=  openssl-${_OPENSSL_VERSION}
+#
+# If the built-in OpenSSL software is 0.9.6g, then check whether it
+# contains the security fixes pulled up to netbsd-1-6 on 2003-11-07.
+# If it does, then treat it as the equivalent of openssl-0.9.6l.  This
+# is not strictly true, but is good enough since the main differences
+# between 0.9.6g and 0.9.6l are security fixes that NetBSD has already
+# patched into its built-in OpenSSL software.
+#
+_OPENSSL_HAS_FIX!=                                                     \
+       ${AWK} 'BEGIN { ans = "NO" }                                    \
+               /OPENSSL_HAS_20031107_FIX/ { ans = "YES" }              \
+               END { print ans; exit 0 }                               \
+       ' ${_OPENSSL_OPENSSLV_H}
+.    if !empty(_OPENSSL_VERSION:M0\.9\.6g) && (${_OPENSSL_HAS_FIX} == "YES")
+_OPENSSL_PKG=          openssl-0.9.6l
+.    endif
+
 _OPENSSL_DEPENDS=      ${BUILDLINK_DEPENDS.openssl}
 _NEED_OPENSSL!=                \
        if ${PKG_ADMIN} pmatch '${_OPENSSL_DEPENDS}' ${_OPENSSL_PKG}; then \