diff -Nru xawtv-3.107/debian/changelog xawtv-3.107/debian/changelog --- xawtv-3.107/debian/changelog 2021-04-05 22:15:01.000000000 +0000 +++ xawtv-3.107/debian/changelog 2021-12-06 19:59:01.000000000 +0000 @@ -1,9 +1,10 @@ -xawtv (3.107-1ubuntu1) hirsute; urgency=medium +xawtv (3.107-1.1) unstable; urgency=medium - * d/p/glibc_2.32.diff: Use strsignal() instead of sys_siglist to fix FTBFS - with glibc 2.32. + * Non-maintainer upload. + * Add upstream fix for FTBFS with glibc 2.32, + thanks to Jeremy Sowden. (Closes: #997281) - -- Logan Rosen Mon, 05 Apr 2021 18:15:01 -0400 + -- Adrian Bunk Mon, 06 Dec 2021 21:59:01 +0200 xawtv (3.107-1) unstable; urgency=medium diff -Nru xawtv-3.107/debian/control xawtv-3.107/debian/control --- xawtv-3.107/debian/control 2021-04-05 22:15:01.000000000 +0000 +++ xawtv-3.107/debian/control 2020-07-05 16:42:23.000000000 +0000 @@ -1,8 +1,7 @@ Source: xawtv Section: video Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Multimedia Maintainers +Maintainer: Debian Multimedia Maintainers Uploaders: Dmitry Eremin-Solenikov Build-Depends: autoconf, debhelper-compat (= 13), diff -Nru xawtv-3.107/debian/patches/0001-Replace-sys_siglist-with-strsignal.patch xawtv-3.107/debian/patches/0001-Replace-sys_siglist-with-strsignal.patch --- xawtv-3.107/debian/patches/0001-Replace-sys_siglist-with-strsignal.patch 1970-01-01 00:00:00.000000000 +0000 +++ xawtv-3.107/debian/patches/0001-Replace-sys_siglist-with-strsignal.patch 2021-12-06 19:56:31.000000000 +0000 @@ -0,0 +1,64 @@ +From 4bf2b3966eecad32b47472065706560f31314a92 Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +Date: Tue, 17 Aug 2021 10:46:22 +0200 +Subject: [PATCH] Replace sys_siglist with strsignal + +This is needed in order to compile with newer glibc versions. + +Signed-off-by: Mauro Carvalho Chehab +--- + console/fbtools.c | 2 +- + console/record.c | 2 +- + x11/rootv.c | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/console/fbtools.c b/console/fbtools.c +index 9f876df32dac..07739ff687ec 100644 +--- a/console/fbtools.c ++++ b/console/fbtools.c +@@ -520,6 +520,6 @@ fb_catch_exit_signals(void) + + /* cleanup */ + fb_cleanup(); +- fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]); ++ fprintf(stderr,"Oops: %s\n",strsignal(termsig)); + exit(42); + } +diff --git a/console/record.c b/console/record.c +index 685221b4b5ae..90f0c852bb08 100644 +--- a/console/record.c ++++ b/console/record.c +@@ -429,7 +429,7 @@ ctrlc(int signal) + { + if (verbose) + fprintf(stderr,"\n%s - exiting\n", +- sys_siglist[signal]); ++ strsignal(signal)); + stop = 1; + } + +diff --git a/x11/rootv.c b/x11/rootv.c +index 60a840641e33..4bf458b227a0 100644 +--- a/x11/rootv.c ++++ b/x11/rootv.c +@@ -133,7 +133,7 @@ catch_sig(int signal) + termsig = signal; + if (verbose) + fprintf(stderr,"received signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + } + + static void usage(FILE *fp) +@@ -422,7 +422,7 @@ main(int argc, char *argv[]) + } + if (verbose && termsig) + fprintf(stderr,"exiting on signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + if (do_mute && have_mute) + XvSetPortAttribute(dpy,port,XV_MUTE,1); + XvStopVideo(dpy,port,win); +-- +2.33.0 + diff -Nru xawtv-3.107/debian/patches/glibc_2.32.diff xawtv-3.107/debian/patches/glibc_2.32.diff --- xawtv-3.107/debian/patches/glibc_2.32.diff 2021-04-05 22:15:01.000000000 +0000 +++ xawtv-3.107/debian/patches/glibc_2.32.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ ---- a/console/record.c -+++ b/console/record.c -@@ -429,7 +429,7 @@ - { - if (verbose) - fprintf(stderr,"\n%s - exiting\n", -- sys_siglist[signal]); -+ strsignal(signal)); - stop = 1; - } - ---- a/console/fbtools.c -+++ b/console/fbtools.c -@@ -520,6 +520,6 @@ - - /* cleanup */ - fb_cleanup(); -- fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]); -+ fprintf(stderr,"Oops: %s\n",strsignal(termsig)); - exit(42); - } ---- a/x11/rootv.c -+++ b/x11/rootv.c -@@ -133,7 +133,7 @@ - termsig = signal; - if (verbose) - fprintf(stderr,"received signal %d [%s]\n", -- termsig,sys_siglist[termsig]); -+ termsig,strsignal(termsig)); - } - - static void usage(FILE *fp) -@@ -426,7 +426,7 @@ - } - if (verbose && termsig) - fprintf(stderr,"exiting on signal %d [%s]\n", -- termsig,sys_siglist[termsig]); -+ termsig,strsignal(termsig)); - if (do_mute && have_mute) - XvSetPortAttribute(dpy,port,XV_MUTE,1); - XvStopVideo(dpy,port,win); diff -Nru xawtv-3.107/debian/patches/series xawtv-3.107/debian/patches/series --- xawtv-3.107/debian/patches/series 2021-04-05 22:14:01.000000000 +0000 +++ xawtv-3.107/debian/patches/series 2021-12-06 19:58:58.000000000 +0000 @@ -7,4 +7,4 @@ 0007-Makefile.in-fix-make-distclean.patch 0008-Makefile.in-honour-CPPFLAGS.patch CVE-2020-13696-error_message_fix.patch -glibc_2.32.diff +0001-Replace-sys_siglist-with-strsignal.patch