commit: d8f4284590c80f6a331e15a7f535184342920dcb Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Tue Jul 25 03:09:16 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jul 26 03:33:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f42845
sys-kernel/genkernel: update cryptsetup to 2.6.1 This version has the LFS64 changes required for >= musl-1.2.4. Upstream-Commit: https://github.com/gentoo/genkernel/commit/231fdfd9f1c1819d19440627ebe0ea58576a9965 Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/32029 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-kernel/genkernel/Manifest | 1 + ...genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch | 24 ++++++++++++++++++++++ ...ernel-9999.ebuild => genkernel-4.3.5-r1.ebuild} | 3 ++- sys-kernel/genkernel/genkernel-9999.ebuild | 2 +- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest index b99d346d94ec..ea0925c7e25c 100644 --- a/sys-kernel/genkernel/Manifest +++ b/sys-kernel/genkernel/Manifest @@ -5,6 +5,7 @@ DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c279 DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033 SHA512 fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada SHA512 17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7 +DIST cryptsetup-2.6.1.tar.xz 11402380 BLAKE2B efd7a64d89d863876de68ff3e89d8c94ad5eca6a8d2236c52c234fbe51e9d9ee303a0c7fe7dac7df10e0062003b9c0aeddc8dc342582106c157ab2d1e742155e SHA512 0cbddbf33cbac2b834ed7e2dd47a9fc787131031a1c729f373f5c974600a838097e9cc0555f13719fc79c384a2a34b404f94ba4cc2f35f0bb1d70aef2233fd18 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d diff --git a/sys-kernel/genkernel/files/genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch b/sys-kernel/genkernel/files/genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch new file mode 100644 index 000000000000..26caca5de43a --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch @@ -0,0 +1,24 @@ +https://github.com/gentoo/genkernel/commit/231fdfd9f1c1819d19440627ebe0ea58576a9965 + +From 231fdfd9f1c1819d19440627ebe0ea58576a9965 Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Wed, 5 Jul 2023 21:41:39 +0100 +Subject: [PATCH] gkbuilds: cryptsetup: disable asciidoc + +Signed-off-by: Sam James <[email protected]> +--- + gkbuilds/cryptsetup.gkbuild | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild +index 816df609..c084286c 100644 +--- a/gkbuilds/cryptsetup.gkbuild ++++ b/gkbuilds/cryptsetup.gkbuild +@@ -11,6 +11,7 @@ src_configure() { + local myconf=( + --enable-internal-argon2 + --sbindir=/sbin ++ --disable-asciidoc + --disable-nls + --disable-selinux + --disable-ssh-token diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild similarity index 99% copy from sys-kernel/genkernel/genkernel-9999.ebuild copy to sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild index 0a90921d0699..9a46e6c7644d 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild @@ -17,7 +17,7 @@ VERSION_BOOST="1.79.0" VERSION_BTRFS_PROGS="5.15" VERSION_BUSYBOX="1.34.1" VERSION_COREUTILS="8.32" -VERSION_CRYPTSETUP="2.4.1" +VERSION_CRYPTSETUP="2.6.1" VERSION_DMRAID="1.0.0.rc16-3" VERSION_DROPBEAR="2020.81" VERSION_EUDEV="3.2.10" @@ -133,6 +133,7 @@ if [[ ${PV} == 9999* ]]; then fi PATCHES=( + "${FILESDIR}"/${P}-no-asciidoc-on-cryptsetup.patch ) src_unpack() { diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index 0a90921d0699..1c6d353d36db 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -17,7 +17,7 @@ VERSION_BOOST="1.79.0" VERSION_BTRFS_PROGS="5.15" VERSION_BUSYBOX="1.34.1" VERSION_COREUTILS="8.32" -VERSION_CRYPTSETUP="2.4.1" +VERSION_CRYPTSETUP="2.6.1" VERSION_DMRAID="1.0.0.rc16-3" VERSION_DROPBEAR="2020.81" VERSION_EUDEV="3.2.10"
