diff -Nru logrotate-3.14.0/debian/changelog logrotate-3.14.0/debian/changelog --- logrotate-3.14.0/debian/changelog 2020-07-10 17:28:21.000000000 +0000 +++ logrotate-3.14.0/debian/changelog 2020-09-10 16:15:41.000000000 +0000 @@ -1,3 +1,9 @@ +logrotate (3.14.0-4ubuntu5) groovy; urgency=medium + + * Chery-pick upstream patch to fix FTBFS with GCC 10 + + -- Balint Reczey Thu, 10 Sep 2020 18:15:41 +0200 + logrotate (3.14.0-4ubuntu4) groovy; urgency=medium * No change rebuild against new CET ABI. diff -Nru logrotate-3.14.0/debian/patches/0006-split-declaration-and-definition-of-queue-variable.patch logrotate-3.14.0/debian/patches/0006-split-declaration-and-definition-of-queue-variable.patch --- logrotate-3.14.0/debian/patches/0006-split-declaration-and-definition-of-queue-variable.patch 1970-01-01 00:00:00.000000000 +0000 +++ logrotate-3.14.0/debian/patches/0006-split-declaration-and-definition-of-queue-variable.patch 2020-09-10 16:15:41.000000000 +0000 @@ -0,0 +1,40 @@ +From: =?utf-8?q?Christian_G=C3=B6ttsche?= +Date: Wed, 8 Jan 2020 10:54:53 +0100 +Subject: split declaration and definition of queue variable + +Support compilation with -fno-common flag, which is the default for GCC 10. + +Fixes: #288 +Closes #289 +--- + config.c | 2 ++ + logrotate.h | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/config.c b/config.c +index 84db36f..b1c4014 100644 +--- a/config.c ++++ b/config.c +@@ -32,6 +32,8 @@ + #include "log.h" + #include "logrotate.h" + ++struct logInfoHead logs; ++ + #if !defined(GLOB_ABORTED) && defined(GLOB_ABEND) + #define GLOB_ABORTED GLOB_ABEND + #endif +diff --git a/logrotate.h b/logrotate.h +index 7bd7da2..1fa8159 100644 +--- a/logrotate.h ++++ b/logrotate.h +@@ -81,7 +81,8 @@ struct logInfo { + TAILQ_ENTRY(logInfo) list; + }; + +-TAILQ_HEAD(logInfoHead, logInfo) logs; ++TAILQ_HEAD(logInfoHead, logInfo); ++extern struct logInfoHead logs; + + extern int numLogs; + extern int debug; diff -Nru logrotate-3.14.0/debian/patches/series logrotate-3.14.0/debian/patches/series --- logrotate-3.14.0/debian/patches/series 2018-09-18 18:51:14.000000000 +0000 +++ logrotate-3.14.0/debian/patches/series 2020-09-10 16:15:41.000000000 +0000 @@ -3,3 +3,4 @@ 0007-skip-cronjob-when-running-with-systemd.patch 0008-fix-test-pagesize.patch 0009-drop-MemoryDenyWriteExecute-from-systemd-service.patch +0006-split-declaration-and-definition-of-queue-variable.patch