diff --git a/dev-libs/openssl/openssl-1.0.0m.recipe b/dev-libs/openssl/openssl-1.0.0m.recipe index 38538f991..2ecb2952b 100644 --- a/dev-libs/openssl/openssl-1.0.0m.recipe +++ b/dev-libs/openssl/openssl-1.0.0m.recipe @@ -21,7 +21,7 @@ COPYRIGHT=" 1995-1998 Eric Young 1998-2012 The OpenSSL Project. " -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -105,7 +105,6 @@ INSTALL() TEST() { - cd openssl-1.0.0j make test } diff --git a/dev-libs/openssl/patches/openssl-1.0.0m.patchset b/dev-libs/openssl/patches/openssl-1.0.0m.patchset index cea5b3100..ed643c50b 100644 --- a/dev-libs/openssl/patches/openssl-1.0.0m.patchset +++ b/dev-libs/openssl/patches/openssl-1.0.0m.patchset @@ -1,8 +1,13 @@ -From df00735cecc9c5ec0cdb9a9706e52b15f14057ec Mon Sep 17 00:00:00 2001 +From 32832917dfac06f89f0ef56f088859b2ad555f3e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 5 Jun 2014 15:47:46 +0000 -Subject: import patch from 1.0.0l +Subject: [PATCH 1/2] import patch from 1.0.0l +--- + Configure | 4 ++++ + Makefile.shared | 8 ++++---- + config | 11 +++++++++++ + 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Configure b/Configure index cd849e3..0ff7727 100755 @@ -70,3 +75,28 @@ index 30e9a37..c2894cc 100755 -- 1.8.3.4 +From ad3b79df8dbaaafa1297204c2632e3bbb2a26489 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Sat, 21 Jun 2014 21:45:05 +0000 +Subject: [PATCH 2/2] openssl: Adjust default CA cert path + +--- + crypto/cryptlib.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h +index fc249c5..273aa94 100644 +--- a/crypto/cryptlib.h ++++ b/crypto/cryptlib.h +@@ -82,7 +82,7 @@ extern "C" { + #ifndef OPENSSL_SYS_VMS + #define X509_CERT_AREA OPENSSLDIR + #define X509_CERT_DIR OPENSSLDIR "/certs" +-#define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++#define X509_CERT_FILE OPENSSLDIR "/CARootCertificates.pem" + #define X509_PRIVATE_DIR OPENSSLDIR "/private" + #else + #define X509_CERT_AREA "SSLROOT:[000000]" +-- +1.8.3.4 +