Re: [update] rsyslog 8.33.1

On 2018/03/06 23:45, Remi Locherer wrote:
> On Tue, Mar 06, 2018 at 10:43:46PM +0100, Remi Locherer wrote:
> > On Thu, Feb 08, 2018 at 03:17:46PM +0100, Remi Locherer wrote:
> > > Hi,
> > >
> > > This updates rsyslogd to the current version and adds two new modules.
> > > It needs the updated librelp that I sent earlier.

Since this was quite a recent update, it probably makes sense to use
sysutils/librelp>=1.2.14 in LIB_DEPENDS for this.

> > > I looked into upstreaming the remaining patch but that is not necessary.
> > > The next version of rsyslog will include <sys/wait.h> for all platforms.
> > >
> > > I tested it on i386 (imudp + omrelp) and on amd64 (imrelp, ommysql,
> > > omelasticsearch).
> > >
> > > The "CFLAGS += -march=i686" seems not to be needed anymore for i386.
> > > I guess because clang is now used.

If it builds on i386 without this, then that's alright.

> > In the meantime rsyslog 8.33.0 was released. Updated diff below.
>
> Few hours ago 8.33.1 was released. In the changelog they say:
> - 8.33.0 tarball release was actually pre-8.33.0
>
> Everything that I tested with 8.32.0 is still ok.
>
> OK?
>
> Remi
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
> retrieving revision 1.39
> diff -u -p -r1.39 Makefile
> --- Makefile 18 Feb 2018 14:36:30 -0000 1.39
> +++ Makefile 6 Mar 2018 21:53:56 -0000
> @@ -4,44 +4,53 @@ BROKEN-powerpc = 64-bit atomics (__sync_
>
> COMMENT-main = syslog daemon supporting databases, TCP, SSL, RELP
> COMMENT-mysql = MySQL plugin for rsyslog
> +COMMENT-normalize = liblognorm plugin for rsyslog
> COMMENT-pgsql = PostgreSQL plugin for rsyslog
> +COMMENT-elasticsearch = Elasticsearch plugin for rsyslog
>
> -MULTI_PACKAGES = -main -mysql -pgsql
> +MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch
>
> -V = 8.16.0
> +V = 8.33.1
> 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
> CATEGORIES = sysutils
> -REVISION-main = 4
> -REVISION-mysql = 1
> -REVISION-pgsql = 1
>
> HOMEPAGE = http://www.rsyslog.com/
>
> +MAINTAINER = Remi Locherer <remi@openbsd.org>
> +
> # GPLv3+
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB-main += c estr ffi gcrypt gmp gnutls gpg-error hogweed iconv
> -WANTLIB-main += idn2 intl json-c nettle p11-kit pthread relp tasn1
> +WANTLIB-main += c curl estr fastjson ffi gcrypt gmp gnutls gpg-error
> +WANTLIB-main += hogweed idn2 nettle p11-kit pthread relp tasn1
> WANTLIB-main += unistring uuid z
>
> WANTLIB-mysql += crypto m mysqlclient pthread ssl ${COMPILER_LIBCXX} z
>
> +WANTLIB-normalize += lognorm
> +
> WANTLIB-pgsql += crypto pq ssl

the WANTLIB block should be:

WANTLIB-main += c crypto curl estr fastjson ffi gcrypt gmp gnutls gpg-error
WANTLIB-main += hogweed iconv idn2 intl nettle nghttp2 p11-kit pthread
WANTLIB-main += relp ssl tasn1 unistring uuid z

WANTLIB-mysql += ${COMPILER_LIBCXX} crypto m mysqlclient ssl z

WANTLIB-normalize += estr fastjson lognorm pthread

WANTLIB-pgsql += crypto pq pthread ssl

WANTLIB-elasticsearch += crypto m pthread ssl z

> -LIB_DEPENDS-main = devel/json-c \
> - devel/libestr>=0.1.2 \
> - security/libgcrypt \
> - security/gnutls \
> - sysutils/librelp>=1.2.9
> +LIB_DEPENDS-main = devel/libfastjson \
> + devel/libestr \
> + net/curl \
> + security/libgcrypt \
> + security/gnutls \
> + sysutils/librelp
> # XXX should port to using libc UUID functions
> -LIB_DEPENDS-main += sysutils/e2fsprogs
> -LIB_DEPENDS-mysql = databases/mariadb
> -RUN_DEPENDS-mysql = ${PKGNAME-main}:${PKGPATH},-main
> -LIB_DEPENDS-pgsql = databases/postgresql
> -RUN_DEPENDS-pgsql = ${PKGNAME-main}:${PKGPATH},-main
> +LIB_DEPENDS-main += sysutils/e2fsprogs
> +LIB_DEPENDS-mysql = databases/mariadb
> +RUN_DEPENDS-mysql = ${PKGNAME-main}:${PKGPATH},-main
> +LIB_DEPENDS-normalize = devel/liblognorm
> +RUN_DEPENDS-normalize = ${PKGNAME-main}:${PKGPATH},-main
> +LIB_DEPENDS-pgsql = databases/postgresql
> +RUN_DEPENDS-pgsql = ${PKGNAME-main}:${PKGPATH},-main
> +RUN_DEPENDS-elasticsearch = ${PKGNAME-main}:${PKGPATH},-main
>
> MASTER_SITES = http://www.rsyslog.com/files/download/rsyslog/ \
> http://download.rsyslog.com/rsyslog/
> @@ -51,8 +60,10 @@ LIBTOOL_FLAGS = --tag=disable-static
> CONFIGURE_ARGS += --enable-pgsql \
> --enable-mysql \
> --enable-mail \
> + --enable-mmnormalize \
> --enable-gnutls \
> --enable-relp \
> + --enable-elasticsearch \
> --disable-liblogging-stdlog
> CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include"
>
> @@ -65,10 +76,5 @@ post-install:
> ${PREFIX}/share/examples/rsyslog/createDB_mysql.sql
> ${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql \
> ${PREFIX}/share/examples/rsyslog/createDB_pgsql.sql
> -
> -.if ${MACHINE_ARCH:Mi386}
> -# 64-bit atomics
> -CFLAGS += -march=i686
> -.endif
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 15 Mar 2016 23:25:51 -0000 1.4
> +++ distinfo 6 Mar 2018 21:54:05 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (rsyslog-8.16.0.tar.gz) = T+T5fBCJkIbZi5QB1+jSvP9hx8P3zehieJHjb8bsG3Y=
> -SIZE (rsyslog-8.16.0.tar.gz) = 2132012
> +SHA256 (rsyslog-8.33.1.tar.gz) = LaK9dz29X95OsWLVQR2slr9ZazPmKkBiYQRDaGWX46g=
> +SIZE (rsyslog-8.33.1.tar.gz) = 2494338
> Index: files/rsyslog.conf
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/files/rsyslog.conf,v
> retrieving revision 1.1
> diff -u -p -r1.1 rsyslog.conf
> --- files/rsyslog.conf 15 Mar 2016 23:25:51 -0000 1.1
> +++ files/rsyslog.conf 26 Feb 2018 22:43:08 -0000
> @@ -6,14 +6,14 @@
> # like we have with the default config. For more advanced
> # things, RainerScript configuration is suggested.
> #
> -# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
> -# or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html
> +# For more information see http://www.rsyslog.com/doc/rsyslog_conf.html
> # If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
>
> #### MODULES ####
>
> module(load="imuxsock") # provides support for local system logging (e.g. via logger command)
> -module(load="imklog") # provides kernel logging support (previously done by rklogd)
> +# on OpenBSD sendsyslog(2) is used for logging - imklog will not receive logs
> +#module(load="imklog") # provides kernel logging support (previously done by rklogd)
> #module(load"immark") # provides --MARK-- message capability
>
> # Provides UDP syslog reception
> @@ -39,6 +39,10 @@ $ActionFileDefaultTemplate RSYSLOG_Tradi
> # Include all config files in /etc/rsyslog.d/
> $IncludeConfig ${SYSCONFDIR}/rsyslog.d/*.conf
>
> +# Drop root privileges
> +# See http://wiki.rsyslog.com/index.php/Security#Dropping_Privileges
> +$PrivDropToUser _rsyslogd
> +$PrivDropToGroup _rsyslogd
>
> #### RULES ####
>
> Index: patches/patch-grammar_lexer_l
> ===================================================================
> RCS file: patches/patch-grammar_lexer_l
> diff -N patches/patch-grammar_lexer_l
> --- patches/patch-grammar_lexer_l 15 Mar 2016 23:25:51 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-grammar_lexer_l,v 1.1 2016/03/15 23:25:51 sthen Exp $
> ---- grammar/lexer.l.orig Thu Mar 3 13:18:38 2016
> -+++ grammar/lexer.l Thu Mar 3 13:18:52 2016
> -@@ -97,7 +97,7 @@ extern int yydebug;
> - /* somehow, I need these prototype even though the headers are
> - * included. I guess that's some autotools magic I don't understand...
> - */
> --#if !defined(__FreeBSD__)
> -+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
> - int fileno(FILE *stream);
> -