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 (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,122 +1,123 @@ @@ -1,122 +1,123 @@
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
17DEPENDS+= erlang-eimp>=1.0.18:../../graphics/erlang-eimp 18DEPENDS+= erlang-eimp>=1.0.18:../../graphics/erlang-eimp
18DEPENDS+= erlang-esip>=1.0.39:../../net/erlang-esip 19DEPENDS+= erlang-esip>=1.0.39:../../net/erlang-esip
19DEPENDS+= erlang-ezlib>=1.0.9:../../devel/erlang-ezlib 20DEPENDS+= erlang-ezlib>=1.0.9:../../devel/erlang-ezlib
20DEPENDS+= erlang-fast_tls>=1.1.10:../../security/erlang-fast_tls 21DEPENDS+= erlang-fast_tls>=1.1.10:../../security/erlang-fast_tls
21DEPENDS+= erlang-fast_xml>=1.1.45:../../textproc/erlang-fast_xml 22DEPENDS+= erlang-fast_xml>=1.1.45:../../textproc/erlang-fast_xml
22DEPENDS+= erlang-fast_yaml>=1.0.29:../../textproc/erlang-fast_yaml 23DEPENDS+= erlang-fast_yaml>=1.0.29:../../textproc/erlang-fast_yaml
23DEPENDS+= erlang-jiffy>=1.0.5:../../textproc/erlang-jiffy 24DEPENDS+= erlang-jiffy>=1.0.5:../../textproc/erlang-jiffy
24DEPENDS+= erlang-jose>=1.9.0:../../security/erlang-jose 25DEPENDS+= erlang-jose>=1.9.0:../../security/erlang-jose
25DEPENDS+= erlang-lager>=3.6.10.:../../sysutils/erlang-lager 26DEPENDS+= erlang-lager>=3.6.10.:../../sysutils/erlang-lager
26DEPENDS+= erlang-luerl>=0.3:../../lang/erlang-luerl 27DEPENDS+= erlang-luerl>=0.3:../../lang/erlang-luerl
27DEPENDS+= erlang-mqtree>=1.0.11:../../devel/erlang-mqtree 28DEPENDS+= erlang-mqtree>=1.0.11:../../devel/erlang-mqtree
28DEPENDS+= erlang-p1_acme>=1.0.10:../../security/erlang-p1_acme 29DEPENDS+= erlang-p1_acme>=1.0.10:../../security/erlang-p1_acme
29DEPENDS+= erlang-p1_mysql>=1.0.6:../../databases/erlang-p1_mysql 30DEPENDS+= erlang-p1_mysql>=1.0.6:../../databases/erlang-p1_mysql
30DEPENDS+= erlang-p1_oauth2>=0.6.8:../../security/erlang-p1_oauth2 31DEPENDS+= erlang-p1_oauth2>=0.6.8:../../security/erlang-p1_oauth2
31DEPENDS+= erlang-p1_pgsql>=1.1.6:../../databases/erlang-p1_pgsql 32DEPENDS+= erlang-p1_pgsql>=1.1.6:../../databases/erlang-p1_pgsql
32DEPENDS+= erlang-p1_utils>=1.0.21:../../misc/erlang-p1_utils 33DEPENDS+= erlang-p1_utils>=1.0.21:../../misc/erlang-p1_utils
33DEPENDS+= erlang-pkix>=1.0.7:../../security/erlang-pkix 34DEPENDS+= erlang-pkix>=1.0.7:../../security/erlang-pkix
34DEPENDS+= erlang-stringprep>=1.0.24:../../textproc/erlang-stringprep 35DEPENDS+= erlang-stringprep>=1.0.24:../../textproc/erlang-stringprep
35DEPENDS+= erlang-stun>=1.0.40:../../net/erlang-stun 36DEPENDS+= erlang-stun>=1.0.40:../../net/erlang-stun
36DEPENDS+= erlang-xmpp>=1.5.1:../../net/erlang-xmpp 37DEPENDS+= erlang-xmpp>=1.5.1:../../net/erlang-xmpp
37DEPENDS+= erlang-yconf>=1.0.9:../../textproc/erlang-yconf 38DEPENDS+= erlang-yconf>=1.0.9:../../textproc/erlang-yconf
38 39
39GNU_CONFIGURE= yes 40GNU_CONFIGURE= yes
40USE_GCC_RUNTIME= yes 41USE_GCC_RUNTIME= yes
41USE_TOOLS+= bash:run gmake patch 42USE_TOOLS+= bash:run gmake patch
42 43
43CONFIGURE_ARGS+= --disable-debug 44CONFIGURE_ARGS+= --disable-debug
44CONFIGURE_ARGS+= --enable-system-deps 45CONFIGURE_ARGS+= --enable-system-deps
45CONFIGURE_ARGS+= --enable-iconv 46CONFIGURE_ARGS+= --enable-iconv
46CONFIGURE_ARGS+= --enable-mysql 47CONFIGURE_ARGS+= --enable-mysql
47CONFIGURE_ARGS+= --enable-odbc 48CONFIGURE_ARGS+= --enable-odbc
48CONFIGURE_ARGS+= --enable-pam 49CONFIGURE_ARGS+= --enable-pam
49CONFIGURE_ARGS+= --enable-pgsql 50CONFIGURE_ARGS+= --enable-pgsql
50CONFIGURE_ARGS+= --enable-redis 51CONFIGURE_ARGS+= --enable-redis
51CONFIGURE_ARGS+= --enable-sip 52CONFIGURE_ARGS+= --enable-sip
52CONFIGURE_ARGS+= --enable-stun 53CONFIGURE_ARGS+= --enable-stun
53CONFIGURE_ARGS+= --enable-zlib 54CONFIGURE_ARGS+= --enable-zlib
54CONFIGURE_ARGS+= --enable-user=${EJABBERD_USER} 55CONFIGURE_ARGS+= --enable-user=${EJABBERD_USER}
55CONFIGURE_ARGS+= --enable-group=${EJABBERD_GROUP} 56CONFIGURE_ARGS+= --enable-group=${EJABBERD_GROUP}
56CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 57CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
57 58
58MAKE_ENV+= USE_GLOBAL_DEPS=true 59MAKE_ENV+= USE_GLOBAL_DEPS=true
59 60
60RCD_SCRIPTS= ejabberd 61RCD_SCRIPTS= ejabberd
61 62
62BUILD_DEFS+= EJABBERD_USER EJABBERD_GROUP EJABBERD_LOGDIR 63BUILD_DEFS+= EJABBERD_USER EJABBERD_GROUP EJABBERD_LOGDIR
63BUILD_DEFS+= EJABBERD_PIDDIR EJABBERD_DB EJABBERD_TRANSDIR 64BUILD_DEFS+= EJABBERD_PIDDIR EJABBERD_DB EJABBERD_TRANSDIR
64BUILD_DEFS+= VARBASE 65BUILD_DEFS+= VARBASE
65PKG_SYSCONFSUBDIR= ejabberd 66PKG_SYSCONFSUBDIR= ejabberd
66 67
67.include "../../mk/bsd.prefs.mk" 68.include "../../mk/bsd.prefs.mk"
68.include "options.mk" 69.include "options.mk"
69 70
70EJABBERD_USER?= ejabberd 71EJABBERD_USER?= ejabberd
71EJABBERD_GROUP?= ejabberd 72EJABBERD_GROUP?= ejabberd
72EJABBERD_PIDDIR?= ${VARBASE}/run/ejabberd 73EJABBERD_PIDDIR?= ${VARBASE}/run/ejabberd
73EJABBERD_LOGDIR?= ${VARBASE}/log/ejabberd 74EJABBERD_LOGDIR?= ${VARBASE}/log/ejabberd
74EJABBERD_DB?= ${VARBASE}/spool/ejabberd 75EJABBERD_DB?= ${VARBASE}/spool/ejabberd
75 76
76OWN_DIRS_PERMS+= ${EJABBERD_PIDDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 77OWN_DIRS_PERMS+= ${EJABBERD_PIDDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770
77OWN_DIRS_PERMS+= ${EJABBERD_LOGDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 78OWN_DIRS_PERMS+= ${EJABBERD_LOGDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770
78OWN_DIRS_PERMS+= ${EJABBERD_DB} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 79OWN_DIRS_PERMS+= ${EJABBERD_DB} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770
79 80
80FILES_SUBST+= EJABBERD_USER=${EJABBERD_USER} 81FILES_SUBST+= EJABBERD_USER=${EJABBERD_USER}
81FILES_SUBST+= EJABBERD_GROUP=${EJABBERD_GROUP} 82FILES_SUBST+= EJABBERD_GROUP=${EJABBERD_GROUP}
82FILES_SUBST+= EJABBERD_DB=${EJABBERD_DB} 83FILES_SUBST+= EJABBERD_DB=${EJABBERD_DB}
83 84
84PKG_GROUPS+= ${EJABBERD_GROUP} 85PKG_GROUPS+= ${EJABBERD_GROUP}
85PKG_USERS+= ${EJABBERD_USER}:${EJABBERD_GROUP} 86PKG_USERS+= ${EJABBERD_USER}:${EJABBERD_GROUP}
86PKG_GECOS.${EJABBERD_USER}= ejabberd user 87PKG_GECOS.${EJABBERD_USER}= ejabberd user
87PKG_HOME.${EJABBERD_USER}= ${EJABBERD_DB} 88PKG_HOME.${EJABBERD_USER}= ${EJABBERD_DB}
88PKG_SHELL.${EJABBERD_USER}= ${SH} 89PKG_SHELL.${EJABBERD_USER}= ${SH}
89 90
90EGDIR= share/examples/ejabberd 91EGDIR= share/examples/ejabberd
91 92
92INSTALLATION_DIRS+= share/doc/${PKGBASE} ${EGDIR} share/bash-completion.d 93INSTALLATION_DIRS+= share/doc/${PKGBASE} ${EGDIR} share/bash-completion.d
93INSTALLATION_DIRS+= lib/${DISTNAME}/priv/sql 94INSTALLATION_DIRS+= lib/${DISTNAME}/priv/sql
94 95
95CONF_FILES_PERMS= ${EGDIR}/ejabberd.yml ${PKG_SYSCONFDIR}/ejabberd.yml \ 96CONF_FILES_PERMS= ${EGDIR}/ejabberd.yml ${PKG_SYSCONFDIR}/ejabberd.yml \
96 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640 97 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640
97CONF_FILES_PERMS+= ${EGDIR}/ejabberdctl.cfg ${PKG_SYSCONFDIR}/ejabberdctl.cfg \ 98CONF_FILES_PERMS+= ${EGDIR}/ejabberdctl.cfg ${PKG_SYSCONFDIR}/ejabberdctl.cfg \
98 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640 99 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640
99CONF_FILES_PERMS+= ${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \ 100CONF_FILES_PERMS+= ${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \
100 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640 101 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640
101SPECIAL_PERMS+= sbin/ejabberdctl ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0750 102SPECIAL_PERMS+= sbin/ejabberdctl ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0750
102 103
103REPLACE_BASH= ejabberdctl.template tools/captcha.sh 104REPLACE_BASH= ejabberdctl.template tools/captcha.sh
104 105
105SUBST_CLASSES+= paths 106SUBST_CLASSES+= paths
106SUBST_MESSAGE.paths= Localizing paths 107SUBST_MESSAGE.paths= Localizing paths
107SUBST_STAGE.paths= pre-configure 108SUBST_STAGE.paths= pre-configure
108SUBST_FILES.paths= Makefile.in 109SUBST_FILES.paths= Makefile.in
109SUBST_VARS.paths= DISTNAME EJABBERD_DB EJABBERD_LOGDIR EJABBERD_PIDDIR 110SUBST_VARS.paths= DISTNAME EJABBERD_DB EJABBERD_LOGDIR EJABBERD_PIDDIR
110SUBST_VARS.paths+= PKG_SYSCONFDIR PREFIX LOCALBASE 111SUBST_VARS.paths+= PKG_SYSCONFDIR PREFIX LOCALBASE
111 112
112post-extract: 113post-extract:
113 cd ${WRKSRC} && ${MKDIR} deps && ${TOUCH} deps/.got deps/.built 114 cd ${WRKSRC} && ${MKDIR} deps && ${TOUCH} deps/.got deps/.built
114 115
115post-install: 116post-install:
116 ${INSTALL_DATA} ${WRKSRC}/tools/ejabberdctl.bc \ 117 ${INSTALL_DATA} ${WRKSRC}/tools/ejabberdctl.bc \
117 ${DESTDIR}${PREFIX}/share/bash-completion.d/ejabberd 118 ${DESTDIR}${PREFIX}/share/bash-completion.d/ejabberd
118 cd ${WRKSRC}/sql && ${INSTALL_DATA} *.sql \ 119 cd ${WRKSRC}/sql && ${INSTALL_DATA} *.sql \
119 ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/priv/sql 120 ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/priv/sql
120 121
121.include "../../lang/erlang/buildlink3.mk" 122.include "../../lang/erlang/buildlink3.mk"
122.include "../../mk/bsd.pkg.mk" 123.include "../../mk/bsd.pkg.mk"
cvs diff -r1.59 -r1.60 pkgsrc/chat/ejabberd/distinfo (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 (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,37 +1,47 @@ @@ -1,37 +1,47 @@
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 {
25- "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null 35- "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null
26+ "$EPMD" -names 2>/dev/null | grep name >/dev/null || "$EPMD" -kill >/dev/null 36+ "$EPMD" -names 2>/dev/null | grep name >/dev/null || "$EPMD" -kill >/dev/null
27 } 37 }
28  38
29 # make sure node not already running and node name unregistered 39 # make sure node not already running and node name unregistered
30 # if all ok, ensure runtime directory exists and make it current directory 40 # if all ok, ensure runtime directory exists and make it current directory
31 check_start() 41 check_start()
32 { 42 {
33- "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && { 43- "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
34+ "$EPMD" -names 2>/dev/null | grep " ${ERLANG_NODE%@*} " >/dev/null && { 44+ "$EPMD" -names 2>/dev/null | grep " ${ERLANG_NODE%@*} " >/dev/null && {
35 pgrep -f "$ERLANG_NODE" >/dev/null && { 45 pgrep -f "$ERLANG_NODE" >/dev/null && {
36 echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running." 46 echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running."
37 exit 4 47 exit 4