From bb5cf1306476b2e47ed9784e300289034fd43f83c21286991d8798aa5e94b800 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 4 Jul 2013 16:04:58 +0000
Subject: [PATCH] Accepting request 182147 from Base:System

- Don't use the legacy /etc/ssl/certs directory anymore but rather
  the p11-kit generated /var/lib/ca-certificates/openssl one
  (fate#314991, openssl-1.0.1e-truststore.diff)

OBS-URL: https://build.opensuse.org/request/show/182147
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=91
---
 openssl-1.0.1e-truststore.diff | 15 +++++++++++++++
 openssl.changes                |  7 +++++++
 openssl.spec                   |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 openssl-1.0.1e-truststore.diff

diff --git a/openssl-1.0.1e-truststore.diff b/openssl-1.0.1e-truststore.diff
new file mode 100644
index 0000000..b3105b2
--- /dev/null
+++ b/openssl-1.0.1e-truststore.diff
@@ -0,0 +1,15 @@
+Don't use the legacy /etc/ssl/certs directory anymore but rather the
+p11-kit generated /var/lib/ca-certificates/openssl one (fate#314991)
+Index: openssl-1.0.1e/crypto/cryptlib.h
+===================================================================
+--- openssl-1.0.1e.orig/crypto/cryptlib.h
++++ openssl-1.0.1e/crypto/cryptlib.h
+@@ -81,7 +81,7 @@ extern "C" {
+ 
+ #ifndef OPENSSL_SYS_VMS
+ #define X509_CERT_AREA		OPENSSLDIR
+-#define X509_CERT_DIR		OPENSSLDIR "/certs"
++#define X509_CERT_DIR		"/var/lib/ca-certificates/openssl"
+ #define X509_CERT_FILE		OPENSSLDIR "/cert.pem"
+ #define X509_PRIVATE_DIR	OPENSSLDIR "/private"
+ #else
diff --git a/openssl.changes b/openssl.changes
index 9732f2d..d62d933 100644
--- a/openssl.changes
+++ b/openssl.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  2 09:02:59 UTC 2013 - lnussel@suse.de
+
+- Don't use the legacy /etc/ssl/certs directory anymore but rather
+  the p11-kit generated /var/lib/ca-certificates/openssl one
+  (fate#314991, openssl-1.0.1e-truststore.diff)
+
 -------------------------------------------------------------------
 Sat Jun 29 22:47:54 UTC 2013 - crrodriguez@opensuse.org
 
diff --git a/openssl.spec b/openssl.spec
index 6306002..ba57035 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -48,6 +48,7 @@ Patch3:         openssl-ocloexec.patch
 Patch4:         VIA_padlock_support_on_64systems.patch
 # PATCH-FIX-UPSTREAM http://rt.openssl.org/Ticket/Attachment/WithHeaders/20049
 Patch5:         openssl-fix-pod-syntax.diff
+Patch6:         openssl-1.0.1e-truststore.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -129,6 +130,7 @@ this package's base documentation.
 %patch3
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 cp -p %{S:10} .
 echo "adding/overwriting some entries in the 'table' hash in Configure"
 # $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags