[packages/openssl] Restore snap bcond from dev-1.1 branch

glen glen at pld-linux.org
Tue Dec 1 16:33:32 CET 2020


commit 102adabc2f311080f864c792d146f63364ad1990
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Dec 1 16:04:49 2020 +0200

    Restore snap bcond from dev-1.1 branch

 openssl.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/openssl.spec b/openssl.spec
index ae7bca0..d44fd0b 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -4,6 +4,7 @@
 %bcond_without	zlib	# zlib: note - enables CVE-2012-4929 vulnerability
 %bcond_with	sslv2	# SSLv2: note - many flaws http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0
 %bcond_with	sslv3	# SSLv3: note - enables CVE-2014-3566 vulnerability
+%bcond_with	snap	# use GitHub snapshot to build branch release
 
 Summary:	OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3)
 Summary(de.UTF-8):	Secure Sockets Layer (SSL)-Kommunikationslibrary
@@ -20,8 +21,12 @@ Version:	1.1.1h
 Release:	1
 License:	Apache-like
 Group:		Libraries
+%if %{without snap}
 Source0:	https://www.openssl.org/source/%{name}-%{version}.tar.gz
 # Source0-md5:	53840c70434793127a3574433494e8d3
+%else
+Source1:	https://github.com/openssl/openssl/archive/OpenSSL_1_1_1-stable/%{name}-%{version}-dev.tar.gz
+%endif
 Source2:	%{name}.1.pl
 Source3:	%{name}-ssl-certificate.sh
 Source4:	%{name}-c_rehash.sh
@@ -250,7 +255,7 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %prep
 %if %{with snap}
 %setup -qcT -a1
-%{__mv} %{name}-OpenSSL_1_1_0-stable/* .
+%{__mv} %{name}-OpenSSL_1_1_1-stable/* .
 %else
 %setup -q %{?subver:-n %{name}-%{version}-%{subver}}
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/102adabc2f311080f864c792d146f63364ad1990



More information about the pld-cvs-commit mailing list