testing/openssl
SHA256
3
0
Fork 0
forked from pool/openssl
Code Pull Requests Activity

Accepting request 182147 from Base:System

Browse Source 
- 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
This commit is contained in:
Stephan Kulow 2013-07-04 16:04:58 +00:00 committed by Git OBS Bridge
parent dd9592a972
commit bb5cf13064
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openssl-1.0.1e-truststore.diff Normal file
View File

@ -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

7
openssl.changes
View File

@ -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 Sat Jun 29 22:47:54 UTC 2013 - crrodriguez@opensuse.org

2
openssl.spec
View File

@ -48,6 +48,7 @@ Patch3: openssl-ocloexec.patch
Patch4: VIA_padlock_support_on_64systems.patch Patch4: VIA_padlock_support_on_64systems.patch
# PATCH-FIX-UPSTREAM http://rt.openssl.org/Ticket/Attachment/WithHeaders/20049 # PATCH-FIX-UPSTREAM http://rt.openssl.org/Ticket/Attachment/WithHeaders/20049
Patch5: openssl-fix-pod-syntax.diff Patch5: openssl-fix-pod-syntax.diff
Patch6: openssl-1.0.1e-truststore.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -129,6 +130,7 @@ this package's base documentation.
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
cp -p %{S:10} . cp -p %{S:10} .
echo "adding/overwriting some entries in the 'table' hash in Configure" echo "adding/overwriting some entries in the 'table' hash in Configure"
# $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags # $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags