- rel 2; fix engines dir

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index 73b9671a01b172dd648e3ef9d37de9649f977df1..ca73061bb11b9378d0074d22e94f193915bb8dde 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -14,14 +14,15 @@ 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.8i
+Version:       0.9.8j
 Release:       2
 License:       Apache-like
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 561e00f18821c74b2b86c8c7786f9d8b
+# Source0-md5: a5cb5f6c3d11affb387ecf7a997cac0c
 Source2:       %{name}.1.pl
 Source3:       %{name}-ssl-certificate.sh
+Source4:       %{name}-c_rehash.sh
 Patch0:                %{name}-alpha-ccc.patch
 Patch1:                %{name}-optflags.patch
 Patch2:                %{name}-globalCA.diff
@@ -29,6 +30,8 @@ Patch3:               %{name}-include.patch
 Patch4:                %{name}-libvar.patch
 Patch5:                %{name}-man-namespace.patch
 Patch6:                %{name}-asflag.patch
+Patch7:                %{name}-ca-certificates.patch
+Patch8:                %{name}-fips_install.patch
 URL:           http://www.openssl.org/
 BuildRequires: bc
 BuildRequires: perl-devel >= 1:5.6.1
@@ -39,7 +42,8 @@ Obsoletes:    SSLeay
 Obsoletes:     SSLeay-devel
 Obsoletes:     SSLeay-perl
 Obsoletes:     libopenssl0
-Requires:      ca-certificates >= 20080809-1
+Requires:      ca-certificates >= 20080809-4
+Requires:      rpm-whiteout >= 1.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -195,10 +199,14 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p0
 
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
        `grep -l -r "%{_prefix}/local/bin/perl" *`
 
+sed -i -e 's|$prefix/lib/engines|%{_libdir}/engines|g' Configure
+
 %build
 touch Makefile.*
 
@@ -206,7 +214,11 @@ touch Makefile.*
 
 OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \
 ./Configure \
+%if "%{pld_release}" == "ti"
+       --openssldir=%{_var}/lib/%{name} \
+%else
        --openssldir=%{_sysconfdir}/%{name} \
+%endif
        --lib=%{_lib} \
        shared threads \
        enable-mdc2 enable-rc5 \
@@ -277,14 +289,26 @@ install lib*.so.*.* $RPM_BUILD_ROOT%{_libdir}
 ln -sf libcrypto.so.*.* $RPM_BUILD_ROOT%{_libdir}/libcrypto.so
 ln -sf libssl.so.*.* $RPM_BUILD_ROOT%{_libdir}/libssl.so
 
+%if "%{pld_release}" == "ti"
+ln -sf %{_var}/lib/%{name}/%{name}.cnf \
+       $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/openssl.cnf
+ln -sf %{_var}/lib/%{name}/certs \
+       $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/certs
+ln -sf %{_var}/lib/%{name}/private \
+       $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/private
+mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name}
+rm -rf $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc
+%else
 mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc
+%endif
 
 # not installed as individual utilities (see openssl dgst instead)
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{md2,md4,md5,mdc2,ripemd160,sha,sha1}.1
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1
 install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate
+install %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/c_rehash.sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -292,6 +316,14 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%if "%{pld_release}" == "ti"
+%triggerin -- %{name}-tools < 0.9.8i-2
+if [ -L /var/lib/openssl/openssl.cnf ] ; then
+       echo "Saving old configuration as /var/lib/openssl/openssl.cnf.rpmsave"
+       rm /var/lib/openssl/openssl.cnf
+       mv %{_sysconfdir}/%{name}/openssl.cnf /var/lib/openssl/openssl.cnf.rpmsave 2>/dev/null || :
+fi
+%else
 %triggerpostun -- %{name} < 0.9.8i-2
 if [ -d /var/lib/openssl/certs ] ; then
        mv /var/lib/openssl/certs/* %{_sysconfdir}/%{name}/certs 2>/dev/null || :
@@ -304,6 +336,7 @@ if [ -d /var/lib/openssl ] ; then
                [ -f "$f" ] && mv "$f" %{_sysconfdir}/%{name} 2>/dev/null || :
        done
 fi
+%endif
 
 %files
 %defattr(644,root,root,755)
@@ -313,15 +346,30 @@ fi
 %attr(755,root,root) %{_libdir}/libssl.so.*.*.*
 %dir %{_libdir}/engines
 %attr(755,root,root) %{_libdir}/engines/*.so
+%if "%{pld_release}" == "ti"
+%dir %{_var}/lib/%{name}
+%dir %{_var}/lib/%{name}/certs
+%dir %{_var}/lib/%{name}/private
+%dir %{_sysconfdir}/%{name}
+%attr(755,root,root) %{_sysconfdir}/%{name}/certs
+%attr(755,root,root) %{_sysconfdir}/%{name}/private
+%else
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/certs
 %dir %{_sysconfdir}/%{name}/private
+%endif
 %dir %{_datadir}/ssl
 
 %files tools
 %defattr(644,root,root,755)
+%if "%{pld_release}" == "ti"
+%{_sysconfdir}/%{name}/openssl.cnf
+%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/%{name}/openssl.cnf
+%else
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/openssl.cnf
+%endif
 %attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/c_rehash.sh
 %attr(754,root,root) %{_bindir}/ssl-certificate
 
 %dir %{_libdir}/%{name}