epaolantonio/erlang
SHA256
1
0
Fork 0
forked from erlang/erlang
Code Pull Requests Activity

Accepting request 342548 from home:matwey:branches:devel:languages:erlang:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/342548
OBS-URL: https://build.opensuse.org/package/show/devel:languages:erlang:Factory/erlang?expand=0&rev=36
This commit is contained in:
Nico Kruber
2015-11-17 12:37:21 +00:00
committed by Git OBS Bridge
parent 2677d9d78f
commit 5f7dd47647
8 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OTP-18.0.3.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

BIN
OTP-18.1.3.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

8
crypto.patch
View File

@@ -5,11 +5,11 @@ Date: Sat Dec 21 00:13:35 2013 +0400
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.
Index: otp_src_17.4/lib/crypto/c_src/crypto.c
Index: otp-OTP-18.1.3/lib/crypto/c_src/crypto.c
===================================================================
--- otp_src_17.4.orig/lib/crypto/c_src/crypto.c
+++ otp_src_17.4/lib/crypto/c_src/crypto.c
@@ -77,7 +77,8 @@
--- otp-OTP-18.1.3.orig/lib/crypto/c_src/crypto.c
+++ otp-OTP-18.1.3/lib/crypto/c_src/crypto.c
@@ -82,7 +82,8 @@
#if OPENSSL_VERSION_NUMBER >= 0x009080ffL \
&& !defined(OPENSSL_NO_EC) \
&& !defined(OPENSSL_NO_ECDH) \

16
erlang-not-install-misc.patch
View File

@@ -9,11 +9,11 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
erts/etc/unix/Install.src | 10 ----------
2 files changed, 14 deletions(-)
Index: otp_src_17.4/erts/etc/common/Makefile.in
Index: otp-OTP-18.1.3/erts/etc/common/Makefile.in
===================================================================
--- otp_src_17.4.orig/erts/etc/common/Makefile.in
+++ otp_src_17.4/erts/etc/common/Makefile.in
@@ -550,10 +550,6 @@ endif
--- otp-OTP-18.1.3.orig/erts/etc/common/Makefile.in
+++ otp-OTP-18.1.3/erts/etc/common/Makefile.in
@@ -551,10 +551,6 @@ endif
ifneq ($(INSTALL_TOP_BIN),)
$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"
endif
@@ -24,11 +24,11 @@ Index: otp_src_17.4/erts/etc/common/Makefile.in
ifneq ($(INSTALL_SRC),)
$(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/src"
$(INSTALL_DATA) $(INSTALL_SRC) "$(RELEASE_PATH)/erts-$(VSN)/src"
Index: otp_src_17.4/erts/etc/unix/Install.src
Index: otp-OTP-18.1.3/erts/etc/unix/Install.src
===================================================================
--- otp_src_17.4.orig/erts/etc/unix/Install.src
+++ otp_src_17.4/erts/etc/unix/Install.src
@@ -140,14 +140,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*
--- otp-OTP-18.1.3.orig/erts/etc/unix/Install.src
+++ otp-OTP-18.1.3/erts/etc/unix/Install.src
@@ -141,14 +141,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*
cp -p ../releases/%I_SYSTEM_VSN%/no_dot_erlang.boot .
cp -p $Name.boot start.boot
cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script

22
erlang.changes
View File

@@ -1,3 +1,25 @@
-------------------------------------------------------------------
Thu Oct 29 13:41:47 UTC 2015 - matwey.kornilov@gmail.com
- Update to 18.1.3:
* ssl: Add possibility to downgrade an SSL/TLS connection to a
tcp connection, and give back the socket control to a user
process.
* ssh: The following new key exchange algorithms are
implemented:'ecdh-sha2-nistp256', 'ecdh-sha2-nistp384',
'ecdh-sha2-nistp521','diffie-hellman-group14-sha1',
'diffie-hellman-group-exchange-sha1' and
'diffie-hellman-group-exchange-sha256'. This raises the
security level considerably.
* kernel,stdlib,sasl: A mechanism for limiting the amount of
text that the built-in error logger events will produce has
been introduced. It is useful for limiting both the size of
log files and the CPU time used to produce them. This
mechanism is experimental in the sense that it may be changed
based on feedback. See config parameter
error_logger_format_depth in the Kernel application.
- Removed erts_fix_unlock_status_lock.patch: fixed in upstream
-------------------------------------------------------------------
Tue Sep 29 17:17:53 UTC 2015 - matwey.kornilov@gmail.com

5
erlang.spec
View File

@@ -21,7 +21,7 @@
%endif
Name: erlang
Version: 18.0.3
Version: 18.1.3
Release: 0
Summary: General-purpose programming language and runtime environment
License: Apache-2.0
@@ -41,8 +41,6 @@ Patch0: otp-R16B-rpath.patch
Patch4: erlang-not-install-misc.patch
# PATCH-FIX-UPSTREAM crypto.patch - matwey.kornilov@gmail.com -- fix compilation with disabled EC in openssl
Patch5: crypto.patch
# PATCH-FIX-UPSTREAM erts_fix_unlock_status_lock.patch - lukas.larsson@erlang-solutions.com -- erts: Make sure to unlock status lock when setting process prio
Patch6: erts_fix_unlock_status_lock.patch
BuildRequires: autoconf
BuildRequires: gcc-c++
BuildRequires: ncurses-devel
@@ -302,7 +300,6 @@ A Graphics System used to write platform independent user interfaces.
%patch0 -p1 -b .rpath
%patch4 -p1
%patch5 -p1
%patch6 -p1
cp %{S:9} .
./otp_build autoconf

25
erts_fix_unlock_status_lock.patch
View File

@@ -1,25 +0,0 @@
From 02380778fd2a9d6af85865a89ef0747351cc0f88 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas.larsson@erlang-solutions.com>
Date: Thu, 13 Aug 2015 14:52:20 +0200
Subject: [PATCH] erts: Make sure to unlock status lock when setting process
prio
---
erts/emulator/beam/erl_process.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 7b3d12c..98f01bb 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -9177,6 +9177,10 @@ erts_set_process_priority(Process *p, Eterm value)
a = erts_smp_atomic32_cmpxchg_mb(&p->state, n, e);
} while (a != e);
+
+ if (slocked)
+ erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+
}
switch (oprio) {

24
otp-R16B-rpath.patch
View File

@@ -1,8 +1,8 @@
Index: otp_src_17.4/lib/crypto/c_src/Makefile.in
Index: otp-OTP-18.1.3/lib/crypto/c_src/Makefile.in
===================================================================
--- otp_src_17.4.orig/lib/crypto/c_src/Makefile.in
+++ otp_src_17.4/lib/crypto/c_src/Makefile.in
@@ -89,7 +89,7 @@ endif
--- otp-OTP-18.1.3.orig/lib/crypto/c_src/Makefile.in
+++ otp-OTP-18.1.3/lib/crypto/c_src/Makefile.in
@@ -90,7 +90,7 @@ endif
DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
@@ -11,11 +11,11 @@ Index: otp_src_17.4/lib/crypto/c_src/Makefile.in
CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
else
Index: otp_src_17.4/lib/crypto/priv/Makefile
Index: otp-OTP-18.1.3/lib/crypto/priv/Makefile
===================================================================
--- otp_src_17.4.orig/lib/crypto/priv/Makefile
+++ otp_src_17.4/lib/crypto/priv/Makefile
@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto.o
--- otp-OTP-18.1.3.orig/lib/crypto/priv/Makefile
+++ otp-OTP-18.1.3/lib/crypto/priv/Makefile
@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o
# ----------------------------------------------------
$(SO_NIFLIB): $(OBJS)
@@ -24,11 +24,11 @@ Index: otp_src_17.4/lib/crypto/priv/Makefile
-o $@ $^ -lcrypto
$(DLL_NIFLIB): $(OBJS)
Index: otp_src_17.4/lib/odbc/c_src/odbcserver.c
Index: otp-OTP-18.1.3/lib/odbc/c_src/odbcserver.c
===================================================================
--- otp_src_17.4.orig/lib/odbc/c_src/odbcserver.c
+++ otp_src_17.4/lib/odbc/c_src/odbcserver.c
@@ -106,6 +106,8 @@
--- otp-OTP-18.1.3.orig/lib/odbc/c_src/odbcserver.c
+++ otp-OTP-18.1.3/lib/odbc/c_src/odbcserver.c
@@ -107,6 +107,8 @@
#ifdef UNIX
#include <unistd.h>
#include <netinet/tcp.h>