Accepting request 143982 from home:NicoK:branches:devel:languages:erlang

update to R15B03 (including SSL accept timeout patch)

OBS-URL: https://build.opensuse.org/request/show/143982
OBS-URL: https://build.opensuse.org/package/show/devel:languages:erlang/erlang?expand=0&rev=63
This commit is contained in:
Alex Simonov 2012-12-03 18:55:57 +00:00 committed by Git OBS Bridge
parent deb58c2356
commit a8e784f853
9 changed files with 37 additions and 10 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Dec 3 18:07:40 UTC 2012 - kruber@zib.de
- update to R15B03 release:
+ mainly bug fixes
+ ERL_CRASH_DUMP_SECONDS must be set in order to get any Erlang
crash dump (potential incompatibility introduced to fix the
use of "-heart" in combination with the Erlang crash dump
+ details: http://www.erlang.org/download/otp_src_R15B03.readme
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 19 18:41:15 UTC 2012 - dimstar@opensuse.org Mon Nov 19 18:41:15 UTC 2012 - dimstar@opensuse.org

View File

@ -17,7 +17,7 @@
Name: erlang Name: erlang
Version: R15B02 Version: R15B03
Release: 0 Release: 0
Summary: General-purpose programming language and runtime environment Summary: General-purpose programming language and runtime environment
License: ErlPL-1.1 License: ErlPL-1.1
@ -36,6 +36,8 @@ Source5: erlang.sysconfig
Patch0: otp-R15B02-rpath.patch Patch0: otp-R15B02-rpath.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch1: erlang-ppc.patch Patch1: erlang-ppc.patch
# PATCH-FIX-UPSTREAM -- See http://erlang.org/pipermail/erlang-bugs/2012-November/003214.html
Patch2: otp-R15B03-fix_ssl_accept_timeout.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: openssh BuildRequires: openssh
@ -187,6 +189,7 @@ A Graphics System used to write platform independent user interfaces.
%setup -q -n otp_src_%{version} %setup -q -n otp_src_%{version}
%patch0 -p1 -b .rpath %patch0 -p1 -b .rpath
%patch1 -p1 %patch1 -p1
%patch2 -p1
chmod -R u+w . chmod -R u+w .
# enable dynamic linking for ssl # enable dynamic linking for ssl

View File

@ -0,0 +1,14 @@
index 87cf49d..102dd4a 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1001,6 +1001,10 @@ handle_info({cancel_start_or_recv, RecvFrom}, connection = StateName, #state{sta
gen_fsm:reply(RecvFrom, {error, timeout}),
{next_state, StateName, State#state{start_or_recv_from = undefined}, get_timeout(State)};
+handle_info({cancel_start_or_recv, RecvFrom}, StateName, State) when connection =/= StateName->
+ gen_fsm:reply(RecvFrom, {error, timeout}),
+ {next_state, StateName, State#state{start_or_recv_from = undefined}, get_timeout(State)};
+
handle_info({cancel_start_or_recv, _RecvFrom}, StateName, State) ->
{next_state, StateName, State, get_timeout(State)};

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be166976a651da4ea2588b9d277a6684a2d4318b37e8fc029365e992ec404518
size 30385932

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:00595ba3055a1282a18344467c865a416e05ef6e883c2702eded7ac40fc6c50c
size 30434193

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e27ed26259a2560b81e02b89190ae2a3bf0a777dc2e875f9615adab0a5388f95
size 1298793

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a5a01f8c6050551c1ba0591de42731a6640370e7527fae81cdfe3d3d6af0a6b
size 1304986

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158
size 75959087

3
otp_src_R15B03.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d1ee5dd3833537ad7533f2deaf164936508c55c992c2b930f0c4c4559d40aa12
size 76127884