Date: Sat, 15 Jul 2017 12:16:25 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445871 - in head/net-im/ejabberd: . files Message-ID: <201707151216.v6FCGPv5035598@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Sat Jul 15 12:16:25 2017 New Revision: 445871 URL: https://svnweb.freebsd.org/changeset/ports/445871 Log: - Import diff from ejabberd repository, commitid: d4cdc3a - Add fix to make ejabberdctl work, when INET_DIST_INTERFACE is defined. Submitted a pull-request upstream. PR: 220627 Modified: head/net-im/ejabberd/Makefile head/net-im/ejabberd/files/patch-ejabberdctl.template Modified: head/net-im/ejabberd/Makefile ============================================================================== --- head/net-im/ejabberd/Makefile Sat Jul 15 11:07:53 2017 (r445870) +++ head/net-im/ejabberd/Makefile Sat Jul 15 12:16:25 2017 (r445871) @@ -2,6 +2,7 @@ PORTNAME= ejabberd PORTVERSION= 17.07 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \ http://distfiles.pirateparty.in/ashish/:deps \ Modified: head/net-im/ejabberd/files/patch-ejabberdctl.template ============================================================================== --- head/net-im/ejabberd/files/patch-ejabberdctl.template Sat Jul 15 11:07:53 2017 (r445870) +++ head/net-im/ejabberd/files/patch-ejabberdctl.template Sat Jul 15 12:16:25 2017 (r445871) @@ -1,4 +1,4 @@ ---- ejabberdctl.template.orig 2017-07-10 09:25:01 UTC +--- ejabberdctl.template.orig 2017-07-15 11:43:57 UTC +++ ejabberdctl.template @@ -49,8 +49,8 @@ done @@ -11,8 +11,22 @@ : ${EJABBERD_CONFIG_PATH:="$ETC_DIR"/ejabberd.yml} : ${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR"/ejabberdctl.cfg} [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH" -@@ -72,7 +72,8 @@ if [ "$INET_DIST_INTERFACE" != "" ] ; th - ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface \"$INET_DIST_INTERFACE2\"" +@@ -62,17 +62,18 @@ done + # define erl parameters + ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS" + if [ "$FIREWALL_WINDOW" != "" ] ; then +- ERLANG_OPTS="$ERLANG_OPTS -kernel " \ +- "inet_dist_listen_min ${FIREWALL_WINDOW%-*} " \ +- "inet_dist_listen_max ${FIREWALL_WINDOW#*-}" ++ ERLANG_OPTS="$ERLANG_OPTS -kernel \ ++ inet_dist_listen_min ${FIREWALL_WINDOW%-*} \ ++ inet_dist_listen_max ${FIREWALL_WINDOW#*-}" + fi + if [ "$INET_DIST_INTERFACE" != "" ] ; then + INET_DIST_INTERFACE2=$("$ERL" -noshell -eval 'case inet:parse_address("'$INET_DIST_INTERFACE'") of {ok,IP} -> io:format("~p",[IP]); _ -> ok end.' -s erlang halt) + if [ "$INET_DIST_INTERFACE2" != "" ] ; then +- ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface \"$INET_DIST_INTERFACE2\"" ++ ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2" fi fi -ERL_LIBS={{libdir}}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707151216.v6FCGPv5035598>