summaryrefslogtreecommitdiff
path: root/security/openssl
diff options
context:
space:
mode:
authorjlam <jlam>2005-10-12 02:20:10 +0000
committerjlam <jlam>2005-10-12 02:20:10 +0000
commitc9a510ce204a4cd50fcad8c7f11000271e109d26 (patch)
treebc8ebbe071dccde1139720641f02bf861cdee2be /security/openssl
parent7121cecf4f0fe262332a82af936ecf53657db70d (diff)
downloadpkgsrc-c9a510ce204a4cd50fcad8c7f11000271e109d26.tar.gz
If the native openssl-0.9.7d contains the security fixes pulled up to
the netbsd-2-0, netbsd-2, and netbsd-3-0 branches on 2005-10-11, then for the purposes of satisfying dependencies, pretend it's openssl-0.9.7h.
Diffstat (limited to 'security/openssl')
-rw-r--r--security/openssl/builtin.mk19
1 files changed, 16 insertions, 3 deletions
diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk
index 20db2872da2..35aa387fe44 100644
--- a/security/openssl/builtin.mk
+++ b/security/openssl/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2005/10/12 02:00:03 jlam Exp $
+# $NetBSD: builtin.mk,v 1.17 2005/10/12 02:20:10 jlam Exp $
BUILTIN_PKG:= openssl
@@ -54,8 +54,7 @@ BUILTIN_VERSION.openssl!= \
} \
' ${H_OPENSSL}
-. if !empty(BUILTIN_VERSION.openssl:M0\.9\.6g) && \
- exists(${H_OPENSSL})
+. if !empty(BUILTIN_VERSION.openssl:M0\.9\.6g) && exists(${H_OPENSSL})
#
# If the native OpenSSL contains the security fixes pulled up to the
# netbsd-1-6 branch on 2003-11-07, then pretend it's openssl-0.9.6l.
@@ -80,6 +79,20 @@ BUILTIN_OPENSSL_HAS_20040401_FIX!= \
. if !empty(BUILTIN_OPENSSL_HAS_20040401_FIX:M[yY][eE][sS])
BUILTIN_VERSION.openssl= 0.9.6m
. endif
+. elif !empty(BUILTIN_VERSION.openssl:M0\.9\.7d) && exists(${H_OPENSSL})
+#
+# If the native OpenSSL contains the security fixes pulled up to the
+# netbsd-2-0, netbsd-2, and netbsd-3-0 branches on 2005-10-11, then
+# pretend it's openssl-0.9.7h.
+#
+BUILTIN_OPENSSL_HAS_20051011_FIX!= \
+ ${AWK} 'BEGIN { ans = "no" } \
+ /OPENSSL_HAS_20051011_FIX/ { ans = "yes" } \
+ END { print ans; exit 0 } \
+ ' ${H_OPENSSL}
+. if !empty(BUILTIN_OPENSSL_HAS_20051011_FIX:M[yY][eE][sS])
+BUILTIN_VERSION.openssl= 0.9.7h
+. endif
. endif
BUILTIN_PKG.openssl= openssl-${BUILTIN_VERSION.openssl}
.endif