- Update to 17.11

- Add a fix from upstream to make it work with LibreSSL[1]
- Add a bug fix from upstream w.r.t. ejabberd_pix module
- Add a fix for kqueue implementation in 'fs' dependency module
- Remove FreeBSD sed workaround

PR:		224320 [1]
Submitted by:	romain [1]

7 files changed, 98 insertions, 19 deletions

diff --git a/net-im/ejabberd/files/patch-Makefile.in b/net-im/ejabberd/files/patch-Makefile.in
index d51553691661..ea87e95df785 100644
--- a/net-im/ejabberd/files/patch-Makefile.in
+++ b/net-im/ejabberd/files/patch-Makefile.in
@@ -1,4 +1,4 @@
---- Makefile.in.orig	2017-09-28 13:21:11 UTC
+--- Makefile.in.orig	2017-11-20 12:14:44 UTC
 +++ Makefile.in
 @@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@
  LIBDIR =  $(DESTDIR)@libdir@
@@ -9,7 +9,7 @@
  
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -50,10 +50,10 @@ MSGSDIR = $(PRIVDIR)/msgs
+@@ -59,10 +59,10 @@ JSDIR = $(PRIVDIR)/js
  SQLDIR = $(PRIVDIR)/sql
  
  # /var/lib/ejabberd/
@@ -23,7 +23,7 @@
  
  # /var/lib/ejabberd/.erlang.cookie
  COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
-@@ -113,7 +113,7 @@ JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),
+@@ -123,7 +123,7 @@ JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),
  VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
  
  ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
@@ -32,16 +32,7 @@
  MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
  TO_DEST_SINGLE=$(if $(subst XdepsX,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word 3,$(1))X),$(call DEPS_TO_DEST,$(1)),$(call ELIXIR_TO_DEST,$(1))))
  TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
-@@ -123,7 +123,7 @@ FILES_WILDCARD=$(call FILTER_DIRS,$(fore
- 
- ifeq ($(MAKECMDGOALS),copy-files-sub)
- 
--DEPS:=$(sort $(shell $(REBAR) -q list-deps|$(SED) -e '/[a-z0-9_-]+\s/d;s/ .*//'))
-+DEPS:=$(sort $(shell $(REBAR) -q list-deps|$(SED) -rne '/^[a-zA-Z0-9_-]{1,} (TAG|REV)/s/^([^ ]*).*/\1/p'))
- 
- DEPS_FILES=$(call FILES_WILDCARD,$(foreach DEP,$(DEPS),deps/$(DEP)/ebin/*.beam deps/$(DEP)/ebin/*.app deps/$(DEP)/priv/* deps/$(DEP)/priv/lib/* deps/$(DEP)/priv/bin/* deps/$(DEP)/include/*.hrl deps/$(DEP)/COPY* deps/$(DEP)/LICENSE* deps/$(DEP)/lib/*/ebin/*.beam deps/$(DEP)/lib/*/ebin/*.app))
- DEPS_FILES_FILTERED=$(filter-out %/epam deps/elixir/ebin/elixir.app,$(DEPS_FILES))
-@@ -170,9 +170,7 @@ install: all copy-files
+@@ -183,9 +183,7 @@ install: all copy-files
  	#
  	# Configuration files
  	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
@@ -52,7 +43,7 @@
  	$(SED) -e "s*{{rootdir}}*@prefix@*g" \
  		-e "s*{{installuser}}*@INSTALLUSER@*g" \
  		-e "s*{{bindir}}*@bindir@*g" \
-@@ -181,16 +179,15 @@ install: all copy-files
+@@ -194,16 +192,15 @@ install: all copy-files
  		-e "s*{{localstatedir}}*@localstatedir@*g" \
  		-e "s*{{docdir}}*@docdir@*g" \
  		-e "s*{{erl}}*@ERL@*g" \
@@ -73,7 +64,7 @@
  	# Elixir binaries
  	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
  	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
-@@ -225,11 +222,13 @@ install: all copy-files
+@@ -238,11 +235,13 @@ install: all copy-files
  	chmod -R 750 $(LOGDIR)
  	#
  	# Documentation
diff --git a/net-im/ejabberd/files/patch-deps_fast__tls_c__src_fast__tls.c b/net-im/ejabberd/files/patch-deps_fast__tls_c__src_fast__tls.c
new file mode 100644
index 000000000000..a9bd8647a90d
--- /dev/null
+++ b/net-im/ejabberd/files/patch-deps_fast__tls_c__src_fast__tls.c
@@ -0,0 +1,22 @@
+Source: https://github.com/processone/fast_tls/commit/a2b2154d11280becbf3077e62f7b5621d52b54fd
+
+--- deps/fast_tls/c_src/fast_tls.c.orig	2017-12-14 19:39:12 UTC
++++ deps/fast_tls/c_src/fast_tls.c
+@@ -57,7 +57,7 @@ typedef unsigned __int32 uint32_t;
+ #define SSL_OP_NO_TICKET 0
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
+ #define DH_set0_pqg(dh, dh_p, param, dh_g) (dh)->p = dh_p; (dh)->g = dh_g
+ #define our_alloc enif_alloc
+ #define our_realloc enif_realloc
+@@ -347,7 +347,7 @@ static void unload(ErlNifEnv *env, void 
+ 
+     for (i = 0; i < CRYPTO_num_locks(); i++)
+         enif_mutex_destroy(mtx_buf[i]);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
+     OPENSSL_cleanup();
+ #endif
+ }
diff --git a/net-im/ejabberd/files/patch-deps_fs_c__src_bsd_main.c b/net-im/ejabberd/files/patch-deps_fs_c__src_bsd_main.c
new file mode 100644
index 000000000000..009d00ac1ee1
--- /dev/null
+++ b/net-im/ejabberd/files/patch-deps_fs_c__src_bsd_main.c
@@ -0,0 +1,16 @@
+--- deps/fs/c_src/bsd/main.c.orig	2017-12-14 20:07:26 UTC
++++ deps/fs/c_src/bsd/main.c
+@@ -11,13 +11,9 @@ int main(int argc, char *argv[]) {
+     int fd, kq, nev;
+     if ((fd = open(argv[1], O_RDONLY)) == -1) return 1;
+     EV_SET(&change, fd, EVFILT_VNODE , EV_ADD
+-                                     | EV_ENABLE
+-                                     | EV_DISABLE
+                                      | EV_CLEAR
+                                      | EV_DELETE
+                                      | EV_EOF
+-                                     | EV_RECEIPT
+-                                     | EV_DISPATCH
+                                      | EV_ONESHOT,
+                                        NOTE_DELETE
+                                      | NOTE_RENAME
diff --git a/net-im/ejabberd/files/patch-deps_fs_src_sys_kqueue.erl b/net-im/ejabberd/files/patch-deps_fs_src_sys_kqueue.erl
new file mode 100644
index 000000000000..575b40d808cb
--- /dev/null
+++ b/net-im/ejabberd/files/patch-deps_fs_src_sys_kqueue.erl
@@ -0,0 +1,8 @@
+--- deps/fs/src/sys/kqueue.erl.orig	2017-12-14 20:07:47 UTC
++++ deps/fs/src/sys/kqueue.erl
+@@ -9,4 +9,4 @@ line_to_event(Line) ->
+ find_executable() -> fs:find_executable("kqueue", "deps/fs/priv/kqueue").
+ start_port(Path, Cwd) ->
+     erlang:open_port({spawn_executable, find_executable()},
+-        [stream, exit_status, {line, 16384}, {args, Path}, {cd, Cwd}]).
++        [stream, exit_status, {line, 16384}, {args, [Path]}, {cd, Cwd}]).
diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template
index 0632d8bcff97..e12bed366387 100644
--- a/net-im/ejabberd/files/patch-ejabberdctl.template
+++ b/net-im/ejabberd/files/patch-ejabberdctl.template
@@ -1,6 +1,6 @@
---- ejabberdctl.template.orig	2017-11-16 13:10:22 UTC
+--- ejabberdctl.template.orig	2017-12-14 20:47:43 UTC
 +++ ejabberdctl.template
-@@ -57,8 +57,8 @@ done
+@@ -58,8 +58,8 @@ done
  
  # define ejabberd variables if not already defined from the command line
  : "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"
@@ -11,7 +11,7 @@
  : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"
  : "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}"
  [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
-@@ -78,7 +78,8 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then
+@@ -79,7 +79,8 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then
          ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2"
      fi
  fi
diff --git a/net-im/ejabberd/files/patch-src_ejabberd__pkix.erl b/net-im/ejabberd/files/patch-src_ejabberd__pkix.erl
new file mode 100644
index 000000000000..f87ae1ea1665
--- /dev/null
+++ b/net-im/ejabberd/files/patch-src_ejabberd__pkix.erl
@@ -0,0 +1,40 @@
+Source: https://github.com/processone/ejabberd/commit/e31f6409a657fedde63460ddee9fbd2e5c8a1eb2
+
+--- src/ejabberd_pkix.erl.orig	2017-11-20 12:14:44 UTC
++++ src/ejabberd_pkix.erl
+@@ -273,7 +273,7 @@ get_certfiles_from_config_options(State)
+ 		 undefined ->
+ 		     [];
+ 		 Paths ->
+-		     lists:flatmap(fun filelib:wildcard/1, Paths)
++		     lists:flatmap(fun wildcard/1, Paths)
+ 	     end,
+     Local = lists:flatmap(
+ 	      fun(OptHost) ->
+@@ -527,7 +527,7 @@ certs_dir() ->
+ -spec clean_dir(file:filename_all()) -> ok.
+ clean_dir(Dir) ->
+     ?DEBUG("Cleaning directory ~s", [Dir]),
+-    Files = filelib:wildcard(filename:join(Dir, "*")),
++    Files = wildcard(filename:join(Dir, "*")),
+     lists:foreach(
+       fun(Path) ->
+ 	      case filelib:is_file(Path) of
+@@ -540,7 +540,7 @@ clean_dir(Dir) ->
+ 
+ -spec check_ca_dir() -> ok.
+ check_ca_dir() ->
+-    case filelib:wildcard(filename:join(ca_dir(), "*.0")) of
++    case wildcard(filename:join(ca_dir(), "*.0")) of
+ 	[] ->
+ 	    Hint = "configuring 'ca_path' option might help",
+ 	    case file:list_dir(ca_dir()) of
+@@ -723,3 +723,8 @@ start_fs() ->
+ 		       [Reason]),
+ 	    false
+     end.
++
++wildcard(Path) when is_binary(Path) ->
++    wildcard(binary_to_list(Path));
++wildcard(Path) ->
++    filelib:wildcard(Path).
diff --git a/net-im/ejabberd/files/pkg-install.in b/net-im/ejabberd/files/pkg-install.in
index d764305a9e86..152947441986 100644
--- a/net-im/ejabberd/files/pkg-install.in
+++ b/net-im/ejabberd/files/pkg-install.in
@@ -14,11 +14,13 @@ chown -R %%USERS%%:%%GROUPS%%  %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%POR
 find %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 | xargs -0 chmod %%SHAREMODE%%
 find %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 | xargs -0 chown %%SHAREOWN%%:%%SHAREGRP%%
 
+chmod +x %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fs-2.12.0/priv/kqueue
+
 %%PAM%%chmod 4750 %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/epam-1.0.3/priv/bin/epam \
 %%PAM%%	     %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
 %%PAM%%chown root:%%GROUPS%% %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/epam-1.0.3/priv/bin/epam \
 %%PAM%%	     %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
 
-%%GRAPHICS%%chmod +x %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-1.0.1/priv/bin/eimp
+%%GRAPHICS%%chmod +x %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-1.0.2/priv/bin/eimp
 
 exit 0