- fix for CVE-2007-3108

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index e279e34772cf7ef17dccfb109bb883495a6f3f49..b893f1edc421ee3b1b4abc886f3f720de145a6c2 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8):    Библиотеки и утилиты для соедине
 Summary(uk.UTF-8):     Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:          openssl
 Version:       0.9.8e
-Release:       3
+Release:       5
 License:       Apache-style License
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
@@ -32,6 +32,7 @@ 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
 URL:           http://www.openssl.org/
 BuildRequires: bc
 BuildRequires: perl-devel >= 1:5.6.1
@@ -201,6 +202,7 @@ 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' \
@@ -333,8 +335,6 @@ ln -s %{_sysconfdir}/%{name}/openssl.cnf \
 mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name}
 rm -rf $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc
 
-mv -f $RPM_BUILD_ROOT%{_bindir}/c_rehash $RPM_BUILD_ROOT%{_libdir}/%{name}
-
 find $RPM_BUILD_ROOT%{_mandir} -type f | xargs rm -f
 install doc/apps/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install doc/apps/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
@@ -434,8 +434,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tools-perl
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/c_rehash
 %attr(755,root,root) %{_libdir}/%{name}/CA.pl
-%attr(755,root,root) %{_libdir}/%{name}/c_rehash
 %{_mandir}/man1/openssl_CA.pl.1*
 
 %files devel