6 files changed, 78 insertions, 2 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e6173aedc92a..38749bed1b75 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index 35c0d083151f..46ed3417876c 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1,5 +1,5 @@
 DIST cracklib-words-2.9.7.gz 5537586 BLAKE2B 242afa5e3615b159c59d27c99b87f008f245351cc7e4bd8dc975e66b4ef98456841c6a213282744d39c221c8646dc8e0c5ad99f277f37ae3e64bc949f6b57187 SHA512 1fa34b0a2e16d6906982b248f1757bf5bf8154d8d7e8bab94a4ac25080c41434d3828a2c8dd5065e9be586f36480ab70375f09e0bb64eb495d96a460619e2bae
 DIST cracklib-words-2.9.8.gz 5537586 BLAKE2B ca56229852211094c17b2a612100b5b6e4e4f6aafa7cbfae8f779296370b01e5cae26d7d51dd69af6291946a1781cd19f8652bdff7f358c2e50d26c9e263c2fd SHA512 1700c56b9776b7ae4684b9ab1e784dd7707550bce2149301f662618a4f00a2eb0ba2d1a206c09aac22f7d95bc561544d412d2fdac5008fc3aabc4872e8a74afc
 EBUILD cracklib-words-2.9.7.ebuild 730 BLAKE2B bb11fba3622e072adb2a0b337ceeb58589bcbb871f256ae3c746e91307e61c964295c2bfb6ab9d22d7ba06baeb49a1d46847cb8cbcba0a3cb6feb237409da8d7 SHA512 e0a6feb971675e447e7cbf3f8f3ed8d3325fa54872103f39d810594ac47fab85ea87bca70def7d92e052c0c57cac88240be077c86e40f33a39b5e0c930b30007
-EBUILD cracklib-words-2.9.8.ebuild 734 BLAKE2B 224d186a60fbeb452c692345f44c3265007b2c10b4f7bb29b8f9e86c15378ed58ffa8c93a419464665b67d5486bdd6da044cf20a2b882ab2fc0b792fec6a9b0f SHA512 46831bdc33f640bedb6f93e66c7e62b1b2dae1f4ae6c31be9d302fbb0f4b1da0e2de66b51947a0a8c7a6c183cef541496d599a659ddf94673a8e352d3c8adc20
+EBUILD cracklib-words-2.9.8.ebuild 728 BLAKE2B b6e97b83706fd6c937d8246b3d31b3c55327eb3fa91078c592369355bc4e5ed72e760ca350439213aa38218378eddc7dd511571a3ea780cfefe8aa7f5c78af8c SHA512 92b24a5dec549ae8641b6d8df8bc84171f7e4ccef9a215cc645887aee3666c36d3dff68109d80ed1462c412c6900f4229f273bdb8051ed4a3a2fa4da8d099b39
 MISC metadata.xml 417 BLAKE2B d57320d6e9f27d403b1fbeb93aab3a2ee1773ccbdafb0d56290a767cf0c4b0d12e20c2fd8a12e63bb132fd0ceaa06b7c7e0d6be9d3ab841e0af67164a3006d10 SHA512 e632e2c3f28aee9318c902efdcf62960d8c2420e0bd7beae9b352d51d34a1c3d92a4fceec0daa32c2d11338b38eebdc9ee7d48951abf9f0d2a82dd58dbb74bca
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.8.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.8.ebuild
index e688298dccf3..5d47659449b2 100644
--- a/sys-apps/cracklib-words/cracklib-words-2.9.8.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-2.9.8.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	insinto /usr/share/dict
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 <fontaine.fabrice@gmail.com>
+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 <fontaine.fabrice@gmail.com>
+
+--- 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
+}