X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=619881b51877c1710471e7882d5f6bbaefffb7ef;hp=c3cfbfe4eed50c14fe4320c9e6ae262c05465ac7;hb=2a83d92e4f7fe690944a385ea55fded5cfefdf4d;hpb=ce33e8e7b9227478170d2f90b2345a4141bc9545 diff --git a/openssl.spec b/openssl.spec index c3cfbfe..619881b 100644 --- a/openssl.spec +++ b/openssl.spec @@ -1,11 +1,18 @@ -# -# TODO: consider dropping last optflags.patch hunk and return to SOMAJOR (.so.1) sonames +# TODO +# - consider dropping last optflags.patch hunk and return to SOMAJOR (.so.1) sonames +# - find a way to simplify (drop) openssl-optflags.patch, it's pain to update here in pld # # Conditional build: %bcond_without tests # don't perform "make tests" -%bcond_with purify # Compile openssl with \-DPURIFY, useful when one wants to +%bcond_without zlib # zlib: note - enables CVE-2012-4929 vulnerability +%bcond_without sslv2 # SSLv2: note - many flaws http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0 +%bcond_without sslv3 # SSLv3: note - enables CVE-2014-3566 vulnerability +%bcond_with purify # Compile openssl with "-DPURIFY", useful when one wants to # use valgrind debugger against openssl-linked programs +%bcond_with snap # use GitHub snapshot to build branch release +%define subver pre6 +%define rel 0.1 %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,45 +23,56 @@ 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.1h -Release: 1 +# 1.0.2 will be LTS release +# Version 1.0.2 will be supported until 2019-12-31. +# https://www.openssl.org/about/releasestrat.html +Version: 1.1.0 +Release: 0.1 License: Apache-like Group: Libraries -Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz -# Source0-md5: 8d6d684a9430d5cc98a62a5d8fbda8cf +%if %{without snap} +#Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz +Source0: https://www.openssl.org/source/%{name}-%{version}-%{subver}.tar.gz +# Source0-md5: 5073f45b5922992234396c7d8247196f +%else +Source1: https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable/%{name}-%{version}-dev.tar.gz +%endif 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}-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 - +Patch2: %{name}-include.patch +Patch3: %{name}-man-namespace.patch +Patch4: %{name}-asflag.patch +Patch5: %{name}-ca-certificates.patch +Patch6: %{name}-ldflags.patch +Patch7: %{name}-find.patch +Patch8: pic.patch +Patch10: %{name}_fix_for_x32.patch +Patch11: engines-dir.patch URL: http://www.openssl.org/ BuildRequires: bc -BuildRequires: perl-devel >= 1:5.6.1 +BuildRequires: perl-devel >= 1:5.10.0 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.213 BuildRequires: sed >= 4.0 -Requires: ca-certificates >= 20080809-4 +Requires: ca-certificates >= 20120623-1.1 Requires: rpm-whiteout >= 1.7 Obsoletes: SSLeay Obsoletes: SSLeay-devel Obsoletes: SSLeay-perl Obsoletes: libopenssl0 +%if "%{pld_release}" == "ac" +Conflicts: neon < 0.26.3-3 +Conflicts: ntpd < 4.2.4p8-10 +Conflicts: openssh-clients < 2:5.8p1-9 +Conflicts: openssh-server < 2:5.8p1-9 +%else Conflicts: neon < 0.29.6-8 Conflicts: openssh-clients < 2:6.2p2-3 Conflicts: openssh-server < 2:6.2p2-3 +%endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -245,45 +263,53 @@ RC4, RSA и SSL. Включает статические библиотеки д бібліотеки для розробки програм з використанням SSL. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%if %{with snap} +%setup -qcT -a1 +mv %{name}-OpenSSL_1_0_2-stable/* . +%else +%setup -q %{?subver:-n %{name}-%{version}-%{subver}} +%endif +#%patch0 -p1 # alpha patch from year 2000 - drop it +#%patch1 -p1 # flags list has been nuked (thank god!) +#%patch2 -p1 # openssl include subdir. check this +#%patch3 -p1 # patched Makefile.org no longer exists +#%patch4 -p1 # patched Makefile.org no longer exists +#%patch5 -p1 # check +#%patch6 -p1 # patched Makefile.org no longer exists %patch7 -p1 %patch8 -p1 - +%ifarch x32 %patch10 -p1 +%endif %patch11 -p1 -%patch12 -p1 - -sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure %build touch Makefile.* -%{__perl} util/perlpath.pl %{__perl} +# util/perlpath.pl no longer exists +#%{__perl} util/perlpath.pl %{__perl} OPTFLAGS="%{rpmcflags} %{rpmcppflags} %{?with_purify:-DPURIFY}" \ PERL="%{__perl}" \ %{__perl} ./Configure \ + --prefix=%{_prefix} \ --openssldir=%{_sysconfdir}/%{name} \ --libdir=%{_lib} \ shared \ threads \ - zlib \ - enable-tlsext \ - enable-seed \ - enable-rfc3779 \ - enable-camelia \ + %{?with_sslv2:enable-ssl2}%{!?with_sslv2:no-ssl2} \ + %{?with_sslv3:enable-ssl3}%{!?with_sslv3:no-ssl3} \ + %{!?with_zlib:no-}zlib \ enable-cms \ enable-idea \ - enable-mdc2 \ enable-md2 \ + enable-mdc2 \ enable-rc5 \ + enable-rfc3779 \ + enable-seed \ +%ifarch %{x8664} + enable-ec_nistp_64_gcc_128 \ +%endif %ifarch %{ix86} %ifarch i386 386 linux-elf @@ -298,6 +324,9 @@ PERL="%{__perl}" \ %ifarch %{x8664} linux-x86_64 %endif +%ifarch x32 + linux-x32 +%endif %ifarch ia64 linux-ia64 %endif @@ -320,6 +349,9 @@ PERL="%{__perl}" \ linux-armv4 %endif +v=$(awk -F= '/^VERSION/{print $2}' Makefile) +test "$v" = %{version}%{?subver:-%{subver}}%{?with_snap:-dev} + %{__make} -j1 all rehash %{?with_tests:tests} \ CC="%{__cc}" \ ASFLAG='$(CFLAG) -Wa,--noexecstack' \ @@ -359,7 +391,7 @@ mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{n 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 +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{dss1,md2,md4,md5,mdc2,ripemd160,sha,sha1,sha224,sha256,sha384,sha512}.1 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1 install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate @@ -397,12 +429,11 @@ 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) /%{_lib}/libcrypto.so.*.*.* %attr(755,root,root) /%{_lib}/libssl.so.*.*.* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/certs -%dir %{_sysconfdir}/%{name}/private +%dir %attr(700,root,root) %{_sysconfdir}/%{name}/private %dir %{_datadir}/ssl %files engines @@ -477,6 +508,7 @@ fi %attr(755,root,root) %{_libdir}/%{name}/CA.pl %attr(755,root,root) %{_libdir}/%{name}/tsget %{_mandir}/man1/openssl_CA.pl.1* +%{_mandir}/man1/openssl_c_rehash.1* %files devel %defattr(644,root,root,755)