diff --git a/.checkpackageignore b/.checkpackageignore index 713b9d9a07..f1a089aac5 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -361,8 +361,6 @@ package/exim/0001-Build-buildconfig-for-the-host.patch lib_patch.Upstream package/exim/0002-Don-t-make-backup-copies-of-installed-files.patch lib_patch.Upstream package/exim/0003-Skip-version-check-and-symlink-installation.patch lib_patch.Upstream package/exim/S86exim lib_sysv.Indent lib_sysv.Variables -package/expect/0001-enable-cross-compilation.patch lib_patch.Upstream -package/expect/0002-allow-tcl-build-directory.patch lib_patch.Upstream package/fail2ban/S60fail2ban Shellcheck lib_sysv.Variables package/fakedate/fakedate Shellcheck package/falcosecurity-libs/0001-cmake-Permit-setting-GRPC_CPP_PLUGIN.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 6562046378..36ff082164 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2025.11" +config BR2_PACKAGE_EXPECT + bool "expect has been removed" + select BR2_LEGACY + help + expect is unmaintained and has been removed + config BR2_PACKAGE_BCTOOLBOX bool "bctoolbox has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 0de585ff9c..6ea9bf176d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1524,7 +1524,6 @@ endif source "package/tcl/Config.in" if BR2_PACKAGE_TCL menu "Tcl libraries/modules" - source "package/expect/Config.in" source "package/tcllib/Config.in" endmenu endif diff --git a/package/expect/0001-enable-cross-compilation.patch b/package/expect/0001-enable-cross-compilation.patch deleted file mode 100644 index fd31a01f11..0000000000 --- a/package/expect/0001-enable-cross-compilation.patch +++ /dev/null @@ -1,120 +0,0 @@ -From: Andrew Ruder -Subject: [PATCH] enable cross compilation for expect - -This patch was created by running ./configure on a modern Linux machine -and inserting the results into the cross compilation section of -each AC_MSG_CHECKING that bombed out with an error. - -Signed-off-by: Andrew Ruder ---- - -Index: expect-5.45/configure.in -=================================================================== ---- expect-5.45.orig/configure.in 2013-11-14 07:59:58.732100595 -0600 -+++ expect-5.45/configure.in 2013-11-14 07:59:58.732100595 -0600 -@@ -481,7 +481,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - AC_MSG_CHECKING([if any value exists for WNOHANG]) -@@ -506,7 +506,8 @@ - AC_MSG_RESULT(no) - AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) - ) - - # -@@ -574,7 +575,7 @@ - AC_DEFINE(REARM_SIG) - , - AC_MSG_RESULT(no) --, AC_MSG_WARN([Expect can't be cross compiled]) -+, AC_MSG_RESULT(no) - ) - - # HPUX7 has trouble with the big cat so split it -@@ -725,7 +726,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - # mach systems have include files for unimplemented features -@@ -749,7 +750,9 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_DEFINE(HAVE_TERMIO) -+ PTY_TYPE=termios -+ AC_MSG_RESULT(yes) - ) - - # now check for the new style ttys (not yet posix) -@@ -771,7 +774,9 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_DEFINE(HAVE_TERMIOS) -+ PTY_TYPE=termios -+ AC_MSG_RESULT(yes) - ) - fi - -@@ -794,7 +799,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - AC_MSG_CHECKING([if TIOCGWINSZ in termios.h]) -@@ -816,7 +821,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - # finally check for Cray style ttys -@@ -837,7 +842,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - # -@@ -869,7 +874,9 @@ - AC_HAVE_FUNCS(getpty) - - # following test sets SETPGRP_VOID if setpgrp takes 0 args, else takes 2 --AC_FUNC_SETPGRP -+cat >>expect_cf.h <<\_ACEOF -+#define SETPGRP_VOID 1 -+_ACEOF - - # - # check for timezones -@@ -889,7 +896,7 @@ - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(yes) - ) - - diff --git a/package/expect/0002-allow-tcl-build-directory.patch b/package/expect/0002-allow-tcl-build-directory.patch deleted file mode 100644 index 83ede7acb6..0000000000 --- a/package/expect/0002-allow-tcl-build-directory.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Andrew Ruder -Subject: [PATCH] Allow tcl build directory for linking - -Some small changes to use TCL_BUILD_LIB_SPEC instead of TCL_LIB_SPEC for -linking against tcl directly out of its build directory. - -Signed-off-by: Andrew Ruder ---- - -Index: expect-5.45/Makefile.in -=================================================================== ---- expect-5.45.orig/Makefile.in 2013-11-14 07:59:58.732100595 -0600 -+++ expect-5.45/Makefile.in 2013-11-14 07:59:58.732100595 -0600 -@@ -393,7 +393,7 @@ - @LDFLAGS_DEFAULT@ \ - -o expect exp_main_exp.o \ - @EXP_BUILD_LIB_SPEC@ \ -- @TCL_LIB_SPEC@ \ -+ @TCL_BUILD_LIB_SPEC@ \ - @TCL_DL_LIBS@ @PKG_LIBS@ @MATH_LIBS@ \ - @TCL_CC_SEARCH_FLAGS@ \ - @EXP_CC_SEARCH_FLAGS@ -Index: expect-5.45/tclconfig/tcl.m4 -=================================================================== ---- expect-5.45.orig/tclconfig/tcl.m4 2010-11-09 13:42:10.000000000 -0600 -+++ expect-5.45/tclconfig/tcl.m4 2013-11-14 08:02:08.424100580 -0600 -@@ -412,6 +412,7 @@ - AC_SUBST(TCL_LIB_FILE) - AC_SUBST(TCL_LIB_FLAG) - AC_SUBST(TCL_LIB_SPEC) -+ AC_SUBST(TCL_BUILD_LIB_SPEC) - - AC_SUBST(TCL_STUB_LIB_FILE) - AC_SUBST(TCL_STUB_LIB_FLAG) diff --git a/package/expect/Config.in b/package/expect/Config.in deleted file mode 100644 index 67dfe643b2..0000000000 --- a/package/expect/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_EXPECT - bool "expect" - help - Expect is a tool for automating interactive applications - such as telnet, ftp, passwd, fsck, rlogin, ssh, tip, etc. - - https://core.tcl.tk/expect/ diff --git a/package/expect/expect.hash b/package/expect/expect.hash deleted file mode 100644 index c4815abb07..0000000000 --- a/package/expect/expect.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://sourceforge.net/projects/expect/files/Expect/5.45.4/expect5.45.4.tar.gz.SHA256 -sha256 49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34 expect5.45.4.tar.gz -# Locally calculated -sha256 b2415b17dc8d9a287f4509047ef5ac3436baef7ba7c50faef5222dcdf61a2bab README diff --git a/package/expect/expect.mk b/package/expect/expect.mk deleted file mode 100644 index 44bf74af46..0000000000 --- a/package/expect/expect.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# expect -# -################################################################################ - -EXPECT_VERSION = 5.45.4 -EXPECT_SITE = https://sourceforge.net/projects/expect/files/Expect/$(EXPECT_VERSION) -EXPECT_SOURCE = expect$(EXPECT_VERSION).tar.gz -EXPECT_LICENSE = Public domain -EXPECT_LICENSE_FILES = README - -# 0001-enable-cross-compilation.patch -EXPECT_AUTORECONF = YES -EXPECT_DEPENDENCIES = tcl -EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix - -# Since we don't want examples installed -EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-binaries - -$(eval $(autotools-package))