From 312997bdbff1265b7227c0e1a200e128fb96f921 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 26 Apr 2024 17:06:29 -0700
Subject: [PATCH] Backport upstream 10ac8d2 to fix passphrase appearing in text
 mode (#2271337)

---
 ...Set-unbuffered-input-when-creating-a.patch | 37 +++++++++++++++++++
 plymouth.spec                                 |  5 +++
 2 files changed, 42 insertions(+)
 create mode 100644 0001-ply-boot-splash-Set-unbuffered-input-when-creating-a.patch

diff --git a/0001-ply-boot-splash-Set-unbuffered-input-when-creating-a.patch b/0001-ply-boot-splash-Set-unbuffered-input-when-creating-a.patch
new file mode 100644
index 0000000..f0de1ba
--- /dev/null
+++ b/0001-ply-boot-splash-Set-unbuffered-input-when-creating-a.patch
@@ -0,0 +1,37 @@
+From 10ac8d2dc927b112ce6aeb06bc73d9c46550954c Mon Sep 17 00:00:00 2001
+From: n3rdopolis <bluescreen_avenger@verizon.net>
+Date: Tue, 6 Feb 2024 18:52:25 -0500
+Subject: [PATCH] ply-boot-splash: Set unbuffered input when creating a text
+ display
+
+---
+ src/libply-splash-core/ply-boot-splash.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/libply-splash-core/ply-boot-splash.c b/src/libply-splash-core/ply-boot-splash.c
+index 12fb6c10..217f455e 100644
+--- a/src/libply-splash-core/ply-boot-splash.c
++++ b/src/libply-splash-core/ply-boot-splash.c
+@@ -173,6 +173,7 @@ ply_boot_splash_add_text_display (ply_boot_splash_t  *splash,
+                                   ply_text_display_t *display)
+ {
+         int number_of_columns, number_of_rows;
++        ply_terminal_t *terminal;
+ 
+         if (splash->plugin_interface->add_text_display == NULL)
+                 return;
+@@ -183,6 +184,11 @@ ply_boot_splash_add_text_display (ply_boot_splash_t  *splash,
+         ply_trace ("adding %dx%d text display", number_of_columns, number_of_rows);
+ 
+         splash->plugin_interface->add_text_display (splash->plugin, display);
++
++        terminal = ply_text_display_get_terminal (display);
++        if (terminal)
++                ply_terminal_set_unbuffered_input (terminal);
++
+         ply_list_append_data (splash->text_displays, display);
+ }
+ 
+-- 
+2.44.0
+
diff --git a/plymouth.spec b/plymouth.spec
index 8548c65..d3fc092 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -13,6 +13,11 @@ Source2: charge.plymouth
 # https://bugzilla.redhat.com/show_bug.cgi?id=2269385
 Patch: 0001-Revert-src-Hide-console-text-when-splash-is-requeste.patch
 
+# https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/10ac8d2dc927b112ce6aeb06bc73d9c46550954c
+# Fix encryption passphrase appearing in plain text in text mode
+# https://bugzilla.redhat.com/show_bug.cgi?id=2271337
+Patch: 0001-ply-boot-splash-Set-unbuffered-input-when-creating-a.patch
+
 BuildRequires: meson
 BuildRequires: system-logos
 BuildRequires: gcc libtool git