up to 1.0.2i-snap

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index fc77b6fb8cfde213f732c33f59b6af0896b551d8..23ccce135194e2c5398e82aa409480251c103833 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,7 +1,6 @@
 # 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
-# - make with sslv2 bcond work (or drop) after 1.0.2g
 #
 # Conditional build:
 %bcond_without tests   # don't perform "make tests"
@@ -25,13 +24,13 @@ 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.2g
-Release:       6
+Version:       1.0.2i
+Release:       1
 License:       Apache-like
 Group:         Libraries
 %if %{without snap}
-Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: f3c710c045cdee5fd114feb69feba7aa
+Source0:       https://www.openssl.org/source/%{name}-%{version}.tar.gz
+# Source0-md5: 9392e65072ce4b614c1392eefc1f23d0
 %else
 Source1:       https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable/%{name}-%{version}-dev.tar.gz
 %endif
@@ -66,20 +65,9 @@ Conflicts:   ntpd < 4.2.4p8-10
 Conflicts:     openssh-clients < 2:5.8p1-9
 Conflicts:     openssh-server < 2:5.8p1-9
 %else
-Conflicts:     QtNetwork < 4.8.7-8
-Conflicts:     apache-mod_ssl < 1:2.2.31-4
-Conflicts:     curl-libs < 7.47.1-2
 Conflicts:     neon < 0.29.6-8
 Conflicts:     openssh-clients < 2:6.2p2-3
 Conflicts:     openssh-server < 2:6.2p2-3
-Conflicts:     php52-common < 4:5.2.17-20130717.17
-Conflicts:     php53-common < 4:5.3.29-27
-Conflicts:     php54-common < 4:5.4.45-5
-Conflicts:     php55-common < 4:5.5.32-2
-Conflicts:     php56-common < 4:5.6.18-3
-Conflicts:     python-modules < 1:2.7.10-8
-Conflicts:     python3-modules < 1:3.5.0-9
-Conflicts:     ruby-modules < 1:2.0.0.648-2
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -304,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 \