From fbf86c8f341c79d28f2347c1801ea2ac175af213 Mon Sep 17 00:00:00 2001
From: Xavier Beaudouin <kiwi@oav.net>
Date: Wed, 23 Jul 2025 07:18:49 +0200
Subject: [PATCH] Update port before poudriere

---
 textproc/augeas/Makefile                      |  3 +-
 textproc/augeas/distinfo                      |  2 -
 .../augeas/files/patch-lenses_rsyslog.aug     | 15 ++++++++
 ...tests_root_var_tmp_test-quoted-strings.txt |  5 +++
 ...patch-tests_test-augtool_quoted-strings.sh | 38 +++++++++++++++++++
 5 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 textproc/augeas/files/patch-lenses_rsyslog.aug
 create mode 100644 textproc/augeas/files/patch-tests_root_var_tmp_test-quoted-strings.txt
 create mode 100644 textproc/augeas/files/patch-tests_test-augtool_quoted-strings.sh

diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index e2f1525..fc2ed56 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -1,12 +1,11 @@
 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/
 PATCHFILES+=	7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch:-p1 # https://github.com/hercules-team/augeas/pull/792
-PATCHFILES+=	78a9c2add3dd37d023df67e9089de277bd98f914.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 b4a1872..692a3a9 100644
--- a/textproc/augeas/distinfo
+++ b/textproc/augeas/distinfo
@@ -3,5 +3,3 @@ SHA256 (augeas-1.14.0.tar.gz) = 8c101759ca3d504bd1d805e70e2f615fa686af189dd7cf05
 SIZE (augeas-1.14.0.tar.gz) = 2651463
 SHA256 (7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch) = 08b0dbf7f303cd7cb341e2dff13f9b5df7042c2171dcfc89ed00d1d8f4886983
 SIZE (7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch) = 1239
-SHA256 (78a9c2add3dd37d023df67e9089de277bd98f914.patch) = 2ff5c7f11eaacf9cf4f4c69962d3934f109942a47c70e0aa769aec10d46fb465
-SIZE (78a9c2add3dd37d023df67e9089de277bd98f914.patch) = 8442
diff --git a/textproc/augeas/files/patch-lenses_rsyslog.aug b/textproc/augeas/files/patch-lenses_rsyslog.aug
new file mode 100644
index 0000000..ef0e8fc
--- /dev/null
+++ b/textproc/augeas/files/patch-lenses_rsyslog.aug
@@ -0,0 +1,15 @@
+--- lenses/rsyslog.aug.orig	2025-07-23 05:14:55 UTC
++++ lenses/rsyslog.aug
+@@ -53,11 +53,7 @@ let namedpipe = Syslog.pipe . Sep.space . [ label "pip
+ 
+ let namedpipe = Syslog.pipe . Sep.space . [ label "pipe" . store Syslog.file_r ]
+ 
+-(* View: action_config
+-   Handle action(type="..." users="...") syntax *)
+-let action_config =
+-  [ key "action" . Util.del_str "(" .
+-    [ label "params" . store /[^)]+/ ] . Util.del_str ")" ]
++let action_config = [ key "action" . Util.del_str "(" . [ label "params" . store /[^)]+/ ] . Util.del_str ")" ]
+ 
+ let action = Syslog.action | omusrmsg | file_tmpl | dynamic | namedpipe | action_config
+ 
diff --git a/textproc/augeas/files/patch-tests_root_var_tmp_test-quoted-strings.txt b/textproc/augeas/files/patch-tests_root_var_tmp_test-quoted-strings.txt
new file mode 100644
index 0000000..b92772e
--- /dev/null
+++ b/textproc/augeas/files/patch-tests_root_var_tmp_test-quoted-strings.txt
@@ -0,0 +1,5 @@
+--- tests/root/var/tmp/test-quoted-strings.txt.orig	2022-11-14 10:02:37 UTC
++++ tests/root/var/tmp/test-quoted-strings.txt
+@@ -1 +1 @@
+-find this: ][ )( . * $ / \ " '
++find this: ]][ )( . * $ / \
diff --git a/textproc/augeas/files/patch-tests_test-augtool_quoted-strings.sh b/textproc/augeas/files/patch-tests_test-augtool_quoted-strings.sh
new file mode 100644
index 0000000..55f26f8
--- /dev/null
+++ b/textproc/augeas/files/patch-tests_test-augtool_quoted-strings.sh
@@ -0,0 +1,38 @@
+--- tests/test-augtool/quoted-strings.sh.orig	2022-11-13 10:55:34 UTC
++++ tests/test-augtool/quoted-strings.sh
+@@ -0,0 +1,35 @@
++#!/bin/bash
++
++commands="
++set /files/var/tmp/test-quoted-strings.txt/01 '['
++set /files/var/tmp/test-quoted-strings.txt/02 ']'
++set /files/var/tmp/test-quoted-strings.txt/03 ']['
++set /files/var/tmp/test-quoted-strings.txt/04 '[]'
++set /files/var/tmp/test-quoted-strings.txt/05 '[]['
++set /files/var/tmp/test-quoted-strings.txt/06 '[]]'
++set /files/var/tmp/test-quoted-strings.txt/07 '('
++set /files/var/tmp/test-quoted-strings.txt/08 ')'
++set /files/var/tmp/test-quoted-strings.txt/09 '"\""'
++insert 010 after /files/var/tmp/test-quoted-strings.txt/seq::*[.=~regexp('.*\]\]\[ \)\( .*')]
++set /files/var/tmp/test-quoted-strings.txt/010 'found ]][ )('
++insert 011 after /files/var/tmp/test-quoted-strings.txt/seq::*[.=~regexp('.*\\\\..*')]
++set /files/var/tmp/test-quoted-strings.txt/011 'found .'
++"
++lens=Simplelines.lns
++file="/var/tmp/test-quoted-strings.txt"
++
++diff='--- /var/tmp/test-quoted-strings.txt
+++++ /var/tmp/test-quoted-strings.txt.augnew
++@@ -1 +1,12 @@
++ find this: ]][ )( . * $ / \
+++found .
+++found ]][ )(
+++[
+++]
+++][
+++[]
+++[][
+++[]]
+++(
+++)
+++"'