Index: head/lang/erlang/Makefile =================================================================== --- head/lang/erlang/Makefile (revision 386668) +++ head/lang/erlang/Makefile (revision 386669) @@ -1,272 +1,274 @@ # Created by: ruslan@shevchenko.kiev.ua # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 17.5.3 +PORTVERSION= 17.5.4 PORTEPOCH= 3 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ http://www.erlang.se/doc/:erlangse \ http://www.erlang.se/publications/:publications \ http://www.sics.se/~joe/thesis/:joe \ LOCAL/olgeni:local DISTNAME= otp_src_${ERL_RELEASE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ ${ERLANG_MAN}:erlangorg DIST_SUBDIR= erlang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= olgeni@FreeBSD.org COMMENT= Functional programming language from Ericsson WRKSRC= ${WRKDIR}/otp_src_${ERL_RELEASE} ERLANG_LIB= ${PORTNAME} SUB_FILES= pkg-message SUB_LIST= TOOLS_VSN=${TOOLS_VSN} PLIST_SUB= ERLANG_LIB=${ERLANG_LIB} MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX GCC_DESC= Use current GCC HIPE_DESC= Build native HiPE compiler KQUEUE_DESC= Enable Kernel Poll (kqueue) support SCTP_DESC= Enable SCTP support SMP_DESC= Enable SMP support WX_DESC= Enable WX application GS_DESC= Enable GS application (deprecated) DTRACE_DESC= Enable DTrace support OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS OPTIONS_EXCLUDE_DragonFly= SCTP ERL_RELEASE= 17.5 USES= autoreconf gmake perl5 USE_PERL5= build USE_RC_SUBR= epmd GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib EI_VSN= 3.7.20 +SNMP_VSN= 5.1.2 TOOLS_VSN= 2.7.2 .include .if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${ERLANG_DOCS}:erlangorg \ ${DOC_DISTFILES} DOC_DISTFILES= armstrong_thesis_2003.pdf:joe \ bjarnelic.pdf:publications \ erlang-book-part1.pdf:erlangorg \ master_thesis_patterns.pdf:local \ mnesia_overview.pdf:publications \ programming_rules.pdf:erlangse .endif # See http://wiki.freebsd.org/DTrace to learn how to enable DTrace # on your system. You will need to configure STRIP, WITH_CTF and # CFLAGS in your make.conf before building. # If you run Erlang and get a message resembling "WARNING: number of # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. .if ${OSVERSION} < 1000000 .if ${ARCH} == "amd64" && ${PORT_OPTIONS:MDTRACE} && ! ${PORT_OPTIONS:MGCC} IGNORE= DTRACE support on amd64 requires GCC option .endif .endif .if ${PORT_OPTIONS:MGCC} USE_GCC?= yes .endif .if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--with-dynamic-trace=dtrace .else CONFIGURE_ARGS+=--without-dynamic-trace .endif .if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} .else CONFIGURE_ARGS+=--without-ssl .endif .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes CONFIGURE_ARGS+=--with-javac CONFIGURE_ENV+= ac_cv_prog_JAVAC="${JAVAC}" .else CONFIGURE_ARGS+=--without-javac .endif .if ${PORT_OPTIONS:MHIPE} CONFIGURE_ARGS+=--enable-hipe .else CONFIGURE_ARGS+=--disable-hipe .endif .if ${PORT_OPTIONS:MKQUEUE} CONFIGURE_ARGS+=--enable-kernel-poll .else CONFIGURE_ARGS+=--disable-kernel-poll .endif .if ${PORT_OPTIONS:MGS} USES+= tk:run .endif .if ${PORT_OPTIONS:MWX} USE_WX= 2.8+ WX_COMPS= wx contrib WX_UNICODE= yes CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG} .endif .if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+=--with-odbc LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC .else CONFIGURE_ARGS+=--without-odbc .endif ERLANG_MAN= otp_doc_man_${ERL_RELEASE}.tar.gz ERLANG_DOCS= otp_doc_html_${ERL_RELEASE}.tar.gz .if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+=--enable-threads .else CONFIGURE_ARGS+=--disable-threads .endif .if ${PORT_OPTIONS:MSCTP} CONFIGURE_ARGS+=--enable-sctp .else CONFIGURE_ARGS+=--disable-sctp .endif # enabling --enable-smp-support crashes the OS when # net_kernel:start([node_name, shortnames]) invoked repeatedly # TODO verify if it still applies .if ${PORT_OPTIONS:MSMP} CONFIGURE_ARGS+=--enable-smp-support .else CONFIGURE_ARGS+=--disable-smp-support .endif .if ${ARCH} == i386 MAKE_ARGS+= ARCH=x86 .endif # The man-pages are put (in spite of FreeBSD's port convention) in a private # subdir. This is to avoid cluttering up the man page name space. Also the # Erlang man pages are more of internal documentation using the man format than # actual system man pages. (erl.1 and epmd.1 perhaps being the exception). # Install documentation. (HTML docs need to be in same dir as the # rest, not in share/doc/erlang as it should, because of relative # links in the documentation. post-patch: @${ECHO_CMD} "MANPATH ${PREFIX}/lib/erlang/man" > ${WRKDIR}/erlang.conf pre-configure: .if ${PORT_OPTIONS:MDTRACE} @if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \ ${ECHO_CMD}; \ ${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \ ${ECHO_CMD}; \ exit 1; \ fi .endif .if ! ${PORT_OPTIONS:MWX} echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP .endif post-install: ${INSTALL_DATA} ${WRKDIR}/erlang.conf ${STAGEDIR}${PREFIX}/etc/man.d/erlang.conf ${LN} -sf ../lib/${ERLANG_LIB}/lib/erl_interface-${EI_VSN}/bin/erl_call ${STAGEDIR}${PREFIX}/bin/erl_call for SECTION in 1 3 4 6 7; do \ ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \ "man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \ done ${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat? .if ${PORT_OPTIONS:MDOCS} ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-6.4/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-6.4.1 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-6.4 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-5.10.6/* \ - ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-5.10.7 + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-5.10.8 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-5.10.6 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-3.2/* \ - ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-3.2.2 + ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-3.2.3 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-3.2 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.10/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.10.1 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.10 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/diameter-1.9/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/diameter-1.9.1 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/diameter-1.9 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/snmp-5.1.1/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/snmp-5.1.2 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/snmp-5.1.1 ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/test_server-3.8/* \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/test_server-3.8.1 ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/test_server-3.8 ${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/ @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${DOC_DISTFILES} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$(expr ${FILE} : '\([^:]*\)') ${STAGEDIR}/${DOCSDIR} .endfor .endif - .if ! ${PORT_OPTIONS:MGS} ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-* .endif .if ! ${PORT_OPTIONS:MJAVA} ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* .endif .if ! ${PORT_OPTIONS:MODBC} ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* .endif .if ! ${PORT_OPTIONS:MOPENSSL} ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* .endif .if ! ${PORT_OPTIONS:MWX} ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* .endif + + ${LN} -s ../lib/erlang/lib/snmp-${SNMP_VSN}/bin/snmpc ${STAGEDIR}${PREFIX}/bin/snmpc @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type d -empty \ | ${SORT} \ | ${SED} -e 's#^#@dir #g' \ >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ | ${SORT} \ >> ${TMPPLIST} .include Index: head/lang/erlang/files/patch-otp-17.5.4 =================================================================== --- head/lang/erlang/files/patch-otp-17.5.4 (nonexistent) +++ head/lang/erlang/files/patch-otp-17.5.4 (revision 386669) @@ -0,0 +1,306 @@ +diff --git OTP_VERSION OTP_VERSION +index f32d20d..64b493c 100644 +--- OTP_VERSION ++++ OTP_VERSION +@@ -1 +1 @@ +-17.5.3 ++17.5.4 +diff --git lib/inets/doc/src/notes.xml lib/inets/doc/src/notes.xml +index 12bbc2b..bae8e32 100644 +--- lib/inets/doc/src/notes.xml ++++ lib/inets/doc/src/notes.xml +@@ -32,7 +32,22 @@ + notes.xml + + +-
Inets 5.10.7 ++
Inets 5.10.8 ++ ++
Fixed Bugs and Malfunctions ++ ++ ++

++ Reject messages with a Content-Length less than 0

++

++ Own Id: OTP-12739 Aux Id: seq12860

++ ++ ++
++ ++
++ ++
Inets 5.10.7 + +
Improvements and New Features + +diff --git lib/inets/src/http_server/httpd_request.erl lib/inets/src/http_server/httpd_request.erl +index 6985065..3ff0761 100644 +--- lib/inets/src/http_server/httpd_request.erl ++++ lib/inets/src/http_server/httpd_request.erl +@@ -417,8 +417,12 @@ check_header({"content-length", Value}, Maxsizes) -> + case length(Value) =< MaxLen of + true -> + try +- _ = list_to_integer(Value), +- ok ++ list_to_integer(Value) ++ of ++ I when I>= 0 -> ++ ok; ++ _ -> ++ {error, {size_error, Max, 411, "negative content-length"}} + catch _:_ -> + {error, {size_error, Max, 411, "content-length not an integer"}} + end; +diff --git lib/inets/vsn.mk lib/inets/vsn.mk +index e9ecb26..ecb84e4 100644 +--- lib/inets/vsn.mk ++++ lib/inets/vsn.mk +@@ -18,6 +18,6 @@ + # %CopyrightEnd% + + APPLICATION = inets +-INETS_VSN = 5.10.7 ++INETS_VSN = 5.10.8 + PRE_VSN = + APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" +diff --git lib/ssh/doc/src/notes.xml lib/ssh/doc/src/notes.xml +index 41885c6..579a3ae 100644 +--- lib/ssh/doc/src/notes.xml ++++ lib/ssh/doc/src/notes.xml +@@ -29,6 +29,25 @@ + notes.xml + + ++
Ssh 3.2.3 ++ ++
Fixed Bugs and Malfunctions ++ ++ ++

++ A new option for handling the SSH_MSG_DEBUG message's ++ printouts. A fun could be given in the options that will ++ be called whenever the SSH_MSG_DEBUG message arrives. ++ This enables the user to format the printout or just ++ discard it.

++

++ Own Id: OTP-12738 Aux Id: seq12860

++ ++ ++
++ ++
++ +
Ssh 3.2.2 + +
Improvements and New Features +diff --git lib/ssh/doc/src/ssh.xml lib/ssh/doc/src/ssh.xml +index 72dafc0..501668c 100644 +--- lib/ssh/doc/src/ssh.xml ++++ lib/ssh/doc/src/ssh.xml +@@ -201,6 +201,14 @@ + + +

Sets a timeout on connection when no channels are active, default is infinity

 ++ ++ _}]]> ++ ++

Provide a fun to implement your own logging of the SSH message SSH_MSG_DEBUG. The last three parameters are from the message, see RFC4253, section 11.3. The ConnectionRef is the reference to the connection on which the message arrived. The return value from the fun is not checked.

++

The default behaviour is ignore the message. ++ To get a printout for each message with AlwaysDisplay = true, use for example {ssh_msg_debug_fun, fun(_,true,M,_)-> io:format("DEBUG: ~p~n", [M]) end}

++ ++ + + + +@@ -383,8 +391,16 @@ + +

Provide a fun to implement your own logging when a user disconnects from the server.

+ +- +- ++ ++ _}]]> ++ ++

Provide a fun to implement your own logging of the SSH message SSH_MSG_DEBUG. The last three parameters are from the message, see RFC4253, section 11.3. The ConnectionRef is the reference to the connection on which the message arrived. The return value from the fun is not checked.

++

The default behaviour is ignore the message. ++ To get a printout for each message with AlwaysDisplay = true, use for example {ssh_msg_debug_fun, fun(_,true,M,_)-> io:format("DEBUG: ~p~n", [M]) end}

++ ++ ++ ++ + + + +diff --git lib/ssh/src/ssh.erl lib/ssh/src/ssh.erl +index d4b02a0..71e7d77 100644 +--- lib/ssh/src/ssh.erl ++++ lib/ssh/src/ssh.erl +@@ -312,6 +312,8 @@ handle_option([{disconnectfun, _} = Opt | Rest], SocketOptions, SshOptions) -> + handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); + handle_option([{failfun, _} = Opt | Rest], SocketOptions, SshOptions) -> + handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); ++handle_option([{ssh_msg_debug_fun, _} = Opt | Rest], SocketOptions, SshOptions) -> ++ handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]); + %%Backwards compatibility should not be underscore between ip and v6 in API + handle_option([{ip_v6_disabled, Value} | Rest], SocketOptions, SshOptions) -> + handle_option(Rest, SocketOptions, [handle_ssh_option({ipv6_disabled, Value}) | SshOptions]); +@@ -417,6 +419,8 @@ handle_ssh_option({disconnectfun , Value} = Opt) when is_function(Value) -> + Opt; + handle_ssh_option({failfun, Value} = Opt) when is_function(Value) -> + Opt; ++handle_ssh_option({ssh_msg_debug_fun, Value} = Opt) when is_function(Value,4) -> ++ Opt; + + handle_ssh_option({ipv6_disabled, Value} = Opt) when is_boolean(Value) -> + throw({error, {{ipv6_disabled, Opt}, option_no_longer_valid_use_inet_option_instead}}); +diff --git lib/ssh/src/ssh_connection_handler.erl lib/ssh/src/ssh_connection_handler.erl +index e1f2e05..0f6162d 100644 +--- lib/ssh/src/ssh_connection_handler.erl ++++ lib/ssh/src/ssh_connection_handler.erl +@@ -580,12 +580,12 @@ handle_event(#ssh_msg_disconnect{description = Desc} = DisconnectMsg, _StateName + handle_event(#ssh_msg_ignore{}, StateName, State) -> + {next_state, StateName, next_packet(State)}; + +-handle_event(#ssh_msg_debug{always_display = true, message = DbgMsg}, +- StateName, State) -> +- io:format("DEBUG: ~p\n", [DbgMsg]), +- {next_state, StateName, next_packet(State)}; +- +-handle_event(#ssh_msg_debug{}, StateName, State) -> ++handle_event(#ssh_msg_debug{always_display = Display, message = DbgMsg, language=Lang}, ++ StateName, #state{opts = Opts} = State) -> ++ F = proplists:get_value(ssh_msg_debug_fun, Opts, ++ fun(_ConnRef, _AlwaysDisplay, _Msg, _Language) -> ok end ++ ), ++ catch F(self(), Display, DbgMsg, Lang), + {next_state, StateName, next_packet(State)}; + + handle_event(#ssh_msg_unimplemented{}, StateName, State) -> +diff --git lib/ssh/test/ssh_basic_SUITE.erl lib/ssh/test/ssh_basic_SUITE.erl +index f5f8991..fa7b426 100644 +--- lib/ssh/test/ssh_basic_SUITE.erl ++++ lib/ssh/test/ssh_basic_SUITE.erl +@@ -52,6 +52,8 @@ all() -> + ssh_connect_arg4_timeout, + packet_size_zero, + ssh_daemon_minimal_remote_max_packet_size_option, ++ ssh_msg_debug_fun_option_client, ++ ssh_msg_debug_fun_option_server, + id_string_no_opt_client, + id_string_own_string_client, + id_string_random_client, +@@ -494,6 +496,94 @@ server_userpassword_option(Config) when is_list(Config) -> + ssh:stop_daemon(Pid). + + %%-------------------------------------------------------------------- ++ssh_msg_debug_fun_option_client() -> ++ [{doc, "validate client that uses the 'ssh_msg_debug_fun' option"}]. ++ssh_msg_debug_fun_option_client(Config) -> ++ PrivDir = ?config(priv_dir, Config), ++ UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth ++ file:make_dir(UserDir), ++ SysDir = ?config(data_dir, Config), ++ ++ {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir}, ++ {user_dir, UserDir}, ++ {password, "morot"}, ++ {failfun, fun ssh_test_lib:failfun/2}]), ++ Parent = self(), ++ DbgFun = fun(ConnRef,Displ,Msg,Lang) -> Parent ! {msg_dbg,{ConnRef,Displ,Msg,Lang}} end, ++ ++ ConnectionRef = ++ ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true}, ++ {user, "foo"}, ++ {password, "morot"}, ++ {user_dir, UserDir}, ++ {user_interaction, false}, ++ {ssh_msg_debug_fun,DbgFun}]), ++ %% Beware, implementation knowledge: ++ gen_fsm:send_all_state_event(ConnectionRef,{ssh_msg_debug,false,<<"Hello">>,<<>>}), ++ receive ++ {msg_dbg,X={ConnectionRef,false,<<"Hello">>,<<>>}} -> ++ ct:log("Got expected dbg msg ~p",[X]), ++ ssh:stop_daemon(Pid); ++ {msg_dbg,X={_,false,<<"Hello">>,<<>>}} -> ++ ct:log("Got dbg msg but bad ConnectionRef (~p expected) ~p",[ConnectionRef,X]), ++ ssh:stop_daemon(Pid), ++ {fail, "Bad ConnectionRef received"}; ++ {msg_dbg,X} -> ++ ct:log("Got bad dbg msg ~p",[X]), ++ ssh:stop_daemon(Pid), ++ {fail,"Bad msg received"} ++ after 1000 -> ++ ssh:stop_daemon(Pid), ++ {fail,timeout} ++ end. ++ ++%%-------------------------------------------------------------------- ++ssh_msg_debug_fun_option_server() -> ++ [{doc, "validate client that uses the 'ssh_msg_debug_fun' option"}]. ++ssh_msg_debug_fun_option_server(Config) -> ++ PrivDir = ?config(priv_dir, Config), ++ UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth ++ file:make_dir(UserDir), ++ SysDir = ?config(data_dir, Config), ++ ++ Parent = self(), ++ DbgFun = fun(ConnRef,Displ,Msg,Lang) -> Parent ! {msg_dbg,{ConnRef,Displ,Msg,Lang}} end, ++ ConnFun = fun(_,_,_) -> Parent ! {connection_pid,self()} end, ++ ++ {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir}, ++ {user_dir, UserDir}, ++ {password, "morot"}, ++ {failfun, fun ssh_test_lib:failfun/2}, ++ {connectfun, ConnFun}, ++ {ssh_msg_debug_fun, DbgFun}]), ++ _ConnectionRef = ++ ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true}, ++ {user, "foo"}, ++ {password, "morot"}, ++ {user_dir, UserDir}, ++ {user_interaction, false}]), ++ receive ++ {connection_pid,Server} -> ++ %% Beware, implementation knowledge: ++ gen_fsm:send_all_state_event(Server,{ssh_msg_debug,false,<<"Hello">>,<<>>}), ++ receive ++ {msg_dbg,X={_,false,<<"Hello">>,<<>>}} -> ++ ct:log("Got expected dbg msg ~p",[X]), ++ ssh:stop_daemon(Pid); ++ {msg_dbg,X} -> ++ ct:log("Got bad dbg msg ~p",[X]), ++ ssh:stop_daemon(Pid), ++ {fail,"Bad msg received"} ++ after 3000 -> ++ ssh:stop_daemon(Pid), ++ {fail,timeout2} ++ end ++ after 3000 -> ++ ssh:stop_daemon(Pid), ++ {fail,timeout1} ++ end. ++ ++%%-------------------------------------------------------------------- + known_hosts() -> + [{doc, "check that known_hosts is updated correctly"}]. + known_hosts(Config) when is_list(Config) -> +diff --git lib/ssh/vsn.mk lib/ssh/vsn.mk +index b2b85a7..40bda0c 100644 +--- lib/ssh/vsn.mk ++++ lib/ssh/vsn.mk +@@ -1,4 +1,4 @@ + #-*-makefile-*- ; force emacs to enter makefile-mode + +-SSH_VSN = 3.2.2 ++SSH_VSN = 3.2.3 + APP_VSN = "ssh-$(SSH_VSN)" +diff --git otp_versions.table otp_versions.table +index 12790c8..fbed2ce 100644 +--- otp_versions.table ++++ otp_versions.table +@@ -1,3 +1,4 @@ ++OTP-17.5.4 : inets-5.10.8 ssh-3.2.3 # asn1-3.0.4 common_test-1.10.1 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3 dialyzer-2.7.4 diameter-1.9.1 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 erts-6.4.1 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 jinterface-1.5.12 kernel-3.2 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16 sasl-2.4.1 snmp-5.1.2 ssl-6.0 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8.1 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 : + OTP-17.5.3 : common_test-1.10.1 diameter-1.9.1 erts-6.4.1 snmp-5.1.2 test_server-3.8.1 # asn1-3.0.4 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3 dialyzer-2.7.4 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 inets-5.10.7 jinterface-1.5.12 kernel-3.2 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16 sasl-2.4.1 ssh-3.2.2 ssl-6.0 stdlib-2.4 syntax_tools-1.6.18 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 : + OTP-17.5.2 : inets-5.10.7 ssh-3.2.2 # asn1-3.0.4 common_test-1.10 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3 dialyzer-2.7.4 diameter-1.9 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 erts-6.4 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 jinterface-1.5.12 kernel-3.2 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16 sasl-2.4.1 snmp-5.1.1 ssl-6.0 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 : + OTP-17.5.1 : ssh-3.2.1 # asn1-3.0.4 common_test-1.10 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3 dialyzer-2.7.4 diameter-1.9 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 erts-6.4 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 inets-5.10.6 jinterface-1.5.12 kernel-3.2 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16 sasl-2.4.1 snmp-5.1.1 ssl-6.0 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 : Property changes on: head/lang/erlang/files/patch-otp-17.5.4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/erlang/pkg-plist =================================================================== --- head/lang/erlang/pkg-plist (revision 386668) +++ head/lang/erlang/pkg-plist (revision 386669) @@ -1,17 +1,18 @@ bin/ct_run bin/dialyzer bin/epmd bin/erl bin/erl_call bin/erlc bin/escript bin/run_erl +bin/snmpc bin/to_erl bin/typer etc/man.d/erlang.conf %%PORTDOCS%%%%DOCSDIR%%/armstrong_thesis_2003.pdf %%PORTDOCS%%%%DOCSDIR%%/bjarnelic.pdf %%PORTDOCS%%%%DOCSDIR%%/erlang-book-part1.pdf %%PORTDOCS%%%%DOCSDIR%%/master_thesis_patterns.pdf %%PORTDOCS%%%%DOCSDIR%%/mnesia_overview.pdf %%PORTDOCS%%%%DOCSDIR%%/programming_rules.pdf Index: head/lang/erlang-java/Makefile =================================================================== --- head/lang/erlang-java/Makefile (revision 386668) +++ head/lang/erlang-java/Makefile (revision 386669) @@ -1,68 +1,68 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 17.5.3 +PORTVERSION= 17.5.4 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg PKGNAMESUFFIX= -java DISTNAME= otp_src_${ERL_RELEASE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg DIST_SUBDIR= erlang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= olgeni@FreeBSD.org COMMENT= Erlang interface for Java WRKSRC= ${WRKDIR}/otp_src_${ERL_RELEASE} PLIST_SUB= APP_VERSION=${APP_VERSION} MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= DOCS ERL_RELEASE= 17.5 USES= autoreconf gmake GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib APP_VERSION= 1.5.12 APP_DIR= ${PREFIX}/lib/erlang/lib/jinterface-${APP_VERSION} .include .if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${ERLANG_DOCS}:erlangorg .endif CONFIGURE_ARGS+=--enable-threads --without-odbc --with-javac CONFIGURE_ENV+= ac_cv_prog_JAVAC="${JAVAC}" USE_JAVA= yes ERLANG_DOCS= otp_doc_html_${ERL_RELEASE}.tar.gz .if ${ARCH} == i386 MAKE_ARGS+= ARCH=x86 .endif do-build: cd ${WRKSRC}/lib/jinterface && ${GMAKE} ERL_TOP=${WRKSRC} TARGET=${CONFIGURE_TARGET} ${RM} -r ${WRKSRC}/lib/jinterface/priv/com do-install: @${MKDIR} ${STAGEDIR}${APP_DIR} @${MKDIR} ${STAGEDIR}${APP_DIR}/priv cd ${WRKSRC}/lib/jinterface && ${COPYTREE_SHARE} ebin ${STAGEDIR}${APP_DIR} cd ${WRKSRC}/lib/jinterface && ${COPYTREE_SHARE} java_src ${STAGEDIR}${APP_DIR} ${INSTALL_DATA} ${WRKSRC}/lib/jinterface/priv/OtpErlang.jar ${STAGEDIR}${APP_DIR}/priv .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/lib/jinterface && ${COPYTREE_SHARE} doc ${STAGEDIR}${APP_DIR} ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${STAGEDIR}${PREFIX}/lib/erlang lib/jinterface-${APP_VERSION} .endif .include Index: head/lang/erlang-wx/Makefile =================================================================== --- head/lang/erlang-wx/Makefile (revision 386668) +++ head/lang/erlang-wx/Makefile (revision 386669) @@ -1,72 +1,72 @@ # $FreeBSD$ PORTNAME= erlang -PORTVERSION= 17.5.3 +PORTVERSION= 17.5.4 CATEGORIES= lang parallel MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg PKGNAMESUFFIX= -wx DISTNAME= otp_src_${ERL_RELEASE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg DIST_SUBDIR= erlang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= olgeni@FreeBSD.org COMMENT= Erlang bindings for wxWindows WRKSRC= ${WRKDIR}/otp_src_${ERL_RELEASE} PLIST_SUB= APP_VERSION=${APP_VERSION} \ CONFIGURE_TARGET=${CONFIGURE_TARGET} MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= DOCS ERL_RELEASE= 17.5 USES= autoreconf gmake GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib APP_VERSION= 1.3.3 APP_DIR= ${PREFIX}/lib/erlang/lib/wx-${APP_VERSION} .include .if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${ERLANG_DOCS}:erlangorg .endif CONFIGURE_ARGS+=--enable-threads --without-odbc --without-javac --with-wx-config=${WX_CONFIG} USE_WX= 2.8+ WX_COMPS= wx contrib WX_UNICODE= yes ERLANG_DOCS= otp_doc_html_${ERL_RELEASE}.tar.gz .if ${ARCH} == i386 MAKE_ARGS+= ARCH=x86 .endif do-build: cd ${WRKSRC}/lib/wx && ${GMAKE} ERL_TOP=${WRKSRC} TARGET=${CONFIGURE_TARGET} ${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/erl_gl.so ${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/wxe_driver.so do-install: @${MKDIR} ${STAGEDIR}${APP_DIR} cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} ebin ${STAGEDIR}${APP_DIR} cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} include ${STAGEDIR}${APP_DIR} cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} priv ${STAGEDIR}${APP_DIR} cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} src ${STAGEDIR}${APP_DIR} .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} doc ${STAGEDIR}${APP_DIR} ${RMDIR} ${STAGEDIR}${APP_DIR}/doc/man3 ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${STAGEDIR}${PREFIX}/lib/erlang lib/wx-${APP_VERSION} .endif .include