rpms/erlang
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert latest patch - does too much damage

Browse Source 
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
This commit is contained in:
Peter Lemenkov 2019-02-12 15:53:24 +03:00
parent 8b984b11a7
commit cc669331e2
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erlang.spec
View File

@ -61,7 +61,7 @@
Name: erlang
Version: 20.3.8.18
Release: 2%{?dist}
Release: 3%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@ -105,6 +105,7 @@ Patch9: otp-0009-Avoid-forking-sed-to-get-basename.patch
Patch10: otp-0010-Load-man-pages-from-system-wide-directory.patch
Patch11: otp-0011-Improve-nodes-querying.patch
Patch12: otp-0012-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-function-i.patch
Patch13: otp-0013-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch
# end of autogenerated patch tag list
BuildRequires: gcc
@ -2232,6 +2233,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \
%changelog
* Tue Feb 12 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.18-3
- Revert latest patch - does too much damage
* Mon Feb 04 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.18-2
- Fix EC detection

21
otp-0013-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch Normal file
View File

@ -0,0 +1,21 @@
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 12 Feb 2019 15:50:30 +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 805011209d744ed5aa39cd23e020bee3458ee19a.
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index cc1bcc1fb3..6dd263adb2 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -151,8 +151,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