X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=f059a77fd87334a2abcc6c0b8b2a4a6e891f6e0f;hp=ca73061bb11b9378d0074d22e94f193915bb8dde;hb=947d7e2a9802db6f911dab55b2d275be131414d1;hpb=a9839ec4f46b50c39a918bcc2c9ef6a787aa5efd diff --git a/openssl.spec b/openssl.spec index ca73061..f059a77 100644 --- a/openssl.spec +++ b/openssl.spec @@ -1,9 +1,11 @@ +# TODO +# - consider dropping last optflags.patch hunk and return to SOMAJOR (.so.1) sonames # # Conditional build: %bcond_without tests # don't perform "make tests" %bcond_with purify # Compile openssl with \-DPURIFY, useful when one wants to # use valgrind debugger against openssl-linked programs -# + %include /usr/lib/rpm/macros.perl Summary: OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3) Summary(de.UTF-8): Secure Sockets Layer (SSL)-Kommunikationslibrary @@ -14,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.8j -Release: 2 +Version: 1.0.1j +Release: 1 License: Apache-like Group: Libraries Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz -# Source0-md5: a5cb5f6c3d11affb387ecf7a997cac0c +# Source0-md5: f7175c9cd3c39bb1907ac8bba9df8ed3 Source2: %{name}.1.pl Source3: %{name}-ssl-certificate.sh Source4: %{name}-c_rehash.sh @@ -27,23 +29,30 @@ Patch0: %{name}-alpha-ccc.patch Patch1: %{name}-optflags.patch Patch2: %{name}-globalCA.diff 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 +Patch4: %{name}-man-namespace.patch +Patch5: %{name}-asflag.patch +Patch6: %{name}-ca-certificates.patch +Patch7: %{name}-ldflags.patch +Patch8: %{name}-find.patch +# from debian +Patch10: default_bits.patch +Patch11: pic.patch +Patch12: stddef.patch URL: http://www.openssl.org/ BuildRequires: bc BuildRequires: perl-devel >= 1:5.6.1 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.213 BuildRequires: sed >= 4.0 +Requires: ca-certificates >= 20080809-4 +Requires: rpm-whiteout >= 1.7 Obsoletes: SSLeay Obsoletes: SSLeay-devel Obsoletes: SSLeay-perl Obsoletes: libopenssl0 -Requires: ca-certificates >= 20080809-4 -Requires: rpm-whiteout >= 1.7 +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 @@ -97,11 +106,54 @@ RC4, RSA и SSL. користування, що реалізують велику кількість криптографічних алгоритмів, включаючи DES, RC4, RSA та SSL. +%package engines +Summary: OpenSSL optional crypto engines +Summary(pl.UTF-8): Opcjonalne silniki kryptograficzne dla OpenSSL-a +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%description engines +With OpenSSL 0.9.6, a new component was added to support alternative +cryptography implementations, most commonly for interfacing with +external crypto devices (eg. accelerator cards). This component is +called ENGINE. + +There are currently built-in ENGINE implementations for the following +crypto devices: + +- CryptoSwift +- Compaq Atalla +- nCipher CHIL +- Nuron +- Broadcom uBSec + +In addition, dynamic binding to external ENGINE implementations is now +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). + +Obecnie istnieją wbudowane implementacje silników dla następujących +urządzeń kryptograficznych: +- CryptoSwift +- Compaq Atalla +- nCipher CHIL +- Nuron +- Broadcom uBSec + +Ponadto zapewnione jest dynamiczne wiązanie dla zewnętrznych +implementacji silników poprzez specjalny silnik o nazwie "dynamic". + %package tools Summary: OpenSSL command line tool and utilities Summary(pl.UTF-8): Zestaw narzędzi i skryptów Group: Applications/Communications Requires: %{name} = %{version}-%{release} +Requires: which %description tools The OpenSSL Toolkit cmdline tool openssl and utility scripts. @@ -200,28 +252,35 @@ RC4, RSA и SSL. Включает статические библиотеки д %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p0 +%patch8 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 -%{__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 +sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure %build touch Makefile.* %{__perl} util/perlpath.pl %{__perl} -OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \ -./Configure \ -%if "%{pld_release}" == "ti" - --openssldir=%{_var}/lib/%{name} \ -%else +OPTFLAGS="%{rpmcflags} %{rpmcppflags} %{?with_purify:-DPURIFY}" \ +PERL="%{__perl}" \ +%{__perl} ./Configure \ --openssldir=%{_sysconfdir}/%{name} \ -%endif - --lib=%{_lib} \ - shared threads \ - enable-mdc2 enable-rc5 \ + --libdir=%{_lib} \ + shared \ + threads \ + zlib \ + enable-tlsext \ + enable-seed \ + enable-rfc3779 \ + enable-camelia \ + enable-cms \ + enable-idea \ + enable-mdc2 \ + enable-md2 \ + enable-rc5 \ %ifarch %{ix86} %ifarch i386 386 linux-elf @@ -254,6 +313,9 @@ OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \ %ifarch sparc64 linux64-sparcv9 %endif +%ifarch armv4 armv5 armv5t armv5te armv5tel + linux-armv4 +%endif %{__make} -j1 all rehash %{?with_tests:tests} \ CC="%{__cc}" \ @@ -277,38 +339,28 @@ done rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \ $RPM_BUILD_ROOT{%{_mandir}/{pl/man1,man{1,3,5,7}},%{_datadir}/ssl} \ + $RPM_BUILD_ROOT/%{_lib}/engines \ $RPM_BUILD_ROOT%{_pkgconfigdir} -%{__make} install \ +%{__make} -j1 install \ INSTALLTOP=%{_prefix} \ INSTALL_PREFIX=$RPM_BUILD_ROOT \ MANDIR=%{_mandir} -install libcrypto.a libssl.a $RPM_BUILD_ROOT%{_libdir} -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%{_libdir}/engines/* $RPM_BUILD_ROOT/%{_lib}/engines +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 + 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 +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1 +install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate +install -p %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/c_rehash.sh %clean rm -rf $RPM_BUILD_ROOT @@ -316,15 +368,15 @@ 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}-tools < 1.0.0-5 +# the hashing format has changed in 1.0.0 +[ ! -x %{_sbindir}/update-ca-certificates ] || %{_sbindir}/update-ca-certificates --fresh || : + %triggerpostun -- %{name} < 0.9.8i-2 +# don't do anything on --downgrade +if [ $1 -le 1 ]; then + exit 0 +fi if [ -d /var/lib/openssl/certs ] ; then mv /var/lib/openssl/certs/* %{_sysconfdir}/%{name}/certs 2>/dev/null || : fi @@ -335,41 +387,31 @@ if [ -d /var/lib/openssl ] ; then for f in /var/lib/openssl/* ; do [ -f "$f" ] && mv "$f" %{_sysconfdir}/%{name} 2>/dev/null || : done + rmdir /var/lib/openssl/* 2>/dev/null || : + rmdir /var/lib/openssl 2>/dev/null || : fi -%endif %files %defattr(644,root,root,755) %doc CHANGES CHANGES.SSLeay LICENSE NEWS README doc/*.txt %doc doc/openssl_button.gif doc/openssl_button.html -%attr(755,root,root) %{_libdir}/libcrypto.so.*.*.* -%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 +%attr(755,root,root) /%{_lib}/libcrypto.so.*.*.* +%attr(755,root,root) /%{_lib}/libssl.so.*.*.* %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}/%{name} %attr(755,root,root) %{_bindir}/c_rehash.sh +%attr(755,root,root) %{_bindir}/openssl %attr(754,root,root) %{_bindir}/ssl-certificate %dir %{_libdir}/%{name} @@ -383,6 +425,7 @@ fi %{_mandir}/man1/openssl_asn1parse.1* %{_mandir}/man1/openssl_ca.1* %{_mandir}/man1/openssl_ciphers.1* +%{_mandir}/man1/openssl_cms.1* %{_mandir}/man1/openssl_crl.1* %{_mandir}/man1/openssl_crl2pkcs7.1* %{_mandir}/man1/openssl_dgst.1* @@ -394,6 +437,7 @@ fi %{_mandir}/man1/openssl_enc.1* %{_mandir}/man1/openssl_errstr.1* %{_mandir}/man1/openssl_gendsa.1* +%{_mandir}/man1/openssl_genpkey.1* %{_mandir}/man1/openssl_genrsa.1* %{_mandir}/man1/openssl_nseq.1* %{_mandir}/man1/openssl_ocsp.1* @@ -401,6 +445,9 @@ fi %{_mandir}/man1/openssl_pkcs12.1* %{_mandir}/man1/openssl_pkcs7.1* %{_mandir}/man1/openssl_pkcs8.1* +%{_mandir}/man1/openssl_pkey.1* +%{_mandir}/man1/openssl_pkeyparam.1* +%{_mandir}/man1/openssl_pkeyutl.1* %{_mandir}/man1/openssl_rand.1* %{_mandir}/man1/openssl_req.1* %{_mandir}/man1/openssl_rsa.1* @@ -412,6 +459,8 @@ fi %{_mandir}/man1/openssl_smime.1* %{_mandir}/man1/openssl_speed.1* %{_mandir}/man1/openssl_spkac.1* +%{_mandir}/man1/openssl_ts.1* +%{_mandir}/man1/openssl_tsget.1* %{_mandir}/man1/openssl_verify.1* %{_mandir}/man1/openssl_version.1* %{_mandir}/man1/openssl_x509.1* @@ -423,6 +472,7 @@ fi %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}/tsget %{_mandir}/man1/openssl_CA.pl.1* %files devel @@ -438,4 +488,5 @@ fi %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/libcrypto.a +%{_libdir}/libssl.a