up to OpenSSL 1.0.2h [3 May 2016]

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index 78c7df4e982800f77ce525e3bf2235a44b743636..e85f944d39ee8ba879cdfce3f2ee0af71d8b549d 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -9,6 +9,7 @@
 %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
 
 %include       /usr/lib/rpm/macros.perl
 Summary:       OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3)
@@ -23,16 +24,16 @@ Name:               openssl
 # 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.0.2e
+Version:       1.0.2h
 Release:       1
 License:       Apache-like
 Group:         Libraries
+%if %{without snap}
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 2218c1a6f807f7206c11eb3ee3a5ec80
-Source1:       https://raw.githubusercontent.com/openssl/openssl/OpenSSL_1_0_2-stable/util/pod2mantest
-# Source1-md5: 0811d285202cebe91003771475802b4f
-Source11:      https://raw.githubusercontent.com/openssl/openssl/OpenSSL_1_0_2-stable/test/bctest
-# Source11-md5:        ca85ae891de94faa821c2c6f4dba7f5a
+# Source0-md5: 9392e65072ce4b614c1392eefc1f23d0
+%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
@@ -52,7 +53,7 @@ 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:      ca-certificates >= 20120623-1.1
 Requires:      rpm-whiteout >= 1.7
 Obsoletes:     SSLeay
 Obsoletes:     SSLeay-devel
@@ -258,7 +259,12 @@ RC4, RSA и SSL. Включает статические библиотеки д
 бібліотеки для розробки програм з використанням SSL.
 
 %prep
+%if %{with snap}
+%setup -qcT -a1
+mv %{name}-OpenSSL_1_0_2-stable/* .
+%else
 %setup -q
+%endif
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -268,21 +274,12 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%ifarch x32
 %patch10 -p1
+%endif
 
 sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
 
-# fix packaging error
-# https://github.com/openssl/openssl/issues/491
-ln -s . test/openssl-1.0.2e
-
-# also pod2man missing
-# https://github.com/openssl/openssl/issues/490
-install -p %{SOURCE1} util
-
-# https://github.com/openssl/openssl/issues/493
-install -p %{SOURCE11} test
-
 %build
 touch Makefile.*
 
@@ -295,8 +292,8 @@ PERL="%{__perl}" \
        --libdir=%{_lib} \
        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 \
@@ -349,6 +346,9 @@ PERL="%{__perl}" \
        linux-armv4
 %endif
 
+v=$(awk -F= '/^VERSION/{print $2}' Makefile)
+test "$v" = %{version}%{?with_snap:-dev}
+
 %{__make} -j1 all rehash %{?with_tests:tests} \
        CC="%{__cc}" \
        ASFLAG='$(CFLAG) -Wa,--noexecstack' \
@@ -426,12 +426,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