thanks, ok

On 2026/11/19 12:05, Mark Patruck wrote:
> On 19.11.2026 10:18, Stuart Henderson wrote:
> > > 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.
> 
> Good point
> 
> > Normally I think we'd still
> > want to use their scheduled releases i.e. proper uploaded tars with
> > generated autoconf files.
> 
> Absolutely and this whole mess wouldn't be needed if upstream would 
> release in a normal manner when critical fixes went in. But at least
> we have both versions in cvs now (GH_COMMIT + normal cycle) and it's
> easier to switch.
> 
> > 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
> 
> works...
> 
> $ pkg_check-version rsyslog-8.2610.0pl20261118 rsyslog-8.2612.0 
> rsyslog-*- sorted: rsyslog-8.2610.0pl20261118 rsyslog-8.2612.0
> 
> > > +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.
> 
> dropped and done
> 
> > > -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.
> 
> New diff below
> 
> 
> 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 10:50:44 -0000
> @@ -6,19 +6,19 @@ 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.2610.0pl20261118
> +GH_ACCOUNT =         rsyslog
> +GH_PROJECT =         rsyslog
> +GH_COMMIT =          a073c65ebb105e466d8de52edac3810e6ae0a0ad
> +
> +DISTNAME =           rsyslog-${V}
>  
>  CATEGORIES =         sysutils
>  
>  HOMEPAGE =           https://www.rsyslog.com/
>  
> +#SITES =             https://www.rsyslog.com/files/download/rsyslog/
> +
>  # GPLv3+
>  PERMIT_PACKAGE =     Yes
>  
> @@ -29,6 +29,7 @@ WANTLIB-main +=             c crypto curl estr fast
>  WANTLIB-main +=              gpg-error hogweed iconv idn2 intl m nettle 
> nghttp2
>  WANTLIB-main +=              p11-kit pthread relp ssl tasn1 unistring uuid z
>  WANTLIB-main +=              execinfo nghttp3 ngtcp2 ngtcp2_crypto_libressl
> +WANTLIB-main +=              yaml protobuf-c snappy
>  
>  WANTLIB-mysql +=     crypto m mariadb pthread ssl z
>  
> @@ -39,8 +40,11 @@ WANTLIB-pgsql +=   crypto m pq pthread ssl
>  WANTLIB-elasticsearch +=     crypto curl m nghttp2 pthread ssl z
>  WANTLIB-elasticsearch +=     nghttp3 ngtcp2 ngtcp2_crypto_libressl
>  
> -LIB_DEPENDS-main =   devel/libfastjson \
> +LIB_DEPENDS-main =   archivers/snappy \
> +                     devel/libfastjson \
>                       devel/libestr \
> +                     devel/libyaml \
> +                     devel/protobuf-c \
>                       net/curl \
>                       security/libgcrypt \
>                       security/gnutls \
> @@ -55,9 +59,14 @@ LIB_DEPENDS-pgsql =        databases/postgresql
>  RUN_DEPENDS-pgsql =  ${PKGNAME-main}:${PKGPATH},-main
>  RUN_DEPENDS-elasticsearch =  ${PKGNAME-main}:${PKGPATH},-main
>  
> -SITES =                      https://www.rsyslog.com/files/download/rsyslog/
> +BUILD_DEPENDS +=     devel/autoconf-archive
> +
> +AUTOCONF_VERSION =   2.71
> +AUTOMAKE_VERSION =   1.16
> +CONFIGURE_STYLE =    autoreconf
> +
> +USE_GMAKE=           Yes
>  
> -CONFIGURE_STYLE =    gnu
>  LIBTOOL_FLAGS =              --tag=disable-static
>  CONFIGURE_ARGS +=    --enable-pgsql \
>                       --enable-mysql \
> @@ -68,7 +77,8 @@ CONFIGURE_ARGS +=   --enable-pgsql \
>                       --enable-relp \
>                       --enable-elasticsearch \
>                       --enable-imfile
> -CONFIGURE_ENV +=     CPPFLAGS="-I${LOCALBASE}/include"
> +CONFIGURE_ENV +=     CPPFLAGS="-I${LOCALBASE}/include" \
> +                     LDFLAGS="-L${LOCALBASE}/lib"
>  
>  post-install:
>       rm ${PREFIX}/lib/rsyslog/*.la
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo  1 Aug 2024 14:23:03 -0000       1.14
> +++ distinfo  19 Nov 2026 10:50:44 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (rsyslog-8.2404.0.tar.gz) = 
> MFKNFA7BsfB5IkCB+jffbgZYf/QrAuPmHy2qBSbFTTM=
> -SIZE (rsyslog-8.2404.0.tar.gz) = 3408657
> +SHA256 (rsyslog-8.2610.0pl20261118-a073c65e.tar.gz) = 
> 7vDb0FZWr3EpLvN9eyCDJoBdKqO6kY+evWn7batx9+I=
> +SIZE (rsyslog-8.2610.0pl20261118-a073c65e.tar.gz) = 14129172
> Index: patches/patch-runtime_net_ossl_c
> ===================================================================
> RCS file: patches/patch-runtime_net_ossl_c
> diff -N patches/patch-runtime_net_ossl_c
> --- patches/patch-runtime_net_ossl_c  1 Aug 2024 14:23:03 -0000       1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,46 +0,0 @@
> -LibreSSL does not support SSL_CONF_cmd.
> -This is already present in rsyslog master and will most likely ship
> -with a future version.
> -https://github.com/rsyslog/rsyslog/commit/b79fd513271bdd02d8a37fa4197d2f293aaf6d11
> -
> -Index: runtime/net_ossl.c
> ---- runtime/net_ossl.c.orig
> -+++ runtime/net_ossl.c
> -@@ -59,7 +59,9 @@ void net_ossl_set_ssl_verify_callback(SSL *pSsl, int f
> - void net_ossl_set_ctx_verify_callback(SSL_CTX *pCtx, int flags);
> - void net_ossl_set_bio_callback(BIO *conn);
> - int net_ossl_verify_callback(int status, X509_STORE_CTX *store);
> -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && 
> !defined(LIBRESSL_VERSION_NUMBER)
> - rsRetVal net_ossl_apply_tlscgfcmd(net_ossl_t *pThis, uchar *tlscfgcmd);
> -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
> - rsRetVal net_ossl_chkpeercertvalidity(net_ossl_t *pThis, SSL *ssl, uchar 
> *fromHostIP);
> - X509* net_ossl_getpeercert(net_ossl_t *pThis, SSL *ssl, uchar *fromHostIP);
> - rsRetVal net_ossl_peerfingerprint(net_ossl_t *pThis, X509* certpeer, uchar 
> *fromHostIP);
> -@@ -472,6 +474,7 @@ void net_ossl_lastOpenSSLErrorMsg
> -     }
> - }
> - 
> -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && 
> !defined(LIBRESSL_VERSION_NUMBER)
> - /* initialize tls config commands in openssl context
> -  */
> - rsRetVal net_ossl_apply_tlscgfcmd(net_ossl_t *pThis, uchar *tlscfgcmd)
> -@@ -557,8 +560,8 @@ rsRetVal net_ossl_apply_tlscgfcmd(net_ossl_t *pThis, u
> - finalize_it:
> -     RETiRet;
> - }
> -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
> - 
> --
> - /* Convert a fingerprint to printable data. The  conversion is carried out
> -  * according IETF I-D syslog-transport-tls-12. The fingerprint string is
> -  * returned in a new cstr object. It is the caller's responsibility to
> -@@ -1195,7 +1198,9 @@ CODESTARTobjQueryInterface(net_ossl)
> -     pIf->osslPeerfingerprint        = net_ossl_peerfingerprint;
> -     pIf->osslGetpeercert            = net_ossl_getpeercert;
> -     pIf->osslChkpeercertvalidity    = net_ossl_chkpeercertvalidity;
> -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && 
> !defined(LIBRESSL_VERSION_NUMBER)
> -     pIf->osslApplyTlscgfcmd         = net_ossl_apply_tlscgfcmd;
> -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
> -     pIf->osslSetBioCallback         = net_ossl_set_bio_callback;
> -     pIf->osslSetCtxVerifyCallback   = net_ossl_set_ctx_verify_callback;
> -     pIf->osslSetSslVerifyCallback   = net_ossl_set_ssl_verify_callback;
> Index: patches/patch-runtime_net_ossl_h
> ===================================================================
> RCS file: patches/patch-runtime_net_ossl_h
> diff -N patches/patch-runtime_net_ossl_h
> --- patches/patch-runtime_net_ossl_h  1 Aug 2024 14:23:03 -0000       1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -LibreSSL does not support SSL_CONF_cmd.
> -This is already present in rsyslog master and will most likely ship
> -with a future version.
> -https://github.com/rsyslog/rsyslog/commit/b79fd513271bdd02d8a37fa4197d2f293aaf6d11
> -
> -Index: runtime/net_ossl.h
> ---- runtime/net_ossl.h.orig
> -+++ runtime/net_ossl.h
> -@@ -88,7 +88,9 @@ BEGINinterface(net_ossl) /* name must also be changed 
> -     rsRetVal (*osslPeerfingerprint)(net_ossl_t *pThis, X509* certpeer, 
> uchar *fromHostIP);
> -     X509* (*osslGetpeercert)(net_ossl_t *pThis, SSL *ssl, uchar 
> *fromHostIP);
> -     rsRetVal (*osslChkpeercertvalidity)(net_ossl_t *pThis, SSL *ssl, uchar 
> *fromHostIP);
> -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && 
> !defined(LIBRESSL_VERSION_NUMBER)
> -     rsRetVal (*osslApplyTlscgfcmd)(net_ossl_t *pThis, uchar *tlscfgcmd);
> -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
> -     void (*osslSetBioCallback)(BIO *conn);
> -     void (*osslSetCtxVerifyCallback)(SSL_CTX *pCtx, int flags);
> -     void (*osslSetSslVerifyCallback)(SSL *pSsl, int flags);
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v
> retrieving revision 1.10
> diff -u -p -r1.10 PLIST-main
> --- pkg/PLIST-main    8 Nov 2022 11:17:12 -0000       1.10
> +++ pkg/PLIST-main    19 Nov 2026 10:50:44 -0000
> @@ -7,6 +7,7 @@ lib/rsyslog/
>  @so lib/rsyslog/imfile.so
>  @so lib/rsyslog/imklog.so
>  @so lib/rsyslog/immark.so
> +@so lib/rsyslog/impstats.so
>  @so lib/rsyslog/imrelp.so
>  @so lib/rsyslog/imtcp.so
>  @so lib/rsyslog/imudp.so
> @@ -22,6 +23,8 @@ lib/rsyslog/
>  @so lib/rsyslog/lmtcpsrv.so
>  @so lib/rsyslog/lmzlibw.so
>  @so lib/rsyslog/mmexternal.so
> +@so lib/rsyslog/mmleefparse.so
> +@so lib/rsyslog/omkinesis.so
>  @so lib/rsyslog/ommail.so
>  @so lib/rsyslog/omrelp.so
>  @so lib/rsyslog/omtesting.so
> 
> --
> Mark Patruck ( mark at wrapped.cx )
> GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74  F644 0D3C F66F F286 5E51
>  
> https://www.wrapped.cx

Reply via email to