From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DCAB9158013 for ; Mon, 11 Dec 2023 15:44:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21D2B2BC02D; Mon, 11 Dec 2023 15:44:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0290E2BC02D for ; Mon, 11 Dec 2023 15:44:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1DF23335D6B for ; Mon, 11 Dec 2023 15:44:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D68799E for ; Mon, 11 Dec 2023 15:44:13 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1702309430.2f272ce2acf66bb2471cd5ce9fd4756336b36864.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/ejabberd/Manifest net-im/ejabberd/ejabberd-23.10-r1.ebuild net-im/ejabberd/ejabberd-23.10.ebuild X-VCS-Directories: net-im/ejabberd/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 2f272ce2acf66bb2471cd5ce9fd4756336b36864 X-VCS-Branch: master Date: Mon, 11 Dec 2023 15:44:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fcafbd4c-cdbd-4236-980a-c4516c753080 X-Archives-Hash: bffefff946ec61834d001583fc2e851e commit: 2f272ce2acf66bb2471cd5ce9fd4756336b36864 Author: Florian Schmaus gentoo org> AuthorDate: Mon Dec 11 15:42:44 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Mon Dec 11 15:43:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f272ce2 net-im/ejabberd: backport fixes for ejabberdctl Thanks to Holger Weiß for mentioning the patches to backport. Closes: https://bugs.gentoo.org/919711 Signed-off-by: Florian Schmaus gentoo.org> net-im/ejabberd/Manifest | 2 ++ .../ejabberd/{ejabberd-23.10.ebuild => ejabberd-23.10-r1.ebuild} | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index 1e121eba56f2..ee84f649a34b 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,4 +1,6 @@ DIST ejabberd-22.10.tar.gz 2553163 BLAKE2B 670721da1800b489103df49c24bb961cb048e02faffa57921c9740f2effadb8fd5b70841afaf9fc56160e4bb00d6d6d73014cdd3e2aaa683c351fd0d42d53bf3 SHA512 3010b0767017d63c1b1a8b062f881d98be6308f2ae065c58302288096058ed8030e37c73eaf037ee1e61d1040f4e61071b2d62e146c61109ee782b9e6b708942 DIST ejabberd-23.01.tar.gz 2569272 BLAKE2B c8c06204ed6c4992d86b7fcc1a949883267364433fc5d6d05f2214f093301b3fc4cda7b5b078e3ebd1334a418173fd5decd902f582fe0492b2f2f19c39ac88e4 SHA512 3fe11123d24e430fa10d18aabb9cc9613bc25ee48d6c64a642ae1d0d458f220df638b94cde444241399e0d0777a4f64995ad7e37f963f1ee92bbb114ed431c4b DIST ejabberd-23.04.tar.gz 2581686 BLAKE2B 292da892f62d6940418980bfaec63f3aa570f0af4c78be80ff6996d13269f5303ff9ecd88c0fa4ba8daecf5183a7eb31a7048f3425d128b03cc7029a3198ff0d SHA512 2edb437baae54afd625222f2b251549af3ec469b535a10109679f1edd27fc840579351499f9bc79e8d0d17f752065787eb52607f886e5599386dbed52c8aecab +DIST ejabberd-23.10-fix-ejabberdctl.patch 1945 BLAKE2B 3e9e690802dd201aaba50b16435c98e64b52bfa2c77dd054c4db538f8bd9035386282e43b3c51fa444119901addeb2c3174d55d66a515847f80771e350e0a808 SHA512 0a6780915177fa4012a194d3fa755a812f0bed5d446df630c46834953aad54679450ff9fdaa1aa7fb415de5bb905a3dc2b28c65b7b32f0fd83cd99634bb5073d +DIST ejabberd-23.10-set-ejabberd-opts.patch 1508 BLAKE2B 1692fb54b3aeb9838f057d32ebebffbcca5761c820d95a377b257966094e973465740b224d17bebdae0a4f3d0b5ebe35c9c1b005217a3e9baae69fc2511c69aa SHA512 aa7f13be15ec4cb0a9c17e5c1519d5fd94ccee75b46e3a8ee1de39e23000c7faad530208c049dd4a290be18b8b9f1c866584a9abf3f288a8f2fd66c2d72e4fa5 DIST ejabberd-23.10.tar.gz 2615643 BLAKE2B 0c3adfac5d99a33f37b0bd9970489f7a9e32bc1a832efe510be3281cd4ac2df890aa7eeab5758149b3cb16a2e6a71937ee955a86113bba14540d5c685f900ef6 SHA512 d42af356b0b6ebbba757de4256e308766f046d6c2a7df355330fbc9a9fb329635a22c2f9e5fc4d0a9dbe2d7e5488efe85000c4d04a9a0ce12921d839899e0c45 diff --git a/net-im/ejabberd/ejabberd-23.10.ebuild b/net-im/ejabberd/ejabberd-23.10-r1.ebuild similarity index 94% rename from net-im/ejabberd/ejabberd-23.10.ebuild rename to net-im/ejabberd/ejabberd-23.10-r1.ebuild index 01b54660d1ad..72df4518bfd7 100644 --- a/net-im/ejabberd/ejabberd-23.10.ebuild +++ b/net-im/ejabberd/ejabberd-23.10-r1.ebuild @@ -9,6 +9,10 @@ DESCRIPTION="Robust, scalable and extensible XMPP server" HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" SRC_URI=" https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/processone/ejabberd/commit/841d5c029905d5feabe07ab5a4db3aacfeedefb6.patch -> + ${P}-fix-ejabberdctl.patch + https://github.com/processone/ejabberd/commit/4ea46c57653b3d9ea9c1386d1cc3dd07163d74d6.patch -> + ${P}-set-ejabberd-opts.patch " LICENSE="GPL-2" @@ -66,6 +70,9 @@ RDEPEND=" DOCS=( CHANGELOG.md README.md ) PATCHES=( "${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch" + # Both patches for https://bugs.gentoo.org/919711 + "${DISTDIR}/${P}-fix-ejabberdctl.patch" + "${DISTDIR}/${P}-set-ejabberd-opts.patch" ) # Get path to ejabberd lib directory.