diff options
| author | olgeni <olgeni@FreeBSD.org> | 2012-12-08 05:49:46 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2012-12-08 05:49:46 +0800 |
| commit | 5d6e8f934cef0ebdc5faf42ede94779049e5fe5f (patch) | |
| tree | 8e5796953f8e6e04924291d82de127afb7b187ed /lang/erlang | |
| parent | c763b61ac83c27fcdc45fceb9f1edf02b9fe4234 (diff) | |
| download | freebsd-ports-gnome-5d6e8f934cef0ebdc5faf42ede94779049e5fe5f.tar.gz freebsd-ports-gnome-5d6e8f934cef0ebdc5faf42ede94779049e5fe5f.tar.zst freebsd-ports-gnome-5d6e8f934cef0ebdc5faf42ede94779049e5fe5f.zip | |
Upgrade to version R15B03-1, which contains a few minor improvements
over R15B03:
- Official fix for the ssl:ssl_accept/2 timeout issue.
- Revert erl_crash.dump creation behavior back to R15B02.
Feature safe: yes
Diffstat (limited to 'lang/erlang')
| -rw-r--r-- | lang/erlang/Makefile | 7 | ||||
| -rw-r--r-- | lang/erlang/Makefile.lib | 4 | ||||
| -rw-r--r-- | lang/erlang/distinfo | 12 | ||||
| -rw-r--r-- | lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl | 16 |
4 files changed, 12 insertions, 27 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 70615e19f6a3..e60b914d19b0 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -6,8 +6,7 @@ # PORTNAME= erlang -PORTVERSION= 15.b.03 -PORTREVISION= 1 +PORTVERSION= 15.b.03.1 PORTEPOCH= 2 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ @@ -39,6 +38,8 @@ DOC_DISTFILES= armstrong_thesis_2003.pdf:joe \ mnesia_overview.pdf:publications \ programming_rules.pdf:erlangse +WRKSRC= ${WRKDIR}/otp_src_R15B03 + SUB_FILES= pkg-message SUB_LIST= TOOLS_VSN=${TOOLS_VSN} @@ -59,7 +60,7 @@ DTRACE_DESC= Enable DTrace support (experimental) OPTIONS_DEFAULT=SMP OPENSSL THREADS SCTP KQUEUE -ERL_RELEASE= R${PORTVERSION:S/.//g:U} +ERL_RELEASE= R${PORTVERSION:S/.//g:U:S/1$/-1/} .include <bsd.port.options.mk> diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib index b13f37a67935..5a9f354ff599 100644 --- a/lang/erlang/Makefile.lib +++ b/lang/erlang/Makefile.lib @@ -20,7 +20,7 @@ OTP_LIBS= appmon-2.1.14.1 \ eldap-1.0 \ erl_docgen-0.3.3 \ erl_interface-3.7.9 \ - erts-5.9.3 \ + erts-5.9.3.1 \ et-1.4.4.2 \ eunit-2.2.3 \ gs-1.5.15.1 \ @@ -46,7 +46,7 @@ OTP_LIBS= appmon-2.1.14.1 \ sasl-2.2.1 \ snmp-4.22.1 \ ssh-2.1.2 \ - ssl-5.1.1 \ + ssl-5.1.2 \ stdlib-1.18.3 \ syntax_tools-1.6.9 \ test_server-3.5.3 \ diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index d8c757ec8434..c6cbb2046bcd 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,9 +1,9 @@ -SHA256 (erlang/otp_src_R15B03.tar.gz) = d1ee5dd3833537ad7533f2deaf164936508c55c992c2b930f0c4c4559d40aa12 -SIZE (erlang/otp_src_R15B03.tar.gz) = 76127884 -SHA256 (erlang/otp_doc_man_R15B03.tar.gz) = 0a5a01f8c6050551c1ba0591de42731a6640370e7527fae81cdfe3d3d6af0a6b -SIZE (erlang/otp_doc_man_R15B03.tar.gz) = 1304986 -SHA256 (erlang/otp_doc_html_R15B03.tar.gz) = 00595ba3055a1282a18344467c865a416e05ef6e883c2702eded7ac40fc6c50c -SIZE (erlang/otp_doc_html_R15B03.tar.gz) = 30434193 +SHA256 (erlang/otp_src_R15B03-1.tar.gz) = 4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c +SIZE (erlang/otp_src_R15B03-1.tar.gz) = 76123810 +SHA256 (erlang/otp_doc_man_R15B03-1.tar.gz) = 07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8 +SIZE (erlang/otp_doc_man_R15B03-1.tar.gz) = 1305001 +SHA256 (erlang/otp_doc_html_R15B03-1.tar.gz) = d06f580f11d1303217a5c1cf8d68a98d7e01c535be934dcd430ecdc254f7572e +SIZE (erlang/otp_doc_html_R15B03-1.tar.gz) = 30436303 SHA256 (erlang/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a SIZE (erlang/armstrong_thesis_2003.pdf) = 859249 SHA256 (erlang/bjarnelic.pdf) = 9544d4af5cea324e5c9cf77e670d9561ad61ddc240cdb5c2afecebc0a3d7429b diff --git a/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl b/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl deleted file mode 100644 index a49983ccc101..000000000000 --- a/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- lib/ssl/src/ssl_connection.erl.orig -+++ lib/ssl/src/ssl_connection.erl -@@ -986,6 +986,10 @@ - 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)}; - |