Control: tags 1114410 + patch

Dear maintainer,

I've prepared an NMU for tlog (versioned as 14-2.1) and uploaded
it to DELAYED/14. Please feel free to tell me if I should cancel it.

cu
Adrian
diffstat for tlog-14 tlog-14

 changelog                                                   |    7 ++
 patches/0001-Add-missing-argument-for-sigchld-handler.patch |   37 ++++++++++++
 patches/series                                              |    1 
 3 files changed, 45 insertions(+)

diff -Nru tlog-14/debian/changelog tlog-14/debian/changelog
--- tlog-14/debian/changelog	2025-07-13 15:11:47.000000000 +0300
+++ tlog-14/debian/changelog	2025-10-31 14:59:39.000000000 +0200
@@ -1,3 +1,10 @@
+tlog (14-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with GCC 15. (Closes: #1114410)
+
+ -- Adrian Bunk <[email protected]>  Fri, 31 Oct 2025 14:59:39 +0200
+
 tlog (14-2) unstable; urgency=medium
 
   * Avoid conflicts with curl
diff -Nru tlog-14/debian/patches/0001-Add-missing-argument-for-sigchld-handler.patch tlog-14/debian/patches/0001-Add-missing-argument-for-sigchld-handler.patch
--- tlog-14/debian/patches/0001-Add-missing-argument-for-sigchld-handler.patch	1970-01-01 02:00:00.000000000 +0200
+++ tlog-14/debian/patches/0001-Add-missing-argument-for-sigchld-handler.patch	2025-10-31 14:52:05.000000000 +0200
@@ -0,0 +1,37 @@
+From fd1b38c5fe99e3f4f74ec30d48c84cf9354f45a3 Mon Sep 17 00:00:00 2001
+From: Justin Stephenson <[email protected]>
+Date: Thu, 23 Jan 2025 10:09:01 -0500
+Subject: Add missing argument for sigchld handler
+
+rec.c: In function 'tlog_rec_transfer':
+rec.c:877:19: error: assignment to '__sighandler_t' {aka 'void (*)(int)'} from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types]
+  877 |     sa.sa_handler = tlog_rec_sigchld_handler;
+      |                   ^
+rec.c:81:1: note: 'tlog_rec_sigchld_handler' declared here
+   81 | tlog_rec_sigchld_handler()
+      | ^~~~~~~~~~~~~~~~~~~~~~~~
+In file included from rec.c:45:
+/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
+   72 | typedef void (*__sighandler_t) (int);
+      |                ^~~~~~~~~~~~~~
+make[4]: *** [Makefile:734: rec.lo] Error 1
+---
+ lib/tlog/rec.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/tlog/rec.c b/lib/tlog/rec.c
+index 1d4031f..af6af6d 100644
+--- a/lib/tlog/rec.c
++++ b/lib/tlog/rec.c
+@@ -78,7 +78,7 @@ tlog_rec_alarm_sighandler(int signum)
+ }
+ 
+ static void
+-tlog_rec_sigchld_handler()
++tlog_rec_sigchld_handler(int signum)
+ {
+     tlog_rec_child_exited = true;
+ }
+-- 
+2.30.2
+
diff -Nru tlog-14/debian/patches/series tlog-14/debian/patches/series
--- tlog-14/debian/patches/series	2025-07-13 15:11:47.000000000 +0300
+++ tlog-14/debian/patches/series	2025-10-31 14:53:53.000000000 +0200
@@ -1,2 +1,3 @@
 timespec-define-TLOG_TIME_T_MIN_TLOG_TIME_T_MAX.patch
 Adjust-printf-codes-for-64bit-time_t-on-32bit-systems.patch
+0001-Add-missing-argument-for-sigchld-handler.patch

Reply via email to