Skip to content

sysutils/rsyslog8: Update to 8.2610.0 - #3368

Merged
laffer1 merged 1 commit into
masterfrom
sysutils/rsyslog8
Nov 17, 2026
Merged

laffer1 merged 1 commit into
masterfrom
sysutils/rsyslog8

Conversation

@laffer1

@laffer1 laffer1 commented Nov 17, 2026 •

Copy link
Copy Markdown
Member

Update rsyslog from 8.2502.0 to the 8.2610.0 scheduled-stable release. Declare its new YAML and statistics push dependencies, include the newly enabled modules, and refresh portability patches and build tooling.

Validation:

  • Fresh makesum, patch, build, fake and package
  • Upstream unit tests: 13 passed
  • Staged daemon configuration validation and UDP-to-file logging smoke test
  • Package dependency metadata and linked libraries inspected
  • portlint: no fatal errors (four warnings)

The existing port configuration disables the larger upstream integration testbench.

Summary by Sourcery

Update the rsyslog8 port to the 8.2610.0 release with expanded module support, refreshed dependencies, and portability updates.

New Features:

  • Enable the omkinesis output module and package its newly required runtime dependencies.

Enhancements:

  • Update rsyslog to the 8.2610.0 scheduled-stable release.
  • Refresh portability support for current platform and TLS library combinations.

Build:

  • Use GNU make for the port build.

Update dependencies and portability patches for the current scheduled-stable release.

AI-Assisted-by: Codex (GPT-6) <noreply@openai.com>
Signed-off-by: Lucas Holt <luke@foolishgames.com>
@sourcery-ai

sourcery-ai Bot commented Nov 17, 2026 •

Copy link
Copy Markdown
Contributor

Reviewer's Guide

Implementation

Refresh the OpenSSL portability patch and add the missing unistd.h include, while removing patches no longer needed by the updated upstream source.

  • sysutils/rsyslog8/files/patch-runtime_netns__socket.c L1-9
  • sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c L1-11
  • sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c (deleted)
  • sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c (deleted)
  • sysutils/rsyslog8/files/patch-runtime_net__ossl.c (deleted)

Configuration

Update the port version and dependencies, enable GNU make and omkinesis, and include the updated package manifest for the newly enabled modules.

  • sysutils/rsyslog8/Makefile L2-152 (4 small edits)
  • sysutils/rsyslog8/pkg-plist L22-23

Lock files and vendored code

Refresh the distfile checksums and sizes to match the updated upstream release.

  • sysutils/rsyslog8/distinfo L1-3

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@github-actions

github-actions Bot commented Nov 17, 2026 •

Copy link
Copy Markdown

Claude finished @laffer1's task in 23s —— View job


Review of PR #3368: sysutils/rsyslog8 8.2502.0 → 8.2610.0

I reviewed the diff and the port files. I did not run a build.

Findings

  1. files/patch-runtime_nsd__ossl.c line 5 has a doubled backslash. The context line reads "...Shared ciphers = %s\\n". Upstream source almost certainly has a single \n. The patch probably still applies, because patch drops leading context lines at fuzz level 2. It would then apply with fuzz and a warning, which is fragile. Please regenerate the patch from a clean .orig (for example with make makepatch) so the context matches exactly. Check the bmake patch output for "fuzz" or "offset" messages.

  2. pkg-plist: mmleefparse.so and omkinesis.so are listed unconditionally.

    • omkinesis is enabled in the base CONFIGURE_ARGS, so listing it is consistent.
    • mmleefparse is not named in the Makefile (it isn't among the --enable-* args I could see). The PR says the module is "newly enabled", but I couldn't confirm what enables it. Please confirm it is built unconditionally by default and not tied to an option such as JSONPARSE. Otherwise it belongs in that option's PLIST_FILES.
    • omkinesis is fetched and linked through libcurl, and --enable-omkinesis may need extra dependencies. Check the staged readelf -d output to confirm the new LIB_DEPENDS match what is actually linked.
  3. Dependency declarations.

    • The new libprotobuf-c, libsnappy and libyaml entries are plausible, given the statistics push and YAML support described in the PR.
    • They are unconditional LIB_DEPENDS. Only do that if upstream configure hard-requires them. If configure auto-detects them, pass explicit --enable or --disable flags, so the build is deterministic and the package metadata is accurate. The PR says package metadata was inspected, so this is probably fine.
  4. Patch cleanup.

    • Dropping the imdtls, omdtls and net_ossl patches is fine if upstream fixed them. The PR says the build and tests passed.
    • The #include <unistd.h> patch for netns_socket.c is a new portability fix. It's harmless.
    • The LibreSSL guard in nsd_ossl.c is retained.
    • Please confirm the DTLS option still builds. OPTIONS_DEFINE includes DTLS, and its imdtls/omdtls patches were removed. Build with DTLS on at least once.
  5. Minor points.

    • Removing PORTREVISION=1 on a version bump is correct.
    • USES+=gmake is plausible, but upstream's Makefile.am is portable, so please confirm it is actually needed.
    • --enable-omkinesis is appended to the first line of CONFIGURE_ARGS and pushes it past a comfortable length. This is cosmetic; portfmt would reflow it.

Not checked

  • Whether the LICENSE is unchanged for 8.2610.0 (not verified; the diff doesn't touch it).
  • Whether any ports depend on rsyslog's shared libraries and need a PORTREVISION bump. rsyslog installs only plugin modules, so this is probably not needed.

Verdict: Looks good overall. Fix the doubled-backslash patch context (item 1) and confirm where mmleefparse gets enabled (item 2) before merging.

@laffer1
laffer1 merged commit 1ae68c0 into master Nov 17, 2026
10 checks passed
@laffer1
laffer1 deleted the sysutils/rsyslog8 branch November 17, 2026 20:51

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've found 1 issue

Prompt for AI Agents
Please address the comments from this code review:

## Individual Comments

### Comment 1
<location path="sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c" line_range="5" />
<code_context>
- 		dbgprintf("osslPostHandshakeCheck: Debug Shared ciphers = %s\n", szDbg);
+@@ -949,7 +949,7 @@ osslPostHandshakeCheck(nsd_ossl_t *pNsd) {
+     if (SSL_get_shared_ciphers(pNsd->pNetOssl->ssl, szDbg, sizeof szDbg) != NULL)
+         dbgprintf("osslPostHandshakeCheck: Debug Shared ciphers = %s\\n", szDbg);

--	#if OPENSSL_VERSION_NUMBER >= 0x10002000L
</code_context>
<issue_to_address>
**TLS debug lines lose line breaks**

When TLS shared-cipher diagnostics are emitted, `dbgprintf` receives `\\n` in its format string, so it prints the literal characters `\n` instead of ending the line; shared-cipher diagnostics run together with subsequent log output.

Use a single backslash in the C string escape so the diagnostic ends with a newline.
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

dbgprintf("osslPostHandshakeCheck: Debug Shared ciphers = %s\n", szDbg);
@@ -949,7 +949,7 @@ osslPostHandshakeCheck(nsd_ossl_t *pNsd) {
if (SSL_get_shared_ciphers(pNsd->pNetOssl->ssl, szDbg, sizeof szDbg) != NULL)
dbgprintf("osslPostHandshakeCheck: Debug Shared ciphers = %s\\n", szDbg);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚪ Low · TLS debug lines lose line breaks

When TLS shared-cipher diagnostics are emitted, dbgprintf receives \\n in its format string, so it prints the literal characters \n instead of ending the line; shared-cipher diagnostics run together with subsequent log output.

Use a single backslash in the C string escape so the diagnostic ends with a newline.

Prompt for AI agents
In `sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c` at line 5:

**TLS debug lines lose line breaks**

When TLS shared-cipher diagnostics are emitted, `dbgprintf` receives `\\n` in its format string, so it prints the literal characters `\n` instead of ending the line; shared-cipher diagnostics run together with subsequent log output.

Use a single backslash in the C string escape so the diagnostic ends with a newline.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant