X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=1fe6dd4ce1db7b463acdd539f4301322a8bb8995;hp=ba10ef4d94dd98b437b37fd2989ee7b7d80698d2;hb=3a24c9ccdb667b1616491f2c8a1ab50e9b4a65c6;hpb=7250cee4e014610bfcf8c127b9002dba14140a88 diff --git a/openssl.spec b/openssl.spec index ba10ef4..1fe6dd4 100644 --- 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: 1.0.1c -Release: 1 +Version: 1.0.1e +Release: 3 License: Apache-like Group: Libraries Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz -# Source0-md5: ae412727c8c15b67880aef7bd2999b2e +# Source0-md5: 66bf6f10f060d561929de96f9dfe5b8c Source2: %{name}.1.pl Source3: %{name}-ssl-certificate.sh Source4: %{name}-c_rehash.sh @@ -33,6 +33,16 @@ Patch4: %{name}-man-namespace.patch Patch5: %{name}-asflag.patch Patch6: %{name}-ca-certificates.patch Patch7: %{name}-ldflags.patch + +# from debian +Patch10: aesni-mac.patch +Patch11: cpuid.patch +Patch12: default_bits.patch +Patch13: dtls_version.patch +Patch14: get_certificate.patch +Patch15: pic.patch +Patch16: stddef.patch + URL: http://www.openssl.org/ BuildRequires: bc BuildRequires: perl-devel >= 1:5.6.1 @@ -45,6 +55,9 @@ Obsoletes: SSLeay Obsoletes: SSLeay-devel Obsoletes: SSLeay-perl Obsoletes: libopenssl0 +Conflicts: neon < 0.29.6-8 +Conflicts: openssh-clients < 2:6.2p2-3 +Conflicts: openssh-server < 2:6.2p2-3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -120,14 +133,14 @@ crypto devices: - Broadcom uBSec In addition, dynamic binding to external ENGINE implementations is now -provided by a special ENGINE called "dynamic". +provided by a special ENGINE called "dynamic". %description engines -l pl.UTF-8 Począwszy od OpenSSL-a 0.9.6 został dodany nowy komponent, mający wspierać alternatywne implementacje kryptografii, przeważnie współpracujące z zewnętrznymi urządzeniami kryptograficznymi (np. -kartami akceleratorów). Komponent ten jest nazywany SILNIKIEM -(ang. ENGINE). +kartami akceleratorów). Komponent ten jest nazywany SILNIKIEM (ang. +ENGINE). Obecnie istnieją wbudowane implementacje silników dla następujących urządzeń kryptograficznych: @@ -245,6 +258,14 @@ RC4, RSA и SSL. Включает статические библиотеки д %patch6 -p1 %patch7 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 + sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure %build @@ -255,11 +276,7 @@ touch Makefile.* OPTFLAGS="%{rpmcflags} %{rpmcppflags} %{?with_purify:-DPURIFY}" \ PERL="%{__perl}" \ %{__perl} ./Configure \ -%if "%{pld_release}" == "ti" - --openssldir=%{_var}/lib/%{name} \ -%else --openssldir=%{_sysconfdir}/%{name} \ -%endif --libdir=%{_lib} \ shared \ threads \ @@ -334,7 +351,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \ $RPM_BUILD_ROOT/%{_lib}/engines \ $RPM_BUILD_ROOT%{_pkgconfigdir} -%{__make} install \ +%{__make} -j1 install \ INSTALLTOP=%{_prefix} \ INSTALL_PREFIX=$RPM_BUILD_ROOT \ MANDIR=%{_mandir} @@ -344,19 +361,8 @@ mv -f $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* $RPM_BUILD_ROOT/%{_lib} ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcrypto.*.*) $RPM_BUILD_ROOT%{_libdir}/libcrypto.so ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libssl.*.*) $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 @@ -375,14 +381,6 @@ rm -rf $RPM_BUILD_ROOT # the hashing format has changed in 1.0.0 [ ! -x %{_sbindir}/update-ca-certificates ] || %{_sbindir}/update-ca-certificates --fresh || : -%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 # don't do anything on --downgrade if [ $1 -le 1 ]; then @@ -401,7 +399,6 @@ if [ -d /var/lib/openssl ] ; then rmdir /var/lib/openssl/* 2>/dev/null || : rmdir /var/lib/openssl 2>/dev/null || : fi -%endif %files %defattr(644,root,root,755) @@ -409,32 +406,19 @@ fi %doc doc/openssl_button.gif doc/openssl_button.html %attr(755,root,root) /%{_lib}/libcrypto.so.*.*.* %attr(755,root,root) /%{_lib}/libssl.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 engines +%defattr(644,root,root,755) %dir /%{_lib}/engines %attr(755,root,root) /%{_lib}/engines/*.so %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}/c_rehash.sh %attr(755,root,root) %{_bindir}/openssl %attr(754,root,root) %{_bindir}/ssl-certificate