commit: 1336a2c982ab9257be0bae0c140b339e2296deb7 Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com> AuthorDate: Wed Jan 8 18:07:35 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 10 09:20:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1336a2c9
net-misc/zssh: Make it build and fix C23 issues. Previous version is dropped, because it's failing to build and there no better way to massage it into building. Ebuild had traces of EAPI-6, fixed, too. This ebuild dropped stable because this software was dead since 2003, whoever is using it now must do so on their own risk. Closes: https://bugs.gentoo.org/875242 Bug: https://bugs.gentoo.org/898974 Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/40055 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/zssh/files/zssh-1.5c-C23.patch | 178 +++++++++++++++++++++ .../{zssh-1.5c-r2.ebuild => zssh-1.5c-r3.ebuild} | 21 +-- 2 files changed, 190 insertions(+), 9 deletions(-) diff --git a/net-misc/zssh/files/zssh-1.5c-C23.patch b/net-misc/zssh/files/zssh-1.5c-C23.patch new file mode 100644 index 000000000000..50fa9ec176d0 --- /dev/null +++ b/net-misc/zssh/files/zssh-1.5c-C23.patch @@ -0,0 +1,178 @@ +Fix compilation errors with GCC-14 and C23 +https://bugs.gentoo.org/875242 +https://bugs.gentoo.org/898974 +and also fold linking with ncurces[tinfo] from sed to configure.ac +https://bugs.gentoo.org/527036 +diff -ru a/configure.in b/configure.in +--- a/configure.in 2025-01-08 21:48:25.202798412 +0400 ++++ b/configure.in 2025-01-08 21:50:36.184060767 +0400 +@@ -5,7 +5,7 @@ + EXTRA_DEPS="" + EXTRA_LIBS="" + EXTRA_CFLAGS="" +-TERMCAP_LIB="" ++TINFO_LIB="" + + dnl Check configure arguments + AC_MSG_CHECKING(whether to use libreadline for cmd-line editing) +@@ -65,8 +65,8 @@ + if test -z "$fakereadline"; then + + dnl libtermcap (or (n)curses) is only needed by libreadline +- BASH_CHECK_LIB_TERMCAP +- LIBS="$LIBS $TERMCAP_LIB" ++ BASH_CHECK_LIB_TINFO ++ LIBS="$LIBS $TINFO_LIB" + + dnl check for readline headers + AC_CHECK_HEADERS(readline/readline.h readline/history.h, , +@@ -127,7 +127,7 @@ + AC_SUBST(EXTRA_DEPS) + AC_SUBST(EXTRA_CFLAGS) + AC_SUBST(EXTRA_LIBS) +-AC_SUBST(TERMCAP_LIB) ++AC_SUBST(TINFO_LIB) + + AC_OUTPUT(Makefile fake_readline/Makefile test/Makefile) + +diff -ru a/completion.c b/completion.c +--- a/completion.c 2025-01-08 21:55:33.535386179 +0400 ++++ b/completion.c 2025-01-08 21:59:46.899959311 +0400 +@@ -41,7 +41,8 @@ + /* Tell the GNU Readline library how to complete. We want to try to complete + on command names if this is the first word in the line, or on filenames + if not. */ +-void initialize_readline() ++void ++initialize_readline (void) + { + #ifdef DEBUG + printf("Using readline library version: %s\n", rl_library_version); +@@ -53,7 +54,7 @@ + so that if zssh_completion() fails nothing is completed */ + rl_completion_entry_function = fake_generator; + /* Tell the completer that we want a crack first. */ +- rl_attempted_completion_function = (CPPFunction *) zssh_completion; ++ rl_attempted_completion_function = zssh_completion; + + } + +@@ -62,10 +63,8 @@ + the word to complete. We can use the entire contents of rl_line_buffer + in case we want to do some simple parsing. Return the array of matches, + or NULL if there aren't any. */ +-char **zssh_completion(text, start, end) +-char *text; +-int start; +-int end; ++char ** ++zssh_completion (const char *text, int start, int end) + { + char **matches; + +@@ -89,9 +88,8 @@ + /* Generator function for command completion. STATE lets us know whether + to start from scratch; without any state (i.e. STATE == 0), then we + start at the top of the list. */ +-char *command_generator(text, state) +-const char *text; +-int state; ++char * ++command_generator (const char *text, int state) + { + static int list_index, len; + char *name; +@@ -123,9 +121,8 @@ + to start from scratch; without any state (i.e. STATE == 0), then we + start at the top of the list. */ + #if 0 +-char *tilde_generator(text, state) +-char *text; +-int state; ++char * ++tilde_generator (char *text, int state) + { + struct passwd *pwd; + static int len; +@@ -154,9 +151,8 @@ + } + #endif /* 0 */ + +-char *fake_generator(text, state) +-const char *text; +-int state; ++char * ++fake_generator (const char *text, int state) + { + return (0); + } +diff -ru a/fun.h b/fun.h +--- a/fun.h 2025-01-08 21:55:33.531386202 +0400 ++++ b/fun.h 2025-01-08 22:00:12.795813473 +0400 +@@ -1,7 +1,7 @@ + + /* completion.c */ + void initialize_readline(void); +-char **zssh_completion(char *text, int start, int end); ++char **zssh_completion(const char *text, int start, int end); + char *command_generator(const char *text, int state); + char *tilde_generator(char *text, int state); + char *fake_generator(const char *text, int state); +diff -ru a/init.c b/init.c +--- a/init.c 2025-01-08 21:55:33.535386179 +0400 ++++ b/init.c 2025-01-08 21:58:35.526361264 +0400 +@@ -90,7 +90,8 @@ + exit (0); + } + +-void usage() ++void ++usage (void) + { + printf("\ + Usage: zssh [zssh options] [--] [ssh options]\n\ +@@ -143,7 +144,8 @@ + * ^@ -> C-Space + * ^X -> C-x + */ +-char *escape_help() ++char * ++escape_help (void) + { + static char str[40]; + +@@ -154,9 +156,8 @@ + return (str); + } + +-void command_line_options(argc,argv) +-int *argc; +-char ***argv; ++void ++command_line_options (int *argc, char ***argv) + { + int ac = *argc; + char **av = *argv; +@@ -213,9 +214,8 @@ + } + + +-void init(argc,argv) +-int *argc; +-char ***argv; ++void ++init (int *argc, char ***argv) + { + char *str; + +diff -ru a/zssh.h b/zssh.h +--- a/zssh.h 2025-01-08 21:55:33.535386179 +0400 ++++ b/zssh.h 2025-01-08 21:57:02.938882687 +0400 +@@ -45,6 +45,7 @@ + #include <utmp.h> + #include <signal.h> + #include <ctype.h> ++#include <pty.h> + + /*#include <term.h> alpha */ + diff --git a/net-misc/zssh/zssh-1.5c-r2.ebuild b/net-misc/zssh/zssh-1.5c-r3.ebuild similarity index 66% rename from net-misc/zssh/zssh-1.5c-r2.ebuild rename to net-misc/zssh/zssh-1.5c-r3.ebuild index 3d3cfc636134..9fe1d4177546 100644 --- a/net-misc/zssh/zssh-1.5c-r2.ebuild +++ b/net-misc/zssh/zssh-1.5c-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit toolchain-funcs +inherit toolchain-funcs autotools DESCRIPTION="SSH wrapper enabling zmodem up/download in ssh" HOMEPAGE="https://zssh.sourceforge.net/"; @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="nls readline" DEPEND="readline? ( @@ -19,20 +19,23 @@ DEPEND="readline? ( sys-libs/readline:0 )" RDEPEND="${DEPEND} - net-dialup/lrzsz + net-dialup/lrzsz[nls?] virtual/openssh" -src_prepare() { - eapply "${FILESDIR}/${PN}-1.5a-gentoo-include.diff" +PATCHES=( + "${FILESDIR}/${PN}-1.5a-gentoo-include.diff" + "${FILESDIR}/${P}-C23.patch" + ) - # Fix linking with sys-libs/ncurses[tinfo], bug #527036 - sed -i -e 's/-ltermcap/-ltinfo/g' configure || die +src_prepare() { + default - eapply_user + eautoreconf } src_configure() { tc-export AR CC RANLIB + #actually, nls isn't supported in this software, but in bundled lrzsz econf \ $(use_enable nls) \ $(use_enable readline)
