[v2,1/1] package/babeld: bump to version 1.13.1
diff mbox series

Message ID 20240923161409.2937293-1-dario.binacchi@amarulasolutions.com
State New
Headers show
Series
  • [v2,1/1] package/babeld: bump to version 1.13.1
Related show

Commit Message

Dario Binacchi Sept. 23, 2024, 4:14 p.m. UTC 
- Implemented the per-interface option "probe-mtu", which automatically
  discards links with a mis-configured MTU.
- Fixed a typo in the handing of the option "v4viav6".

Release notes:
https://github.com/jech/babeld/blob/master/CHANGES

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
Changes v1 -> v2:
 - Replace the added patch with the merged one.

 .../babeld/0001-Fix-uclibc-build-issue.patch  | 38 +++++++++++++++++++
 package/babeld/babeld.hash                    |  2 +-
 package/babeld/babeld.mk                      |  2 +-
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 package/babeld/0001-Fix-uclibc-build-issue.patch

Comments

'Thomas Petazzoni' via Amarula Linux Oct. 26, 2024, 2:09 p.m. UTC | #1 
On Mon, 23 Sep 2024 18:14:09 +0200
Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote:

> - Implemented the per-interface option "probe-mtu", which automatically
>   discards links with a mis-configured MTU.
> - Fixed a typo in the handing of the option "v4viav6".
> 
> Release notes:
> https://github.com/jech/babeld/blob/master/CHANGES
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
> Changes v1 -> v2:
>  - Replace the added patch with the merged one.

Applied to master, thanks.

However, please note that your fix submitted upstream (and merged) is
not really the most appropriate fix. Indeed, it means you're directly
including kernel headers. I think the correct fix was to add the
missing definition in uClibc-ng.

Best regards,

Thomas

Patch
diff mbox series 

diff --git a/package/babeld/0001-Fix-uclibc-build-issue.patch b/package/babeld/0001-Fix-uclibc-build-issue.patch
new file mode 100644
index 000000000000..fb2f69e98bb1
--- /dev/null
+++ b/package/babeld/0001-Fix-uclibc-build-issue.patch
@@ -0,0 +1,38 @@ 
+From f8e5fbb33690b516b8516590def5136e6619de4c Mon Sep 17 00:00:00 2001
+From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
+Date: Tue, 17 Sep 2024 21:48:01 +0200
+Subject: [PATCH] Fix uclibc build issue
+
+This patch fixes the following compilation error raised by the bump to
+version 1.13.1 in Buildroot [1] using uclibc as the C library for the
+cross-compilation toolchain:
+
+net.c: In function 'babel_send':
+net.c:199:27: error: 'IPV6_DONTFRAG' undeclared (first use in this function)
+  199 |         cmsg->cmsg_type = IPV6_DONTFRAG;;
+
+[1] https://patchwork.ozlabs.org/project/buildroot/patch/20240917201030.11583-1-dario.binacchi@amarulasolutions.com/
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
+Upstream: https://github.com/jech/babeld/pull/121
+---
+ net.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/net.c b/net.c
+index 7a7b57844e6c..30de3dafe1d9 100644
+--- a/net.c
++++ b/net.c
+@@ -37,6 +37,10 @@ THE SOFTWARE.
+ #include <arpa/inet.h>
+ #include <errno.h>
+ 
++#if defined(__UCLIBC__)
++#include <linux/in6.h>
++#endif
++
+ #include "babeld.h"
+ #include "util.h"
+ #include "net.h"
+-- 
+2.43.0
+
diff --git a/package/babeld/babeld.hash b/package/babeld/babeld.hash
index 3eb5d2208153..ab2ffc6ef811 100644
--- a/package/babeld/babeld.hash
+++ b/package/babeld/babeld.hash
@@ -1,3 +1,3 @@ 
 # Locally computed
-sha256  d085ccccfb06a11d7fa5b54c51d9c410f5f3b0a9389f584951336ff178f293b8  babeld-1.13.tar.gz
+sha256  15f24d26da0ccfc073abcdef0309f281e4684f2aa71126f826572c4c845e8dd9  babeld-1.13.1.tar.gz
 sha256  b415c41292cedef6c97b243609e50552887c29343566c639f23282d31efd2afd  LICENCE
diff --git a/package/babeld/babeld.mk b/package/babeld/babeld.mk
index 67ff553b8bed..e9d20111f93d 100644
--- a/package/babeld/babeld.mk
+++ b/package/babeld/babeld.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-BABELD_VERSION = 1.13
+BABELD_VERSION = 1.13.1
 BABELD_SITE = https://www.irif.fr/~jch/software/files
 BABELD_LICENSE = MIT
 BABELD_LICENSE_FILES = LICENCE