Sat Jan 16 21:19:33 2021 UTC ()
ejabberd: Fix spool directory for ejabberdctl

pkgsrc changes:
---------------
  * The spool directory is set to ${VARBASE}/spool/ejabberd by pkgsrc but
    ejabberdctl used ${VARBASE}/lib/ejabberd
  * Bump revision


(triaxx)
diff -r1.89 -r1.90 pkgsrc/chat/ejabberd/Makefile
diff -r1.59 -r1.60 pkgsrc/chat/ejabberd/distinfo
diff -r1.20 -r1.21 pkgsrc/chat/ejabberd/patches/patch-ae
cvs diff -r1.89 -r1.90 pkgsrc/chat/ejabberd/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/Makefile 2021/01/16 20:24:33 1.89
+++ pkgsrc/chat/ejabberd/Makefile 2021/01/16 21:19:32 1.90
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.89 2021/01/16 20:24:33 triaxx Exp $ 1# $NetBSD: Makefile,v 1.90 2021/01/16 21:19:32 triaxx Exp $
2 2
3DISTNAME= ejabberd-20.12 3DISTNAME= ejabberd-20.12
 4PKGREVISION= 1
4CATEGORIES= chat 5CATEGORIES= chat
5MASTER_SITES= https://www.process-one.net/downloads/downloads-action.php?file=/${PKGVERSION_NOREV}/ 6MASTER_SITES= https://www.process-one.net/downloads/downloads-action.php?file=/${PKGVERSION_NOREV}/
6EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.ejabberd.im/ 10HOMEPAGE= https://www.ejabberd.im/
10COMMENT= Free and Open Source distributed fault-tolerant Jabber server 11COMMENT= Free and Open Source distributed fault-tolerant Jabber server
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13DEPENDS+= erlang-base64url>=1.0.1:../../devel/erlang-base64url 14DEPENDS+= erlang-base64url>=1.0.1:../../devel/erlang-base64url
14DEPENDS+= erlang-cache_tab>=1.0.26:../../devel/erlang-cache_tab 15DEPENDS+= erlang-cache_tab>=1.0.26:../../devel/erlang-cache_tab
15DEPENDS+= erlang-epam>=1.0.10:../../security/erlang-epam 16DEPENDS+= erlang-epam>=1.0.10:../../security/erlang-epam
16DEPENDS+= erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis 17DEPENDS+= erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis
cvs diff -r1.59 -r1.60 pkgsrc/chat/ejabberd/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/distinfo 2021/01/16 20:24:33 1.59
+++ pkgsrc/chat/ejabberd/distinfo 2021/01/16 21:19:32 1.60
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.59 2021/01/16 20:24:33 triaxx Exp $ 1$NetBSD: distinfo,v 1.60 2021/01/16 21:19:32 triaxx Exp $
2 2
3SHA1 (ejabberd-20.12.tgz) = 33851f33a68ce7dd45a28d4f63b40f7cbb8c9dbc 3SHA1 (ejabberd-20.12.tgz) = 33851f33a68ce7dd45a28d4f63b40f7cbb8c9dbc
4RMD160 (ejabberd-20.12.tgz) = 155a461097ac70dfeb603a0c23b7bf948de9aa81 4RMD160 (ejabberd-20.12.tgz) = 155a461097ac70dfeb603a0c23b7bf948de9aa81
5SHA512 (ejabberd-20.12.tgz) = 7e7cb2f6e298db9f85c2f9abb6082ebed7afc42e32b11a3a953b0c4721b0b6ea2924e6d3f78cfb5bdb209ddea2abfb040d310b422f3951b104a5461cec5875a8 5SHA512 (ejabberd-20.12.tgz) = 7e7cb2f6e298db9f85c2f9abb6082ebed7afc42e32b11a3a953b0c4721b0b6ea2924e6d3f78cfb5bdb209ddea2abfb040d310b422f3951b104a5461cec5875a8
6Size (ejabberd-20.12.tgz) = 2030495 bytes 6Size (ejabberd-20.12.tgz) = 2030495 bytes
7SHA1 (patch-aa) = 8a1aac6e3ee13bc5251d4994fc8d1927b876e372 7SHA1 (patch-aa) = 8a1aac6e3ee13bc5251d4994fc8d1927b876e372
8SHA1 (patch-ae) = cec3df9f6f02585c869c96aea1d12bd91e61d523 8SHA1 (patch-ae) = 5e1424f57dfe0d3d7adc4fa4811e9a1322a01f22
9SHA1 (patch-configure) = 2c92f408fa49ae9595173613157d55a585ec1cb3 9SHA1 (patch-configure) = 2c92f408fa49ae9595173613157d55a585ec1cb3
10SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569 10SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
cvs diff -r1.20 -r1.21 pkgsrc/chat/ejabberd/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-ae 2021/01/16 20:24:33 1.20
+++ pkgsrc/chat/ejabberd/patches/patch-ae 2021/01/16 21:19:33 1.21
@@ -1,24 +1,34 @@ @@ -1,24 +1,34 @@
1$NetBSD: patch-ae,v 1.20 2021/01/16 20:24:33 triaxx Exp $ 1$NetBSD: patch-ae,v 1.21 2021/01/16 21:19:33 triaxx Exp $
2 2
3- Default locations. 3- Default locations.
4- Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS 4- Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS
5 and AIX where Erlang relies on $HOME set correctly. Use a portable 5 and AIX where Erlang relies on $HOME set correctly. Use a portable
6 su arg order while at it. 6 su arg order while at it.
7- At least SunOS has not wheel group. 7- At least SunOS has not wheel group.
8- Portable grep calls. 8- Portable grep calls.
 9- Fix spool directory.
9 10
10--- ejabberdctl.template.orig 2020-12-15 14:40:16.000000000 +0000 11--- ejabberdctl.template.orig 2020-12-15 14:40:16.000000000 +0000
11+++ ejabberdctl.template 12+++ ejabberdctl.template
 13@@ -57,7 +57,7 @@ done
 14 # define ejabberd variables if not already defined from the command line
 15 : "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"
 16 : "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}"
 17-: "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}"
 18+: "${SPOOL_DIR:="{{localstatedir}}/spool/ejabberd"}"
 19 : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"
 20 : "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}"
 21 # Allows passing extra Erlang command-line arguments in vm.args file
12@@ -110,7 +110,7 @@ export ERL_LIBS 22@@ -110,7 +110,7 @@ export ERL_LIBS
13 exec_cmd() 23 exec_cmd()
14 { 24 {
15 case $EXEC_CMD in 25 case $EXEC_CMD in
16- as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;; 26- as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
17+ as_install_user) su - "$INSTALLUSER" -c '"$@"' -- "$@" ;; 27+ as_install_user) su - "$INSTALLUSER" -c '"$@"' -- "$@" ;;
18 as_current_user) "$@" ;; 28 as_current_user) "$@" ;;
19 esac 29 esac
20 } 30 }
21@@ -217,14 +217,14 @@ uid() 31@@ -217,14 +217,14 @@ uid()
22 # stop epmd if there is no other running node 32 # stop epmd if there is no other running node
23 stop_epmd() 33 stop_epmd()
24 { 34 {