Erlang ver. 21.2.7

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
Peter Lemenkov 2019-03-07 14:14:14 +03:00
parent 4e211dfa6e
commit a1e5da3f62
4 changed files with 6 additions and 48 deletions

View File

@ -60,8 +60,8 @@
Name: erlang
Version: 21.2.6
Release: 2%{?dist}
Version: 21.2.7
Release: 1%{?dist}
Summary: General-purpose programming language and runtime environment
License: ASL 2.0
@ -102,8 +102,6 @@ Patch7: otp-0007-Add-extra-search-directory.patch
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
@ -1946,6 +1944,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \
%changelog
* Thu Mar 07 2019 Peter Lemenkov <lemenkov@gmail.com> - 21.2.7-1
- Ver. 21.2.7
* Tue Feb 19 2019 Kalev Lember <klember@redhat.com> - 21.2.6-2
- Rebuilt against fixed atk (#1626575)

View File

@ -1,22 +0,0 @@
From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
Date: Sat, 21 Dec 2013 00:13:35 +0400
Subject: [PATCH] In openssl 1.0.1e EC_GROUP_new_curve_GF2m function is wrapped
by #ifndef OPENSSL_NO_EC2M. We have to check whether OPENSSL_NO_EC2M is set,
and if it is, then we do not have EC_GROUP_new_curve_GF2m function and do not
HAVE_EC.
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index df607732bf..a1fe05dd41 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -168,7 +168,8 @@
#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_ECDSA) \
+ && !defined(OPENSSL_NO_EC2M)
# define HAVE_EC
#endif

View File

@ -1,21 +0,0 @@
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.6.tar.gz) = 0d43a5eb6e9d01e2997b7c82a15b2bd7483a0623f86f8aaff3ec59b5da6aa2cd8135d48cf66233e28c780473f83b90ad56c076374273cefa79b79622e57027f9
SHA512 (otp-OTP-21.2.7.tar.gz) = 2a5cec5b9e0ae7b8f53060c95ac1d7a61dbf7b591199c7bc2d527d643dd2a09484ae27055bf3135fb32a69500dbbae8ae95258cea22f2c100ea9f892b87715f7