head	1.1;
access;
symbols;
locks; strict;
comment	@# @;


1.1
date	2026.09.06.18.44.01;	author bsiegert;	state Exp;
branches;
next	;
commitid	TNp9CVbeVgbBMAUG;


desc
@@


1.1
log
@augeas: install lenses, fix CVE-2025-2588

Make augeas install all the lenses so it is actually usable. Also fix a
security issue which is not in a release yet.

From Showta Ishizaki in PR pkg/60656.
@
text
@$NetBSD$

Install the lenses.  They depend on GNU make otherwise.

Makefile.am picks the lens lists up with $(wildcard), which is a GNU make
function.  bmake leaves it as the literal string, both lists come out empty
and no lens is installed at all, so augtool cannot read any configuration
file.  The package has been shipping that way since 2014.

The lists are globbed in configure instead; see patch-configure.  Sent
upstream as well.  Patching the generated files rather than Makefile.am and
configure.ac keeps autoreconf out of the build here.

--- Makefile.in.orig
+++ Makefile.in
@@@@ -1703,8 +1703,8 @@@@
 ACLOCAL_AMFLAGS = -I gnulib/m4
 lensdir = $(datadir)/augeas/lenses/dist
 lenstestdir = $(datadir)/augeas/lenses/dist/tests
-dist_lens_DATA = $(wildcard lenses/*.aug)
-dist_lenstest_DATA = $(wildcard lenses/tests/*.aug)
+dist_lens_DATA = @@LENS_FILES@@
+dist_lenstest_DATA = @@LENS_TEST_FILES@@
 EXTRA_DIST = augeas.spec build/ac-aux/move-if-change Makefile.am HACKING.md
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = augeas.pc
@