From a8e784f8539d0be88b5b01b6656c9bdae2c0c207b1545a143d9cdf65a6c1bcb9 Mon Sep 17 00:00:00 2001 From: Alex Simonov Date: Mon, 3 Dec 2012 18:55:57 +0000 Subject: [PATCH] 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 --- erlang.changes | 10 ++++++++++ erlang.spec | 5 ++++- otp-R15B03-fix_ssl_accept_timeout.patch | 14 ++++++++++++++ otp_doc_html_R15B02.tar.gz | 3 --- otp_doc_html_R15B03.tar.gz | 3 +++ otp_doc_man_R15B02.tar.gz | 3 --- otp_doc_man_R15B03.tar.gz | 3 +++ otp_src_R15B02.tar.gz | 3 --- otp_src_R15B03.tar.gz | 3 +++ 9 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 otp-R15B03-fix_ssl_accept_timeout.patch delete mode 100644 otp_doc_html_R15B02.tar.gz create mode 100644 otp_doc_html_R15B03.tar.gz delete mode 100644 otp_doc_man_R15B02.tar.gz create mode 100644 otp_doc_man_R15B03.tar.gz delete mode 100644 otp_src_R15B02.tar.gz create mode 100644 otp_src_R15B03.tar.gz diff --git a/erlang.changes b/erlang.changes index 3d470a1..6e535ff 100644 --- a/erlang.changes +++ b/erlang.changes @@ -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 diff --git a/erlang.spec b/erlang.spec index 4a69576..f668831 100644 --- a/erlang.spec +++ b/erlang.spec @@ -17,7 +17,7 @@ Name: erlang -Version: R15B02 +Version: R15B03 Release: 0 Summary: General-purpose programming language and runtime environment License: ErlPL-1.1 @@ -36,6 +36,8 @@ Source5: erlang.sysconfig Patch0: otp-R15B02-rpath.patch # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines 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: ncurses-devel BuildRequires: openssh @@ -187,6 +189,7 @@ A Graphics System used to write platform independent user interfaces. %setup -q -n otp_src_%{version} %patch0 -p1 -b .rpath %patch1 -p1 +%patch2 -p1 chmod -R u+w . # enable dynamic linking for ssl diff --git a/otp-R15B03-fix_ssl_accept_timeout.patch b/otp-R15B03-fix_ssl_accept_timeout.patch new file mode 100644 index 0000000..615f4ce --- /dev/null +++ b/otp-R15B03-fix_ssl_accept_timeout.patch @@ -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)}; + diff --git a/otp_doc_html_R15B02.tar.gz b/otp_doc_html_R15B02.tar.gz deleted file mode 100644 index cf1fd55..0000000 --- a/otp_doc_html_R15B02.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be166976a651da4ea2588b9d277a6684a2d4318b37e8fc029365e992ec404518 -size 30385932 diff --git a/otp_doc_html_R15B03.tar.gz b/otp_doc_html_R15B03.tar.gz new file mode 100644 index 0000000..0d4cc70 --- /dev/null +++ b/otp_doc_html_R15B03.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00595ba3055a1282a18344467c865a416e05ef6e883c2702eded7ac40fc6c50c +size 30434193 diff --git a/otp_doc_man_R15B02.tar.gz b/otp_doc_man_R15B02.tar.gz deleted file mode 100644 index afb6ca5..0000000 --- a/otp_doc_man_R15B02.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e27ed26259a2560b81e02b89190ae2a3bf0a777dc2e875f9615adab0a5388f95 -size 1298793 diff --git a/otp_doc_man_R15B03.tar.gz b/otp_doc_man_R15B03.tar.gz new file mode 100644 index 0000000..e3f677b --- /dev/null +++ b/otp_doc_man_R15B03.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a5a01f8c6050551c1ba0591de42731a6640370e7527fae81cdfe3d3d6af0a6b +size 1304986 diff --git a/otp_src_R15B02.tar.gz b/otp_src_R15B02.tar.gz deleted file mode 100644 index cd55bcb..0000000 --- a/otp_src_R15B02.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158 -size 75959087 diff --git a/otp_src_R15B03.tar.gz b/otp_src_R15B03.tar.gz new file mode 100644 index 0000000..b4c95d1 --- /dev/null +++ b/otp_src_R15B03.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1ee5dd3833537ad7533f2deaf164936508c55c992c2b930f0c4c4559d40aa12 +size 76127884