diff --git a/backport-expect-5.45-headers.patch b/backport-expect-5.45-headers.patch new file mode 100644 index 0000000000000000000000000000000000000000..83afe389a68cc76f3e393c302faa8e23aa8df9aa --- /dev/null +++ b/backport-expect-5.45-headers.patch @@ -0,0 +1,101 @@ +From 86ec3d495e8c1a0ed8eaf14e7f6d5411517b676a September 20 00:00:00 2010 +From: Mike Frysinger +Date: Thu, 7 May 2020 10:08:02 +0800 +Subject: [PATCH] #80 missing headers in some filesmp +https://sourceforge.net/p/expect/bugs/80/ +Reference:https://sourceforge.net/p/expect/bugs/80/ +Conflict:NA +--- + exp_chan.c | 1 + + exp_clib.c | 7 +++++++ + exp_trap.c | 1 + + exp_tty.h | 1 + + pty_termios.c | 3 +++ + 5 files changed, 13 insertions(+) + +diff --git a/exp_chan.c b/exp_chan.c +index 79f486c..ba1fa80 100644 +--- a/exp_chan.c ++++ b/exp_chan.c +@@ -34,6 +34,7 @@ + #include "exp_rename.h" + #include "exp_prog.h" + #include "exp_command.h" ++#include "exp_event.h" + #include "exp_log.h" + #include "tcldbg.h" /* Dbg_StdinMode */ + +diff --git a/exp_clib.c b/exp_clib.c +index a4bed39..949638c 100644 +--- a/exp_clib.c ++++ b/exp_clib.c +@@ -15,6 +15,12 @@ would appreciate credit if this program or parts of it are used. + #endif + #include + #include ++#ifdef HAVE_UNISTD_H ++# include ++#endif ++#ifdef HAVE_SYS_WAIT_H ++#include ++#endif + + #ifdef TIME_WITH_SYS_TIME + # include +@@ -1949,6 +1955,7 @@ expDiagLogU(str) + + #include "expect.h" + #include "exp_int.h" ++EXTERN void exp_init_tty _ANSI_ARGS_((void)); + + /* exp_glob.c - expect functions for doing glob + * +diff --git a/exp_trap.c b/exp_trap.c +index 390e0e3..a55a74d 100644 +--- a/exp_trap.c ++++ b/exp_trap.c +@@ -13,6 +13,7 @@ would appreciate credit if this program or parts of it are used. + #include + #include + #include ++#include + + #ifdef HAVE_SYS_WAIT_H + #include +diff --git a/exp_tty.h b/exp_tty.h +index 3013838..7b55f0e 100644 +--- a/exp_tty.h ++++ b/exp_tty.h +@@ -17,6 +17,7 @@ extern int exp_stdout_is_tty; + + void exp_tty_raw(int set); + void exp_tty_echo(int set); ++int exp_tty_cooked_echo(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo); + void exp_tty_break(Tcl_Interp *interp, int fd); + int exp_tty_raw_noecho(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo); + int exp_israw(void); +diff --git a/pty_termios.c b/pty_termios.c +index c605b23..e832b2f 100644 +--- a/pty_termios.c ++++ b/pty_termios.c +@@ -9,6 +9,8 @@ would appreciate credit if you use this file or parts of it. + + #include + #include ++#include ++#include + + #if defined(SIGCLD) && !defined(SIGCHLD) + #define SIGCHLD SIGCLD +@@ -101,6 +103,7 @@ with openpty which supports 4000 while ptmx supports 60. */ + + #include "exp_tty_in.h" + #include "exp_rename.h" ++#include "exp_int.h" + #include "exp_pty.h" + + void expDiagLog(); +-- +2.23.0 + + diff --git a/expect.spec b/expect.spec index 6a61bce88a221ba43a142afc267d669de3be9988..bebd3b9f66b2d8693677d87d1264e8c635da4786 100644 --- a/expect.spec +++ b/expect.spec @@ -4,7 +4,7 @@ Name: expect Epoch: 1 Version: 5.45.4 -Release: 8 +Release: 9 Summary: A tool for automating interactive applications License: Public Domain URL: https://core.tcl.tk/expect/index @@ -42,6 +42,8 @@ Patch104: expect-5.45-mkpasswd-man.patch # Patch105: Fix error with -Werror=format-security Patch105: expect-5.45-format-security.patch +Patch6000: backport-expect-5.45-headers.patch + %description Expect is a tool for automating interactive applications such as telnet, ftp, passwd, fsck, rlogin, tip, etc. @@ -125,6 +127,10 @@ echo "%{_libdir}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf %{_mandir}/man3/libexpect.3* %changelog +* Wed Jul 31 2024 hongjinghao - 1:5.45.4-9 +- sync patch from upstream + backport-expect-5.45-headers.patch + * Thu Feb 22 2024 hongjinghao - 1:5.45.4-8 - remove rpath and runpath of exec files and libraries