Ver. 19.1.1
Signed-off-by: Peter Lemenkov <lemenkov@redhat.com>
This commit is contained in:
parent
ab704de852
commit
bf974e29d1
1
.gitignore
vendored
1
.gitignore
vendored
@ -70,3 +70,4 @@ otp_src_R14A.tar.gz
|
||||
/otp-OTP-19.0.5.tar.gz
|
||||
/otp-OTP-19.0.6.tar.gz
|
||||
/otp-OTP-19.0.7.tar.gz
|
||||
/otp-OTP-19.1.1.tar.gz
|
||||
|
@ -65,7 +65,7 @@
|
||||
|
||||
|
||||
Name: erlang
|
||||
Version: 19.0.7
|
||||
Version: 19.1.1
|
||||
Release: 1%{?dist}
|
||||
Summary: General-purpose programming language and runtime environment
|
||||
|
||||
@ -116,9 +116,6 @@ Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
|
||||
# Fedora specific patch
|
||||
# Do not install erlang sources
|
||||
Patch6: otp-0006-Do-not-install-erlang-sources.patch
|
||||
# Fedora specific patch
|
||||
# Respect -proto_dist switch while connection to EPMD
|
||||
Patch7: otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch
|
||||
# end of autogenerated patch tag list
|
||||
|
||||
BuildRequires: flex
|
||||
@ -929,7 +926,6 @@ Provides support for XML 1.0.
|
||||
%patch4 -p1 -b .Do_not_install_Java_sources
|
||||
%patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n
|
||||
%patch6 -p1 -b .Do_not_install_erlang_sources
|
||||
%patch7 -p1 -b .Respect_proto_dist_switch_while_connection_to_EPMD
|
||||
# end of autogenerated prep patch list
|
||||
|
||||
# FIXME we should come up with a better solution
|
||||
@ -2314,6 +2310,9 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Oct 4 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.1.1-1
|
||||
- Ver. 19.1.1
|
||||
|
||||
* Wed Sep 14 2016 Peter Lemenkov <lemenkov@gmail.com> - 19.0.7-1
|
||||
- Ver. 19.0.7
|
||||
|
||||
|
@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
|
||||
|
||||
diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
|
||||
index 4a447d3..eac5ae5 100644
|
||||
index 2ab9eda..9b8ed35 100644
|
||||
--- a/erts/preloaded/src/Makefile
|
||||
+++ b/erts/preloaded/src/Makefile
|
||||
@@ -88,8 +88,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk
|
||||
@@ -90,8 +90,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk
|
||||
include $(ERL_TOP)/make/otp_release_targets.mk
|
||||
|
||||
release_spec: $(APP_TARGET)
|
||||
@ -213,7 +213,7 @@ index 256f20f..2920c0f 100644
|
||||
$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
|
||||
$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
|
||||
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
|
||||
index 7f61620..cade771 100644
|
||||
index 6bf748a..962d7b7 100644
|
||||
--- a/lib/diameter/src/Makefile
|
||||
+++ b/lib/diameter/src/Makefile
|
||||
@@ -251,11 +251,8 @@ release_spec: opt
|
||||
|
@ -1,47 +0,0 @@
|
||||
From: Peter Lemenkov <lemenkov@gmail.com>
|
||||
Date: Thu, 14 Jul 2016 17:51:16 +0300
|
||||
Subject: [PATCH] Respect -proto_dist switch while connection to EPMD
|
||||
|
||||
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
||||
|
||||
diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
|
||||
index f8ef4a4..79a026a 100644
|
||||
--- a/lib/kernel/src/erl_epmd.erl
|
||||
+++ b/lib/kernel/src/erl_epmd.erl
|
||||
@@ -103,6 +103,10 @@ names(EpmdAddr) ->
|
||||
|
||||
register_node(Name, PortNo) ->
|
||||
register_node(Name, PortNo, inet).
|
||||
+register_node(Name, PortNo, inet_tcp) ->
|
||||
+ register_node(Name, PortNo, inet);
|
||||
+register_node(Name, PortNo, inet6_tcp) ->
|
||||
+ register_node(Name, PortNo, inet6);
|
||||
register_node(Name, PortNo, Family) ->
|
||||
gen_server:call(erl_epmd, {register, Name, PortNo, Family}, infinity).
|
||||
|
||||
diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl
|
||||
index f91d7ef..94bde55 100644
|
||||
--- a/lib/kernel/src/inet_tcp_dist.erl
|
||||
+++ b/lib/kernel/src/inet_tcp_dist.erl
|
||||
@@ -74,7 +74,7 @@ gen_listen(Driver, Name) ->
|
||||
TcpAddress = get_tcp_address(Driver, Socket),
|
||||
{_,Port} = TcpAddress#net_address.address,
|
||||
ErlEpmd = net_kernel:epmd_module(),
|
||||
- case ErlEpmd:register_node(Name, Port) of
|
||||
+ case ErlEpmd:register_node(Name, Port, Driver) of
|
||||
{ok, Creation} ->
|
||||
{ok, {Socket, TcpAddress, Creation}};
|
||||
Error ->
|
||||
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
|
||||
index a920f54..08947f2 100644
|
||||
--- a/lib/ssl/src/ssl_tls_dist_proxy.erl
|
||||
+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl
|
||||
@@ -117,7 +117,7 @@ handle_call({listen, Driver, Name}, _From, State) ->
|
||||
{ok, WorldTcpAddress} = get_tcp_address(World),
|
||||
{_,Port} = WorldTcpAddress#net_address.address,
|
||||
ErlEpmd = net_kernel:epmd_module(),
|
||||
- case ErlEpmd:register_node(Name, Port) of
|
||||
+ case ErlEpmd:register_node(Name, Port, Driver) of
|
||||
{ok, Creation} ->
|
||||
{reply, {ok, {Socket, TcpAddress, Creation}},
|
||||
State#state{listen={Socket, World}}};
|
Loading…
Reference in New Issue
Block a user