X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=a901b2c8ba34595d643e8a792a29f890863d0788;hp=40a65e9ccc384f7e6ac7cfd9e048f698fdf95de1;hb=14e98b23d40c010201abb7db5556e4a56d20eb3a;hpb=84745a0c3ecccc028225ed6345956c6f4a3c777c

diff --git a/openssl.spec b/openssl.spec
index 40a65e9..a901b2c 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,8 +1,11 @@
-#
-# TODO: consider dropping last optflags.patch hunk and return to SOMAJOR (.so.1) sonames
+# TODO
+# - consider dropping last optflags.patch hunk and return to SOMAJOR (.so.1) sonames
 #
 # 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
 
@@ -16,33 +19,25 @@ 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.1e
-Release:	2
+Version:	1.0.2d
+Release:	1
 License:	Apache-like
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	66bf6f10f060d561929de96f9dfe5b8c
+# 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
-
-# from debian
-Patch10:	aesni-mac.patch
-Patch11:	cpuid.patch
-Patch12:	default_bits.patch
-Patch13:	dtls_version.patch
-Patch14:	get_certificate.patch
-Patch15:	pic.patch
-Patch16:	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
@@ -55,6 +50,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
@@ -130,14 +130,14 @@ crypto devices:
 - Broadcom uBSec
 
 In addition, dynamic binding to external ENGINE implementations is now
-provided by a special ENGINE called "dynamic". 
+provided by a special ENGINE called "dynamic".
 
 %description engines -l pl.UTF-8
 Począwszy od OpenSSL-a 0.9.6 został dodany nowy komponent, mający
 wspierać alternatywne implementacje kryptografii, przeważnie
 współpracujące z zewnętrznymi urządzeniami kryptograficznymi (np.
-kartami akceleratorów). Komponent ten jest nazywany SILNIKIEM
-(ang. ENGINE).
+kartami akceleratorów). Komponent ten jest nazywany SILNIKIEM (ang.
+ENGINE).
 
 Obecnie istnieją wbudowane implementacje silników dla następujących
 urządzeń kryptograficznych:
@@ -254,14 +254,8 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-
+%patch8 -p1
 %patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
 
 sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
 
@@ -277,16 +271,21 @@ PERL="%{__perl}" \
 	--libdir=%{_lib} \
 	shared \
 	threads \
-	zlib \
-	enable-tlsext \
-	enable-seed \
-	enable-rfc3779 \
+	%{!?with_sslv2:no-ssl2} \
+	%{!?with_sslv3:no-ssl3} \
+	%{!?with_zlib:no-}zlib \
 	enable-camelia \
 	enable-cms \
 	enable-idea \
-	enable-mdc2 \
 	enable-md2 \
+	enable-mdc2 \
 	enable-rc5 \
+	enable-rfc3779 \
+	enable-seed \
+	enable-tlsext \
+%ifarch %{x8664}
+	enable-ec_nistp_64_gcc_128 \
+%endif
 %ifarch %{ix86}
 %ifarch i386
 	386 linux-elf
@@ -301,6 +300,9 @@ PERL="%{__perl}" \
 %ifarch %{x8664}
 	linux-x86_64
 %endif
+%ifarch x32
+	linux-x32
+%endif
 %ifarch ia64
 	linux-ia64
 %endif
@@ -362,7 +364,7 @@ mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{n
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc
 
 # not installed as individual utilities (see openssl dgst instead)
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{md2,md4,md5,mdc2,ripemd160,sha,sha1}.1
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{dss1,md2,md4,md5,mdc2,ripemd160,sha,sha1,sha224,sha256,sha384,sha512}.1
 
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1
 install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate
@@ -409,6 +411,7 @@ fi
 %dir %{_datadir}/ssl
 
 %files engines
+%defattr(644,root,root,755)
 %dir /%{_lib}/engines
 %attr(755,root,root) /%{_lib}/engines/*.so
 
@@ -479,6 +482,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/CA.pl
 %attr(755,root,root) %{_libdir}/%{name}/tsget
 %{_mandir}/man1/openssl_CA.pl.1*
+%{_mandir}/man1/openssl_c_rehash.1*
 
 %files devel
 %defattr(644,root,root,755)