Erlang ver. 21.2.5

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
Peter Lemenkov 2019-02-05 17:51:10 +03:00
parent 4fcc82fa8f
commit 8bdfb92429
3 changed files with 29 additions and 3 deletions

View File

@ -60,8 +60,8 @@
Name: erlang
Version: 21.2.4
Release: 2%{?dist}
Version: 21.2.5
Release: 1%{?dist}
Summary: General-purpose programming language and runtime environment
License: ASL 2.0
@ -103,6 +103,7 @@ Patch8: otp-0008-Avoid-forking-sed-to-get-basename.patch
Patch9: otp-0009-Load-man-pages-from-system-wide-directory.patch
Patch10: otp-0010-Improve-nodes-querying.patch
Patch11: otp-0011-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch
Patch12: otp-0012-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch
# end of autogenerated patch tag list
BuildRequires: gcc
@ -1945,6 +1946,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \
%changelog
* Tue Feb 05 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.2.5-1
- Ver. 21.2.5
- Revert: Fix EC detection
* Mon Feb 04 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.2.4-2
- Fix EC detection

View File

@ -0,0 +1,21 @@
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 5 Feb 2019 17:43:18 +0300
Subject: [PATCH] Revert "In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is
wrapped by #ifndef OPENSSL_NO_EC2M."
This reverts commit 01593ce68f154686cba0815c8121db5912a5e02a.
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index a1fe05dd41..df607732bf 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -168,8 +168,7 @@
#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \
&& !defined(OPENSSL_NO_EC) \
&& !defined(OPENSSL_NO_ECDH) \
- && !defined(OPENSSL_NO_ECDSA) \
- && !defined(OPENSSL_NO_EC2M)
+ && !defined(OPENSSL_NO_ECDSA)
# define HAVE_EC
#endif

View File

@ -1 +1 @@
SHA512 (otp-OTP-21.2.4.tar.gz) = 15b5f96a8159be56016124567ce72c72c7e3b727aabcb408dcc054ae4523c15eec79f33e3df2b283e06dc3f6df09da4d154dbf7a278c6e544ef7d2216662b90d
SHA512 (otp-OTP-21.2.5.tar.gz) = f6f68ec6d87d557cd94ca3308f34fd656e770e9446299495a92b7f647e01512110f2941cdbb69b3939ba5ad65ff2c3bb1fd1e63196d14c4c1df69f546a8df73b