- up to 0.9.8f [CVE-2007-4995, CVE-2007-5135]

Changed files:
    openssl.spec -> 1.173

diff --git a/openssl.spec b/openssl.spec
index b893f1edc421ee3b1b4abc886f3f720de145a6c2..ffe7402cae653e48b50f8c9f3e7cded92d5848bf 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -16,12 +16,12 @@ Summary(pt_BR.UTF-8):       Uma biblioteca C que fornece vários algoritmos e protocol
 Summary(ru.UTF-8):     Библиотеки и утилиты для соединений через Secure Sockets Layer
 Summary(uk.UTF-8):     Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:          openssl
-Version:       0.9.8e
-Release:       5
+Version:       0.9.8f
+Release:       1
 License:       Apache-style License
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 3a7ff24f6ea5cd711984722ad654b927
+# Source0-md5: 114bf908eb1b293d11d3e6b18a09269f
 Source1:       %{name}-ca-bundle.crt
 Source2:       %{name}.1.pl
 Source3:       %{name}-ssl-certificate.sh
@@ -31,8 +31,7 @@ Patch2:               %{name}-globalCA.diff
 Patch3:                %{name}-include.patch
 Patch4:                %{name}-md5-sparcv9.patch
 Patch5:                %{name}-libvar.patch
-Patch6:                %{name}-gcc_4_2.patch
-Patch7:                %{name}-CVE-2007-3108.patch
+Patch6:                %{name}-fix-version.patch
 URL:           http://www.openssl.org/
 BuildRequires: bc
 BuildRequires: perl-devel >= 1:5.6.1
@@ -197,12 +196,7 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-# XXX: gcc 4.2 hack
-cp crypto/asn1/asn1.h crypto/asn1/asn1.h.X
-cp crypto/ocsp/ocsp.h crypto/ocsp/ocsp.h.X
-cp crypto/pem/pem.h crypto/pem/pem.h.X
 %patch6 -p1
-%patch7 -p1
 
 %build
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
@@ -347,13 +341,6 @@ rm $RPM_BUILD_ROOT%{_mandir}/man5/x509v3_config.5
 echo ".so openssl_x509v3_config.5" > $RPM_BUILD_ROOT%{_mandir}/man5/x509v3_config.5
 rm $RPM_BUILD_ROOT%{_mandir}/man5/config.5
 echo ".so openssl_config.5" > $RPM_BUILD_ROOT%{_mandir}/man5/config.5
-rm $RPM_BUILD_ROOT%{_mandir}/man7/Modes_of_DES.7
-echo ".so openssl_des_modes.7" > $RPM_BUILD_ROOT%{_mandir}/man7/Modes_of_DES.7
-
-# XXX: gcc 4.2 hack
-install crypto/asn1/asn1.h.X $RPM_BUILD_ROOT%{_includedir}/%{name}/asn1.h
-install crypto/ocsp/ocsp.h.X $RPM_BUILD_ROOT%{_includedir}/%{name}/ocsp.h
-install crypto/pem/pem.h.X $RPM_BUILD_ROOT%{_includedir}/%{name}/pem.h
 
 %clean
 rm -rf $RPM_BUILD_ROOT