diff options
Diffstat (limited to 'chat/ejabberd/patches')
| -rw-r--r-- | chat/ejabberd/patches/patch-ae | 14 | ||||
| -rw-r--r-- | chat/ejabberd/patches/patch-rebar.config | 39 | ||||
| -rw-r--r-- | chat/ejabberd/patches/patch-rebar.config.script | 67 |
3 files changed, 46 insertions, 74 deletions
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae index 9eea8eaca58..53f357d484d 100644 --- a/chat/ejabberd/patches/patch-ae +++ b/chat/ejabberd/patches/patch-ae @@ -1,11 +1,11 @@ -$NetBSD: patch-ae,v 1.12 2015/11/05 12:23:50 fhajny Exp $ +$NetBSD: patch-ae,v 1.13 2016/01/16 19:28:02 fhajny Exp $ - Default locations. - Make it work with NetBSD's flock(1). ---- ejabberdctl.template.orig 2015-10-28 14:53:12.000000000 +0000 +--- ejabberdctl.template.orig 2016-01-12 11:07:58.000000000 +0000 +++ ejabberdctl.template -@@ -72,10 +72,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th +@@ -73,10 +73,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml fi if [ "$LOGS_DIR" = "" ] ; then @@ -18,7 +18,7 @@ $NetBSD: patch-ae,v 1.12 2015/11/05 12:23:50 fhajny Exp $ fi if [ "$EJABBERD_DOC_PATH" = "" ] ; then EJABBERD_DOC_PATH={{docdir}} -@@ -86,7 +86,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then +@@ -87,7 +87,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then fi if [ "{{release}}" != "true" ] ; then if [ "$EJABBERDDIR" = "" ] ; then @@ -27,7 +27,7 @@ $NetBSD: patch-ae,v 1.12 2015/11/05 12:23:50 fhajny Exp $ fi if [ "$EJABBERD_PRIV_PATH" = "" ] ; then EJABBERD_PRIV_PATH=$EJABBERDDIR/priv -@@ -325,7 +325,7 @@ ctl() +@@ -351,7 +351,7 @@ ctl() # using flock if available. Expects a linux-style # flock that can lock a file descriptor. MAXCONNID=100 @@ -36,12 +36,12 @@ $NetBSD: patch-ae,v 1.12 2015/11/05 12:23:50 fhajny Exp $ FLOCK=/usr/bin/flock if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then JOT=/usr/bin/jot -@@ -352,7 +352,7 @@ ctl() +@@ -378,7 +378,7 @@ ctl() CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN" ( exec 8>"$CTL_LOCKFILE" - if flock --nb 8; then + if flock -x -n 8; then - ctlexec $CTL_CONN $COMMAND + ctlexec $CTL_CONN "$@" ssresult=$? # segregate from possible flock exit(1) diff --git a/chat/ejabberd/patches/patch-rebar.config b/chat/ejabberd/patches/patch-rebar.config new file mode 100644 index 00000000000..b306361f124 --- /dev/null +++ b/chat/ejabberd/patches/patch-rebar.config @@ -0,0 +1,39 @@ +$NetBSD: patch-rebar.config,v 1.1 2016/01/16 19:28:02 fhajny Exp $ + +Deps are handled by pkgsrc. + +--- rebar.config.orig 2016-01-12 11:07:58.000000000 +0000 ++++ rebar.config +@@ -7,32 +7,6 @@ + %%% Created : 1 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net> + %%%------------------------------------------------------------------- + +-{deps, [{if_var_true, lager, {lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}}}, +- {if_var_false, lager, {p1_logger, ".*", {git, "https://github.com/processone/p1_logger", {tag, "1.0.0"}}}}, +- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.2"}}}, +- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.1"}}}, +- {p1_tls, ".*", {git, "https://github.com/processone/tls", {tag, "1.0.0"}}}, +- {p1_stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.0"}}}, +- {p1_xml, ".*", {git, "https://github.com/processone/xml", {tag, "1.1.1"}}}, +- {p1_stun, ".*", {git, "https://github.com/processone/stun", "0.9.0"}}, +- {esip, ".*", {git, "https://github.com/processone/p1_sip", "1.0.0"}}, +- {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", {tag, "1.0.0"}}}, +- {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.5"}}}, +- {oauth2, ".*", {git, "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"}}, +- {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc", {tag, "1.15"}}}, +- {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/mysql", {tag, "1.0.0"}}}}, +- {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", {tag, "1.0.0"}}}}, +- {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/alexeyr/erlang-sqlite3", "cbc3505f7a131254265d3ef56191b2581b8cc172"}}}, +- {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam", {tag, "1.0.0"}}}}, +- {if_var_true, zlib, {p1_zlib, ".*", {git, "https://github.com/processone/zlib", {tag, "1.0.0"}}}}, +- {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang", "908a24fda4a46776a5135db60ca071e3d783f9f6"}}}, % for riak_pb-2.1.0.7 +- {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", "527722d12d0433b837cdb92a60900c2cb5df8942"}}}, +- {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, "v1.1.0"}}}}, +- {if_var_true, elixir, {rebar_elixir_plugin, ".*", {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}, +- {if_var_true, iconv, {p1_iconv, ".*", {git, "https://github.com/processone/eiconv", {tag, "0.9.0"}}}}, +- {if_var_true, tools, {meck, "0.8.2", {git, "https://github.com/eproxus/meck", {tag, "0.8.2"}}}}, +- {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis", {tag, "v1.0.8"}}}}]}. +- + {if_var_true, latest_deps, + {floating_deps, [p1_logger, + cache_tab, diff --git a/chat/ejabberd/patches/patch-rebar.config.script b/chat/ejabberd/patches/patch-rebar.config.script deleted file mode 100644 index b4479c2c503..00000000000 --- a/chat/ejabberd/patches/patch-rebar.config.script +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-rebar.config.script,v 1.1 2015/11/05 12:23:50 fhajny Exp $ - -Skip dependencies, handled by pkgsrc now. - ---- rebar.config.script.orig 2015-10-28 14:53:12.000000000 +0000 -+++ rebar.config.script -@@ -54,17 +54,7 @@ SrcDirs = lists:foldl( - Acc - end, [], Cfg), - --Deps = [{p1_cache_tab, ".*", {git, "https://github.com/processone/cache_tab", "f7ea12b0ba962a3d2f9a406d2954cf7de4e27230"}}, -- {p1_tls, ".*", {git, "https://github.com/processone/tls", "e56321afd974e9da33da913cd31beebc8e73e75f"}}, -- {p1_stringprep, ".*", {git, "https://github.com/processone/stringprep", "3c640237a3a7831dc39de6a6d329d3a9af25c579"}}, -- {p1_xml, ".*", {git, "https://github.com/processone/xml", "1c8b016b0ac7986efb823baf1682a43565449e65"}}, -- {esip, ".*", {git, "https://github.com/processone/p1_sip", "d662d3fe7f6288b444ea321d854de0bd6d40e022"}}, -- {p1_stun, ".*", {git, "https://github.com/processone/stun", "061bdae484268cbf0457ad4797e74b8516df3ad1"}}, -- {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", "79f756ba73a235c4d3836ec07b5f7f2b55f49638"}}, -- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", "d7800881e6702723ce58b7646b60c9e4cd25d563"}}, -- {jiffy, ".*", {git, "https://github.com/davisp/jiffy", "cfc61a2e952dc3182e0f9b1473467563699992e2"}}, -- {oauth2, ".*", {git, "https://github.com/prefiks/oauth2.git", "e6da9912e5d8f658e7e868f41a102d085bdbef59"}}, -- {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc.git", "42e6e96a0fe7106830274feed915125feb1056f3"}}], -+Deps = [], - - CFLags = proplists:get_value(cflags, Cfg, ""), - CPPFLags = proplists:get_value(cppflags, Cfg, ""), -@@ -93,32 +83,7 @@ PostHooks = [ConfigureCmd("p1_tls", ""), - ConfigureCmd("p1_xml", XMLFlags)], - - CfgDeps = lists:flatmap( -- fun({mysql, true}) -> -- [{p1_mysql, ".*", {git, "https://github.com/processone/mysql", "dfa87da95f8fdb92e270741c2a53f796b682f918"}}]; -- ({pgsql, true}) -> -- [{p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", "e72c03c60bfcb56bbb5d259342021d9cb3581dac"}}]; -- ({sqlite, true}) -> -- [{sqlite3, ".*", {git, "https://github.com/alexeyr/erlang-sqlite3", "8350dc603804c503f99c92bfd2eab1dd6885758e"}}]; -- ({pam, true}) -> -- [{p1_pam, ".*", {git, "https://github.com/processone/epam", "d3ce290b7da75d780a03e86e7a8198a80e9826a6"}}]; -- ({zlib, true}) -> -- [{p1_zlib, ".*", {git, "https://github.com/processone/zlib", "e3d4222b7aae616d7ef2e7e2fa0bbf451516c602"}}]; -- ({riak, true}) -> -- [{riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", {tag, "1.4.2"}}}]; -- ({elixir, true}) -> -- [{rebar_elixir_plugin, ".*", {git, "https://github.com/yrashk/rebar_elixir_plugin", "7058379b7c7e017555647f6b9cecfd87cd50f884"}}, -- {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", "1d9548fd285d243721b7eba71912bde2ffd1f6c3"}}]; -- ({iconv, true}) -> -- [{p1_iconv, ".*", {git, "https://github.com/processone/eiconv", "8b7542b1aaf0a851f335e464956956985af6d9a2"}}]; -- ({lager, true}) -> -- [{lager, ".*", {git, "https://github.com/basho/lager", "4d2ec8c701e1fa2d386f92f2b83b23faf8608ac3"}}]; -- ({lager, false}) -> -- [{p1_logger, ".*", {git, "https://github.com/processone/p1_logger", "3e19507fd5606a73694917158767ecb3f5704e3f"}}]; -- ({tools, true}) -> -- [{meck, "0.*", {git, "https://github.com/eproxus/meck", "0845277398b8326f9dddddd9fc3cf73467ba6877"}}]; -- ({redis, true}) -> -- [{eredis, ".*", {git, "https://github.com/wooga/eredis", "bf12ecb30253c84a2331f4f0d93fd68856fcb9f4"}}]; -- (_) -> -+ fun(_) -> - [] - end, Cfg), - -@@ -193,7 +158,6 @@ Config = [{erl_opts, Macros ++ HiPE ++ D - {xref_queries, - [{"(XC - UC) || (XU - X - B - " - ++ string:join(CfgXrefs, " - ") ++ ")", []}]}, -- {post_hooks, PostHooks ++ CfgPostHooks}, - {deps, AllDeps}] ++ ElixirConfig, - %%io:format("ejabberd configuration:~n ~p~n", [Config]), - Config. |