X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=78c7df4e982800f77ce525e3bf2235a44b743636;hp=12064edc5809d517c54a35dfdbfa181f5bcca621;hb=474266d55b2c00ed0019c7defe132406b4b0d1df;hpb=55af98454b1ea8c10cf2e12070fe0d6b0a97f961

diff --git a/openssl.spec b/openssl.spec
index 12064ed..78c7df4 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,5 +1,6 @@
 # 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"
@@ -22,12 +23,16 @@ Name:		openssl
 # 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
+Version:	1.0.2e
 Release:	1
 License:	Apache-like
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	38dd619b2e77cbac69b99f52a053d25a
+# Source0-md5:	2218c1a6f807f7206c11eb3ee3a5ec80
+Source1:	https://raw.githubusercontent.com/openssl/openssl/OpenSSL_1_0_2-stable/util/pod2mantest
+# Source1-md5:	0811d285202cebe91003771475802b4f
+Source11:	https://raw.githubusercontent.com/openssl/openssl/OpenSSL_1_0_2-stable/test/bctest
+# Source11-md5:	ca85ae891de94faa821c2c6f4dba7f5a
 Source2:	%{name}.1.pl
 Source3:	%{name}-ssl-certificate.sh
 Source4:	%{name}-c_rehash.sh
@@ -53,7 +58,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
@@ -262,6 +272,17 @@ RC4, RSA и SSL. Включает статические библиотеки д
 
 sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
 
+# fix packaging error
+# https://github.com/openssl/openssl/issues/491
+ln -s . test/openssl-1.0.2e
+
+# also pod2man missing
+# https://github.com/openssl/openssl/issues/490
+install -p %{SOURCE1} util
+
+# https://github.com/openssl/openssl/issues/493
+install -p %{SOURCE11} test
+
 %build
 touch Makefile.*
 
@@ -405,7 +426,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}