net-im/ejabberd: Update to 22.10

3 files changed, 20 insertions, 13 deletions

diff --git a/net-im/ejabberd/files/patch-Makefile.in b/net-im/ejabberd/files/patch-Makefile.in
index ed43d8c90f92..9ab31b8af83d 100644
--- a/net-im/ejabberd/files/patch-Makefile.in
+++ b/net-im/ejabberd/files/patch-Makefile.in
@@ -1,4 +1,4 @@
---- Makefile.in.orig	2022-05-19 17:55:51 UTC
+--- Makefile.in.orig	2022-10-26 12:02:42 UTC
 +++ Makefile.in
 @@ -22,7 +22,7 @@ SBINDIR = @sbindir@
  LIBDIR =  @libdir@
@@ -18,7 +18,7 @@
  
  # /var/log/ejabberd/
  LOGDIR = @localstatedir@/log/ejabberd
-@@ -198,7 +198,7 @@ DEPIX:=$(words $(subst /, ,$(DEPSDIR)))
+@@ -202,7 +202,7 @@ DEPIX:=$(words $(subst /, ,$(DEPSDIR)))
  LIBIX:=$(shell expr "$(DEPIX)" + 2)
  
  ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
@@ -27,7 +27,7 @@
  MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
  TO_DEST_SINGLE=$(if $(subst X$(DEPSBASE)X,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word $(LIBIX),$(1))X),$(call DEPS_TO_DEST,$(wordlist $(DEPIX),1000,$(1))),$(call ELIXIR_TO_DEST,$(wordlist $(DEPIX),1000,$(1)))))
  TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(DESTDIR)$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
-@@ -305,6 +305,7 @@ ejabberdctl.example: vars.config
+@@ -321,6 +321,7 @@ ejabberdctl.example: vars.config
  		-e "s*{{bindir}}*@bindir@*g" \
  		-e "s*{{libdir}}*@libdir@*g" \
  		-e "s*{{erl}}*@ERL@*g" \
@@ -35,7 +35,7 @@
  		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
  		> ejabberdctl.example
  
-@@ -312,17 +313,13 @@ install: copy-files ejabberdctl.example
+@@ -330,17 +331,13 @@ install: copy-files
  	#
  	# Configuration files
  	$(INSTALL) -d -m 750 $(G_USER) $(DESTDIR)$(ETCDIR)
@@ -57,7 +57,7 @@
  	# Elixir binaries
  	[ -d $(DESTDIR)$(BINDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
  	[ -f $(DEPSDIR)/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/iex $(DESTDIR)$(BINDIR)/iex || true
-@@ -352,12 +349,14 @@ install: copy-files ejabberdctl.example
+@@ -358,12 +355,14 @@ install: copy-files
  	chmod -R 750 $(DESTDIR)$(LOGDIR)
  	#
  	# Documentation
diff --git a/net-im/ejabberd/files/patch-configure.ac b/net-im/ejabberd/files/patch-configure.ac
index 2d5a817941d7..4a9344431c50 100644
--- a/net-im/ejabberd/files/patch-configure.ac
+++ b/net-im/ejabberd/files/patch-configure.ac
@@ -1,10 +1,10 @@
---- configure.ac.orig	2022-05-06 13:12:22 UTC
+--- configure.ac.orig	2022-10-26 12:02:42 UTC
 +++ configure.ac
 @@ -2,7 +2,7 @@
  # Process this file with autoconf to produce a configure script.
  
  AC_PREREQ(2.59)
--AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 22.05` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
+-AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 22.10` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
 +AC_INIT(ejabberd, %%PORTVERSION%%, [ejabberd@process-one.net], [ejabberd])
  REQUIRE_ERLANG_MIN="8.3 (Erlang/OTP 19.3)"
  REQUIRE_ERLANG_MAX="100.0.0 (No Max)"
diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template
index 04d51a3b1c30..f0923793c58b 100644
--- a/net-im/ejabberd/files/patch-ejabberdctl.template
+++ b/net-im/ejabberd/files/patch-ejabberdctl.template
@@ -1,18 +1,25 @@
---- ejabberdctl.template.orig	2022-05-19 09:10:34 UTC
+--- ejabberdctl.template.orig	2022-10-30 09:41:25 UTC
 +++ ejabberdctl.template
-@@ -58,8 +58,8 @@ done
+@@ -58,7 +58,7 @@ done
  
  # define ejabberd variables if not already defined from the command line
  : "${CONFIG_DIR:="{{config_dir}}"}"
 -: "${LOGS_DIR:="{{logs_dir}}"}"
--: "${SPOOL_DIR:="{{spool_dir}}"}"
 +: ${LOGS_DIR:=/var/log/ejabberd}
-+: ${SPOOL_DIR:=/var/spool/ejabberd}
  : "${EJABBERD_CONFIG_PATH:="$CONFIG_DIR/ejabberd.yml"}"
  : "${EJABBERDCTL_CONFIG_PATH:="$CONFIG_DIR/ejabberdctl.cfg"}"
  # Allows passing extra Erlang command-line arguments in vm.args file
-@@ -83,7 +83,8 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then
- fi
+@@ -67,7 +67,7 @@ done
+ [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
+ [ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG"
+ [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s"
+-: "${SPOOL_DIR:="{{spool_dir}}"}"
++: ${SPOOL_DIR:=/var/spool/ejabberd}
+ : "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}"
+ 
+ # define erl parameters
+@@ -84,7 +84,8 @@ fi
+ [ -n "$ERL_DIST_PORT" ] && ERLANG_OPTS="$ERLANG_OPTS -erl_epmd_port $ERL_DIST_PORT -start_epmd false"
  # if vm.args file exists in config directory, pass it to Erlang VM
  [ -f "$VMARGS" ] && ERLANG_OPTS="$ERLANG_OPTS -args_file $VMARGS"
 -ERL_LIBS='{{libdir}}'