gentoo auto-resync : 29:05:2023 - 21:18:33

10 files changed, 73 insertions, 37 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f802ef816560..8bba41f6781a 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 0d25aa05bd9f..ece4547f34d4 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,3 +1,3 @@
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
-EBUILD johntheripper-1.8.0-r1.ebuild 2923 BLAKE2B f6c3db1eac0fd4778915a78eb8de651fc7abf1d07d658d081b3275ec9a60dc541b90cfcf024da00088c2a1685291e6a05bbd1b68d0d869646de1f6a09e198551 SHA512 eccc556489d2080fa29c51d2d54f0062b75c09fa155422a916c8d9ceff28ab36c194036d8956b4fbc5223f80e8d4e7579a4d217a9f47430200982fdc0703b7dc
+EBUILD johntheripper-1.8.0-r1.ebuild 2870 BLAKE2B 182a3d5d10b39dd04e4d2cbd365ef8239874fb595c5df9190fcf34909c96d94877c40ab03a413cee6ad4f81fc32bb2f6d0d8dac7d48757b57b9b1f376e6619d1 SHA512 73a5788f1951065480a71b49c8335c2d0adf9cc6918d42a5348bb8120bdab2d10d6a9759e984900a24b147bd87ada80e000b0ee90683770479b6e28589dacfb3
 MISC metadata.xml 409 BLAKE2B f8d40635490b818425ab465d2d34e41c05881a51860e7714161c50af9b061bea3801aefcbad8edb403f3af753b919621b709d23b0a86a0b303b903653f273fd5 SHA512 ed0271486767ec9b53851b534179307b2f160aea50f3a071b9d68aaa21265f5e0e5d031be3b00580e8f706b944ab7ec7aaa7c325485acf73655d899a8787ba13
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
index 1d4e84fe706c..6a6fca918868 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,8 +59,6 @@ get_target() {
 		echo "macosx-ppc32-altivec"
 	elif use x64-macos; then
 		echo "macosx-x86-64"
-	elif use x86-solaris; then
-		echo "solaris-x86-any"
 	else
 		echo "generic"
 	fi
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 933eb784f107..b3481043801b 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,6 +1,6 @@
 AUX p11-kit-0.24.1-configure-clang16.patch 1071 BLAKE2B d12b500a4f38060ec9845cf6b0a348af11b8a1f02fb7d9c4cb2a74825305808d710ab6f69efc0b36f304f0e74a269a81b89b5651e2261c2109b6f942d80749d3 SHA512 5a6dc630d23607910faa1923e2389817f356df33a90e973612f92ef0617a53650cb316e1f2d009ddc658e4599721ad76b5a31ea2150928702c1b6937ab07023d
 DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
 DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
-EBUILD p11-kit-0.23.22.ebuild 1965 BLAKE2B e2b7f0b1ea2268db949840f52a9a0953935313b4c0a7910ada927ac6ac5c4dd423ea16a5aa12437ab6ccf7af8077266a20bb2bda64aec61ffed01b57bcbaa2fe SHA512 bd871947bf1ed6f13a3399360b8fbb5329b19294e282ce65b06b721e852d39a0b936e26b52702f38988c8b64ac00711bd9e42a7c9192bbef879900b939f9f4ac
-EBUILD p11-kit-0.24.1-r1.ebuild 2186 BLAKE2B 759e422b546985e21ae8c49c08f749641c812a5cf14523c4fd1435473ef1d22c4f9b3c770a988b9bfc10c730a296b46896196825a7351cb2eec2361823e3c7e4 SHA512 99fd4890d9315d7453da2f3a603083585e4c9f9afaddba71165b7fb69ea5707743c2798492d2d4f54e2f424ba7ddb83179d2ccace2cc7e0c58500f697d6f9515
+EBUILD p11-kit-0.23.22.ebuild 1419 BLAKE2B dbd06b7fbf70073570c4bf38bb8f5f6c8875fc932f77bfbeb6934b00d0550371576276190b8b4d054f23633778a69d65ac4c7cc5930f0350fa9e5389d23b4c62 SHA512 d4330c6ea50ebab32a47c550148276a34ead4b8202a8d34efb427564e1b1edf42e9c21885a1252abb49d5820a90498f5e455189de2f6fa6dd3af0c3e53c39aff
+EBUILD p11-kit-0.24.1-r1.ebuild 1667 BLAKE2B 75be06aefb5adde36d1009778e221f09a3a1d6b2fa24dfe364b7b04c514decfe3473a998114a2ba6f3d9d3c96cfca7de1f2a2179cb441ed3bff11ebc13c03909 SHA512 3fde1185e77d1a04b268bb270c62b00829984f1f2a8ce9f0ea704efb4bdfbe4bc1be2750bf210724cb2bb46775eab03a8c881cdc397afb37173ae125fa038683
 MISC metadata.xml 382 BLAKE2B 9ed935e598f60088af1877e443371ccb2c70fc397b21702cb4c47a971132c8a912763bf6ab0d27a3b1a387df39542ac7c5f59345a123808476578878633ed938 SHA512 97c120c9c10d8ee73162beb9970f07153f10b095199adee814459754a3df1414f25b8faae036a19f165a45f8ed4ad0a3087272139d69326018450006b75047a1
diff --git a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
index b18247054250..fdc123c2b489 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,20 +27,6 @@ pkg_setup() {
 	export FAKED_MODE=1
 }
 
-src_prepare() {
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
-		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
-		# drop to XPG6 to make feature_tests.h happy
-		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
-		# paths.h isn't available, oddly enough also not used albeit included
-		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
-		# we don't have SUN_LEN here
-		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
-			p11-kit/server.c || die
-	fi
-	default
-}
-
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable trust trust-module) \
diff --git a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
index 640eaa855703..b7d9c1025d7f 100644
--- a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
@@ -33,17 +33,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
-		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
-		# drop to XPG6 to make feature_tests.h happy
-		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
-		# paths.h isn't available, oddly enough also not used albeit included
-		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
-		# we don't have SUN_LEN here
-		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
-			p11-kit/server.c || die
-	fi
-
 	default
 	# TODO: drop in next release (after 0.24.1), p11-kit-0.24.1-configure-clang16.patch is emrged
 	eautoreconf
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
index de8b8683e371..7ba9c815ccc2 100644
--- a/app-crypt/rotix/Manifest
+++ b/app-crypt/rotix/Manifest
@@ -2,5 +2,5 @@ AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 BLAKE2B 62cff4d1566fbb926314240
 AUX rotix-0.83-interix.patch 252 BLAKE2B 319f34ee0d874d5a608259d4fd3f018ec085ec28f96b8a620b4b1606b844acec7d3b665e62b5c032bbe2d928f924d1dcbc519628a8ccde9e0ac259be2f485871 SHA512 4c3862c22fb6c39f8f9653d7415414f28c31f91eeac284fa277c2527abe0a4d549f1eda141a5409b9ba171bbab3c4a2b9c66ecf438413e542682a85b2c549b8c
 AUX rotix-0.83-locale.patch 206 BLAKE2B 98f179037eaebee3ca2c1f41d543dba29fc61209518b3abec238473a38da0d3140aed50ed5a33ed1d0656336df2f3a236cd0f8ced9f0795d807710f1978f881f SHA512 caa6430c0bf96fccae2547524c7eb81170e27ef2adb054671db0f1d8f88ed6a4960b827d1781af4adbf5216c00e007a48071b1b4237f5a691bd46e45bbd599a0
 DIST rotix-0.83.tar.gz 15412 BLAKE2B 4a0db309fa23af3e15a63263e40a2b27e2ebf1e0cf162f2776ebd5237621207eee3a41374170c2e0441104704bde4aff8f929fc5ad8994dfcf4fd1cb5a461696 SHA512 bffe527714f35a99f3322e87d1e2fcbafd38f3a7677e2ca816988df2ce1567ce064f0ab7a543fab3dc2d73f148675fe069c398a5d9c7bb285cb6b1658c3fbffb
-EBUILD rotix-0.83-r1.ebuild 797 BLAKE2B 237cc3dc47dda2ccf26d08d44f35d54a8a248077d4067d3407e70bebe445dcae738594befe186719f30e6339ac1ef28036a679f9bfd909cd7478c2884bb799ba SHA512 8e3a23c0258e19ebdfdd36d9c431a90e403bba0fdd0ce0b62eaf8cbc575bf390d606e584165f0b7bff5543bcf29a5558e2f94252838afdbb11ed79b9d1569227
+EBUILD rotix-0.83-r1.ebuild 800 BLAKE2B 720423e54f7e829944a9a958ad4868e80ec32cfc9cdd6e6ce992ec2363433a78a6d290c29ee10d26ff51db663c33a0af8d7930b7447bfe9b8cb9f4d095e3a443 SHA512 cdb690a367fdcb20c0446ef57a69dfbbbd89d174182c9d5897ef7e4c010ea18a7d3f5cbd2b2da69cd69c7f6937fad004e762fa6a954a2d32873d06f6744fb6ce
 MISC metadata.xml 248 BLAKE2B b4fe04f63894c1e80ba5c13119bbe5b1eb8dbbbfe86a5d0cfe4fb2998c1b045523c2039787212e05e1ed08ebbbfd83386de86de00fc38e7d4e946bcbad117502 SHA512 7e1ead3f76b507b555179148f9c10a3fa3401df81bf4461d456b3255e9844ed4e706d2788761587b086a5e89b430c1149856733a142f3f58ecbe55c2f2ccad8e
diff --git a/app-crypt/rotix/rotix-0.83-r1.ebuild b/app-crypt/rotix/rotix-0.83-r1.ebuild
index 337f79d84925..31d10f900b4b 100644
--- a/app-crypt/rotix/rotix-0.83-r1.ebuild
+++ b/app-crypt/rotix/rotix-0.83-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,9 +16,11 @@ IUSE=""
 DEPEND="sys-devel/gettext"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/0.83-respect-CFLAGS-and-dont-strip.patch
-"${FILESDIR}"/rotix-0.83-locale.patch
-"${FILESDIR}"/rotix-0.83-interix.patch )
+PATCHES=(
+	"${FILESDIR}"/0.83-respect-CFLAGS-and-dont-strip.patch
+	"${FILESDIR}"/rotix-0.83-locale.patch
+	"${FILESDIR}"/rotix-0.83-interix.patch
+)
 
 src_prepare() {
 	default
diff --git a/app-crypt/sbsigntools/Manifest b/app-crypt/sbsigntools/Manifest
index 4353b1731ef3..dcc17dbab151 100644
--- a/app-crypt/sbsigntools/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -2,5 +2,7 @@ AUX sbsigntools-0.9.4-no-werror.patch 483 BLAKE2B 9a25f9a4057bf8738ad3b32542c990
 AUX sbsigntools-0.9.4-openssl3.patch 1313 BLAKE2B 606f51976b5cdff6398330e95e820b07f8cc625549686178014780445cee5c00463b728abebe68b276d642121ad963f43244a0c8e94bf8ca1373c2c63c6c260c SHA512 e6cd2ce156935df31e6d1a8a4712ea94d15c5b3e7e4b02bdb564d9b5eb2daeff73694b60267219c7d7a7ebc1013491c6dc27127b54d6ebb6f4d4623c728925ad
 DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8 SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
 DIST sbsigntools-0.9.4.tar.gz 57714 BLAKE2B 94797af6c98a9c13cb71e52ba6f7ff07de70660af2194b14061e0cb618d6effff52ef7a4dd2fd4e44e75f022b979442d4290b1d65d63017b2fbebdca5951c5c9 SHA512 953d3d9a7f92b837da966eabe3572163a29c5292e792d5ef17cf842d7373ffaa901377cb4ec68006a6ef2f9c97d48db8ffdd3a6d2853be67016d3484a118bba9
+DIST sbsigntools-0.9.5.tar.gz 57876 BLAKE2B 677f87eac9fba9185acd7e25b8d7a3682083938313f3086aaaa6871e010bd403bdda5b9a5fe931151af75a344802c964918be8feb38ec6229d9a16c5b63416b6 SHA512 3b23bdf1855132a91e2063039bd4d14c5564e9cd8f551711aa89a91646ff783afb6e318479e9cf46eedbc914a1eade142398c774d8dbfef8fd1d65cbbe60aabd
 EBUILD sbsigntools-0.9.4-r1.ebuild 1377 BLAKE2B 89ad7f2d63d6acf7f8974f412caa5913ceedda546da0dc3803fa5a4511f0743a513f74b74433d3def24112988f758e3388180b2a39dedbecab57ca09dbe3c997 SHA512 e876cb47208f4a42e3f62448ad1729b8afe8564fa880b7cc283101fb23aa256409e523b370b83e3cdd5b061280397d6ae82f5cf994954041c472b6599c722dc5
+EBUILD sbsigntools-0.9.5.ebuild 1354 BLAKE2B 8a20cd9dfde02fa2ad1c5706935e9e901f4851c0953f7942745fa40505a0c2a01bf41636c088e1f35f1c4fba1e0a8c32d3bd0c634d3053565d55f8f0124efaf6 SHA512 39a00582a23d784a8cd4930187c5935f90dfac9c7ade267188b5c3522db035f43bccb8ca1a11e6e0abdd5e3e23474a676fba0c527d95aeee8e7c0046ba711aff
 MISC metadata.xml 292 BLAKE2B 590a17ca49fb39917074648d0b2439e707a49055f7b65cc923500cfe354b51aa020c3899b14d7de263c97f281aad36c19695f54747c7652bf46ce26d7a14b5d7 SHA512 230e2b4d2b6858ab067cb5ffe9e59b93fa22abe34bbebe74f0eca9a1f96fcfb9bbe536ed34c1bf8d977e8dfc7b46a6d44feb541d3426e6ada42f35f92ac7c896
diff --git a/app-crypt/sbsigntools/sbsigntools-0.9.5.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.5.ebuild
new file mode 100644
index 000000000000..2eaa15852698
--- /dev/null
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN::-1}"
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
+SRC_URI="
+	https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot/${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${MY_PN}-0.8-ccan.tar.gz
+"
+
+LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/openssl:=
+	sys-apps/util-linux
+"
+DEPEND="
+	${RDEPEND}
+	sys-boot/gnu-efi
+	sys-libs/binutils-libs
+"
+BDEPEND="
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.4-no-werror.patch
+)
+
+src_prepare() {
+	mv "${WORKDIR}"/lib/ccan "${S}"/lib || die "mv failed"
+	rmdir "${WORKDIR}"/lib || die "rmdir failed"
+
+	local iarch
+	case ${ARCH} in
+		amd64) iarch=x86_64 ;;
+		arm64) iarch=aarch64 ;;
+		ia64)  iarch=ia64 ;;
+		riscv) iarch=riscv64 ;;
+		x86)   iarch=ia32 ;;
+		*)     die "unsupported architecture: ${ARCH}" ;;
+	esac
+	sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure.ac || die
+	sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.am || die
+	sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
+
+	default
+	eautoreconf
+}