gentoo auto-resync : 26:05:2024 - 00:07:27

5 files changed, 101 insertions, 3 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 385bf990317b..55ea49b57020 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 1581e942a535..3279941c6187 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,4 +1,8 @@
 AUX loop-aes-3.7w-build-initrd_explicit-losetup.patch 944 BLAKE2B 1fe676ac40df6a08c2e75769fba02fd627ac3411e1657ece64bcf368111b5e9180c9ee5fc392dc3a0bd58299dbffd18cd49a1ba4738bf798915869594f4749ca SHA512 d4f04cec3c39885464e3254366d1c0959ed778c8f60b4353669061b5fecb03c0bc23ecfb9b8cdfc8d143ff5e386d935183e9bb68942d526822ab4f0ebacd06a4
+AUX loop-aes-3.8c-build-initrd_nvme.patch 561 BLAKE2B 373ec8d0445c0776621c04cbf195e4cd1bcf04657a08bb6342a6ebdbbbfe6dd9569224560c9412f96fc037b35b245febc2289301539b669d6f9ecce3f1d181cb SHA512 c14dbbb60267b0f686fcd2a200b40a2edff58f616e8a62c88acca51d11c1dbcb4565fc0fbee4988bd755c05c44d40f65bb3af6fe5a9fda1ffba4db8eb50bb82e
 DIST loop-AES-v3.8b.tar.bz2 411795 BLAKE2B 51e2c4ddd25f288c5cc5cbbbe20d79951d68bc2b7ecc91fe6eddbb829b297fe6946590512f423efcf5be3c4a1c9ce450c0cf49ed44ac6ad8eb2568468570d48f SHA512 8143649cc9616735cb9a9c8cb8b5c8a709b139e8b41aec444d56c85ef7852d103f657d0d702ffb04783963f0d0e919a6fe4e10b31cd373cd326e546caad90661
-EBUILD loop-aes-3.8b.ebuild 1622 BLAKE2B ec8452f7b6364ad52f331e6835fc5b62b02d850240a0d353d7c5ccd37261f9c257111eed308f2527c2d6a3f401d52e3bae663f07516d6c35d814accf06f1c466 SHA512 228ec5d84da815817a0cdb256a1cd32768d2df9e484b732532370b68b5253e8b4eafcad560dc7047b783803fb8c8a44c04e7403bf89524c1a9331e1b1511bbbd
+DIST loop-AES-v3.8c.tar.bz2 419257 BLAKE2B dd7fe8e4fbc3b58e11ef5440ea81b65d9a1e92e71a81020b9664ae2387dd36da327fddab85bfc27b23ac2f546b7622526ded1424e2c6cd3659e8998f914151db SHA512 d22b4773f42d47a8f499e3234f64a880248ea6a2c7e96b598ec11d3d674fca09d989ef9bbee254b384c9fe17adb009115bcfb932081a326400120c1c4c828779
+DIST loop-AES-v3.8c.tar.bz2.sig 861 BLAKE2B aa6c3e2b1e0ab604d92ae6c09fed992f629c7f61b7b62e6d073600f72973ace430e5e0964174a40b63eb703ede4f53098c6deb8af13d663e0bb147a2138a6635 SHA512 44ca990fdf55e8c03e85139dfc07dde5ad1cbd3944060ee2c15b3ce54656b7836e7a8839d237a53361c3ba7bdafda39cbbab0f03bd1952e679d1a3a3c2f0930b
+EBUILD loop-aes-3.8b.ebuild 1623 BLAKE2B d361fa2bd4ed04337d1e05a19ea3c1125d2483c3c28792c621a9524351fa1849e7a230df8fa4b618a468cbb10d6295e59c95f6c3dc33a19c96b85e31ddb9ab49 SHA512 61acb688ea1f59c06834bc6723ab0593f35e7b68557ea7d95fdd40d3945011b9251213933d8a5a6f6d31ee4f51d2d188d2f63705adc0cf084f2bf3fea6f25291
+EBUILD loop-aes-3.8c.ebuild 1925 BLAKE2B 33318eab9a119997b02788218b468fc1d9736a7d6b296ddf0874df7c261ddfb82fc5d3accc3cc6a020056d70b5f17ff831957ebc50f68eec782d7406243b86ff SHA512 0dcb70bc622bdc914b0671a0bd2d91117a60922a476edc859ce17ab4b017aee33c3b407faa19cb8f8bc6843481bc02010931b87c3cd166b6ebbb5215b79af308
 MISC metadata.xml 648 BLAKE2B 283db8a905c756bf44779739a188d2555ff87bdf77ff46ef2d0d947661633a45a0b163a1ad3a7bcc00a50e6502e01886178245af2c73d86947adda24c948c37a SHA512 8fa7faf71248ce5dc0c217869a2109ea3275c84de1b5f4b898fe97be5c0c4c91d38405699b41a8e591336993d52d69357becba2b2a7f15369dc5e0508c4788b4
diff --git a/sys-fs/loop-aes/files/loop-aes-3.8c-build-initrd_nvme.patch b/sys-fs/loop-aes/files/loop-aes-3.8c-build-initrd_nvme.patch
new file mode 100644
index 000000000000..4f0293be6686
--- /dev/null
+++ b/sys-fs/loop-aes/files/loop-aes-3.8c-build-initrd_nvme.patch
@@ -0,0 +1,12 @@
+--- loop-AES-v3.7z.orig/build-initrd.sh.orig	2023-02-27 11:08:09.965971977 -0700
++++ loop-AES-v3.7z/build-initrd.sh	2023-04-17 18:46:32.940350628 -0600
+@@ -967,6 +967,9 @@
+     maybeMakeDiskNode idac0d2p 72  32  0
+     maybeMakeDiskNode idac0d3p 72  48  0
+     maybeMakeDiskNode mmcblk0p 179  0  0
++    maybeMakeDiskNode nvme0n1p 249  0 ""
++    maybeMakeDiskNode nvme1n1p 249  8 ""
++    maybeMakeDiskNode nvme2n1p 249 16 ""
+ 
+     if [ ${mknodCount} != ${mknodRefCount} ] ; then
+         echo "*****************************************************************"
diff --git a/sys-fs/loop-aes/loop-aes-3.8b.ebuild b/sys-fs/loop-aes/loop-aes-3.8b.ebuild
index e74a90959434..9fe025f69c78 100644
--- a/sys-fs/loop-aes/loop-aes-3.8b.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.8b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ MY_P="${PN/aes/AES}-v${PV}"
 
 DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
 HOMEPAGE="https://sourceforge.net/projects/loop-aes/"
-SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2"
+SRC_URI="https://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/loop-aes/loop-aes-3.8c.ebuild b/sys-fs/loop-aes/loop-aes-3.8c.ebuild
new file mode 100644
index 000000000000..03ca24a9e59c
--- /dev/null
+++ b/sys-fs/loop-aes/loop-aes-3.8c.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/jariruusu.asc"
+inherit linux-mod-r1 verify-sig
+
+MY_P="${PN/aes/AES}-v${PV}"
+
+DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
+HOMEPAGE="https://sourceforge.net/projects/loop-aes/"
+SRC_URI="
+	https://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2
+	verify-sig? (
+		https://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2.sign
+			-> ${MY_P}.tar.bz2.sig
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
+
+DEPEND="app-crypt/loop-aes-losetup"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jariruusu )"
+
+PATCHES=(
+	"${FILESDIR}"/loop-aes-3.7w-build-initrd_explicit-losetup.patch
+	"${FILESDIR}"/loop-aes-3.8c-build-initrd_nvme.patch
+)
+
+pkg_setup() {
+	linux-mod-r1_pkg_setup
+
+	CONFIG_CHECK="!BLK_DEV_LOOP"
+}
+
+src_compile() {
+	local modlist=( loop=block::tmp-d-kbuild:all )
+	local modargs=( VAR="${KV_OUT_DIR}"
+		LINUX_SOURCE="${KERNEL_DIR}"
+		KBUILD_OUTPUT="${KBUILD_OUTPUT}"
+		USE_KBUILD=y MODINST=n RUNDM=n )
+
+	if use extra-ciphers; then
+		modlist+=(
+			loop_blowfish=block::tmp-d-kbuild:all
+			loop_serpent=block::tmp-d-kbuild:all
+			loop_twofish=block::tmp-d-kbuild:all )
+		modargs+=( EXTRA_CIPHERS=y )
+	fi
+
+	use cpu_flags_x86_aes && modargs+=( INTELAES=y )
+	use keyscrub && modargs+=( KEYSCRUB=y )
+	use cpu_flags_x86_padlock && modargs+=( PADLOCK=y )
+
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+
+	dodoc README
+	dodoc ChangeLog
+	dobin loop-aes-keygen
+	doman loop-aes-keygen.1
+
+	into /
+	dosbin build-initrd.sh
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+
+	einfo
+	einfo "For more instructions take a look at examples in README at:"
+	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
+	einfo
+}