sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (15dc1a54d82a72d22a7553e4fd0985665877e38a)
- 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 (15dc1a54d82a72d22a7553e4fd0985665877e38a)
- Date: Thu, 18 Dec 2025 20:11:43 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
libs/readline/DETAILS | 3 +
libs/readline/HISTORY | 4 ++
libs/readline/patches/0001-official-8.3p1.patch | 44
++++++++++++++++++++++++
net/samba4/DETAILS | 6 +--
net/samba4/HISTORY | 3 +
5 files changed, 56 insertions(+), 4 deletions(-)
New commits:
commit 15dc1a54d82a72d22a7553e4fd0985665877e38a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
readline: apply official patch to un-break clients like samba4
The CLI was just broken for smbclient for example. No input at all.
That's quality control. Upstream … and for us, months later!
commit 5479a01dd61424045e3cac19b2a7b0e94c787fd4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
samba4: version 4.22.6, ++SECURITY_PATCH
diff --git a/libs/readline/DETAILS b/libs/readline/DETAILS
index 4a48457..d3322ca 100755
--- a/libs/readline/DETAILS
+++ b/libs/readline/DETAILS
@@ -1,6 +1,7 @@
# Watch: https://ftp.gnu.org/gnu/readline
SPELL=readline
VERSION=8.3
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
@@ -13,7 +14,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_IGNORE=signature
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
LICENSE[0]=GPL
- WEB_SITE=https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+ WEB_SITE=https://www.gnu.org/software/readline/
ENTERED=20010922
KEYWORDS="libs"
SHORT="lets users edit command lines as they are typed in"
diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index a3d7fbf..16bf6e0 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,3 +1,7 @@
+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).
+
2025-07-04 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 8.3
diff --git a/libs/readline/patches/0001-official-8.3p1.patch
b/libs/readline/patches/0001-official-8.3p1.patch
new file mode 100644
index 0000000..0203b35
--- /dev/null
+++ b/libs/readline/patches/0001-official-8.3p1.patch
@@ -0,0 +1,44 @@
+*** 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 --git a/net/samba4/DETAILS b/net/samba4/DETAILS
index 1ae48e9..d4ec0c9 100755
--- a/net/samba4/DETAILS
+++ b/net/samba4/DETAILS
@@ -7,9 +7,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL[0]=git://git.samba.org/samba.git:$SPELL
SOURCE_IGNORE=volatile
else
- VERSION=4.22.0
-
SOURCE_HASH=sha512:3d0f34d570eb0c119f1300ffe10f16c1dbc65ef719780d1ffd0c2060b0c283aa57f2d0f5445f1db66d61e52cf5ae1d1093705867973f3b6450b642878073a63f
- SECURITY_PATCH=9
+ VERSION=4.22.6
+
SOURCE_HASH=sha512:ab307c3aff3a76a8a561b8d418ad69e51866238ea5f5bdef6b1621ccadf43d17ec9d5475d033ac93d9b97e623affdcd0ed3fb1b616afc8ff02521cc310968c61
+ SECURITY_PATCH=10
SOURCE=${SPELL/4}-$VERSION.tar.gz
# SOURCE2=${SPELL/4}-${VERSION}.tar.asc
# SOURCE2_IGNORE=signature
diff --git a/net/samba4/HISTORY b/net/samba4/HISTORY
index 73882c5..45e6474 100644
--- a/net/samba4/HISTORY
+++ b/net/samba4/HISTORY
@@ -1,3 +1,6 @@
+2025-12-17 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 4.22.6, ++SECURITY_PATCH
+
2025-04-13 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 4.22.0, ++SECURITY_PATCH
* DEPENDS: add dbus explictly, also lmdb without AD
- [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (15dc1a54d82a72d22a7553e4fd0985665877e38a), Thomas Orgis, 12/18/2025
Archive powered by MHonArc 2.6.24.