[gentoo-commits] repo/gentoo:master commit in: sys-fs/loop-aes/files/, sys-fs/loop-aes/

2024-05-25 Thread Sam James 
commit: ec98d5b33d435a4c8e6917f9864cf41889d6d2de
Author: Hank Leininger  korelogic  com>
AuthorDate: Wed May 22 00:20:54 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 25 06:46:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec98d5b3

sys-fs/loop-aes: add nvme boot device support

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/932393
Signed-off-by: Sam James  gentoo.org>

 sys-fs/loop-aes/files/loop-aes-3.8c-build-initrd_nvme.patch | 12 
 sys-fs/loop-aes/loop-aes-3.8c.ebuild|  5 -
 2 files changed, 16 insertions(+), 1 deletion(-)

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 ..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.8c.ebuild 
b/sys-fs/loop-aes/loop-aes-3.8c.ebuild
index 40face6c0e2e..5c3b2d38850a 100644
--- a/sys-fs/loop-aes/loop-aes-3.8c.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.8c.ebuild
@@ -27,7 +27,10 @@ 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 )
+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

[gentoo-commits] repo/gentoo:master commit in: sys-fs/loop-aes/files/, sys-fs/loop-aes/

2022-03-11 Thread Joonas Niilola 
commit: 0bb250ff921c5789e395e491530c23156a01fc3b
Author: Hank Leininger  korelogic  com>
AuthorDate: Fri Mar  4 03:20:22 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Mar 11 08:31:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb250ff

sys-fs/loop-aes: Version bump to 3.7w, minor Gentoo compat fixes

Upstream version bump added 5.16 support. Also, updates to the bundled
build-initrd.sh script to be compatible with Gentoo's install ISO kernel
(see bug).

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/834546
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/24399
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-fs/loop-aes/Manifest   |  1 +
 .../files/build-initrd_explicit-losetup.patch  | 28 +
 sys-fs/loop-aes/loop-aes-3.7w.ebuild   | 69 ++
 3 files changed, 98 insertions(+)

diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 25aeb63a47a7..529b8e4b6fbb 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1 +1,2 @@
 DIST loop-AES-v3.7v.tar.bz2 378465 BLAKE2B 
01d9c3719242846696c1e199a02a42254c06472abce6cee7ccc3882e456921176f7469e9c61331193dd86ee2fcf0d24972f9012026eadad150a8e6116dd4e275
 SHA512 
62c0bafd97bc07d78d128ba3bbcf471bf16bd979264ad9180132b83f01a1e8d4f6d9aa874c602a00bc85360abfefe16f72b28b2c73cc2ad863ea2d36eb7bc478
+DIST loop-AES-v3.7w.tar.bz2 379844 BLAKE2B 
00877a1711afa0a232f6cf0d568fd667fe891393c4cf4602666c68169c71b4a1308806e37ce48f7e5372d5e2416be2f5f1a680302d6ccc795057ccc1d3716f4b
 SHA512 
882653341edba90a4717624382826296d490cd71d4e8843c9f44f606eda0d30a9e685a5310ed3b996b04ab9095d7be6adccff2a16f1c68a2349c052a69fd0a15

diff --git a/sys-fs/loop-aes/files/build-initrd_explicit-losetup.patch 
b/sys-fs/loop-aes/files/build-initrd_explicit-losetup.patch
new file mode 100644
index ..2cf2976b71fe
--- /dev/null
+++ b/sys-fs/loop-aes/files/build-initrd_explicit-losetup.patch
@@ -0,0 +1,28 @@
+--- loop-AES-v3.7v.orig/build-initrd.sh2012-11-12 09:42:58.0 
-0700
 loop-AES-v3.7v/build-initrd.sh 2022-01-05 18:27:49.410016729 -0700
+@@ -884,7 +884,8 @@
+ 
+ dd if=/dev/zero of=tmp-i-$$ bs=1024 count=${y}
+ /sbin/mkfs -t minix -i 32 tmp-i-$$ ${y}
+-mount -t minix tmp-i-$$ tmp-d-$$ -o 
loop=/dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX}
++losetup /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX} tmp-i-$$
++mount -t minix /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX} tmp-d-$$
+ fi
+ cd tmp-d-$$
+ 
+@@ -978,6 +979,7 @@
+ if [ ${USEPIVOT} != 2 ] ; then
+ umount tmp-d-$$
+ rmdir tmp-d-$$
++losetup -d /dev/loop${DEVFSSLASH2}${TEMPLOOPINDEX}
+ rm tmp-i-$$
+ else
+ rm -rf tmp-d-$$
+@@ -1002,6 +1004,7 @@
+ cd ..
+ df tmp-d-$$
+ umount tmp-d-$$
++losetup -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.7w.ebuild 
b/sys-fs/loop-aes/loop-aes-3.7w.ebuild
new file mode 100644
index ..c8931191f0a0
--- /dev/null
+++ b/sys-fs/loop-aes/loop-aes-3.7w.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${PN/aes/AES}-v${PV}"
+
+DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
+HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README;
+SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2;
+
+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"
+
+PATCHES=( "${FILESDIR}"/build-initrd_explicit-losetup.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   linux-mod_pkg_setup
+
+   CONFIG_CHECK="!BLK_DEV_LOOP"
+   MODULE_NAMES="loop(block::tmp-d-kbuild)"
+   BUILD_TARGETS="all"
+
+   BUILD_PARAMS=" \
+   V=1 \
+   LINUX_SOURCE=\"${KERNEL_DIR}\" \
+   KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
+   USE_KBUILD=y MODINST=n RUNDM=n"
+   use cpu_flags_x86_aes && BUILD_PARAMS+=" INTELAES=y"
+   use keyscrub && BUILD_PARAMS+=" KEYSCRUB=y"
+   use cpu_flags_x86_padlock && BUILD_PARAMS+=" PADLOCK=y"
+
+   if use extra-ciphers; then
+   MODULE_NAMES="${MODULE_NAMES}
+   loop_blowfish(block::tmp-d-kbuild)
+   loop_serpent(block::tmp-d-kbuild)
+   loop_twofish(block::tmp-d-kbuild)"
+   BUILD_PARAMS+=" EXTRA_CIPHERS=y"
+   fi
+}
+
+src_install() {
+   linux-mod_src_install
+
+   dodoc README
+   dodoc ChangeLog
+   dobin loop-aes-keygen
+   doman loop-aes-keygen.1
+
+   into /
+   dosbin

[gentoo-commits] repo/gentoo:master commit in: sys-fs/loop-aes/files/

2017-05-20 Thread Alon Bar-Lev 
commit: efab3e0527aa897ea47a9df366e9411f04f38d95
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sat May 20 16:10:39 2017 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Sat May 20 16:11:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efab3e05

sys-fs/loop-aes: cleanup unused patch

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 sys-fs/loop-aes/files/loop-aes-3.7c-linux4.patch | 45 
 1 file changed, 45 deletions(-)

diff --git a/sys-fs/loop-aes/files/loop-aes-3.7c-linux4.patch 
b/sys-fs/loop-aes/files/loop-aes-3.7c-linux4.patch
deleted file mode 100644
index 339f2c9d600..000
--- a/sys-fs/loop-aes/files/loop-aes-3.7c-linux4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 9b7f9272a5462e03daea0b316f9047e103866ed3 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev 
-Date: Wed, 6 May 2015 22:51:54 +0300
-Subject: [PATCH] build: support linux-4
-

- loop-h-version.h   | 4 +++-
- loop.c-4.x.patched | 1 +
- loop.h-4.x.patched | 1 +
- 3 files changed, 5 insertions(+), 1 deletion(-)
- create mode 12 loop.c-4.x.patched
- create mode 12 loop.h-4.x.patched
-
-diff --git a/loop-h-version.h b/loop-h-version.h
-index 8e6a734..84a538c 100644
 a/loop-h-version.h
-+++ b/loop-h-version.h
-@@ -1,5 +1,7 @@
- #include 
--#if LINUX_VERSION_CODE >= 0x3
-+#if LINUX_VERSION_CODE >= 0x4
-+# include "loop.h-4.x.patched"
-+#elif LINUX_VERSION_CODE >= 0x3
- # include "loop.h-3.x.patched"
- #elif LINUX_VERSION_CODE >= 0x20600
- # include "loop.h-2.6.patched"
-diff --git a/loop.c-4.x.patched b/loop.c-4.x.patched
-new file mode 12
-index 000..b6e51c3
 /dev/null
-+++ b/loop.c-4.x.patched
-@@ -0,0 +1 @@
-+loop.c-3.x.patched
-\ No newline at end of file
-diff --git a/loop.h-4.x.patched b/loop.h-4.x.patched
-new file mode 12
-index 000..0924ecb
 /dev/null
-+++ b/loop.h-4.x.patched
-@@ -0,0 +1 @@
-+loop.h-3.x.patched
-\ No newline at end of file
--- 
-2.3.6
-