[pkgsrc/trunk]: pkgsrc/security/openssl Only point SSLCERTS into ${PKG_SYSCON...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3ffc6782fb4
branches:  trunk
changeset: 466613:a3ffc6782fb4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jan 21 10:03:41 2004 +0000

description:
Only point SSLCERTS into ${PKG_SYSCONFDIR} if we're not using the built-in
OpenSSL software.  Otherwise, set it to /etc/ssl/certs, which is where a
lot of Linux distros store certs.  The behaviour on NetBSD systems is
unchanged -- always set to /etc/openssl/certs.  Fixes PR 24161.

diffstat:

 security/openssl/buildlink2.mk |  4 +++-
 security/openssl/buildlink3.mk |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r c50adbde1da6 -r a3ffc6782fb4 security/openssl/buildlink2.mk
--- a/security/openssl/buildlink2.mk    Wed Jan 21 09:40:49 2004 +0000
+++ b/security/openssl/buildlink2.mk    Wed Jan 21 10:03:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.14 2004/01/07 02:21:16 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.15 2004/01/21 10:03:41 jlam Exp $
 
 .if !defined(OPENSSL_BUILDLINK2_MK)
 OPENSSL_BUILDLINK2_MK= # defined
@@ -144,6 +144,8 @@
 SSLCERTS=              ${PKG_SYSCONFDIR.openssl}/certs
 .elif ${OPSYS} == "NetBSD"
 SSLCERTS=              /etc/openssl/certs
+.elif ${_NEED_OPENSSL} == "NO"
+SSLCERTS=              /etc/ssl/certs
 .else
 SSLCERTS=              ${PKG_SYSCONFBASEDIR}/openssl/certs
 .endif
diff -r c50adbde1da6 -r a3ffc6782fb4 security/openssl/buildlink3.mk
--- a/security/openssl/buildlink3.mk    Wed Jan 21 09:40:49 2004 +0000
+++ b/security/openssl/buildlink3.mk    Wed Jan 21 10:03:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/07 02:21:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/01/21 10:03:41 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=        ${OPENSSL_BUILDLINK3_MK}+
@@ -148,6 +148,8 @@
 SSLCERTS=      ${PKG_SYSCONFDIR.openssl}/certs
 .  elif ${OPSYS} == "NetBSD"
 SSLCERTS=      /etc/openssl/certs
+.  elif !empty(BUILDLINK_USE_BUILTIN.openssl:M[yY][eE][sS])
+SSLCERTS=      /etc/ssl/certs          # likely place where certs live
 .  else
 SSLCERTS=      ${PKG_SYSCONFBASEDIR}/openssl/certs
 .  endif