7 changed files with 231 additions and 56 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/readline-8.1.tar.gz
+SOURCES/readline-7.0.tar.gz
--- a/.readline.metadata
+++ b/.readline.metadata
@ -1 +1 @@
-48c5e0c3a212449e206e21ba82856accac842c6f SOURCES/readline-8.1.tar.gz
+d9095fa14a812495052357e1d678b3f2ac635463 SOURCES/readline-7.0.tar.gz
--- a/SOURCES/Readline-7.0-patch-1.patch
+++ b/SOURCES/Readline-7.0-patch-1.patch
@ -0,0 +1,46 @@
+From acf3951d483e7b3478db4d731f4a8af99d27327d Mon Sep 17 00:00:00 2001
+From: Chet Ramey <chet.ramey@case.edu>
+Date: Wed, 16 Nov 2016 12:57:31 -0500
+Subject: [PATCH] Readline-7.0 patch 1
+
+---
+ history.c  | 6 +++++-
+ patchlevel | 2 +-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/history.c b/history.c
+index 3b8dbc5..9ff25a7 100644
+--- a/history.c
+++ b/history.c
+@@ -57,6 +57,8 @@ extern int errno;
+ /* How big to make the_history when we first allocate it. */
+ #define DEFAULT_HISTORY_INITIAL_SIZE	502
+ 
+#define MAX_HISTORY_INITIAL_SIZE	8192
+
+ /* The number of slots to increase the_history by. */
+ #define DEFAULT_HISTORY_GROW_SIZE 50
+ 
+@@ -307,7 +309,9 @@ add_history (string)
+       if (history_size == 0)
+ 	{
+ 	  if (history_stifled && history_max_entries > 0)
+-	    history_size = history_max_entries + 2;
+	    history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
+				? MAX_HISTORY_INITIAL_SIZE
+				: history_max_entries + 2;
+ 	  else
+ 	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;
+ 	  the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
+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.9.3
+
--- a/SOURCES/Readline-7.0-patch-2.patch
+++ b/SOURCES/Readline-7.0-patch-2.patch
@ -0,0 +1,77 @@
+From e3f5a97bfa54db0d4e4fe67e406e64f1a58508ea Mon Sep 17 00:00:00 2001
+From: Chet Ramey <chet.ramey@case.edu>
+Date: Sun, 29 Jan 2017 13:55:34 -0500
+Subject: [PATCH] Readline-7.0 patch 2
+
+---
+ history.c  | 16 +++++++---------
+ patchlevel |  2 +-
+ 2 files changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/history.c b/history.c
+index 9ff25a7..129c57a 100644
+--- a/history.c
+++ b/history.c
+@@ -279,6 +279,7 @@ add_history (string)
+      const char *string;
+ {
+   HIST_ENTRY *temp;
+  int new_length;
+ 
+   if (history_stifled && (history_length == history_max_entries))
+     {
+@@ -295,13 +296,9 @@ add_history (string)
+ 
+       /* Copy the rest of the entries, moving down one slot.  Copy includes
+ 	 trailing NULL.  */
+-#if 0
+-      for (i = 0; i < history_length; i++)
+-	the_history[i] = the_history[i + 1];
+-#else
+       memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
+-#endif
+ 
+      new_length = history_length;
+       history_base++;
+     }
+   else
+@@ -315,7 +312,7 @@ add_history (string)
+ 	  else
+ 	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;
+ 	  the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
+-	  history_length = 1;
+	  new_length = 1;
+ 	}
+       else
+ 	{
+@@ -325,14 +322,15 @@ add_history (string)
+ 	      the_history = (HIST_ENTRY **)
+ 		xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
+ 	    }
+-	  history_length++;
+	  new_length = history_length + 1;
+ 	}
+     }
+ 
+   temp = alloc_history_entry ((char *)string, hist_inittime ());
+ 
+-  the_history[history_length] = (HIST_ENTRY *)NULL;
+-  the_history[history_length - 1] = temp;
+  the_history[new_length] = (HIST_ENTRY *)NULL;
+  the_history[new_length - 1] = temp;
+  history_length = new_length;
+ }
+ 
+ /* Change the time stamp of the most recent history entry to STRING. */
+diff --git a/patchlevel b/patchlevel
+index fdf4740..7cbda82 100644
+--- a/patchlevel
+++ b/patchlevel
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+ 
+-1
+2
+-- 
+2.13.6
+
--- a/SOURCES/Readline-7.0-patch-3.patch
+++ b/SOURCES/Readline-7.0-patch-3.patch
@ -0,0 +1,34 @@
+From 6c32f81cd66bbe86218469063690c84205661a5e Mon Sep 17 00:00:00 2001
+From: Chet Ramey <chet.ramey@case.edu>
+Date: Sun, 29 Jan 2017 13:55:51 -0500
+Subject: [PATCH] Readline-7.0 patch 3
+
+---
+ input.c    | 1 +
+ patchlevel | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/input.c b/input.c
+index 286897d..24126ea 100644
+--- a/input.c
+++ b/input.c
+@@ -513,6 +513,7 @@ rl_getc (stream)
+       result = 0;
+ #if defined (HAVE_PSELECT)
+       sigemptyset (&empty_set);
+      sigprocmask (SIG_BLOCK, (sigset_t *)NULL, &empty_set);
+       FD_ZERO (&readfds);
+       FD_SET (fileno (stream), &readfds);
+       result = pselect (fileno (stream) + 1, &readfds, NULL, NULL, NULL, &empty_set);
+diff --git a/patchlevel b/patchlevel
+index 7cbda82..ce3e355 100644
+--- a/patchlevel
+++ b/patchlevel
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+ 
+-2
+3
+-- 
+2.13.6
+
--- a/SOURCES/readline-7.0-shlib.patch
+++ b/SOURCES/readline-7.0-shlib.patch
@ -1,5 +1,16 @@
+From 5f7f73a57b16ef58769004fe2f4111baf1c81690 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Mon, 21 Jul 2014 13:50:01 +0200
+Subject: [PATCH] shlib
+
+---
+ shlib/Makefile.in     | 2 +-
+ support/shlib-install | 2 +-
+ support/shobj-conf    | 5 +++--
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
 diff --git a/shlib/Makefile.in b/shlib/Makefile.in
-index d138524..b68b0cc 100644
+index eb16211..3a34840 100644
 --- a/shlib/Makefile.in
 +++ b/shlib/Makefile.in
@@ -178,7 +178,7 @@ $(SHARED_READLINE):	$(SHARED_OBJ)
@ -11,12 +22,25 @@ index d138524..b68b0cc 100644
 
 # 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/shlib-install b/support/shlib-install
+index cfec3bd..f4eea27 100755
+--- a/support/shlib-install
+++ b/support/shlib-install
+@@ -73,7 +73,7 @@ fi
+ case "$host_os" in
+ hpux*|darwin*|macosx*|linux*|solaris2*)
+ 	if [ -z "$uninstall" ]; then
+-		chmod 555 ${INSTALLDIR}/${LIBNAME}
+		chmod 755 ${INSTALLDIR}/${LIBNAME}
+ 	fi ;;
+ cygwin*|mingw*)
+ 	IMPLIBNAME=`echo ${LIBNAME} \
 diff --git a/support/shobj-conf b/support/shobj-conf
-index 5a3f977..0668a33 100644
+index 1f64433..40827a4 100644
 --- a/support/shobj-conf
 +++ b/support/shobj-conf
@@ -126,10 +126,11 @@ sunos5*|solaris2*)
- linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*|dragonfly*)
+ linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
 	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
 -	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
@ -28,4 +52,7 @@ index 5a3f977..0668a33 100644
 +	SHLIB_LIBS='-ltinfo'
 	;;
 
- # Darwin/MacOS X
+ freebsd2*)
+-- 
+1.9.3
+
--- a/SPECS/readline.spec
+++ b/SPECS/readline.spec
@ -1,21 +1,25 @@
 Summary: A library for editing typed command lines
 Name: readline
-Version: 8.1
-Release: 4%{?dist}
+Version: 7.0
+Release: 10%{?dist}
 License: GPLv3+
-URL: https://tiswww.case.edu/php/chet/readline/rltop.html
+URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz

 # Official upstream patches
 # Patches are converted to apply with '-p1'
+Patch1: Readline-7.0-patch-1.patch
+Patch2: Readline-7.0-patch-2.patch
+Patch3: Readline-7.0-patch-3.patch

 # Other patches
-# Remove RPATH, use CFLAGS
-Patch101: readline-8.0-shlib.patch
+# fix file permissions, remove RPATH, use CFLAGS
+Patch101: readline-7.0-shlib.patch

-BuildRequires: make
-BuildRequires: gcc
+Requires(post): info
+Requires(preun): info
 BuildRequires: ncurses-devel
+BuildRequires: git

 %description
 The Readline library provides a set of functions that allow users to
@ -28,6 +32,9 @@ commands.
 %package devel
 Summary: Files needed to develop programs which use the readline library
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: ncurses-devel%{?_isa}
+Requires(post): info
+Requires(preun): info

 %description devel
 The Readline library provides a set of functions that allow users to
@ -47,16 +54,37 @@ library.
 %autosetup -p1

 %build
-%configure --with-curses --disable-install-examples
+export CPPFLAGS="-I%{_includedir}/ncurses"
+%configure
 %make_build

 %install
 %make_install

-rm -vrf %{buildroot}%{_docdir}/readline
-rm -vf %{buildroot}%{_infodir}/dir*
+rm -rf $RPM_BUILD_ROOT%{_datadir}/readline
+rm -rf $RPM_BUILD_ROOT%{_docdir}/readline
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir*

-%ldconfig_scriptlets
+%post
+/sbin/ldconfig
+/sbin/install-info %{_infodir}/history.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/rluserman.info %{_infodir}/dir || :
+
+%postun -p /sbin/ldconfig
+
+%preun
+if [ $1 = 0 ]; then
+  /sbin/install-info --delete %{_infodir}/history.info %{_infodir}/dir || :
+  /sbin/install-info --delete %{_infodir}/rluserman.info %{_infodir}/dir || :
+fi
+
+%post devel
+/sbin/install-info %{_infodir}/history.info %{_infodir}/dir || :
+
+%preun devel
+if [ $1 = 0 ]; then
+  /sbin/install-info --delete %{_infodir}/readline.info %{_infodir}/dir || :
+fi

 %files
 %license COPYING USAGE
@ -71,7 +99,6 @@ rm -vf %{buildroot}%{_infodir}/dir*
 %{_includedir}/readline/
 %{_libdir}/libreadline.so
 %{_libdir}/libhistory.so
-%{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man3/readline.3*
 %{_mandir}/man3/history.3*
 %{_infodir}/readline.info*
@ -81,44 +108,8 @@ rm -vf %{buildroot}%{_infodir}/dir*
 %{_libdir}/libhistory.a

 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 8.1-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 8.1-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan  6 11:32:21 CET 2021 Siteshwar Vashisht <svashisht@redhat.com> - 8.1-1
- Rebase to readline-8.1
-  Resolves: #1904867
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 8.0-2
- Drop ABI compatibility library
-
-* Fri Feb 15 2019 Siteshwar Vashisht <svashisht@redhat.com> - 8.0-1
- Rebase to readline-8.0
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 12 2018 Siteshwar Vashisht <svashisht@redhat.com> - 7.0-11
- Update to readline-7.0 patchlevel 5
-  Resolves: #1590316
+* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 7.0-10
+- Rebuilt for MSVSphere 8.8

 * Tue Apr  3 2018 Peter Robinson <pbrobinson@fedoraproject.org> 7.0-10
 - Move USAGE to %%license as it describes usage in a licensing context