diff -Nru readline-8.2/debian/README.source readline-8.2/debian/README.source --- readline-8.2/debian/README.source 2009-08-29 10:34:33.000000000 +0000 +++ readline-8.2/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -The package uses dpatch to apply patches on top of the upstream source. -See /usr/share/doc/dpatch/README.source.gz. diff -Nru readline-8.2/debian/changelog readline-8.2/debian/changelog --- readline-8.2/debian/changelog 2023-01-03 20:49:45.000000000 +0000 +++ readline-8.2/debian/changelog 2023-11-26 08:01:05.000000000 +0000 @@ -1,3 +1,21 @@ +readline (8.2-3) unstable; urgency=medium + + * Fix crash in rl_do_undo, taken from upstream. Closes: #1056314, #1037274. + + -- Matthias Klose Sun, 26 Nov 2023 09:01:05 +0100 + +readline (8.2-2) unstable; urgency=medium + + * Apply upstream patches 002 - 007. + * Move libraries to /usr. (Helmut Grohne). Closes: #1055958. + * debian/README.source: Remove. Closes: #1023676. + * Remove dependencies on install-info: Closes: #1012425. + * Add Homepage attribute. Closes: #1019711. + * Bump debhelper and standards versions. + * Update watch file. + + -- Matthias Klose Sat, 25 Nov 2023 11:07:51 +0100 + readline (8.2-1.3) unstable; urgency=medium * Non-maintainer upload. diff -Nru readline-8.2/debian/compat readline-8.2/debian/compat --- readline-8.2/debian/compat 2020-08-04 17:35:27.000000000 +0000 +++ readline-8.2/debian/compat 2023-11-25 10:08:44.000000000 +0000 @@ -1 +1 @@ -11 +13 diff -Nru readline-8.2/debian/control readline-8.2/debian/control --- readline-8.2/debian/control 2022-11-11 06:28:05.000000000 +0000 +++ readline-8.2/debian/control 2023-11-25 10:37:26.000000000 +0000 @@ -2,12 +2,13 @@ Section: libs Priority: optional Maintainer: Matthias Klose -Standards-Version: 4.6.1 -Build-Depends: debhelper (>= 11), +Standards-Version: 4.6.2 +Build-Depends: debhelper (>= 13), libncurses-dev, lib32ncurses-dev [amd64 ppc64] , lib64ncurses-dev [i386 powerpc sparc s390] , mawk | awk, texinfo, gcc-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 s390 sparc] +Homepage: https://tiswww.case.edu/php/chet/readline/rltop.html Package: libreadline8 Architecture: any @@ -55,7 +56,7 @@ Architecture: all Multi-Arch: foreign Section: utils -Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Depends: ${misc:Depends} Conflicts: libreadline5 (<< 5.0-11), libreadline-common Replaces: libreadline4 (<< 4.3-16), libreadline5 (<< 5.0-11), libreadline-common Suggests: readline-doc @@ -84,7 +85,7 @@ Package: libreadline-dev Architecture: any Section: libdevel -Depends: libreadline8 (= ${binary:Version}), libncurses-dev, dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Depends: libreadline8 (= ${binary:Version}), libncurses-dev, ${misc:Depends} Multi-Arch: same Conflicts: libreadline5-dev, libreadline6-dev, libreadline-gplv2-dev Suggests: readline-doc @@ -160,7 +161,7 @@ Architecture: all Multi-Arch: foreign Section: doc -Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Depends: ${misc:Depends} Replaces: libreadline6-dev (<< 6.3-8) Description: GNU readline and history libraries, documentation and examples The GNU readline library aids in the consistency of user interface diff -Nru readline-8.2/debian/copyright readline-8.2/debian/copyright --- readline-8.2/debian/copyright 2023-01-03 20:49:00.000000000 +0000 +++ readline-8.2/debian/copyright 2023-11-25 10:27:21.000000000 +0000 @@ -60,9 +60,7 @@ GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program (see the file COPYING); if not, write to the - Free Software Foundation, Inc., - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + along with Readline. If not, see . Comment: On Debian systems, the complete text of the GNU General Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. @@ -93,7 +91,7 @@ Files: debian/* Copyright: - Copyright (C) 1999-2009 Matthias Klose + Copyright (C) 1999-2023 Matthias Klose License: GPL-3 The Debian packaging is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'. diff -Nru readline-8.2/debian/patches/0001-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch readline-8.2/debian/patches/0001-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch --- readline-8.2/debian/patches/0001-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch 2022-10-15 11:47:17.000000000 +0000 +++ readline-8.2/debian/patches/0001-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -From 7274faabe97ce53d6b464272d7e6ab6c1392837b Mon Sep 17 00:00:00 2001 -From: Chet Ramey -Date: Wed, 5 Oct 2022 10:41:16 -0400 -Subject: Readline-8.2 patch 1: fix crash when readline is started with an - invalid locale specification - ---- 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 -Nru readline-8.2/debian/patches/fix-rl_do_undo-crash.diff readline-8.2/debian/patches/fix-rl_do_undo-crash.diff --- readline-8.2/debian/patches/fix-rl_do_undo-crash.diff 1970-01-01 00:00:00.000000000 +0000 +++ readline-8.2/debian/patches/fix-rl_do_undo-crash.diff 2023-11-26 08:00:54.000000000 +0000 @@ -0,0 +1,125 @@ +https://git.savannah.gnu.org/cgit/bash.git/patch/?id=277c21d2b2c6730f6cbda428180b08bacdcecc80 + +From 277c21d2b2c6730f6cbda428180b08bacdcecc80 Mon Sep 17 00:00:00 2001 +From: Chet Ramey +Date: Mon, 6 Mar 2023 10:50:45 -0500 +Subject: readline fix for rl_undo_list pointer aliasing; arith command sets + word_top + +--- a/histlib.h ++++ b/histlib.h +@@ -1,6 +1,6 @@ + /* histlib.h -- internal definitions for the history library. */ + +-/* Copyright (C) 1989-2009,2021-2022 Free Software Foundation, Inc. ++/* Copyright (C) 1989-2009,2021-2023 Free Software Foundation, Inc. + + This file contains the GNU History Library (History), a set of + routines for managing the text of previously typed lines. +@@ -84,6 +84,7 @@ extern int _hs_history_patsearch (const + + /* history.c */ + extern void _hs_replace_history_data (int, histdata_t *, histdata_t *); ++extern int _hs_search_history_data (histdata_t *); + extern int _hs_at_end_of_history (void); + + /* histfile.c */ +--- a/history.c ++++ b/history.c +@@ -1,6 +1,6 @@ + /* history.c -- standalone history library */ + +-/* Copyright (C) 1989-2021 Free Software Foundation, Inc. ++/* Copyright (C) 1989-2023 Free Software Foundation, Inc. + + This file contains the GNU History Library (History), a set of + routines for managing the text of previously typed lines. +@@ -460,7 +460,7 @@ _hs_replace_history_data (int which, his + } + + last = -1; +- for (i = 0; i < history_length; i++) ++ for (i = history_length - 1; i >= 0; i--) + { + entry = the_history[i]; + if (entry == 0) +@@ -477,7 +477,27 @@ _hs_replace_history_data (int which, his + entry = the_history[last]; + entry->data = new; /* XXX - we don't check entry->old */ + } +-} ++} ++ ++int ++_hs_search_history_data (histdata_t *needle) ++{ ++ register int i; ++ HIST_ENTRY *entry; ++ ++ if (history_length == 0 || the_history == 0) ++ return -1; ++ ++ for (i = history_length - 1; i >= 0; i--) ++ { ++ entry = the_history[i]; ++ if (entry == 0) ++ continue; ++ if (entry->data == needle) ++ return i; ++ } ++ return -1; ++} + + /* Remove history element WHICH from the history. The removed + element is returned to you so you can free the line, data, +--- a/misc.c ++++ b/misc.c +@@ -339,6 +339,9 @@ rl_maybe_replace_line (void) + xfree (temp->line); + FREE (temp->timestamp); + xfree (temp); ++ /* XXX - what about _rl_saved_line_for_history? if the saved undo list ++ is rl_undo_list, and we just put that into a history entry, should ++ we set the saved undo list to NULL? */ + } + return 0; + } +@@ -386,14 +389,16 @@ _rl_free_saved_history_line (void) + + if (_rl_saved_line_for_history) + { +- if (rl_undo_list && rl_undo_list == (UNDO_LIST *)_rl_saved_line_for_history->data) +- rl_undo_list = 0; +- /* Have to free this separately because _rl_free_history entry can't: +- it doesn't know whether or not this has application data. Only the +- callers that know this is _rl_saved_line_for_history can know that +- it's an undo list. */ +- if (_rl_saved_line_for_history->data) +- _rl_free_undo_list ((UNDO_LIST *)_rl_saved_line_for_history->data); ++ UNDO_LIST *sentinel; ++ ++ sentinel = (UNDO_LIST *)_rl_saved_line_for_history->data; ++ ++ /* We should only free `data' if it's not the current rl_undo_list and ++ it's not the `data' member in a history entry somewhere. We have to ++ free it separately because only the callers know it's an undo list. */ ++ if (sentinel && sentinel != rl_undo_list && _hs_search_history_data ((histdata_t *)sentinel) < 0) ++ _rl_free_undo_list (sentinel); ++ + _rl_free_history_entry (_rl_saved_line_for_history); + _rl_saved_line_for_history = (HIST_ENTRY *)NULL; + } +--- a/search.c ++++ b/search.c +@@ -88,8 +88,10 @@ make_history_line_current (HIST_ENTRY *e + + xlist = _rl_saved_line_for_history ? (UNDO_LIST *)_rl_saved_line_for_history->data : 0; + /* At this point, rl_undo_list points to a private search string list. */ +- if (rl_undo_list && rl_undo_list != (UNDO_LIST *)entry->data && rl_undo_list != xlist) ++ if (rl_undo_list && rl_undo_list != (UNDO_LIST *)entry->data && rl_undo_list != xlist && ++ _hs_search_history_data ((histdata_t *)rl_undo_list) < 0) + rl_free_undo_list (); ++ rl_undo_list = 0; /* XXX */ + + /* Now we create a new undo list with a single insert for this text. + WE DON'T CHANGE THE ORIGINAL HISTORY ENTRY UNDO LIST */ diff -Nru readline-8.2/debian/patches/readline82-001.diff readline-8.2/debian/patches/readline82-001.diff --- readline-8.2/debian/patches/readline82-001.diff 1970-01-01 00:00:00.000000000 +0000 +++ readline-8.2/debian/patches/readline82-001.diff 2023-11-25 10:22:21.000000000 +0000 @@ -0,0 +1,35 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-001 + +Bug-Reported-by: Kan-Ru Chen +Bug-Reference-ID: +Bug-Reference-URL: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021109 + +Bug-Description: + +Starting a readline application with an invalid locale specification for +LC_ALL/LANG/LC_CTYPE can cause it crash on the first call to readline. + +--- 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 +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-0 ++1 diff -Nru readline-8.2/debian/patches/readline82-002.diff readline-8.2/debian/patches/readline82-002.diff --- readline-8.2/debian/patches/readline82-002.diff 1970-01-01 00:00:00.000000000 +0000 +++ readline-8.2/debian/patches/readline82-002.diff 2023-11-25 10:22:31.000000000 +0000 @@ -0,0 +1,38 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-002 + +Bug-Reported-by: srobertson@peratonlabs.com +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-09/msg00049.html + +Bug-Description: + +It's possible for readline to try to zero out a line that's not null- +terminated, leading to a memory fault. + +--- a/display.c ++++ b/display.c +@@ -2683,11 +2683,8 @@ rl_forced_update_display (void) + register char *temp; + + if (visible_line) +- { +- temp = visible_line; +- while (*temp) +- *temp++ = '\0'; +- } ++ memset (visible_line, 0, line_size); ++ + rl_on_new_line (); + forced_display++; + (*rl_redisplay_function) (); +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-1 ++2 diff -Nru readline-8.2/debian/patches/readline82-003.diff readline-8.2/debian/patches/readline82-003.diff --- readline-8.2/debian/patches/readline82-003.diff 1970-01-01 00:00:00.000000000 +0000 +++ readline-8.2/debian/patches/readline82-003.diff 2023-11-25 10:22:48.000000000 +0000 @@ -0,0 +1,33 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-003 + +Bug-Reported-by: Stefan Klinger +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-08/msg00018.html + +Bug-Description: + +The custom color prefix that readline uses to color possible completions +must have a leading `.'. + +--- a/colors.c ++++ b/colors.c +@@ -73,7 +73,7 @@ + static bool is_colored (enum indicator_no type); + static void restore_default_color (void); + +-#define RL_COLOR_PREFIX_EXTENSION "readline-colored-completion-prefix" ++#define RL_COLOR_PREFIX_EXTENSION ".readline-colored-completion-prefix" + + COLOR_EXT_TYPE *_rl_color_ext_list = 0; + +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-2 ++3 diff -Nru readline-8.2/debian/patches/readline82-004.diff readline-8.2/debian/patches/readline82-004.diff --- readline-8.2/debian/patches/readline82-004.diff 1970-01-01 00:00:00.000000000 +0000 +++ readline-8.2/debian/patches/readline82-004.diff 2023-11-25 10:23:02.000000000 +0000 @@ -0,0 +1,51 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-004 + +Bug-Reported-by: Henry Bent +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-11/msg00044.html + +Bug-Description: + +There are systems that supply one of select or pselect, but not both. + +--- a/input.c ++++ b/input.c +@@ -151,7 +151,9 @@ int rl_timeout_remaining (unsigned int * + + int _rl_timeout_init (void); + int _rl_timeout_sigalrm_handler (void); ++#if defined (RL_TIMEOUT_USE_SELECT) + int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *); ++#endif + + static void _rl_timeout_handle (void); + #if defined (RL_TIMEOUT_USE_SIGALRM) +@@ -248,7 +250,7 @@ rl_gather_tyi (void) + register int tem, result; + int chars_avail, k; + char input; +-#if defined(HAVE_SELECT) ++#if defined (HAVE_PSELECT) || defined (HAVE_SELECT) + fd_set readfds, exceptfds; + struct timeval timeout; + #endif +@@ -805,7 +807,7 @@ rl_getc (FILE *stream) + int result; + unsigned char c; + int fd; +-#if defined (HAVE_PSELECT) ++#if defined (HAVE_PSELECT) || defined (HAVE_SELECT) + sigset_t empty_set; + fd_set readfds; + #endif +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-3 ++4 diff -Nru readline-8.2/debian/patches/readline82-005.diff readline-8.2/debian/patches/readline82-005.diff --- readline-8.2/debian/patches/readline82-005.diff 1970-01-01 00:00:00.000000000 +0000 +++ readline-8.2/debian/patches/readline82-005.diff 2023-11-25 10:23:10.000000000 +0000 @@ -0,0 +1,40 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-005 + +Bug-Reported-by: Simon Marchi +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-09/msg00005.html + +Bug-Description: + +If an application is using readline in callback mode, and a signal arrives +after readline checks for it in rl_callback_read_char() but before it +restores the application's signal handlers, it won't get processed until the +next time the application calls rl_callback_read_char(). Readline needs to +check for and resend any pending signals after restoring the application's +signal handlers. + +--- a/callback.c ++++ b/callback.c +@@ -115,7 +115,10 @@ rl_callback_handler_install (const char + #define CALLBACK_READ_RETURN() \ + do { \ + if (rl_persistent_signal_handlers == 0) \ +- rl_clear_signals (); \ ++ { \ ++ rl_clear_signals (); \ ++ if (_rl_caught_signal) _rl_signal_handler (_rl_caught_signal); \ ++ } \ + return; \ + } while (0) + #else +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-4 ++5 diff -Nru readline-8.2/debian/patches/readline82-006.diff readline-8.2/debian/patches/readline82-006.diff --- readline-8.2/debian/patches/readline82-006.diff 1970-01-01 00:00:00.000000000 +0000 +++ readline-8.2/debian/patches/readline82-006.diff 2023-11-25 10:23:17.000000000 +0000 @@ -0,0 +1,89 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-006 + +Bug-Reported-by: Tom de Vries +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-09/msg00001.html + +Bug-Description: + +This is a variant of the same issue as the one fixed by patch 5. In this +case, the signal arrives and is pending before readline calls rl_getc(). +When this happens, the pending signal will be handled by the loop, but may +alter or destroy some state that the callback uses. Readline needs to treat +this case the same way it would if a signal interrupts pselect/select, so +compound operations like searches and reading numeric arguments get cleaned +up properly. + +--- a/input.c ++++ b/input.c +@@ -804,7 +804,7 @@ rl_read_key (void) + int + rl_getc (FILE *stream) + { +- int result; ++ int result, ostate, osig; + unsigned char c; + int fd; + #if defined (HAVE_PSELECT) || defined (HAVE_SELECT) +@@ -815,8 +815,22 @@ rl_getc (FILE *stream) + fd = fileno (stream); + while (1) + { ++ osig = _rl_caught_signal; ++ ostate = rl_readline_state; ++ + RL_CHECK_SIGNALS (); + ++#if defined (READLINE_CALLBACKS) ++ /* Do signal handling post-processing here, but just in callback mode ++ for right now because the signal cleanup can change some of the ++ callback state, and we need to either let the application have a ++ chance to react or abort some current operation that gets cleaned ++ up by rl_callback_sigcleanup(). If not, we'll just run through the ++ loop again. */ ++ if (osig != 0 && (ostate & RL_STATE_CALLBACK)) ++ goto postproc_signal; ++#endif ++ + /* We know at this point that _rl_caught_signal == 0 */ + + #if defined (__MINGW32__) +@@ -880,6 +894,9 @@ rl_getc (FILE *stream) + /* fprintf(stderr, "rl_getc: result = %d errno = %d\n", result, errno); */ + + handle_error: ++ osig = _rl_caught_signal; ++ ostate = rl_readline_state; ++ + /* If the error that we received was EINTR, then try again, + this is simply an interrupted system call to read (). We allow + the read to be interrupted if we caught SIGHUP, SIGTERM, or any +@@ -920,8 +937,17 @@ handle_error: + RL_CHECK_SIGNALS (); + #endif /* SIGALRM */ + ++postproc_signal: ++ /* POSIX says read(2)/pselect(2)/select(2) don't return EINTR for any ++ reason other than being interrupted by a signal, so we can safely ++ call the application's signal event hook. */ + if (rl_signal_event_hook) + (*rl_signal_event_hook) (); ++#if defined (READLINE_CALLBACKS) ++ else if (osig == SIGINT && (ostate & RL_STATE_CALLBACK) && (ostate & (RL_STATE_ISEARCH|RL_STATE_NSEARCH|RL_STATE_NUMERICARG))) ++ /* just these cases for now */ ++ _rl_abort_internal (); ++#endif + } + } + +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-5 ++6 diff -Nru readline-8.2/debian/patches/readline82-007.diff readline-8.2/debian/patches/readline82-007.diff --- readline-8.2/debian/patches/readline82-007.diff 1970-01-01 00:00:00.000000000 +0000 +++ readline-8.2/debian/patches/readline82-007.diff 2023-11-25 10:23:26.000000000 +0000 @@ -0,0 +1,37 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-007 + +Bug-Reported-by: Kevin Pulo +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-11/msg00002.html + +Bug-Description: + +If readline is called with no prompt, it should display a newline if return +is typed on an empty line. It should still suppress the final newline if +return is typed on the last (empty) line of a multi-line command. + +--- a/display.c ++++ b/display.c +@@ -3338,9 +3338,9 @@ _rl_update_final (void) + puts_face (&last_line[_rl_screenwidth - 1 + woff], + &last_face[_rl_screenwidth - 1 + woff], 1); + } +- _rl_vis_botlin = 0; +- if (botline_length > 0 || _rl_last_c_pos > 0) ++ if ((_rl_vis_botlin == 0 && botline_length == 0) || botline_length > 0 || _rl_last_c_pos > 0) + rl_crlf (); ++ _rl_vis_botlin = 0; + fflush (rl_outstream); + rl_display_fixed++; + } +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-6 ++7 diff -Nru readline-8.2/debian/patches/series readline-8.2/debian/patches/series --- readline-8.2/debian/patches/series 2022-10-15 11:47:16.000000000 +0000 +++ readline-8.2/debian/patches/series 2023-11-26 08:00:29.000000000 +0000 @@ -1,4 +1,10 @@ -#readline81-001.diff +readline82-001.diff +readline82-002.diff +readline82-003.diff +readline82-004.diff +readline82-005.diff +readline82-006.diff +readline82-007.diff rl-attribute.diff rl-header.diff rl-no-cross-check.diff @@ -10,4 +16,4 @@ fix-wformat-security.diff configure-tinfo.diff rlfe-signal-rvt.diff -0001-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch +fix-rl_do_undo-crash.diff diff -Nru readline-8.2/debian/rlfe.copyright readline-8.2/debian/rlfe.copyright --- readline-8.2/debian/rlfe.copyright 2023-01-03 20:49:10.000000000 +0000 +++ readline-8.2/debian/rlfe.copyright 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Comment: - This is Debian GNU/Linux's prepackaged version of the rlfe program. - This package was put together by Matthias Klose . -Upstream-Contact: - Per Bothner - Juergen Weigert (examples/rlfe) - Michael Schroeder (examples/rlfe) -Source: http://ftp.gnu.org/gnu/readline/ - -Files: examples/rlfe/* -Copyright: - Copyright (C) 2004, 1999 Per Bothner - Copyright (c) 1993-2002 Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) - Copyright (c) 1993-2002 Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) - Copyright (c) 1987 Oliver Laumann -License: GPL-2+ - A front-end using readline to "cook" input lines for Kawa. - . - Copyright (C) 1999 Per Bothner - . - This front-end program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - . - Some code from Johnson & Troan: "Linux Application Development" - (Addison-Wesley, 1998) was used directly or for inspiration. -Comment: - You should have received a copy of the GNU General Public License with - your Debian GNU/Linux system, in /usr/share/common-licenses/GPL-2. If not, - write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301, USA. diff -Nru readline-8.2/debian/rules readline-8.2/debian/rules --- readline-8.2/debian/rules 2022-11-11 06:26:09.000000000 +0000 +++ readline-8.2/debian/rules 2023-11-25 10:32:09.000000000 +0000 @@ -47,8 +47,7 @@ ifneq (,$(findstring /$(DEB_HOST_ARCH)/,/amd64/ppc64/)) build32 = yes CC32 = $(CROSS) -m32 - lib32dir = lib32 - lib32devdir = usr/lib32 + lib32dir = usr/lib32 gencontrol_flags = -- \ '-Vdevxx:Depends=libc6-dev-$(ARCH32)' ifeq ($(DEB_HOST_ARCH),amd64) @@ -250,15 +249,9 @@ : # move $(p_rl) dh_installdirs -p$(p_rl) \ - etc \ - lib/$(DEB_HOST_MULTIARCH) \ + usr/lib/$(DEB_HOST_MULTIARCH) \ usr/share/doc - cp -a $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.so.* $(d_rl)/lib/$(DEB_HOST_MULTIARCH)/ -# cp -a $(d)/usr/lib/lib{history,readline}.so.$(libversion) $(d_rl)/lib/ -# ln -s libhistory.so.$(libversion) \ -# $(d_rl)/lib/libhistory.so.$(soversion) -# ln -s libreadline.so.$(libversion) \ -# $(d_rl)/lib/libreadline.so.$(soversion) + cp -a $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.so.* $(d_rl)/usr/lib/$(DEB_HOST_MULTIARCH)/ : # move $(p_comm) dh_installdirs -p$(p_comm) \ @@ -279,9 +272,9 @@ usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \ usr/share/doc \ usr/share/info - ln -s /lib/$(DEB_HOST_MULTIARCH)/libhistory.so.$(soversion) \ + ln -s libhistory.so.$(soversion) \ $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/libhistory.so - ln -s /lib/$(DEB_HOST_MULTIARCH)/libreadline.so.$(soversion) \ + ln -s libreadline.so.$(soversion) \ $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/libreadline.so mv $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.a \ $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/. @@ -327,13 +320,13 @@ infodir=/usr/share/info dh_installdirs -p$(p_rlu) \ - lib/$(DEB_HOST_MULTIARCH) + usr/lib/$(DEB_HOST_MULTIARCH) cp -p $(du)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.so.$(libversion) \ - $(d_rlu)/lib/$(DEB_HOST_MULTIARCH)/ + $(d_rlu)/usr/lib/$(DEB_HOST_MULTIARCH)/ ln -s libhistory.so.$(libversion) \ - $(d_rlu)/lib/$(DEB_HOST_MULTIARCH)/libhistory.so.$(soversion) + $(d_rlu)/usr/lib/$(DEB_HOST_MULTIARCH)/libhistory.so.$(soversion) ln -s libreadline.so.$(libversion) \ - $(d_rlu)/lib/$(DEB_HOST_MULTIARCH)/libreadline.so.$(soversion) + $(d_rlu)/usr/lib/$(DEB_HOST_MULTIARCH)/libreadline.so.$(soversion) dh_installdirs -p$(p_commu) \ usr/share/readline @@ -365,13 +358,13 @@ $(d_rl32)/$(lib32dir)/libreadline.so.$(soversion) dh_installdirs -p$(p_rld32) \ - $(lib32devdir) \ + $(lib32dir) \ usr/share/doc - ln -s /$(lib32dir)/libhistory.so.$(soversion) \ - $(d_rld32)/$(lib32devdir)/libhistory.so - ln -s /$(lib32dir)/libreadline.so.$(soversion) \ - $(d_rld32)/$(lib32devdir)/libreadline.so - mv $(d32)/usr/lib/lib{history,readline}.a $(d_rld32)/$(lib32devdir)/. + ln -s libhistory.so.$(soversion) \ + $(d_rld32)/$(lib32dir)/libhistory.so + ln -s libreadline.so.$(soversion) \ + $(d_rld32)/$(lib32dir)/libreadline.so + mv $(d32)/usr/lib/lib{history,readline}.a $(d_rld32)/$(lib32dir)/. endif ifneq ($(build64),) diff -Nru readline-8.2/debian/source.lintian-overrides readline-8.2/debian/source.lintian-overrides --- readline-8.2/debian/source.lintian-overrides 2009-08-29 10:34:33.000000000 +0000 +++ readline-8.2/debian/source.lintian-overrides 2023-11-25 10:25:50.000000000 +0000 @@ -1 +1 @@ -readline6 source: debian-rules-calls-debhelper-in-odd-order +readline source: debian-rules-calls-debhelper-in-odd-order diff -Nru readline-8.2/debian/watch readline-8.2/debian/watch --- readline-8.2/debian/watch 2014-08-03 17:26:11.000000000 +0000 +++ readline-8.2/debian/watch 2023-11-25 10:14:51.000000000 +0000 @@ -1,2 +1,3 @@ -version=3 +version=4 +opts="uversionmangle=s%-((alpha|beta|rc)\d?)%~$1%" \ http://ftp.gnu.org/gnu/readline/ (?:|.*/)readline(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)