From nobody Thu Jan 19 20:57:42 2023 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 4NyZhQ2Y27z2sg7V; Thu, 19 Jan 2023 20:57:42 +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 4NyZhQ2GDzz4Dtb; Thu, 19 Jan 2023 20:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674161862; 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=/a0BKIqAVuJgqZ+WAvkMuJZkRONiVOOmco8rBBHXDLg=; b=B82rZ+3QiZtycKX/pjaD3FZv5B09lqF+LPoHm/VghUEni05bTGMwQzc0GkIEtOuYQnBt1Y Nk8hkmIOq1W8SuQIKgkoJpDKazKJrf1J1uUEtwOmLRDe+5QRFZzAjA2x8MYgv2TXN9CXOE hCOnRYUKnAfm+juRe+4nImbMfZXtFYVM/pQK8FotEVj+EQWL727+PoiTQdV5B+6A96/mii 0QBP+TO9pijWngPan5eAVPtclzKqq+GQ1zeIbvo+opajivVz/36wKqVy/yP/YoEQ8dQH4p KN1G3RbDHHwNYkOmXzQvApyxKMLA1mcX9uGi2GcFTiGgH3lXoVrP1gGRHFHRzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674161862; 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=/a0BKIqAVuJgqZ+WAvkMuJZkRONiVOOmco8rBBHXDLg=; b=uWBCJNTXdwLxSMRPcV4qer3zQ0dBtEBDyzZV3lbe0vKgCbG+uoN2ITzYnSydZ9qLDB4tV5 UzOphUumhzM2lfnVyNjX7Ao+8hEqbEFUKj1xZfYbx0tDa13AD+hTauoGrEaicLuWRjztbO VVnYRC9rkrLh+HQyeOWhOrdnNcporDWlQ9JaJ8lZHbYsGDNkmYpQ1AIi4U421jNfn0MFCG qK3/g3fILPUMdTWdVKiBsKiAJ0IS+GF/UGrOMEmsML3LwYzLBy5YzVnsRvH6DLftJYtaw3 estDk8eDgHKCdw/DCxZvhUgH+9twa1onCwc/yb18s/uJDLCFet9M31BIgTwgYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674161862; a=rsa-sha256; cv=none; b=BzSXhR9plDblhMIgKIZPb/9vlKRDXvylgbS3o8Kwfa0LNw2R6/zJ1n32T0CxsZUsrsAGkb 60ImdR5IPc1xr9W5CO17IjNo33rcBungIgiqs9J6ouSLXl3UkrAS157b/YSuLX/P+KsNfa H9o6LRSHeV/78YA26hTizwz7XG8WZ3lQMW7akcaaoVg2hjdVRm+k41QnNDgkiG1j6BtV9c KRsDMy9gT9aC/WSQgIFKSqms5PCUt70nYcVGNHqnMfG64exzvJ1M+tP4sOgPR8rruhOavr cmTFOJAhjvl/2biXzc41RWe/XIOYrLQzXs+W/1gBoODodOcnMMcQO5mLigZSFg== 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 4NyZhQ1F0cz14qw; Thu, 19 Jan 2023 20:57:42 +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 30JKvgI4082484; Thu, 19 Jan 2023 20:57:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30JKvgmV082483; Thu, 19 Jan 2023 20:57:42 GMT (envelope-from git) Date: Thu, 19 Jan 2023 20:57:42 GMT Message-Id: <202301192057.30JKvgmV082483@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: d263c3526c4e - main - net-im/ejabberd: Update to 23.01 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: d263c3526c4ef09326b6372e971a242d202b0c40 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=d263c3526c4ef09326b6372e971a242d202b0c40 commit d263c3526c4ef09326b6372e971a242d202b0c40 Author: Ashish SHUKLA AuthorDate: 2023-01-19 20:29:36 +0000 Commit: Ashish SHUKLA CommitDate: 2023-01-19 20:45:08 +0000 net-im/ejabberd: Update to 23.01 --- net-im/ejabberd/Makefile | 24 +++++----- net-im/ejabberd/distinfo | 52 +++++++++++----------- net-im/ejabberd/files/patch-Makefile.in | 10 ++--- net-im/ejabberd/files/patch-configure.ac | 4 +- .../files/patch-deps_jose_src_jose__server.erl | 46 ------------------- net-im/ejabberd/pkg-plist | 12 ++++- 6 files changed, 57 insertions(+), 91 deletions(-) diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile index c3f226f75862..dbb17c51945a 100644 --- a/net-im/ejabberd/Makefile +++ b/net-im/ejabberd/Makefile @@ -1,5 +1,5 @@ PORTNAME= ejabberd -PORTVERSION= 22.10 +PORTVERSION= 23.01 CATEGORIES= net-im MAINTAINER= ashish@FreeBSD.org @@ -98,30 +98,30 @@ BASE64URL_VER= 1.0.1 CACHE_TAB_VER= 1.0.30 EIMP_VER= 1.0.22 EJABBERD_PO_VER= 0.0.0 -EPAM_VER= 1.0.12 +EPAM_VER= 1.0.14 EREDIS_VER= 1.2.0 -ESIP_VER= 1.0.48 +ESIP_VER= 1.0.49 EZLIB_VER= 1.0.12 FAST_TLS_VER= 1.1.16 FAST_XML_VER= 1.1.49 -FAST_YAML_VER= 1.0.34 +FAST_YAML_VER= 1.0.36 IDNA_VER= 6.0.0 JIFFY_VER= 1.1.1 -JOSE_VER= 1.11.1 +JOSE_VER= 1.11.5 LUERL_VER= 1.0 MQTREE_VER= 1.0.15 -P1_ACME_VER= 1.0.20 -P1_MYSQL_VER= 1.0.20 +P1_ACME_VER= 1.0.22 +P1_MYSQL_VER= 1.0.21 P1_OAUTH2_VER= 0.6.11 -P1_PGSQL_VER= 1.1.19 +P1_PGSQL_VER= 1.1.20 P1_UTILS_VER= 1.0.25 PKIX_VER= 1.0.9 -SQLITE3_VER= 1.1.13 +SQLITE3_VER= 1.1.14 STRINGPREP_VER= 1.0.29 -STUN_VER= 1.2.6 +STUN_VER= 1.2.7 UNICODE_UTIL_COMPAT_VER= 0.4.1 -XMPP_VER= 1.6.0 -YCONF_VER= 1.0.14 +XMPP_VER= 1.6.1 +YCONF_VER= 1.0.15 OPTIONS_SUB= yes SIP_DESC= SIP support diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo index 64731ab555e5..1b61b737dc73 100644 --- a/net-im/ejabberd/distinfo +++ b/net-im/ejabberd/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1667116270 -SHA256 (processone-ejabberd-22.10_GH0.tar.gz) = 8539707da7e75785444edf402b5ff60fc3f956806c341b2565702dcc77900402 -SIZE (processone-ejabberd-22.10_GH0.tar.gz) = 2553163 +TIMESTAMP = 1674159662 +SHA256 (processone-ejabberd-23.01_GH0.tar.gz) = 2b83fe036bbf1db8a76b86f718ff13df098fa10c62bfcf06b81e0a64e6f6f9c0 +SIZE (processone-ejabberd-23.01_GH0.tar.gz) = 2569272 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 @@ -11,16 +11,18 @@ SHA256 (processone-stringprep-1.0.29_GH0.tar.gz) = b07daf2148829d513caf2931d4635 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.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 (processone-xmpp-1.6.1_GH0.tar.gz) = 3ac425d7a8ccbfd0db1ad9c69d4380b5b9500b72eb02de163774df6638c4471d +SIZE (processone-xmpp-1.6.1_GH0.tar.gz) = 561740 +SHA256 (processone-fast_yaml-1.0.36_GH0.tar.gz) = 6794470ef35fb3985c4e9aa0ed8d3a0b44e7a5c7bf4c5a1efbeca42060db6806 +SIZE (processone-fast_yaml-1.0.36_GH0.tar.gz) = 60410 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 (potatosalad-erlang-libsodium-2.0.0_GH0.tar.gz) = 72cadb57abb74b64cb10590a5882a27fc3f594e64d62c9e1f4483d8834f3f18f +SIZE (potatosalad-erlang-libsodium-2.0.0_GH0.tar.gz) = 2592590 +SHA256 (potatosalad-erlang-jose-1.11.5_GH0.tar.gz) = 2186b93ad20d386e6db9f673c135c48568a55de42b5a1d839518c65509af4ea5 +SIZE (potatosalad-erlang-jose-1.11.5_GH0.tar.gz) = 327036 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 @@ -31,29 +33,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.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 (processone-yconf-1.0.15_GH0.tar.gz) = 0280358c868977105104cfffa7b1fa2c5bf7856243cee9b7df974dc54904e4da +SIZE (processone-yconf-1.0.15_GH0.tar.gz) = 223980 +SHA256 (processone-p1_acme-1.0.22_GH0.tar.gz) = a445b66e76acdf1342eda166344004473bf4f45ad7e7f5ae38fb0333d896eb2d +SIZE (processone-p1_acme-1.0.22_GH0.tar.gz) = 223336 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.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.19_GH0.tar.gz) = 80f88328d15d385ca6f7da543cde17b70cc684ac4dd484dcb738b3f184c7108e -SIZE (processone-p1_pgsql-1.1.19_GH0.tar.gz) = 27194 +SHA256 (processone-p1_mysql-1.0.21_GH0.tar.gz) = ee669e2f114087f6623723297cbfe39b9b176c245e55373bc4554183453f94f9 +SIZE (processone-p1_mysql-1.0.21_GH0.tar.gz) = 26334 +SHA256 (processone-epam-1.0.14_GH0.tar.gz) = 0e375557cf7ba670b626d0b1691b0257c2e68a4509bb72bf14ae8f8b7a30b3c3 +SIZE (processone-epam-1.0.14_GH0.tar.gz) = 49229 +SHA256 (processone-p1_pgsql-1.1.20_GH0.tar.gz) = 4b20e8cd04b7f5f701636bc407a820abda804c667638bcb2420c0525452dd2b1 +SIZE (processone-p1_pgsql-1.1.20_GH0.tar.gz) = 27195 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.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.6_GH0.tar.gz) = afec886ebb1879fc299aa60f3584be7d1b4fded5d8b9c9c1f58b97c57deebf88 -SIZE (processone-stun-1.2.6_GH0.tar.gz) = 42153 +SHA256 (processone-esip-1.0.49_GH0.tar.gz) = 895a143fc90f0222649d103dd524def7fed6665c52600c2bba61e9f69d132372 +SIZE (processone-esip-1.0.49_GH0.tar.gz) = 91250 +SHA256 (processone-erlang-sqlite3-1.1.14_GH0.tar.gz) = 7f7234b86e8a06474f41a4618419e2706e0cc23f55bc5f72e9a7ba0fde3d5618 +SIZE (processone-erlang-sqlite3-1.1.14_GH0.tar.gz) = 1715677 +SHA256 (processone-stun-1.2.7_GH0.tar.gz) = d7e9d3d591a88a91abf053c068f7152495e37d17f4c9ac58992c544d6f8f5e86 +SIZE (processone-stun-1.2.7_GH0.tar.gz) = 42155 SHA256 (processone-ejabberd-po-e909d88_GH0.tar.gz) = 400fdfacd6dc75bd21c84a60b74266df8049267228ec9fc62c0ba0f445d35226 SIZE (processone-ejabberd-po-e909d88_GH0.tar.gz) = 649749 diff --git a/net-im/ejabberd/files/patch-Makefile.in b/net-im/ejabberd/files/patch-Makefile.in index 9ab31b8af83d..135a8b1c8cc9 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-10-26 12:02:42 UTC +--- Makefile.in.orig 2023-01-17 10:35:52 UTC +++ Makefile.in @@ -22,7 +22,7 @@ SBINDIR = @sbindir@ LIBDIR = @libdir@ @@ -18,7 +18,7 @@ # /var/log/ejabberd/ LOGDIR = @localstatedir@/log/ejabberd -@@ -202,7 +202,7 @@ DEPIX:=$(words $(subst /, ,$(DEPSDIR))) +@@ -205,7 +205,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))))) -@@ -321,6 +321,7 @@ ejabberdctl.example: vars.config +@@ -324,6 +324,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 -@@ -330,17 +331,13 @@ install: copy-files +@@ -333,17 +334,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 -@@ -358,12 +355,14 @@ install: copy-files +@@ -361,12 +358,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 4a9344431c50..b7e3431c65b7 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-10-26 12:02:42 UTC +--- configure.ac.orig +++ 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.10` | 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 23.01` | 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 deleted file mode 100644 index de877b78a2da..000000000000 --- a/net-im/ejabberd/files/patch-deps_jose_src_jose__server.erl +++ /dev/null @@ -1,46 +0,0 @@ -Source: https://github.com/potatosalad/erlang-jose/commit/833f81666a0f9fc31e7a3c2403d72e168a4a3209.patch - ---- deps/jose/src/jose_server.erl.orig 2020-12-23 13:18:03 UTC -+++ deps/jose/src/jose_server.erl -@@ -173,9 +173,7 @@ support_check() -> - - %% @private - check_ec_key_mode(_Fallback, Entries) -> -- ECPEMEntry = { -- 'ECPrivateKey', -- << -+ PEMBin = << - 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, -@@ -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 - >>, -- not_encrypted -- }, -- case public_key:pem_entry_decode(ECPEMEntry) of -- #'ECPrivateKey'{ privateKey = PrivateKey, publicKey = PublicKey } when is_list(PrivateKey) andalso is_tuple(PublicKey) -> -- [{ec_key_mode, list} | Entries]; -- #'ECPrivateKey'{ privateKey = PrivateKey, publicKey = PublicKey } when is_binary(PrivateKey) andalso is_binary(PublicKey) -> -- [{ec_key_mode, binary} | Entries] -+ PEMEntry = {'ECPrivateKey', PEMBin, not_encrypted}, -+ %% Erlang 24 changes 'ECPrivateKey' record in a way that makes record matching fail -+ %% when this module is compiled on Erlang 23 (or earlier) but runs on 24. -+ %% So we destructure tuples, as ugly as it may be. -+ %% -+ %% See erlang-jose#113 for details. -+ PrivateKey = case list_to_integer(erlang:system_info(otp_release)) >= 24 of -+ true -> -+ {'ECPrivateKey', _Version, PrivKey0, _Params, _PubKey0, _Attributes} = public_key:pem_entry_decode(PEMEntry), -+ PrivKey0; -+ false -> -+ {'ECPrivateKey', _Version, PrivKey0, _Params, _PubKey0} = public_key:pem_entry_decode(PEMEntry), -+ PrivKey0 -+ end, -+ case is_binary(PrivateKey) of -+ true -> [{ec_key_mode, binary} | Entries]; -+ _ -> [{ec_key_mode, list} | Entries] - end. - - %% @private diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist index e91dd023cc28..15d522b0eb36 100644 --- a/net-im/ejabberd/pkg-plist +++ b/net-im/ejabberd/pkg-plist @@ -83,6 +83,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web_admin.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_websocket.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_websocket_codec.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_xmlrpc.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejd2sql.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap.beam @@ -166,6 +167,9 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mix_pam_sql.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mix_sql.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_bridge.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_bridge_opt.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_bridge_session.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_mnesia.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_opt.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_session.beam @@ -408,7 +412,6 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose.app %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_app.beam -%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_base.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_base64.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_base64url.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_crypto_compat.beam @@ -418,10 +421,14 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_chacha20_poly1305_libsodium.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_chacha20_poly1305_unsupported.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_curve25519.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_curve25519_crypto.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_curve25519_libdecaf.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_curve25519_fallback.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_curve25519_libsodium.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_curve25519_unsupported.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_curve448.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_curve448_crypto.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_curve448_fallback.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_curve448_libdecaf.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_curve448_unsupported.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_json.beam @@ -433,6 +440,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_json_poison.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_json_poison_compat_encoder.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_json_poison_lexical_encoder.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_json_thoas.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_json_unsupported.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_jwa.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_jwa_aes.beam @@ -465,6 +473,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_jwe_alg_ecdh_1pu.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_jwe_alg_dir.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_jwe_alg_ecdh_es.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_jwe_alg_ecdh_ss.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_jwe_alg_pbes2.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_jwe_alg_rsa.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_jwe_alg_xc20p_kw.beam @@ -511,6 +520,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_sup.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_xchacha20_poly1305.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_xchacha20_poly1305_crypto.beam +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_xchacha20_poly1305_libsodium.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/ebin/jose_xchacha20_poly1305_unsupported.beam %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/include/jose.hrl %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jose-%%JOSE_VER%%/include/jose_base.hrl