debian: patch around mips64el build failure

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/debian/.gitignore b/debian/.gitignore
index d95d33a610b3dd9b8a16ed0ae6b49f446639521f..f2ccf49d183530de153e91244a0e4459d98ce442 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -3,6 +3,8 @@
 /*/
 !/tests/
 !/source
+!/patches/
+!/patches/xref_mips64el_pcrel.patch
 
 /*.log
 /*.substvars

diff --git a/debian/changelog b/debian/changelog
index 66c20ec7cceb6be6f75862f512dbae2e8239f208..bd9f000825b5d557b009ad846380e669c05c7f3f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ frr (8.4.1-1) UNRELEASED; urgency=medium
   * upstream fix bgpd out-of-bounds read CVE-2022-37032 (closes: #1021016)
   * upstream fix bgpd UAF CVE-2022-37035 (closes: #1016978)
   * libyang-related pcre3 dep replaced with pcre2 (closes: #1000032)
+  * disable ELF magic on mips64el
 
  -- David Lamparter <equinox-debian@diac24.net>  Mon, 02 Jan 2023 12:19:01 +0100
 

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..b31ffb3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+xref_mips64el_pcrel.patch

diff --git a/debian/patches/xref_mips64el_pcrel.patch b/debian/patches/xref_mips64el_pcrel.patch
new file mode 100644 (file)
index 0000000..50c8683
--- /dev/null
+++ b/debian/patches/xref_mips64el_pcrel.patch
@@ -0,0 +1,11 @@
+--- frr-8.4.1/lib/xref.h       2021-11-08 04:44:24.000000000 +0100
++++ frr-8.4.1/lib/xref.h       2022-11-29 19:40:16.614404443 +0100
+@@ -195,7 +195,7 @@
+  * some build issue with it just add -DFRR_XREF_NO_NOTE to your build flags
+  * to disable it.
+  */
+-#ifdef FRR_XREF_NO_NOTE
++#if defined(FRR_XREF_NO_NOTE) || defined(__mips64)
+ #define XREF_NOTE ""
+ #else
+