diff options
| author | Adrian Bunk <bunk@debian.org> | 2025-10-31 14:59:39 +0200 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2025-11-14 10:40:20 +0000 |
| commit | a7ae526a1cc866aa9361666081ce2984bc5feaa0 (patch) | |
| tree | 645e546df5dbc26e7654ab684b2700d19a6bb172 | |
| parent | 174ea4edbe706f11e74de7122b664afdd4127123 (diff) | |
14-2.1 (patches unapplied)HEADimport/14-2.1ubuntu/resolute-proposedubuntu/resolute-develubuntu/resoluteubuntu/develdebian/sid
Imported using git-ubuntu import.
Notes
Notes:
* Non-maintainer upload.
* Backport upstream fix for FTBFS with GCC 15. (Closes: #1114410)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/0001-Add-missing-argument-for-sigchld-handler.patch | 37 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 45 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 8eb1972..402cca2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <bunk@debian.org> Fri, 31 Oct 2025 14:59:39 +0200 + tlog (14-2) unstable; urgency=medium * Avoid conflicts with curl diff --git a/debian/patches/0001-Add-missing-argument-for-sigchld-handler.patch b/debian/patches/0001-Add-missing-argument-for-sigchld-handler.patch new file mode 100644 index 0000000..e03dfa5 --- /dev/null +++ b/debian/patches/0001-Add-missing-argument-for-sigchld-handler.patch @@ -0,0 +1,37 @@ +From fd1b38c5fe99e3f4f74ec30d48c84cf9354f45a3 Mon Sep 17 00:00:00 2001 +From: Justin Stephenson <jstephen@redhat.com> +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 --git a/debian/patches/series b/debian/patches/series index 2ffdf87..86635a7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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 |