X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=openssl.spec;h=c5bd166bd95e32a7271cb6d24d183ffaca5e434a;hb=7b2191a02888123059c18133a901a03e904b36bd;hp=591bd8085d15e2d31440a1ad5766b8f2df726027;hpb=16a987986935311661129015c54305467b01d5e0;p=packages%2Fopenssl.git diff --git a/openssl.spec b/openssl.spec index 591bd80..c5bd166 100644 --- a/openssl.spec +++ b/openssl.spec @@ -1,15 +1,9 @@ -# 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_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 +%bcond_with sslv2 # SSLv2: note - many flaws http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0 +%bcond_with sslv3 # SSLv3: note - enables CVE-2014-3566 vulnerability %include /usr/lib/rpm/macros.perl Summary: OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3) @@ -21,39 +15,36 @@ 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 -# 1.0.2 will be LTS release -# Version 1.0.2 will be supported until 2019-12-31. +# Version 1.1.1 is LTS, supported until 2023-09-11. # https://www.openssl.org/about/releasestrat.html -Version: 1.0.2f +Version: 1.1.1b Release: 1 License: Apache-like Group: Libraries -%if %{without snap} -Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz -# Source0-md5: b3bf73f507172be9292ea2a8c28b659d -%else -Source1: https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable.tar.gz -%endif +Source0: https://www.openssl.org/source/%{name}-%{version}.tar.gz +# Source0-md5: 4532712e7bcc9414f5bce995e4e13930 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}-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: libsctp-devel +BuildRequires: perl-devel >= 1:5.10.0 +BuildRequires: pkgconfig BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.213 BuildRequires: sed >= 4.0 -Requires: ca-certificates >= 20120623-1.1 +BuildRequires: zlib-devel +Requires: ca-certificates >= 20141019-3 Requires: rpm-whiteout >= 1.7 Obsoletes: SSLeay Obsoletes: SSLeay-devel @@ -261,47 +252,44 @@ RC4, RSA и SSL. Включает статические библиотеки д %prep %if %{with snap} %setup -qcT -a1 -mv %{name}-OpenSSL_1_0_2-stable/* . +%{__mv} %{name}-OpenSSL_1_1_0-stable/* . %else -%setup -q +%setup -q %{?subver:-n %{name}-%{version}-%{subver}} %endif -%patch0 -p1 + %patch1 -p1 -%patch2 -p1 + %patch3 -p1 -%patch4 -p1 + %patch5 -p1 -%patch6 -p1 + %patch7 -p1 %patch8 -p1 -%patch10 -p1 -sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure +%patch11 -p1 %build touch Makefile.* -%{__perl} util/perlpath.pl %{__perl} - -OPTFLAGS="%{rpmcflags} %{rpmcppflags} %{?with_purify:-DPURIFY}" \ PERL="%{__perl}" \ %{__perl} ./Configure \ + --prefix=%{_prefix} \ --openssldir=%{_sysconfdir}/%{name} \ --libdir=%{_lib} \ + -Wa,--noexecstack \ shared \ threads \ - %{!?with_sslv2:no-ssl2} \ - %{!?with_sslv3:no-ssl3} \ + %{?with_sslv2:enable-ssl2}%{!?with_sslv2:no-ssl2} \ + %{?with_sslv3:enable-ssl3}%{!?with_sslv3:no-ssl3} \ %{!?with_zlib:no-}zlib \ - enable-camelia \ enable-cms \ enable-idea \ enable-md2 \ enable-mdc2 \ enable-rc5 \ enable-rfc3779 \ + enable-sctp \ enable-seed \ - enable-tlsext \ %ifarch %{x8664} enable-ec_nistp_64_gcc_128 \ %endif @@ -314,7 +302,7 @@ PERL="%{__perl}" \ %endif %endif %ifarch alpha - linux-alpha+bwx-gcc + linux-alpha-gcc %endif %ifarch %{x8664} linux-x86_64 @@ -340,53 +328,53 @@ PERL="%{__perl}" \ %ifarch sparc64 linux64-sparcv9 %endif -%ifarch armv4 armv5 armv5t armv5te armv5tel +%ifarch %{arm} linux-armv4 %endif +%ifarch aarch64 + linux-aarch64 +%endif v=$(awk -F= '/^VERSION/{print $2}' Makefile) -test "$v" = %{version}%{?with_snap:-dev} +test "$v" = %{version}%{?subver:-%{subver}}%{?with_snap:-dev} + +# fails with enable-sctp as of 1.1.1 +%{__rm} test/recipes/80-test_ssl_new.t -%{__make} -j1 all rehash %{?with_tests:tests} \ +%{__make} -j1 all %{?with_tests:tests} \ CC="%{__cc}" \ - ASFLAG='$(CFLAG) -Wa,--noexecstack' \ + OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \ INSTALLTOP=%{_prefix} -# Rename POD sources of man pages. "openssl_" prefix is added to each +# Rename POD sources of man pages. "openssl-" prefix is added to each # manpage to avoid potential conflicts with other packages. +# openssl-man-namespace.patch mostly marks these pages with "openssl-" prefix. -for dir in doc/{apps,ssl,crypto}; do - cd $dir || exit 1; - %{__perl} -pi -e 's/(\W)((?