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 37600158020 for ; Fri, 18 Nov 2022 02:20:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47688E0950; Fri, 18 Nov 2022 02:20:29 +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 E958DE094F for ; Fri, 18 Nov 2022 02:20:28 +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 B2A06340FE1 for ; Fri, 18 Nov 2022 02:20:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18C42756 for ; Fri, 18 Nov 2022 02:20:26 +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: <1668737896.a1e9afb52621981f5e77546348f99d244ddcdb22.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sg3_utils/, sys-apps/sg3_utils/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild X-VCS-Directories: sys-apps/sg3_utils/ sys-apps/sg3_utils/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a1e9afb52621981f5e77546348f99d244ddcdb22 X-VCS-Branch: master Date: Fri, 18 Nov 2022 02:20:26 +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: a01b8ed0-e95e-4a71-9702-5102b0f0fcb0 X-Archives-Hash: 7fdeb36ee9cd4afc26c6b924beff4039 commit: a1e9afb52621981f5e77546348f99d244ddcdb22 Author: Ian Jordan gmail com> AuthorDate: Sun Nov 13 20:45:53 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Nov 18 02:18:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e9afb5 sys-apps/sg3_utils: musl uint fix Upstream patch for cherry pick - https://github.com/doug-gilbert/sg3_utils/commit/9e6d513fe192e53778b6dd98954e43b8e6f0c3a6.patch This patch allows sg3_utils to work under Musl by replacing uint with uint32_t and has been tested on amd64 and PPC. Upstream bug: https://github.com/doug-gilbert/sg3_utils/pull/7 Closes: https://bugs.gentoo.org/828897 Thanks-to: ayuayuayu Signed-off-by: Ian Jordan gmail.com> Closes: https://github.com/gentoo/gentoo/pull/28259 Signed-off-by: Sam James gentoo.org> sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch | 32 +++++++++++++++++ sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild | 42 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch b/sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch new file mode 100644 index 000000000000..1ce015e73a05 --- /dev/null +++ b/sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch @@ -0,0 +1,32 @@ +Closes: https://bugs.gentoo.org/828897 + +From https://github.com/doug-gilbert/sg3_utils/commit/c93ad13ecd8ddfbb8bb3e4d5d5ad7f3f2c633db6.patch Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 14 Nov 2021 12:37:16 +0100 +Subject: [PATCH] src/sg_dd.c: fix musl build + +Fix the following build failure on musl raised since version 1.47 and +https://github.com/doug-gilbert/sg3_utils/commit/f0195003bb0c66ba55084b2f7e0fe982f08c5675: + +sg_dd.c: In function 'main': +sg_dd.c:2402:17: error: unknown type name 'uint'; did you mean 'int'? + 2402 | uint off; + | ^~~~ + | int + +Fixes: + - http://autobuild.buildroot.org/results/9ead59ffefefe2a4e3b94a153b3d23231736d882 + +Signed-off-by: Fabrice Fontaine + +--- a/src/sg_dd.c ++++ b/src/sg_dd.c +@@ -2399,7 +2399,7 @@ main(int argc, char * argv[]) + res = blocks * blk_sz; + if (iflag.zero && iflag.ff && (blk_sz >= 4)) { + uint32_t pos = (uint32_t)skip; +- uint off; ++ uint32_t off; + + for (k = 0, off = 0; k < blocks; ++k, off += blk_sz, ++pos) { + for (j = 0; j < (blk_sz - 3); j += 4) diff --git a/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild new file mode 100644 index 000000000000..b88d096ba1a7 --- /dev/null +++ b/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Apps for querying the sg SCSI interface" +HOMEPAGE="https://sg.danny.cz/sg/" +#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://sg.danny.cz/sg/p/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="static-libs" + +DEPEND="sys-devel/libtool" +RDEPEND="!sys-apps/rescan-scsi-bus" + +PATCHES=( + # Bug #828897 + "${FILESDIR}"/${PN}-1.47-musl.patch +) + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + default + dodoc COVERAGE doc/README examples/*.txt + newdoc scripts/README README.scripts + + find "${ED}" -type f -name "*.la" -delete || die + + # Better fix for bug 231089; some packages look for sgutils2 + local path lib + path="/usr/$(get_libdir)" + for lib in "${ED}/"${path}/libsgutils2{,-${PV}}.*; do + lib=${lib##*/} + dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}" + done +}