On Tue, 20 Oct 2020 12:01:41 +0200 "=?UTF-8?Q?Stefan_B=c3=bchler?=" <stefan.bueh...@tik.uni-stuttgart.de> wrote: > Hi Ondrej, > > On Mon, 3 Aug 2020 10:00:07 +0200 Lucas Nussbaum <lu...@debian.org> wrote: > > During a rebuild of all packages in sid, your package failed to build > > on amd64. > > > > Relevant part (hopefully): > > > /usr/bin/ld: obj/sysdep/unix/main.o:././nest/route.h:461: multiple > > > definition of `rta_dest_names'; > > > obj/conf/cf-parse.tab.o:././nest/route.h:461: first defined here > > > LD -Wl,-z,relro -Wl,-z,now -g -O2 -fno-strict-aliasing > > > -fno-strict-overflow -fPIC -Wl,-z,defs -Wl,--as-needed -pthread -o birdcl > > > obj/client/commands.o obj/client/util.o obj/client/client.o > > > obj/client/birdcl.o > > > LD -Wl,-z,relro -Wl,-z,now -g -O2 -fno-strict-aliasing > > > -fno-strict-overflow -fPIC -Wl,-z,defs -Wl,--as-needed -pthread -o birdc > > > obj/client/commands.o obj/client/util.o obj/client/client.o > > > obj/client/birdc.o -lreadline -ltinfo > > > collect2: error: ld returned 1 exit status > > this got fixed upstream in: > > https://gitlab.nic.cz/labs/bird/-/commit/4bbc1061 > > With this patch bird2 compiles in my sbuild chroot. > > Please also keep https://salsa.debian.org/debian/bird2 synchronized; it > is missing the 2.0.7-4 upload.
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. The debdiff is attached. Since https://salsa.debian.org/debian/bird2 lacks the commits for the last upload (2.0.7-4) 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 2.0.7-4. -- Benjamin Drung Debian & Ubuntu Developer
diff -Nru bird2-2.0.7/debian/changelog bird2-2.0.7/debian/changelog --- bird2-2.0.7/debian/changelog 2020-05-11 10:29:24.000000000 +0200 +++ bird2-2.0.7/debian/changelog 2021-01-02 18:12:44.000000000 +0100 @@ -1,3 +1,10 @@ +bird2 (2.0.7-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix collect2: error: ld returned 1 exit status (Closes: #966906) + + -- Benjamin Drung <bdr...@debian.org> Sat, 02 Jan 2021 18:12:44 +0100 + bird2 (2.0.7-4) unstable; urgency=medium * Sync the linuxdoc mangled files with linuxdoc-tools_0.9.73-2 diff -Nru bird2-2.0.7/debian/patches/0002-Added-missing-extern.patch bird2-2.0.7/debian/patches/0002-Added-missing-extern.patch --- bird2-2.0.7/debian/patches/0002-Added-missing-extern.patch 1970-01-01 01:00:00.000000000 +0100 +++ bird2-2.0.7/debian/patches/0002-Added-missing-extern.patch 2021-01-02 18:12:14.000000000 +0100 @@ -0,0 +1,33 @@ +From 4bbc10614f3431c37e6352f5a6ea5c693c31021e Mon Sep 17 00:00:00 2001 +From: Maria Matejka <m...@ucw.cz> +Date: Tue, 4 Feb 2020 10:11:16 +0100 +Subject: Added missing extern +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks to Robert Scheck <b...@robert-scheck.de> who reported it +and Toke Høiland-Jørgensen <t...@toke.dk> who suggested this patch. + +Bug-Debian: https://bugs.debian.org/966906 +Origin: https://gitlab.nic.cz/labs/bird/-/commit/4bbc1061 +--- + nest/route.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nest/route.h b/nest/route.h +index d2a07f09..b927db5f 100644 +--- a/nest/route.h ++++ b/nest/route.h +@@ -458,7 +458,7 @@ typedef struct rta { + protocol-specific metric is availabe */ + + +-const char * rta_dest_names[RTD_MAX]; ++extern const char * rta_dest_names[RTD_MAX]; + + static inline const char *rta_dest_name(uint n) + { return (n < RTD_MAX) ? rta_dest_names[n] : "???"; } +-- +2.27.0 + diff -Nru bird2-2.0.7/debian/patches/series bird2-2.0.7/debian/patches/series --- bird2-2.0.7/debian/patches/series 2020-05-11 10:29:24.000000000 +0200 +++ bird2-2.0.7/debian/patches/series 2021-01-02 18:11:46.000000000 +0100 @@ -1 +1,2 @@ 0001-Sync-the-linuxdoc-mangled-files-with-linuxdoc-tools_.patch +0002-Added-missing-extern.patch
From 435a53bda9e4cda61da61362069ebb4e59042e07 Mon Sep 17 00:00:00 2001 From: Benjamin Drung <bdr...@debian.org> Date: Sat, 2 Jan 2021 18:12:24 +0100 Subject: [PATCH 1/2] Added missing extern MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Robert Scheck <b...@robert-scheck.de> who reported it and Toke Høiland-Jørgensen <t...@toke.dk> who suggested this patch. Bug-Debian: https://bugs.debian.org/966906 Origin: https://gitlab.nic.cz/labs/bird/-/commit/4bbc1061 --- .../patches/0002-Added-missing-extern.patch | 33 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 debian/patches/0002-Added-missing-extern.patch diff --git a/debian/patches/0002-Added-missing-extern.patch b/debian/patches/0002-Added-missing-extern.patch new file mode 100644 index 0000000..1daaf43 --- /dev/null +++ b/debian/patches/0002-Added-missing-extern.patch @@ -0,0 +1,33 @@ +From 4bbc10614f3431c37e6352f5a6ea5c693c31021e Mon Sep 17 00:00:00 2001 +From: Maria Matejka <m...@ucw.cz> +Date: Tue, 4 Feb 2020 10:11:16 +0100 +Subject: Added missing extern +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks to Robert Scheck <b...@robert-scheck.de> who reported it +and Toke Høiland-Jørgensen <t...@toke.dk> who suggested this patch. + +Bug-Debian: https://bugs.debian.org/966906 +Origin: https://gitlab.nic.cz/labs/bird/-/commit/4bbc1061 +--- + nest/route.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nest/route.h b/nest/route.h +index d2a07f09..b927db5f 100644 +--- a/nest/route.h ++++ b/nest/route.h +@@ -458,7 +458,7 @@ typedef struct rta { + protocol-specific metric is availabe */ + + +-const char * rta_dest_names[RTD_MAX]; ++extern const char * rta_dest_names[RTD_MAX]; + + static inline const char *rta_dest_name(uint n) + { return (n < RTD_MAX) ? rta_dest_names[n] : "???"; } +-- +2.27.0 + diff --git a/debian/patches/series b/debian/patches/series index 3a10aac..acc2176 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Sync-the-linuxdoc-mangled-files-with-linuxdoc-tools_.patch +0002-Added-missing-extern.patch -- 2.27.0
From daec522655671ecfa19c33f6c1770d7b73489ac3 Mon Sep 17 00:00:00 2001 From: Benjamin Drung <bdr...@debian.org> Date: Sat, 2 Jan 2021 18:13:28 +0100 Subject: [PATCH 2/2] Release bird2 2.0.7-4.1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0e9f713..76728e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +bird2 (2.0.7-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix collect2: error: ld returned 1 exit status (Closes: #966906) + + -- Benjamin Drung <bdr...@debian.org> Sat, 02 Jan 2021 18:12:44 +0100 + bird2 (2.0.7-4) unstable; urgency=medium * Sync the linuxdoc mangled files with linuxdoc-tools_0.9.73-2 -- 2.27.0
