Attachment #189012 for bug #224320

View | Details | Raw Unified | Return to bug 224320
Collapse All | Expand All

Lines 1-5 Link Here

(-)ejabberd/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1510836133	1	TIMESTAMP = 1513284459
2	SHA256 (ejabberd-17.09.tgz) = 6caf64cb472f8ab0f40429e967450555b7e1fec11d84fc5ea5d466381329cf03	2	SHA256 (ejabberd-17.11.tgz) = bd16b33a2f1345e5847fd05b70a5fa992181bac756cd6d5d621de9c18cb76801
3	SIZE (ejabberd-17.09.tgz) = 1759331	3	SIZE (ejabberd-17.11.tgz) = 1878639
4	SHA256 (ejabberd-deps-14.tar.xz) = cb9a55026536083116bc4039f3498ef0509286f9e4d67838104684f2df9d5a6e	4	SHA256 (ejabberd-deps-15.tar.xz) = 8b4d1593d4513bf1738073a60bb5b7ed2e0746b17153bc1506e4b97f2408090e
5	SIZE (ejabberd-deps-14.tar.xz) = 33759676	5	SIZE (ejabberd-deps-15.tar.xz) = 33820568




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
 }




--- 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

Line 0 Link Here

(-)ejabberd/files/patch-deps_fs_src_sys_kqueue.erl (+8 lines)
	1	--- deps/fs/src/sys/kqueue.erl.orig 2017-12-14 20:07:47 UTC
	2	+++ deps/fs/src/sys/kqueue.erl
	3	@@ -9,4 +9,4 @@ line_to_event(Line) ->
	4	find_executable() -> fs:find_executable("kqueue", "deps/fs/priv/kqueue").
	5	start_port(Path, Cwd) ->
	6	erlang:open_port({spawn_executable, find_executable()},
	7	- [stream, exit_status, {line, 16384}, {args, Path}, {cd, Cwd}]).
	8	+ [stream, exit_status, {line, 16384}, {args, [Path]}, {cd, Cwd}]).

Lines 1-6 Link Here

(-)ejabberd/files/patch-ejabberdctl.template (-3 / +3 lines)
1	--- ejabberdctl.template.orig 2017-11-16 13:10:22 UTC	1	--- ejabberdctl.template.orig 2017-12-14 20:47:43 UTC
2	+++ ejabberdctl.template	2	+++ ejabberdctl.template
3	@@ -57,8 +57,8 @@ done	3	@@ -58,8 +58,8 @@ done
4		4
5	# define ejabberd variables if not already defined from the command line	5	# define ejabberd variables if not already defined from the command line
6	: "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"	6	: "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"
Lines 11-17 Link Here
11	: "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"	11	: "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"
12	: "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}"	12	: "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}"
13	[ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"	13	[ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
14	@@ -78,7 +78,8 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then	14	@@ -79,7 +79,8 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then
15	ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2"	15	ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2"
16	fi	16	fi
17	fi	17	fi




--- Makefile.in.orig	2017-11-20 12:14:44 UTC
+++ Makefile.in
@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@
 LIBDIR =  $(DESTDIR)@libdir@

 
 # /share/doc/ejabberd
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -59,10 +59,10 @@ JSDIR = $(PRIVDIR)/js
 SQLDIR = $(PRIVDIR)/sql
 
 # /var/lib/ejabberd/

 
 # /var/lib/ejabberd/.erlang.cookie
 COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
@@ -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))

 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)))))
@@ -183,9 +183,7 @@ install: all copy-files
 
 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
 	#
 	# Configuration files
 	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)

 	$(SED) -e "s*{{rootdir}}*@prefix@*g" \
 		-e "s*{{installuser}}*@INSTALLUSER@*g" \
 		-e "s*{{bindir}}*@bindir@*g" \
@@ -194,16 +192,15 @@ install: all copy-files
 		-e "s*{{localstatedir}}*@localstatedir@*g" \
 		-e "s*{{docdir}}*@docdir@*g" \
 		-e "s*{{erl}}*@ERL@*g" \

 	# 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
@@ -238,11 +235,13 @@ install: all copy-files
 	chmod -R 750 $(LOGDIR)
 	#
 	# Documentation




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).

Lines 14-24 Link Here

(-)ejabberd/files/pkg-install.in (-1 / +3 lines)
14	find %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 \| xargs -0 chmod %%SHAREMODE%%	14	find %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 \| xargs -0 chmod %%SHAREMODE%%
15	find %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 \| xargs -0 chown %%SHAREOWN%%:%%SHAREGRP%%	15	find %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 \| xargs -0 chown %%SHAREOWN%%:%%SHAREGRP%%
16		16
		17	chmod +x %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fs-2.12.0/priv/kqueue
		18
17	%%PAM%%chmod 4750 %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/epam-1.0.3/priv/bin/epam \	19	%%PAM%%chmod 4750 %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/epam-1.0.3/priv/bin/epam \
18	%%PAM%% %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam	20	%%PAM%% %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
19	%%PAM%%chown root:%%GROUPS%% %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/epam-1.0.3/priv/bin/epam \	21	%%PAM%%chown root:%%GROUPS%% %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/epam-1.0.3/priv/bin/epam \
20	%%PAM%% %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam	22	%%PAM%% %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
21		23
22	%%GRAPHICS%%chmod +x %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-1.0.1/priv/bin/eimp	24	%%GRAPHICS%%chmod +x %%PREFIX%%/%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-1.0.2/priv/bin/eimp
23		25
24	exit 0	26	exit 0




# $FreeBSD: head/net-im/ejabberd/Makefile 450493 2017-09-24 15:43:34Z ashish $

PORTNAME=	ejabberd
PORTVERSION=	17.11
PORTREVISION=	1
CATEGORIES=	net-im
MASTER_SITES=	http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \
		http://distfiles.pirateparty.in/ashish/:deps \
		LOCAL/ashish:deps
DISTFILES+=	${DISTNAME}.tgz:p1 ejabberd-deps-15.tar.xz:deps

MAINTAINER=	ashish@FreeBSD.org
COMMENT=	Free and Open Source distributed fault-tolerant Jabber server

	@${MKDIR} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}

post-install-GRAPHICS-on:
	@${CHMOD} +x ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/eimp-1.0.2/priv/bin/eimp

post-install-PAM-on:
	@${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd \

	@${INSTALL} -m 0755 ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/priv/bin/captcha.sh \
		${STAGEDIR}${DATADIR}
	@${REINPLACE_CMD} -r -e '/captcha_cmd:/s,"[^"]+","${DATADIR}/captcha.sh",' ${STAGEDIR}${ETCDIR}/${PORTNAME}.yml.example
	@${CHMOD} +x ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/fs-2.12.0/priv/kqueue

.include <bsd.port.post.mk>

Return to bug 224320

Line 0 Link Here

(-)ejabberd/files/patch-deps_fast__tls_c__src_fast__tls.c (+22 lines)
	1	Source: https://github.com/processone/fast_tls/commit/a2b2154d11280becbf3077e62f7b5621d52b54fd
	2
	3	--- deps/fast_tls/c_src/fast_tls.c.orig 2017-12-14 19:39:12 UTC
	4	+++ deps/fast_tls/c_src/fast_tls.c
	5	@@ -57,7 +57,7 @@ typedef unsigned __int32 uint32_t;
	6	#define SSL_OP_NO_TICKET 0
	7	#endif
	8
	9	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
	10	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined LIBRESSL_VERSION_NUMBER
	11	#define DH_set0_pqg(dh, dh_p, param, dh_g) (dh)->p = dh_p; (dh)->g = dh_g
	12	#define our_alloc enif_alloc
	13	#define our_realloc enif_realloc
	14	@@ -347,7 +347,7 @@ static void unload(ErlNifEnv *env, void
	15
	16	for (i = 0; i < CRYPTO_num_locks(); i++)
	17	enif_mutex_destroy(mtx_buf[i]);
	18	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
	19	+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER
	20	OPENSSL_cleanup();
	21	#endif
	22	}

Line 0 Link Here

(-)ejabberd/files/patch-deps_fs_c__src_bsd_main.c (+16 lines)
	1	--- deps/fs/c_src/bsd/main.c.orig 2017-12-14 20:07:26 UTC
	2	+++ deps/fs/c_src/bsd/main.c
	3	@@ -11,13 +11,9 @@ int main(int argc, char *argv[]) {
	4	int fd, kq, nev;
	5	if ((fd = open(argv[1], O_RDONLY)) == -1) return 1;
	6	EV_SET(&change, fd, EVFILT_VNODE , EV_ADD
	7	- \| EV_ENABLE
	8	- \| EV_DISABLE
	9	\| EV_CLEAR
	10	\| EV_DELETE
	11	\| EV_EOF
	12	- \| EV_RECEIPT
	13	- \| EV_DISPATCH
	14	\| EV_ONESHOT,
	15	NOTE_DELETE
	16	\| NOTE_RENAME

Lines 1-4 Link Here

(-)ejabberd/files/patch-Makefile.in (-15 / +6 lines)
1	--- Makefile.in.orig 2017-09-28 13:21:11 UTC	1	--- Makefile.in.orig 2017-11-20 12:14:44 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@	3	@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@
4	LIBDIR = $(DESTDIR)@libdir@	4	LIBDIR = $(DESTDIR)@libdir@
Lines 9-15 Link Here
9		9
10	# /share/doc/ejabberd	10	# /share/doc/ejabberd
11	PACKAGE_TARNAME = @PACKAGE_TARNAME@	11	PACKAGE_TARNAME = @PACKAGE_TARNAME@
12	@@ -50,10 +50,10 @@ MSGSDIR = $(PRIVDIR)/msgs	12	@@ -59,10 +59,10 @@ JSDIR = $(PRIVDIR)/js
13	SQLDIR = $(PRIVDIR)/sql	13	SQLDIR = $(PRIVDIR)/sql
14		14
15	# /var/lib/ejabberd/	15	# /var/lib/ejabberd/
Lines 23-29 Link Here
23		23
24	# /var/lib/ejabberd/.erlang.cookie	24	# /var/lib/ejabberd/.erlang.cookie
25	COOKIEFILE = $(SPOOLDIR)/.erlang.cookie	25	COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
26	@@ -113,7 +113,7 @@ JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),	26	@@ -123,7 +123,7 @@ JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),
27	VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))	27	VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
28		28
29	ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))	29	ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
Lines 32-47 Link Here
32	MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)	32	MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
33	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))))	33	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))))
34	TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))	34	TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
35	@@ -123,7 +123,7 @@ FILES_WILDCARD=$(call FILTER_DIRS,$(fore	35	@@ -183,9 +183,7 @@ install: all copy-files
36
37	ifeq ($(MAKECMDGOALS),copy-files-sub)
38
39	-DEPS:=$(sort $(shell $(REBAR) -q list-deps\|$(SED) -e '/[a-z0-9_-]+\s/d;s/ .*//'))
40	+DEPS:=$(sort $(shell $(REBAR) -q list-deps\|$(SED) -rne '/^[a-zA-Z0-9_-]{1,} (TAG\|REV)/s/^([^ ])./\1/p'))
41
42	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))
43	DEPS_FILES_FILTERED=$(filter-out %/epam deps/elixir/ebin/elixir.app,$(DEPS_FILES))
44	@@ -170,9 +170,7 @@ install: all copy-files
45	#	36	#
46	# Configuration files	37	# Configuration files
47	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)	38	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
Lines 52-58 Link Here
52	$(SED) -e "s{{rootdir}}@prefix@*g" \	43	$(SED) -e "s{{rootdir}}@prefix@*g" \
53	-e "s{{installuser}}@INSTALLUSER@*g" \	44	-e "s{{installuser}}@INSTALLUSER@*g" \
54	-e "s{{bindir}}@bindir@*g" \	45	-e "s{{bindir}}@bindir@*g" \
55	@@ -181,16 +179,15 @@ install: all copy-files	46	@@ -194,16 +192,15 @@ install: all copy-files
56	-e "s{{localstatedir}}@localstatedir@*g" \	47	-e "s{{localstatedir}}@localstatedir@*g" \
57	-e "s{{docdir}}@docdir@*g" \	48	-e "s{{docdir}}@docdir@*g" \
58	-e "s{{erl}}@ERL@*g" \	49	-e "s{{erl}}@ERL@*g" \
Lines 73-79 Link Here
73	# Elixir binaries	64	# Elixir binaries
74	[ -d $(BINDIR) ] \|\| $(INSTALL) -d -m 755 $(BINDIR)	65	[ -d $(BINDIR) ] \|\| $(INSTALL) -d -m 755 $(BINDIR)
75	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex \|\| true	66	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex \|\| true
76	@@ -225,11 +222,13 @@ install: all copy-files	67	@@ -238,11 +235,13 @@ install: all copy-files
77	chmod -R 750 $(LOGDIR)	68	chmod -R 750 $(LOGDIR)
78	#	69	#
79	# Documentation	70	# Documentation

Line 0 Link Here

(-)ejabberd/files/patch-src_ejabberd__pkix.erl (+40 lines)
	1	Source: https://github.com/processone/ejabberd/commit/e31f6409a657fedde63460ddee9fbd2e5c8a1eb2
	2
	3	--- src/ejabberd_pkix.erl.orig 2017-11-20 12:14:44 UTC
	4	+++ src/ejabberd_pkix.erl
	5	@@ -273,7 +273,7 @@ get_certfiles_from_config_options(State)
	6	undefined ->
	7	[];
	8	Paths ->
	9	- lists:flatmap(fun filelib:wildcard/1, Paths)
	10	+ lists:flatmap(fun wildcard/1, Paths)
	11	end,
	12	Local = lists:flatmap(
	13	fun(OptHost) ->
	14	@@ -527,7 +527,7 @@ certs_dir() ->
	15	-spec clean_dir(file:filename_all()) -> ok.
	16	clean_dir(Dir) ->
	17	?DEBUG("Cleaning directory ~s", [Dir]),
	18	- Files = filelib:wildcard(filename:join(Dir, "*")),
	19	+ Files = wildcard(filename:join(Dir, "*")),
	20	lists:foreach(
	21	fun(Path) ->
	22	case filelib:is_file(Path) of
	23	@@ -540,7 +540,7 @@ clean_dir(Dir) ->
	24
	25	-spec check_ca_dir() -> ok.
	26	check_ca_dir() ->
	27	- case filelib:wildcard(filename:join(ca_dir(), "*.0")) of
	28	+ case wildcard(filename:join(ca_dir(), "*.0")) of
	29	[] ->
	30	Hint = "configuring 'ca_path' option might help",
	31	case file:list_dir(ca_dir()) of
	32	@@ -723,3 +723,8 @@ start_fs() ->
	33	[Reason]),
	34	false
	35	end.
	36	+
	37	+wildcard(Path) when is_binary(Path) ->
	38	+ wildcard(binary_to_list(Path));
	39	+wildcard(Path) ->
	40	+ filelib:wildcard(Path).

Lines 1-13 Link Here

(-)ejabberd/Makefile (-5 / +5 lines)
1	# $FreeBSD: head/net-im/ejabberd/Makefile 454480 2017-11-19 09:05:18Z ashish $	1	# $FreeBSD: head/net-im/ejabberd/Makefile 450493 2017-09-24 15:43:34Z ashish $
2		2
3	PORTNAME= ejabberd	3	PORTNAME= ejabberd
4	PORTVERSION= 17.09	4	PORTVERSION= 17.11
5	PORTREVISION= 1
6	CATEGORIES= net-im	5	CATEGORIES= net-im
7	MASTER_SITES= http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \	6	MASTER_SITES= http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \
8	http://distfiles.pirateparty.in/ashish/:deps \	7	http://distfiles.pirateparty.in/ashish/:deps \
9	LOCAL/ashish:deps	8	LOCAL/ashish:deps
10	DISTFILES+= ${DISTNAME}.tgz:p1 ejabberd-deps-14.tar.xz:deps	9	DISTFILES+= ${DISTNAME}.tgz:p1 ejabberd-deps-15.tar.xz:deps
11		10
12	MAINTAINER= ashish@FreeBSD.org	11	MAINTAINER= ashish@FreeBSD.org
13	COMMENT= Free and Open Source distributed fault-tolerant Jabber server	12	COMMENT= Free and Open Source distributed fault-tolerant Jabber server
Lines 99-105 Link Here
99	@${MKDIR} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}	98	@${MKDIR} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}
100		99
101	post-install-GRAPHICS-on:	100	post-install-GRAPHICS-on:
102	@${CHMOD} +x ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/eimp-1.0.1/priv/bin/eimp	101	@${CHMOD} +x ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/eimp-1.0.2/priv/bin/eimp
103		102
104	post-install-PAM-on:	103	post-install-PAM-on:
105	@${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd \	104	@${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd \
Lines 114-118 Link Here
114	@${INSTALL} -m 0755 ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/priv/bin/captcha.sh \	113	@${INSTALL} -m 0755 ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/priv/bin/captcha.sh \
115	${STAGEDIR}${DATADIR}	114	${STAGEDIR}${DATADIR}
116	@${REINPLACE_CMD} -r -e '/captcha_cmd:/s,"[^"]+","${DATADIR}/captcha.sh",' ${STAGEDIR}${ETCDIR}/${PORTNAME}.yml.example	115	@${REINPLACE_CMD} -r -e '/captcha_cmd:/s,"[^"]+","${DATADIR}/captcha.sh",' ${STAGEDIR}${ETCDIR}/${PORTNAME}.yml.example
		116	@${CHMOD} +x ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/fs-2.12.0/priv/kqueue
117		117
118	.include <bsd.port.post.mk>	118	.include <bsd.port.post.mk>

Lines 6-11 Link Here

(-)ejabberd/pkg-plist (-175 / +317 lines)
6	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam	6	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam
7	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam	7	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam
8	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam	8	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam
		9	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/acme_challenge.beam
9	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl.beam	10	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl.beam
10	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_anonymous.beam	11	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_anonymous.beam
11	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_digest.beam	12	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_digest.beam
Lines 15-20 Link Here
15	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.app	16	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.app
16	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam	17	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam
17	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_access_permissions.beam	18	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_access_permissions.beam
		19	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_acme.beam
		20	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_acme_comm.beam
18	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_admin.beam	21	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_admin.beam
19	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_app.beam	22	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_app.beam
20	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth.beam	23	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth.beam
Lines 41-46 Link Here
41	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_http.beam	44	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_http.beam
42	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_http_ws.beam	45	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_http_ws.beam
43	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_idna.beam	46	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_idna.beam
		47	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_iq.beam
44	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_listener.beam	48	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_listener.beam
45	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_local.beam	49	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_local.beam
46	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_logger.beam	50	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_logger.beam
Lines 106-111 Link Here
106	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/misc.beam	110	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/misc.beam
107	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_adhoc.beam	111	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_adhoc.beam
108	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_admin_extra.beam	112	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_admin_extra.beam
		113	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_admin_update_sql.beam
109	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce.beam	114	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce.beam
110	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce_mnesia.beam	115	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce_mnesia.beam
111	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce_riak.beam	116	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce_riak.beam
Lines 187-192 Link Here
187	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push.beam	192	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push.beam
188	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push_keepalive.beam	193	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push_keepalive.beam
189	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push_mnesia.beam	194	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push_mnesia.beam
		195	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push_sql.beam
190	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register.beam	196	%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register.beam