Tue Aug 15 19:12:24 2023 UTC ()
Pullup ticket #6789 - requested by gdt
chat/ejabberd: functionality fix

Revisions pulled up:
- chat/ejabberd/Makefile                                        1.99
- chat/ejabberd/distinfo                                        1.69
- chat/ejabberd/patches/patch-aa                                1.18

---
   Module Name:	pkgsrc
   Committed By:	manu
   Date:		Fri Aug 11 13:50:30 UTC 2023

   Modified Files:
   	pkgsrc/chat/ejabberd: Makefile distinfo
   	pkgsrc/chat/ejabberd/patches: patch-aa

   Log Message:
   Fix the paths in ejabberdctl

   - Remove ${DESTDIR}
   - Use config from /usr/pkg/etc/ejabberd and not /usr/pkg/share/examples/ejabberd


(bsiegert)
diff -r1.98 -r1.98.4.1 pkgsrc/chat/ejabberd/Makefile
diff -r1.68 -r1.68.4.1 pkgsrc/chat/ejabberd/distinfo
diff -r1.17 -r1.17.6.1 pkgsrc/chat/ejabberd/patches/patch-aa
cvs diff -r1.98 -r1.98.4.1 pkgsrc/chat/ejabberd/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/Makefile 2023/01/11 22:07:46 1.98
+++ pkgsrc/chat/ejabberd/Makefile 2023/08/15 19:12:24 1.98.4.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.98 2023/01/11 22:07:46 nikita Exp $ 1# $NetBSD: Makefile,v 1.98.4.1 2023/08/15 19:12:24 bsiegert Exp $
2 2
3DISTNAME= ejabberd-22.05 3DISTNAME= ejabberd-22.05
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= chat 5CATEGORIES= chat
6MASTER_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}/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.ejabberd.im/ 9HOMEPAGE= https://www.ejabberd.im/
10COMMENT= Free and Open Source distributed fault-tolerant Jabber server 10COMMENT= Free and Open Source distributed fault-tolerant Jabber server
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= elixir>=1.4.4:../../lang/elixir 13DEPENDS+= elixir>=1.4.4:../../lang/elixir
14DEPENDS+= erlang-base64url>=1.0.1:../../devel/erlang-base64url 14DEPENDS+= erlang-base64url>=1.0.1:../../devel/erlang-base64url
15DEPENDS+= erlang-cache_tab>=1.0.30:../../devel/erlang-cache_tab 15DEPENDS+= erlang-cache_tab>=1.0.30:../../devel/erlang-cache_tab
16DEPENDS+= erlang-epam>=1.0.12:../../security/erlang-epam 16DEPENDS+= erlang-epam>=1.0.12:../../security/erlang-epam
17DEPENDS+= erlang-eredis>=1.2.0:../../databases/erlang-eredis 17DEPENDS+= erlang-eredis>=1.2.0:../../databases/erlang-eredis
cvs diff -r1.68 -r1.68.4.1 pkgsrc/chat/ejabberd/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/distinfo 2023/01/08 16:19:05 1.68
+++ pkgsrc/chat/ejabberd/distinfo 2023/08/15 19:12:24 1.68.4.1
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.68 2023/01/08 16:19:05 gdt Exp $ 1$NetBSD: distinfo,v 1.68.4.1 2023/08/15 19:12:24 bsiegert Exp $
2 2
3BLAKE2s (ejabberd-22.05.tar.gz) = 657dcfe4ee9f78fbba344588c255c8d3be8ee155e55c702b125fd0626673b908 3BLAKE2s (ejabberd-22.05.tar.gz) = 657dcfe4ee9f78fbba344588c255c8d3be8ee155e55c702b125fd0626673b908
4SHA512 (ejabberd-22.05.tar.gz) = 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865 4SHA512 (ejabberd-22.05.tar.gz) = 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
5Size (ejabberd-22.05.tar.gz) = 2527957 bytes 5Size (ejabberd-22.05.tar.gz) = 2527957 bytes
6SHA1 (patch-aa) = c48f1b242777a4610cdbecb32791ce614e0ef80d 6SHA1 (patch-aa) = 8544545d6a858a4853d339743d9f35c9506af241
7SHA1 (patch-ae) = de7536dbafab8d14430faa5fcbd767c238a151e5 7SHA1 (patch-ae) = de7536dbafab8d14430faa5fcbd767c238a151e5
8SHA1 (patch-m4_erlang-extra.m4) = 3b89c1a8212e8a45ae319b30606a41429762e2fe 8SHA1 (patch-m4_erlang-extra.m4) = 3b89c1a8212e8a45ae319b30606a41429762e2fe
9SHA1 (patch-tools_ejabberdctl.bc) = 167f542c95f8e25ba601076ad717a85bfd456dc7 9SHA1 (patch-tools_ejabberdctl.bc) = 167f542c95f8e25ba601076ad717a85bfd456dc7
cvs diff -r1.17 -r1.17.6.1 pkgsrc/chat/ejabberd/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-aa 2022/10/15 18:20:40 1.17
+++ pkgsrc/chat/ejabberd/patches/patch-aa 2023/08/15 19:12:24 1.17.6.1
@@ -1,38 +1,44 @@ @@ -1,38 +1,44 @@
1$NetBSD: patch-aa,v 1.17 2022/10/15 18:20:40 triaxx Exp $ 1$NetBSD: patch-aa,v 1.17.6.1 2023/08/15 19:12:24 bsiegert Exp $
2 2
3Fix locations; don't mess with ownership. 3Fix locations; don't mess with ownership.
4 4
5--- Makefile.in.orig 2022-05-06 13:12:22.000000000 +0000 5--- Makefile.in.orig 2022-05-06 15:12:22.000000000 +0200
6+++ Makefile.in 6+++ Makefile.in 2023-08-11 09:08:52.337637204 +0200
7@@ -10,7 +10,7 @@ exec_prefix = @exec_prefix@ 7@@ -9,9 +9,10 @@
 8
8 DESTDIR = 9 DESTDIR =
9  10
10 # /etc/ejabberd/ 11 # /etc/ejabberd/
11-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd 12-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
12+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd 13+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
 14+SYSCONFDIR_ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
13  15
14 # /bin/ 16 # /bin/
15 BINDIR = $(DESTDIR)@bindir@ 17 BINDIR = $(DESTDIR)@bindir@
16@@ -22,7 +22,7 @@ SBINDIR = $(DESTDIR)@sbindir@ 18
 19@@ -21,9 +22,9 @@
 20 # /lib/
17 LIBDIR = $(DESTDIR)@libdir@ 21 LIBDIR = $(DESTDIR)@libdir@
18  22
19 # /lib/ejabberd/ 23 # /lib/ejabberd/
20-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd 24-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
21+EJABBERDDIR = $(LIBDIR)/ejabberd 25+EJABBERDDIR = $(LIBDIR)/ejabberd
22  26
23 # /share/doc/ejabberd 27 # /share/doc/ejabberd
24 PACKAGE_TARNAME = @PACKAGE_TARNAME@ 28 PACKAGE_TARNAME = @PACKAGE_TARNAME@
25@@ -66,31 +66,18 @@ SQLDIR = $(PRIVDIR)/sql 29 datarootdir = @datarootdir@
 30@@ -65,33 +66,20 @@
 31 # /usr/lib/ejabberd/priv/lua
26 LUADIR = $(PRIVDIR)/lua 32 LUADIR = $(PRIVDIR)/lua
27  33
28 # /var/lib/ejabberd/ 34 # /var/lib/ejabberd/
29-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd 35-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
30+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@ 36+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@
31  37
32 # /var/log/ejabberd/ 38 # /var/log/ejabberd/
33-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd 39-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
34+LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@ 40+LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@
35  41
36 INSTALLUSER=@INSTALLUSER@ 42 INSTALLUSER=@INSTALLUSER@
37-# if no user was enabled, don't set privileges or ownership 43-# if no user was enabled, don't set privileges or ownership
38-ifeq ($(INSTALLUSER),) 44-ifeq ($(INSTALLUSER),)
@@ -46,13 +52,41 @@ Fix locations; don't mess with ownership @@ -46,13 +52,41 @@ Fix locations; don't mess with ownership
46- G_USER=-g $(INSTALLUSER) 52- G_USER=-g $(INSTALLUSER)
47- CHOWN_COMMAND=chown 53- CHOWN_COMMAND=chown
48- CHOWN_OUTPUT=&1 54- CHOWN_OUTPUT=&1
49- INIT_USER=$(INSTALLUSER) 55- INIT_USER=$(INSTALLUSER)
50-endif 56-endif
51-# if no group was enabled, don't set privileges or ownership 57-# if no group was enabled, don't set privileges or ownership
52 INSTALLGROUP=@INSTALLGROUP@ 58 INSTALLGROUP=@INSTALLGROUP@
53-ifneq ($(INSTALLGROUP),) 59-ifneq ($(INSTALLGROUP),)
54- G_USER=-g $(INSTALLGROUP) 60- G_USER=-g $(INSTALLGROUP)
55-endif 61-endif
56  62
57 ifeq "$(MIX)" "mix" 63 ifeq "$(MIX)" "mix"
58 REBAR_VER:=6 64 REBAR_VER:=6
 65 REBAR_VER_318:=0
 66@@ -293,21 +281,21 @@
 67 -e "s*{{bindir}}/iex*$(iexpath)*g" \
 68 -e "s*{{bindir}}*@bindir@*g" \
 69 -e "s*{{libdir}}*${relivelibdir}*g" \
 70 -e "s*{{erl}}*@ERL@*g" \
 71- -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
 72- > ejabberdctl.relive
 73+ -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template | \
 74+ $(SED) -e "s*\${DESTDIR}**g" > ejabberdctl.relive
 75
 76 ejabberdctl.example: vars.config
 77 $(SED) -e "s*{{installuser}}*@INSTALLUSER@*g" \
 78- -e "s*{{config_dir}}*${ETCDIR}*g" \
 79+ -e "s*{{config_dir}}*${SYSCONFDIR_ETCDIR}*g" \
 80 -e "s*{{logs_dir}}*${LOGDIR}*g" \
 81 -e "s*{{spool_dir}}*${SPOOLDIR}*g" \
 82 -e "s*{{bindir}}*@bindir@*g" \
 83 -e "s*{{libdir}}*@libdir@*g" \
 84 -e "s*{{erl}}*@ERL@*g" \
 85- -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
 86- > ejabberdctl.example
 87+ -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template | \
 88+ $(SED) -e "s*\${DESTDIR}**g" > ejabberdctl.example
 89
 90 install: copy-files ejabberdctl.example
 91 #
 92 # Configuration files