pool/openssl
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 454260 from Base:System

Browse Source 
- fix X509_CERT_FILE path (bsc#1022271) and rename
  updated openssl-1.0.1e-truststore.diff to openssl-truststore.patch (forwarded request 454258 from vitezslav_cizek)

OBS-URL: https://build.opensuse.org/request/show/454260
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=136
This commit is contained in:
Dominique Leuenberger 2017-02-07 10:57:29 +00:00 committed by Git OBS Bridge
parent f7574150c5
commit de4d1be4ab
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openssl-1.0.1e-truststore.diff
View File

@ -1,15 +0,0 @@
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.2a/crypto/cryptlib.h
===================================================================
--- openssl-1.0.2a.orig/crypto/cryptlib.h 2015-04-03 22:09:06.993805968 +0200
+++ openssl-1.0.2a/crypto/cryptlib.h 2015-04-03 22:10:12.867717257 +0200
@@ -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

17
openssl-truststore.patch Normal file
View File

@ -0,0 +1,17 @@
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.2j/crypto/cryptlib.h
===================================================================
--- openssl-1.0.2j.orig/crypto/cryptlib.h 2017-02-01 16:50:51.103706760 +0100
+++ openssl-1.0.2j/crypto/cryptlib.h 2017-02-01 16:52:10.517058963 +0100
@@ -81,8 +81,8 @@ 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_DIR "/var/lib/ca-certificates/openssl"
+# define X509_CERT_FILE "/var/lib/ca-certificates/ca-bundle.pem"
# define X509_PRIVATE_DIR OPENSSLDIR "/private"
# else
# define X509_CERT_AREA "SSLROOT:[000000]"

6
openssl.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 2 15:19:15 UTC 2017 - vcizek@suse.com
- fix X509_CERT_FILE path (bsc#1022271) and rename
updated openssl-1.0.1e-truststore.diff to openssl-truststore.patch
-------------------------------------------------------------------
Fri Jan 27 10:21:42 UTC 2017 - meissner@suse.com

2
openssl.spec
View File

@ -54,7 +54,7 @@ Patch3: openssl-ocloexec.patch
Patch4: openssl-1.0.2a-padlock64.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
Patch6: openssl-truststore.patch
Patch7: compression_methods_switch.patch
Patch8: 0005-libssl-Hide-library-private-symbols.patch
Patch9: openssl-1.0.2a-default-paths.patch