Hi Ondřej, On Fri, 17 Apr 2020 10:57:13 +0000 Matthias Klose <d...@debian.org> wrote: > Package: src:bird > Version: 1.6.8-1 > Severity: normal > Tags: sid bullseye > User: debian-...@lists.debian.org > Usertags: ftbfs-gcc-10 > > Please keep this issue open in the bug tracker for the package it > was filed for. If a fix in another package is required, please > file a bug for the other package (or clone), and add a block in this > package. Please keep the issue open until the package can be built in > a follow-up test rebuild. > > The package fails to build in a test rebuild on at least amd64 with > gcc-10/g++-10, but succeeds to build with gcc-9/g++-9. The > severity of this report will be raised before the bullseye release, > so nothing has to be done for the buster release. > > The full build log can be found at: > http://people.debian.org/~doko/logs/gcc10-20200225/bird_1.6.8-1_unstable_gcc10.log > The last lines of the build log are at the end of this report.
In consideration of the nearing freeze and the fix being applied upstream, I took the opportunity to prepare a NMU and upload it without delay. I also couldn't resist to address the lintian warning about upstart. The debdiff is attached. Since https://salsa.debian.org/debian/bird lacks the commits for the last upload (1.6.8-2) I did not commit my changes to the repository, but attach them as patches to this mail. Then you can apply them with "git am" once you pushed the changes for 1.6.8-2. -- Benjamin Drung Debian & Ubuntu Developer
diff -Nru bird-1.6.8/debian/bird.bird6.upstart bird-1.6.8/debian/bird.bird6.upstart --- bird-1.6.8/debian/bird.bird6.upstart 2020-05-11 10:27:20.000000000 +0200 +++ bird-1.6.8/debian/bird.bird6.upstart 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -# bird - BIRD Internet Routing Daemon (IPv6) - -description "BIRD Internet Routing Daemon (IPv6)" -author "Ondřej Surý <ond...@debian.org>" - -start on runlevel [2345] -stop on runlevel [016] - -respawn -pre-start script -/usr/lib/bird/prepare-environment -/usr/sbin/bird6 -p -end script - -script -. /etc/bird/envvars -exec /usr/sbin/bird6 -f -u $BIRD_RUN_USER -g $BIRD_RUN_GROUP $BIRD_ARGS -end script diff -Nru bird-1.6.8/debian/bird.bird.upstart bird-1.6.8/debian/bird.bird.upstart --- bird-1.6.8/debian/bird.bird.upstart 2020-05-11 10:27:20.000000000 +0200 +++ bird-1.6.8/debian/bird.bird.upstart 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -# bird - BIRD Internet Routing Daemon (IPv4) - -description "BIRD Internet Routing Daemon (IPv4)" -author "Ondřej Surý <ond...@debian.org>" - -start on runlevel [2345] -stop on runlevel [016] - -respawn -pre-start script -/usr/lib/bird/prepare-environment -/usr/sbin/bird -p -end script - -script -. /etc/bird/envvars -exec /usr/sbin/bird -f -u $BIRD_RUN_USER -g $BIRD_RUN_GROUP $BIRD_ARGS -end script diff -Nru bird-1.6.8/debian/changelog bird-1.6.8/debian/changelog --- bird-1.6.8/debian/changelog 2020-05-11 10:27:20.000000000 +0200 +++ bird-1.6.8/debian/changelog 2021-01-02 17:40:39.000000000 +0100 @@ -1,3 +1,11 @@ +bird (1.6.8-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix compilation with GCC 10 (Closes: #957045) + * Remove obsolete upstart files + + -- Benjamin Drung <bdr...@debian.org> Sat, 02 Jan 2021 17:40:39 +0100 + bird (1.6.8-2) unstable; urgency=medium * Sync the linuxdoc mangled files with linuxdoc-tools_0.9.73-2 diff -Nru bird-1.6.8/debian/patches/0004-Unix-fix-compilation-with-GCC-10.patch bird-1.6.8/debian/patches/0004-Unix-fix-compilation-with-GCC-10.patch --- bird-1.6.8/debian/patches/0004-Unix-fix-compilation-with-GCC-10.patch 1970-01-01 01:00:00.000000000 +0100 +++ bird-1.6.8/debian/patches/0004-Unix-fix-compilation-with-GCC-10.patch 2021-01-02 17:33:44.000000000 +0100 @@ -0,0 +1,34 @@ +From e4f91ee4cb11a10df6a61ab4ffcdc8e2da3c3483 Mon Sep 17 00:00:00 2001 +From: Vincent Bernat <vinc...@bernat.ch> +Date: Mon, 28 Sep 2020 16:30:56 +0200 +Subject: Unix: fix compilation with GCC 10 + +GCC 10 will now error when declaring a global variable twice: + + https://gcc.gnu.org/gcc-10/porting_to.html#common + +Fix this issue by declaring the variable as `extern' in `krt.h'. +The variable is really declared in `krt.c'. + +Bug-Debian: https://bugs.debian.org/957045 +Origin: upstream, https://gitlab.nic.cz/labs/bird/-/commit/e4f91ee4cb11a10df6a61ab4ffcdc8e2da3c3483 +--- + sysdep/unix/krt.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h +index d4a8717e..fe79efc3 100644 +--- a/sysdep/unix/krt.h ++++ b/sysdep/unix/krt.h +@@ -112,7 +112,7 @@ struct kif_proto { + struct kif_state sys; /* Sysdep state */ + }; + +-struct kif_proto *kif_proto; ++extern struct kif_proto *kif_proto; + + #define KIF_CF ((struct kif_config *)p->p.cf) + +-- +2.27.0 + diff -Nru bird-1.6.8/debian/patches/series bird-1.6.8/debian/patches/series --- bird-1.6.8/debian/patches/series 2020-05-11 10:27:20.000000000 +0200 +++ bird-1.6.8/debian/patches/series 2021-01-02 17:33:57.000000000 +0100 @@ -1,3 +1,4 @@ 0001-Link-using-ld.patch 0002-Split-example-config-files.patch 0003-Sync-the-linuxdoc-mangled-files-with-linuxdoc-tools_.patch +0004-Unix-fix-compilation-with-GCC-10.patch
From a8d6b995da4f7c123bf021654d249d84da0fe310 Mon Sep 17 00:00:00 2001 From: Benjamin Drung <bdr...@debian.org> Date: Sat, 2 Jan 2021 17:16:24 +0100 Subject: [PATCH 1/3] Unix: fix compilation with GCC 10 GCC 10 will now error when declaring a global variable twice: https://gcc.gnu.org/gcc-10/porting_to.html#common Fix this issue by declaring the variable as `extern' in `krt.h'. The variable is really declared in `krt.c'. Bug-Debian: https://bugs.debian.org/957045 Origin: upstream, https://gitlab.nic.cz/labs/bird/-/commit/e4f91ee4cb11a10df6a61ab4ffcdc8e2da3c3483 --- ...004-Unix-fix-compilation-with-GCC-10.patch | 34 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 35 insertions(+) create mode 100644 debian/patches/0004-Unix-fix-compilation-with-GCC-10.patch diff --git a/debian/patches/0004-Unix-fix-compilation-with-GCC-10.patch b/debian/patches/0004-Unix-fix-compilation-with-GCC-10.patch new file mode 100644 index 0000000..2c06757 --- /dev/null +++ b/debian/patches/0004-Unix-fix-compilation-with-GCC-10.patch @@ -0,0 +1,34 @@ +From e4f91ee4cb11a10df6a61ab4ffcdc8e2da3c3483 Mon Sep 17 00:00:00 2001 +From: Vincent Bernat <vinc...@bernat.ch> +Date: Mon, 28 Sep 2020 16:30:56 +0200 +Subject: Unix: fix compilation with GCC 10 + +GCC 10 will now error when declaring a global variable twice: + + https://gcc.gnu.org/gcc-10/porting_to.html#common + +Fix this issue by declaring the variable as `extern' in `krt.h'. +The variable is really declared in `krt.c'. + +Bug-Debian: https://bugs.debian.org/957045 +Origin: upstream, https://gitlab.nic.cz/labs/bird/-/commit/e4f91ee4cb11a10df6a61ab4ffcdc8e2da3c3483 +--- + sysdep/unix/krt.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h +index d4a8717e..fe79efc3 100644 +--- a/sysdep/unix/krt.h ++++ b/sysdep/unix/krt.h +@@ -112,7 +112,7 @@ struct kif_proto { + struct kif_state sys; /* Sysdep state */ + }; + +-struct kif_proto *kif_proto; ++extern struct kif_proto *kif_proto; + + #define KIF_CF ((struct kif_config *)p->p.cf) + +-- +2.27.0 + diff --git a/debian/patches/series b/debian/patches/series index 9b5be85..e6ebe47 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-Link-using-ld.patch 0002-Split-example-config-files.patch 0003-Sync-the-linuxdoc-mangled-files-with-linuxdoc-tools_.patch +0004-Unix-fix-compilation-with-GCC-10.patch -- 2.27.0
From e2eea89ef47fd8f518cbf165f930cabc4f07fd2d Mon Sep 17 00:00:00 2001 From: Benjamin Drung <bdr...@debian.org> Date: Sat, 2 Jan 2021 17:39:07 +0100 Subject: [PATCH 2/3] Remove obsolete upstart files The package installs files into the /etc/init directory which is used by Upstart, a replacement for the /sbin/init daemon which handles starting of tasks and services during boot, etc. However, Upstart was removed in Debian "stretch" and these files are thus no longer useful and should be removed. Signed-off-by: Benjamin Drung <bdr...@debian.org> --- debian/bird.bird.upstart | 18 ------------------ debian/bird.bird6.upstart | 18 ------------------ 2 files changed, 36 deletions(-) delete mode 100644 debian/bird.bird.upstart delete mode 100644 debian/bird.bird6.upstart diff --git a/debian/bird.bird.upstart b/debian/bird.bird.upstart deleted file mode 100644 index e33f396..0000000 --- a/debian/bird.bird.upstart +++ /dev/null @@ -1,18 +0,0 @@ -# bird - BIRD Internet Routing Daemon (IPv4) - -description "BIRD Internet Routing Daemon (IPv4)" -author "Ondřej Surý <ond...@debian.org>" - -start on runlevel [2345] -stop on runlevel [016] - -respawn -pre-start script -/usr/lib/bird/prepare-environment -/usr/sbin/bird -p -end script - -script -. /etc/bird/envvars -exec /usr/sbin/bird -f -u $BIRD_RUN_USER -g $BIRD_RUN_GROUP $BIRD_ARGS -end script diff --git a/debian/bird.bird6.upstart b/debian/bird.bird6.upstart deleted file mode 100644 index 8163a10..0000000 --- a/debian/bird.bird6.upstart +++ /dev/null @@ -1,18 +0,0 @@ -# bird - BIRD Internet Routing Daemon (IPv6) - -description "BIRD Internet Routing Daemon (IPv6)" -author "Ondřej Surý <ond...@debian.org>" - -start on runlevel [2345] -stop on runlevel [016] - -respawn -pre-start script -/usr/lib/bird/prepare-environment -/usr/sbin/bird6 -p -end script - -script -. /etc/bird/envvars -exec /usr/sbin/bird6 -f -u $BIRD_RUN_USER -g $BIRD_RUN_GROUP $BIRD_ARGS -end script -- 2.27.0
From 6737c0cdbddbcf70a2f2932544e1a580a67cc60a Mon Sep 17 00:00:00 2001 From: Benjamin Drung <bdr...@debian.org> Date: Sat, 2 Jan 2021 17:40:43 +0100 Subject: [PATCH 3/3] Release bird 1.6.8-2.1 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8581306..c81b60c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +bird (1.6.8-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix compilation with GCC 10 (Closes: #957045) + * Remove obsolete upstart files + + -- Benjamin Drung <bdr...@debian.org> Sat, 02 Jan 2021 17:40:39 +0100 + bird (1.6.8-2) unstable; urgency=medium * Sync the linuxdoc mangled files with linuxdoc-tools_0.9.73-2 -- 2.27.0
