X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=9bca39169978093ce5a517b07cc1528311beb94f;hp=c3cfbfe4eed50c14fe4320c9e6ae262c05465ac7;hb=e02b6d37706201456a69b1fecd0e54304bb8d0f5;hpb=ce33e8e7b9227478170d2f90b2345a4141bc9545

diff --git a/openssl.spec b/openssl.spec
index c3cfbfe..9bca391 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,5 +1,5 @@
-#
-# 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"
@@ -16,12 +16,12 @@ 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.1h
-Release:	1
+Version:	1.0.1j
+Release:	2
 License:	Apache-like
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	8d6d684a9430d5cc98a62a5d8fbda8cf
+# Source0-md5:	f7175c9cd3c39bb1907ac8bba9df8ed3
 Source2:	%{name}.1.pl
 Source3:	%{name}-ssl-certificate.sh
 Source4:	%{name}-c_rehash.sh
@@ -34,12 +34,10 @@ 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
-
 URL:		http://www.openssl.org/
 BuildRequires:	bc
 BuildRequires:	perl-devel >= 1:5.6.1
@@ -255,7 +253,6 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
@@ -274,16 +271,21 @@ PERL="%{__perl}" \
 	--libdir=%{_lib} \
 	shared \
 	threads \
-	zlib \
-	enable-tlsext \
-	enable-seed \
-	enable-rfc3779 \
+	no-ssl2 \
+	no-ssl3 \
+	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
@@ -359,7 +361,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
@@ -477,6 +479,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)