up to OpenSSL 1.0.1j [15 Oct 2014]:

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index 40a65e9ccc384f7e6ac7cfd9e048f698fdf95de1..f059a77fd87334a2abcc6c0b8b2a4a6e891f6e0f 100644 (file)
--- 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.1e
-Release:       2
+Version:       1.0.1j
+Release:       1
 License:       Apache-like
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 66bf6f10f060d561929de96f9dfe5b8c
+# Source0-md5: f7175c9cd3c39bb1907ac8bba9df8ed3
 Source2:       %{name}.1.pl
 Source3:       %{name}-ssl-certificate.sh
 Source4:       %{name}-c_rehash.sh
@@ -33,16 +33,11 @@ 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:       aesni-mac.patch
-Patch11:       cpuid.patch
-Patch12:       default_bits.patch
-Patch13:       dtls_version.patch
-Patch14:       get_certificate.patch
-Patch15:       pic.patch
-Patch16:       stddef.patch
-
+Patch10:       default_bits.patch
+Patch11:       pic.patch
+Patch12:       stddef.patch
 URL:           http://www.openssl.org/
 BuildRequires: bc
 BuildRequires: perl-devel >= 1:5.6.1
@@ -55,6 +50,9 @@ Obsoletes:    SSLeay
 Obsoletes:     SSLeay-devel
 Obsoletes:     SSLeay-perl
 Obsoletes:     libopenssl0
+Conflicts:     neon < 0.29.6-8
+Conflicts:     openssh-clients < 2:6.2p2-3
+Conflicts:     openssh-server < 2:6.2p2-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -130,14 +128,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 +252,10 @@ 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
 
@@ -409,6 +403,7 @@ fi
 %dir %{_datadir}/ssl
 
 %files engines
+%defattr(644,root,root,755)
 %dir /%{_lib}/engines
 %attr(755,root,root) /%{_lib}/engines/*.so