Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id B509F1A9217 for ; Sat, 16 Jan 2021 21:19:35 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 8E18685139; Sat, 16 Jan 2021 21:19:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C8D8A85138 for ; Sat, 16 Jan 2021 21:19:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id jL80cenTCt7B for ; Sat, 16 Jan 2021 21:19:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 393EA84CBC for ; Sat, 16 Jan 2021 21:19:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 36993FA9D; Sat, 16 Jan 2021 21:19:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1610831973149180" MIME-Version: 1.0 Date: Sat, 16 Jan 2021 21:19:33 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/chat/ejabberd To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20210116211933.36993FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1610831973149180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Sat Jan 16 21:19:33 UTC 2021 Modified Files: pkgsrc/chat/ejabberd: Makefile distinfo pkgsrc/chat/ejabberd/patches: patch-ae Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 pkgsrc/chat/ejabberd/Makefile cvs rdiff -u -r1.59 -r1.60 pkgsrc/chat/ejabberd/distinfo cvs rdiff -u -r1.20 -r1.21 pkgsrc/chat/ejabberd/patches/patch-ae Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1610831973149180 Content-Disposition: inline Content-Length: 2941 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/ejabberd/Makefile diff -u pkgsrc/chat/ejabberd/Makefile:1.89 pkgsrc/chat/ejabberd/Makefile:1.90 --- pkgsrc/chat/ejabberd/Makefile:1.89 Sat Jan 16 20:24:33 2021 +++ pkgsrc/chat/ejabberd/Makefile Sat Jan 16 21:19:32 2021 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.89 2021/01/16 20:24:33 triaxx Exp $ +# $NetBSD: Makefile,v 1.90 2021/01/16 21:19:32 triaxx Exp $ DISTNAME= ejabberd-20.12 +PKGREVISION= 1 CATEGORIES= chat MASTER_SITES= https://www.process-one.net/downloads/downloads-action.php?file=/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tgz Index: pkgsrc/chat/ejabberd/distinfo diff -u pkgsrc/chat/ejabberd/distinfo:1.59 pkgsrc/chat/ejabberd/distinfo:1.60 --- pkgsrc/chat/ejabberd/distinfo:1.59 Sat Jan 16 20:24:33 2021 +++ pkgsrc/chat/ejabberd/distinfo Sat Jan 16 21:19:32 2021 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.59 2021/01/16 20:24:33 triaxx Exp $ +$NetBSD: distinfo,v 1.60 2021/01/16 21:19:32 triaxx Exp $ SHA1 (ejabberd-20.12.tgz) = 33851f33a68ce7dd45a28d4f63b40f7cbb8c9dbc RMD160 (ejabberd-20.12.tgz) = 155a461097ac70dfeb603a0c23b7bf948de9aa81 SHA512 (ejabberd-20.12.tgz) = 7e7cb2f6e298db9f85c2f9abb6082ebed7afc42e32b11a3a953b0c4721b0b6ea2924e6d3f78cfb5bdb209ddea2abfb040d310b422f3951b104a5461cec5875a8 Size (ejabberd-20.12.tgz) = 2030495 bytes SHA1 (patch-aa) = 8a1aac6e3ee13bc5251d4994fc8d1927b876e372 -SHA1 (patch-ae) = cec3df9f6f02585c869c96aea1d12bd91e61d523 +SHA1 (patch-ae) = 5e1424f57dfe0d3d7adc4fa4811e9a1322a01f22 SHA1 (patch-configure) = 2c92f408fa49ae9595173613157d55a585ec1cb3 SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569 Index: pkgsrc/chat/ejabberd/patches/patch-ae diff -u pkgsrc/chat/ejabberd/patches/patch-ae:1.20 pkgsrc/chat/ejabberd/patches/patch-ae:1.21 --- pkgsrc/chat/ejabberd/patches/patch-ae:1.20 Sat Jan 16 20:24:33 2021 +++ pkgsrc/chat/ejabberd/patches/patch-ae Sat Jan 16 21:19:33 2021 @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.20 2021/01/16 20:24:33 triaxx Exp $ +$NetBSD: patch-ae,v 1.21 2021/01/16 21:19:33 triaxx Exp $ - Default locations. - Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS @@ -6,9 +6,19 @@ $NetBSD: patch-ae,v 1.20 2021/01/16 20:2 su arg order while at it. - At least SunOS has not wheel group. - Portable grep calls. +- Fix spool directory. --- ejabberdctl.template.orig 2020-12-15 14:40:16.000000000 +0000 +++ ejabberdctl.template +@@ -57,7 +57,7 @@ done + # define ejabberd variables if not already defined from the command line + : "${ETC_DIR:="{{sysconfdir}}/ejabberd"}" + : "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}" +-: "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}" ++: "${SPOOL_DIR:="{{localstatedir}}/spool/ejabberd"}" + : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}" + : "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}" + # Allows passing extra Erlang command-line arguments in vm.args file @@ -110,7 +110,7 @@ export ERL_LIBS exec_cmd() { --_----------=_1610831973149180--