From 8f917e848a633ee4ad701b1daec210990e6e1667 Mon Sep 17 00:00:00 2001 From: lixiaokeng Date: Mon, 13 Sep 2021 00:03:57 +0800 Subject: [PATCH] add newer libreadline.so.8 to dlopen path (cherry picked from commit 4e4dd9a0c9a63decc11f57ba14b726d40d78f4b5) --- ...ewer-libreadline.so.8-to-dlopen-path.patch | 30 +++++++++++++++++++ e2fsprogs.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0005-libss-add-newer-libreadline.so.8-to-dlopen-path.patch diff --git a/0005-libss-add-newer-libreadline.so.8-to-dlopen-path.patch b/0005-libss-add-newer-libreadline.so.8-to-dlopen-path.patch new file mode 100644 index 0000000..e45b85a --- /dev/null +++ b/0005-libss-add-newer-libreadline.so.8-to-dlopen-path.patch @@ -0,0 +1,30 @@ +From 3d967e53033c85ad5d3af1a42efb2c4f7501c356 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Fri, 20 Aug 2021 18:15:02 +0200 +Subject: [PATCH] libss: add newer libreadline.so.8 to dlopen path + +OpenSUSE Tumbleweed now has libreadline.so.8. Add it to the list of libs +to look for. + +Signed-off-by: Jan Kara +Signed-off-by: Theodore Ts'o +--- + 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 11c72b3..aa16157 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.7: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.8: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.14.3 (Apple Git-98) + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 571e37f..7eb3ce2 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,6 +1,6 @@ Name: e2fsprogs Version: 1.45.6 -Release: 5 +Release: 6 Summary: Second extended file system management tools License: GPLv2 and LGPLv2 and MIT URL: http://e2fsprogs.sourceforge.net/ @@ -10,6 +10,7 @@ Patch1: 0001-e2fsprogs-set-hugefile-from-4T-to-1T-in-hugefile-tes.patch Patch2: 0002-e2fsck-fix-off-by-one-check-when-validating-depth-of.patch Patch3: 0003-mke2fs-fix-up-check-for-hardlinks-always-false-if-in.patch Patch4: 0004-add-device-check-in-ismount-process.patch +Patch5: 0005-libss-add-newer-libreadline.so.8-to-dlopen-path.patch BuildRequires: gcc pkgconfig texinfo BuildRequires: fuse-devel libblkid-devel libuuid-devel @@ -131,6 +132,9 @@ exit 0 %{_mandir}/man8/* %changelog +* Sun Sep 13 2021 lixiaokeng - 1.45.6-6 +- DESC: add newer libreadline.so.8 to dlopen path + * Fri Aug 20 2021 chenyanpanHW - 1.45.6-5 - DESC: add necessary BuildRequires audit -- Gitee