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 E1E3A158089 for ; Fri, 3 Nov 2023 21:07:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10EBC2BC013; Fri, 3 Nov 2023 21:07:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 E06B72BC013 for ; Fri, 3 Nov 2023 21:07:09 +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 CA53F335D1E for ; Fri, 3 Nov 2023 21:07:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C477AA2 for ; Fri, 3 Nov 2023 21:07:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1699045576.858ecfe2ed6fdc5362c7115e723d52ca43298730.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/btrfs-progs/Manifest sys-fs/btrfs-progs/btrfs-progs-6.6-r1.ebuild sys-fs/btrfs-progs/btrfs-progs-6.6.ebuild X-VCS-Directories: sys-fs/btrfs-progs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 858ecfe2ed6fdc5362c7115e723d52ca43298730 X-VCS-Branch: master Date: Fri, 3 Nov 2023 21:07:07 +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: 89f7d9b6-445d-42ec-a198-992d719ea306 X-Archives-Hash: 263a5c964959dcc651bc073f1a26769c commit: 858ecfe2ed6fdc5362c7115e723d52ca43298730 Author: Sam James gentoo org> AuthorDate: Fri Nov 3 21:04:17 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Nov 3 21:06:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=858ecfe2 sys-fs/btrfs-progs: 6.6 was respun See https://lore.kernel.org/linux-btrfs/20231103201408.GN11264 twin.jikos.cz/T/#u. It's not quite as the mail makes it sound though -- it wasn't like the 6.6 tarball was the same as 6.5.3, it has a different hash and there were changes in there which I checked when doing the bump. Anyway, /var/cache/distfiles/btrfs-progs-v6.6.tar.xz vs /var/cache/distfiles/btrfs-progs-v6.6.respun.tar.xz adds a bunch of missing but legitimate-looking changes. Signed-off-by: Sam James gentoo.org> sys-fs/btrfs-progs/Manifest | 2 +- .../btrfs-progs/{btrfs-progs-6.6.ebuild => btrfs-progs-6.6-r1.ebuild} | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 8a002ef9f1bc..5e9f8947ba23 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -2,4 +2,4 @@ DIST btrfs-progs-v6.3.3.tar.xz 3163112 BLAKE2B 76714da94e1cd733df4198b736c31b32d DIST btrfs-progs-v6.5.1.tar.xz 3179504 BLAKE2B 95d424342dfa238ed4dd525f72618b449e91db198fa6a12bcbb6bb48246d7b5b84a8fd5dc3b943246732fa40c3b575855c966f8ca135b32aa926e0709549cb99 SHA512 87cc81ecad0cb22de3086fef0fd825be101344d44dc954ac05e25d394421ca5fe3dbcb27c79a3a8fb67a2d3237b7bd84329ccef2c070b1b07d1156dc08716dfb DIST btrfs-progs-v6.5.2.tar.xz 3190068 BLAKE2B 74010ed51e211d28ce161db9f6e005bb1c73d8726c9a74446520a46bfa8d6f25d267f747e392f82a8ebeb0b9dd25b3681e9617048e33b9244047089a36fc34c6 SHA512 40b5a2f4d4dcf1810eeb0808e6cb72081ef5743a5072b75e2535420b6acb3a3ead61b01da3217c2bc3fb6ec700f141d4646389cc7a6476ce8af51a424a732672 DIST btrfs-progs-v6.5.3.tar.xz 2542416 BLAKE2B 83a39e1a991ad253a8733235c01fed32c23bde033b7ddc647347dba54a9ba5755d8508e6df817a627d59cefbed6a5696ec485093509ab007374d27c739dabfb1 SHA512 6bec6c0da0b61eb4dce6dc3128fe34fdc68b18cbbb7917c3cd13a558cee9464e6b4c1fcda2cab342d1b506767fab4eee5d03d2fb284a5c7249eec5a75407034a -DIST btrfs-progs-v6.6.tar.xz 2547332 BLAKE2B ade670578958867bc9686a6b6d9665bd609b0335665224a2880811784debb74a820746ae95a7558ca249c8b8afc3ca2664221ef9c5afb6fc1091dd23bbd45067 SHA512 5292c5bbf8fce74fe9529ee99f2340565b1d0c2c9fe48700ddccf7f7165be7cf4467bb9f3f3d70571dfccee6be669235e7ef88b0d248064b78f0c54abf9f7db4 +DIST btrfs-progs-v6.6.respun.tar.xz 2548524 BLAKE2B d8dbbaf82ea1e49409f5003fbcbfe6e768520a0d265cd434f306cedf7adb6194420ba99a247106cb282495ae5041d1e9d128d16886d9038227beb8dc82c153eb SHA512 ce422775b982081b92f7d1823614f62825501a106a7cab450568221c788864c8da090e233f877d3ada87893e10c5b54cb38790e928f7f1db2d9471a1f6463303 diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.6.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.6-r1.ebuild similarity index 95% rename from sys-fs/btrfs-progs/btrfs-progs-6.6.ebuild rename to sys-fs/btrfs-progs/btrfs-progs-6.6-r1.ebuild index 479ade82c97a..6c3a264533c1 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.6.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.6-r1.ebuild @@ -10,7 +10,9 @@ libbtrfs_soname=0 if [[ ${PV} != 9999 ]]; then MY_PV="v${PV/_/-}" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" + # XXX: Drop .respun after 6.6 + # https://lore.kernel.org/linux-btrfs/20231103201408.GN11264@twin.jikos.cz/T/#u + SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz -> ${PN}-${MY_PV}.respun.tar.xz" if [[ ${PV} != *_rc* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"