From cc669331e2a00d5ba7cecf83b2fd670c6dcdfcb7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 12 Feb 2019 15:53:24 +0300 Subject: [PATCH] Revert latest patch - does too much damage Signed-off-by: Peter Lemenkov --- erlang.spec | 6 +++++- ...l-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch | 21 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 otp-0013-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch diff --git a/erlang.spec b/erlang.spec index 09f1e79..f263c28 100644 --- a/erlang.spec +++ b/erlang.spec @@ -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 - 20.3.8.18-3 +- Revert latest patch - does too much damage + * Mon Feb 04 2019 Peter Lemenkov - 20.3.8.18-2 - Fix EC detection diff --git a/otp-0013-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch b/otp-0013-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch new file mode 100644 index 0000000..da94579 --- /dev/null +++ b/otp-0013-Revert-In-openssl-1.0.1e-EC_GROUP_new_curve_GF2m-fun.patch @@ -0,0 +1,21 @@ +From: Peter Lemenkov +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 +