From nobody Sun Oct 30 09:52:30 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N0WmH03S0z4gSWc; Sun, 30 Oct 2022 09:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N0WmG716Mz3R33; Sun, 30 Oct 2022 09:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667123550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P8dCh0V6qJxdzPa+v2zXSLHt9C41R2lwnMjrDKgIitc=; b=hDGASAcy1eehMLZHMCFD0KxaRMqhIB9iDMBo3fXMt0NNOhIk1+K7vwfQTePoyBQYZL4DJe 0yv12l7g8LnE8LcgSAGRf5Axmdb7MlLyHTR/BuX4+SN0+9gmpta2uxNnPUXb3KYKVbLYA5 d9SZZRZ5ihhUm/mbB7+an/Vu4tCZ77g6o3unYvdSaHy/ZHBrSUns4iHHEcIGaqkpthV9r2 OnGQeOHCrN6dENu54v3LxW23C3esdX2mC5xTpDLoVnEEs/Gn2bfUk7Cx3DalWeZbUANABM E3kjzvhiFXF3w/EOaTQrRb0hc2QTFmqG6s4FqhQn8Rpl6rpZd01dRhCS0Vn9VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N0WmG63Q9zsq4; Sun, 30 Oct 2022 09:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29U9qUCI043615; Sun, 30 Oct 2022 09:52:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29U9qUeM043614; Sun, 30 Oct 2022 09:52:30 GMT (envelope-from git) Date: Sun, 30 Oct 2022 09:52:30 GMT Message-Id: <202210300952.29U9qUeM043614@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 1c620a3b22bf - main - net-im/ejabberd: Update to 22.10 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c620a3b22bfdfe960171ebd028d5307ee5449c8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667123550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P8dCh0V6qJxdzPa+v2zXSLHt9C41R2lwnMjrDKgIitc=; b=JBDC5Iy3hw3KxyUvfZsRi/BKdsjaHCJeCsXQ0+aVgc/rS+LIM57Z9ZZYVu+FD32CpibOVv P4j7lJdFCulXOe1Eom5BWk5pbPgFALztKSfcpwLm69akZCxLA0IZTfGrh4qZgf5mzl83oe NgQo+eIghKl+liAiEIaatOxltRSSAdr3fekq54Ixg8qWbqlx7h4bpYAp/h5IX+IprIO8fq Ek5Zb1nbjBJc6IQk2/XY6WQwWd0Zh19DVUXOljiQAvzF+mG5WzgdQE4G1f5tggjh5tLKQQ k3q8D1pQ9rkm/QxLOkdKC9chF69bpnR9HkS/ytHlbp25OhNfRGSmI4tlRb0lLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667123550; a=rsa-sha256; cv=none; b=fL2Z3ygEO83vIoVBTtJxlxIpUV12xPlA5JNP7Ho5Er+MpVdUAUZ5rFJ83hpqdklKJaN/1c od+nkutK1AoZCYE/vVKQ00UJT+GKYUcXjg6ovhtsD1JpHYVCElUVLLXjmBy5tUaVL8vHNX um2L5g6aB64kHR8m7TUFFtKTAL3IMSpfYT5Jxrw3BiSxfViSzBLQGzQjQvqHEJahQDcYRw mtF1r6I77zhXjc3H/jT6msns3on224B7E8jBzen1n31wG7XkvABZKUtZxcI45t41RCw1nV NBy+iu8xUwiD8CjA3F8ai6B+5qIcklqN+2BjX5/zMVthvMYYOzVD82uYwxQdwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c620a3b22bfdfe960171ebd028d5307ee5449c8 commit 1c620a3b22bfdfe960171ebd028d5307ee5449c8 Author: Ashish SHUKLA AuthorDate: 2022-10-30 08:32:48 +0000 Commit: Ashish SHUKLA CommitDate: 2022-10-30 09:52:21 +0000 net-im/ejabberd: Update to 22.10 --- net-im/ejabberd/Makefile | 27 ++++++------- net-im/ejabberd/distinfo | 48 ++++++++++++------------ net-im/ejabberd/files/patch-Makefile.in | 10 ++--- net-im/ejabberd/files/patch-configure.ac | 4 +- net-im/ejabberd/files/patch-ejabberdctl.template | 19 +++++++--- net-im/ejabberd/pkg-plist | 8 ++-- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile index 7a4ecadc499c..c3f226f75862 100644 --- a/net-im/ejabberd/Makefile +++ b/net-im/ejabberd/Makefile @@ -1,12 +1,7 @@ PORTNAME= ejabberd -PORTVERSION= 22.05 -PORTREVISION= 1 +PORTVERSION= 22.10 CATEGORIES= net-im -# See https://github.com/processone/ejabberd/issues/3819 -PATCHFILES= 75a771bfec3626145d404349fdaec4f0eef83bbc.patch:-p1 -PATCH_SITES+= https://github.com/processone/ejabberd/commit/ - MAINTAINER= ashish@FreeBSD.org COMMENT= Free and Open Source distributed fault-tolerant Jabber server WWW= https://www.ejabberd.im/ @@ -105,28 +100,28 @@ EIMP_VER= 1.0.22 EJABBERD_PO_VER= 0.0.0 EPAM_VER= 1.0.12 EREDIS_VER= 1.2.0 -ESIP_VER= 1.0.47 +ESIP_VER= 1.0.48 EZLIB_VER= 1.0.12 -FAST_TLS_VER= 1.1.15 +FAST_TLS_VER= 1.1.16 FAST_XML_VER= 1.1.49 -FAST_YAML_VER= 1.0.33 +FAST_YAML_VER= 1.0.34 IDNA_VER= 6.0.0 JIFFY_VER= 1.1.1 JOSE_VER= 1.11.1 LUERL_VER= 1.0 MQTREE_VER= 1.0.15 -P1_ACME_VER= 1.0.19 -P1_MYSQL_VER= 1.0.19 +P1_ACME_VER= 1.0.20 +P1_MYSQL_VER= 1.0.20 P1_OAUTH2_VER= 0.6.11 -P1_PGSQL_VER= 1.1.18 +P1_PGSQL_VER= 1.1.19 P1_UTILS_VER= 1.0.25 PKIX_VER= 1.0.9 SQLITE3_VER= 1.1.13 -STRINGPREP_VER= 1.0.28 -STUN_VER= 1.2.2 +STRINGPREP_VER= 1.0.29 +STUN_VER= 1.2.6 UNICODE_UTIL_COMPAT_VER= 0.4.1 -XMPP_VER= 1.5.8 -YCONF_VER= 1.0.13 +XMPP_VER= 1.6.0 +YCONF_VER= 1.0.14 OPTIONS_SUB= yes SIP_DESC= SIP support diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo index b55a18739cff..64731ab555e5 100644 --- a/net-im/ejabberd/distinfo +++ b/net-im/ejabberd/distinfo @@ -1,20 +1,20 @@ -TIMESTAMP = 1652983300 -SHA256 (processone-ejabberd-22.05_GH0.tar.gz) = b8e93b51ae3cb650a2870fae1b6705404bb155289e97be7e9a54961a9effb959 -SIZE (processone-ejabberd-22.05_GH0.tar.gz) = 2527957 +TIMESTAMP = 1667116270 +SHA256 (processone-ejabberd-22.10_GH0.tar.gz) = 8539707da7e75785444edf402b5ff60fc3f956806c341b2565702dcc77900402 +SIZE (processone-ejabberd-22.10_GH0.tar.gz) = 2553163 SHA256 (processone-p1_utils-1.0.25_GH0.tar.gz) = c62f93ab5ea8d9251d9acda2abf576352d50f4a3299972549180a5387656746a SIZE (processone-p1_utils-1.0.25_GH0.tar.gz) = 47802 SHA256 (processone-cache_tab-1.0.30_GH0.tar.gz) = c506d2aa2e59f1e0086ce32234618189d557a767312179cc1c8df19754131ca2 SIZE (processone-cache_tab-1.0.30_GH0.tar.gz) = 60913 -SHA256 (processone-fast_tls-1.1.15_GH0.tar.gz) = 3e460c915d3459bc403c5b9ab11c6c952e291aaaa4e8f1064d151f9be24ce262 -SIZE (processone-fast_tls-1.1.15_GH0.tar.gz) = 83705 -SHA256 (processone-stringprep-1.0.28_GH0.tar.gz) = 33dca9b95671d6946621e4d9d8baff6d8ed046d5629b745e4726dbdd0ec96f37 -SIZE (processone-stringprep-1.0.28_GH0.tar.gz) = 100057 +SHA256 (processone-fast_tls-1.1.16_GH0.tar.gz) = 8c38768998e8ee0aa2bf5831bc25deeb4ea2e08bd52e26b2abfd654504fbe4f9 +SIZE (processone-fast_tls-1.1.16_GH0.tar.gz) = 83971 +SHA256 (processone-stringprep-1.0.29_GH0.tar.gz) = b07daf2148829d513caf2931d463550e70252a78ef99696dcf444d61d93bf940 +SIZE (processone-stringprep-1.0.29_GH0.tar.gz) = 100076 SHA256 (processone-fast_xml-1.1.49_GH0.tar.gz) = 02bcdb0a4350080a10b52de85c11de982e5f7cf2150f5b1b888f7a95ccb31265 SIZE (processone-fast_xml-1.1.49_GH0.tar.gz) = 108442 -SHA256 (processone-xmpp-1.5.8_GH0.tar.gz) = 166d80cd14fcf2a56ab43968122bdb454a0380672ff55cb4d6ecad52ed6a7f51 -SIZE (processone-xmpp-1.5.8_GH0.tar.gz) = 557974 -SHA256 (processone-fast_yaml-1.0.33_GH0.tar.gz) = 754af5b8ba6eee3d72aaf0830e234f9deb9e1638aabaf2e3fdd50b2c0e1934e7 -SIZE (processone-fast_yaml-1.0.33_GH0.tar.gz) = 60314 +SHA256 (processone-xmpp-1.6.0_GH0.tar.gz) = e8692aaf3d4f4435b24526ece268a36f72ccb01da38efd3d53d18559271dc480 +SIZE (processone-xmpp-1.6.0_GH0.tar.gz) = 561026 +SHA256 (processone-fast_yaml-1.0.34_GH0.tar.gz) = 1930f21a73a0677de3b4f3a63cb0077056c1610fd0982188e1e0b7a00a9fdbc0 +SIZE (processone-fast_yaml-1.0.34_GH0.tar.gz) = 60367 SHA256 (davisp-jiffy-1.1.1_GH0.tar.gz) = a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8 SIZE (davisp-jiffy-1.1.1_GH0.tar.gz) = 1674571 SHA256 (processone-p1_oauth2-0.6.11_GH0.tar.gz) = 2a33d96ab007b77759f48613a65794351569e7d2d800700b71e50448eed0e3b8 @@ -31,31 +31,29 @@ SHA256 (processone-pkix-1.0.9_GH0.tar.gz) = a9adf7d16494c1a1b572b46fc9ee1d28996b SIZE (processone-pkix-1.0.9_GH0.tar.gz) = 406218 SHA256 (processone-mqtree-1.0.15_GH0.tar.gz) = 8d6b2d780d3d6e23a2d205406b30bf96c722f6c8b336a83182d5455e665ae866 SIZE (processone-mqtree-1.0.15_GH0.tar.gz) = 265445 -SHA256 (processone-yconf-1.0.13_GH0.tar.gz) = 1a6be23d9a697baa5474f4791007ec043fb72189239e93cc029f264814469f54 -SIZE (processone-yconf-1.0.13_GH0.tar.gz) = 223970 -SHA256 (processone-p1_acme-1.0.19_GH0.tar.gz) = d880ab7e150bb81580231f53adc8e8b69ebe6ae49a0050069f5828837308de4e -SIZE (processone-p1_acme-1.0.19_GH0.tar.gz) = 223303 +SHA256 (processone-yconf-1.0.14_GH0.tar.gz) = 6daacda7ae907e8f1e5f0a3b5bd570bf566350bd8ff2a44baa8c9a54e0114221 +SIZE (processone-yconf-1.0.14_GH0.tar.gz) = 223966 +SHA256 (processone-p1_acme-1.0.20_GH0.tar.gz) = 28c5f2af87f2180ca9d1af7dc6a8ce829a216303babb5b30dfb173d3322c368d +SIZE (processone-p1_acme-1.0.20_GH0.tar.gz) = 223319 SHA256 (benoitc-erlang-idna-6.0.0_GH0.tar.gz) = d57e20ee88018ff0431e0275e91ada5915782870c9981fc798bcd05589031d6f SIZE (benoitc-erlang-idna-6.0.0_GH0.tar.gz) = 740802 SHA256 (benoitc-unicode_util_compat-0.4.1_GH0.tar.gz) = daca2a0d9469b6d8b766f72168ff5576b1e902d1b026a659d6ef0073adb996fa SIZE (benoitc-unicode_util_compat-0.4.1_GH0.tar.gz) = 416975 SHA256 (rvirding-luerl-v1.0_GH0.tar.gz) = b84672c703b3e098e03ed1baa7806388e173f6a289516269a02cff65dd1c66b1 SIZE (rvirding-luerl-v1.0_GH0.tar.gz) = 120855 -SHA256 (processone-p1_mysql-1.0.19_GH0.tar.gz) = 587f77bf5489f157d67ef2bc86be9dda0905043fcda5814ddb285c716edd685c -SIZE (processone-p1_mysql-1.0.19_GH0.tar.gz) = 27476 +SHA256 (processone-p1_mysql-1.0.20_GH0.tar.gz) = b8cc2108a988261a1abae55523a8537a74101ee4b9ce2608348b0b93cc8a4db0 +SIZE (processone-p1_mysql-1.0.20_GH0.tar.gz) = 26257 SHA256 (processone-epam-1.0.12_GH0.tar.gz) = 110ef1701cae4ed507b2959e2b929984300e6d60553c892bcab0a16e5667fa90 SIZE (processone-epam-1.0.12_GH0.tar.gz) = 49074 -SHA256 (processone-p1_pgsql-1.1.18_GH0.tar.gz) = 07f1c1aabb4851b9eb6cba920e0fd7c80e99bb1e89b66819f2e32d502138c0ce -SIZE (processone-p1_pgsql-1.1.18_GH0.tar.gz) = 27186 +SHA256 (processone-p1_pgsql-1.1.19_GH0.tar.gz) = 80f88328d15d385ca6f7da543cde17b70cc684ac4dd484dcb738b3f184c7108e +SIZE (processone-p1_pgsql-1.1.19_GH0.tar.gz) = 27194 SHA256 (wooga-eredis-v1.2.0_GH0.tar.gz) = 31a2e61d8d5a9631bda6e72e74abd6042292a39323acb6df94c050a41eb1f1a3 SIZE (wooga-eredis-v1.2.0_GH0.tar.gz) = 28568 -SHA256 (processone-esip-1.0.47_GH0.tar.gz) = 1de406bc59c30e2697b8b29cc0ad0e370e6f5a5d777d37e022d195586b80643d -SIZE (processone-esip-1.0.47_GH0.tar.gz) = 91238 +SHA256 (processone-esip-1.0.48_GH0.tar.gz) = a1675d986ac327dedb630cd98ac06aa7abe02245ea8226305e565a83dd1c428e +SIZE (processone-esip-1.0.48_GH0.tar.gz) = 91251 SHA256 (processone-erlang-sqlite3-1.1.13_GH0.tar.gz) = 02019845df226bc1286a4948aa94f5ff055e8730d45808cbee6af7df0da4c27a SIZE (processone-erlang-sqlite3-1.1.13_GH0.tar.gz) = 1920452 -SHA256 (processone-stun-1.2.2_GH0.tar.gz) = beae0be29729579312533d0da29e423b2cb010e5c4708be7166617ef96bd9f14 -SIZE (processone-stun-1.2.2_GH0.tar.gz) = 41090 +SHA256 (processone-stun-1.2.6_GH0.tar.gz) = afec886ebb1879fc299aa60f3584be7d1b4fded5d8b9c9c1f58b97c57deebf88 +SIZE (processone-stun-1.2.6_GH0.tar.gz) = 42153 SHA256 (processone-ejabberd-po-e909d88_GH0.tar.gz) = 400fdfacd6dc75bd21c84a60b74266df8049267228ec9fc62c0ba0f445d35226 SIZE (processone-ejabberd-po-e909d88_GH0.tar.gz) = 649749 -SHA256 (75a771bfec3626145d404349fdaec4f0eef83bbc.patch) = c2f6738ad61964d9d6e1ec79e2d934392085c3830914f20fe04204a5eff73630 -SIZE (75a771bfec3626145d404349fdaec4f0eef83bbc.patch) = 8302 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}}' diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist index 0db16c9ec628..e91dd023cc28 100644 --- a/net-im/ejabberd/pkg-plist +++ b/net-im/ejabberd/pkg-plist @@ -280,11 +280,9 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_compress.beam %%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_compress_gen.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/ELDAPv3.hrl -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/adhoc.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/bosh.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_auth.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_commands.hrl -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_config.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_ctl.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_http.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_oauth.hrl @@ -311,7 +309,6 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_roster.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_shared_roster.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_vcard.hrl -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_vcard_xupdate.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mqtt.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/pubsub.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/translate.hrl @@ -579,7 +576,6 @@ %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql_app.beam %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql_auth.beam %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql_conn.beam -%%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql_recv.beam %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql_sup.beam %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/include/p1_mysql.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_oauth2-%%P1_OAUTH2_VER%%/LICENSE @@ -648,8 +644,11 @@ %%STUN%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/stun-%%STUN_VER%%/ebin/stun.app %%STUN%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/stun-%%STUN_VER%%/ebin/stun.beam %%STUN%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/stun-%%STUN_VER%%/ebin/stun_app.beam +%%STUN%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/stun-%%STUN_VER%%/ebin/stun_acceptor.beam +%%STUN%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/stun-%%STUN_VER%%/ebin/stun_acceptor_sup.beam %%STUN%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/stun-%%STUN_VER%%/ebin/stun_codec.beam %%STUN%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/stun-%%STUN_VER%%/ebin/stun_listener.beam +%%STUN%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/stun-%%STUN_VER%%/ebin/stun_listener_sup.beam %%STUN%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/stun-%%STUN_VER%%/ebin/stun_logger.beam %%STUN%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/stun-%%STUN_VER%%/ebin/stun_shaper.beam %%STUN%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/stun-%%STUN_VER%%/ebin/stun_sup.beam @@ -752,6 +751,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0363.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0369.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0377.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0403.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0405.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0417.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0430.beam