Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
426b496dca | ||
|
b84c60e1bf | ||
|
c0926a2e8d | ||
|
98fd17843c | ||
|
29dfe5c18b | ||
|
0c1ec1a368 | ||
|
1ca757a41a | ||
|
cc669331e2 | ||
|
8b984b11a7 |
28
erlang.spec
28
erlang.spec
@ -60,7 +60,7 @@
|
||||
|
||||
|
||||
Name: erlang
|
||||
Version: 20.3.8.18
|
||||
Version: 20.3.8.24
|
||||
Release: 1%{?dist}
|
||||
Summary: General-purpose programming language and runtime environment
|
||||
|
||||
@ -104,6 +104,8 @@ Patch8: otp-0008-Add-extra-search-directory.patch
|
||||
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
|
||||
@ -2231,6 +2233,30 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 20 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.24-1
|
||||
- Ver. 20.3.8.24
|
||||
|
||||
* Wed Nov 13 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.23-1
|
||||
- Ver. 20.3.8.23
|
||||
|
||||
* Wed Jun 19 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.22-1
|
||||
- Ver. 20.3.8.22
|
||||
|
||||
* Wed Apr 17 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.21-1
|
||||
- Ver. 20.3.8.21
|
||||
|
||||
* Tue Feb 19 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.20-1
|
||||
- Ver. 20.3.8.20
|
||||
|
||||
* Fri Feb 15 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.19-1
|
||||
- Ver. 20.3.8.19
|
||||
|
||||
* 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
|
||||
|
||||
* Tue Jan 22 2019 Peter Lemenkov <lemenkov@gmail.com> - 20.3.8.18-1
|
||||
- Ver. 20.3.8.18
|
||||
|
||||
|
@ -48,10 +48,10 @@ index a4a6c158cc..13658302f5 100644
|
||||
|
||||
release_docs_spec:
|
||||
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
|
||||
index 69b5b6003d..ba9a0e74b8 100644
|
||||
index 24a9b87aeb..640c80722f 100644
|
||||
--- a/lib/erl_interface/src/Makefile.in
|
||||
+++ b/lib/erl_interface/src/Makefile.in
|
||||
@@ -842,14 +842,14 @@ ifneq ($(EXE_TARGETS),)
|
||||
@@ -844,14 +844,14 @@ ifneq ($(EXE_TARGETS),)
|
||||
$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
|
||||
endif
|
||||
$(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src"
|
||||
@ -134,10 +134,10 @@ index 27b156a2c9..f11ff303b6 100644
|
||||
$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
|
||||
|
||||
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
|
||||
index cfe91917f8..735cdaaaef 100644
|
||||
index 289322b6fa..9e2b9b7e7c 100644
|
||||
--- a/lib/tools/c_src/Makefile.in
|
||||
+++ b/lib/tools/c_src/Makefile.in
|
||||
@@ -190,8 +190,6 @@ include ../vsn.mk
|
||||
@@ -189,8 +189,6 @@ include ../vsn.mk
|
||||
RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
|
||||
|
||||
release_spec: all
|
||||
|
@ -0,0 +1,22 @@
|
||||
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 e955905739..20c5dab4e7 100644
|
||||
--- a/lib/crypto/c_src/crypto.c
|
||||
+++ b/lib/crypto/c_src/crypto.c
|
||||
@@ -151,7 +151,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
|
||||
|
@ -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 20c5dab4e7..e955905739 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
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (otp-OTP-20.3.8.18.tar.gz) = 877649835dcf79db7f8940cfbd5db882b10bb5a2652386680b1cecfa2d60fcd2939a9e2cc3710cda49194286e598f752d81e6e6119f40f4e43aef7efbbe5cbd8
|
||||
SHA512 (otp-OTP-20.3.8.24.tar.gz) = e6fecc971227f6cd212b8644dd534bd757dd22e5bf7cf1e9627a344857d1969756ffac1a2bcd15e73b1e6094b335ef075f601ca24c53cb33940a671dad5f1d75
|
||||
|
Loading…
Reference in New Issue
Block a user