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

update to R15B03-1 (using "R15B03_1" as the RPM version due to '-' not being allowed in the version tag)

OBS-URL: https://build.opensuse.org/request/show/151109
OBS-URL: https://build.opensuse.org/package/show/devel:languages:erlang/erlang?expand=0&rev=67

erlang.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Feb  4 10:54:07 UTC 2013 - kruber@zib.de
+
+- update to R15B03-1 release:
+  + integrated fix for a bug in ssl that affected accept calls
+    with timeouts
+  + ERL_CRASH_DUMP_SECONDS only needs to be set when using heart,
+    all other invocations of the Erlang VM will crashdump on fatal
+    errors as they did in R15B02
+  + systems using heart still have to define a maximum time for
+    crashdumps using the ERL_CRASH_DUMP_SECONDS environment
+    variable
+- dropped otp-R15B03-fix_ssl_accept_timeout.patch
+  (fixed in release)
+
 -------------------------------------------------------------------
 Mon Jan  7 12:40:48 UTC 2013 - matwey.kornilov@gmail.com
 

erlang.spec

@@ -17,18 +17,20 @@
 
 
 Name:           erlang
-Version:        R15B03
+%define otp_base_version R15B03
+%define otp_version %{otp_base_version}-1
+Version:        R15B03_1
 Release:        0
 Summary:        General-purpose programming language and runtime environment
 License:        ErlPL-1.1
 Group:          Development/Languages/Other
 Url:            http://www.erlang.org
-Source:         otp_src_%{version}.tar.gz
-#Source:        http://www.erlang.org/download/otp_src_%{version}.tar.gz
-Source1:        otp_doc_html_%{version}.tar.gz
-#Source1:       http://www.erlang.org/download/otp_doc_html_%{version}.tar.gz
-Source2:        otp_doc_man_%{version}.tar.gz
-#Source2:       http://www.erlang.org/download/otp_doc_man_%{version}.tar.gz
+Source:         otp_src_%{otp_version}.tar.gz
+#Source:        http://www.erlang.org/download/otp_src_%{otp_version}.tar.gz
+Source1:        otp_doc_html_%{otp_version}.tar.gz
+#Source1:       http://www.erlang.org/download/otp_doc_html_%{otp_version}.tar.gz
+Source2:        otp_doc_man_%{otp_version}.tar.gz
+#Source2:       http://www.erlang.org/download/otp_doc_man_%{otp_version}.tar.gz
 Source3:        %{name}-rpmlintrc
 Source4:        epmd.init
 Source5:        erlang.sysconfig
@@ -36,8 +38,6 @@ 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
 # PATCH-FIX-UPSTREAM fix-armv7hl.patch - matwey.kornilov@gmail.com -- this makes erlang build at Factory:ARM for armv7hl
 Patch3:         fix-armv7hl.patch
 # autoconf is required only by fix-armv7hl.patch
@@ -190,10 +190,9 @@ Requires:       wxGTK >= 2.8
 A Graphics System used to write platform independent user interfaces.
 
 %prep
-%setup -q -n otp_src_%{version}
+%setup -q -n otp_src_%{otp_base_version}
 %patch0 -p1 -b .rpath
 %patch1 -p1
-%patch2 -p1
 %ifarch %arm
 %patch3 -p1
 autoreconf -si ./erts

otp-R15B03-fix_ssl_accept_timeout.patch

@@ -1,14 +0,0 @@
-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)};
-