On 2026/11/19 10:03, Mark Patruck wrote:
> On 18.11.2026 18:55, Stuart Henderson wrote:
> > Seems reasonable. Alternatively you could take a daily-stable checkout.
> > 
> > Their normal release cycle is to make a new 'scheduled stable' once
> > every 2 months (i.e. unless they push an early release, 8.2612.0 around
> > 20 Dec).
> > 
> > ok
> 
> So instead of managing patches manually, it then makes more sense to
> directly take master and build rsyslog on that. According to their
> docs, master is also "stable" and users are encouraged to use that,
> see: https://www.rsyslog.com/downloads/download-daily-build/
> 
> The changes to the port are equal to before, but now based on GH_COMMIT.
> The version tag is set to the upcoming 8.2612.0+pre0, so we can increase
> if needed (CVEs or whatever) until the final version is out on ~ Dec 20th.
> 
> Only question. If 8.2612.0 is out and we drop the pre0, does pkg_add see
> this as newer or do we have to bump REV (or do we have a better solution)?
> 
> Again...lightly tested and running fine.
> 
> OK?
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
> retrieving revision 1.60
> diff -u -p -r1.60 Makefile
> --- Makefile  26 Aug 2025 16:08:32 -0000      1.60
> +++ Makefile  19 Nov 2026 08:17:50 -0000
> @@ -6,14 +6,17 @@ COMMENT-elasticsearch =     Elasticsearch pl
>  
>  MULTI_PACKAGES =     -main -mysql -normalize -pgsql -elasticsearch
>  
> -V =                  8.2404.0
> -DISTNAME =           rsyslog-$V
> -PKGNAME-main =               rsyslog-$V
> -PKGNAME-mysql =              rsyslog-mysql-$V
> -PKGNAME-normalize =  rsyslog-normalize-$V
> -PKGNAME-pgsql =              rsyslog-pgsql-$V
> -PKGNAME-elasticsearch =      rsyslog-elasticsearch-$V
> -REVISION =           1
> +V =                  8.2612.0pre0

I would go with 8.2610.0pl20261118 (using the date of upstream commit),
that way if they do decide to make an earlier release with a 2611
version we won't need to mess with EPOCH. Normally I think we'd still
want to use their scheduled releases i.e. proper uploaded tars with
generated autoconf files.

See packages-specs(7) and use pkg_check-version to test upgrade
scenarios for package version numbers.

$ pkg_check-version rsyslog-8.2404.0 rsyslog-8.2610.0pl20261118 
rsyslog-8.2612.0pre0 rsyslog-8.2612.0 rsyslog-8.2610.0 rsyslog-8.2612.0p0 
rsyslog-8.2611.0
rsyslog-*- sorted: rsyslog-8.2404.0 rsyslog-8.2610.0 rsyslog-8.2610.0pl20261118 
rsyslog-8.2611.0 rsyslog-8.2612.0pre0 rsyslog-8.2612.0 rsyslog-8.2612.0p0

> +GH_ACCOUNT =         rsyslog
> +GH_PROJECT =         rsyslog
> +GH_COMMIT =          a073c65ebb105e466d8de52edac3810e6ae0a0ad
> +
> +DISTNAME =           rsyslog-${V}
> +PKGNAME-main =               rsyslog-${V}
> +PKGNAME-mysql =              rsyslog-mysql-${V}
> +PKGNAME-normalize =  rsyslog-normalize-${V}
> +PKGNAME-pgsql =              rsyslog-pgsql-${V}
> +PKGNAME-elasticsearch =      rsyslog-elasticsearch-${V}

There doesn't seem much point changing $V to ${V} and otherwise
keeping these lines, however they were written before subpackages got
sensible PKGNAMEs by default and are now not needed at all.
You can just remove all of the PKGNAME-xxx lines.

Use make show=PKGNAMES before+after to confirm that names end up as
expected and stems didn't change.

> -SITES =                      https://www.rsyslog.com/files/download/rsyslog/

I would keep this, commented-out, so it's easier to move back to
tar distfiles.

The rest lgtm.

Reply via email to