commit 42b56af84203ce147498b0e88db637b2b1d8b892
Merge: b5f1c39 f60e47a
Author: Elan Ruusamäe <[email protected]>
Date:   Wed Mar 2 12:46:00 2016 +0200

    up to 1.0.2g, "DROWN" CVE-2016-0800 and "Cachebleed"
    
    Merge branch '1.0.2g'

 openssl.spec              | 10 ++++++----
 openssl_fix_for_x32.patch | 20 ++++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)
---
diff --cc openssl.spec
index f8c76d2,39274c2..6923771
--- a/openssl.spec
+++ b/openssl.spec
@@@ -30,9 -30,9 +30,9 @@@ License:      Apache-lik
  Group:                Libraries
  %if %{without snap}
  Source0:      ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
--# Source0-md5:        b3bf73f507172be9292ea2a8c28b659d
++# Source0-md5:        f3c710c045cdee5fd114feb69feba7aa
  %else
- Source1:      
https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable.tar.gz
+ Source1:      
https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable/%{name}-%{version}-dev.tar.gz
  %endif
  Source2:      %{name}.1.pl
  Source3:      %{name}-ssl-certificate.sh
@@@ -274,7 -274,9 +274,9 @@@ mv %{name}-OpenSSL_1_0_2-stable/* 
  %patch6 -p1
  %patch7 -p1
  %patch8 -p1
+ %ifarch x32
 -%endif
  %patch10 -p1
++%endif
  
  sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssl102.git/commitdiff/9fc1b1b87b259e8a327c99835865e91a391efc9e

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to