Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F175226426
D50873.id158936.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
2 KB
Referenced Files
None
Subscribers
None
D50873.id158936.diff
View Options
diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -1,6 +1,6 @@
PORTNAME= augeas
DISTVERSION= 1.14.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= https://github.com/hercules-team/augeas/releases/download/release-${DISTVERSION}/
diff --git a/textproc/augeas/distinfo b/textproc/augeas/distinfo
--- a/textproc/augeas/distinfo
+++ b/textproc/augeas/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1683741338
+TIMESTAMP = 1750064706
SHA256 (augeas-1.14.0.tar.gz) = 8c101759ca3d504bd1d805e70e2f615fa686af189dd7cf0529f71d855c087df1
SIZE (augeas-1.14.0.tar.gz) = 2651463
SHA256 (7b26cbb74ed634d886ed842e3d5495361d8fd9b1.patch) = 08b0dbf7f303cd7cb341e2dff13f9b5df7042c2171dcfc89ed00d1d8f4886983
diff --git a/textproc/augeas/files/patch-lenses_rsyslog.aug b/textproc/augeas/files/patch-lenses_rsyslog.aug
new file mode 100644
--- /dev/null
+++ b/textproc/augeas/files/patch-lenses_rsyslog.aug
@@ -0,0 +1,40 @@
+--- 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/*"
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Oct 10, 6:21 AM (11 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40529246
Default Alt Text
D50873.id158936.diff (2 KB)
Attached To
Mode
D50873: [PATCH] textproc/augeas: Fix rsyslog lense
Attached
Detach File
Event Timeline
Log In to Comment