From 070c77515d1406e762e9e344856546f0a15765b6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Nov 2022 06:58:04 +0000 Subject: gentoo auto-resync : 18:11:2022 - 06:58:04 --- sys-apps/sg3_utils/Manifest | 2 ++ sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch | 32 +++++++++++++++++ sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild | 42 ++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch create mode 100644 sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild (limited to 'sys-apps/sg3_utils') diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest index 5ed22af75c63..4d657e3e725d 100644 --- a/sys-apps/sg3_utils/Manifest +++ b/sys-apps/sg3_utils/Manifest @@ -1,6 +1,8 @@ AUX sg3_utils-1.46-musl-drand48-compat.patch 4532 BLAKE2B 454837f33c374eb3002a47b441de9d34f57944ce99c26710b44cab010c1a5fdf538e97dfbea5714cb2d4ac5c7fd508fb23a5d835f0932ca6fcec22604dd55e46 SHA512 faba667b6cb4b7b1d6e04ddd7e80073cd5e80dd4ec7b2312c599a5c1c44df4b9ba8394354881a4968625450691587ddb42adec004043ab604f923d5fb643a86b +AUX sg3_utils-1.47-musl.patch 1238 BLAKE2B 557c29249c23afe8ee807e0cd168d3a502095e3eae0aeea006b37f8b2e8c2dd3530c37517e9dd4ec1aed2bf14707cbc2e1dc6f607f091130dbafa61ca2470b69 SHA512 5eeae68fbca737e127f43c83177adda5c4ad41d49ad6e4ebdb780d25f9eb1a516456e2f91ef20f95cb5dde63505c385b3bf514dcc56235369689f0736df0deef DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf DIST sg3_utils-1.47.tar.xz 1046904 BLAKE2B 6efadd86f6d466469f5d5d3f53b2b6bf01143695db19e96b55a13a606d8a36d5571e390fed0b0990371dc4b77714f88c03f440a4468f6863544c0d21b2e3ef73 SHA512 ef072b8f0012d0944e21d2134aff7125e24ea24d1cbbb1aa79160e844f9a60236f1e244437a3bc08a22a7e99f613adad4a05ae5cc3916ded5a72d162cd3aa163 EBUILD sg3_utils-1.46-r1.ebuild 1078 BLAKE2B e8d173b0636b17a6ef4922f3817ca7250eac4ce241f4103bc75ca39c7a4e2675b10f70672e680bd8d19dfdb8917871a6f46c116ff8585938fe357e83833c1933 SHA512 2b59e7d8e31ec2d5010e2cb822888bde3891f625a46a6951b123c38f39f9978986479688d74986beebbec27230eb27a154c77caad200323ec65733549bcc61dd +EBUILD sg3_utils-1.47-r1.ebuild 1076 BLAKE2B 1a4d06cbe916389f4dab924f60a9958ce5d4df83a851d91dc0f98239120000aa4870f1198e058a24e1a4666f1bc71ac0be706447fc034a8bb92db6cd7d375488 SHA512 7116d389962b86005f07d5a40414d0f8afeb0969c39e1cf3523f0cbca162a6c449f3af757a4e410a112603e84b68f5c5dd557c29b082714383951c6b92e20ec0 EBUILD sg3_utils-1.47.ebuild 1003 BLAKE2B 37ab8a8a18d80df213402fe43335bf07b1a36056a23cdaff02c8b199e8b7e72af3b094170a9b748072848054382be4efe6d504cbd66260ce1d6ea16a18fbf5a9 SHA512 9bb97a9d684a6ff8cf64b8f1db7c4eaebc2c37ab13c990e26139ce02c30b0a6be0af062d3fbeb05426bcf37b31505519788213bc0ade798110c887407eb9c86b MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c 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 +} -- cgit v1.2.3