commit 618e7076669ee7a48416373d5da4369647c57246 Author: Tomasz Pala <go...@pld-linux.org> Date: Sun Dec 3 09:15:35 2017 +0100
use the generic ca-bundle path instead of PLD-specific ca-certificates one openssl-ca-certificates.patch | 2 +- openssl.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/openssl.spec b/openssl.spec index 8010668..dcaba4e 100644 --- a/openssl.spec +++ b/openssl.spec @@ -56,7 +56,7 @@ BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.213 BuildRequires: sed >= 4.0 BuildRequires: zlib-devel -Requires: ca-certificates >= 20120623-1.1 +Requires: ca-certificates >= 20141019-3 Requires: rpm-whiteout >= 1.7 Obsoletes: SSLeay Obsoletes: SSLeay-devel diff --git a/openssl-ca-certificates.patch b/openssl-ca-certificates.patch index 8f366ad..0221ac2 100644 --- a/openssl-ca-certificates.patch +++ b/openssl-ca-certificates.patch @@ -6,7 +6,7 @@ diff -ruN openssl-1.0.2.orig/crypto/cryptlib.h openssl-1.0.2/crypto/cryptlib.h # define X509_CERT_AREA OPENSSLDIR # define X509_CERT_DIR OPENSSLDIR "/certs" -# define X509_CERT_FILE OPENSSLDIR "/cert.pem" -+# define X509_CERT_FILE "/etc/certs/ca-certificates.crt" ++# define X509_CERT_FILE "/etc/pki/tls/certs/ca-bundle.crt" # define X509_PRIVATE_DIR OPENSSLDIR "/private" # else # define X509_CERT_AREA "SSLROOT:[000000]" ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/618e7076669ee7a48416373d5da4369647c57246 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit