diff --git a/e2fsprogs.changes b/e2fsprogs.changes index 6068dbd..6d5216c 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 17 08:35:39 UTC 2022 - Jan Kara + +- libss-add-newer-libreadline.so.7-to-dlopen-path.patch: libss: Add support + for libreadline.so.7 for Leap 15.3 (bsc#1196939) + ------------------------------------------------------------------- Tue Apr 6 16:20:41 UTC 2021 - Jan Kara diff --git a/e2fsprogs.spec b/e2fsprogs.spec index b65bd34..03e5116 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -94,6 +94,7 @@ Patch15: ext2fs-implement-dir-entry-creation-in-htree-directo.patch Patch16: tests-add-test-to-excercise-indexed-directories-with.patch Patch17: tune2fs-update-dir-checksums-when-clearing-dir_index.patch Patch18: po-remove-unnecessary-buggy-positional-parameter-spe.patch +Patch19: libss-add-newer-libreadline.so.7-to-dlopen-path.patch # Do not suppress make commands BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -251,6 +252,7 @@ Development files for the com_err error message display library. Static librarie %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 cp %{SOURCE2} . %build diff --git a/libss-add-newer-libreadline.so.7-to-dlopen-path.patch b/libss-add-newer-libreadline.so.7-to-dlopen-path.patch new file mode 100644 index 0000000..47c977b --- /dev/null +++ b/libss-add-newer-libreadline.so.7-to-dlopen-path.patch @@ -0,0 +1,35 @@ +From cb6d45fb1cd00199d0c7ca6ffe3eee8f7f74fa20 Mon Sep 17 00:00:00 2001 +From: Lukas Czerner +Date: Thu, 22 Feb 2018 14:25:03 +0100 +Subject: [PATCH] libss: add newer libreadline.so.7 to dlopen path +References: bsc#1196939 + +Rawhide now has libreadline.so.7. Add it to the list of libs to look +for. + +Based on commit 4e79a19fe0b6dc3c2bd9cae9dfdbc5e96a3f98f8 for previous +libreadline version. + +Signed-off-by: Lukas Czerner +Signed-off-by: Theodore Ts'o +Acked-by: Jan Kara +--- + lib/ss/get_readline.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ss/get_readline.c b/lib/ss/get_readline.c +index 9365be062db9..11c72b3387d1 100644 +--- a/lib/ss/get_readline.c ++++ b/lib/ss/get_readline.c +@@ -37,7 +37,7 @@ static void ss_release_readline(ss_data *info) + #endif + + /* Libraries we will try to use for readline/editline functionality */ +-#define DEFAULT_LIBPATH "libreadline.so.6:libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so" ++#define DEFAULT_LIBPATH "libreadline.so.7:libreadline.so.6:libreadline.so.5:libreadline.so.4:libreadline.so:libedit.so.2:libedit.so:libeditline.so.0:libeditline.so" + + #ifdef HAVE_DLOPEN + void ss_get_readline(int sci_idx) +-- +2.34.1 +