Control: tags 972767 + pending
Dear maintainer,
I've prepared an NMU for frr (versioned as 7.4-1.1) and uploaded
it to DELAYED/7. Please feel free to tell me if I should cancel it.
cu
Adrian
diff -Nru frr-7.4/debian/changelog frr-7.4/debian/changelog
--- frr-7.4/debian/changelog 2020-08-10 12:50:45.000000000 +0300
+++ frr-7.4/debian/changelog 2021-01-21 16:06:12.000000000 +0200
@@ -1,3 +1,10 @@
+frr (7.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream fix for FTBFS with Python 3.9. (Closes: #972767)
+
+ -- Adrian Bunk <b...@debian.org> Thu, 21 Jan 2021 16:06:12 +0200
+
frr (7.4-1) unstable; urgency=medium
[ Ondřej Surý ]
diff -Nru frr-7.4/debian/patches/0001-build-find-all-future-minor-versions-of-python3.patch frr-7.4/debian/patches/0001-build-find-all-future-minor-versions-of-python3.patch
--- frr-7.4/debian/patches/0001-build-find-all-future-minor-versions-of-python3.patch 1970-01-01 02:00:00.000000000 +0200
+++ frr-7.4/debian/patches/0001-build-find-all-future-minor-versions-of-python3.patch 2021-01-21 16:05:17.000000000 +0200
@@ -0,0 +1,29 @@
+From 838cb35e08eb98acbc27637808162105ae2c4549 Mon Sep 17 00:00:00 2001
+From: Michal Ruprich <michalrupr...@gmail.com>
+Date: Wed, 17 Jun 2020 13:47:30 +0200
+Subject: build: find all future minor versions of python3
+
+This way we can find every python from 3.8 further
+
+Signed-off-by: Michal Ruprich <michalrupr...@gmail.com>
+---
+ m4/ax_python.m4 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/m4/ax_python.m4 b/m4/ax_python.m4
+index 9f43ea0ab..91d12b99b 100644
+--- a/m4/ax_python.m4
++++ b/m4/ax_python.m4
+@@ -186,7 +186,8 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ AC_MSG_RESULT([yes])
+
+ PYTHON_CFLAGS="`\"$pycfg\" --includes`"
+- if test x"${py_ver}" = x"3.8" || test x"{py_ver}" = x"3.9"; then
++ minor_ver=${py_ver#*\.}
++ if test $((minor_ver)) -gt 7; then
+ PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`"
+ else
+ PYTHON_LIBS="`\"$pycfg\" --ldflags`"
+--
+2.20.1
+
diff -Nru frr-7.4/debian/patches/series frr-7.4/debian/patches/series
--- frr-7.4/debian/patches/series 1970-01-01 02:00:00.000000000 +0200
+++ frr-7.4/debian/patches/series 2021-01-21 16:06:12.000000000 +0200
@@ -0,0 +1 @@
+0001-build-find-all-future-minor-versions-of-python3.patch
