Update port before poudriere

This commit is contained in:
2025-07-23 07:18:49 +02:00
parent 93f2480ef0
commit fbf86c8f34
5 changed files with 59 additions and 4 deletions

View File

@ -1,12 +1,11 @@
PORTNAME= augeas PORTNAME= augeas
DISTVERSION= 1.14.0 DISTVERSION= 1.14.0
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= textproc CATEGORIES= textproc
MASTER_SITES= https://github.com/hercules-team/augeas/releases/download/release-${DISTVERSION}/ 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/
PATCHFILES+= 7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch:-p1 # https://github.com/hercules-team/augeas/pull/792 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 MAINTAINER= puppet@FreeBSD.org
COMMENT= Configuration editing tool COMMENT= Configuration editing tool

View File

@ -3,5 +3,3 @@ SHA256 (augeas-1.14.0.tar.gz) = 8c101759ca3d504bd1d805e70e2f615fa686af189dd7cf05
SIZE (augeas-1.14.0.tar.gz) = 2651463 SIZE (augeas-1.14.0.tar.gz) = 2651463
SHA256 (7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch) = 08b0dbf7f303cd7cb341e2dff13f9b5df7042c2171dcfc89ed00d1d8f4886983 SHA256 (7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch) = 08b0dbf7f303cd7cb341e2dff13f9b5df7042c2171dcfc89ed00d1d8f4886983
SIZE (7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch) = 1239 SIZE (7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch) = 1239
SHA256 (78a9c2add3dd37d023df67e9089de277bd98f914.patch) = 2ff5c7f11eaacf9cf4f4c69962d3934f109942a47c70e0aa769aec10d46fb465
SIZE (78a9c2add3dd37d023df67e9089de277bd98f914.patch) = 8442

View File

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

View File

@ -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: ]][ )( . * $ / \

View File

@ -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 ]][ )(
++[
++]
++][
++[]
++[][
++[]]
++(
++)
++"'