Bug#1096494: cvs: ftbfs with GCC-15

[Florian Ernst]

Control: tags -1 patch
thanks

On Mon, Feb 17, 2025 at 05:09:01PM +0000, Matthias Klose wrote:
> [...]
> The package fails to build in a test rebuild on at least amd64 with
> gcc-15/g++-15, but succeeds to build with gcc-14/g++-14. The
> severity of this report will be raised before the forky release.
> [...]
> ../../../lib/sighandle.c: In function 'SIG_handle':
> ../../../lib/sighandle.c:207:18: error: too many arguments to function 
> 'this->handler'; expected 0, have 1
>   207 |                 (*this->handler)(sig);
>       |                 ~^~~~~~~~~~~~~~~ ~~~
> ../../../lib/sighandle.c:59:35: note: declared here
>    59 |         RETSIGTYPE              (*handler)();
>       |                                   ^~~~~~~
> [...]

The Alpine patch at
<https://git.alpinelinux.org/aports/tree/main/cvs/gcc15.patch> (now also
attached) seems to resolve this. Or at least the package build reaches
its testsuite which I then just canceled. Still, tagging this bug
accordingly.

There also exists a seemingly more complete patch at
<https://src.fedoraproject.org/rpms/cvs/blob/rawhide/f/cvs-1.11.23-Adapt-to-changes-in-GCC-15.patch>,
but that one does not apply to the Debian sources. YMMV.

HTH,
Flo

--- a/diff/system.h
+++ b/diff/system.h
@@ -177,7 +177,7 @@
 VOID *realloc ();
 #endif
 #ifndef getenv
-char *getenv ();
+char *getenv (const char *);
 #endif
 
 #include <limits.h>
--- a/diff/util.c
+++ b/diff/util.c
@@ -24,7 +24,7 @@
 #endif
 
 #ifndef strerror
-extern char *strerror ();
+extern char *strerror (int);
 #endif
 
 /* Queue up one-line messages to be printed at the end,
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -124,7 +124,7 @@
    whose names are inconsistent.  */
 
 #ifndef getenv
-extern char *getenv ();
+extern char *getenv (const char *);
 #endif
 
 #endif /* not __GNU_LIBRARY__ */
--- a/lib/sighandle.c
+++ b/lib/sighandle.c
@@ -56,7 +56,7 @@
 
 /* Define linked list of signal handlers structure */
 struct SIG_hlist {
-	RETSIGTYPE		(*handler)();
+	RETSIGTYPE		(*handler)(int);
 	struct SIG_hlist	*next;
 };
 
@@ -220,7 +220,7 @@
  * restoration later.
  */
 
-int SIG_register(int sig, RETSIGTYPE (*fn)())
+int SIG_register(int sig, RETSIGTYPE (*fn)(int))
 {
 	int			val;
 	struct SIG_hlist	*this;

signature.asc
Description: PGP signature