X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=f059a77fd87334a2abcc6c0b8b2a4a6e891f6e0f;hp=b893f1edc421ee3b1b4abc886f3f720de145a6c2;hb=947d7e2a9802db6f911dab55b2d275be131414d1;hpb=f8e1925841b4172eec64ce27c10e8341af5a30bc diff --git a/openssl.spec b/openssl.spec index b893f1e..f059a77 100644 --- a/openssl.spec +++ b/openssl.spec @@ -1,11 +1,11 @@ -# TODO: -# - get rid of gcc_4_2 patch and header files crapolla - +# TODO +# - consider dropping last optflags.patch hunk and return to SOMAJOR (.so.1) sonames +# # Conditional build: -%bcond_without tests -%bcond_with purify # Compile openssl with \-DPURIFY, useful when one wants to +%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 @@ -16,33 +16,43 @@ 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 -License: Apache-style License +Version: 1.0.1j +Release: 1 +License: Apache-like Group: Libraries Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz -# Source0-md5: 3a7ff24f6ea5cd711984722ad654b927 -Source1: %{name}-ca-bundle.crt +# Source0-md5: f7175c9cd3c39bb1907ac8bba9df8ed3 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 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 +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 +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 @@ -96,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. @@ -197,29 +250,37 @@ 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 +%patch8 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 -%build -%{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \ - `grep -l -r "%{_prefix}/local/bin/perl" *` +sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure +%build touch Makefile.* %{__perl} util/perlpath.pl %{__perl} -OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" -LDFLAGS="%{rpmldflags}" -export OPTFLAGS LDFLAGS -./Configure \ - --openssldir=%{_var}/lib/%{name} \ - --lib=%{_lib} \ - shared threads \ - enable-mdc2 enable-rc5 \ +OPTFLAGS="%{rpmcflags} %{rpmcppflags} %{?with_purify:-DPURIFY}" \ +PERL="%{__perl}" \ +%{__perl} ./Configure \ + --openssldir=%{_sysconfdir}/%{name} \ + --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 @@ -252,108 +313,54 @@ export OPTFLAGS LDFLAGS %ifarch sparc64 linux64-sparcv9 %endif +%ifarch armv4 armv5 armv5t armv5te armv5tel + linux-armv4 +%endif %{__make} -j1 all rehash %{?with_tests:tests} \ CC="%{__cc}" \ + ASFLAG='$(CFLAG) -Wa,--noexecstack' \ INSTALLTOP=%{_prefix} -# Conv PODs to man pages. "openssl_" prefix is added to each manpage -# to avoid potential conflicts with others packages. -center="OpenSSL 0.9.7" -rel="OpenSSL 0.9.7" - -cd doc/apps || exit 1 -%{__perl} -pi -e 's/(\W)((? $manpage; - echo "$manpage"; -done -cd .. +# Rename POD sources of man pages. "openssl_" prefix is added to each +# manpage to avoid potential conflicts with other packages. -sec=3 -for dir in ssl crypto; do +for dir in doc/{apps,ssl,crypto}; do cd $dir || exit 1; - if [ $dir = "ssl" ]; then - rel="OpenSSL SSL/TLS library" - elif [ $dir = "crypto" ]; then - rel="OpenSSL cryptographic library" - fi - %{__perl} -pi -e 's/(\W)((? $manpage; - echo "$manpage"; done - cd .. + cd ../.. done -#cd perl -#%%{__perl} Makefile.PL \ -# INSTALLDIRS=vendor -#%{__make} - %install 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 \ - CC="%{__cc}" \ +%{__make} -j1 install \ INSTALLTOP=%{_prefix} \ INSTALL_PREFIX=$RPM_BUILD_ROOT \ MANDIR=%{_mandir} -install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/ssl/ca-bundle.crt -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 - -mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/openssl.cnf $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -ln -s %{_sysconfdir}/%{name}/openssl.cnf \ - $RPM_BUILD_ROOT%{_var}/lib/%{name}/%{name}.cnf - -mv -f $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name} -rm -rf $RPM_BUILD_ROOT%{_var}/lib/%{name}/misc - -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 -install doc/ssl/*.3 doc/crypto/*.3 $RPM_BUILD_ROOT%{_mandir}/man3 -install doc/crypto/*.7 $RPM_BUILD_ROOT%{_mandir}/man7 -install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1 -install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate - -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 +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 + +# not installed as individual utilities (see openssl dgst instead) +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{md2,md4,md5,mdc2,ripemd160,sha,sha1}.1 + +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 @@ -361,28 +368,50 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%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 +if [ -d /var/lib/openssl/private ] ; then + mv /var/lib/openssl/private/* %{_sysconfdir}/%{name}/private 2>/dev/null || : +fi +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 + %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 -%dir %{_var}/lib/%{name} -%dir %{_var}/lib/%{name}/certs -%dir %{_var}/lib/%{name}/private +%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 %dir %{_datadir}/ssl -%config(noreplace) %verify(not md5 mtime size) %{_datadir}/ssl/ca-bundle.crt -%files tools +%files engines %defattr(644,root,root,755) -%dir %{_sysconfdir}/%{name} +%dir /%{_lib}/engines +%attr(755,root,root) /%{_lib}/engines/*.so +%files tools +%defattr(644,root,root,755) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/openssl.cnf -%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/%{name}/openssl.cnf - -%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} @@ -396,6 +425,7 @@ rm -rf $RPM_BUILD_ROOT %{_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* @@ -407,6 +437,7 @@ rm -rf $RPM_BUILD_ROOT %{_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* @@ -414,6 +445,9 @@ rm -rf $RPM_BUILD_ROOT %{_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* @@ -425,17 +459,20 @@ rm -rf $RPM_BUILD_ROOT %{_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* -%{_mandir}/man1/openssl_x509v3_config.1* -%{_mandir}/man5/*.5* +%{_mandir}/man5/openssl_config.5* +%{_mandir}/man5/openssl_x509v3_config.5* %lang(pl) %{_mandir}/pl/man1/openssl.1* %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}/tsget %{_mandir}/man1/openssl_CA.pl.1* %files devel @@ -447,8 +484,9 @@ rm -rf $RPM_BUILD_ROOT %{_pkgconfigdir}/libssl.pc %{_pkgconfigdir}/openssl.pc %{_mandir}/man3/openssl*.3* -%{_mandir}/man7/*.7* +%{_mandir}/man7/openssl_des_modes.7* %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/libcrypto.a +%{_libdir}/libssl.a