From owner-dev-commits-ports-all@freebsd.org Wed Jul 28 13:20:50 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1FBBA65B362; Wed, 28 Jul 2021 13:20:50 +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 4GZZ6V0N82z3DZt; Wed, 28 Jul 2021 13:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E99501E9CB; Wed, 28 Jul 2021 13:20:49 +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 16SDKnjT022847; Wed, 28 Jul 2021 13:20:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16SDKnai022846; Wed, 28 Jul 2021 13:20:49 GMT (envelope-from git) Date: Wed, 28 Jul 2021 13:20:49 GMT Message-Id: <202107281320.16SDKnai022846@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: dfbefdf6da7b - main - net-im/ejabberd: Update to 21.07 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: dfbefdf6da7b2af7d075f4e209a0242bfd6941a4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2021 13:20:50 -0000 The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfbefdf6da7b2af7d075f4e209a0242bfd6941a4 commit dfbefdf6da7b2af7d075f4e209a0242bfd6941a4 Author: Ashish SHUKLA AuthorDate: 2021-07-28 13:18:50 +0000 Commit: Ashish SHUKLA CommitDate: 2021-07-28 13:20:40 +0000 net-im/ejabberd: Update to 21.07 - Add a patch to bump version in a mistagged dependency --- net-im/ejabberd/Makefile | 46 +++++------ net-im/ejabberd/distinfo | 94 +++++++++++----------- net-im/ejabberd/files/patch-Makefile.in | 20 ++--- net-im/ejabberd/files/patch-configure.ac | 2 +- .../files/patch-deps_eredis_src_eredis.app.src | 10 +++ net-im/ejabberd/pkg-plist | 1 + 6 files changed, 92 insertions(+), 81 deletions(-) diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile index 83b0aa8cede4..21e996c2010c 100644 --- a/net-im/ejabberd/Makefile +++ b/net-im/ejabberd/Makefile @@ -1,5 +1,5 @@ PORTNAME= ejabberd -PORTVERSION= 21.04 +PORTVERSION= 21.07 CATEGORIES= net-im MAINTAINER= ashish@FreeBSD.org @@ -97,35 +97,35 @@ SUB_LIST= ${SUBS} \ SHEBANG_FILES= ${WRKSRC}/ejabberdctl.template BASE64URL_VER= 1.0.1 -CACHE_TAB_VER= 1.0.28 -EIMP_VER= 1.0.20 +CACHE_TAB_VER= 1.0.29 +EIMP_VER= 1.0.21 EJABBERD_PO_VER= 0.0.0 -EPAM_VER= 1.0.10 -EREDIS_VER= 1.0.8 -ESIP_VER= 1.0.42 -EZLIB_VER= 1.0.9 -FAST_TLS_VER= 1.1.12 -FAST_XML_VER= 1.1.46 -FAST_YAML_VER= 1.0.31 +EPAM_VER= 1.0.12 +EREDIS_VER= 1.2.0 +ESIP_VER= 1.0.43 +EZLIB_VER= 1.0.10 +FAST_TLS_VER= 1.1.13 +FAST_XML_VER= 1.1.47 +FAST_YAML_VER= 1.0.32 GOLDRUSH_VER= 0.1.9 IDNA_VER= 6.0.0 JIFFY_VER= 1.0.5 JOSE_VER= 1.9.0 -LAGER_VER= 3.6.10 +LAGER_VER= 3.9.1 LUERL_VER= 0.3 -MQTREE_VER= 1.0.13 -P1_ACME_VER= 1.0.12 -P1_MYSQL_VER= 1.0.18 -P1_OAUTH2_VER= 0.6.9 -P1_PGSQL_VER= 1.1.11 -P1_UTILS_VER= 1.0.22 -PKIX_VER= 1.0.7 -SQLITE3_VER= 1.1.12 -STRINGPREP_VER= 1.0.25 -STUN_VER= 1.0.43 +MQTREE_VER= 1.0.14 +P1_ACME_VER= 1.0.13 +P1_MYSQL_VER= 1.0.19 +P1_OAUTH2_VER= 0.6.10 +P1_PGSQL_VER= 1.1.12 +P1_UTILS_VER= 1.0.23 +PKIX_VER= 1.0.8 +SQLITE3_VER= 1.1.13 +STRINGPREP_VER= 1.0.27 +STUN_VER= 1.0.44 UNICODE_UTIL_COMPAT_VER= 0.4.1 -XMPP_VER= 1.5.3 -YCONF_VER= 1.0.11 +XMPP_VER= 1.5.4 +YCONF_VER= 1.0.12 OPTIONS_SUB= yes SIP_DESC= SIP support diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo index 593e53573bf8..696dd8c9c00c 100644 --- a/net-im/ejabberd/distinfo +++ b/net-im/ejabberd/distinfo @@ -1,63 +1,63 @@ -TIMESTAMP = 1618138570 -SHA256 (processone-ejabberd-21.04_GH0.tar.gz) = 2a5d22cd594ea2bd31adebcbcef9d9bdf46109803874fb336f8afba76fc08d8d -SIZE (processone-ejabberd-21.04_GH0.tar.gz) = 1523711 -SHA256 (erlang-lager-lager-3.6.10_GH0.tar.gz) = c5bb4ba6f918e90d2e6671c3996d72c61f2a589b65c151b3df8011d046362981 -SIZE (erlang-lager-lager-3.6.10_GH0.tar.gz) = 268657 -SHA256 (processone-p1_utils-1.0.22_GH0.tar.gz) = 2a16e2da1f537ee6c2c2f08a046b000aa56ad5d87b675bcb851ff82b3466c931 -SIZE (processone-p1_utils-1.0.22_GH0.tar.gz) = 64860 -SHA256 (processone-cache_tab-1.0.28_GH0.tar.gz) = 05b4d6be1c4200dcdf074d1f858346e686709c69117bc316613b74fb24a97eec -SIZE (processone-cache_tab-1.0.28_GH0.tar.gz) = 24031 -SHA256 (processone-fast_tls-1.1.12_GH0.tar.gz) = c128f7480e9f3092a6ceb7f5a85f999e5199e71f641414897fc506e2b2d3ff78 -SIZE (processone-fast_tls-1.1.12_GH0.tar.gz) = 80867 -SHA256 (processone-stringprep-1.0.25_GH0.tar.gz) = df193bce294a28ff08ca5e828bfc47a5e39ab9e9e438d600b059264cf3279967 -SIZE (processone-stringprep-1.0.25_GH0.tar.gz) = 99387 -SHA256 (processone-fast_xml-1.1.46_GH0.tar.gz) = 083e5785451645d2809a8454ab5764c9d585d0612b70f3e7e88442e884c4874a -SIZE (processone-fast_xml-1.1.46_GH0.tar.gz) = 107357 -SHA256 (processone-xmpp-1.5.3_GH0.tar.gz) = eba51eb42fbf1c1570743155e898417d48115c9260402b7beb5d199a03a29d7b -SIZE (processone-xmpp-1.5.3_GH0.tar.gz) = 510756 -SHA256 (processone-fast_yaml-1.0.31_GH0.tar.gz) = 14af7057c7d86ed56c71fdbe53d1de330eda5edf8021a6c55bea96bf4c5e6941 -SIZE (processone-fast_yaml-1.0.31_GH0.tar.gz) = 59389 +TIMESTAMP = 1627450775 +SHA256 (processone-ejabberd-21.07_GH0.tar.gz) = 8b344f727602a28f88bf9e24d39144bc3f324b62e0b03bda51884f8d99084d4e +SIZE (processone-ejabberd-21.07_GH0.tar.gz) = 2483313 +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.47_GH0.tar.gz) = 03e3108aa9705190ee17b278f7de09f9802fc77abac333359692d71098d9f6a6 +SIZE (processone-fast_xml-1.1.47_GH0.tar.gz) = 108032 +SHA256 (processone-xmpp-1.5.4_GH0.tar.gz) = 5bd646bf7d754d647764fce35acf320e40872a21f09c7192585ff57597ce03d4 +SIZE (processone-xmpp-1.5.4_GH0.tar.gz) = 556501 +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.9_GH0.tar.gz) = 40b86eb3e8e65778248c2b6e94002f037b4d088c0c4cc248feec37ecd0e33928 -SIZE (processone-p1_oauth2-0.6.9_GH0.tar.gz) = 214329 +SHA256 (processone-p1_oauth2-0.6.10_GH0.tar.gz) = 625e6d96a212cc2cf8a63c36ee698072791d85acbaae18e5820ba144cdaca869 +SIZE (processone-p1_oauth2-0.6.10_GH0.tar.gz) = 214205 SHA256 (potatosalad-erlang-jose-1.9.0_GH0.tar.gz) = d55a9d3a1697833fed555a21f1aeb2727af88193995cb6ffa945d4b6749d0e8d SIZE (potatosalad-erlang-jose-1.9.0_GH0.tar.gz) = 258407 -SHA256 (processone-eimp-1.0.20_GH0.tar.gz) = ca13164c5a71b668cbb9a3fa7df532e757bd3dc0b6f4f65cabe11a7501d234f3 -SIZE (processone-eimp-1.0.20_GH0.tar.gz) = 3477544 +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 (dvv-base64url-1.0.1_GH0.tar.gz) = 7ef7210effd25ac1f82f190fcfaef53e49d7bc40bb94112c4aa07266c32a851b SIZE (dvv-base64url-1.0.1_GH0.tar.gz) = 2726 -SHA256 (processone-ezlib-1.0.9_GH0.tar.gz) = f0ac60336b2ddf55ac4f58934580cb8f02dba440d68feb607be312dd35d91269 -SIZE (processone-ezlib-1.0.9_GH0.tar.gz) = 49395 -SHA256 (processone-pkix-1.0.7_GH0.tar.gz) = ef1a0f1cf0bd66696fa1c0336efe784864b8337564c0415bff83867010a1b950 -SIZE (processone-pkix-1.0.7_GH0.tar.gz) = 412022 -SHA256 (processone-mqtree-1.0.13_GH0.tar.gz) = e9804c7f155b1b4f0523e3c1351f702cb6e6b77971d5445e68194ba92640f291 -SIZE (processone-mqtree-1.0.13_GH0.tar.gz) = 229077 -SHA256 (processone-yconf-1.0.11_GH0.tar.gz) = b61269b7c517531b9d55ef65f7fc3263bb50c89be811a800c759791f437fdeec -SIZE (processone-yconf-1.0.11_GH0.tar.gz) = 222974 -SHA256 (processone-p1_acme-1.0.12_GH0.tar.gz) = a6f02bd9c5547d379b95dc2e9653b4e057071df51eadde66d9cd50db960a822a -SIZE (processone-p1_acme-1.0.12_GH0.tar.gz) = 221422 +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.13_GH0.tar.gz) = f06041158e888d98ecb950b00bb056a06c16da19f397d9615137572b19fd989a +SIZE (processone-p1_acme-1.0.13_GH0.tar.gz) = 222206 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 (processone-p1_mysql-1.0.18_GH0.tar.gz) = 9508ce3e21d747208d518a2232756632a8b6df88e185d1ab2da9e74f71b17bb9 -SIZE (processone-p1_mysql-1.0.18_GH0.tar.gz) = 27300 -SHA256 (processone-epam-1.0.10_GH0.tar.gz) = 6502b15e2ed40abec947afbcbc7a6a45095690f8ee102c3301d7873260f9783c -SIZE (processone-epam-1.0.10_GH0.tar.gz) = 47727 -SHA256 (processone-p1_pgsql-1.1.11_GH0.tar.gz) = c43cf0130feb3d884742718feab10df9cea9bc4247026b75f7669d4e9ab5de69 -SIZE (processone-p1_pgsql-1.1.11_GH0.tar.gz) = 24415 -SHA256 (wooga-eredis-v1.0.8_GH0.tar.gz) = cd75c5b19dca8b23ec998fecf83ea5f0e29f3cb75618a61d3080168c66509b56 -SIZE (wooga-eredis-v1.0.8_GH0.tar.gz) = 124993 -SHA256 (processone-esip-1.0.42_GH0.tar.gz) = 65d0c804e830fde8638e2190362a079f92a419df27bd86dca51759495430f381 -SIZE (processone-esip-1.0.42_GH0.tar.gz) = 90518 -SHA256 (processone-erlang-sqlite3-1.1.12_GH0.tar.gz) = d30cea1ee0b27bb267f009cc36942b44665c36da6a129e7c1c1fe34fc21c45f3 -SIZE (processone-erlang-sqlite3-1.1.12_GH0.tar.gz) = 1881515 -SHA256 (processone-stun-1.0.43_GH0.tar.gz) = 82f1b3e264f731b4265b625849551edd1b9dab02becfed296644f404e49aee79 -SIZE (processone-stun-1.0.43_GH0.tar.gz) = 39788 +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.12_GH0.tar.gz) = 4488c91339f297cf4a1226837eb2f4390178ee74fa7211395b7220626bb90832 +SIZE (processone-p1_pgsql-1.1.12_GH0.tar.gz) = 24887 +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.43_GH0.tar.gz) = e6d1a42873313b480b7baddee71cc5cc354f7a4a60b27abf5e508b73e9f01719 +SIZE (processone-esip-1.0.43_GH0.tar.gz) = 90979 +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.44_GH0.tar.gz) = 2833e4b43c77e4d0fc0ad9c709ce914740610ce4b0ea9ae10d8b5e63885c3ae4 +SIZE (processone-stun-1.0.44_GH0.tar.gz) = 40058 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 ae8463cff9d3..2ddada57cb4d 100644 --- a/net-im/ejabberd/files/patch-Makefile.in +++ b/net-im/ejabberd/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2020-01-17 11:05:36 UTC +--- Makefile.in.orig 2021-07-22 13:51:43 UTC +++ Makefile.in -@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@ +@@ -22,7 +22,7 @@ SBINDIR = $(DESTDIR)@sbindir@ LIBDIR = $(DESTDIR)@libdir@ # /lib/ejabberd/ @@ -9,7 +9,7 @@ # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ -@@ -65,10 +65,10 @@ SQLDIR = $(PRIVDIR)/sql +@@ -66,10 +66,10 @@ SQLDIR = $(PRIVDIR)/sql LUADIR = $(PRIVDIR)/lua # /var/lib/ejabberd/ @@ -23,16 +23,16 @@ # /var/lib/ejabberd/.erlang.cookie COOKIEFILE = $(SPOOLDIR)/.erlang.cookie -@@ -140,7 +140,7 @@ JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),$(firstword $( - VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1)) +@@ -191,7 +191,7 @@ DEPIX:=$(words $(subst /, ,$(DEPSDIR))) + LIBIX:=$(shell expr "$(DEPIX)" + 2) ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1)) -DEPS_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1)) +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 XdepsX,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word 3,$(1))X),$(call DEPS_TO_DEST,$(1)),$(call ELIXIR_TO_DEST,$(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))))) -@@ -210,9 +210,7 @@ install: all copy-files +@@ -264,9 +264,7 @@ install: copy-files # # Configuration files $(INSTALL) -d -m 750 $(G_USER) $(ETCDIR) @@ -43,7 +43,7 @@ $(SED) -e "s*{{rootdir}}*@prefix@*g" \ -e "s*{{installuser}}*@INSTALLUSER@*g" \ -e "s*{{bindir}}*@bindir@*g" \ -@@ -221,16 +219,15 @@ install: all copy-files +@@ -275,16 +273,15 @@ install: copy-files -e "s*{{localstatedir}}*@localstatedir@*g" \ -e "s*{{docdir}}*@docdir@*g" \ -e "s*{{erl}}*@ERL@*g" \ @@ -63,8 +63,8 @@ + $(INSTALL) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl # Elixir binaries [ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR) - [ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true -@@ -265,12 +262,14 @@ install: all copy-files + [ -f $(DEPSDIR)/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/iex $(BINDIR)/iex || true +@@ -319,12 +316,14 @@ install: copy-files chmod -R 750 $(LOGDIR) # # Documentation diff --git a/net-im/ejabberd/files/patch-configure.ac b/net-im/ejabberd/files/patch-configure.ac index b17ebd116f6a..0f20a5a50c7d 100644 --- a/net-im/ejabberd/files/patch-configure.ac +++ b/net-im/ejabberd/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2020-01-17 11:05:36 UTC +--- configure.ac.orig 2021-07-22 13:51:43 UTC +++ configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. diff --git a/net-im/ejabberd/files/patch-deps_eredis_src_eredis.app.src b/net-im/ejabberd/files/patch-deps_eredis_src_eredis.app.src new file mode 100644 index 000000000000..47b067b3c382 --- /dev/null +++ b/net-im/ejabberd/files/patch-deps_eredis_src_eredis.app.src @@ -0,0 +1,10 @@ +--- deps/eredis/src/eredis.app.src.orig 2018-09-12 08:21:41 UTC ++++ deps/eredis/src/eredis.app.src +@@ -1,6 +1,6 @@ + {application, eredis, [ + {description, "Erlang Redis Client"}, +- {vsn, "1.1.0"}, ++ {vsn, "1.2.0"}, + {modules, [eredis, eredis_client, eredis_parser, eredis_sub, eredis_sub_client]}, + {registered, []}, + {applications, [kernel, stdlib]}, diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist index 3136226a6753..14f8d2388840 100644 --- a/net-im/ejabberd/pkg-plist +++ b/net-im/ejabberd/pkg-plist @@ -865,6 +865,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/wa.msg %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/zh.msg %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/sql/lite.sql +%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/sql/lite.new.sql sbin/%%PORTNAME%%ctl %%DATADIR%%/captcha.sh %%PORTDOCS%%%%DOCSDIR%%/COPYING