X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=openssl.spec;h=c61ed55ace3a054c8cfb7ccb498abd45342fd753;hb=4a8ad7eb81a44abfbd476689276be05a183ba60f;hp=f8ef076eb996ccae7d3bd1dabcfb55837f52019e;hpb=7685574880e50c8ab8a2d0cf11ee268c8bd3f524;p=packages%2Fopenssl.git

diff --git a/openssl.spec b/openssl.spec
index f8ef076..c61ed55 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,12 +1,13 @@
 # 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
+%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
@@ -19,12 +20,15 @@ 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.2
+# 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
 Release:	1
 License:	Apache-like
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	38373013fc85c790aabf8837969c5eba
+# Source0-md5:	5262bfa25b60ed9de9f28d5d52d77fc5
 Source2:	%{name}.1.pl
 Source3:	%{name}-ssl-certificate.sh
 Source4:	%{name}-c_rehash.sh
@@ -37,7 +41,6 @@ Patch5:		%{name}-ca-certificates.patch
 Patch6:		%{name}-ldflags.patch
 Patch7:		%{name}-find.patch
 Patch8:		pic.patch
-Patch9:		stddef.patch
 Patch10:	%{name}_fix_for_x32.patch
 URL:		http://www.openssl.org/
 BuildRequires:	bc
@@ -51,7 +54,12 @@ Obsoletes:	SSLeay
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
 Obsoletes:	libopenssl0
-%if "%{pld_release}" != "ac"
+%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
@@ -256,7 +264,6 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %patch10 -p1
 
 sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
@@ -404,7 +411,7 @@ 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
+#%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}