CVS commit: [pkgsrc-2025Q3] pkgsrc/devel/readline

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Oct 15 17:17:48 UTC 2025

Modified Files:
        pkgsrc/devel/readline [pkgsrc-2025Q3]: Makefile distinfo
Added Files:
        pkgsrc/devel/readline/patches [pkgsrc-2025Q3]: patch-input.c

Log Message:
Pullup ticket #7008 - requested by wiz
devel/readline: Bug fix

Revisions pulled up:
- devel/readline/Makefile                                       1.78
- devel/readline/distinfo                                       1.41
- devel/readline/patches/patch-input.c                          1.3

---
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Tue Oct  7 18:20:19 UTC 2025

   Modified Files:
        pkgsrc/devel/readline: Makefile distinfo
   Added Files:
        pkgsrc/devel/readline/patches: patch-input.c

   Log Message:
   readline: fix event hook using upstream patch from mailing list

   Should fix octave problems reported in PR 59688

   Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.77.2.1 pkgsrc/devel/readline/Makefile
cvs rdiff -u -r1.40 -r1.40.2.1 pkgsrc/devel/readline/distinfo
cvs rdiff -u -r0 -r1.3.2.2 pkgsrc/devel/readline/patches/patch-input.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/readline/Makefile
diff -u pkgsrc/devel/readline/Makefile:1.77 pkgsrc/devel/readline/Makefile:1.77.2.1
--- pkgsrc/devel/readline/Makefile:1.77 Sat Aug  2 06:57:22 2025
+++ pkgsrc/devel/readline/Makefile      Wed Oct 15 17:17:48 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2025/08/02 06:57:22 wiz Exp $
+# $NetBSD: Makefile,v 1.77.2.1 2025/10/15 17:17:48 maya Exp $
 
 DISTNAME=      readline-8.3
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=readline/}
 

Index: pkgsrc/devel/readline/distinfo
diff -u pkgsrc/devel/readline/distinfo:1.40 pkgsrc/devel/readline/distinfo:1.40.2.1
--- pkgsrc/devel/readline/distinfo:1.40 Sat Aug  2 06:56:14 2025
+++ pkgsrc/devel/readline/distinfo      Wed Oct 15 17:17:48 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2025/08/02 06:56:14 wiz Exp $
+$NetBSD: distinfo,v 1.40.2.1 2025/10/15 17:17:48 maya Exp $
 
 BLAKE2s (readline-8.3.tar.gz) = 9138ef5b41fb1a5cf758b99281c915cc6b09bd640c7ddc3460db8c6a116feccc
 SHA512 (readline-8.3.tar.gz) = 513002753dcf5db9213dbbb61d51217245f6a40d33b1dd45238e8062dfa8eef0c890b87a5548e11db959e842724fb572c4d3d7fb433773762a63c30efe808344
@@ -7,5 +7,6 @@ SHA1 (patch-ae) = c917e0f4cc2e502bab2b69
 SHA1 (patch-ag) = 3114e6959dfff3e2aae74c3df3ba4b0f692b79bb
 SHA1 (patch-ah) = d812ea068415939beb42c72dd9bed8d210db57d1
 SHA1 (patch-examples_Makefile.in) = 12bdbc3a0d1a116bed96c66ef4d25273b071fd3c
+SHA1 (patch-input.c) = 968d3f637d7e99370ef5f7c3a98dbd7622c24f4d
 SHA1 (patch-readline.pc.in) = b953a4ca1636b30eee0e90d76484b9ecb73f84f5
 SHA1 (patch-rlprivate.h) = b04503026cb4fd5bfeb9cd884bb6a35b6014f058

Added files:

Index: pkgsrc/devel/readline/patches/patch-input.c
diff -u /dev/null pkgsrc/devel/readline/patches/patch-input.c:1.3.2.2
--- /dev/null   Wed Oct 15 17:17:48 2025
+++ pkgsrc/devel/readline/patches/patch-input.c Wed Oct 15 17:17:48 2025
@@ -0,0 +1,34 @@
+$NetBSD: patch-input.c,v 1.3.2.2 2025/10/15 17:17:48 maya Exp $
+
+Fix broken event_hook.
+https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00012.html
+https://lists.gnu.org/archive/html/bug-readline/2025-07/txtTYu28QVKRX.txt
+
+--- input.c.orig       2025-05-02 13:29:05.000000000 +0000
++++ input.c
+@@ -261,13 +261,16 @@ rl_gather_tyi (void)
+   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 @@ rl_gather_tyi (void)
+ #endif
+       if (result <= 0)
+       return 0;       /* Nothing to read. */
++      result = -1;    /* there is something, so check how many chars below */
+     }
+ #endif
+