summaryrefslogtreecommitdiffstats
path: root/package/ejabberd/0008-handle-error-case-from-lib_dir.patch
diff options
context:
space:
mode:
authorJohan Oudinet <johan.oudinet@gmail.com>2018-11-26 12:08:07 +0100
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-11-28 22:38:22 +0100
commite1a43490e9ab24a3a249ab1224e236db47c53145 (patch)
tree155645837d4b148da5f70f47c994cdc29acb9343 /package/ejabberd/0008-handle-error-case-from-lib_dir.patch
parent091c950fb068209a2cff450cd56b48c053333208 (diff)
downloadbuildroot-e1a43490e9ab24a3a249ab1224e236db47c53145.tar.gz
buildroot-e1a43490e9ab24a3a249ab1224e236db47c53145.zip
package/ejabberd: bump to version 18.09
This version requires much less patches than the previous one packaged in Buildroot. It is compatible with Erlang OTP 21. There are two remainning patches to: - change the Makefile rules so dependencies are not downloaded/compiled; - fix ejabberd user and load a default file in ejabberdctl script. The patch 0006-fix-install-permissions has been replaced by setting permissions on /etc/ejabberd directory via EJABBERD_PERMISSIONS. The patch 0009-disable-mod_avatar has been removed because eimp is a mandatory dependency since 0f86559d. Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/ejabberd/0008-handle-error-case-from-lib_dir.patch')
-rw-r--r--package/ejabberd/0008-handle-error-case-from-lib_dir.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/package/ejabberd/0008-handle-error-case-from-lib_dir.patch b/package/ejabberd/0008-handle-error-case-from-lib_dir.patch
deleted file mode 100644
index f7931b4edc..0000000000
--- a/package/ejabberd/0008-handle-error-case-from-lib_dir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d0bfcbbfd8a6e7ee6213112e4078b020e4e1d15d Mon Sep 17 00:00:00 2001
-From: Paweł Chmielowski <pchmielowski@process-one.net>
-Date: Wed, 10 Jan 2018 16:34:01 +0100
-Subject: [PATCH] Handle error case from code:lib_dir in ResolveDepPath in
- rebar.config.script
-
-This patch have already been applied in upstream/master.
-
-Signed-off-by: Paweł Chmielowski <pchmielowski@process-one.net>
-
----
- rebar.config.script | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/rebar.config.script b/rebar.config.script
-index 85f918fffd..ba374e5c5f 100644
---- a/rebar.config.script
-+++ b/rebar.config.script
-@@ -233,9 +233,10 @@ ResolveDepPath = case {SystemDeps, IsRebar3} of
- {true, _} ->
- fun("deps/" ++ Rest) ->
- Slash = string:str(Rest, "/"),
-- code:lib_dir(
-- string:sub_string(Rest, 1, Slash -1)) ++
-- string:sub_string(Rest, Slash);
-+ case code:lib_dir(string:sub_string(Rest, 1, Slash -1)) of
-+ {error, _} -> Rest;
-+ V -> V ++ string:sub_string(Rest, Slash)
-+ end;
- (Path) ->
- Path
- end;
OpenPOWER on IntegriCloud