gentoo auto-resync : 14:11:2024 - 03:02:32

4 files changed, 141 insertions, 8 deletions

diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 236191166ed7..17b3e580012a 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,11 +1,14 @@
 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
+AUX loop-aes-3.8e-build-initrd_initfstype.patch 3393 BLAKE2B a0b4ede61378b1fe596f627b866e2430f411d4ba7416a2a570af2b971008452ef7cdd8224343dbf16a4f3f3f97ba14f5b06c4e332d52d594b948d72ae3e5ab80 SHA512 f0666774bea496ef9b2eccd1e05d6960f394309e11fcd527d7b9434ee4500c026c24ed6b024a432d7eb68857d3d738558c08bec7516a31b8329648f691ad057a
+AUX loop-aes-3.8e-build-initrd_prefer-l-a-losetup.patch 1583 BLAKE2B 9d2e98a69d8693e98ba9fa4c21d1f9b72175fa2069073829f9b86373c140bc0f1488e380514e1abe1ff52fe18845667701d58427d91b2d69a178ec04a24d2ab3 SHA512 af8c57ecdf47e2818053326237ea1e9af085ea865d467e5f7b5c8df677492917a13e20c1c77d1ed80c7e2fd801792a736bc5924b3b3f53de2b756a65ce639790
 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
 DIST loop-AES-v3.8d.tar.bz2 419860 BLAKE2B 67362b54d031df928080c97e5143eb80b6b3f2b89c4b2b318794bfa1cf79e9092d312e0dd42a70599b5b4684643f18477203a8ed901ebc13d77dcfbc0f625801 SHA512 10abb0e2719225f74fc01c443cf5fa741dc40548ba342158e5fdaf40934dd50db0b624125073eab04084b8d2245ccd353bf5d1027509e251566940f99576fce0
 DIST loop-AES-v3.8d.tar.bz2.sig 861 BLAKE2B 7835b504cf507a9b70c0fc75ae2a052223f6b8077f6b616a4c0ecf4158ff9cdaf91ca407098195b8bff487db3208519220fd9270b75a75c2b2a037714fedab28 SHA512 57f8da54e3138a3bbc34b312df8efca9346de54e17299ad3308b4b3a859925e19c15eed7e6727c28a5214274e4d48acf8ac4748666032ca0133d0088b9ee3990
-EBUILD loop-aes-3.8b.ebuild 1623 BLAKE2B d361fa2bd4ed04337d1e05a19ea3c1125d2483c3c28792c621a9524351fa1849e7a230df8fa4b618a468cbb10d6295e59c95f6c3dc33a19c96b85e31ddb9ab49 SHA512 61acb688ea1f59c06834bc6723ab0593f35e7b68557ea7d95fdd40d3945011b9251213933d8a5a6f6d31ee4f51d2d188d2f63705adc0cf084f2bf3fea6f25291
+DIST loop-AES-v3.8e.tar.bz2 419394 BLAKE2B 6051efde9c58ecc56231cc1671ed51a238b829098b0f91fe69a63d6080e7c6c87ce9510db25661058493a0e9f51382b7391509f4d146d491a0c7d20dda4eb05c SHA512 6191dbf2c4f2312c5caa14d124353894856fa9b97807c357ff916a81e8633cd8c9eeeb23d08fb7fb532dae02e0ecf03328f48e75227714e1ad9d1fc8ce27d224
+DIST loop-AES-v3.8e.tar.bz2.sig 861 BLAKE2B b220acdbd0c9aadd27abcc7c17818d38e791d3dd9c8f007af09a7fbb3bbcd1e6045fa31a3a13d82f5acfb3da1b6a41da6b6631c130abcd665bf3aa896583cc08 SHA512 2c62886e8be40849b8aa44cd36328c121e35428398f742ea3fad1a5cf445e131fe211ed4faeae4c1d2f702a2e4a050a4a5c4ac3eb341b2b5910cb9ce79c5c184
 EBUILD loop-aes-3.8c.ebuild 1925 BLAKE2B 33318eab9a119997b02788218b468fc1d9736a7d6b296ddf0874df7c261ddfb82fc5d3accc3cc6a020056d70b5f17ff831957ebc50f68eec782d7406243b86ff SHA512 0dcb70bc622bdc914b0671a0bd2d91117a60922a476edc859ce17ab4b017aee33c3b407faa19cb8f8bc6843481bc02010931b87c3cd166b6ebbb5215b79af308
 EBUILD loop-aes-3.8d.ebuild 1925 BLAKE2B 33318eab9a119997b02788218b468fc1d9736a7d6b296ddf0874df7c261ddfb82fc5d3accc3cc6a020056d70b5f17ff831957ebc50f68eec782d7406243b86ff SHA512 0dcb70bc622bdc914b0671a0bd2d91117a60922a476edc859ce17ab4b017aee33c3b407faa19cb8f8bc6843481bc02010931b87c3cd166b6ebbb5215b79af308
+EBUILD loop-aes-3.8e.ebuild 2051 BLAKE2B 26e9ae5cf85b0ed4388e6f73c16fb9bd2fc6b797fb9d551b6e3afe105ee18d14bfb76f4cf8b8f8142e93f92f7bc3b42c8a9fd8ebbff77ec8e3f0804bb35f188b SHA512 ba6a7a5b176fa646649258cd4b38496956df8d20144430610c4bb7db3d6a98aed019a15775b4169b7facd9600e1377707b5945a930718abcd2933666e1cade81
 MISC metadata.xml 648 BLAKE2B 283db8a905c756bf44779739a188d2555ff87bdf77ff46ef2d0d947661633a45a0b163a1ad3a7bcc00a50e6502e01886178245af2c73d86947adda24c948c37a SHA512 8fa7faf71248ce5dc0c217869a2109ea3275c84de1b5f4b898fe97be5c0c4c91d38405699b41a8e591336993d52d69357becba2b2a7f15369dc5e0508c4788b4
diff --git a/sys-fs/loop-aes/files/loop-aes-3.8e-build-initrd_initfstype.patch b/sys-fs/loop-aes/files/loop-aes-3.8e-build-initrd_initfstype.patch
new file mode 100644
index 000000000000..bba57edcafda
--- /dev/null
+++ b/sys-fs/loop-aes/files/loop-aes-3.8e-build-initrd_initfstype.patch
@@ -0,0 +1,76 @@
+diff '--color=auto' -urP loop-AES-v3.8e-build-initrd_prefer-l-a-losetup/build-initrd.sh loop-AES-v3.8e-build-initrd_initfstype/build-initrd.sh
+--- loop-AES-v3.8e-build-initrd_prefer-l-a-losetup/build-initrd.sh	2024-10-11 12:24:11.542170501 -0600
++++ loop-AES-v3.8e-build-initrd_initfstype/build-initrd.sh	2024-10-11 15:31:36.719228138 -0600
+@@ -74,6 +74,8 @@
+ #  2.4 and older kernels always install to block/ directory
+ #  2.6 kernels with loop-AES-v3.2a and later install to extra/ directory
+ #
++# Note, if INITFSTYPE= is not minix, the rootfstype= arguments above
++# will need to be adjusted accordingly.
+ 
+ ### All default-values can be altered via the configfile
+ 
+@@ -183,6 +185,9 @@
+ # which must be in uncompressed form. (can not be .gz file)
+ LOADNATIONALKEYB=0
+ 
++# Filesystem type to use in the initrd (minix or ext2)
++INITFSTYPE=minix
++
+ # Try to auto-assemble linux software raid md devices. This is only
+ # needed and used on USEPIVOT=2 (initramfs/switch_root) type build.
+ # This gets automatically disabled if none of needed devices (BOOTDEV,
+@@ -887,10 +892,51 @@
+         y=`expr ${y} + 1`
+     fi
+ 
++    # Try to detect if the running system lacks support for
++    # the named filesystem, to avoid a less graceful error.
++    if [ -r /proc/filesystems ]; then
++        if ! grep -q "	${INITFSTYPE}\$" /proc/filesystems ; then
++            echo "************************************************"
++            echo "***  INITFSTYPE specifies a filesystem type  ***"
++            echo "***  not supported by the running kernel.    ***"
++            echo "***  Script aborted.                         ***"
++            echo "************************************************"
++            exit 1
++        fi
++    fi
++
++    # Check if the currently booted kernel has a rootfstype=
++    # argument that mismatches; warn but do not abort.
++    if [ -r /proc/cmdline ]; then
++        ROOTFSTYPEARG=$(grep -E -o 'rootfstype=[^ ]+' /proc/cmdline | cut -d= -f2-)
++        if [ -n "${ROOTFSTYPEARG}" ] && [ "${ROOTFSTYPEARG}" != "${INITFSTYPE}" ]; then
++            echo "******************************************************"
++            echo "***  Warning: INITFSTYPE '${INITFSTYPE}'"
++            echo "***  does not match the running kernel argument"
++            echo "***  'rootfstype=${ROOTFSTYPEARG}'"
++            echo "***  Existing bootloader arguments may fail to boot."
++            echo "******************************************************"
++        fi
++    fi
++
++    if [ ${INITFSTYPE} = "minix" ]; then
++        MKFS_ARGS="-t minix -i 32 tmp-i-$$ ${y}"
++    elif [ ${INITFSTYPE} = "ext2" ]; then
++        MKFS_ARGS="-t ext2 -i 1024 tmp-i-$$"
++        y=`expr ${y} + 80`
++    else
++        echo "*******************************************"
++        echo "***  Unsupported INITFSTYPE specified;  ***"
++        echo "***  must be one of: minix, ext2        ***"
++        echo "***  Script aborted.                    ***"
++        echo "*******************************************"
++        exit 1
++    fi
++
+     dd if=/dev/zero of=tmp-i-$$ bs=1024 count=${y}
+-    /sbin/mkfs -t minix -i 32 tmp-i-$$ ${y}
++    /sbin/mkfs ${MKFS_ARGS}
+     ${LOSETUPLIVE} /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX} tmp-i-$$
+-    mount -t minix /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX} tmp-d-$$
++    mount -t ${INITFSTYPE} /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX} tmp-d-$$
+ fi
+ cd tmp-d-$$
+ 
diff --git a/sys-fs/loop-aes/files/loop-aes-3.8e-build-initrd_prefer-l-a-losetup.patch b/sys-fs/loop-aes/files/loop-aes-3.8e-build-initrd_prefer-l-a-losetup.patch
new file mode 100644
index 000000000000..78309cf44926
--- /dev/null
+++ b/sys-fs/loop-aes/files/loop-aes-3.8e-build-initrd_prefer-l-a-losetup.patch
@@ -0,0 +1,42 @@
+diff '--color=auto' -urP loop-AES-v3.8e-build-initrd_explicit-losetup/build-initrd.sh loop-AES-v3.8e-build-initrd_prefer-l-a-losetup/build-initrd.sh
+--- loop-AES-v3.8e-build-initrd_explicit-losetup/build-initrd.sh	2024-10-11 12:21:58.899153668 -0600
++++ loop-AES-v3.8e-build-initrd_prefer-l-a-losetup/build-initrd.sh	2024-10-11 12:24:11.542170501 -0600
+@@ -863,6 +863,11 @@
+ fi
+ rm -f tmp-c-$$.[co]
+ 
++# If the live system has loop-aes-losetup, prefer that over losetup
++# (needed for e.g. Gentoo)
++LOSETUPLIVE=losetup
++command -v loop-aes-losetup >/dev/null && LOSETUPLIVE=loop-aes-losetup
++
+ mkdir tmp-d-$$
+ if [ ${USEPIVOT} != 2 ] ; then
+     x=`cat tmp-c-$$ | wc -c`
+@@ -884,7 +889,7 @@
+ 
+     dd if=/dev/zero of=tmp-i-$$ bs=1024 count=${y}
+     /sbin/mkfs -t minix -i 32 tmp-i-$$ ${y}
+-    losetup /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX} tmp-i-$$
++    ${LOSETUPLIVE} /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX} tmp-i-$$
+     mount -t minix /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX} tmp-d-$$
+ fi
+ cd tmp-d-$$
+@@ -980,7 +985,7 @@
+         if [ ${USEPIVOT} != 2 ] ; then
+             umount tmp-d-$$
+             rmdir tmp-d-$$
+-            losetup -d /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX}
++            ${LOSETUPLIVE} -d /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX}
+             rm tmp-i-$$
+         else
+             rm -rf tmp-d-$$
+@@ -1005,7 +1010,7 @@
+     cd ..
+     df tmp-d-$$
+     umount tmp-d-$$
+-    losetup -d /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX}
++    ${LOSETUPLIVE} -d /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX}
+     rmdir tmp-d-$$
+     sync ; sync ; sync
+     gzip -9 tmp-i-$$
diff --git a/sys-fs/loop-aes/loop-aes-3.8b.ebuild b/sys-fs/loop-aes/loop-aes-3.8e.ebuild
index 9fe025f69c78..c195ff12ea91 100644
--- a/sys-fs/loop-aes/loop-aes-3.8b.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.8e.ebuild
@@ -3,13 +3,21 @@
 
 EAPI=8
 
-inherit linux-mod-r1
+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"
+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"
@@ -17,10 +25,14 @@ 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"
-
-PATCHES=( "${FILESDIR}"/loop-aes-3.7w-build-initrd_explicit-losetup.patch )
-
-S="${WORKDIR}/${MY_P}"
+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
+	"${FILESDIR}"/loop-aes-3.8e-build-initrd_prefer-l-a-losetup.patch
+	"${FILESDIR}"/loop-aes-3.8e-build-initrd_initfstype.patch
+)
 
 pkg_setup() {
 	linux-mod-r1_pkg_setup