commit a4b4d0bf9f48b857ab35fa39c06c33c10bf2c40f
Author: Peter Lemenkov <[email protected]>
Date: Thu Oct 24 16:46:17 2013 +0400
TEMPORARILY disable ECC until dust settles
Signed-off-by: Peter Lemenkov <[email protected]>
erlang.spec | 13 ++++++++-
otp-0008-Fix-for-armv7hl-architecture.patch | 6 +---
...EMPORARILY-disable-ECC-until-dust-settles.patch | 27 ++++++++++++++++++++
3 files changed, 39 insertions(+), 7 deletions(-)
---
diff --git a/erlang.spec b/erlang.spec
index 9d3719b..1d4cbfd 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -24,7 +24,7 @@
Name: erlang
Version: %{upstream_ver}
-Release: %{upstream_rel_for_rpm}.2%{?dist}
+Release: %{upstream_rel_for_rpm}.3%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@@ -76,7 +76,12 @@ Patch6: otp-0006-Do-not-install-erlang-sources.patch
# Required only for el5, el6 on PowerPC
# Ugly workaround for java-1.5.0-gcj which doesn't support
Patch7: otp-0007-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch
+# Fedora specific patch
+# Fix for armv7hl architecture
Patch8: otp-0008-Fix-for-armv7hl-architecture.patch
+# Fedora specific patch
+# TEMPORARILY disable ECC until dust settles
+Patch9: otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch
# end of autogenerated patch tag list
# BuildRoot not strictly needed since F10, but keep it for spec file robustness
@@ -937,7 +942,8 @@ Erlang mode for XEmacs (source lisp files).
%patch7 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup
%endif
%endif
-%patch8 -p1 -b .fix_armv7hl_hipe
+%patch8 -p1 -b .Fix_for_armv7hl_architecture
+%patch9 -p1 -b .TEMPORARILY_disable_ECC_until_dust_settles
# end of autogenerated prep patch list
# FIXME we should come up with a better solution
@@ -2268,6 +2274,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Oct 24 2013 Peter Lemenkov <[email protected]> - R16B-02.3
+- TEMPORARILY disable ECC until dust settles
+
* Thu Oct 24 2013 Peter Lemenkov <[email protected]> - R16B-02.2
- Fix building for armv7hl (patch taken from OpenSUSE repository)
diff --git a/otp-0008-Fix-for-armv7hl-architecture.patch
b/otp-0008-Fix-for-armv7hl-architecture.patch
index b985440..fc9f76e 100644
--- a/otp-0008-Fix-for-armv7hl-architecture.patch
+++ b/otp-0008-Fix-for-armv7hl-architecture.patch
@@ -1,7 +1,6 @@
-From 98268681b57ddec0d7aad2234d271c47da538d63 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <[email protected]>
Date: Thu, 26 Sep 2013 22:01:03 +0400
-Subject: [PATCH 8/8] Fix for armv7hl architecture
+Subject: [PATCH] Fix for armv7hl architecture
Taken from openSUSE:
@@ -24,6 +23,3 @@ index 00c7045..5b72215 100644
tile) ARCH=tile;;
*) ARCH=noarch;;
esac
---
-1.8.3.1
-
diff --git a/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch
b/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch
new file mode 100644
index 0000000..28c166a
--- /dev/null
+++ b/otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch
@@ -0,0 +1,27 @@
+From: Peter Lemenkov <[email protected]>
+Date: Thu, 24 Oct 2013 16:44:22 +0400
+Subject: [PATCH] TEMPORARILY disable ECC until dust settles
+
+Signed-off-by: Peter Lemenkov <[email protected]>
+---
+ lib/crypto/c_src/crypto.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
+index c28ff81..1b3b6c2 100644
+--- a/lib/crypto/c_src/crypto.c
++++ b/lib/crypto/c_src/crypto.c
+@@ -74,13 +74,6 @@
+ # define HAVE_DES_ede3_cfb_encrypt
+ #endif
+
+-#if OPENSSL_VERSION_NUMBER >= 0x009080ffL \
+- && !defined(OPENSSL_NO_EC) \
+- && !defined(OPENSSL_NO_ECDH) \
+- && !defined(OPENSSL_NO_ECDSA)
+-# define HAVE_EC
+-#endif
+-
+ #if defined(HAVE_EC)
+ #include <openssl/ec.h>
+ #include <openssl/ecdh.h>
_______________________________________________
erlang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/erlang
