commit: 4d945888c6574c60c178b4aaaa1665375555f6a3 Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Wed Dec 17 17:41:54 2025 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Wed Dec 17 17:41:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d945888
sys-fs/cryptsetup: remove unused patch Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> .../cryptsetup-2.7.5-compat-test-passwdqc.patch | 58 ---------------------- 1 file changed, 58 deletions(-) diff --git a/sys-fs/cryptsetup/files/cryptsetup-2.7.5-compat-test-passwdqc.patch b/sys-fs/cryptsetup/files/cryptsetup-2.7.5-compat-test-passwdqc.patch deleted file mode 100644 index b266f142f2f4..000000000000 --- a/sys-fs/cryptsetup/files/cryptsetup-2.7.5-compat-test-passwdqc.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://gitlab.com/cryptsetup/cryptsetup/-/commit/64fb1c1b2673e7f366b789943d1627c859a70b1f.patch -https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/737 - -From 64fb1c1b2673e7f366b789943d1627c859a70b1f Mon Sep 17 00:00:00 2001 -From: Gabi Falk <[email protected]> -Date: Sun, 22 Dec 2024 16:00:00 +0000 -Subject: [PATCH] tests/compat-test: Adjust test for compatibility with - passwdqc - -Unlike libpwquality, passwdqc does not consider 'compatkey' a strong -password and rejects 512 character long passwords. - -Closes: https://gitlab.com/cryptsetup/cryptsetup/-/issues/928 -Signed-off-by: Gabi Falk <[email protected]> ---- - tests/compat-test | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/compat-test b/tests/compat-test -index 0b2463dd..f01f3032 100755 ---- a/tests/compat-test -+++ b/tests/compat-test -@@ -250,7 +250,7 @@ echo $PWD1 | $CRYPTSETUP luksAddKey $IMG $FAST_PBKDF_OPT 2>/dev/null && fail - echo -e "$PWD1\n$PWD2" | $CRYPTSETUP luksAddKey $IMG $FAST_PBKDF_OPT || fail - echo -e "$PWD0\n$PWD1" | $CRYPTSETUP luksAddKey $IMG $FAST_PBKDF_OPT 2>/dev/null && fail - echo "[4] change key" --echo -e "$PWD1\n$PWD0\n" | $CRYPTSETUP luksChangeKey $FAST_PBKDF_OPT $IMG || fail -+echo -e "$PWD1\n$PWD0\n" | $CRYPTSETUP luksChangeKey --force-password $FAST_PBKDF_OPT $IMG || fail - echo -e "$PWD1\n$PWD2\n" | $CRYPTSETUP luksChangeKey $FAST_PBKDF_OPT $IMG 2>/dev/null && fail - [ $? -ne 2 ] && fail "luksChangeKey should return EPERM exit code" - echo "[5] remove key" -@@ -941,7 +941,7 @@ prepare "[35] Interactive format of device." wipe - expect_run - >/dev/null <<EOF - proc abort {} { send_error "Timeout. "; exit 2 } - set timeout $EXPECT_TIMEOUT --eval spawn $CRYPTSETUP_RAW luksFormat --type luks1 $FAST_PBKDF_OPT -v $LOOPDEV -+eval spawn $CRYPTSETUP_RAW luksFormat --type luks1 --force-password $FAST_PBKDF_OPT -v $LOOPDEV - expect timeout abort "Are you sure? (Type 'yes' in capital letters):" - send "YES\n" - expect timeout abort "Enter passphrase for $EXPECT_DEV:" -@@ -971,7 +971,7 @@ expect timeout abort "Are you sure? (Type 'yes' in capital letters):" - send "YES\n" - expect timeout abort "Command successful." - expect timeout abort eof --eval spawn $CRYPTSETUP_RAW luksFormat --type luks1 $FAST_PBKDF_OPT -v $LOOPDEV -+eval spawn $CRYPTSETUP_RAW luksFormat --type luks1 --force-password $FAST_PBKDF_OPT -v $LOOPDEV - expect timeout abort "Are you sure? (Type 'yes' in capital letters):" - send "YES\n" - expect timeout abort "Enter passphrase for $EXPECT_DEV:" -@@ -1105,7 +1105,7 @@ echo -n "$LONG_PWD" >$KEYE - expect_run - >/dev/null <<EOF - proc abort {} { send_error "Timeout. "; exit 2 } - set timeout $EXPECT_TIMEOUT --eval spawn $CRYPTSETUP_RAW luksFormat --type luks1 $FAST_PBKDF_OPT -v $LOOPDEV -+eval spawn $CRYPTSETUP_RAW luksFormat --type luks1 --force-password $FAST_PBKDF_OPT -v $LOOPDEV - expect timeout abort "Are you sure? (Type 'yes' in capital letters):" - send "YES\n" - expect timeout abort "Enter passphrase for $EXPECT_DEV:"
