diff options
Diffstat (limited to 'debian')
41 files changed, 3663 insertions, 0 deletions
diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..c0dfefc --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,54 @@ +A kind of FAQ for libreadline on Debian GNU/{Linux,Hurd} +-------------------------------------------------------- + +0. symlinked directory completion behavior + + Starting with readline-4.2a, completion on symlinks that point + to directories does not append the slash. To restore the behaviour + found in readline-4.2, add to /etc/inputrc or ~/.inputrc: + + set mark-symlinked-directories on + +1. re-enable the paren matching feature in readline-4.1 + + Add to /etc/inputrc or ~/.inputrc: + + set blink-matching-paren on + +2. key bindings for ESC + + Consider the following .inputrc: + + set editing-mode vi + + keymap vi + "\M-[D": backward-char + "\M-[C": forward-char + "\M-[A": previous-history + "\M-[B": next-history + + And, just to be certain, set -o reports that vi is on. + + However, ESC k does not send me to the previous line. + + I'm guessing that this is a conflict between bash's concept of a meta + keymap and its concept of vi's command-mode character -- which is to + say that its data structures don't properly reflect its implementation. + + Note that if I remove the meta prefix, leaving lines like: + "[A": previous-history + + That vi command mode keys work fine, and I can use the arrow keys in vi + mode, *provided I'm already in command mode already*. In other words, + bash is doing something wrong here such that it doesn't see the escape + character at the beginning of the key sequence even when in vi insert mode. + + Comment from the upstream author: "This guy destroyed the key binding for + ESC, which effectively disabled vi command mode. It's not as simple as he + paints it to be -- the binding for ESC in the vi insertion keymap *must* + be a function because of the other things needed when switching + from insert mode to command mode. + + If he wants to change something in vi's command mode, he needs + to use `set keymap vi-command' and enter key bindings without + the \M- prefix (as he discovered)." diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..f27f9f2 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,2 @@ +The package uses dpatch to apply patches on top of the upstream source. +See /usr/share/doc/dpatch/README.source.gz. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..0a053ea --- /dev/null +++ b/debian/changelog @@ -0,0 +1,771 @@ +readline (7.0-5) unstable; urgency=medium + + * More updates for the new ncurses build dependencies. + + -- Matthias Klose <doko@debian.org> Sat, 05 May 2018 16:52:46 +0200 + +readline (7.0-4) unstable; urgency=medium + + * Update ncurses build dependencies. Closes: #897403. + * Stop building the libreadline7-dbg package. + + -- Matthias Klose <doko@debian.org> Wed, 02 May 2018 13:36:22 +0200 + +readline (7.0-3) unstable; urgency=medium + + * Apply upstream patches 002 and 003. Closes: #852750. + + -- Matthias Klose <doko@debian.org> Mon, 15 May 2017 13:00:23 -0700 + +readline (7.0-2) unstable; urgency=medium + + * Apply upstream patch 001. + + -- Matthias Klose <doko@debian.org> Tue, 24 Jan 2017 16:17:33 +0100 + +readline (7.0-1) unstable; urgency=medium + + * Readline 7.0 release. + * libreadline-dev: Provide libreadline6-dev. + + -- Matthias Klose <doko@debian.org> Tue, 04 Oct 2016 00:07:07 +0200 + +readline (7.0~rc2-1) experimental; urgency=medium + + * Readline 7.0 release candidate 2. + + -- Matthias Klose <doko@debian.org> Mon, 29 Aug 2016 09:59:15 +0200 + +readline (7.0~rc1+b2-1) experimental; urgency=medium + + * New upstream tarball, called "7.0 beta2". + + -- Matthias Klose <doko@debian.org> Mon, 25 Jul 2016 20:48:12 +0200 + +readline (7.0~rc1-1) experimental; urgency=medium + + * Readline 7.0 release candidate 1. + + -- Matthias Klose <doko@debian.org> Sun, 13 Mar 2016 21:42:41 +0100 + +readline (7.0~beta-1) experimental; urgency=medium + + * Readline 7.0 beta release. + * Stop building versioned -dev packages. + * debian/copyright: Mention GFDL for documentation files. + + -- Matthias Klose <doko@debian.org> Sat, 06 Feb 2016 12:27:41 +0100 + +readline6 (6.3-8) unstable; urgency=medium + + * Split out a readline-doc package for documentation and examples. + Closes: #749168. + + -- Matthias Klose <doko@debian.org> Sun, 03 Aug 2014 19:13:20 +0200 + +readline6 (6.3-7) unstable; urgency=medium + + * Apply upstream patches 001 - 006. Fixes: + - The `.' command in vi mode cannot undo multi-key commands beginning with + `c', `d', and `y' (command plus motion specifier). + - When in callback mode, some readline commands can cause readline to + segfault by passing invalid contexts to callback functions. + - There are debugging functions in the readline release that are + theoretically exploitable as security problems. + They are not public functions, but have global linkage. + - The signal handling changes to bash and readline (to avoid running any + code in a signal handler context) cause the cursor to be placed on the + wrong line of a multi-line command after a ^C interrupts editing. + - There are still applications using the deprecated Function/VFunction/etc. + typedefs in rltypedefs.h. This patch restores the typedefs, but attempts + to mark them as deprecated using gcc/clang attributes. + - Using reverse-i-search when horizontal scrolling is enabled does not + redisplay the entire line containing the successful search results. + * Remove local patches included in the upstream updates. + * Apply upstream bash patch bash43-021: + - When the readline `revert-all-at-newline' option is set, pressing newline + when the current line is one retrieved from history results in a double + free and a segmentation fault. + * Add home code for rxvt in inputrc. Closes: #722087. + + -- Matthias Klose <doko@debian.org> Sun, 03 Aug 2014 18:34:31 +0200 + +readline6 (6.3-6) unstable; urgency=medium + + * Really apply the patch to fix the display issue when a multiline + command is aborted with ^C. Closes: #743603. + + -- Matthias Klose <doko@debian.org> Sat, 05 Apr 2014 13:18:20 +0200 + +readline6 (6.3-5) unstable; urgency=medium + + * Fix a display issue when a multiline command is aborted with ^C. + + -- Matthias Klose <doko@debian.org> Sat, 29 Mar 2014 18:03:53 +0100 + +readline6 (6.3-4) unstable; urgency=medium + + * Fix an issue in vi-mode, not re-doing the latest "dw", "dl", "D", ... + commands. + + -- Matthias Klose <doko@debian.org> Wed, 19 Mar 2014 18:35:48 +0100 + +readline6 (6.3-3) unstable; urgency=medium + + * Fix patching the installed example Makefile. + + -- Matthias Klose <doko@debian.org> Wed, 19 Mar 2014 17:07:30 +0100 + +readline6 (6.3-2) unstable; urgency=medium + + * Fix segfault in _rl_dispatch_callback(). Closes: #741555. + * Remove build specific paths from the installed examples Makefile. + Closes: #670030, #693248. + * 6.3 includes the documentation again. Closes: #726581. + * Fix symbols file for non-linux architectures. + * Fix build warning building rlfe (assignment makes pointer from integer + without a cast). + * Fix lintian permission warnings. + + -- Matthias Klose <doko@debian.org> Wed, 19 Mar 2014 13:42:21 +0100 + +readline6 (6.3-1) unstable; urgency=medium + + * readline 6.3 release. + * Update symbols files. + + -- Matthias Klose <doko@debian.org> Mon, 03 Mar 2014 08:24:21 +0100 + +readline6 (6.2-9) unstable; urgency=low + + * Apply upstream patches 002 - 004. Fixes: + - The readline shared library helper script needs to be updated for + Mac OS X 10.7 (Lion, darwin11). + - A change between readline-6.1 and readline-6.2 to prevent the readline + input hook from being called too frequently had the side effect of + causing delays when reading pasted input on systems such as Mac OS X. + This patch fixes those delays while retaining the readline-6.2 behavior. + Closes: #687100. + - Attempting to redo (using `.') the vi editing mode `cc', `dd', or `yy' + commands leads to an infinite loop. + * Make examples Makefile Multi-Arch installable (Shawn Landden). + Closes: #670030. + * Fix building with -Wformat-security, and pass CPPFLAGS (Simon Ruderich). + Closes: #687717. + + -- Matthias Klose <doko@debian.org> Mon, 17 Sep 2012 14:10:00 +0200 + +readline6 (6.2-8) unstable; urgency=low + + * Mark readline-common Multi-Arch: foreign. Closes: #648098. + + -- Matthias Klose <doko@debian.org> Mon, 21 Nov 2011 23:21:05 +0100 + +readline6 (6.2-7) unstable; urgency=low + + * Fix build failure on hurd-i386 (Samuel Thibault). Closes: #644777. + * Use dpkg-buildflags to set CFLAGS and LDFLAGS. + + -- Matthias Klose <doko@debian.org> Sun, 09 Oct 2011 11:23:45 +0200 + +readline6 (6.2-6) unstable; urgency=low + + * lib{,32}readline6-dev: Depend on lib{,32}tinfo-dev instead of + lib{,32}ncurses5-dev. + * Don't link rlfe against any libncurses* library. + + -- Matthias Klose <doko@debian.org> Tue, 04 Oct 2011 16:33:44 +0200 + +readline6 (6.2-5) unstable; urgency=low + + * Do not link against any libncurses* library, just against libtinfo. + * Fix corrupt display for history search in vi-mode, 256-color prompt + (Micah Cowan). Closes: #614718, LP: #721982. + * Remove unused build-dep on lsb-release. Closes: #642383. + + -- Matthias Klose <doko@debian.org> Sat, 01 Oct 2011 11:56:50 +0200 + +readline6 (6.2-4) unstable; urgency=low + + * Fix broken .so symlinks. + + -- Matthias Klose <doko@debian.org> Wed, 24 Aug 2011 10:08:49 +0200 + +readline6 (6.2-3) unstable; urgency=low + + * Add multi-arch support (Riku Voipio). Closes: #638850. + + -- Matthias Klose <doko@debian.org> Tue, 23 Aug 2011 00:25:58 +0200 + +readline6 (6.2-2) unstable; urgency=low + + * Re-apply patch from 6.1-3, fixing kfreebsd build failure. Closes: #626704. + + -- Matthias Klose <doko@debian.org> Wed, 18 May 2011 12:04:44 +0200 + +readline6 (6.2-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose <doko@debian.org> Sat, 23 Apr 2011 14:37:46 +0200 + +readline6 (6.2~alpha1-1) experimental; urgency=low + + * New upstream version, first alpha release. + + -- Matthias Klose <doko@debian.org> Mon, 22 Nov 2010 10:30:08 +0100 + +readline6 (6.1-3) unstable; urgency=low + + * Fix build failure on kfreebsd. Closes: #577234. + + -- Matthias Klose <doko@debian.org> Sun, 30 May 2010 20:31:27 +0200 + +readline6 (6.1-2) unstable; urgency=low + + * Apply upstream patches + * rlfe: Provide readline-editor. Closes: #565964. + * Use source format 3.0. + + -- Matthias Klose <doko@debian.org> Sat, 10 Apr 2010 13:28:58 +0200 + +readline6 (6.1-1) unstable; urgency=low + + * New upstream version, final release. + + -- Matthias Klose <doko@debian.org> Sat, 02 Jan 2010 13:29:08 +0100 + +readline6 (6.1~rc1-1) unstable; urgency=low + + * New upstream version, release candidate 1. + * Add symbols files. + + -- Matthias Klose <doko@debian.org> Wed, 30 Dec 2009 15:02:07 +0100 + +readline6 (6.0-5) unstable; urgency=low + + * Fix rlfe, always writing a history file (Andrew Pimlott). + Closes: #544944. + + -- Matthias Klose <doko@debian.org> Sun, 20 Sep 2009 10:36:09 +0200 + +readline6 (6.0-4) unstable; urgency=low + + * libreadline6-dev: Conflict with libreadline5-dev. Closes: #544082. + + -- Matthias Klose <doko@debian.org> Sat, 29 Aug 2009 12:38:02 +0200 + +readline6 (6.0-3) unstable; urgency=low + + * Add a package libreadline-dev to be used as a build dependency, + independent of the readline version. + * Add cross build support (closes: #465237). + * Clarify package description (closes: #478276) and comment in + inputrc file (closes: #501671). + + -- Matthias Klose <doko@debian.org> Mon, 24 Aug 2009 04:26:15 +0200 + +readline6 (6.0-2) unstable; urgency=low + + * Apply upstream patch 004. + * Fix package sections and priorities and lintian warnings. + + -- Matthias Klose <doko@debian.org> Sun, 23 Aug 2009 17:37:21 +0200 + +readline6 (6.0-1) experimental; urgency=low + + * New upstream version, final release. + * Apply upstream patches 001 - 003. + + -- Matthias Klose <doko@debian.org> Sun, 28 Jun 2009 19:18:02 +0200 + +readline6 (6.0~beta-0ubuntu1) jaunty; urgency=low + + * New upstream version, 6.0 beta. + + -- Matthias Klose <doko@ubuntu.com> Sat, 29 Nov 2008 17:56:45 +0100 + +readline5 (5.2-4) unstable; urgency=low + + * Apply upstream patches up to readline52-013. Closes: #494934. + * Remove the patch introduced in 5.2-3.1, obsoleted by the upstream + patches. + + -- Matthias Klose <doko@debian.org> Sat, 28 Feb 2009 19:00:38 +0100 + +readline5 (5.2-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Apply rl-input-eventhook.dpatch: Fix input data validation when run with + rl_event_hook. Closes: #498277. + + -- Arnaud Cornet <acornet@debian.org> Sat, 10 Jan 2009 17:06:46 +0100 + +readline5 (5.2-3) unstable; urgency=low + + * Build-depend on gcc-multilib instead of lib{32,64}c*-dev-*. + Closes: #423995. + * Apply upstream patch readline52-001 (readline neglects to reallocate + the array it uses to keep track of wrapped screen lines when increasing + its size. This will eventually result in segmentation faults when given + sufficiently long input. + * Apply upstream patch readline52-003 and readline52-004, fixes + for displaying the prompt. + * Link biarch builds against ncurses. + + -- Matthias Klose <doko@debian.org> Thu, 24 May 2007 23:49:39 +0200 + +readline5 (5.2-2) unstable; urgency=low + + * Apply upstream patch readline52-001 (incorrect display position + with multibyte characters). + + -- Matthias Klose <doko@debian.org> Tue, 19 Dec 2006 16:28:28 +0100 + +readline5 (5.2-1) unstable; urgency=low + + * New upstream version. + * Removed patches applied upstream: rlfe-pts, rl-inputrc. + * readline-common: Don't conflict with libreadine4, keep the replaces; + eases upgrades from MySQL 5 databases. Closes: #387966. + + -- Matthias Klose <doko@debian.org> Sat, 28 Oct 2006 13:54:43 +0200 + +readline5 (5.1-9) unstable; urgency=low + + * Fix libc dependencies for the lib32readline5{,-dev} packages. + Closes: #386345. + * Set DEB_BUILD_GNU_TYPE. Closes: #390372. + + -- Matthias Klose <doko@debian.org> Sun, 10 Sep 2006 21:04:52 +0000 + +readline5 (5.1-8) unstable; urgency=low + + * Build 32bit packages for amd64 and ppc64. Closes: #384198. + * Apply cross-compilation fixes, but keep the dependency on readline-common. + Closes: #358767. + * Fix build failure on ppc64. Closes: #361193. + + -- Matthias Klose <doko@debian.org> Mon, 4 Sep 2006 00:15:39 +0200 + +readline5 (5.1-7) unstable; urgency=low + + * Apply upstream patches 003, 004. + * Remove build dependency on ia32-libs-dev. + + -- Matthias Klose <doko@debian.org> Mon, 15 Mar 2006 23:39:50 +0000 + +readline5 (5.1-6) unstable; urgency=low + + * Apply upstream patch 002. + * Fix dangling symlinks in doc directory (closes: #346157, #346158). + + -- Matthias Klose <doko@debian.org> Tue, 7 Feb 2006 18:46:32 +0100 + +readline5 (5.1-5) unstable; urgency=high + + * Fix names of libc-dev packages in lib64readline5-dev dependencies. + Closes: #344723. + + -- Matthias Klose <doko@debian.org> Fri, 30 Dec 2005 00:23:24 +0100 + +readline5 (5.1-4) unstable; urgency=low + + * Add 32/64 bit build dependencies, lib64ncurses-dev doesn't yet depend + on it. + + -- Matthias Klose <doko@debian.org> Thu, 22 Dec 2005 18:36:32 +0000 + +readline5 (5.1-3) unstable; urgency=medium + + * Don't call dh_shlibdeps for the lib64readline5 package. + * Fix build on GNU/kFreeBSD. Closes: #343323. + * Fix callback interface (closes: #343477). + + -- Matthias Klose <doko@debian.org> Thu, 22 Dec 2005 17:29:52 +0100 + +readline5 (5.1-2) unstable; urgency=low + + * Don't check for cross compilation, when building for 64bit biarchs. + * Build 64bit packages for i386 and powerpc as well. + * /etc/inputrc: Activate bindings for forward-/backward-word, + when term=rxvt. Ubuntu #18927. + + -- Matthias Klose <doko@debian.org> Sat, 10 Dec 2005 00:03:36 +0100 + +readline5 (5.1-1) unstable; urgency=low + + * New upstream version (5.1 release). + - Works better with non-ASCII input (closes: #332635). + * readline-common conflicts/replaces libreadline-common (closes: #339452). + + -- Matthias Klose <doko@debian.org> Fri, 9 Dec 2005 21:22:24 +0100 + +readline5 (5.0+5.1rc1-1) unstable; urgency=low + + * New upstream version (5.1-rc1). + - Fix rlfe command line parsing (closes: #308315). + * Remove patches applied upstream: rl-del-backspace-policy. + * Remove /etc/inputrc on purge (closes: #334142). + + -- Matthias Klose <doko@debian.org> Fri, 11 Nov 2005 12:36:59 +0000 + +readline5 (5.0+5.1b1-1) unstable; urgency=low + + * New upstream version (5.1-beta1). + + -- Matthias Klose <doko@debian.org> Thu, 13 Oct 2005 16:03:09 +0200 + +readline5 (5.0+5.1a1-1) unstable; urgency=low + + * New upstream version (5.1-alpha1). + * Remove patches applied upstream: + - readline50-*, rl-setenv, rl-display, rl-self-insert, rl-examples. + * libreadline5 now depends on libreadline-common, now holding the + readline user documentation and the configuration file /etc/inputrc. + + -- Matthias Klose <doko@debian.org> Sun, 11 Sep 2005 17:05:28 +0200 + +readline5 (5.0-11) unstable; urgency=low + + * libreadline5 now depends on readline-common, now holding the + readline user documentation and the configuration file /etc/inputrc. + + -- Matthias Klose <doko@debian.org> Sun, 11 Sep 2005 20:18:27 +0000 + +readline5 (5.0-10) unstable; urgency=low + + * Update support/config.* files (closes: #290910). + + -- Matthias Klose <doko@debian.org> Sun, 23 Jan 2005 09:58:30 +0100 + +readline5 (5.0-9) unstable; urgency=low + + * Fix bug in readline's self-insert command (addresses: #290103). + * Fix reference to upstream version (closes: #282252). + * Fix re-read-init-file (C-xC-r) not to read /etc/inputrc twice, + but /etc/inputrc and ~/.inputrc. Thanks to Vasco Pedro. + * rlfe: Use Unix98 pty naming (closes: #287434). + + -- Matthias Klose <doko@debian.org> Sun, 16 Jan 2005 13:01:21 +0100 + +readline5 (5.0-8) unstable; urgency=low + + * Fix segfault in the ``reverse-search-history'' feature of the readline + library, if the search string matches a previously entered command (ie + history) and must overflow the current screen width. Addresses: #288940. + + -- Matthias Klose <doko@debian.org> Wed, 12 Jan 2005 08:11:36 +0100 + +readline5 (5.0-7) unstable; urgency=low + + * Add build dependency on autotools-dev (closes: #281429). + + -- Matthias Klose <doko@debian.org> Mon, 15 Nov 2004 22:53:33 +0100 + +readline5 (5.0-6) unstable; urgency=low + + * Build-depend on texinfo (closes: #280867). + + -- Matthias Klose <doko@debian.org> Fri, 12 Nov 2004 08:47:26 +0100 + +readline5 (5.0-5) unstable; urgency=high + + * Remove the libreadline-common package, until sarge is released. + Install the man pages as readline5(3) and history5(3), install the + user manual as rl5userman. Closes: #279366. + + -- Matthias Klose <doko@debian.org> Thu, 11 Nov 2004 08:05:15 +0100 + +readline5 (5.0-4) unstable; urgency=low + + * Fix typo in rules file. + + -- Matthias Klose <doko@debian.org> Tue, 26 Oct 2004 07:35:50 +0200 + +readline5 (5.0-3) unstable; urgency=low + + * Prefer using setenv over putenv. + + -- Matthias Klose <doko@debian.org> Sun, 17 Oct 2004 11:09:20 +0200 + +readline5 (5.0-2) unstable; urgency=medium + + * Remove sgid bits from directories (closes: #274667). + * libreadline5 now depends on libreadline-common | libreadline4 (<< 4.3-13), + becoming installable in sarge, but leaving out the rluserman docs, + which is in libreadline-common (closes: #276536). + + -- Matthias Klose <doko@debian.org> Fri, 15 Oct 2004 00:09:16 +0200 + +readline5 (5.0-1) unstable; urgency=low + + * Package maintainers: Do not build-depend on libreadline5-dev, unless you + want to stick your package to unstable. readline is part of base and + therefore frozen for sarge. + + * New upstream release. + * Bugs fixed in this release (and the alpha/beta releases): + - Fixed a bug that caused the prompt to overwrite previous output when the + output doesn't contain a newline and the locale supports multibyte + characters. This same change fixes the problem of readline redisplay + slowing down dramatically as the line gets longer in multibyte locales. + Closes: #179883. + - Speedups to the multibyte character redisplay code. Closes: #154063. + - Fixed a problem with EOF detection when using rl_event_hook. + Closes: #144585. + - Display of multibyte character in readline prompts. Closes: #195678. + - Broken column output in UTF-8 locale. Closes: #161750. + - Fix a bug in the callback read-char interface. Closes: #172849. + * New shared object name. Obsoletes bug about changed symbol size. + Closes: #153974. + * Exported readline functions now have a rl_ prefix. Closes: #65484. + + -- Matthias Klose <doko@debian.org> Sun, 19 Sep 2004 11:48:34 +0200 + +readline4 (4.3-6) unstable; urgency=low + + * Fix package sections and priorities. + * Add support for freebsd (closes: #200537). + * Add package rlfe (closes: #154400). + + -- Matthias Klose <doko@debian.org> Fri, 26 Sep 2003 19:05:31 +0200 + +readline4 (4.3-5) unstable; urgency=low + + * Fix ~ command working in UTF-8 locales (closes: #175127). + * Apply upstream patches 001, 002, 003, 004, 005. + * Do not redefine __attribute__ (closes: #191209). + + -- Matthias Klose <doko@debian.org> Sun, 1 Jun 2003 09:39:44 +0200 + +readline4 (4.3-5) unstable; urgency=low + + * debian/patches/mbutil.dpatch: Fix segfault in mbutil.c. + + -- Matthias Klose <doko@debian.org> Tue, 24 Sep 2002 13:12:12 +0200 + +readline4 (4.3-4) unstable; urgency=medium + + * Apply upstream patches: + - Fix segfault (closes: #154462). + - Fix for repeating an edit in vi mode. + * Build dependency on 'mawk | awk' (closes: #154462). + + -- Matthias Klose <doko@debian.org> Wed, 31 Jul 2002 20:10:44 +0200 + +readline4 (4.3-3) unstable; urgency=high + + * Do it again. Really link against ncurses library. + + -- Matthias Klose <doko@debian.org> Sun, 21 Jul 2002 21:44:00 +0200 + +readline4 (4.3-2) unstable; urgency=high + + * Link against ncurses library. + + -- Matthias Klose <doko@debian.org> Sat, 20 Jul 2002 18:21:40 +0200 + +readline4 (4.3-1) unstable; urgency=low + + * New upstream version: + - Handle multibyte characters (obsoletes and closes: #113078). + - Implement toggable overwrite mode (closes: #36651). + - Fixed the event loop to handle the case where the input file descriptor + is invalidated (closes: #134615). + - Added some default key bindings for common escape sequences produced by + HOME and END keys (closes: #150429). + * Move debug library to /usr/lib/debug. + + -- Matthias Klose <doko@debian.org> Sat, 20 Jul 2002 12:40:06 +0200 + +readline4 (4.2.91-1) unstable; urgency=low + + * New upstream version (4.3 beta1). + + -- Matthias Klose <doko@debian.org> Fri, 31 May 2002 00:15:04 +0200 + +readline4 (4.2a-5) unstable; urgency=low + + * Adjust for netbsd linker options (closes: #130349). + + -- Matthias Klose <doko@debian.org> Sun, 3 Feb 2002 22:03:03 +0100 + +readline4 (4.2a-4) unstable; urgency=high + + * Taken from the current upstream sources: Make the symlinked directory + completion behavior introduced in readline-4.2a a user-settable option. + If `mark-symlinked-directories' is set to `on', the symlinked directory + completion behavior is disabled, and symlinks that point to directories + have a slash appended (closes: #120854, #123602). + Same severity as the bash upload (2.05-4), as bash depends on it. + * Introduced a new private (but global) variable, so the shlibs version + needs an update again. + + -- Matthias Klose <doko@debian.org> Sat, 12 Jan 2002 16:00:08 +0100 + +readline4 (4.2a-3) unstable; urgency=medium + + * 4.2a has a new variable `rl_readline_version', so the shlibs version + needs to be upgraded to (>= 4.2a). + * Don't rely on HAVE_CONFIG_H macro in installed headers (closes: #125398). + * Upstream: The completion code now attempts to do a better job of preserving + the case of the word the user typed if ignoring case in completions. + Closes: #74861. + + -- Matthias Klose <doko@debian.org> Fri, 21 Dec 2001 00:16:28 +0100 + +readline4 (4.2a-2) unstable; urgency=high + + * Update config.{sub,guess} from ftp://ftp.gnu.org/pub/gnu/config/. + Closes: #119847. + + -- Matthias Klose <doko@debian.org> Fri, 16 Nov 2001 19:00:07 +0100 + +readline4 (4.2a-1) unstable; urgency=low + + * Final release. + * This is mainly a bugfix and code cleanup release (as you can see + from the version number as well). Fixes the following Debian reports: + - readline doesn't ignore null prompts anymore (closes: #105231). + - Don't include -I/usr/include in CFLAGS. + * Fix location of upstream source in copyright file (closes: #118481). + + -- Matthias Klose <doko@debian.org> Wed, 14 Nov 2001 21:56:29 +0100 + +readline4 (4.2a-0rc1) unstable; urgency=low + + * New upstream (bug fix) version, release candidate. + + -- Matthias Klose <doko@debian.org> Fri, 2 Nov 2001 10:35:55 +0100 + +readline4 (4.2a-0beta1) unstable; urgency=low + + * New upstream (bug fix) version. + * Move manual pages to libreadline4 package (closes: #111303). + + -- Matthias Klose <doko@debian.org> Thu, 11 Oct 2001 22:51:21 +0200 + +readline4 (4.2-5) unstable; urgency=low + + * Include stdio.h in history.h (closes: #101166). + * libreadline4-dbg suggests libreadline4-dev (closes: #101790). + + -- Matthias Klose <doko@debian.org> Sat, 21 Jul 2001 19:02:53 +0200 + +readline4 (4.2-4) unstable; urgency=low + + * Fix tilde.h for C++ compatibility as well. + + -- Matthias Klose <doko@debian.org> Sat, 5 May 2001 01:03:03 +0200 + +readline4 (4.2-3) unstable; urgency=low + + * Fix header for C++ compatibility (closes #95048, #95758). + * Fixed upstream: closes #55626, #75346. + + -- Matthias Klose <doko@debian.org> Wed, 2 May 2001 23:06:00 +0200 + +readline4 (4.2-2) unstable; urgency=low + + * Tighten shlibs dependency to >= 4.2-2. + + -- Matthias Klose <doko@debian.org> Tue, 10 Apr 2001 00:37:22 +0200 + +readline4 (4.2-1) unstable; urgency=low + + * New upstream release. + + -- Matthias Klose <doko@debian.org> Mon, 9 Apr 2001 18:28:54 +0200 + +readline4 (4.2-0beta2) unstable; urgency=low + + * New upstream release 4.2-beta2. + + -- Matthias Klose <doko@debian.org> Thu, 29 Mar 2001 23:18:10 +0200 + +readline4 (4.2-0) unstable; urgency=low + + * New upstream release 4.2-beta1. + + -- Matthias Klose <doko@debian.org> Tue, 6 Feb 2001 21:12:58 +0100 + +readline4 (4.1-4) unstable; urgency=low + + * Fix build error. + + -- Matthias Klose <doko@debian.org> Mon, 20 Nov 2000 23:27:16 +0100 + +readline4 (4.1-3) unstable; urgency=low + + * debian/patches/rl-hurd-build.dpatch: Build on the Hurd (fixes #75342). + + -- Matthias Klose <doko@debian.org> Sat, 18 Nov 2000 12:55:16 +0100 + +readline4 (4.1-2) unstable; urgency=low + + * Include stdio.h in readline.h (fixes #70669). + + -- Matthias Klose <doko@debian.org> Mon, 9 Oct 2000 20:35:23 +0200 + +readline4 (4.1-1) frozen unstable; urgency=low + + * Final release. Documentation fixes. + + -- Matthias Klose <doko@debian.org> Mon, 20 Mar 2000 20:08:45 +0100 + +readline4 (4.1-0beta5db1) frozen unstable; urgency=low + + * Updated beta version. + * debian/control: Remove libreadline4-doc suggestions (fixes #57547, #57578). + + -- Matthias Klose <doko@debian.org> Sun, 20 Feb 2000 21:10:34 +0100 + +readline4 (4.1-0beta3db3) unstable; urgency=low + + * Update rl.ctrl-char patch from Dan Jacobowitz. + Fixes #54805, #54639, #54612. + + -- Matthias Klose <doko@debian.org> Wed, 12 Jan 2000 10:26:51 +0100 + +readline4 (4.1-0beta3db2) unstable; urgency=low + + * debian/control: libreadline4-dev depends on libncurses5-dev. + + -- Matthias Klose <doko@debian.org> Thu, 6 Jan 2000 12:11:29 +0100 + +readline4 (4.1-0beta3db1) unstable; urgency=low + + * New upstream version. + * Remove three patches integrated upstream. + * Reports fixed in upstream version: #16797, #22480, #47525. + * Put rluserman.info into library package (fixes: #32075). + * In lib/readline/chardefs.h do not assume char is signed (fixes #53253). + + -- Matthias Klose <doko@debian.org> Sat, 1 Jan 2000 16:22:30 +0100 + +readline4 (4.0-0.1) experimental; urgency=low + + * New upstream version. + * Fixed upstream (closes: #22480). + * Separated from bash package, since readline is available as a + separate source package upstream. The upstream author writes: + "It's not appropriate to build shared libraries from the readline + shipped with bash. That is designed to be linked directly into bash." + * Make /usr/doc compatibility links. + * debian/patches/conf-update.dpatch: New config files from automake + (closes #33745). + * debian/rules: Add Build-Depends. + * debian/rules: Install info files with default perms (closes: #49879). + * readline headers fixed upstream (closes: #47525). + * debian/etc.inputrc: Document how to enable German umlauts. Should close + #38397? Should close #33168, #36077 and #42775 as well? The first report + (33168) contains some more information how to get xemacs to work with 8bit. + * Support to build on the Hurd (closes: #35769). + Patch from Marcus.Brinkmann@ruhr-uni-bochum.de. + * debian/patches/rl-del-backspace-policy.dpatch: Handle Delete/Backspace + keys according to Debian policy. + * debian/patches/rl-paren-matching.dpatch: Turn on parens matching. + * debian/patches/rl-shell-memleak.dpatch: Fix memory leak. + + -- Matthias Klose <doko@debian.org> Sat, 20 Nov 1999 18:52:00 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..1f68c5b --- /dev/null +++ b/debian/control @@ -0,0 +1,146 @@ +Source: readline +Section: libs +Priority: important +Maintainer: Matthias Klose <doko@debian.org> +Standards-Version: 4.1.4 +Build-Depends: debhelper (>= 9), + libncurses-dev, + lib32ncurses-dev [amd64 ppc64], lib64ncurses-dev [i386 powerpc sparc s390], + mawk | awk, texinfo, autotools-dev, + gcc-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 s390 sparc] + +Package: libreadline7 +Architecture: any +Depends: readline-common, ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Section: libs +Priority: important +Description: GNU readline and history libraries, run-time libraries + The GNU readline library aids in the consistency of user interface + across discrete programs that need to provide a command line + interface. + . + The GNU history library provides a consistent user interface for + recalling lines of previously typed input. + +Package: lib64readline7 +Architecture: i386 powerpc s390 sparc +Depends: readline-common, ${shlibs:Depends}, ${misc:Depends} +Section: libs +Priority: optional +Description: GNU readline and history libraries, run-time libraries (64-bit) + The GNU readline library aids in the consistency of user interface + across discrete programs that need to provide a command line + interface. + . + The GNU history library provides a consistent user interface for + recalling lines of previously typed input. + +Package: readline-common +Architecture: all +Multi-Arch: foreign +Section: utils +Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Conflicts: libreadline5 (<< 5.0-11), libreadline-common +Replaces: libreadline4 (<< 4.3-16), libreadline5 (<< 5.0-11), libreadline-common +Suggests: readline-doc +Priority: important +Description: GNU readline and history libraries, common files + The GNU readline library aids in the consistency of user interface + across discrete programs that need to provide a command line + interface. + . + The GNU history library provides a consistent user interface for + recalling lines of previously typed input. + +Package: libreadline-dev +Architecture: any +Section: libdevel +Priority: optional +Depends: libreadline7 (= ${binary:Version}), libncurses-dev, dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Multi-Arch: same +Conflicts: libreadline5-dev, libreadline6-dev, libreadline-gplv2-dev +Suggests: readline-doc +Provides: libreadline6-dev +Description: GNU readline and history libraries, development files + The GNU readline library aids in the consistency of user interface + across discrete programs that need to provide a command line + interface. + . + The GNU history library provides a consistent user interface for + recalling lines of previously typed input. + . + This package contains development files. + +Package: lib64readline-dev +Architecture: i386 powerpc s390 sparc +Depends: lib64readline7 (= ${binary:Version}), lib64ncurses-dev, ${devxx:Depends}, ${misc:Depends} +Conflicts: lib64readline6-dev, lib64readline-gplv2-dev +Provides: lib64readline6-dev +Section: libdevel +Priority: optional +Description: GNU readline and history libraries, development files (64-bit) + The GNU readline library aids in the consistency of user interface + across discrete programs that need to provide a command line + interface. + . + The GNU history library provides a consistent user interface for + recalling lines of previously typed input. + +Package: rlfe +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Section: utils +Priority: optional +Provides: readline-editor +Description: Front-end using readline to "cook" input lines for other programs + This tool lets you use history and line-editing in any text oriented + tool. This is especially useful with third-party proprietary tools that + cannot be distributed linked against readline. It is not perfect but it + works pretty well. + . + See the ledit and rlwrap packages for other programs of that kind. + +Package: lib32readline7 +Architecture: amd64 ppc64 +Depends: readline-common, ${shlibs:Depends}, ${misc:Depends} +Section: libs +Priority: optional +Description: GNU readline and history libraries, run-time libraries (32-bit) + The GNU readline library aids in the consistency of user interface + across discrete programs that need to provide a command line + interface. + . + The GNU history library provides a consistent user interface for + recalling lines of previously typed input. + +Package: lib32readline-dev +Architecture: amd64 ppc64 +Depends: lib32readline7 (= ${binary:Version}), lib32ncurses-dev, ${devxx:Depends}, ${misc:Depends} +Conflicts: lib32readline6-dev, lib32readline-gplv2-dev +Provides: lib32readline6-dev +Section: libdevel +Priority: optional +Description: GNU readline and history libraries, development files (32-bit) + The GNU readline library aids in the consistency of user interface + across discrete programs that need to provide a command line + interface. + . + The GNU history library provides a consistent user interface for + recalling lines of previously typed input. + +Package: readline-doc +Architecture: all +Multi-Arch: foreign +Section: doc +Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Replaces: libreadline6-dev (<< 6.3-8) +Priority: optional +Description: GNU readline and history libraries, documentation and examples + The GNU readline library aids in the consistency of user interface + across discrete programs that need to provide a command line + interface. + . + The GNU history library provides a consistent user interface for + recalling lines of previously typed input. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..79bdc50 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,68 @@ +This is Debian GNU/Linux's prepackaged version of the FSF's GNU +Readline library. + +This package was put together by Matthias Klose <doko@debian.org>, derived +from the bash package by Guy Maor <maor@debian.org>, from the GNU sources at + + ftp.gnu.org:/pub/gnu/readline/readline-6.0.tar.gz. + +Upstream Authors: + + Chet Ramey <chet.ramey@case.edu> + Jeff Solomon <jsolomon@stanford.edu> (examples/excallback.c) + Harold Levy <Harold.Levy@synopsys.com> (examples/rl-fgets.c) + Juergen Weigert <jnweiger@immd4.informatik.uni-erlangen.de> (examples/rlfe) + Michael Schroeder <mlschroe@immd4.informatik.uni-erlangen.de> (examples/rlfe) + Oliver Laumann (examples/rlfe) + +Copyright: + + Copyright (C) 1987-2009 Free Software Foundation, Inc. + Copyright (C) 1999 Jeff Solomon (examples/excallback.c) + Copyright (C) 2003-2004 Harold Levy (examples/rl-fgets.c) + Copyright (C) 1993-2002 Juergen Weigert (examples/rlfe) + Copyright (C) 1993-2002 Michael Schroeder (examples/rlfe) + Copyright (C) 1987 Oliver Laumann (examples/rlfe) + +License: + + Readline 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 3 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Readline. If not, see <http://www.gnu.org/licenses/>. + + examples/rl-fgets.c: GPL v2 or later. + examples/rlfe: GPL v2 or later. + +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL-3'. + +The documentation files doc/*.texi and derived .info, .html, .ps and .pdf +files are: + + Copyright (C) 1988-2015 Free Software Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with no Invariant Sections, no Front-Cover Texts, and + no Back-Cover Texts. A copy of the license is included in the + section entitled "GNU Free Documentation License". + +On Debian systems, the complete text of the GNU Free Documentation License +can be found in `/usr/share/common-licenses/GFDL'. + +The Debian packaging is: + + Copyright (C) 1999-2009 Matthias Klose <doko@debian.org> + +and is licensed under the GPL version 3, +see `/usr/share/common-licenses/GPL-3'. diff --git a/debian/inputrc b/debian/inputrc new file mode 100644 index 0000000..d3da985 --- /dev/null +++ b/debian/inputrc @@ -0,0 +1,67 @@ +# /etc/inputrc - global inputrc for libreadline +# See readline(3readline) and `info rluserman' for more information. + +# Be 8 bit clean. +set input-meta on +set output-meta on + +# To allow the use of 8bit-characters like the german umlauts, uncomment +# the line below. However this makes the meta key not work as a meta key, +# which is annoying to those which don't need to type in 8-bit characters. + +# set convert-meta off + +# try to enable the application keypad when it is called. Some systems +# need this to enable the arrow keys. +# set enable-keypad on + +# see /usr/share/doc/bash/inputrc.arrows for other codes of arrow keys + +# do not bell on tab-completion +# set bell-style none +# set bell-style visible + +# some defaults / modifications for the emacs mode +$if mode=emacs + +# allow the use of the Home/End keys +"\e[1~": beginning-of-line +"\e[4~": end-of-line + +# allow the use of the Delete/Insert keys +"\e[3~": delete-char +"\e[2~": quoted-insert + +# mappings for "page up" and "page down" to step to the beginning/end +# of the history +# "\e[5~": beginning-of-history +# "\e[6~": end-of-history + +# alternate mappings for "page up" and "page down" to search the history +# "\e[5~": history-search-backward +# "\e[6~": history-search-forward + +# mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving +"\e[1;5C": forward-word +"\e[1;5D": backward-word +"\e[5C": forward-word +"\e[5D": backward-word +"\e\e[C": forward-word +"\e\e[D": backward-word + +$if term=rxvt +"\e[7~": beginning-of-line +"\e[8~": end-of-line +"\eOc": forward-word +"\eOd": backward-word +$endif + +# for non RH/Debian xterm, can't hurt for RH/Debian xterm +# "\eOH": beginning-of-line +# "\eOF": end-of-line + +# for freebsd console +# "\e[H": beginning-of-line +# "\e[F": end-of-line + +$endif diff --git a/debian/inputrc.arrows b/debian/inputrc.arrows new file mode 100644 index 0000000..21aed08 --- /dev/null +++ b/debian/inputrc.arrows @@ -0,0 +1,30 @@ +# This file controls the behaviour of line input editing for +# programs that use the Gnu Readline library. +# +# Arrow keys in keypad mode +# +"\C-[OD" backward-char +"\C-[OC" forward-char +"\C-[OA" previous-history +"\C-[OB" next-history +# +# Arrow keys in ANSI mode +# +"\C-[[D" backward-char +"\C-[[C" forward-char +"\C-[[A" previous-history +"\C-[[B" next-history +# +# Arrow keys in 8 bit keypad mode +# +"\C-M-OD" backward-char +"\C-M-OC" forward-char +"\C-M-OA" previous-history +"\C-M-OB" next-history +# +# Arrow keys in 8 bit ANSI mode +# +"\C-M-[D" backward-char +"\C-M-[C" forward-char +"\C-M-[A" previous-history +"\C-M-[B" next-history diff --git a/debian/installed-examples-makefile.diff b/debian/installed-examples-makefile.diff new file mode 100644 index 0000000..b0c1c0a --- /dev/null +++ b/debian/installed-examples-makefile.diff @@ -0,0 +1,19 @@ +--- debian/libreadline6-dev/usr/share/doc/libreadline6/examples/Makefile ++++ debian/libreadline6-dev/usr/share/doc/libreadline6/examples/Makefile +@@ -27,12 +27,11 @@ + datarootdir = ${prefix}/share + + bindir = ${exec_prefix}/bin +-srcdir = /scratch/packages/tmp/readline6-6.3/examples ++srcdir = /usr/share/doc/libreadline6/examples + datadir = ${datarootdir} +-VPATH = /scratch/packages/tmp/readline6-6.3/examples +-top_srcdir = /scratch/packages/tmp/readline6-6.3 +-#BUILD_DIR = . +-BUILD_DIR = /scratch/packages/tmp/readline6-6.3/build ++VPATH = .:/usr/share/doc/libreadline6/examples ++top_srcdir = /usr/include/readline ++BUILD_DIR = /usr/src/readline6/build + installdir = $(datadir)/readline + + INSTALL = /usr/bin/install -c diff --git a/debian/lib32readline7.symbols b/debian/lib32readline7.symbols new file mode 100644 index 0000000..b487189 --- /dev/null +++ b/debian/lib32readline7.symbols @@ -0,0 +1,4 @@ +libhistory.so.7 #PACKAGE# #MINVER# +#include "libhistory7.symbols.common" +libreadline.so.7 #PACKAGE# #MINVER# +#include "libreadline7.symbols.common" diff --git a/debian/lib64readline7.symbols b/debian/lib64readline7.symbols new file mode 100644 index 0000000..b487189 --- /dev/null +++ b/debian/lib64readline7.symbols @@ -0,0 +1,4 @@ +libhistory.so.7 #PACKAGE# #MINVER# +#include "libhistory7.symbols.common" +libreadline.so.7 #PACKAGE# #MINVER# +#include "libreadline7.symbols.common" diff --git a/debian/libhistory7.symbols.common b/debian/libhistory7.symbols.common new file mode 100644 index 0000000..18e423a --- /dev/null +++ b/debian/libhistory7.symbols.common @@ -0,0 +1,73 @@ + _hs_append_history_line@Base 7.0~rc1 + _hs_replace_history_data@Base 7.0~beta + _rl_adjust_point@Base 6.0 + _rl_char_value@Base 6.0 + _rl_compare_chars@Base 6.0 + _rl_find_next_mbchar@Base 6.0 + _rl_find_prev_mbchar@Base 6.0 + _rl_find_prev_mbchar_internal@Base 7.0~rc1 + _rl_get_char_len@Base 6.0 + _rl_is_mbchar_matched@Base 6.0 + _rl_utf8locale@Base 6.3 + add_history@Base 6.0 + add_history_time@Base 6.0 + alloc_history_entry@Base 6.0 + append_history@Base 6.0 + clear_history@Base 6.0 + copy_history_entry@Base 6.0 + current_history@Base 6.0 + free_history_entry@Base 6.0 + get_history_event@Base 6.0 + history_arg_extract@Base 6.0 + history_base@Base 6.0 + history_comment_char@Base 6.0 + history_expand@Base 6.0 + history_expansion_char@Base 6.0 + history_file_version@Base 7.0~rc1 + history_get@Base 6.0 + history_get_history_state@Base 6.0 + history_get_time@Base 6.0 + history_inhibit_expansion_function@Base 6.0 + history_is_stifled@Base 6.0 + history_length@Base 6.0 + history_lines_read_from_file@Base 7.0~beta + history_lines_written_to_file@Base 7.0~beta + history_list@Base 6.0 + history_max_entries@Base 6.0 + history_multiline_entries@Base 7.0~rc1 + history_no_expand_chars@Base 6.0 + history_offset@Base 6.0 + history_quotes_inhibit_expansion@Base 6.0 + history_search@Base 6.0 + history_search_delimiter_chars@Base 6.0 + history_search_pos@Base 6.0 + history_search_prefix@Base 6.0 + history_set_history_state@Base 6.0 + history_set_pos@Base 6.0 + history_subst_char@Base 6.0 + history_tokenize@Base 6.0 + history_total_bytes@Base 6.0 + history_truncate_file@Base 6.0 + history_word_delimiters@Base 6.0 + history_write_timestamps@Base 6.0 + max_input_history@Base 6.0 + next_history@Base 6.0 + previous_history@Base 6.0 + read_history@Base 6.0 + read_history_range@Base 6.0 + remove_history@Base 6.0 + replace_history_entry@Base 6.0 + rl_byte_oriented@Base 6.0 + sh_get_env_value@Base 6.0 + sh_get_home_dir@Base 6.0 + sh_set_lines_and_columns@Base 6.0 + sh_single_quote@Base 6.0 + sh_unset_nodelay_mode@Base 6.0 + stifle_history@Base 6.0 + unstifle_history@Base 6.0 + using_history@Base 6.0 + where_history@Base 6.0 + write_history@Base 6.0 + (optional)xfree@Base 6.0 + (optional)xmalloc@Base 6.0 + (optional)xrealloc@Base 6.0 diff --git a/debian/libreadline7.shlibs b/debian/libreadline7.shlibs new file mode 100644 index 0000000..27e5058 --- /dev/null +++ b/debian/libreadline7.shlibs @@ -0,0 +1,2 @@ +libhistory 7 libreadline7 +libreadline 7 libreadline7 diff --git a/debian/libreadline7.symbols b/debian/libreadline7.symbols new file mode 100644 index 0000000..b487189 --- /dev/null +++ b/debian/libreadline7.symbols @@ -0,0 +1,4 @@ +libhistory.so.7 #PACKAGE# #MINVER# +#include "libhistory7.symbols.common" +libreadline.so.7 #PACKAGE# #MINVER# +#include "libreadline7.symbols.common" diff --git a/debian/libreadline7.symbols.common b/debian/libreadline7.symbols.common new file mode 100644 index 0000000..d58b134 --- /dev/null +++ b/debian/libreadline7.symbols.common @@ -0,0 +1,677 @@ + _hs_append_history_line@Base 7.0~rc1 + _hs_replace_history_data@Base 7.0~beta + _rl_abort_internal@Base 6.0 + _rl_add_macro_char@Base 6.0 + _rl_adjust_point@Base 6.0 + _rl_allow_pathname_alphabetic_chars@Base 6.0 + _rl_any_typein@Base 6.0 + _rl_arg_callback@Base 6.0 + _rl_arg_dispatch@Base 6.0 + _rl_arg_getchar@Base 6.0 + _rl_arg_init@Base 6.0 + _rl_arg_overflow@Base 6.0 + _rl_argcxt@Base 6.0 + _rl_backspace@Base 6.0 + _rl_bell_preference@Base 6.0 + _rl_bind_stty_chars@Base 6.0 + _rl_block_sigint@Base 6.0 + _rl_block_sigwinch@Base 6.1 + _rl_callback_data@Base 6.0 + _rl_callback_data_alloc@Base 6.0 + _rl_callback_data_dispose@Base 6.0 + _rl_callback_func@Base 6.0 + _rl_caught_signal@Base 6.0 + _rl_char_search_internal@Base 6.0 + _rl_char_value@Base 6.0 + _rl_clean_up_for_exit@Base 6.0 + _rl_clear_screen@Base 6.0 + _rl_clear_to_eol@Base 6.0 + _rl_color_ext_list@Base 6.3 + _rl_color_indicator@Base 6.3 + _rl_colored_completion_prefix@Base 7.0~beta + _rl_colored_stats@Base 6.3 + _rl_comment_begin@Base 6.0 + _rl_compare_chars@Base 6.0 + _rl_complete_mark_directories@Base 6.0 + _rl_complete_mark_symlink_dirs@Base 6.0 + _rl_complete_show_all@Base 6.0 + _rl_complete_show_unmodified@Base 6.0 + _rl_completion_case_fold@Base 6.0 + _rl_completion_case_map@Base 6.2 + _rl_completion_columns@Base 6.2 + _rl_completion_prefix_display_length@Base 6.0 + _rl_control_keypad@Base 6.0 + _rl_convert_meta_chars_to_ascii@Base 6.0 + _rl_copy_undo_entry@Base 6.0 + _rl_copy_undo_list@Base 6.0 + _rl_current_display_line@Base 6.0 + _rl_digit_p@Base 6.0 + _rl_digit_value@Base 6.0 + _rl_disable_meta_key@Base 6.3 + _rl_disable_tty_signals@Base 6.0 + _rl_dispatch@Base 6.0 + _rl_dispatch_callback@Base 6.0 + _rl_dispatch_subseq@Base 6.0 + _rl_dispatching_keymap@Base 6.0 + _rl_doing_an_undo@Base 6.0 + _rl_echo_control_chars@Base 6.1 + _rl_echoctl@Base 6.0 + _rl_echoing_p@Base 6.0 + _rl_emacs_mode_str@Base 7.0~beta + _rl_emacs_modestr_len@Base 7.0~beta + _rl_enable_bracketed_paste@Base 7.0~beta + _rl_enable_keypad@Base 6.0 + _rl_enable_meta@Base 6.0 + _rl_enable_meta_key@Base 6.0 + _rl_enable_paren_matching@Base 6.0 + _rl_eof_char@Base 6.0 + _rl_erase_at_end_of_line@Base 6.0 + _rl_erase_entire_line@Base 6.0 + _rl_errmsg@Base 6.0 + _rl_executing_keyseq_size@Base 6.3 + _rl_find_completion_word@Base 6.0 + _rl_find_next_mbchar@Base 6.0 + _rl_find_prev_mbchar@Base 6.0 + _rl_find_prev_mbchar_internal@Base 7.0~rc1 + _rl_fix_last_undo_of_type@Base 6.0 + _rl_fix_point@Base 6.0 + _rl_forward_char_internal@Base 6.2 + _rl_free_history_entry@Base 6.0 + _rl_free_match_list@Base 6.0 + _rl_free_saved_history_line@Base 6.0 + _rl_free_undo_list@Base 6.3 + _rl_get_char_len@Base 6.0 + _rl_get_screen_size@Base 6.0 + _rl_history_preserve_point@Base 6.0 + _rl_history_saved_point@Base 6.0 + _rl_horizontal_scroll_mode@Base 6.0 + _rl_in_stream@Base 6.0 + _rl_init_eightbit@Base 6.0 + _rl_init_line_state@Base 6.0 + _rl_init_terminal_io@Base 6.0 + _rl_input_available@Base 6.0 + _rl_input_queued@Base 6.0 + _rl_insert_char@Base 6.0 + _rl_insert_typein@Base 6.0 + _rl_internal_char_cleanup@Base 6.0 + _rl_interrupt_immediately@Base 6.0 + _rl_intr_char@Base 6.0 + _rl_is_mbchar_matched@Base 6.0 + _rl_iscxt@Base 6.0 + _rl_isearch_callback@Base 6.0 + _rl_isearch_cleanup@Base 7.0~beta + _rl_isearch_dispatch@Base 6.0 + _rl_isearch_terminators@Base 6.0 + _rl_keymap@Base 6.0 + _rl_keyseq_chain_dispose@Base 6.0 + _rl_keyseq_cxt_alloc@Base 6.0 + _rl_keyseq_cxt_dispose@Base 6.0 + _rl_keyseq_timeout@Base 6.3 + _rl_kill_kbd_macro@Base 6.0 + _rl_kscxt@Base 6.0 + _rl_last_c_pos@Base 6.0 + _rl_last_command_was_kill@Base 6.0 + _rl_last_v_pos@Base 6.0 + _rl_lowercase_p@Base 6.0 + _rl_make_prompt_for_search@Base 6.0 + _rl_mark_modified_lines@Base 6.0 + _rl_match_hidden_files@Base 6.0 + _rl_menu_complete_prefix_first@Base 6.2 + _rl_meta_flag@Base 6.0 + _rl_move_cursor_relative@Base 6.0 + _rl_move_vert@Base 6.0 + _rl_next_macro_key@Base 6.0 + _rl_nscxt@Base 6.0 + _rl_nsearch_callback@Base 6.0 + _rl_nsearch_cleanup@Base 7.0~beta + _rl_null_function@Base 6.1 + _rl_optimize_typeahead@Base 7.0~beta + _rl_out_stream@Base 6.0 + _rl_output_character_function@Base 6.0 + _rl_output_meta_chars@Base 6.0 + _rl_output_some_chars@Base 6.0 + _rl_overwrite_char@Base 6.0 + _rl_overwrite_rubout@Base 6.0 + _rl_page_completions@Base 6.0 + _rl_parse_colors@Base 6.3 + _rl_parsing_conditionalized_out@Base 6.0 + _rl_pop_executing_macro@Base 6.0 + _rl_possible_control_prefixes@Base 6.0 + _rl_possible_meta_prefixes@Base 6.0 + _rl_prep_non_filename_text@Base 6.3 + _rl_prev_macro_key@Base 6.3 + _rl_print_color_indicator@Base 6.3 + _rl_print_completions_horizontally@Base 6.0 + _rl_print_prefix_color@Base 7.0~beta + _rl_pure_alphabetic@Base 6.0 + _rl_push_executing_macro@Base 6.0 + _rl_pushed_input_available@Base 6.0 + _rl_put_indicator@Base 6.3 + _rl_qsort_string_compare@Base 6.0 + _rl_quit_char@Base 6.0 + _rl_read_mbchar@Base 6.0 + _rl_read_mbstring@Base 6.0 + _rl_redisplay_after_sigwinch@Base 6.0 + _rl_release_sigint@Base 6.0 + _rl_release_sigwinch@Base 6.1 + _rl_replace_text@Base 6.0 + _rl_reset_argument@Base 6.0 + _rl_reset_completion_state@Base 6.0 + _rl_reset_prompt@Base 6.3 + _rl_restore_tty_signals@Base 6.0 + _rl_revert_all_at_newline@Base 6.0 + _rl_revert_all_lines@Base 6.0 + _rl_rubout_char@Base 6.0 + _rl_saved_line_for_history@Base 6.0 + _rl_savestring@Base 6.0 + _rl_screenchars@Base 6.0 + _rl_screenheight@Base 6.0 + _rl_screenwidth@Base 6.0 + _rl_scxt_alloc@Base 6.0 + _rl_scxt_dispose@Base 6.0 + _rl_search_getchar@Base 6.0 + _rl_set_cursor@Base 6.0 + _rl_set_insert_mode@Base 6.0 + _rl_set_mark_at_pos@Base 6.0 + _rl_set_normal_color@Base 6.3 + _rl_set_screen_size@Base 6.0 + _rl_set_the_line@Base 6.0 + _rl_show_mode_in_prompt@Base 6.3 + _rl_sigcleanarg@Base 6.3 + _rl_sigcleanup@Base 6.3 + _rl_signal_handler@Base 6.0 + _rl_sigwinch_resize_terminal@Base 6.3 + _rl_skip_completed_text@Base 6.1 + _rl_start_using_history@Base 6.0 + _rl_strindex@Base 6.0 + _rl_strip_prompt@Base 6.0 + _rl_suppress_redisplay@Base 6.0 + _rl_susp_char@Base 6.0 + _rl_term_DC@Base 6.0 + _rl_term_IC@Base 6.0 + _rl_term_autowrap@Base 6.0 + _rl_term_backspace@Base 6.0 + _rl_term_clreol@Base 6.0 + _rl_term_clrpag@Base 6.0 + _rl_term_cr@Base 6.0 + _rl_term_dc@Base 6.0 + _rl_term_ei@Base 6.0 + _rl_term_forward_char@Base 6.0 + _rl_term_goto@Base 6.0 + _rl_term_ic@Base 6.0 + _rl_term_im@Base 6.0 + _rl_term_ip@Base 6.0 + _rl_term_pc@Base 6.0 + _rl_term_up@Base 6.0 + _rl_terminal_can_insert@Base 6.0 + _rl_to_lower@Base 6.0 + _rl_to_upper@Base 6.0 + _rl_top_level@Base 6.0 + _rl_ttyflush@Base 7.0~beta + _rl_ttymsg@Base 6.0 + _rl_undo_group_level@Base 6.0 + _rl_unget_char@Base 6.0 + _rl_untranslate_macro_value@Base 6.3 + _rl_update_final@Base 6.0 + _rl_uppercase_p@Base 6.0 + _rl_utf8locale@Base 6.3 + _rl_vi_cmd_mode_str@Base 7.0~beta + _rl_vi_cmd_modestr_len@Base 7.0~beta + _rl_vi_domove_callback@Base 6.2 + _rl_vi_domove_motion_cleanup@Base 7.0~beta + _rl_vi_done_inserting@Base 6.0 + _rl_vi_initialize_line@Base 6.0 + _rl_vi_ins_mode_str@Base 7.0~beta + _rl_vi_ins_modestr_len@Base 7.0~beta + _rl_vi_last_command@Base 6.0 + _rl_vi_motion_command@Base 7.0~beta + _rl_vi_redoing@Base 7.0~beta + _rl_vi_reset_last@Base 6.0 + _rl_vi_set_last@Base 6.0 + _rl_vi_textmod_command@Base 6.0 + _rl_vimvcxt@Base 6.2 + _rl_vis_botlin@Base 6.0 + _rl_walphabetic@Base 6.0 + _rl_want_redisplay@Base 6.0 + _rl_with_macro_input@Base 6.0 + add_history@Base 6.0 + add_history_time@Base 6.0 + alloc_history_entry@Base 6.0 + alphabetic@Base 6.0 + append_history@Base 6.0 + clear_history@Base 6.0 + completion_matches@Base 6.0 + copy_history_entry@Base 6.0 + crlf@Base 6.0 + current_history@Base 6.0 + ding@Base 6.0 + emacs_ctlx_keymap@Base 6.0 + emacs_meta_keymap@Base 6.0 + emacs_standard_keymap@Base 6.0 + filename_completion_function@Base 6.0 + free_history_entry@Base 6.0 + free_undo_list@Base 6.0 + funmap@Base 6.0 + funmap_program_specific_entry_start@Base 6.0 + get_history_event@Base 6.0 + history_arg_extract@Base 6.0 + history_base@Base 6.0 + history_comment_char@Base 6.0 + history_expand@Base 6.0 + history_expansion_char@Base 6.0 + history_file_version@Base 7.0~rc1 + history_get@Base 6.0 + history_get_history_state@Base 6.0 + history_get_time@Base 6.0 + history_inhibit_expansion_function@Base 6.0 + history_is_stifled@Base 6.0 + history_length@Base 6.0 + history_lines_read_from_file@Base 7.0~beta + history_lines_written_to_file@Base 7.0~beta + history_list@Base 6.0 + history_max_entries@Base 6.0 + history_multiline_entries@Base 7.0~rc1 + history_no_expand_chars@Base 6.0 + history_offset@Base 6.0 + history_quotes_inhibit_expansion@Base 6.0 + history_search@Base 6.0 + history_search_delimiter_chars@Base 6.0 + history_search_pos@Base 6.0 + history_search_prefix@Base 6.0 + history_set_history_state@Base 6.0 + history_set_pos@Base 6.0 + history_subst_char@Base 6.0 + history_tokenize@Base 6.0 + history_total_bytes@Base 6.0 + history_truncate_file@Base 6.0 + history_word_delimiters@Base 6.0 + history_write_timestamps@Base 6.0 + max_input_history@Base 6.0 + maybe_replace_line@Base 6.0 + maybe_save_line@Base 6.0 + maybe_unsave_line@Base 6.0 + next_history@Base 6.0 + previous_history@Base 6.0 + read_history@Base 6.0 + read_history_range@Base 6.0 + readline@Base 6.0 + readline_internal_char@Base 6.0 + readline_internal_setup@Base 6.0 + readline_internal_teardown@Base 6.0 + remove_history@Base 6.0 + replace_history_entry@Base 6.0 + rl_abort@Base 6.0 + rl_add_defun@Base 6.0 + rl_add_funmap_entry@Base 6.0 + rl_add_undo@Base 6.0 + rl_alphabetic@Base 6.0 + rl_already_prompted@Base 6.0 + rl_arg_sign@Base 6.0 + rl_arrow_keys@Base 6.0 + rl_attempted_completion_function@Base 6.0 + rl_attempted_completion_over@Base 6.0 + rl_backward@Base 6.0 + rl_backward_byte@Base 6.0 + rl_backward_char@Base 6.0 + rl_backward_char_search@Base 6.0 + rl_backward_kill_line@Base 6.0 + rl_backward_kill_word@Base 6.0 + rl_backward_menu_complete@Base 6.1 + rl_backward_word@Base 6.0 + rl_basic_quote_characters@Base 6.0 + rl_basic_word_break_characters@Base 6.0 + rl_beg_of_line@Base 6.0 + rl_begin_undo_group@Base 6.0 + rl_beginning_of_history@Base 6.0 + rl_bind_key@Base 6.0 + rl_bind_key_if_unbound@Base 6.0 + rl_bind_key_if_unbound_in_map@Base 6.0 + rl_bind_key_in_map@Base 6.0 + rl_bind_keyseq@Base 6.0 + rl_bind_keyseq_if_unbound@Base 6.0 + rl_bind_keyseq_if_unbound_in_map@Base 6.0 + rl_bind_keyseq_in_map@Base 6.0 + rl_binding_keymap@Base 6.0 + rl_blink_matching_paren@Base 6.0 + rl_bracketed_paste_begin@Base 7.0~beta + rl_byte_oriented@Base 6.0 + rl_call_last_kbd_macro@Base 6.0 + rl_callback_handler_install@Base 6.0 + rl_callback_handler_remove@Base 6.0 + rl_callback_read_char@Base 6.0 + rl_callback_sigcleanup@Base 7.0~beta + rl_capitalize_word@Base 6.0 + rl_catch_signals@Base 6.0 + rl_catch_sigwinch@Base 6.0 + rl_change_environment@Base 6.3 + rl_char_is_quoted_p@Base 6.0 + rl_char_search@Base 6.0 + rl_character_len@Base 6.0 + rl_cleanup_after_signal@Base 6.0 + rl_clear_history@Base 6.3 + rl_clear_message@Base 6.0 + rl_clear_pending_input@Base 6.0 + rl_clear_screen@Base 6.0 + rl_clear_signals@Base 6.0 + rl_clear_visible_line@Base 7.0~rc1 + rl_complete@Base 6.0 + rl_complete_internal@Base 6.0 + rl_complete_with_tilde_expansion@Base 6.0 + rl_completer_quote_characters@Base 6.0 + rl_completer_word_break_characters@Base 6.0 + rl_completion_append_character@Base 6.0 + rl_completion_display_matches_hook@Base 6.0 + rl_completion_entry_function@Base 6.0 + rl_completion_found_quote@Base 6.0 + rl_completion_invoking_key@Base 6.0 + rl_completion_mark_symlink_dirs@Base 6.0 + rl_completion_matches@Base 6.0 + rl_completion_mode@Base 6.0 + rl_completion_query_items@Base 6.0 + rl_completion_quote_character@Base 6.0 + rl_completion_suppress_append@Base 6.0 + rl_completion_suppress_quote@Base 6.0 + rl_completion_type@Base 6.0 + rl_completion_word_break_hook@Base 6.0 + rl_copy_backward_word@Base 6.0 + rl_copy_forward_word@Base 6.0 + rl_copy_keymap@Base 6.0 + rl_copy_region_to_kill@Base 6.0 + rl_copy_text@Base 6.0 + rl_crlf@Base 6.0 + rl_delete@Base 6.0 + rl_delete_horizontal_space@Base 6.0 + rl_delete_or_show_completions@Base 6.0 + rl_delete_text@Base 6.0 + rl_deprep_term_function@Base 6.0 + rl_deprep_terminal@Base 6.0 + rl_digit_argument@Base 6.0 + rl_ding@Base 6.0 + rl_directory_completion_hook@Base 6.0 + rl_directory_rewrite_hook@Base 6.0 + rl_discard_argument@Base 6.0 + rl_discard_keymap@Base 6.0 + rl_dispatching@Base 6.0 + rl_display_fixed@Base 6.0 + rl_display_match_list@Base 6.0 + rl_display_prompt@Base 6.0 + rl_do_lowercase_version@Base 6.0 + rl_do_undo@Base 6.0 + rl_done@Base 6.0 + rl_downcase_word@Base 6.0 + rl_dump_functions@Base 6.0 + rl_dump_macros@Base 6.0 + rl_dump_variables@Base 6.0 + rl_echo_signal_char@Base 6.0 + rl_editing_mode@Base 6.0 + rl_emacs_editing_mode@Base 6.0 + rl_end@Base 6.0 + rl_end_kbd_macro@Base 6.0 + rl_end_of_history@Base 6.0 + rl_end_of_line@Base 6.0 + rl_end_undo_group@Base 6.0 + rl_erase_empty_line@Base 6.0 + rl_event_hook@Base 6.0 + rl_exchange_point_and_mark@Base 6.0 + rl_execute_next@Base 6.0 + rl_executing_key@Base 6.3 + rl_executing_keymap@Base 6.0 + rl_executing_keyseq@Base 6.3 + rl_executing_macro@Base 6.0 + rl_expand_prompt@Base 6.0 + rl_explicit_arg@Base 6.0 + rl_extend_line_buffer@Base 6.0 + rl_filename_completion_desired@Base 6.0 + rl_filename_completion_function@Base 6.0 + rl_filename_dequoting_function@Base 6.0 + rl_filename_quote_characters@Base 6.0 + rl_filename_quoting_desired@Base 6.0 + rl_filename_quoting_function@Base 6.0 + rl_filename_rewrite_hook@Base 6.1 + rl_filename_stat_hook@Base 6.3 + rl_forced_update_display@Base 6.0 + rl_forward@Base 6.0 + rl_forward_byte@Base 6.0 + rl_forward_char@Base 6.0 + rl_forward_search_history@Base 6.0 + rl_forward_word@Base 6.0 + rl_free@Base 6.0 + rl_free_keymap@Base 6.1 + rl_free_line_state@Base 6.0 + rl_free_undo_list@Base 6.0 + rl_function_dumper@Base 6.0 + rl_function_of_keyseq@Base 6.0 + rl_funmap_names@Base 6.0 + rl_generic_bind@Base 6.0 + rl_get_keymap@Base 6.0 + rl_get_keymap_by_name@Base 6.0 + rl_get_keymap_name@Base 6.0 + rl_get_keymap_name_from_edit_mode@Base 6.0 + rl_get_next_history@Base 6.0 + rl_get_previous_history@Base 6.0 + rl_get_screen_size@Base 6.0 + rl_get_termcap@Base 6.0 + rl_getc@Base 6.0 + rl_getc_function@Base 6.0 + rl_gnu_readline_p@Base 6.0 + rl_history_search_backward@Base 6.0 + rl_history_search_forward@Base 6.0 + rl_history_substr_search_backward@Base 6.3 + rl_history_substr_search_forward@Base 6.3 + rl_ignore_completion_duplicates@Base 6.0 + rl_ignore_some_completions_function@Base 6.0 + rl_inhibit_completion@Base 6.0 + rl_initialize@Base 6.0 + rl_initialize_funmap@Base 6.0 + rl_input_available_hook@Base 6.3 + rl_insert@Base 6.0 + rl_insert_close@Base 6.0 + rl_insert_comment@Base 6.0 + rl_insert_completions@Base 6.0 + rl_insert_mode@Base 6.0 + rl_insert_text@Base 6.0 + rl_instream@Base 6.0 + rl_invoking_keyseqs@Base 6.0 + rl_invoking_keyseqs_in_map@Base 6.0 + rl_key_sequence_length@Base 6.0 + rl_kill_full_line@Base 6.0 + rl_kill_line@Base 6.0 + rl_kill_region@Base 6.0 + rl_kill_text@Base 6.0 + rl_kill_word@Base 6.0 + rl_last_func@Base 6.0 + rl_library_version@Base 6.0 + rl_line_buffer@Base 6.0 + rl_line_buffer_len@Base 6.0 + rl_linefunc@Base 6.0 + rl_list_funmap_names@Base 6.0 + rl_macro_bind@Base 6.0 + rl_macro_dumper@Base 6.0 + rl_make_bare_keymap@Base 6.0 + rl_make_keymap@Base 6.0 + rl_mark@Base 6.0 + rl_maybe_replace_line@Base 6.0 + rl_maybe_save_line@Base 6.0 + rl_maybe_unsave_line@Base 6.0 + rl_menu_complete@Base 6.0 + rl_menu_completion_entry_function@Base 6.0 + rl_message@Base 6.0 + rl_modifying@Base 6.0 + rl_named_function@Base 6.0 + rl_newline@Base 6.0 + rl_noninc_forward_search@Base 6.0 + rl_noninc_forward_search_again@Base 6.0 + rl_noninc_reverse_search@Base 6.0 + rl_noninc_reverse_search_again@Base 6.0 + rl_num_chars_to_read@Base 6.0 + rl_numeric_arg@Base 6.0 + rl_old_menu_complete@Base 6.0 + rl_on_new_line@Base 6.0 + rl_on_new_line_with_prompt@Base 6.0 + rl_outstream@Base 6.0 + rl_overwrite_mode@Base 6.0 + rl_parse_and_bind@Base 6.0 + rl_pending_input@Base 6.0 + rl_pending_signal@Base 7.0~rc2 + rl_persistent_signal_handlers@Base 7.0~rc2 + rl_point@Base 6.0 + rl_possible_completions@Base 6.0 + rl_pre_input_hook@Base 6.0 + rl_prefer_env_winsize@Base 6.0 + rl_prep_term_function@Base 6.0 + rl_prep_terminal@Base 6.0 + rl_print_last_kbd_macro@Base 6.3 + rl_prompt@Base 6.0 + rl_push_macro_input@Base 6.0 + rl_quoted_insert@Base 6.0 + rl_re_read_init_file@Base 6.0 + rl_read_init_file@Base 6.0 + rl_read_key@Base 6.0 + rl_readline_name@Base 6.0 + rl_readline_state@Base 6.0 + rl_readline_version@Base 6.0 + rl_redisplay@Base 6.0 + rl_redisplay_function@Base 6.0 + rl_redraw_prompt_last_line@Base 7.0~beta + rl_refresh_line@Base 6.0 + rl_replace_from_history@Base 6.0 + rl_replace_line@Base 6.0 + rl_reset_after_signal@Base 6.0 + rl_reset_line_state@Base 6.0 + rl_reset_screen_size@Base 6.0 + rl_reset_terminal@Base 6.0 + rl_resize_terminal@Base 6.0 + rl_restart_output@Base 6.0 + rl_restore_prompt@Base 6.0 + rl_restore_state@Base 6.0 + rl_reverse_search_history@Base 6.0 + rl_revert_line@Base 6.0 + rl_rubout@Base 6.0 + rl_rubout_or_delete@Base 6.0 + rl_save_prompt@Base 6.0 + rl_save_state@Base 6.0 + rl_set_key@Base 6.0 + rl_set_keyboard_input_timeout@Base 6.0 + rl_set_keymap@Base 6.0 + rl_set_keymap_from_edit_mode@Base 6.0 + rl_set_mark@Base 6.0 + rl_set_paren_blink_timeout@Base 6.0 + rl_set_prompt@Base 6.0 + rl_set_retained_kills@Base 6.0 + rl_set_screen_size@Base 6.0 + rl_set_signals@Base 6.0 + rl_show_char@Base 6.0 + rl_signal_event_hook@Base 6.3 + rl_skip_csi_sequence@Base 6.1 + rl_sort_completion_matches@Base 6.0 + rl_special_prefixes@Base 6.0 + rl_start_kbd_macro@Base 6.0 + rl_startup_hook@Base 6.0 + rl_stop_output@Base 6.0 + rl_stuff_char@Base 6.0 + rl_tab_insert@Base 6.0 + rl_terminal_name@Base 6.0 + rl_tilde_expand@Base 6.0 + rl_translate_keyseq@Base 6.0 + rl_transpose_chars@Base 6.0 + rl_transpose_words@Base 6.0 + rl_tty_set_default_bindings@Base 6.0 + rl_tty_set_echoing@Base 7.0~rc1 + rl_tty_status@Base 6.0 + rl_tty_unset_default_bindings@Base 6.0 + rl_unbind_command_in_map@Base 6.0 + rl_unbind_function_in_map@Base 6.0 + rl_unbind_key@Base 6.0 + rl_unbind_key_in_map@Base 6.0 + rl_undo_command@Base 6.0 + rl_undo_list@Base 6.0 + rl_universal_argument@Base 6.0 + rl_unix_filename_rubout@Base 6.0 + rl_unix_line_discard@Base 6.0 + rl_unix_word_rubout@Base 6.0 + rl_untranslate_keyseq@Base 6.0 + rl_upcase_word@Base 6.0 + rl_username_completion_function@Base 6.0 + rl_variable_bind@Base 6.0 + rl_variable_dumper@Base 6.0 + rl_variable_value@Base 6.0 + rl_vi_append_eol@Base 6.0 + rl_vi_append_mode@Base 6.0 + rl_vi_arg_digit@Base 6.0 + rl_vi_bWord@Base 6.0 + rl_vi_back_to_indent@Base 6.0 + rl_vi_bracktype@Base 6.0 + rl_vi_bword@Base 6.0 + rl_vi_change_case@Base 6.0 + rl_vi_change_char@Base 6.0 + rl_vi_change_to@Base 6.0 + rl_vi_char_search@Base 6.0 + rl_vi_check@Base 6.0 + rl_vi_column@Base 6.0 + rl_vi_complete@Base 6.0 + rl_vi_delete@Base 6.0 + rl_vi_delete_to@Base 6.0 + rl_vi_domove@Base 6.0 + rl_vi_eWord@Base 6.0 + rl_vi_editing_mode@Base 6.0 + rl_vi_end_word@Base 6.0 + rl_vi_eof_maybe@Base 6.0 + rl_vi_eword@Base 6.0 + rl_vi_fWord@Base 6.0 + rl_vi_fetch_history@Base 6.0 + rl_vi_first_print@Base 6.0 + rl_vi_fword@Base 6.0 + rl_vi_goto_mark@Base 6.0 + rl_vi_insert_beg@Base 6.0 + rl_vi_insert_mode@Base 6.0 + rl_vi_insertion_mode@Base 6.0 + rl_vi_match@Base 6.0 + rl_vi_movement_mode@Base 6.0 + rl_vi_next_word@Base 6.0 + rl_vi_overstrike@Base 6.0 + rl_vi_overstrike_delete@Base 6.0 + rl_vi_prev_word@Base 6.0 + rl_vi_put@Base 6.0 + rl_vi_redo@Base 6.0 + rl_vi_replace@Base 6.0 + rl_vi_rubout@Base 6.0 + rl_vi_search@Base 6.0 + rl_vi_search_again@Base 6.0 + rl_vi_set_mark@Base 6.0 + rl_vi_start_inserting@Base 6.0 + rl_vi_subst@Base 6.0 + rl_vi_tilde_expand@Base 6.0 + rl_vi_undo@Base 6.0 + rl_vi_unix_word_rubout@Base 7.0~rc1 + rl_vi_yank_arg@Base 6.0 + rl_vi_yank_pop@Base 7.0~beta + rl_vi_yank_to@Base 6.0 + rl_visible_prompt_length@Base 6.0 + rl_visible_stats@Base 6.0 + rl_yank@Base 6.0 + rl_yank_last_arg@Base 6.0 + rl_yank_nth_arg@Base 6.0 + rl_yank_pop@Base 6.0 + rltty_set_default_bindings@Base 6.0 + sh_get_env_value@Base 6.0 + sh_get_home_dir@Base 6.0 + sh_set_lines_and_columns@Base 6.0 + sh_single_quote@Base 6.0 + sh_unset_nodelay_mode@Base 6.0 + stifle_history@Base 6.0 + tilde_additional_prefixes@Base 6.0 + tilde_additional_suffixes@Base 6.0 + tilde_expand@Base 6.0 + tilde_expand_word@Base 6.0 + tilde_expansion_failure_hook@Base 6.0 + tilde_expansion_preexpansion_hook@Base 6.0 + unstifle_history@Base 6.0 + username_completion_function@Base 6.0 + using_history@Base 6.0 + vi_insertion_keymap@Base 6.0 + vi_movement_keymap@Base 6.0 + where_history@Base 6.0 + write_history@Base 6.0 + (optional)xfree@Base 6.0 + (optional)xmalloc@Base 6.0 + (optional)xrealloc@Base 6.0 diff --git a/debian/patches/configure-tinfo.diff b/debian/patches/configure-tinfo.diff new file mode 100644 index 0000000..8b59ad7 --- /dev/null +++ b/debian/patches/configure-tinfo.diff @@ -0,0 +1,202 @@ +Index: b/aclocal.m4 +=================================================================== +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -958,8 +958,8 @@ _bash_needmsg= + fi + AC_CACHE_VAL(bash_cv_termcap_lib, + [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc, +- [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap, +- [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo, ++ [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo, ++ [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap, + [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses, + [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses, + bash_cv_termcap_lib=gnutermcap)])])])])]) +Index: b/configure +=================================================================== +--- a/configure ++++ b/configure +@@ -698,6 +698,7 @@ infodir + docdir + oldincludedir + includedir ++runstatedir + localstatedir + sharedstatedir + sysconfdir +@@ -773,6 +774,7 @@ datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' ++runstatedir='${localstatedir}/run' + includedir='${prefix}/include' + oldincludedir='/usr/include' + docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +@@ -1025,6 +1027,15 @@ do + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + ++ -runstatedir | --runstatedir | --runstatedi | --runstated \ ++ | --runstate | --runstat | --runsta | --runst | --runs \ ++ | --run | --ru | --r) ++ ac_prev=runstatedir ;; ++ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ ++ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ ++ | --run=* | --ru=* | --r=*) ++ runstatedir=$ac_optarg ;; ++ + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +@@ -1162,7 +1173,7 @@ fi + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ +- libdir localedir mandir ++ libdir localedir mandir runstatedir + do + eval ac_val=\$$ac_var + # Remove trailing slashes. +@@ -1315,6 +1326,7 @@ Fine tuning of the installation director + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] +@@ -2951,7 +2963,7 @@ ac_clean_files="$ac_clean_files conftest + # the compiler is broken, or we cross compile. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 + $as_echo_n "checking whether we are cross compiling... " >&6; } +-if false && test "$cross_compiling" != yes; then ++if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +@@ -4835,7 +4847,7 @@ else + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +@@ -4881,7 +4893,7 @@ else + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +@@ -4905,7 +4917,7 @@ rm -f core conftest.err conftest.$ac_obj + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +@@ -4950,7 +4962,7 @@ else + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +@@ -4974,7 +4986,7 @@ rm -f core conftest.err conftest.$ac_obj + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +@@ -5905,13 +5917,13 @@ else + if test "x$ac_cv_func_tgetent" = xyes; then : + bash_cv_termcap_lib=libc + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 +-$as_echo_n "checking for tgetent in -ltermcap... " >&6; } +-if ${ac_cv_lib_termcap_tgetent+:} false; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5 ++$as_echo_n "checking for tgetent in -ltinfo... " >&6; } ++if ${ac_cv_lib_tinfo_tgetent+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ltermcap $LIBS" ++LIBS="-ltinfo $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -5931,26 +5943,26 @@ return tgetent (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_termcap_tgetent=yes ++ ac_cv_lib_tinfo_tgetent=yes + else +- ac_cv_lib_termcap_tgetent=no ++ ac_cv_lib_tinfo_tgetent=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 +-$as_echo "$ac_cv_lib_termcap_tgetent" >&6; } +-if test "x$ac_cv_lib_termcap_tgetent" = xyes; then : +- bash_cv_termcap_lib=libtermcap ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5 ++$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; } ++if test "x$ac_cv_lib_tinfo_tgetent" = xyes; then : ++ bash_cv_termcap_lib=libtinfo + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5 +-$as_echo_n "checking for tgetent in -ltinfo... " >&6; } +-if ${ac_cv_lib_tinfo_tgetent+:} false; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5 ++$as_echo_n "checking for tgetent in -ltermcap... " >&6; } ++if ${ac_cv_lib_termcap_tgetent+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ltinfo $LIBS" ++LIBS="-ltermcap $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -5970,18 +5982,18 @@ return tgetent (); + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_tinfo_tgetent=yes ++ ac_cv_lib_termcap_tgetent=yes + else +- ac_cv_lib_tinfo_tgetent=no ++ ac_cv_lib_termcap_tgetent=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5 +-$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; } +-if test "x$ac_cv_lib_tinfo_tgetent" = xyes; then : +- bash_cv_termcap_lib=libtinfo ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5 ++$as_echo "$ac_cv_lib_termcap_tgetent" >&6; } ++if test "x$ac_cv_lib_termcap_tgetent" = xyes; then : ++ bash_cv_termcap_lib=libtermcap + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5 + $as_echo_n "checking for tgetent in -lcurses... " >&6; } diff --git a/debian/patches/examples-makefile-multiarch.diff b/debian/patches/examples-makefile-multiarch.diff new file mode 100644 index 0000000..d2c11e3 --- /dev/null +++ b/debian/patches/examples-makefile-multiarch.diff @@ -0,0 +1,30 @@ +From e5a01df4f075ddb96c393748d37a16498aa37c0a Mon Sep 17 00:00:00 2001 +From: Shawn Landden <shawnlandden@gmail.com> +Date: Wed, 18 Jul 2012 18:21:14 -0700 +Subject: [PATCH] fix Makefile -- allows build of examples, multi-arch: same + +--- + examples/Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: b/examples/Makefile.in +=================================================================== +--- a/examples/Makefile.in ++++ b/examples/Makefile.in +@@ -27,12 +27,12 @@ + datarootdir = @datarootdir@ + + bindir = @bindir@ +-srcdir = @srcdir@ ++srcdir = /usr/share/doc/libreadline6/examples + datadir = @datadir@ +-VPATH = @srcdir@ +-top_srcdir = @top_srcdir@ ++VPATH = .:/usr/share/doc/libreadline6/examples ++top_srcdir = /usr/include/readline + #BUILD_DIR = . +-BUILD_DIR = @BUILD_DIR@ ++BUILD_DIR = /usr/src/readline6/build + installdir = $(datadir)/readline + + INSTALL = @INSTALL@ diff --git a/debian/patches/fix-wformat-security.diff b/debian/patches/fix-wformat-security.diff new file mode 100644 index 0000000..84edbc8 --- /dev/null +++ b/debian/patches/fix-wformat-security.diff @@ -0,0 +1,16 @@ +Description: Fix compiling with -Werror=format-security. + Prevents format string attacks. +Author: Simon Ruderich <simon@ruderich.org> +Last-Update: 2012-09-15 + +--- readline6-6.2.orig/examples/rlfe/rlfe.c ++++ readline6-6.2/examples/rlfe/rlfe.c +@@ -273,7 +273,7 @@ static void maybe_emphasize_input (int o + if (on == current_emphasize_input + || (on && ! do_emphasize_input)) + return; +- fprintf (rl_outstream, on ? start_input_mode : end_input_mode); ++ fprintf (rl_outstream, "%s", on ? start_input_mode : end_input_mode); + fflush (rl_outstream); + current_emphasize_input = on; + } diff --git a/debian/patches/readline70-001.diff b/debian/patches/readline70-001.diff new file mode 100644 index 0000000..f356d22 --- /dev/null +++ b/debian/patches/readline70-001.diff @@ -0,0 +1,50 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 7.0 +Patch-ID: readline70-001 + +Bug-Reported-by: Sean Zha <freeman_cha@hotmail.com> +Bug-Reference-ID: <BN3PR01MB13657D9303EB94BF6E54216E8CCA0@BN3PR01MB1365.prod.exchangelabs.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00107.html + +Bug-Description: + +Readline-7.0 changed the way the history list is initially allocated to reduce +the number of reallocations and copies. Users who set the readline +history-size variable to a very large number to essentially unlimit the size +of the history list will get memory allocation errors + +Index: b/history.c +=================================================================== +--- 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 *)); +Index: b/patchlevel +=================================================================== +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-0 ++1 diff --git a/debian/patches/readline70-002.diff b/debian/patches/readline70-002.diff new file mode 100644 index 0000000..df853ca --- /dev/null +++ b/debian/patches/readline70-002.diff @@ -0,0 +1,81 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 7.0 +Patch-ID: readline70-002 + +Bug-Reported-by: Hong Cho <hong.cho@citrix.com> +Bug-Reference-ID: <c30b5fe62b2543af8297e47ca487c29c@SJCPEX02CL02.citrite.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2016-12/msg00002.html + +Bug-Description: + +There is a race condition in add_history() that can be triggered by a fatal +signal arriving between the time the history length is updated and the time +the history list update is completed. A later attempt to reference an +invalid history entry can cause a crash. + +Index: b/history.c +=================================================================== +--- 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. */ +Index: b/patchlevel +=================================================================== +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-1 ++2 diff --git a/debian/patches/readline70-003.diff b/debian/patches/readline70-003.diff new file mode 100644 index 0000000..44c1539 --- /dev/null +++ b/debian/patches/readline70-003.diff @@ -0,0 +1,38 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 7.0 +Patch-ID: readline70-003 + +Bug-Reported-by: Frédéric Brière <fbriere@fbriere.net> +Bug-Reference-ID: <20170120180724.7ydq7fb2hsp366dj@fabul.fbriere.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2017-01/msg00002.html + +Bug-Description: + +Readline-7.0 uses pselect(2) to allow readline to handle signals that do not +interrupt read(2), such as SIGALRM, before reading another character. The +signal mask used in the pselect call did not take into account signals the +calling application blocked before calling readline(). + +Index: b/input.c +=================================================================== +--- 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); +Index: b/patchlevel +=================================================================== +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-2 ++3 diff --git a/debian/patches/rl-attribute.diff b/debian/patches/rl-attribute.diff new file mode 100644 index 0000000..c566065 --- /dev/null +++ b/debian/patches/rl-attribute.diff @@ -0,0 +1,36 @@ +rl-attribute.dpatch by <doko@debian.org> + +Do not redefine __attribute__, define macro __rl_attribute__ + +Index: b/readline.h +=================================================================== +--- a/readline.h ++++ b/readline.h +@@ -385,7 +385,7 @@ extern int rl_reset_line_state PARAMS((v + extern int rl_crlf PARAMS((void)); + + #if defined (USE_VARARGS) && defined (PREFER_STDARG) +-extern int rl_message (const char *, ...) __attribute__((__format__ (printf, 1, 2))); ++extern int rl_message (const char *, ...) __rl_attribute__((__format__ (printf, 1, 2))); + #else + extern int rl_message (); + #endif +Index: b/rlstdc.h +=================================================================== +--- a/rlstdc.h ++++ b/rlstdc.h +@@ -36,10 +36,10 @@ + # endif + #endif + +-#ifndef __attribute__ +-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) +-# define __attribute__(x) +-# endif ++#if defined(__GNUC__) && __GNUC__ >= 2 ++# define __rl_attribute__(x) __attribute__(x) ++#else ++# define __rl_attribute__(x) + #endif + + /* Moved from config.h.in because readline.h:rl_message depends on these diff --git a/debian/patches/rl-header.diff b/debian/patches/rl-header.diff new file mode 100644 index 0000000..72938e3 --- /dev/null +++ b/debian/patches/rl-header.diff @@ -0,0 +1,28 @@ +rl-header.dpatch by <doko@debian.org> + +Include stdio.h in readline.h and history.h + +Index: b/history.h +=================================================================== +--- a/history.h 2010-04-10 12:05:07.792336522 +0000 ++++ b/history.h 2010-04-10 12:12:39.462336737 +0000 +@@ -32,6 +32,7 @@ + # include "rlstdc.h" + # include "rltypedefs.h" + #else ++# include <stdio.h> + # include <readline/rlstdc.h> + # include <readline/rltypedefs.h> + #endif +Index: b/readline.h +=================================================================== +--- a/readline.h 2010-04-10 12:12:39.302337290 +0000 ++++ b/readline.h 2010-04-10 12:12:39.462336737 +0000 +@@ -32,6 +32,7 @@ + # include "keymaps.h" + # include "tilde.h" + #else ++# include <stdio.h> + # include <readline/rlstdc.h> + # include <readline/rltypedefs.h> + # include <readline/keymaps.h> diff --git a/debian/patches/rl-no-cross-check.diff b/debian/patches/rl-no-cross-check.diff new file mode 100644 index 0000000..e6fde4c --- /dev/null +++ b/debian/patches/rl-no-cross-check.diff @@ -0,0 +1,17 @@ +rl-no-cross-check.dpatch by <doko@debian.org> + +configure: Don't check for cross compilation + +Index: b/configure +=================================================================== +--- a/configure ++++ b/configure +@@ -2951,7 +2951,7 @@ ac_clean_files="$ac_clean_files conftest + # the compiler is broken, or we cross compile. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 + $as_echo_n "checking whether we are cross compiling... " >&6; } +-if test "$cross_compiling" != yes; then ++if false && test "$cross_compiling" != yes; then + { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; diff --git a/debian/patches/rl-no-rpath.diff b/debian/patches/rl-no-rpath.diff new file mode 100644 index 0000000..f47e08e --- /dev/null +++ b/debian/patches/rl-no-rpath.diff @@ -0,0 +1,17 @@ +rl-no-rpath.dpatch by <doko@debian.org> + +Don't set a runtime path for linking the shared libraries + +Index: b/support/shobj-conf +=================================================================== +--- a/support/shobj-conf ++++ b/support/shobj-conf +@@ -128,7 +128,7 @@ + SHOBJ_LD='${CC}' + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' + +- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' ++ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' + SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' + ;; + diff --git a/debian/patches/rlfe-history.diff b/debian/patches/rlfe-history.diff new file mode 100644 index 0000000..f83469f --- /dev/null +++ b/debian/patches/rlfe-history.diff @@ -0,0 +1,52 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## rlfe-history.dpatch by <andrew@pimlott.net> +## +## DP: Fix rlfe, always writing a history file. + +@DPATCH@ +Index: b/examples/rlfe/rlfe.c +=================================================================== +--- a/examples/rlfe/rlfe.c ++++ b/examples/rlfe/rlfe.c +@@ -154,21 +154,27 @@ + static pid_t child = -1; + + static void +-sig_child (int signo) ++finish_up() + { +- int status; +- wait (&status); + if (hist_file != 0) + { + write_history (hist_file); + if (hist_size) + history_truncate_file (hist_file, hist_size); + } +- DPRINT0 ("(Child process died.)\n"); + tcsetattr(STDIN_FILENO, TCSANOW, &orig_term); + exit (0); + } + ++static void ++sig_child (int signo) ++{ ++ int status; ++ wait (&status); ++ DPRINT0 ("(Child process died.)\n"); ++ finish_up(); ++} ++ + volatile int propagate_sigwinch = 0; + + /* sigwinch_handler +@@ -710,8 +716,7 @@ + if (count <= 0) + { + DPRINT0 ("(Connection closed by foreign host.)\n"); +- tcsetattr(STDIN_FILENO, TCSANOW, &orig_term); +- exit (0); ++ finish_up(); + } + old_count = buf_count; + diff --git a/debian/patches/rlfe-kfreebsd.diff b/debian/patches/rlfe-kfreebsd.diff new file mode 100644 index 0000000..240d85a --- /dev/null +++ b/debian/patches/rlfe-kfreebsd.diff @@ -0,0 +1,13 @@ +Index: readline6-6.1/examples/rlfe/pty.c +=================================================================== +--- readline6-6.1.orig/examples/rlfe/pty.c 2010-05-30 18:30:54.000000000 +0000 ++++ readline6-6.1/examples/rlfe/pty.c 2010-05-30 18:30:58.000000000 +0000 +@@ -133,7 +133,7 @@ + { + if (f < 0) + return; +-#if defined(I_PUSH) && defined(HAVE_SVR4_PTYS) && !defined(sgi) && !defined(linux) && !defined(__osf__) && !defined(M_UNIX) ++#if defined(I_PUSH) && defined(HAVE_SVR4_PTYS) && !defined(sgi) && !defined(linux) && !defined(__osf__) && !defined(M_UNIX) && !defined(__FreeBSD_kernel__) + if (ioctl(f, I_PUSH, "ptem")) + Panic(errno, "InitPTY: cannot I_PUSH ptem"); + if (ioctl(f, I_PUSH, "ldterm")) diff --git a/debian/patches/rlfe-signal-rvt.diff b/debian/patches/rlfe-signal-rvt.diff new file mode 100644 index 0000000..4d841a4 --- /dev/null +++ b/debian/patches/rlfe-signal-rvt.diff @@ -0,0 +1,13 @@ +Index: b/examples/rlfe/pty.c +=================================================================== +--- a/examples/rlfe/pty.c ++++ b/examples/rlfe/pty.c +@@ -254,7 +254,7 @@ + #if defined(HAVE_GETPT) && defined(linux) + int getpt __P((void)); + #endif +- sigret_t (*sigcld)__P(SIGPROTOARG); ++ sighandler_t sigcld; + + strcpy(PtyName, "/dev/ptmx"); + #if defined(HAVE_GETPT) && defined(linux) diff --git a/debian/patches/rlfe-tinfo.diff b/debian/patches/rlfe-tinfo.diff new file mode 100644 index 0000000..48304f4 --- /dev/null +++ b/debian/patches/rlfe-tinfo.diff @@ -0,0 +1,448 @@ +# DP: Link rlfe with libtinfo. + +Index: b/examples/rlfe/configure.in +=================================================================== +--- a/examples/rlfe/configure.in ++++ b/examples/rlfe/configure.in +@@ -211,8 +211,8 @@ + tgetent((char *)0, (char *)0); + #endif + ],, +-LIBS="-ltermcap $olibs" +-AC_CHECKING(libtermcap) ++LIBS="-ltinfo $olibs" ++AC_CHECKING(libtinfo) + AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, + LIBS="-ltermlib $olibs" + AC_CHECKING(libtermlib) +Index: b/examples/rlfe/configure +=================================================================== +--- a/examples/rlfe/configure ++++ b/examples/rlfe/configure +@@ -1,11 +1,9 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.68. ++# Generated by GNU Autoconf 2.69. + # + # +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +-# Foundation, Inc. ++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. + # + # + # This configure script is free software; the Free Software Foundation +@@ -134,6 +132,31 @@ + # CDPATH. + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + ++# Use a proper internal environment variable to ensure we don't fall ++ # into an infinite loop, continuously re-executing ourselves. ++ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then ++ _as_can_reexec=no; export _as_can_reexec; ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++as_fn_exit 255 ++ fi ++ # We don't want this to propagate to other subprocesses. ++ { _as_can_reexec=; unset _as_can_reexec;} + if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh +@@ -167,7 +190,8 @@ + else + exitcode=1; echo positional parameters were not saved. + fi +-test x\$exitcode = x0 || exit 1" ++test x\$exitcode = x0 || exit 1 ++test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && +@@ -212,21 +236,25 @@ + + + if test "x$CONFIG_SHELL" != x; then : +- # We cannot yet assume a decent shell, so we have to provide a +- # neutralization value for shells without unset; and this also +- # works around shells that cannot unset nonexistent variables. +- # Preserve -v and -x to the replacement shell. +- BASH_ENV=/dev/null +- ENV=/dev/null +- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +- export CONFIG_SHELL +- case $- in # (((( +- *v*x* | *x*v* ) as_opts=-vx ;; +- *v* ) as_opts=-v ;; +- *x* ) as_opts=-x ;; +- * ) as_opts= ;; +- esac +- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} ++ export CONFIG_SHELL ++ # We cannot yet assume a decent shell, so we have to provide a ++# neutralization value for shells without unset; and this also ++# works around shells that cannot unset nonexistent variables. ++# Preserve -v and -x to the replacement shell. ++BASH_ENV=/dev/null ++ENV=/dev/null ++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++esac ++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} ++# Admittedly, this is quite paranoid, since all the known shells bail ++# out after a failed `exec'. ++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 ++exit 255 + fi + + if test x$as_have_required = xno; then : +@@ -328,6 +356,14 @@ + + + } # as_fn_mkdir_p ++ ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p + # as_fn_append VAR VALUE + # ---------------------- + # Append the text in VALUE to the end of the definition contained in VAR. Take +@@ -449,6 +485,10 @@ + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + ++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have ++ # already done that, so ensure we don't try to do so again and fall ++ # in an infinite loop. This has already happened in practice. ++ _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). +@@ -483,16 +523,16 @@ + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -504,28 +544,8 @@ + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in #( +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -1123,8 +1143,6 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1356,9 +1374,9 @@ + if $ac_init_version; then + cat <<\_ACEOF + configure +-generated by GNU Autoconf 2.68 ++generated by GNU Autoconf 2.69 + +-Copyright (C) 2010 Free Software Foundation, Inc. ++Copyright (C) 2012 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1471,7 +1489,7 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext ++ test -x conftest$ac_exeext + }; then : + ac_retval=0 + else +@@ -1721,7 +1739,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +@@ -2097,7 +2115,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2137,7 +2155,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2190,7 +2208,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2231,7 +2249,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +@@ -2289,7 +2307,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2333,7 +2351,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -2779,8 +2797,7 @@ + /* end confdefs.h. */ + #include <stdarg.h> + #include <stdio.h> +-#include <sys/types.h> +-#include <sys/stat.h> ++struct stat; + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ + struct buf { int x; }; + FILE * (*rcsopen) (struct buf *, struct stat *, int); +@@ -3020,7 +3037,7 @@ + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++ as_fn_executable_p "$ac_path_GREP" || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP + case `"$ac_path_GREP" --version 2>&1` in +@@ -3086,7 +3103,7 @@ + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++ as_fn_executable_p "$ac_path_EGREP" || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP + case `"$ac_path_EGREP" --version 2>&1` in +@@ -3331,7 +3348,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -3608,9 +3625,9 @@ + if ac_fn_c_try_link "$LINENO"; then : + + else +- LIBS="-ltermcap $olibs" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermcap..." >&5 +-$as_echo "$as_me: checking libtermcap..." >&6;} ++ LIBS="-ltinfo $olibs" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtinfo..." >&5 ++$as_echo "$as_me: checking libtinfo..." >&6;} + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -3965,7 +3982,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_WRITEPATH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4005,7 +4022,7 @@ + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XTERMPATH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -4757,16 +4774,16 @@ + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. ++ # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + else +- as_ln_s='cp -p' ++ as_ln_s='cp -pR' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -4826,28 +4843,16 @@ + as_mkdir_p=false + fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- if ls -dL / >/dev/null 2>&1; then +- as_ls_L_option=L +- else +- as_ls_L_option= +- fi +- as_test_x=' +- eval sh -c '\'' +- if test -d "$1"; then +- test -d "$1/."; +- else +- case $1 in #( +- -*)set "./$1";; +- esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( +- ???[sx]*):;;*)false;;esac;fi +- '\'' sh +- ' +-fi +-as_executable_p=$as_test_x ++ ++# as_fn_executable_p FILE ++# ----------------------- ++# Test if FILE is an executable regular file. ++as_fn_executable_p () ++{ ++ test -f "$1" && test -x "$1" ++} # as_fn_executable_p ++as_test_x='test -x' ++as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. + as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +@@ -4869,7 +4874,7 @@ + # values after options handling. + ac_log=" + This file was extended by $as_me, which was +-generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -4931,10 +4936,10 @@ + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.68, ++configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +-Copyright (C) 2010 Free Software Foundation, Inc. ++Copyright (C) 2012 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -5023,7 +5028,7 @@ + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + if \$ac_cs_recheck; then +- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..4c484bc --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,15 @@ +# readline70-001.diff +readline70-001.diff +readline70-002.diff +readline70-003.diff +rl-attribute.diff +rl-header.diff +rl-no-cross-check.diff +rl-no-rpath.diff +rlfe-history.diff +rlfe-kfreebsd.diff +rlfe-tinfo.diff +#examples-makefile-multiarch.diff +fix-wformat-security.diff +configure-tinfo.diff +rlfe-signal-rvt.diff diff --git a/debian/readline-common.overrides b/debian/readline-common.overrides new file mode 100644 index 0000000..f57ea05 --- /dev/null +++ b/debian/readline-common.overrides @@ -0,0 +1 @@ +readline-common: manpage-section-mismatch diff --git a/debian/readline-common.postinst b/debian/readline-common.postinst new file mode 100644 index 0000000..1a664cf --- /dev/null +++ b/debian/readline-common.postinst @@ -0,0 +1,13 @@ +#! /bin/sh -e + +install_from_default() { + if [ ! -f $2 ]; then + cp -p $1 $2 + fi +} + +if [ "$1" = "configure" ] && [ "$2" = "" ]; then + install_from_default /usr/share/readline/inputrc /etc/inputrc +fi + +#DEBHELPER# diff --git a/debian/readline-common.postrm b/debian/readline-common.postrm new file mode 100644 index 0000000..9a19c2d --- /dev/null +++ b/debian/readline-common.postrm @@ -0,0 +1,8 @@ +#! /bin/sh -e + +case "$1" in + purge) + rm -f /etc/inputrc +esac + +#DEBHELPER# diff --git a/debian/rl-inputrc.dpatch b/debian/rl-inputrc.dpatch new file mode 100644 index 0000000..b51ddb1 --- /dev/null +++ b/debian/rl-inputrc.dpatch @@ -0,0 +1,102 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p3 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p3 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Support for /etc/inputrc in addition to ~/inputrc + +diff -ur bash.saved/lib/readline/bind.c bash/lib/readline/bind.c +--- bash.saved/lib/readline/bind.c 2005-01-16 13:18:30.000000000 +0100 ++++ bash/lib/readline/bind.c 2005-01-16 13:21:43.000000000 +0100 +@@ -713,6 +713,9 @@ + /* The last key bindings file read. */ + static char *last_readline_init_file = (char *)NULL; + ++/* Flag to read system init file */ ++static int read_system_init_file = 0; ++ + /* The file we're currently reading key bindings from. */ + static const char *current_readline_init_file; + static int current_readline_init_include_level; +@@ -780,7 +783,7 @@ + to the first non-null filename from this list: + 1. the filename used for the previous call + 2. the value of the shell variable `INPUTRC' +- 3. ~/.inputrc ++ 3. /etc/inputrc and ~/.inputrc + If the file existed and could be opened and read, 0 is returned, + otherwise errno is returned. */ + int +@@ -791,14 +794,31 @@ + if (filename == 0) + { + filename = last_readline_init_file; +- if (filename == 0) ++ if (filename == 0) { + filename = sh_get_env_value ("INPUTRC"); +- if (filename == 0) ++ read_system_init_file = 0; ++ } ++ if (filename == 0) { + filename = DEFAULT_INPUTRC; ++ read_system_init_file = 1; ++ } + } + +- if (*filename == 0) ++ if (*filename == 0) { + filename = DEFAULT_INPUTRC; ++ read_system_init_file = 1; ++ } ++ ++ if (read_system_init_file) ++ if (filename == last_readline_init_file) ++ { ++ filename = savestring (filename); ++ _rl_read_init_file (SYSTEM_INPUTRC, 0); ++ free (last_readline_init_file); ++ last_readline_init_file = filename; ++ } ++ else ++ _rl_read_init_file (SYSTEM_INPUTRC, 0); + + #if defined (__MSDOS__) + if (_rl_read_init_file (filename, 0) == 0) +Only in bash/lib/readline: bind.c.orig +Only in bash/lib/readline: bind.c.rej +diff -ur bash.saved/lib/readline/doc/rluser.texi bash/lib/readline/doc/rluser.texi +--- bash.saved/lib/readline/doc/rluser.texi 2005-01-16 13:18:30.000000000 +0100 ++++ bash/lib/readline/doc/rluser.texi 2005-01-16 13:21:28.000000000 +0100 +@@ -336,7 +336,8 @@ + @ifclear BashFeatures + file is taken from the value of the environment variable @env{INPUTRC}. If + @end ifclear +-that variable is unset, the default is @file{~/.inputrc}. ++that variable is unset, Readline will read both @file{/etc/inputrc} and ++@file{~/.inputrc}. + + When a program which uses the Readline library starts up, the + init file is read, and the key bindings are set. +diff -ur bash.saved/lib/readline/rlconf.h bash/lib/readline/rlconf.h +--- bash.saved/lib/readline/rlconf.h 2005-01-16 13:18:30.000000000 +0100 ++++ bash/lib/readline/rlconf.h 2005-01-16 13:21:28.000000000 +0100 +@@ -39,6 +39,7 @@ + + /* The final, last-ditch effort file name for an init file. */ + #define DEFAULT_INPUTRC "~/.inputrc" ++#define SYSTEM_INPUTRC "/etc/inputrc" + + /* If defined, expand tabs to spaces. */ + #define DISPLAY_TABS diff --git a/debian/rlfe.1 b/debian/rlfe.1 new file mode 100644 index 0000000..26a20a1 --- /dev/null +++ b/debian/rlfe.1 @@ -0,0 +1,64 @@ +.TH RLFE 1 +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.SH NAME +rlfe \- "cook" input lines for other programs using readline +.SH SYNOPSIS +.PP +\fBrlfe\fP [\fI-l filename\fP] [\fI-a\fP] [\fI-n appname\fP] [\fI-hv\fP] [\fIcommand\fP [\fIarguments ...\fP]] +.PP +.SH "DESCRIPTION" +.PP +.B rlfe +lets you use history and line-editing in any text oriented tool. This +is especially useful with third-party proprietary tools that cannot be +distributed linked against readline. It is not perfect but it works +pretty well. +.SH OPTIONS +.TP +-a +append to the logfile (default is to overwrite). +.TP +-l filename +log into file. +.TP +-n appname +set the readline application name. +.TP +-h +print usage string. +.TP +-v +print version information. +.SH "SEE ALSO" +readline(3) +.SH AUTHOR +Per Bothner +.SH PROBLEMS/TODO +When running mc -c under the Linux console, mc does not recognize +mouse clicks, which mc does when not running under fep. +.PP +Pasting selected text containing tabs is like hitting the tab character, +which invokes readline completion. We don't want this. I don't know +if this is fixable without integrating fep into a terminal emulator. +.PP +Echo suppression is a kludge, but can only be avoided with better kernel +support: We need a tty mode to disable "real" echoing, while still +letting the inferior think its tty driver to doing echoing. +Stevens's book claims SCR$ and BSD4.3+ have TIOCREMOTE. +.PP +The latest readline may have some hooks we can use to avoid having +to back up the prompt. +.PP +Desirable readline feature: When in cooked no-echo mode (e.g. password), +echo characters are they are types with '*', but remove them when done. +.PP +A synchronous output while we're editing an input line should be +inserted in the output view.PPbefore* the input line, so that the +lines being edited (with the prompt) float at the end of the input. +.PP +A "page mode" option to emulate more/less behavior: At each page of +output, pause for a user command. This required parsing the output +to keep track of line lengths. It also requires remembering the +output, if we want an option to scroll back, which suggests that +this should be integrated with a terminal emulator like xterm. diff --git a/debian/rlfe.copyright b/debian/rlfe.copyright new file mode 100644 index 0000000..562ce3e --- /dev/null +++ b/debian/rlfe.copyright @@ -0,0 +1,28 @@ +This is Debian GNU/Linux's prepackaged version of the rlfe program. +This package was put together by Matthias Klose <doko@debian.org>. + +Upstream source: + ftp.gnu.org:/pub/gnu/readline/readline-4.3.tar.gz. + +Author: Per Bothner + +Copyright: + +/* 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. + */ + +You should have received a copy of the GNU General Public License with +your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with +the Debian GNU/Linux bash source package as the file COPYING. If not, +write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +Boston, MA 02110-1301, USA. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..8a5483d --- /dev/null +++ b/debian/rules @@ -0,0 +1,450 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +soversion = 7 +libversion = $(soversion).0 + +# architecture dependent variables +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) +CROSS=$(DEB_HOST_GNU_TYPE)-gcc +else +CROSS=gcc +endif + +ifneq (,$(findstring /$(DEB_HOST_ARCH)/,/i386/powerpc/sparc/s390/)) + build64 = yes + CC64 = $(CROSS) -m64 + gencontrol_flags = -- \ + '-Vdevxx:Depends=libc6-dev-$(ARCH64)' + ifeq ($(DEB_HOST_ARCH),i386) + ARCH64 = amd64 + HOST64 = x86_64-linux-gnu + endif + ifeq ($(DEB_HOST_ARCH),powerpc) + ARCH64 = ppc64 + HOST64 = ppc64-linux-gnu + endif + ifeq ($(DEB_HOST_ARCH),sparc) + ARCH64 = sparc64 + HOST64 = sparc64-linux-gnu + endif + ifeq ($(DEB_HOST_ARCH),s390) + ARCH64 = s390x + HOST64 = s390x-linux-gnu + endif +endif + +ifneq (,$(findstring /$(DEB_HOST_ARCH)/,/amd64/ppc64/)) + build32 = yes + CC32 = $(CROSS) -m32 + lib32dir = lib32 + lib32devdir = usr/lib32 + gencontrol_flags = -- \ + '-Vdevxx:Depends=libc6-dev-$(ARCH32)' + ifeq ($(DEB_HOST_ARCH),amd64) + ARCH32 = i386 + HOST32 = i486-linux-gnu + endif + ifeq ($(DEB_HOST_ARCH),ppc64) + ARCH32 = powerpc + HOST32 = powerpc-linux-gnu + endif +endif + +unexport CPPFLAGS CFLAGS LDFLAGS + +CFLAGS := $(shell dpkg-buildflags --get CFLAGS) +CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) +LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) +CFLAGS := $(CFLAGS) -I/usr/include/ncursesw + +CC = $(CROSS) + +SHELL = bash + +p_rl = libreadline$(soversion) +p_rl32 = lib32readline$(soversion) +p_rl64 = lib64readline$(soversion) +p_comm = readline-common +p_rld = libreadline-dev +p_rld32 = lib32readline-dev +p_rld64 = lib64readline-dev +p_doc = readline-doc +p_rlfe = rlfe + +d = debian/tmp +d32 = debian/tmp32 +d64 = debian/tmp64 +d_rl = debian/$(p_rl) +d_rl32 = debian/$(p_rl32) +d_rl64 = debian/$(p_rl64) +d_comm = debian/$(p_comm) +d_rld = debian/$(p_rld) +d_rld32 = debian/$(p_rld32) +d_rld64 = debian/$(p_rld64) +d_doc = debian/$(p_doc) +d_rlfe = debian/$(p_rlfe) + +srcdir = $(CURDIR) +builddir = $(CURDIR)/build +builddir32 = $(CURDIR)/build32 +builddir64 = $(CURDIR)/build64 + +default: build + +configure: configure-stamp +configure-stamp: + dh_testdir + cp -p /usr/share/misc/config.* ./support/ + rm -rf $(builddir) + mkdir $(builddir) + find . -type d | xargs chmod g-s + cd $(builddir) && \ + CC=$(CC) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(srcdir)/configure \ + --prefix=/usr\ + --host=$(DEB_HOST_GNU_TYPE) \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) + +ifneq ($(build32),) + rm -rf $(builddir32) + mkdir $(builddir32) + cd $(builddir32) && \ + CC="$(CC32)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(srcdir)/configure \ + --host=$(HOST32) --prefix=/usr +endif + +ifneq ($(build64),) + rm -rf $(builddir64) + mkdir $(builddir64) + cd $(builddir64) && \ + CC="$(CC64)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(srcdir)/configure \ + --host=$(HOST64) --prefix=/usr +endif + + touch configure-stamp + +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) +build: build-stamp build-rlfe-stamp +else +build: build-stamp +endif +build-arch: build +build-indep: build + +build-stamp: configure-stamp + dh_testdir + $(MAKE) -C $(builddir) \ + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + SHOBJ_CFLAGS="-fPIC -D_REENTRANT" \ + SHOBJ_LDFLAGS='$(LDFLAGS) -shared' \ + SHLIB_LIBS="-ltinfo" + +ifneq ($(build32),) + $(MAKE) -C $(builddir32) \ + CC="$(CC32)" \ + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + SHOBJ_CFLAGS="-fPIC -D_REENTRANT" \ + SHOBJ_LDFLAGS='$(LDFLAGS) -shared' \ + SHLIB_LIBS="-ltinfo" + SHLIB_XLDFLAGS='-Wl,-soname,`echo $$@ | sed s/\\..$$$$//`' +endif + +ifneq ($(build64),) + $(MAKE) -C $(builddir64) \ + CC="$(CC64)" \ + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + SHOBJ_CFLAGS="-fPIC -D_REENTRANT" \ + SHOBJ_LDFLAGS='$(LDFLAGS) -shared' \ + SHLIB_LIBS="-ltinfo" + SHLIB_XLDFLAGS='-Wl,-soname,`echo $$@ | sed s/\\..$$$$//`' +endif + $(MAKE) -C $(builddir)/doc info + + touch build-stamp + +build-rlfe-stamp: configure-stamp + dh_testdir + ln -sf libhistory.so.$(libversion) \ + $(builddir)/shlib/libhistory.so.$(soversion) + ln -sf libhistory.so.$(soversion) $(builddir)/shlib/libhistory.so + ln -sf libreadline.so.$(libversion) \ + $(builddir)/shlib/libreadline.so.$(soversion) + ln -sf libreadline.so.$(soversion) $(builddir)/shlib/libreadline.so + rm -rf $(builddir)/examples/rlfe + cp -a examples/rlfe $(builddir)/examples/ + ln -sf ../../.. $(builddir)/examples/rlfe/readline + cd $(builddir)/examples/rlfe \ + && ./configure --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) + $(MAKE) -C $(builddir)/examples/rlfe \ + CFLAGS="$(CFLAGS) -D_GNU_SOURCE" CPPFLAGS="$(CPPFLAGS)" \ + LDFLAGS="$(LDFLAGS) -g -L$(builddir)/shlib" \ + LIBS="-lreadline -ltinfo -lutil" rlfe + touch build-rlfe-stamp + +clean: + dh_testdir + dh_testroot + rm -f configure*-stamp build*-stamp install-stamp + rm -rf autom4te.cache + rm -rf $(builddir) $(builddir32) $(builddir64) + rm -rf debian/tmp* + rm -f doc/*.dvi + rm -f debian/shlibs.local + find . -type d | xargs chmod g-s + rm -f support/config.guess support/config.sub + dh_clean + +install: install-stamp +install-stamp: + dh_testdir + dh_testroot + dh_prep + rm -rf $(d) + mkdir -p $(d)/usr/bin + $(MAKE) -C $(builddir) install \ + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -D_REENTRANT" \ + SHOBJ_LDFLAGS='-shared $(LDFLAGS)' \ + SHLIB_XLDFLAGS='-Wl,-soname,`echo $$@ | sed s/\\..$$$$//`' \ + SHLIB_LIBS=-ltinfo \ + DESTDIR=$(CURDIR)/$(d) \ + mandir=/usr/share/man \ + infodir=/usr/share/info + + : # move $(p_rl) + dh_installdirs -p$(p_rl) \ + etc \ + 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) + + : # move $(p_comm) + dh_installdirs -p$(p_comm) \ + etc \ + usr/share/readline \ + usr/share/info \ + usr/share/doc + mv $(d)/usr/share/man $(d_comm)/usr/share/. + mv $(d_comm)/usr/share/man/man3/history.3 \ + $(d_comm)/usr/share/man/man3/history.3readline + mv $(d_comm)/usr/share/man/man3/readline.3 \ + $(d_comm)/usr/share/man/man3/readline.3readline + mv $(d)/usr/share/info/rluserman.info $(d_comm)/usr/share/info/. + install -m 644 debian/inputrc $(d_comm)/usr/share/readline/ + + : # move $(p_rld) + dh_installdirs -p$(p_rld) \ + usr/lib/$(DEB_HOST_MULTIARCH)/ \ + usr/share/doc \ + usr/share/info + ln -s /lib/$(DEB_HOST_MULTIARCH)/libhistory.so.$(soversion) \ + $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/libhistory.so + ln -s /lib/$(DEB_HOST_MULTIARCH)/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)/. + mv $(d)/usr/include $(d_rld)/usr/. + + : # remove HAVE_CONFIG_H from installed headers + awk '/^#if defined \(HAVE_CONFIG_H\)/, /^#endif/ \ + {if ($$0 == "#else") print "#include <string.h>"; next} {print}' \ + $(d_rld)/usr/include/readline/chardefs.h \ + > $(d_rld)/usr/include/readline/chardefs.h.new + if diff -u $(d_rld)/usr/include/readline/chardefs.h \ + $(d_rld)/usr/include/readline/chardefs.h.new; \ + then \ + rm -f $(d_rld)/usr/include/readline/chardefs.h.new; \ + else \ + mv -f $(d_rld)/usr/include/readline/chardefs.h.new \ + $(d_rld)/usr/include/readline/chardefs.h; \ + fi + + : # install $(p_rlfe) +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + dh_installdirs -p$(p_rlfe) \ + usr/bin usr/share/man/man1 \ + usr/share/doc/$(p_rlfe) + cp -p $(builddir)/examples/rlfe/rlfe $(d_rlfe)/usr/bin/. + cp -p debian/rlfe.1 $(d_rlfe)/usr/share/man/man1/. +endif + +ifneq ($(build32),) + rm -rf $(d32) + mkdir -p $(d32)/usr/bin + $(MAKE) -C $(builddir32) install \ + CC="$(CC32)" \ + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -D_REENTRANT" \ + SHOBJ_LDFLAGS='-shared $(LDFLAGS)' \ + SHLIB_XLDFLAGS='-Wl,-soname,`echo $$@ | sed s/\\..$$$$//`' \ + SHLIB_LIBS=-ltinfo \ + DESTDIR=$(CURDIR)/$(d32) \ + mandir=/usr/share/man \ + infodir=/usr/share/info + + dh_installdirs -p$(p_rl32) \ + $(lib32dir) \ + usr/share/doc + cp -p $(d32)/usr/lib/lib{history,readline}.so.$(libversion) \ + $(d_rl32)/$(lib32dir)/ + ln -s libhistory.so.$(libversion) \ + $(d_rl32)/$(lib32dir)/libhistory.so.$(soversion) + ln -s libreadline.so.$(libversion) \ + $(d_rl32)/$(lib32dir)/libreadline.so.$(soversion) + + dh_installdirs -p$(p_rld32) \ + $(lib32devdir) \ + 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)/. +endif + +ifneq ($(build64),) + rm -rf $(d64) + mkdir -p $(d64)/usr/bin + $(MAKE) -C $(builddir64) install \ + CC="$(CC64)" \ + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -D_REENTRANT" \ + SHOBJ_LDFLAGS='-shared $(LDFLAGS)' \ + SHLIB_XLDFLAGS='-Wl,-soname,`echo $$@ | sed s/\\..$$$$//`' \ + SHLIB_LIBS=-ltinfo \ + DESTDIR=$(CURDIR)/$(d64) \ + mandir=/usr/share/man \ + infodir=/usr/share/info + + dh_installdirs -p$(p_rl64) \ + lib64 \ + usr/share/doc + dh_installdirs -p$(p_rld64) \ + usr/share/doc + cp -p $(d64)/usr/lib/lib{history,readline}.so.$(libversion) \ + $(d_rl64)/lib64/ + ln -s libhistory.so.$(libversion) \ + $(d_rl64)/lib64/libhistory.so.$(soversion) + ln -s libreadline.so.$(libversion) \ + $(d_rl64)/lib64/libreadline.so.$(soversion) + + dh_installdirs -p$(p_rld64) \ + usr/lib64 \ + usr/share/doc + ln -s /lib64/libhistory.so.$(soversion) \ + $(d_rld64)/usr/lib64/libhistory.so + ln -s /lib64/libreadline.so.$(soversion) \ + $(d_rld64)/usr/lib64/libreadline.so + mv $(d64)/usr/lib/lib{history,readline}.a $(d_rld64)/usr/lib64/. +endif + + : # $(p_doc) + mkdir -p $(d_doc)/usr/share/info + mv $(d)/usr/share/info/{readline.info,history.info} \ + $(d_doc)/usr/share/info/. + + touch install-stamp + +binary-indep: build install + dh_testdir + dh_testroot + mkdir -p $(d_doc)/usr/share/doc/$(p_rl)/examples + cp -p $(builddir)/examples/Makefile examples/*.c \ + $(d_doc)/usr/share/doc/$(p_rl)/examples/ + sed -i \ + -e '/^srcdir =/s,=.*,= /usr/share/doc/$(p_rl)/examples,' \ + -e '/^VPATH =/s,=.*,= .:/usr/share/doc/$(p_rl)/examples,' \ + -e '/^top_srcdir =/s,=.*,= /usr/include/readline,' \ + -e '/^BUILD_DIR =/s,=.*,= /usr/src/readline6/build,' \ + $(d_doc)/usr/share/doc/$(p_rl)/examples/Makefile + dh_link -p$(p_doc) \ + /usr/share/doc/$(p_rl)/examples /usr/share/doc/$(p_doc)/examples + + mkdir -p $(d_comm)/usr/share/lintian/overrides + cp -p debian/readline-common.overrides \ + $(d_comm)/usr/share/lintian/overrides/readline-common + dh_installdocs -p$(p_comm) debian/inputrc.arrows + dh_installdocs -p$(p_doc) + dh_installchangelogs -i + dh_installdocs -i + dh_fixperms -i + dh_compress -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs -p$(p_rl) \ + USAGE debian/inputrc.arrows + dh_installchangelogs -p$(p_rl) CHANGES + dh_installexamples -p$(p_rl) \ + examples/Inputrc + ln -sf $(p_rl) $(d_rld)/usr/share/doc/$(p_rld) + +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + dh_installdocs -p$(p_rlfe) examples/rlfe/README + dh_installchangelogs -p$(p_rlfe) examples/rlfe/ChangeLog + + dh_fixperms -p$(p_rl) -p$(p_rld) -p$(p_rlfe) + dh_strip -p$(p_rl) -p$(p_rld) -p$(p_rlfe) + dh_compress -p$(p_rl) -p$(p_rld) -p$(p_rlfe) \ + -X.c -XMakefile + dh_makeshlibs -p$(p_rl) + cp -p debian/$(p_rl).shlibs debian/shlibs.local + dh_shlibdeps -p$(p_rl) -p$(p_rld) -p$(p_rlfe) \ + -L $(p_rl) -l $(d_rl)/lib +endif + +ifneq ($(build32),) + -ls -l $(d_rld)/usr/share/doc/$(p_rl) + dh_installdocs -p$(p_rl32) \ + USAGE debian/inputrc.arrows + dh_installchangelogs -p$(p_rl32) CHANGES + ln -sf $(p_rl32) $(d_rld32)/usr/share/doc/$(p_rld32) + dh_compress -p$(p_rl32) -p$(p_rld32) + dh_fixperms -p$(p_rl32) -p$(p_rld32) + dh_strip -p$(p_rl32) -p$(p_rld32) + dh_makeshlibs -p$(p_rl32) + -dh_shlibdeps -p$(p_rl32) -p$(p_rld32) \ + -L $(p_rl32) -l $(d_rl32)/lib + -ls -l $(d_rld)/usr/share/doc/$(p_rl) +endif + +ifneq ($(build64),) + -ls -l $(d_rld)/usr/share/doc/$(p_rl) + dh_installdocs -p$(p_rl64) \ + USAGE debian/inputrc.arrows + dh_installchangelogs -p$(p_rl64) CHANGES + ln -sf $(p_rl64) $(d_rld64)/usr/share/doc/$(p_rld64) + dh_compress -p$(p_rl64) -p$(p_rld64) + dh_fixperms -p$(p_rl64) -p$(p_rld64) + dh_strip -p$(p_rl64) -p$(p_rld64) + dh_makeshlibs -p$(p_rl64) + -dh_shlibdeps -p$(p_rl64) -p$(p_rld64) \ + -L $(p_rl64) -l $(d_rl64)/lib + -ls -l $(d_rld)/usr/share/doc/$(p_rl) +endif + + dh_installdeb -s + dh_gencontrol -s $(gencontrol_flags) + dh_md5sums -s + dh_builddeb -s + +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep clean + +# Local Variables: +# mode: makefile +# end: diff --git a/debian/semantic.cache b/debian/semantic.cache new file mode 100644 index 0000000..db211f1 --- /dev/null +++ b/debian/semantic.cache @@ -0,0 +1,15 @@ +;; Object debian/ +;; SEMANTICDB Tags save file +(semanticdb-project-database-file "debian/" + :tables (list + (semanticdb-table "rules" + :major-mode 'makefile-mode + :tags '(("soversion" variable (:default-value ("5")) nil [40 54]) ("libversion" variable (:default-value ("$(soversion).1")) nil [54 82]) ("build64" variable (:default-value ("yes")) nil [384 398]) ("CC64" variable (:default-value ("gcc" "-m64")) nil [400 416]) ("gencontrol_flags" variable (:default-value ("--" "'-Vlibxx:Depends=libc6-$(ARCH64)'" "'-Vdevxx:Depends=libc6-dev-$(ARCH64)'")) nil [418 518]) ("ARCH64" variable (:default-value ("amd64")) nil [553 568]) ("HOST64" variable (:default-value ("x86_64-linux-gnu")) nil [572 598]) ("ARCH64" variable (:default-value ("ppc64")) nil [644 659]) ("HOST64" variable (:default-value ("ppc64-linux-gnu")) nil [663 688]) ("ARCH64" variable (:default-value ("sparc64")) nil [732 749]) ("HOST64" variable (:default-value ("sparc64-linux-gnu")) nil [753 780]) ("ARCH64" variable (:default-value ("s390x")) nil [823 838]) ("HOST64" variable (:default-value ("s390x-linux-gnu")) nil [842 867]) ("build32" variable (:default-value ("yes")) nil [940 954]) ("CC32" variable (:default-value ("gcc" "-m32")) nil [956 972]) ("gencontrol_flags" variable (:default-value ("--" "'-Vlibxx:Depends=libc6-$(ARCH32)'" "'-Vdevxx:Depends=libc6-dev-$(ARCH32)'")) nil [974 1074]) ("ARCH32" variable (:default-value ("amd64")) nil [1110 1125]) ("HOST32" variable (:default-value ("i486-linux-gnu")) nil [1129 1153]) ("ARCH32" variable (:default-value ("powerpc")) nil [1197 1214]) ("HOST32" variable (:default-value ("powerpc-linux-gnu")) nil [1218 1245]) ("CC_LINK_FLAGS" variable nil nil [1296 1312]) ("CC_LINK_FLAGS" variable (:default-value ("-Wl,")) nil [1319 1340]) ("CC" variable (:default-value ("gcc")) nil [1346 1355]) ("SHELL" variable (:default-value ("bash")) nil [1356 1369]) ("PWD" variable (:default-value ("$(shell pwd)")) nil [1370 1390]) ("p_rl" variable (:default-value ("libreadline$(soversion)")) nil [1390 1421]) ("p_rl32" variable (:default-value ("lib32readline$(soversion)")) nil [1421 1456]) ("p_rl64" variable (:default-value ("lib64readline$(soversion)")) nil [1456 1491]) ("p_comm" variable (:default-value ("readline-common")) nil [1491 1516]) ("p_rld" variable (:default-value ("$(p_rl)-dev")) nil [1516 1536]) ("p_rld32" variable (:default-value ("$(p_rl32)-dev")) nil [1536 1560]) ("p_rld64" variable (:default-value ("$(p_rl64)-dev")) nil [1560 1584]) ("p_rlg" variable (:default-value ("$(p_rl)-dbg")) nil [1584 1604]) ("p_doc" variable (:default-value ("$(p_rl)-doc")) nil [1604 1624]) ("p_rlfe" variable (:default-value ("rlfe")) nil [1624 1638]) ("d" variable (:default-value ("debian/tmp")) nil [1639 1654]) ("d32" variable (:default-value ("debian/tmp32")) nil [1654 1673]) ("d64" variable (:default-value ("debian/tmp64")) nil [1673 1692]) ("d_rl" variable (:default-value ("debian/$(p_rl)")) nil [1692 1714]) ("d_rl32" variable (:default-value ("debian/$(p_rl32)")) nil [1714 1740]) ("d_rl64" variable (:default-value ("debian/$(p_rl64)")) nil [1740 1766]) ("d_comm" variable (:default-value ("debian/$(p_comm)")) nil [1766 1792]) ("d_rld" variable (:default-value ("debian/$(p_rld)")) nil [1792 1816]) ("d_rld32" variable (:default-value ("debian/$(p_rld32)")) nil [1816 1844]) ("d_rld64" variable (:default-value ("debian/$(p_rld64)")) nil [1844 1872]) ("d_rlg" variable (:default-value ("debian/$(p_rlg)")) nil [1872 1896]) ("d_doc" variable (:default-value ("debian/$(p_doc)")) nil [1896 1920]) ("d_rlfe" variable (:default-value ("debian/$(p_rlfe)")) nil [1920 1946]) ("srcdir" variable (:default-value ("$(PWD)")) nil [1947 1964]) ("builddir" variable (:default-value ("$(PWD)/build")) nil [1964 1988]) ("builddir32" variable (:default-value ("$(PWD)/build32")) nil [1988 2016]) ("builddir64" variable (:default-value ("$(PWD)/build64")) nil [2016 2044]) ("default" function (:arguments ("build")) nil [2045 2061]) ("configure" function (:arguments ("configure-stamp")) nil [2061 2103]) ("configure-stamp" function (:arguments ("patch-stamp")) nil [2088 2331]) ("build" function (:arguments ("build-stamp" "build-rlfe-stamp")) nil [2711 2748]) ("build-stamp" function (:arguments ("configure-stamp")) nil [2748 2908]) ("build-rlfe-stamp" function (:arguments ("configure-stamp")) nil [3453 4125]) ("clean" function nil nil [4125 4256]) ("install" function (:arguments ("install-stamp")) nil [4495 4531]) ("install-stamp" function nil nil [4518 4763]) ("binary-indep" function (:arguments ("build" "install")) nil [9268 9697]) ("binary-arch" function (:arguments ("build" "install")) nil [9697 10140]) ("binary" function (:arguments ("binary-indep" "binary-arch")) nil [11493 11528]) ("patchdir" variable (:default-value ("debian/patches")) nil [11780 11806]) ("debian_patches" variable (:default-value ("readline51-001" "readline51-002" "readline51-003" "readline51-004" "rl-inputrc" "rl-header" "rl-attribute" "rl-no-rpath" "rl-no-cross-check" "rlfe-libs")) nil [11842 12026]) ("patch" function (:arguments ("patch-stamp")) nil [12027 12059]) ("apply-patches" function (:arguments ("patch-stamp")) nil [12046 12074]) ("patch-stamp" function (:arguments ("$(foreach p,$(debian_patches),patch-stamp-$(p))")) nil [12074 12338]) ("reverse-patches" function (:arguments ("unpatch")) nil [12338 12370]) ("unpatch" function nil nil [12363 12945]) ("patch-stamp-%" function (:arguments ("$(patchdir)/%.dpatch")) nil [12945 13161]) (".PHONY" function (:arguments ("binary" "binary-arch" "binary-indep" "clean")) nil [13162 13209])) + :file "rules" + :pointmax 13252 + ) + ) + :file "semantic.cache" + :semantic-tag-version "2.0pre3" + :semanticdb-version "2.0pre3" + ) diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides new file mode 100644 index 0000000..7cb5e50 --- /dev/null +++ b/debian/source.lintian-overrides @@ -0,0 +1 @@ +readline6 source: debian-rules-calls-debhelper-in-odd-order diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..f05976e --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnu.org/gnu/readline/ (?:|.*/)readline(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) |