X-Git-Url: https://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=12064edc5809d517c54a35dfdbfa181f5bcca621;hp=339271ff1f7d51a8eb41e5bb5055334f58187612;hb=55af98454b1ea8c10cf2e12070fe0d6b0a97f961;hpb=d343076c587984d1f86e7770d4e6242f7cb1c966

diff --git a/openssl.spec b/openssl.spec
index 339271f..12064ed 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -6,7 +6,7 @@
 %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,28 +19,28 @@ 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.1j
-Release:	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.2d
+Release:	1
 License:	Apache-like
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	f7175c9cd3c39bb1907ac8bba9df8ed3
+# Source0-md5:	38dd619b2e77cbac69b99f52a053d25a
 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
 URL:		http://www.openssl.org/
 BuildRequires:	bc
 BuildRequires:	perl-devel >= 1:5.6.1
@@ -53,9 +53,11 @@ Obsoletes:	SSLeay
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
 Obsoletes:	libopenssl0
+%if "%{pld_release}" != "ac"
 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
@@ -257,8 +259,6 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch7 -p1
 %patch8 -p1
 %patch10 -p1
-%patch11 -p1
-%patch12 -p1
 
 sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
 
@@ -303,6 +303,9 @@ PERL="%{__perl}" \
 %ifarch %{x8664}
 	linux-x86_64
 %endif
+%ifarch x32
+	linux-x32
+%endif
 %ifarch ia64
 	linux-ia64
 %endif