Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (8a1a6bb5af4762e90764edf6a9c7fd3de8f46a09)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (8a1a6bb5af4762e90764edf6a9c7fd3de8f46a09)
  • Date: Wed, 24 Dec 2025 08:45:08 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

libs/readline/HISTORY | 4 +
libs/readline/patches/0001-official-8.3p1.patch | 81
++++++++++--------------
2 files changed, 41 insertions(+), 44 deletions(-)

New commits:
commit 8a1a6bb5af4762e90764edf6a9c7fd3de8f46a09
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

readline: reformat patch to match current requirements

diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index 16bf6e0..2aed39d 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,3 +1,7 @@
+2025-12-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * patches/0001-official-8.3p1.patch: reformat with diff -u to match
strict
+ patch dir requirements
+
2025-12-18 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: ++PATCHLEVEL
* patches/0001-official-8.3p1.patch: Un-break clients with input
hooks (like samba4).
diff --git a/libs/readline/patches/0001-official-8.3p1.patch
b/libs/readline/patches/0001-official-8.3p1.patch
index 0203b35..8f7366b 100644
--- a/libs/readline/patches/0001-official-8.3p1.patch
+++ b/libs/readline/patches/0001-official-8.3p1.patch
@@ -1,44 +1,37 @@
-*** readline-8.3/input.c Fri May 2 09:29:05 2025
---- readline-8.3p1/input.c Tue Jul 8 15:37:13 2025
-***************
-*** 262,266 ****
- tty = fileno (rl_instream);
-
-! /* Move this up here to give it first shot, but it can't set chars_avail
*/
- /* XXX - need rl_chars_available_hook? */
- if (rl_input_available_hook)
---- 262,267 ----
- tty = fileno (rl_instream);
-
-! /* Move this up here to give it first shot, but it can't set chars_avail,
-! so we assume a single character is available. */
- /* XXX - need rl_chars_available_hook? */
- if (rl_input_available_hook)
-***************
-*** 269,272 ****
---- 270,275 ----
- if (result == 0)
- result = -1;
-+ else
-+ chars_avail = 1;
- }
-
-***************
-*** 286,289 ****
---- 289,293 ----
- if (result <= 0)
- return 0; /* Nothing to read. */
-+ result = -1; /* there is something, so check how many chars below
*/
- }
- #endif
-*** readline-8.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
---- readline-8.3p1/patchlevel 2014-03-21 08:28:40.000000000 -0400
-***************
-*** 1,3 ****
- # Do not edit -- exists only for use by patch
-
-! 0
---- 1,3 ----
- # Do not edit -- exists only for use by patch
-
-! 1
+diff -ruN readline-8.3.orig/input.c readline-8.3/input.c
+--- readline-8.3.orig/input.c 2025-05-02 15:29:05.000000000 +0200
++++ readline-8.3/input.c 2025-12-24 09:42:16.297387295 +0100
+@@ -261,13 +261,16 @@
+ input = 0;
+ tty = fileno (rl_instream);
+
+- /* Move this up here to give it first shot, but it can't set chars_avail
*/
++ /* Move this up here to give it first shot, but it can't set chars_avail,
++ so we assume a single character is available. */
+ /* XXX - need rl_chars_available_hook? */
+ if (rl_input_available_hook)
+ {
+ result = (*rl_input_available_hook) ();
+ if (result == 0)
+ result = -1;
++ else
++ chars_avail = 1;
+ }
+
+ #if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
+@@ -285,6 +288,7 @@
+ #endif
+ if (result <= 0)
+ return 0; /* Nothing to read. */
++ result = -1; /* there is something, so check how many chars below
*/
+ }
+ #endif
+
+diff -ruN readline-8.3.orig/patchlevel readline-8.3/patchlevel
+--- readline-8.3.orig/patchlevel 2020-05-21 20:22:40.000000000 +0200
++++ readline-8.3/patchlevel 2025-12-24 09:42:16.297387295 +0100
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+
+-0
++1


  • [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (8a1a6bb5af4762e90764edf6a9c7fd3de8f46a09), Thomas Orgis, 12/24/2025

Archive powered by MHonArc 2.6.24.

Top of Page