commit e90d99b8fdde961b8c1acab48f8ad0960156f63a
Merge: 3ab6eaf fa69ae9
Author: Jakub Bogusz <[email protected]>
Date: Sat Sep 15 21:18:22 2018 +0200
Merge branch 'dev-1.1'
engines-dir.patch | 11 +
openssl-alpha-ccc.patch | 11 -
openssl-asflag.patch | 11 -
openssl-ca-certificates.patch | 9 +-
openssl-include.patch | 29 --
openssl-ldflags.patch | 25 --
openssl-man-namespace.patch | 839 ++++++++++++++++++++++++++++++++++++++++--
openssl-optflags.patch | 155 +-------
openssl.spec | 265 +++++++++----
openssl_fix_for_x32.patch | 23 --
10 files changed, 1030 insertions(+), 348 deletions(-)
---
diff --cc openssl.spec
index ecfec62,7be0596..c433de3
--- a/openssl.spec
+++ b/openssl.spec
@@@ -5,11 -2,9 +2,8 @@@
# Conditional build:
%bcond_without tests # don't perform "make tests"
%bcond_without zlib # zlib: note - enables CVE-2012-4929
vulnerability
- %bcond_without sslv2 # SSLv2: note - many flaws
http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0
- %bcond_without sslv3 # SSLv3: note - enables CVE-2014-3566
vulnerability
- %bcond_with purify # Compile openssl with "-DPURIFY", useful when one
wants to
- # use valgrind debugger against openssl-linked programs
- %bcond_with snap # use GitHub snapshot to build branch release
+ %bcond_with sslv2 # SSLv2: note - many flaws
http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0
+ %bcond_with sslv3 # SSLv3: note - enables CVE-2014-3566 vulnerability
-%bcond_with snap # use GitHub snapshot to build branch release
%include /usr/lib/rpm/macros.perl
Summary: OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL
v2/v3)
@@@ -28,13 -22,12 +21,8 @@@ Version: 1.1.
Release: 1
License: Apache-like
Group: Libraries
--%if %{without snap}
Source0: https://www.openssl.org/source/%{name}-%{version}.tar.gz
- # Source0-md5: ac5eb30bf5798aa14b1ae6d0e7da58df
- %else
- Source1:
https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable/%{name}-%{version}-dev.tar.gz
- # Source1-md5: 6b846f8a4f55f5ddfa1e0d335241840a
- %endif
+ # Source0-md5: 7079eb017429e0ffb9efb42bf80ccb21
-%else
-Source1:
https://github.com/openssl/openssl/archive/OpenSSL_1_1_0-stable/%{name}-%{version}-dev.tar.gz
-%endif
Source2: %{name}.1.pl
Source3: %{name}-ssl-certificate.sh
Source4: %{name}-c_rehash.sh
@@@ -493,6 -472,10 +469,8 @@@ f
%{_mandir}/man1/openssl-smime.1*
%{_mandir}/man1/openssl-speed.1*
%{_mandir}/man1/openssl-spkac.1*
+ %{_mandir}/man1/openssl-srp.1*
-%{_mandir}/man1/openssl-s_server.1*
-%{_mandir}/man1/openssl-s_time.1*
+ %{_mandir}/man1/openssl-storeutl.1*
%{_mandir}/man1/openssl-ts.1*
%{_mandir}/man1/openssl-tsget.1*
%{_mandir}/man1/openssl-verify.1*
diff --cc openssl-ca-certificates.patch
index 0221ac2,eaca92b..1afdbfb
--- a/openssl-ca-certificates.patch
+++ b/openssl-ca-certificates.patch
@@@ -6,7 -5,7 +5,7 @@@
# 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"
+ # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
# else
- # define X509_CERT_AREA "SSLROOT:[000000]"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/e90d99b8fdde961b8c1acab48f8ad0960156f63a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
