CVS commit: pkgsrc/net/frr

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Sep 20 18:06:12 UTC 2026

Modified Files:
        pkgsrc/net/frr: Makefile distinfo options.mk
Added Files:
        pkgsrc/net/frr/patches: patch-lib_elf__py.c

Log Message:
frr: avoid conflict between elf.h and libelf.h

still builds on -current, I hope it fixes the -11 build.

Fix (whitespace) pkglint while here.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/frr/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/frr/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/frr/options.mk
cvs rdiff -u -r0 -r1.3 pkgsrc/net/frr/patches/patch-lib_elf__py.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/frr/Makefile
diff -u pkgsrc/net/frr/Makefile:1.31 pkgsrc/net/frr/Makefile:1.32
--- pkgsrc/net/frr/Makefile:1.31        Wed Sep  2 19:03:52 2026
+++ pkgsrc/net/frr/Makefile     Sun Sep 20 18:06:12 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2026/09/02 19:03:52 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2026/09/20 18:06:12 wiz Exp $
 
 DISTNAME=      frr-9.1
-PKGREVISION=   14
+PKGREVISION=   15
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=FRRouting/}
 GITHUB_TAG=    frr-${PKGVERSION_NOREV}

Index: pkgsrc/net/frr/distinfo
diff -u pkgsrc/net/frr/distinfo:1.9 pkgsrc/net/frr/distinfo:1.10
--- pkgsrc/net/frr/distinfo:1.9 Tue Jan  9 20:17:41 2024
+++ pkgsrc/net/frr/distinfo     Sun Sep 20 18:06:12 2026
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.9 2024/01/09 20:17:41 chopps Exp $
+$NetBSD: distinfo,v 1.10 2026/09/20 18:06:12 wiz Exp $
 
 BLAKE2s (frr-9.1.tar.gz) = c09d3967700a1a385d2b055d603e5291c6863767581a9115d46c96e40908a296
 SHA512 (frr-9.1.tar.gz) = 77b278a3ea87da9dfd7b87e4f9ae67f08ed0f24809f6dd228d2ab2e2c29e2b3191d59d50fc474e53e159ac6c79c302481b462125d0657889516f07b8e05e8562
 Size (frr-9.1.tar.gz) = 10779477 bytes
 SHA1 (patch-configure.ac) = d10b406ff371ffab7ce8eb63392c856a87300aa3
+SHA1 (patch-lib_elf__py.c) = dc6dd799a27aba3a04372186ccab769556ad8a26
 SHA1 (patch-lib_frr__pthread.c) = 566b2a54ebbcf79abaae7f39e563b4b83bd8f474
 SHA1 (patch-pkgsrc_zebra.sh.in) = a466eef102995b1627f031986d10b1d1519dc59e
 SHA1 (patch-zebra_kernel__socket.c) = 118acf4a3d5424a45d1d1c037f1198f6162f4993

Index: pkgsrc/net/frr/options.mk
diff -u pkgsrc/net/frr/options.mk:1.7 pkgsrc/net/frr/options.mk:1.8
--- pkgsrc/net/frr/options.mk:1.7       Tue Jan  6 11:31:36 2026
+++ pkgsrc/net/frr/options.mk   Sun Sep 20 18:06:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2026/01/06 11:31:36 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2026/09/20 18:06:12 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.frr
 PKG_SUPPORTED_OPTIONS= doc
@@ -14,12 +14,12 @@ PLIST_VARS+=                doc
 ### doc/man support
 ###
 .if !empty(PKG_OPTIONS:Mdoc)
-USE_TOOLS+=            makeinfo
-CONFIGURE_ARGS+=       --enable-doc-html
+USE_TOOLS+=                    makeinfo
+CONFIGURE_ARGS+=               --enable-doc-html
 PYTHON_VERSIONS_INCOMPATIBLE=  310 311 # py-sphinx
-TOOL_DEPENDS+=         ${PYPKGPREFIX}-sphinx>=9:../../textproc/py-sphinx
-PLIST.doc=             yes
-INFO_FILES=            yes
+TOOL_DEPENDS+=                 ${PYPKGPREFIX}-sphinx>=9:../../textproc/py-sphinx
+PLIST.doc=                     yes
+INFO_FILES=                    yes
 .else
-CONFIGURE_ARGS+=       --disable-doc
+CONFIGURE_ARGS+=               --disable-doc
 .endif

Added files:

Index: pkgsrc/net/frr/patches/patch-lib_elf__py.c
diff -u /dev/null pkgsrc/net/frr/patches/patch-lib_elf__py.c:1.3
--- /dev/null   Sun Sep 20 18:06:13 2026
+++ pkgsrc/net/frr/patches/patch-lib_elf__py.c  Sun Sep 20 18:06:12 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_elf__py.c,v 1.3 2026/09/20 18:06:12 wiz Exp $
+
+Avoid conflict between symbols in elf.h and libelf.h.
+
+--- lib/elf_py.c.orig  2026-09-20 18:03:27.605799319 +0000
++++ lib/elf_py.c
+@@ -57,7 +57,6 @@
+ #endif
+ 
+ #include <elf.h>
+-#include <libelf.h>
+ #include <gelf.h>
+ 
+ #include "typesafe.h"