Upgrade readline to version 8.1-002

Signed-off-by: Marko Lindqvist <[email protected]>

Author: cazfi

dllstack.sh

@@ -1119,17 +1119,19 @@ if ! unpack_component  ncurses                                           ||
    ! deldir_component  ncurses $VERSION_NCURSES "ncurses"                ||
    ! unpack_component  readline                                          ||
    ! patch_readline                                                      ||
-   ! patch_src readline $VERSION_READLINE "readline_posix"               ||
-   ! (is_minimum_version $VERSION_READLINE 7.0 ||
-      patch_src readline $VERSION_READLINE "readline_sighup" )           ||
-   ! (is_smaller_version $VERSION_READLINE 7.0 ||
-      is_minimum_version $VERSION_READLINE 8.0 ||
-      patch_src readline $VERSION_READLINE "readline_chown" )            ||
-   ! patch_src readline $VERSION_READLINE "readline_statf"               ||
-   ! patch_src readline $VERSION_READLINE "readline_ncurses"             ||
+   ! patch_src readline "${VERSION_READLINE}" "readline_posix"           ||
+   ! (is_minimum_version "${VERSION_READLINE}" 7.0 ||
+      patch_src readline "${VERSION_READLINE}" "readline_sighup" )       ||
+   ! (is_smaller_version "${VERSION_READLINE}" 7.0 ||
+      is_minimum_version "${VERSION_READLINE}" 8.0 ||
+      patch_src readline "${VERSION_READLINE}" "readline_chown" )        ||
+   ! (is_smaller_version "${VERSION_READLINE}" 8.1 ||
+      patch_src readline "${VERSION_READLINE}" "readline_sigblock" )     ||
+   ! patch_src readline "${VERSION_READLINE}" "readline_statf"           ||
+   ! patch_src readline "${VERSION_READLINE}" "readline_ncurses"         ||
    ! build_component   readline                                          \
-     "$READLINE_VARS --with-curses"                                      ||
-   ! deldir_component  readline   $VERSION_READLINE "readline"
+     "${READLINE_VARS} --with-curses"                                    ||
+   ! deldir_component  readline   "${VERSION_READLINE}" "readline"
 then
   log_error "Readline build failed"
   exit 1

doc/ChangeLog

@@ -25,6 +25,7 @@
 	- Updated pixman to version 0.44.2
 	- Updated libiconv to version 1.18
 	- Updated SDL2_image to version 2.8.3
+	- Updated readline to version 8.1-002
 
 2.9 (04-Sep-24)
 	- Dropped illegal linker parameter from ImageMagick config

patch/readline_sigblock.patch

@@ -0,0 +1,59 @@
+diff -Nurd readline-8.1/signals.c readline-8.1-newbie/signals.c
+--- readline-8.1/signals.c	2020-08-06 23:30:02.000000000 +0300
++++ readline-8.1-newbie/signals.c	2024-12-22 23:27:14.902660588 +0200
+@@ -210,7 +210,7 @@
+       _rl_sigcleanarg = 0;
+     }
+ 
+-#if defined (HAVE_POSIX_SIGNALS)
++#if defined (HAVE_POSIX_SIGNALS) && defined (SIG_BLOCK)
+   /* Get the current set of blocked signals. If we want to block a signal for
+      the duration of the cleanup functions, make sure to add it to SET and
+      set block_sig = 1 (see the SIGHUP case below). */
+@@ -266,8 +266,10 @@
+     case SIGQUIT:
+ #endif
+ 
++#ifdef SIG_BLOCK
+       if (block_sig)
+ 	sigprocmask (SIG_BLOCK, &set, &oset);
++#endif
+ 
+       rl_echo_signal_char (sig);
+       rl_cleanup_after_signal ();
+@@ -284,7 +286,7 @@
+       /* We don't have to bother unblocking the signal because we are not
+ 	 running in a signal handler context. */
+ #if 0
+-#if defined (HAVE_POSIX_SIGNALS)
++#if defined (HAVE_POSIX_SIGNALS) && defined (SIG_BLOCK)
+       /* Make sure this signal is not blocked when we resend it to the
+ 	 calling application. */
+       sigemptyset (&set);
+@@ -470,7 +472,7 @@
+ 
+   if (rl_catch_signals && signals_set_flag == 0)
+     {
+-#if defined (HAVE_POSIX_SIGNALS)
++#if defined (HAVE_POSIX_SIGNALS) && defined (SIG_BLOCK)
+       sigemptyset (&_rl_orig_sigset);
+       sigprocmask (SIG_BLOCK, &bset, &_rl_orig_sigset);
+ #endif
+@@ -518,7 +520,7 @@
+     }
+   else if (rl_catch_signals == 0)
+     {
+-#if defined (HAVE_POSIX_SIGNALS)
++#if defined (HAVE_POSIX_SIGNALS) && defined (SIG_BLOCK)
+       sigemptyset (&_rl_orig_sigset);
+       sigprocmask (SIG_BLOCK, (sigset_t *)NULL, &_rl_orig_sigset);
+ #endif
+@@ -691,7 +693,7 @@
+ 
+ #if defined (SIGWINCH)
+ 
+-#if defined (HAVE_POSIX_SIGNALS)
++#if defined (HAVE_POSIX_SIGNALS) && defined (SIG_BLOCK)
+   sigemptyset (&sigwinch_set);
+   sigemptyset (&sigwinch_oset);
+   sigaddset (&sigwinch_set, SIGWINCH);

scripts/setup_reader.sh

@@ -110,11 +110,11 @@ if test "$CROSSER_SFML" != "yes" && test "$CROSSER_SFML" != "no" ; then
   echo "Unknown value \"$CROSSER_SFML\" for CROSSER_SFML. Valid values are \"yes\" and \"no\"" >&2
   exit 1
 fi
-if test "$CROSSER_READLINE" = "" ; then
-  CROSSER_READLINE="$CROSSER_FULL"
+if test "${CROSSER_READLINE}" = "" ; then
+  CROSSER_READLINE="${CROSSER_FULL}"
 fi
-if test "$CROSSER_READLINE" != "yes" && test "$CROSSER_READLINE" != "no" ; then
-  echo "Unknown value \"$CROSSER_READLINE\" for CROSSER_READLINE. Valid values are \"yes\" and \"no\"" >&2
+if test "${CROSSER_READLINE}" != "yes" && test "${CROSSER_READLINE}" != "no" ; then
+  echo "Unknown value \"${CROSSER_READLINE}\" for CROSSER_READLINE. Valid values are \"yes\" and \"no\"" >&2
   exit 1
 fi
 if test "$CROSSER_PKGCONF" = "" ; then

setups/current.versions

@@ -23,8 +23,8 @@ VERSION_PKG_CONFIG=0.29.2
 VERSION_PKGCONF=2.3.0
 VERSION_ICON_NUTILS=0.8.90
 VERSION_NCURSES=6.4
-VERSION_READLINE=8.0
-PATCHES_READLINE=4
+VERSION_READLINE=8.1
+PATCHES_READLINE=2
 VERSION_PCRE2=10.44
 VERSION_GLIB=2.82.4
 VERSION_FRIBIDI=1.0.16

setups/mature.versions

@@ -30,8 +30,8 @@ VERSION_PKG_CONFIG=0.29.2
 VERSION_PKGCONF=2.2.0
 VERSION_ICON_NUTILS=0.8.90
 VERSION_NCURSES=6.3
-VERSION_READLINE=7.0
-PATCHES_READLINE=5
+VERSION_READLINE=8.0
+PATCHES_READLINE=4
 VERSION_PCRE2=10.42
 VERSION_GLIB=2.80.5
 VERSION_FRIBIDI=1.0.15

setups/test.versions

@@ -29,8 +29,8 @@ VERSION_PKG_CONFIG=0.29.2
 VERSION_PKGCONF=2.3.0
 VERSION_ICON_NUTILS=0.8.90
 VERSION_NCURSES=6.4
-VERSION_READLINE=8.0
-PATCHES_READLINE=4
+VERSION_READLINE=8.1
+PATCHES_READLINE=2
 VERSION_PCRE2=10.44
 VERSION_GLIB=2.82.4
 VERSION_FRIBIDI=1.0.16