git: cf6482319cf7 - main - textproc/augeas: Fix rsyslog lense

From: Xavier Beaudouin <kiwi_at_FreeBSD.org>
Date: Thu, 24 Jul 2025 10:28:23 UTC
The branch main has been updated by kiwi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cf6482319cf70c34eb2e9b58ac6850d9af6ca39b

commit cf6482319cf70c34eb2e9b58ac6850d9af6ca39b
Author:     Xavier Beaudouin <kiwi@FreeBSD.org>
AuthorDate: 2025-07-24 10:26:37 +0000
Commit:     Xavier Beaudouin <kiwi@FreeBSD.org>
CommitDate: 2025-07-24 10:28:04 +0000

    textproc/augeas: Fix rsyslog lense
    
    This integrate the PR863 that fixes parsing of rsyslogd.conf
    files with "if xxx then {}".
    
    PR:     287586
    Approved by:    0mp (mentor)
    Approved by:    maintainer timeout
    Sponsored by:   Klara, Inc.
    Obtained from:  https://github.com/hercules-team/augeas/pull/863
    Differential Revision:  https://reviews.freebsd.org/D50873
---
 textproc/augeas/Makefile                       |  6 ++++--
 textproc/augeas/distinfo                       |  4 +++-
 textproc/augeas/files/patch-lenses_rsyslog.aug | 11 +++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index 728645ba0704..4d1bd3702b25 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -1,11 +1,13 @@
 PORTNAME=	augeas
 DISTVERSION=	1.14.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/hercules-team/augeas/releases/download/release-${DISTVERSION}/
 
-PATCH_SITES=	https://github.com/hercules-team/augeas/commit/
+PATCH_SITES=	https://github.com/hercules-team/augeas/commit/ \
+		https://github.com/hercules-team/augeas/pull/
 PATCHFILES+=	7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch:-p1 # https://github.com/hercules-team/augeas/pull/792
+PATCHFILES+=	863.patch:-p1 # https://github.com/hercules-team/augeas/pull/863
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Configuration editing tool
diff --git a/textproc/augeas/distinfo b/textproc/augeas/distinfo
index da7e25700d38..e6e5ad0be998 100644
--- a/textproc/augeas/distinfo
+++ b/textproc/augeas/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1683741338
+TIMESTAMP = 1753321317
 SHA256 (augeas-1.14.0.tar.gz) = 8c101759ca3d504bd1d805e70e2f615fa686af189dd7cf0529f71d855c087df1
 SIZE (augeas-1.14.0.tar.gz) = 2651463
 SHA256 (7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch) = 08b0dbf7f303cd7cb341e2dff13f9b5df7042c2171dcfc89ed00d1d8f4886983
 SIZE (7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch) = 1239
+SHA256 (863.patch) = 7e54e1f98d470c78b297b9e964c88803ff1ac7c290d5eb39e794c2983c238635
+SIZE (863.patch) = 18596
diff --git a/textproc/augeas/files/patch-lenses_rsyslog.aug b/textproc/augeas/files/patch-lenses_rsyslog.aug
new file mode 100644
index 000000000000..ee9c839c647a
--- /dev/null
+++ b/textproc/augeas/files/patch-lenses_rsyslog.aug
@@ -0,0 +1,11 @@
+--- lenses/rsyslog.aug.orig	2025-07-24 03:58:56.131711000 +0200
++++ lenses/rsyslog.aug	2025-07-24 03:59:27.793860000 +0200
+@@ -109,6 +109,8 @@
+ 
+ let filter = incl "/etc/rsyslog.conf"
+            . incl "/etc/rsyslog.d/*"
++           . incl "/usr/local/etc/rsyslog.conf"
++           . incl "/usr/local/etc/rsyslog.d/*"
+            . Util.stdexcl
+ 
+ let xfm = transform lns filter