Compare commits

..

No commits in common. "ef4a03453a05a5bb58bdd45bede0ef86af5981ed" and "f135f638bf387b2858c2da01c741c017a33db24a" have entirely different histories.

5 changed files with 24 additions and 73 deletions

View File

@ -1,41 +0,0 @@
From 7274faabe97ce53d6b464272d7e6ab6c1392837b Mon Sep 17 00:00:00 2001
From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 5 Oct 2022 10:41:16 -0400
Subject: [PATCH] Readline-8.2 patch 1: fix crash when readline is started with
an invalid locale specification
Conflict: The file ._.gitignore does not exist.
Reference: http://git.savannah.gnu.org/cgit/readline.git/commit/?id=7274faabe97ce53d6b464272d7e6ab6c1392837b
---
nls.c | 4 ++++
patchlevel | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/nls.c b/nls.c
index 5c6a13b..8c027d6 100644
--- a/nls.c
+++ b/nls.c
@@ -141,6 +141,10 @@ _rl_init_locale (void)
if (lspec == 0)
lspec = "";
ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */
+ if (ret == 0 || *ret == 0)
+ ret = setlocale (LC_CTYPE, (char *)NULL);
+ if (ret == 0 || *ret == 0)
+ ret = RL_DEFAULT_LOCALE;
#else
ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec;
#endif
diff --git a/patchlevel b/patchlevel
index d8c9df7..fdf4740 100644
--- a/patchlevel
+++ b/patchlevel
@@ -1,3 +1,3 @@
# Do not edit -- exists only for use by patch
-0
+1
--
2.46.0

View File

@ -1,18 +1,32 @@
From 3c0b10478d91274e761a50c5958b6a3645a4e8ee Mon Sep 17 00:00:00 2001 From 5f7f73a57b16ef58769004fe2f4111baf1c81690 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com> From: Jan Chaloupka <jchaloup@redhat.com>
Date: Mon, 21 Jul 2014 13:50:01 +0200 Date: Mon, 21 Jul 2014 13:50:01 +0200
Subject: [PATCH] shlib Subject: [PATCH] shlib
--- ---
support/shobj-conf | 5 +++-- shlib/Makefile.in | 2 +-
1 file changed, 3 insertions(+), 2 deletions(-) support/shobj-conf | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/shlib/Makefile.in b/shlib/Makefile.in
index eb16211..3a34840 100644
--- a/shlib/Makefile.in
+++ b/shlib/Makefile.in
@@ -178,7 +178,7 @@ $(SHARED_READLINE): $(SHARED_OBJ)
$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so
$(RM) $@
- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS)
+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so
# Since tilde.c is shared between readline and bash, make sure we compile
# it with the right flags when it's built as part of readline
diff --git a/support/shobj-conf b/support/shobj-conf diff --git a/support/shobj-conf b/support/shobj-conf
index cd7634d..b9df437 100644 index 5a3f977..e51f7c4 100644
--- a/support/shobj-conf --- a/support/shobj-conf
+++ b/support/shobj-conf +++ b/support/shobj-conf
@@ -126,10 +126,11 @@ sunos5*|solaris2*) @@ -126,10 +126,11 @@ sunos5*|solaris2*)
linux*-*|gnu*-*|k*bsd*-gnu-*|midnightbsd*|freebsd*|dragonfly*) linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*|dragonfly*)
SHOBJ_CFLAGS=-fPIC SHOBJ_CFLAGS=-fPIC
SHOBJ_LD='${CC}' SHOBJ_LD='${CC}'
- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' - SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
@ -26,5 +40,4 @@ index cd7634d..b9df437 100644
# Darwin/MacOS X # Darwin/MacOS X
-- --
2.33.0 1.9.3

BIN
readline-8.1.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,14 +1,13 @@
Name: readline Name: readline
Version: 8.2 Version: 8.1
Release: 4 Release: 1
Summary: Readline library for editing typed command lines Summary: Readline library for editing typed command lines
License: GPLv3+ License: GPLv3+
URL: http://tiswww.case.edu/php/chet/readline/rltop.html URL: http://tiswww.case.edu/php/chet/readline/rltop.html
Source0: http://git.savannah.gnu.org/cgit/readline.git/snapshot/%{name}-%{version}.tar.gz Source0: http://git.savannah.gnu.org/cgit/readline.git/snapshot/%{name}-%{version}.tar.gz
Patch0: readline-8.0-shlib.patch Patch0: readline-8.0-shlib.patch
Patch1: backport-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch
BuildRequires: gcc gcc-c++ ncurses-devel BuildRequires: gcc gcc-c++ ncurses-devel
@ -67,7 +66,6 @@ export CPPFLAGS="-I%{_includedir}/ncurses"
%{_libdir}/libhistory.so %{_libdir}/libhistory.so
%{_libdir}/libreadline.so %{_libdir}/libreadline.so
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/history.pc
%{_docdir}/%{name}/* %{_docdir}/%{name}/*
%{_datadir}/%{name} %{_datadir}/%{name}
%{_libdir}/*.a %{_libdir}/*.a
@ -79,27 +77,8 @@ export CPPFLAGS="-I%{_includedir}/ncurses"
%exclude %{_infodir}/dir* %exclude %{_infodir}/dir*
%{_mandir}/man3/*.3.gz %{_mandir}/man3/*.3.gz
%posttrans
if ! grep -q "enable-bracketed-paste" /etc/inputrc; then
echo "set enable-bracketed-paste 0" >> /etc/inputrc
fi
%changelog %changelog
* Thu Jan 23 2025 shixuantong <shixuantong1@huawei.com> - 8.2-4
- Add shell command to switch bracketed-paste mode from on to off to keep consistent with realine-8.0
* Wed Jan 8 2025 beta <beta@yfqm.date> - 8.2-3
- backport patch to fix segmentation fault problem
* Wed Feb 1 2023 chenziyang <chenziyang4@huawei.com> - 8.2-2
- upload readline-8.0-shlib.patch to fix undefined symbol problem
* Tue Jan 31 2023 chenziyang <chenziyang4@huawei.com> - 8.2-1
- update to 8.2
* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 8.1-2
- rebuild for next release
* Mon Sep 27 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 8.1-1 * Mon Sep 27 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 8.1-1
- update to 8.1 - update to 8.1