summaryrefslogtreecommitdiff
path: root/security/openssl
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-01-21 10:03:41 +0000
committerjlam <jlam@pkgsrc.org>2004-01-21 10:03:41 +0000
commit0167c3791f4277fca9cdf2791da483abcf94a3af (patch)
treee6559706c423b51fe44744a2ec94ea19fcbe60ab /security/openssl
parentbc9660dc1e70ad68b5142baa7ff8135108ce79c5 (diff)
downloadpkgsrc-0167c3791f4277fca9cdf2791da483abcf94a3af.tar.gz
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 (limited to 'security/openssl')
-rw-r--r--security/openssl/buildlink2.mk4
-rw-r--r--security/openssl/buildlink3.mk4
2 files changed, 6 insertions, 2 deletions
diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk
index ee7b802094b..911f9a04771 100644
--- a/security/openssl/buildlink2.mk
+++ b/security/openssl/buildlink2.mk
@@ -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 @@ BUILD_DEFS+= SSLBASE
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 --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 6bc3747f75a..845b9ddb00f 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -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 @@ BUILD_DEFS+= SSLBASE
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