From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 15 Oct 2025 13:02:22 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1v8zGw-0084dD-1h for lore@lore.pengutronix.de; Wed, 15 Oct 2025 13:02:22 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1v8zGw-00038x-9F; Wed, 15 Oct 2025 13:02:22 +0200 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1v8zGk-00038a-4t; Wed, 15 Oct 2025 13:02:10 +0200 From: =?UTF-8?q?Sven=20P=C3=BCschel?= To: ptxdist@pengutronix.de Date: Wed, 15 Oct 2025 13:01:55 +0200 Message-ID: <20251015110207.3066644-1-s.pueschel@pengutronix.de> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] readline: version bump 8.2 -> 8.3 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 --- ...s-link-against-our-termcap-libraries.patch | 33 ------------------- .../0001-rl-attribute.patch | 22 ++++++++----- .../0002-rl-header.patch | 4 +-- .../0003-rl-no-rpath.patch | 2 +- .../0004-rlfe-history.patch | 6 ++-- patches/{readline-8.2 => readline-8.3}/series | 3 +- rules/readline.make | 8 +++-- 7 files changed, 25 insertions(+), 53 deletions(-) delete mode 100644 patches/readline-8.2/0005-always-link-against-our-termcap-libraries.patch rename patches/{readline-8.2 => readline-8.3}/0001-rl-attribute.patch (67%) rename patches/{readline-8.2 => readline-8.3}/0002-rl-header.patch (91%) rename patches/{readline-8.2 => readline-8.3}/0003-rl-no-rpath.patch (95%) rename patches/{readline-8.2 => readline-8.3}/0004-rlfe-history.patch (90%) rename patches/{readline-8.2 => readline-8.3}/series (57%) 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 afaa67648..000000000 --- a/patches/readline-8.2/0005-always-link-against-our-termcap-libraries.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Marc Kleine-Budde -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 ---- - 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 f7b2f150f..565ed7e90 100644 --- a/patches/readline-8.2/0001-rl-attribute.patch +++ b/patches/readline-8.3/0001-rl-attribute.patch @@ -1,33 +1,37 @@ From: "doko@debian.org" 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 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 +Signed-off-by: Sven Püschel --- 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 ad5cd2f93..95aedcf50 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 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 #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 f503f3830..14199f52b 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 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 1bd44d33f..f9c1ea1eb 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 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 5b5cd2fea..4ccbfd05e 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 3bbf03051..43b2fe787 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 -- 2.47.3