Date: Thu, 19 May 2022 18:59:08 GMT From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d44192b04ed3 - main - net-im/ejabberd: Update to 22.05 Message-ID: <202205191859.24JIx8Yl025646@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=d44192b04ed363bba30bef0cd7ad18efe701730c commit d44192b04ed363bba30bef0cd7ad18efe701730c Author: Ashish SHUKLA <ashish@FreeBSD.org> AuthorDate: 2022-05-19 16:04:27 +0000 Commit: Ashish SHUKLA <ashish@FreeBSD.org> CommitDate: 2022-05-19 18:58:38 +0000 net-im/ejabberd: Update to 22.05 - Remove unneeded dependencies - Add upgrade note to pkg-message - Add a patch from upstream for a bug related to packaging --- net-im/ejabberd/Makefile | 53 +++++++------ net-im/ejabberd/distinfo | 88 +++++++++++----------- net-im/ejabberd/files/patch-Makefile.in | 78 ++++++++++--------- net-im/ejabberd/files/patch-configure.ac | 6 +- .../files/patch-deps_jose_src_jose__server.erl | 6 +- net-im/ejabberd/files/patch-ejabberdctl.template | 20 ++--- net-im/ejabberd/files/pkg-message.in | 14 ++++ net-im/ejabberd/pkg-plist | 66 +++++----------- 8 files changed, 157 insertions(+), 174 deletions(-) diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile index 7f6e69792765..4b9ec2c6bb00 100644 --- a/net-im/ejabberd/Makefile +++ b/net-im/ejabberd/Makefile @@ -1,7 +1,11 @@ PORTNAME= ejabberd -PORTVERSION= 21.12 +PORTVERSION= 22.05 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 @@ -31,8 +35,7 @@ CPE_VENDOR= process-one USE_GITHUB= yes GH_ACCOUNT= processone -GH_TUPLE= erlang-lager:lager:${LAGER_VER}:lager/deps/lager \ - processone:p1_utils:${P1_UTILS_VER}:p1_utils/deps/p1_utils \ +GH_TUPLE= processone:p1_utils:${P1_UTILS_VER}:p1_utils/deps/p1_utils \ processone:cache_tab:${CACHE_TAB_VER}:cache_tab/deps/cache_tab \ processone:fast_tls:${FAST_TLS_VER}:fast_tls/deps/fast_tls \ processone:stringprep:${STRINGPREP_VER}:stringprep/deps/stringprep \ @@ -43,7 +46,6 @@ GH_TUPLE= erlang-lager:lager:${LAGER_VER}:lager/deps/lager \ processone:p1_oauth2:${P1_OAUTH2_VER}:p1_oauth2/deps/p1_oauth2 \ potatosalad:erlang-jose:${JOSE_VER}:jose/deps/jose \ processone:eimp:${EIMP_VER}:eimp/deps/eimp \ - DeadZen:goldrush:${GOLDRUSH_VER}:goldrush/deps/goldrush \ dvv:base64url:${BASE64URL_VER}:base64url/deps/base64url \ processone:ezlib:${EZLIB_VER}:ezlib/deps/ezlib \ processone:pkix:${PKIX_VER}:pkix/deps/pkix \ @@ -73,10 +75,9 @@ SUBS= PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \ FAST_TLS_VER=${FAST_TLS_VER} \ FAST_XML_VER=${FAST_XML_VER} \ FAST_YAML_VER=${FAST_YAML_VER} \ - GOLDRUSH_VER=${GOLDRUSH_VER} \ IDNA_VER=${IDNA_VER} \ JIFFY_VER=${JIFFY_VER} JOSE_VER=${JOSE_VER} \ - LAGER_VER=${LAGER_VER} LUERL_VER=${LUERL_VER} \ + LUERL_VER=${LUERL_VER} \ MQTREE_VER=${MQTREE_VER} \ P1_ACME_VER=${P1_ACME_VER} \ P1_MYSQL_VER=${P1_MYSQL_VER} \ @@ -97,35 +98,33 @@ SUB_LIST= ${SUBS} \ SHEBANG_FILES= ${WRKSRC}/ejabberdctl.template BASE64URL_VER= 1.0.1 -CACHE_TAB_VER= 1.0.29 -EIMP_VER= 1.0.21 +CACHE_TAB_VER= 1.0.30 +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.45 -EZLIB_VER= 1.0.10 -FAST_TLS_VER= 1.1.13 -FAST_XML_VER= 1.1.48 -FAST_YAML_VER= 1.0.32 -GOLDRUSH_VER= 0.1.9 +ESIP_VER= 1.0.47 +EZLIB_VER= 1.0.12 +FAST_TLS_VER= 1.1.15 +FAST_XML_VER= 1.1.49 +FAST_YAML_VER= 1.0.33 IDNA_VER= 6.0.0 -JIFFY_VER= 1.0.5 +JIFFY_VER= 1.1.1 JOSE_VER= 1.11.1 -LAGER_VER= 3.9.1 -LUERL_VER= 0.3 -MQTREE_VER= 1.0.14 -P1_ACME_VER= 1.0.16 +LUERL_VER= 1.0 +MQTREE_VER= 1.0.15 +P1_ACME_VER= 1.0.19 P1_MYSQL_VER= 1.0.19 -P1_OAUTH2_VER= 0.6.10 -P1_PGSQL_VER= 1.1.16 -P1_UTILS_VER= 1.0.23 -PKIX_VER= 1.0.8 +P1_OAUTH2_VER= 0.6.11 +P1_PGSQL_VER= 1.1.18 +P1_UTILS_VER= 1.0.25 +PKIX_VER= 1.0.9 SQLITE3_VER= 1.1.13 -STRINGPREP_VER= 1.0.27 -STUN_VER= 1.0.47 +STRINGPREP_VER= 1.0.28 +STUN_VER= 1.2.2 UNICODE_UTIL_COMPAT_VER= 0.4.1 -XMPP_VER= 1.5.6 -YCONF_VER= 1.0.12 +XMPP_VER= 1.5.8 +YCONF_VER= 1.0.13 OPTIONS_SUB= yes SIP_DESC= SIP support diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo index 05f93444d4d1..b55a18739cff 100644 --- a/net-im/ejabberd/distinfo +++ b/net-im/ejabberd/distinfo @@ -1,63 +1,61 @@ -TIMESTAMP = 1639154089 -SHA256 (processone-ejabberd-21.12_GH0.tar.gz) = 0bd140d0a3569c8cc530eebd2040a8f525c9928eff62fe22fbf3c8e55d01e9f8 -SIZE (processone-ejabberd-21.12_GH0.tar.gz) = 2495058 -SHA256 (erlang-lager-lager-3.9.1_GH0.tar.gz) = 13316ba3006b174cf6b085ad13ed19ec0f618f10b83fc3530a072cdf4b50668b -SIZE (erlang-lager-lager-3.9.1_GH0.tar.gz) = 273932 -SHA256 (processone-p1_utils-1.0.23_GH0.tar.gz) = 05f29bc55a51840c84f4055b89d4cc312078badc5571a5962f15348fa5d87015 -SIZE (processone-p1_utils-1.0.23_GH0.tar.gz) = 65338 -SHA256 (processone-cache_tab-1.0.29_GH0.tar.gz) = b11299eebafab6f1f5670650c48b10d9fa607ab092b4be8a976982e3f2b37526 -SIZE (processone-cache_tab-1.0.29_GH0.tar.gz) = 60908 -SHA256 (processone-fast_tls-1.1.13_GH0.tar.gz) = 5377671fed74a61518a742bc52d73941039d6e3c6e192133c7feaf5a83e1275b -SIZE (processone-fast_tls-1.1.13_GH0.tar.gz) = 81247 -SHA256 (processone-stringprep-1.0.27_GH0.tar.gz) = cdc2ffa6ba2171f55b78e69cfce5dab6099cbb6bc6955d88c5c53b0cf24d13af -SIZE (processone-stringprep-1.0.27_GH0.tar.gz) = 100037 -SHA256 (processone-fast_xml-1.1.48_GH0.tar.gz) = bc6219b31b58baa9769d60c0acd681d49d201fc86f32810f98a2578c81743873 -SIZE (processone-fast_xml-1.1.48_GH0.tar.gz) = 108340 -SHA256 (processone-xmpp-1.5.6_GH0.tar.gz) = bde03ad371aad3e171ebe94a5b3b84daa4b8dd7ee37e9979ff373cd65370e725 -SIZE (processone-xmpp-1.5.6_GH0.tar.gz) = 557828 -SHA256 (processone-fast_yaml-1.0.32_GH0.tar.gz) = 6d5c823dd895b736b98325d88893a63c054964d7bde9a8e150fc4df5f4165065 -SIZE (processone-fast_yaml-1.0.32_GH0.tar.gz) = 59969 -SHA256 (davisp-jiffy-1.0.5_GH0.tar.gz) = e5acdee0beacc7b0fcd099d360f83d8d7d77c3029bd4d5ff5270494af36e5929 -SIZE (davisp-jiffy-1.0.5_GH0.tar.gz) = 1896318 -SHA256 (processone-p1_oauth2-0.6.10_GH0.tar.gz) = 625e6d96a212cc2cf8a63c36ee698072791d85acbaae18e5820ba144cdaca869 -SIZE (processone-p1_oauth2-0.6.10_GH0.tar.gz) = 214205 +TIMESTAMP = 1652983300 +SHA256 (processone-ejabberd-22.05_GH0.tar.gz) = b8e93b51ae3cb650a2870fae1b6705404bb155289e97be7e9a54961a9effb959 +SIZE (processone-ejabberd-22.05_GH0.tar.gz) = 2527957 +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_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 (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 +SIZE (processone-p1_oauth2-0.6.11_GH0.tar.gz) = 214437 SHA256 (potatosalad-erlang-jose-1.11.1_GH0.tar.gz) = 87cdcb9df6f943c97772e5d90bed87555a72c8957ce2cb901df259050e18e7bb SIZE (potatosalad-erlang-jose-1.11.1_GH0.tar.gz) = 281125 -SHA256 (processone-eimp-1.0.21_GH0.tar.gz) = 25e4e1178280d6fb98ee5e582ade393f7c5404c546638bcde86a6ebcb6757d90 -SIZE (processone-eimp-1.0.21_GH0.tar.gz) = 3478113 -SHA256 (DeadZen-goldrush-0.1.9_GH0.tar.gz) = 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612 -SIZE (DeadZen-goldrush-0.1.9_GH0.tar.gz) = 24548 +SHA256 (processone-eimp-1.0.22_GH0.tar.gz) = 7023b86bc7cf3551fd876a1361ceb2443bdf1c1be9f98a4d9a9a90eda3353b51 +SIZE (processone-eimp-1.0.22_GH0.tar.gz) = 3478737 SHA256 (dvv-base64url-1.0.1_GH0.tar.gz) = 7ef7210effd25ac1f82f190fcfaef53e49d7bc40bb94112c4aa07266c32a851b SIZE (dvv-base64url-1.0.1_GH0.tar.gz) = 2726 -SHA256 (processone-ezlib-1.0.10_GH0.tar.gz) = cef52f8f28229bf7229b53d225a6a9865acf5bdeaf16a40f81bbeb226615be99 -SIZE (processone-ezlib-1.0.10_GH0.tar.gz) = 50086 -SHA256 (processone-pkix-1.0.8_GH0.tar.gz) = 257171bec3fe495cd390c3a987131893a0a1a0b22e5973ac3cba9c354cb72324 -SIZE (processone-pkix-1.0.8_GH0.tar.gz) = 413346 -SHA256 (processone-mqtree-1.0.14_GH0.tar.gz) = b0b5506f43fd2ef8f72b3d5f42ece4dd22d872f9be2a9120affb7c6ae047597f -SIZE (processone-mqtree-1.0.14_GH0.tar.gz) = 265443 -SHA256 (processone-yconf-1.0.12_GH0.tar.gz) = e88f74c3950630e0ca7be41cbe2332d3ca600241f37779a862bdcc46f9031877 -SIZE (processone-yconf-1.0.12_GH0.tar.gz) = 223962 -SHA256 (processone-p1_acme-1.0.16_GH0.tar.gz) = 58d4b7e97e677bd5a8aa3c1e52514a37cfa0985cad8b5f45cd05889843c4fdd9 -SIZE (processone-p1_acme-1.0.16_GH0.tar.gz) = 222562 +SHA256 (processone-ezlib-1.0.12_GH0.tar.gz) = f2e7a3d17bbd752ad3ffd8a24c7948bf7c211c67c953a98c03110ddc497798d1 +SIZE (processone-ezlib-1.0.12_GH0.tar.gz) = 49803 +SHA256 (processone-pkix-1.0.9_GH0.tar.gz) = a9adf7d16494c1a1b572b46fc9ee1d28996b3d4bcb7a433395dfe120cee0c0ae +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 (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-v0.3_GH0.tar.gz) = 37c6d2be8ecc624a8bf469b80609c4e3f2f079c30886575c31c46391dfedfec6 -SIZE (rvirding-luerl-v0.3_GH0.tar.gz) = 95182 +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-epam-1.0.12_GH0.tar.gz) = 110ef1701cae4ed507b2959e2b929984300e6d60553c892bcab0a16e5667fa90 SIZE (processone-epam-1.0.12_GH0.tar.gz) = 49074 -SHA256 (processone-p1_pgsql-1.1.16_GH0.tar.gz) = 6e6a382ae7bc1ae825a15c99b8924f82dfa31ffe56f78f5bc2a60cee9c45b20c -SIZE (processone-p1_pgsql-1.1.16_GH0.tar.gz) = 27160 +SHA256 (processone-p1_pgsql-1.1.18_GH0.tar.gz) = 07f1c1aabb4851b9eb6cba920e0fd7c80e99bb1e89b66819f2e32d502138c0ce +SIZE (processone-p1_pgsql-1.1.18_GH0.tar.gz) = 27186 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.45_GH0.tar.gz) = 63e8ded8252478f34079ccc30ddfdbb1ce74c6a482a8222e848ccee6268795f6 -SIZE (processone-esip-1.0.45_GH0.tar.gz) = 90984 +SHA256 (processone-esip-1.0.47_GH0.tar.gz) = 1de406bc59c30e2697b8b29cc0ad0e370e6f5a5d777d37e022d195586b80643d +SIZE (processone-esip-1.0.47_GH0.tar.gz) = 91238 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.0.47_GH0.tar.gz) = f9b82949b54778a4b766dca5509eef4475e1dbc165a449974dbd0cc54c6f84a2 -SIZE (processone-stun-1.0.47_GH0.tar.gz) = 41277 +SHA256 (processone-stun-1.2.2_GH0.tar.gz) = beae0be29729579312533d0da29e423b2cb010e5c4708be7166617ef96bd9f14 +SIZE (processone-stun-1.2.2_GH0.tar.gz) = 41090 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 77b2eec8c56f..ed43d8c90f92 100644 --- a/net-im/ejabberd/files/patch-Makefile.in +++ b/net-im/ejabberd/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2021-07-22 13:51:43 UTC +--- Makefile.in.orig 2022-05-19 17:55:51 UTC +++ Makefile.in -@@ -22,7 +22,7 @@ SBINDIR = $(DESTDIR)@sbindir@ - LIBDIR = $(DESTDIR)@libdir@ +@@ -22,7 +22,7 @@ SBINDIR = @sbindir@ + LIBDIR = @libdir@ # /lib/ejabberd/ --EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd -+EJABBERDDIR = $(DESTDIR)@libdir@/erlang/lib/ejabberd-$(PORTVERSION) +-EJABBERDDIR = @libdir@/ejabberd ++EJABBERDDIR = @libdir@/erlang/lib/ejabberd-$(PORTVERSION) # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -13,12 +13,12 @@ LUADIR = $(PRIVDIR)/lua # /var/lib/ejabberd/ --SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd -+SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd +-SPOOLDIR = @localstatedir@/lib/ejabberd ++SPOOLDIR = @localstatedir@/spool/ejabberd # /var/log/ejabberd/ - LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd -@@ -185,7 +185,7 @@ + LOGDIR = @localstatedir@/log/ejabberd +@@ -198,7 +198,7 @@ DEPIX:=$(words $(subst /, ,$(DEPSDIR))) LIBIX:=$(shell expr "$(DEPIX)" + 2) ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1)) @@ -26,50 +26,48 @@ +DEPS_TO_DEST=$(LIBDIR)/ejabberd-$(PORTVERSION)/lib $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1)) 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,$(call TO_DEST_SINGLE,$(subst /, ,$(path))))) -@@ -266,9 +266,7 @@ install: copy-files - # - # Configuration files - $(INSTALL) -d -m 750 $(G_USER) $(ETCDIR) -- [ -f $(ETCDIR)/ejabberd.yml ] \ -- && $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \ -- || $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml -+ $(INSTALL) -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR) - $(SED) -e "s*{{rootdir}}*@prefix@*g" \ - -e "s*{{installuser}}*@INSTALLUSER@*g" \ + TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(DESTDIR)$(call TO_DEST_SINGLE,$(subst /, ,$(path))))) +@@ -305,6 +305,7 @@ ejabberdctl.example: vars.config -e "s*{{bindir}}*@bindir@*g" \ -@@ -277,16 +275,15 @@ install: copy-files - -e "s*{{localstatedir}}*@localstatedir@*g" \ - -e "s*{{docdir}}*@docdir@*g" \ + -e "s*{{libdir}}*@libdir@*g" \ -e "s*{{erl}}*@ERL@*g" \ + -e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \ -e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \ > ejabberdctl.example -- [ -f $(ETCDIR)/ejabberdctl.cfg ] \ -- && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \ -- || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg -- $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc -+ $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR) -+ $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc.example + +@@ -312,17 +313,13 @@ install: copy-files ejabberdctl.example + # + # Configuration files + $(INSTALL) -d -m 750 $(G_USER) $(DESTDIR)$(ETCDIR) +- [ -f $(DESTDIR)$(ETCDIR)/ejabberd.yml ] \ +- && $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(DESTDIR)$(ETCDIR)/ejabberd.yml-new \ +- || $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(DESTDIR)$(ETCDIR)/ejabberd.yml +- [ -f $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg ] \ +- && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg-new \ +- || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg +- $(INSTALL) -b -m 644 $(G_USER) inetrc $(DESTDIR)$(ETCDIR)/inetrc ++ $(INSTALL) -m 640 $(G_USER) ejabberd.yml.example $(DESTDIR)$(ETCDIR) ++ $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(DESTDIR)$(ETCDIR) ++ $(INSTALL) -b -m 644 $(G_USER) inetrc $(DESTDIR)$(ETCDIR)/inetrc.example # # Administration script - [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR) -- $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl -+ $(INSTALL) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl + [ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(SBINDIR) +- $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(DESTDIR)$(SBINDIR)/ejabberdctl ++ $(INSTALL) -m 555 $(G_USER) ejabberdctl.example $(DESTDIR)$(SBINDIR)/ejabberdctl # Elixir binaries - [ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR) - [ -f $(DEPSDIR)/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/iex $(BINDIR)/iex || true -@@ -316,12 +313,14 @@ install: copy-files - chmod -R 750 $(LOGDIR) + [ -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 + chmod -R 750 $(DESTDIR)$(LOGDIR) # # Documentation +ifndef NOPORTDOCS - $(INSTALL) -d $(MANDIR) - $(INSTALL) -d $(DOCDIR) + $(INSTALL) -d $(DESTDIR)$(MANDIR) + $(INSTALL) -d $(DESTDIR)$(DOCDIR) [ -f man/ejabberd.yml.5 ] \ - && $(INSTALL) -m 644 man/ejabberd.yml.5 $(MANDIR) \ + && $(INSTALL) -m 644 man/ejabberd.yml.5 $(DESTDIR)$(MANDIR) \ || echo "Man page not included in sources" - $(INSTALL) -m 644 COPYING $(DOCDIR) + $(INSTALL) -m 644 COPYING $(DESTDIR)$(DOCDIR) +endif uninstall: uninstall-binary diff --git a/net-im/ejabberd/files/patch-configure.ac b/net-im/ejabberd/files/patch-configure.ac index 0f20a5a50c7d..2d5a817941d7 100644 --- a/net-im/ejabberd/files/patch-configure.ac +++ b/net-im/ejabberd/files/patch-configure.ac @@ -1,10 +1,10 @@ ---- configure.ac.orig 2021-07-22 13:51:43 UTC +--- configure.ac.orig 2022-05-06 13:12:22 UTC +++ configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. - AC_PREREQ(2.53) --AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 0.0` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd]) + 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, %%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-deps_jose_src_jose__server.erl b/net-im/ejabberd/files/patch-deps_jose_src_jose__server.erl index be50a38e7244..de877b78a2da 100644 --- a/net-im/ejabberd/files/patch-deps_jose_src_jose__server.erl +++ b/net-im/ejabberd/files/patch-deps_jose_src_jose__server.erl @@ -1,8 +1,8 @@ Source: https://github.com/potatosalad/erlang-jose/commit/833f81666a0f9fc31e7a3c2403d72e168a4a3209.patch ---- deps/jose/src/jose_server.erl.orig 2018-12-31 15:47:40 UTC +--- deps/jose/src/jose_server.erl.orig 2020-12-23 13:18:03 UTC +++ deps/jose/src/jose_server.erl -@@ -162,9 +162,7 @@ support_check() -> +@@ -173,9 +173,7 @@ support_check() -> %% @private check_ec_key_mode(_Fallback, Entries) -> @@ -13,7 +13,7 @@ Source: https://github.com/potatosalad/erlang-jose/commit/833f81666a0f9fc31e7a3c 48,119,2,1,1,4,32,104,152,88,12,19,82,251,156,171,31,222,207, 0,76,115,88,210,229,36,106,137,192,81,153,154,254,226,38,247, 70,226,157,160,10,6,8,42,134,72,206,61,3,1,7,161,68,3,66,0,4, -@@ -173,13 +171,23 @@ check_ec_key_mode(_Fallback, Entries) -> +@@ -184,13 +182,23 @@ check_ec_key_mode(_Fallback, Entries) -> 36,225,0,90,21,186,235,132,152,229,13,189,196,121,64,84,64, 229,173,12,24,23,127,175,67,247,29,139,91 >>, diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template index a3a834af7b05..04d51a3b1c30 100644 --- a/net-im/ejabberd/files/patch-ejabberdctl.template +++ b/net-im/ejabberd/files/patch-ejabberdctl.template @@ -1,23 +1,23 @@ ---- ejabberdctl.template.orig 2020-08-02 14:16:55 UTC +--- ejabberdctl.template.orig 2022-05-19 09:10:34 UTC +++ ejabberdctl.template -@@ -56,8 +56,8 @@ done +@@ -58,8 +58,8 @@ 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"}" + : "${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:="$ETC_DIR/ejabberd.yml"}" - : "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}" + : "${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 -@@ -81,7 +81,8 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then +@@ -83,7 +83,8 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then fi # 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}} +-ERL_LIBS='{{libdir}}' +ERL_LIBS={{libdir}}/ejabberd +ERL_LIBS=$ERL_LIBS:{{libdir}}/ejabberd/lib ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump - ERL_INETRC="$ETC_DIR"/inetrc + ERL_INETRC="$CONFIG_DIR"/inetrc diff --git a/net-im/ejabberd/files/pkg-message.in b/net-im/ejabberd/files/pkg-message.in index 7609af67f10c..f05dcf19b9b0 100644 --- a/net-im/ejabberd/files/pkg-message.in +++ b/net-im/ejabberd/files/pkg-message.in @@ -1,3 +1,6 @@ +[ +{ type: install + message: <<EOM Congratulations, you have installed %%PORTNAME%%! o To enable ejabberd you need to add following string to your /etc/rc.conf: @@ -11,3 +14,14 @@ Congratulations, you have installed %%PORTNAME%%! of this port! Users are advised to check all configuration files and data in /var/spool/ejabberd to ensure everything has the correct owner/group. o To start using CAPTCHA functionality, please install ImageMagick port. +EOM +} +{ type: upgrade, + maximum_version: "22.05", + message: <<EOM +Please refer to the release notes[0] for required DB schema updates. + +[0] https://www.process-one.net/blog/ejabberd-22-05/ +EOM +} +] diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist index 816b4efad6d0..0db16c9ec628 100644 --- a/net-im/ejabberd/pkg-plist +++ b/net-im/ejabberd/pkg-plist @@ -21,6 +21,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_pam.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_sql.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_backend_sup.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_batch.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_bosh.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_c2s.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_c2s_config.beam @@ -133,6 +134,8 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_delegation_opt.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_fail2ban.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_fail2ban_opt.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_host_meta.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_host_meta_opt.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_api.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_api_opt.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_fileserver.beam @@ -171,6 +174,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_opt.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_admin.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_admin_opt.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_log.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_log_opt.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_mnesia.beam @@ -360,7 +364,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib_app.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib_sup.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/priv/lib/ezlib_drv.so +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/priv/lib/ezlib.so %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_tls-%%FAST_TLS_VER%%/LICENSE.txt %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_tls-%%FAST_TLS_VER%%/ebin/fast_tls.app %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_tls-%%FAST_TLS_VER%%/ebin/fast_tls.beam @@ -388,24 +392,6 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-%%FAST_YAML_VER%%/ebin/fast_yaml_app.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-%%FAST_YAML_VER%%/ebin/fast_yaml_sup.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_yaml-%%FAST_YAML_VER%%/priv/lib/fast_yaml.so -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/LICENSE -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/glc.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/glc_code.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/glc_lib.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/glc_ops.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/glc_run.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/goldrush.app -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gr_app.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gr_context.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gr_counter.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gr_counter_sup.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gr_manager.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gr_manager_sup.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gr_param.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gr_param_sup.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gr_sup.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gre.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/priv/edoc.css %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/idna-%%IDNA_VER%%/LICENSE %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/idna-%%IDNA_VER%%/ebin/idna.app %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/idna-%%IDNA_VER%%/ebin/idna.beam @@ -538,43 +524,23 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/include/jose_jwt.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/include/jose_public_key.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/priv/Dockerfile -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/LICENSE -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/error_logger_lager_h.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager.app -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_app.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_backend_throttle.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_common_test_backend.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_config.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_console_backend.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_crash_log.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_default_formatter.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_file_backend.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_format.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_handler_watcher.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_handler_watcher_sup.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_manager_killer.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_msg.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_rotator_behaviour.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_rotator_default.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_stdlib.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_sup.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_transform.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_trunc_io.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_util.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/include/lager.hrl -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/priv/edoc.css %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/LICENSE +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/Elixir.Luerl.New.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/Elixir.Luerl.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl.app %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_anno.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_app.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_comp.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_comp_cg.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_comp_env.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_comp_lint.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_comp_locf.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_comp_normalise.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_comp_peep.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_comp_vars.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_emul.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_heap.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_lib.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_lib_basic.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_lib_bit32.beam @@ -586,10 +552,17 @@ %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_lib_string.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_lib_string_format.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_lib_table.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_lib_utf8.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_new.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_old.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_parse.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_sandbox.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_scan.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_sup.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_util.beam %%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/ttdict.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/ttsets.beam +%%LUA%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/include/luerl.hrl %%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/%%PORTNAME%%_po-0.0.0/LICENSE %%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/%%PORTNAME%%_po-0.0.0/ebin/%%PORTNAME%%_po.app %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/mqtree-%%MQTREE_VER%%/LICENSE @@ -634,13 +607,13 @@ %%PGSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_pgsql-%%P1_PGSQL_VER%%/ebin/pgsql_sup.beam %%PGSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_pgsql-%%P1_PGSQL_VER%%/ebin/pgsql_util.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/LICENSE.txt -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_edoc_layout.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_file_queue.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_fsm.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_http.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_nif_utils.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_options.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_prof.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_proxy_protocol.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_queue.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_rand.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_server.beam @@ -857,6 +830,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/js/admin.js %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/js/muc.js %%REDIS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/lua/redis_sm.lua +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/ar.msg %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/ca.msg %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/cs.msg %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/de.msg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205191859.24JIx8Yl025646>