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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F1CC158011 for ; Wed, 31 Aug 2022 14:52:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 074A8E0831; Wed, 31 Aug 2022 14:52:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 E591CE0831 for ; Wed, 31 Aug 2022 14:52:30 +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 11080341249 for ; Wed, 31 Aug 2022 14:52:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 70E605B1 for ; Wed, 31 Aug 2022 14:52:28 +0000 (UTC) From: "Kenton Groombridge" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kenton Groombridge" Message-ID: <1661957428.49efb943a46068b3f6a00220947ac0b16668d757.concord@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-voip/murmur/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-voip/murmur/Manifest net-voip/murmur/murmur-1.4.274-r1.ebuild net-voip/murmur/murmur-1.4.274.ebuild X-VCS-Directories: net-voip/murmur/ X-VCS-Committer: concord X-VCS-Committer-Name: Kenton Groombridge X-VCS-Revision: 49efb943a46068b3f6a00220947ac0b16668d757 X-VCS-Branch: master Date: Wed, 31 Aug 2022 14:52:28 +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: f8e0078b-025a-43e0-b70f-66900e3d7841 X-Archives-Hash: aad305dc603b12a2ae07f9c49508e755 commit: 49efb943a46068b3f6a00220947ac0b16668d757 Author: Kenton Groombridge gentoo org> AuthorDate: Wed Aug 31 14:23:12 2022 +0000 Commit: Kenton Groombridge gentoo org> CommitDate: Wed Aug 31 14:50:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49efb943 net-voip/murmur: fix ODR violations, apply crypto threads patch Signed-off-by: Kenton Groombridge gentoo.org> net-voip/murmur/Manifest | 2 ++ .../murmur/{murmur-1.4.274.ebuild => murmur-1.4.274-r1.ebuild} | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest index f05002991fd7..ae1e2cd591a5 100644 --- a/net-voip/murmur/Manifest +++ b/net-voip/murmur/Manifest @@ -1,5 +1,7 @@ DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68 +DIST mumble-1.4-crypto-threads.patch.xz 1472 BLAKE2B 18f64d7b63a5ac253792e31fe272870a8e6a8bec542c163c6f63e9c80157329ce07e3d8753aa4c29429980903207c457c6488ff81d7dffcc48426a022a8d1767 SHA512 981db1f7d877fa9ab92875449486074c31ea269a48db49cafa9e37380dfb1140d7d4a225765d2f5333b27aa2d271427287ac5c7d32a525eded455d734aca7d8b +DIST mumble-1.4-odr.patch.xz 1088 BLAKE2B 48a7b04ef31f7d0f4cc7e5632ba8f328e5a7fa6961cd971b66a761366351a9a99e3cecce911c90701688083e03f2b63e6838083a8ab669f86fe0fecf23a8596d SHA512 600807cbd893f585c621e7267ee16e2828428fff17aa7eb36b8595164356ef73be2765a41ff9cd7c549c11a63abbf593b0172e56e07571e1c0a3c86fd14e5f15 DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53 DIST mumble-1.4.274.tar.gz 9446657 BLAKE2B db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660 SHA512 6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2 diff --git a/net-voip/murmur/murmur-1.4.274.ebuild b/net-voip/murmur/murmur-1.4.274-r1.ebuild similarity index 91% rename from net-voip/murmur/murmur-1.4.274.ebuild rename to net-voip/murmur/murmur-1.4.274-r1.ebuild index 2f572ab1a86e..6261b3912022 100644 --- a/net-voip/murmur/murmur-1.4.274.ebuild +++ b/net-voip/murmur/murmur-1.4.274-r1.ebuild @@ -15,7 +15,7 @@ else MY_PN="mumble" if [[ "${PV}" == *_pre* ]] ; then MY_P="${MY_PN}-${PV}" - SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz" + SRC_URI="https://dev.gentoo.org/~concord/distfiles/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" else MY_PV="${PV/_/-}" @@ -27,7 +27,9 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -SRC_URI+=" https://dev.gentoo.org/~polynomial-c/mumble-1.4-openssl3.patch.xz" +SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-openssl3.patch.xz" +SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-crypto-threads.patch.xz" +SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-odr.patch.xz" LICENSE="BSD" SLOT="0" @@ -83,6 +85,8 @@ DOC_CONTENTS=" PATCHES=( "${WORKDIR}/mumble-1.4-openssl3.patch" + "${WORKDIR}/mumble-1.4-crypto-threads.patch" + "${WORKDIR}/mumble-1.4-odr.patch" ) src_prepare() {