kiwi/klara-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use PATCHFILES

Browse Source
This commit is contained in:
Xavier Beaudouin
2025-07-24 03:42:43 +02:00
parent 7cde189318
commit 71e43c341a
3 changed files with 7 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
textproc/augeas/Makefile
View File

@ -1,11 +1,13 @@
PORTNAME= augeas
DISTVERSION= 1.14.0
PORTREVISION= 4
PORTREVISION= 3
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

4
textproc/augeas/distinfo
View File

@ -1,5 +1,7 @@
TIMESTAMP = 1750064706
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

40
textproc/augeas/files/patch-lenses_rsyslog.aug
View File

@ -1,40 +0,0 @@
--- lenses/rsyslog.aug.orig 2025-07-23 13:11:53.989669000 +0200
+++ lenses/rsyslog.aug 2025-07-23 13:12:09.304191000 +0200
@@ -53,8 +53,10 @@
let namedpipe = Syslog.pipe . Sep.space . [ label "pipe" . store Syslog.file_r ]
-let action = Syslog.action | omusrmsg | file_tmpl | dynamic | namedpipe
+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
+
(* Cannot use syslog program because rsyslog does not suppport #! *)
let program = [ label "program" . Syslog.bang .
( Syslog.opt_plus | [ Build.xchgs "-" "reverse" ] ) .
@@ -87,9 +89,23 @@
in [ label "filter" . prop_name . sep . prop_oper . sep . prop_val .
Sep.space . actions . Util.eol ]
-let entries = ( Syslog.empty | Util.comment | entry | macro | config_object | prop_filter )*
+(* View: condition
+ Parses if condition blocks, e.g., if $programname != "devd" then { ... }
+*)
+let condition =
+ let cond_rx = /\\$[a-zA-Z0-9_]+[ \t]*(==|!=|=~|!~|>|<|>=|<=)[ \t]*("[^"]*"|[0-9]+)/ in
+ [ key "if" . Sep.space .
+ [ label "condition" . store cond_rx ] . Sep.space .
+ Util.del_str "then" . Sep.space . Util.del_str "{" . (del /[ \t\n]*/ "" ) .
+ (entry | Util.comment | Syslog.empty)* .
+ Util.del_str "}" . (del /[ \t\n]*/ "" ) . Util.eol ]
-let lns = entries . ( program | hostname )*
+(* Fallback for unparsed lines *)
+let invalid = [ label "invalid" . store /[^\n]*\n/ ]
+
+let entries = ( Syslog.empty | Util.comment | entry | macro | config_object | prop_filter | condition | invalid )*
+
+let lns = entries . ( program | hostname | condition )*
let filter = incl "/etc/rsyslog.conf"
. incl "/etc/rsyslog.d/*"