Thanks, applied as 5b852b106f25db1cf262978b616c1ed5e20d4d65. Michael
[sent from post-receive hook] On Sun, 19 Oct 2025 14:05:24 +0200, Sven Püschel <[email protected]> wrote: > Updated Patch 0001-rl-attribute.patch with the current Debian patch. > Version 8.3 now supports a flag to force linking against termcap, > which allows us to remove a patch. > > https://tiswww.case.edu/php/chet/readline/CHANGES > > Signed-off-by: Sven Püschel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/readline-8.2/0005-always-link-against-our-termcap-libraries.patch > b/patches/readline-8.2/0005-always-link-against-our-termcap-libraries.patch > deleted file mode 100644 > index afaa676484df..000000000000 > --- > a/patches/readline-8.2/0005-always-link-against-our-termcap-libraries.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From: Marc Kleine-Budde <[email protected]> > -Date: Sun, 24 Jan 2010 00:32:08 +0100 > -Subject: [PATCH] always link against our $termcap libraries > - > -This way our $user doesn't need to know wich $termcap library > -we linked against. > - > -(If this lib would be written in the mid 2000s pkg-config would > - probably used for this :) > - > -Signed-off-by: Marc Kleine-Budde <[email protected]> > ---- > - shlib/Makefile.in | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/shlib/Makefile.in b/shlib/Makefile.in > -index d138524ce9ee..ee46f9806332 100644 > ---- a/shlib/Makefile.in > -+++ b/shlib/Makefile.in > -@@ -174,11 +174,11 @@ unsupported: > - > - $(SHARED_READLINE): $(SHARED_OBJ) > - $(RM) $@ > -- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) > $(SHLIB_LIBS) > -+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) > $(SHLIB_LIBS) $(TERMCAP_LIB) > - > - $(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so > - $(RM) $@ > -- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) > xmalloc.so xfree.so $(SHLIB_LIBS) > -+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) > xmalloc.so xfree.so $(SHLIB_LIBS) $(TERMCAP_LIB) > - > - # Since tilde.c is shared between readline and bash, make sure we compile > - # it with the right flags when it's built as part of readline > diff --git a/patches/readline-8.2/0001-rl-attribute.patch > b/patches/readline-8.3/0001-rl-attribute.patch > similarity index 67% > rename from patches/readline-8.2/0001-rl-attribute.patch > rename to patches/readline-8.3/0001-rl-attribute.patch > index f7b2f150f1f5..565ed7e90620 100644 > --- a/patches/readline-8.2/0001-rl-attribute.patch > +++ b/patches/readline-8.3/0001-rl-attribute.patch > @@ -1,33 +1,37 @@ > From: "[email protected]" <[email protected]> > Date: Sun, 24 Jan 2010 00:31:09 +0100 > Subject: [PATCH] rl-attribute. > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > > rl-attribute.dpatch by <[email protected]> > > from: > -http://ftp.de.debian.org/debian/pool/main/r/readline6/readline6_6.1-1.diff.gz > +https://sources.debian.org/patches/readline/8.3-3/rl-attribute.diff/ > > Signed-off-by: Marc Kleine-Budde <[email protected]> > +Signed-off-by: Sven Püschel <[email protected]> > --- > readline.h | 2 +- > rlstdc.h | 8 ++++---- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/readline.h b/readline.h > -index cac269f0b433..ec50816f8d39 100644 > +index 8a53b063e427..355a432671a5 100644 > --- a/readline.h > +++ b/readline.h > -@@ -405,7 +405,7 @@ extern void rl_deactivate_mark (void); > +@@ -409,7 +409,7 @@ extern void rl_activate_mark (void); > + extern void rl_deactivate_mark (void); > extern int rl_mark_active_p (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 > + > + extern int rl_show_char (int); > + > diff --git a/rlstdc.h b/rlstdc.h > -index 2aaa30babfbd..82b607cb35df 100644 > +index 0e5c4f47f8ee..1f357825f0db 100644 > --- a/rlstdc.h > +++ b/rlstdc.h > @@ -36,10 +36,10 @@ > @@ -44,4 +48,4 @@ index 2aaa30babfbd..82b607cb35df 100644 > +# define __rl_attribute__(x) > #endif > > - /* Moved from config.h.in because readline.h:rl_message depends on these > + #endif /* !_RL_STDC_H_ */ > diff --git a/patches/readline-8.2/0002-rl-header.patch > b/patches/readline-8.3/0002-rl-header.patch > similarity index 91% > rename from patches/readline-8.2/0002-rl-header.patch > rename to patches/readline-8.3/0002-rl-header.patch > index ad5cd2f93dee..95aedcf503de 100644 > --- a/patches/readline-8.2/0002-rl-header.patch > +++ b/patches/readline-8.3/0002-rl-header.patch > @@ -14,7 +14,7 @@ Signed-off-by: Marc Kleine-Budde <[email protected]> > 2 files changed, 2 insertions(+) > > diff --git a/history.h b/history.h > -index 5208f9a463b2..ed4e4f7b24f2 100644 > +index 4721e3a29f48..664653612194 100644 > --- a/history.h > +++ b/history.h > @@ -32,6 +32,7 @@ extern "C" { > @@ -26,7 +26,7 @@ index 5208f9a463b2..ed4e4f7b24f2 100644 > # include <readline/rltypedefs.h> > #endif > diff --git a/readline.h b/readline.h > -index ec50816f8d39..fd9bf5d81d5f 100644 > +index 355a432671a5..ba747df44a84 100644 > --- a/readline.h > +++ b/readline.h > @@ -32,6 +32,7 @@ extern "C" { > diff --git a/patches/readline-8.2/0003-rl-no-rpath.patch > b/patches/readline-8.3/0003-rl-no-rpath.patch > similarity index 95% > rename from patches/readline-8.2/0003-rl-no-rpath.patch > rename to patches/readline-8.3/0003-rl-no-rpath.patch > index f503f3830120..14199f52be8a 100644 > --- a/patches/readline-8.2/0003-rl-no-rpath.patch > +++ b/patches/readline-8.3/0003-rl-no-rpath.patch > @@ -13,7 +13,7 @@ Signed-off-by: Marc Kleine-Budde <[email protected]> > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/shobj-conf b/support/shobj-conf > -index cd7634dfa624..029123a64c64 100644 > +index c3df351af9f7..c2bc28227ce5 100644 > --- a/support/shobj-conf > +++ b/support/shobj-conf > @@ -128,7 +128,7 @@ > linux*-*|gnu*-*|k*bsd*-gnu-*|midnightbsd*|freebsd*|dragonfly*) > diff --git a/patches/readline-8.2/0004-rlfe-history.patch > b/patches/readline-8.3/0004-rlfe-history.patch > similarity index 90% > rename from patches/readline-8.2/0004-rlfe-history.patch > rename to patches/readline-8.3/0004-rlfe-history.patch > index 1bd44d33f7a1..f9c1ea1eb5e0 100644 > --- a/patches/readline-8.2/0004-rlfe-history.patch > +++ b/patches/readline-8.3/0004-rlfe-history.patch > @@ -13,10 +13,10 @@ Signed-off-by: Marc Kleine-Budde <[email protected]> > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/examples/rlfe/rlfe.c b/examples/rlfe/rlfe.c > -index f40b2ddaf00f..89bb17e462db 100644 > +index 0e8ef2b8246d..91e51b2d6f2b 100644 > --- a/examples/rlfe/rlfe.c > +++ b/examples/rlfe/rlfe.c > -@@ -154,21 +154,27 @@ struct termios orig_term; > +@@ -152,21 +152,27 @@ struct termios orig_term; > static pid_t child = -1; > > static void > @@ -48,7 +48,7 @@ index f40b2ddaf00f..89bb17e462db 100644 > volatile int propagate_sigwinch = 0; > > /* sigwinch_handler > -@@ -710,8 +716,7 @@ main(int argc, char** argv) > +@@ -708,8 +714,7 @@ main(int argc, char** argv) > if (count <= 0) > { > DPRINT0 ("(Connection closed by foreign host.)\n"); > diff --git a/patches/readline-8.2/series b/patches/readline-8.3/series > similarity index 57% > rename from patches/readline-8.2/series > rename to patches/readline-8.3/series > index 5b5cd2feac4a..4ccbfd05ee78 100644 > --- a/patches/readline-8.2/series > +++ b/patches/readline-8.3/series > @@ -4,5 +4,4 @@ > 0002-rl-header.patch > 0003-rl-no-rpath.patch > 0004-rlfe-history.patch > -0005-always-link-against-our-termcap-libraries.patch > -# 7b8eea3fcea421a1233d1d9232c74be5 - git-ptx-patches magic > +# eae3239a8862b47078f4dd50c25717aa - git-ptx-patches magic > diff --git a/rules/readline.make b/rules/readline.make > index 3bbf03051f0c..43b2fe78779a 100644 > --- a/rules/readline.make > +++ b/rules/readline.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_READLINE) += readline > # > # Paths and names > # > -READLINE_VERSION := 8.2 > -READLINE_MD5 := 4aa1b31be779e6b84f9a96cb66bc50f6 > +READLINE_VERSION := 8.3 > +READLINE_MD5 := 25a73bfb2a3ad7146c5e9d4408d9f6cd > READLINE := readline-$(READLINE_VERSION) > READLINE_SUFFIX := tar.gz > READLINE_URL := $(call ptx/mirror, GNU, > readline/$(READLINE).$(READLINE_SUFFIX)) > @@ -39,7 +39,9 @@ READLINE_CONF_OPT := \ > --disable-install-examples \ > --enable-bracketed-paste-default \ > $(GLOBAL_LARGE_FILE_OPTION) \ > - --$(call ptx/wwo,PTXCONF_READLINE_NCURSES)-curses > + --$(call ptx/endis, PTXDIST_Y2038)-year2038 \ > + --$(call ptx/wwo,PTXCONF_READLINE_NCURSES)-curses \ > + --with-shared-termcap-library > > # > ---------------------------------------------------------------------------- > # Target-Install
