Page MenuHomeFreeBSD

[PATCH] textproc/augeas: Fix rsyslog lense
ClosedPublic

Authored by kiwi on Jun 16 2025, 10:38 AM.
Tags
None
Referenced Files
F132183060: D50873.id158978.diff
Tue, Oct 14, 1:35 PM
F132183059: D50873.id158968.diff
Tue, Oct 14, 1:35 PM
F132183057: D50873.id158936.diff
Tue, Oct 14, 1:35 PM
F132183053: D50873.id157094.diff
Tue, Oct 14, 1:35 PM
F132183035: D50873.id.diff
Tue, Oct 14, 1:35 PM
F132125943: D50873.diff
Mon, Oct 13, 11:46 PM
Unknown Object (File)
Mon, Oct 13, 6:22 AM
Unknown Object (File)
Sun, Oct 12, 5:18 PM
Subscribers
None

Details

Summary
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
Test Plan
  • Tested successfully in production environment
  • Port update checked by portclippy
  • Package building successfully built using poudriere on 14.2-RELEAS

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kiwi requested review of this revision.Jun 16 2025, 10:38 AM
kiwi created this revision.

rsyslog.aug has been cleaned (no more CRLF).

Looks great. Some notes about the commit message:

  • Drop [PATCH].
  • I'd use Obtained from instead of Pull Request. FreeBSD uses Pull Request for PRs from FreeBSD's GitHub. It's a GitHub equivalent of Phabricator's Differential Revision. We'd use that to point to a patch for the ports tree. We do not use it to point to a patch that inspired the change that we now apply to the ports tree.
  • Add Approved by: maintainer timeout

Also, would it be better to use:

PATCH_SITES=   https://github.com/hercules-team/augeas/pull/
PATCHFILES=   863.patch:-p1

but if that is not an option, then vendoring the patch is also fine.

textproc/augeas/files/patch-lenses_rsyslog.aug
41

Side note: this should probably include directories and configuration files in LOCALBASE as well, right? This is out of scope for this patch but I just wanted to note that.

This revision is now accepted and ready to land.Jul 23 2025, 4:19 PM
kiwi edited the summary of this revision. (Show Details)
kiwi marked an inline comment as done.

Use PATCHES_SITES and PATCHFILES as suggested. Added some LOCALBASE for rsyslog.aug (like other patches).

This revision now requires review to proceed.Jul 24 2025, 2:13 AM
textproc/augeas/files/patch-lenses_rsyslog.aug
41

Added such patch as it is done on others patches for lenses (see atch-lenses_pg__hba.aug for example).

This revision was not accepted when it landed; it landed in state Needs Review.Jul 24 2025, 10:29 AM
This revision was automatically updated to reflect the committed changes.