gentoo auto-resync : 11:02:2025 - 00:12:37

3 files changed, 202 insertions, 16 deletions

diff --git a/net-misc/zssh/Manifest b/net-misc/zssh/Manifest
index 3c1aa9750f83..951c1055e9ad 100644
--- a/net-misc/zssh/Manifest
+++ b/net-misc/zssh/Manifest
@@ -1,4 +1,5 @@
 AUX zssh-1.5a-gentoo-include.diff 320 BLAKE2B b5ba88091ba1804f22f735ef3d2229a70f24bdddb11a02c128d2c31cccf44a79b532e2455b4f03fc5e273889716e293c3dac2c7a33cf838b8350eed68e752f1d SHA512 447a1aeb095907473ef18a6b2bc6a1a4bfc9baf7ed532382a636ea044667c2f7cbd86c8d0e20ffea7c9751cb9c50249d3085bf65aee7ab7fab5362aae27d8ba5
+AUX zssh-1.5c-C23.patch 4594 BLAKE2B 0e7df641be495e0bdde0ef0183cd58793f3329140ea1358386b939e980d6b7db1ffed854ded98a560230de89c9ae9267d6eda013febb45c99eff5846bfa27c14 SHA512 9773f929c789395d88504aaa95405e74d6a1838add709928ad6dcef1d58006ed19610c4c950448063ed5a5a6e7151c79d197e9038d7433b994efc7781c64734c
 DIST zssh-1.5c.tgz 344964 BLAKE2B 35b41125ec7a49cae741666516b17e3f0b22b159d0fc2b490565e8eaef366bb4b418895ad028822647a4b946577b2ef9dc588e9dbfe657ce7c1c8300207ca603 SHA512 799ce3bbea5e94a800f61e6c38879746a579992396304861b7584b6bad967214b811b6bf9aecb36d9d60a15857377cb2fee80b495ad69778903fc45593efeebd
-EBUILD zssh-1.5c-r2.ebuild 893 BLAKE2B 79106345a84cea18a7c5f87b3975aabe49e80ccb386f1f41bd20808b5bb6b8733a2339368d8ecf213c83d5ca850b9f96dda95071cb8b71ddaaa4d3bd39dcaeb8 SHA512 ccc0dea66e438897e581a24a535a7ef3c05d0f6d638937db9a6df71170a24c28f42522cb9e7526104b43b9d463059b04a8e630546a9fd0d53367521b82fc88d4
+EBUILD zssh-1.5c-r3.ebuild 924 BLAKE2B 615c181f751fa570f102d63611bcc05909653d8a003f00353f306fd4ca06f1ca649a988367eddc3321150c648590a1b61d66a0cb06d694d4b3dbcf759b26a994 SHA512 22b34b59c4bbff448712004e9a956ef4f05d2b2c13e0b87d5aa7fbaf49adc957bbd11119660ac15fd6808b7bb69f34a5a5c24aaf747bb3edab84ba9e31e83c13
 MISC metadata.xml 242 BLAKE2B 0219a28d20cce3e716b2e6737277182560a5b292d94b89a3b57385d14393ab6b28a6aac667aac11ff744c6be8042a411c6aef63b2fddf60c40024d6a35e0f2ab SHA512 1214868537bf0006e32453e2962570693e6e18474c468ebe7bc00bf9fb2e6c60775644ebf02471af8fa8e326332ca51f05a2d47b04f7fdbe1d0ad63400b74211
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
index 3d3cfc636134..c675342be7fd 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,28 +11,35 @@ 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? (
-		sys-libs/ncurses:0
-		sys-libs/readline:0
-	)"
-RDEPEND="${DEPEND}
-	net-dialup/lrzsz
-	virtual/openssh"
+DEPEND="
+	readline? (
+		sys-libs/ncurses:=
+		sys-libs/readline:=
+	)
+"
+RDEPEND="
+	${DEPEND}
+	net-dialup/lrzsz[nls?]
+	virtual/openssh
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5a-gentoo-include.diff"
+	"${FILESDIR}/${P}-C23.patch"
+)
 
 src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.5a-gentoo-include.diff"
+	default
 
-	# Fix linking with sys-libs/ncurses[tinfo], bug #527036
-	sed -i -e 's/-ltermcap/-ltinfo/g' configure || die
-
-	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)