head	1.3;
access;
symbols
	pkgsrc-2026Q3:1.3.0.2
	pkgsrc-2026Q3-base:1.3
	pkgsrc-2022Q1:1.1.0.6
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.4
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.2
	pkgsrc-2021Q3-base:1.1;
locks; strict;
comment	@ * @;


1.3
date	2026.09.20.18.06.12;	author wiz;	state Exp;
branches;
next	1.2;
commitid	KXmB8bt2AzVw7oWG;

1.2
date	2022.05.19.07.49.17;	author wiz;	state dead;
branches;
next	1.1;
commitid	BAdHVRn1dqPNEDED;

1.1
date	2021.08.11.10.09.54;	author kardel;	state Exp;
branches;
next	;
commitid	2QJt9zN34oKUsx4D;


desc
@@


1.3
log
@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.
@
text
@$NetBSD$

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"
@


1.2
log
@frr: remove patch that was removed from distinfo during last update
@
text
@d1 1
a1 1
$NetBSD: patch-lib_elf__py.c,v 1.1 2021/08/11 10:09:54 kardel Exp $
d3 1
a3 5
	frr 8 now embeds Xref information in executables and
	adds notes to the ELF files. On NetBSD these notes
	create kernel messages at exec time. Allow the
	note mechanism to be disabled by allowing lib/elf_py.c
	to be compiled in that configuration.
d5 1
a5 1
--- lib/elf_py.c.orig	2021-08-06 11:34:16.683867232 +0000
d7 2
a8 3
@@@@ -1030,6 +1030,7 @@@@ static char *elfdata_strptr(Elf_Data *da
 	return p;
 }
d10 3
a12 6
+#ifdef HAVE_ELF_GETDATA_RAWCHUNK
 static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
 				 size_t entries, Elf_Data *symdata,
 				 Elf_Data *strdata, Elf_Type typ)
@@@@ -1124,6 +1125,7 @@@@ static void elffile_add_dynreloc(struct 
 	}
d14 1
a14 5
 }
+#endif
 
 /* primary (only, really) entry point to anything in this module */
 static PyObject *elffile_load(PyTypeObject *type, PyObject *args,
@


1.1
log
@net/frr: upgrade to frr 8.0
@
text
@d1 1
a1 1
$NetBSD$
@