diff -Nru db5.3-5.3.28+dfsg1/debian/build_signature_amd64.txt db5.3-5.3.28+dfsg1/debian/build_signature_amd64.txt --- db5.3-5.3.28+dfsg1/debian/build_signature_amd64.txt 2019-02-26 07:57:29.000000000 +0000 +++ db5.3-5.3.28+dfsg1/debian/build_signature_amd64.txt 2020-09-15 15:07:12.000000000 +0000 @@ -1 +1 @@ -7e5b311c +6b2fefb9 diff -Nru db5.3-5.3.28+dfsg1/debian/changelog db5.3-5.3.28+dfsg1/debian/changelog --- db5.3-5.3.28+dfsg1/debian/changelog 2020-03-21 12:26:50.000000000 +0000 +++ db5.3-5.3.28+dfsg1/debian/changelog 2020-09-15 15:07:12.000000000 +0000 @@ -1,3 +1,12 @@ +db5.3 (5.3.28+dfsg1-0.6ubuntu3) groovy; urgency=medium + + * Fix FTBFS due to multiple definitions of progname, switch one of them + to glibc provided program_invocation_name. + * Test-suite sh_list segfaults when db5.3 built with gcc-10, switch to + gcc-9. + + -- Dimitri John Ledkov Tue, 15 Sep 2020 16:07:12 +0100 + db5.3 (5.3.28+dfsg1-0.6ubuntu2) focal; urgency=medium * No-change rebuild for libgcc-s1 package name change. diff -Nru db5.3-5.3.28+dfsg1/debian/control db5.3-5.3.28+dfsg1/debian/control --- db5.3-5.3.28+dfsg1/debian/control 2019-05-31 17:30:28.000000000 +0000 +++ db5.3-5.3.28+dfsg1/debian/control 2020-09-15 15:07:12.000000000 +0000 @@ -12,6 +12,7 @@ tcl , tcl-dev , procps [!hurd-i386] , + gcc-9, g++-9, javahelper , default-jdk Homepage: http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html diff -Nru db5.3-5.3.28+dfsg1/debian/patches/fix-ftbfs-multiple-progname.patch db5.3-5.3.28+dfsg1/debian/patches/fix-ftbfs-multiple-progname.patch --- db5.3-5.3.28+dfsg1/debian/patches/fix-ftbfs-multiple-progname.patch 1970-01-01 00:00:00.000000000 +0000 +++ db5.3-5.3.28+dfsg1/debian/patches/fix-ftbfs-multiple-progname.patch 2020-09-15 15:07:12.000000000 +0000 @@ -0,0 +1,45 @@ +Description: Fix FTBFS due to multiple definitions of progname, switch one of them to glibc provided program_invocation_name. +Author: Dimitri John Ledkov + + +--- db5.3-5.3.28+dfsg1.orig/test/c/cutest/Runner.c ++++ db5.3-5.3.28+dfsg1/test/c/cutest/Runner.c +@@ -11,9 +11,11 @@ + * It lets users run the entire suites (default), or choose individual + * suite(s), or individual tests. + */ ++#define _GNU_SOURCE + #include + #include + #include ++#include + + #include "CuTest.h" + #include "db.h" +@@ -26,7 +28,7 @@ int append_case(char **cases, int *num_c + int usage(); + void CuTestAssertForDb(const char *msg, const char *file, int line); + +-const char *progname; ++extern char *program_invocation_name; + + int main(int argc, char **argv) + { +@@ -37,8 +39,6 @@ int main(int argc, char **argv) + int ch, failed, i, num_suites, num_tests, verbose; + char *test; + +- progname = argv[0]; +- + num_suites = num_tests = verbose = 0; + while ((ch = getopt(argc, argv, "s:t:v")) != EOF) + switch (ch) { +@@ -120,7 +120,7 @@ void CuTestAssertForDb(const char *msg, + int + usage() + { +- (void)fprintf(stderr, "usage: %s %s\n", progname, ++ (void)fprintf(stderr, "usage: %s %s\n", program_invocation_short_name, + "[-s suite] [-t test] -v. Multiple test and suite args allowed."); + return (EXIT_FAILURE); + } diff -Nru db5.3-5.3.28+dfsg1/debian/patches/series db5.3-5.3.28+dfsg1/debian/patches/series --- db5.3-5.3.28+dfsg1/debian/patches/series 2019-05-31 17:30:28.000000000 +0000 +++ db5.3-5.3.28+dfsg1/debian/patches/series 2020-09-15 15:07:12.000000000 +0000 @@ -10,3 +10,4 @@ 009-java-10.patch 010-__atomic_compare_exchange.patch CVE-2019-8457.patch +fix-ftbfs-multiple-progname.patch diff -Nru db5.3-5.3.28+dfsg1/debian/rules db5.3-5.3.28+dfsg1/debian/rules --- db5.3-5.3.28+dfsg1/debian/rules 2019-02-26 07:57:29.000000000 +0000 +++ db5.3-5.3.28+dfsg1/debian/rules 2020-09-15 15:07:12.000000000 +0000 @@ -5,6 +5,10 @@ # Published under the GNU GPL license # Partially based on previous work by Clint Adams # + +export CC=gcc-9 +export CXX=g++-9 + # Uncomment this to turn on verbose mode. export DH_VERBOSE=1