Re: [update] rsyslog 8.33.1
On Sun, 11 Mar 2018 10:56:14 +0100, Remi Locherer
wrote:
> > > With that added (unless you think it's wrong), ok danj@
> > >
> >
> > That is wrong, the elasticsearch package does not provide a library
> > so a LIB_DEPENDS dependency would just be stripped ("not needed
> > for" message).
>
> Exactly. The module omelasticsearch.so talks http with ES and for
> that it links to libcurl and libnghttp2.
Indeed, so ok danj@
Re: [update] rsyslog 8.33.1
On 2018/03/11 10:56, Remi Locherer wrote:
> On Sun, Mar 11, 2018 at 09:07:03AM +, Stuart Henderson wrote:
> > On 2018/03/10 22:11, Daniel Jakots wrote:
> > > On Thu, 8 Mar 2018 22:18:01 +0100, Remi Locherer
> > > wrote:
> > >
> > > > +RUN_DEPENDS-elasticsearch =${PKGNAME-main}:${PKGPATH},-main
> > >
> > > > + --enable-elasticsearch \
> > >
> > > You added a subpackage for ES but shouldn't we have a ldep on
> > > elasticsearch as it is with mysql/mariadb?
> > >
> > > With that added (unless you think it's wrong), ok danj@
> > >
> >
> > That is wrong, the elasticsearch package does not provide a library so
> > a LIB_DEPENDS dependency would just be stripped ("not needed for" message).
> >
>
> Exactly. The module omelasticsearch.so talks http with ES and for that it
> links to libcurl and libnghttp2.
>
> > Since there is no extra dependency for this (I guess it just talks http),
> > I'd probably roll it into the main package, though having it as a separate
> > package is ok too.
>
> If it's preferable I can remove the subpackage and move the module to the
> main package. I made it a subpackage because the other db output modules
> are. One advantage of it being a subpackage might be that its easier to
> find this functionality for an admin. But I don't have a strong opinion
> on this.
Really I'm ok with it either way, that's exactly the reason for having it
separate. If I was writing the port myself I'd roll it in, but totally
happy with it separate.
I think you should go ahead and commit, ok sthen@.
Re: [update] rsyslog 8.33.1
On Sun, Mar 11, 2018 at 09:07:03AM +, Stuart Henderson wrote:
> On 2018/03/10 22:11, Daniel Jakots wrote:
> > On Thu, 8 Mar 2018 22:18:01 +0100, Remi Locherer
> > wrote:
> >
> > > +RUN_DEPENDS-elasticsearch = ${PKGNAME-main}:${PKGPATH},-main
> >
> > > + --enable-elasticsearch \
> >
> > You added a subpackage for ES but shouldn't we have a ldep on
> > elasticsearch as it is with mysql/mariadb?
> >
> > With that added (unless you think it's wrong), ok danj@
> >
>
> That is wrong, the elasticsearch package does not provide a library so
> a LIB_DEPENDS dependency would just be stripped ("not needed for" message).
>
Exactly. The module omelasticsearch.so talks http with ES and for that it
links to libcurl and libnghttp2.
> Since there is no extra dependency for this (I guess it just talks http),
> I'd probably roll it into the main package, though having it as a separate
> package is ok too.
If it's preferable I can remove the subpackage and move the module to the
main package. I made it a subpackage because the other db output modules
are. One advantage of it being a subpackage might be that its easier to
find this functionality for an admin. But I don't have a strong opinion
on this.
Re: [update] rsyslog 8.33.1
On 2018/03/10 22:11, Daniel Jakots wrote:
> On Thu, 8 Mar 2018 22:18:01 +0100, Remi Locherer
> wrote:
>
> > +RUN_DEPENDS-elasticsearch =${PKGNAME-main}:${PKGPATH},-main
>
> > + --enable-elasticsearch \
>
> You added a subpackage for ES but shouldn't we have a ldep on
> elasticsearch as it is with mysql/mariadb?
>
> With that added (unless you think it's wrong), ok danj@
>
That is wrong, the elasticsearch package does not provide a library so
a LIB_DEPENDS dependency would just be stripped ("not needed for" message).
Since there is no extra dependency for this (I guess it just talks http),
I'd probably roll it into the main package, though having it as a separate
package is ok too.
Re: [update] rsyslog 8.33.1
On Thu, 8 Mar 2018 22:18:01 +0100, Remi Locherer
wrote:
> +RUN_DEPENDS-elasticsearch = ${PKGNAME-main}:${PKGPATH},-main
> + --enable-elasticsearch \
You added a subpackage for ES but shouldn't we have a ldep on
elasticsearch as it is with mysql/mariadb?
With that added (unless you think it's wrong), ok danj@
Re: [update] rsyslog 8.33.1
On Tue, Mar 06, 2018 at 08:47:25PM -0500, Daniel Jakots wrote:
> On Tue, 6 Mar 2018 23:45:50 +0100, Remi Locherer
> wrote:
>
> > > > This updates rsyslogd to the current version and adds two new
> > > > modules.
>
> /usr/ports/sysutils/rsyslog$ make lib-depends-check
>
> rsyslog-8.33.1(sysutils/rsyslog,-main):
> Missing: crypto.42 (/usr/local/sbin/rsyslogd) (system lib)
> Missing: iconv.6 from libiconv-1.14p3 (/usr/local/lib/rsyslog/omrelp.so)
[..]
> Scanning: ok
> *** Error 1 in /usr/ports/sysutils/rsyslog
> (/usr/ports/infrastructure/mk/bsd.port.mk:2234 'lib-depends-check')
>
Thank you for spotting this. Fixed diff below. Also including stehn@'s
suggestion to add the required version for the librelp dependency.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile18 Feb 2018 14:36:30 - 1.39
+++ Makefile8 Mar 2018 00:27:06 -
@@ -4,44 +4,55 @@ 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
+
# 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 +=unistring uuid z
+WANTLIB-main +=c crypto curl estr fastjson ffi gcrypt gmp gnutls
+WANTLIB-main +=gpg-error hogweed iconv idn2 intl nettle nghttp2
+WANTLIB-main +=p11-kit pthread relp ssl tasn1 unistring uuid z
WANTLIB-mysql += crypto m mysqlclient pthread ssl ${COMPILER_LIBCXX} z
-WANTLIB-pgsql += crypto pq ssl
+WANTLIB-normalize += estr fastjson lognorm pthread
+
+WANTLIB-pgsql += crypto pq pthread ssl
-LIB_DEPENDS-main = devel/json-c \
- devel/libestr>=0.1.2 \
+WANTLIB-elasticsearch += crypto curl m nghttp2 pthread ssl z
+
+LIB_DEPENDS-main = devel/libfastjson \
+ devel/libestr \
+ net/curl \
security/libgcrypt \
security/gnutls \
- sysutils/librelp>=1.2.9
+ sysutils/librelp>=1.2.14
# 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-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 +62,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 +78,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
Index: distinfo
===
RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo15 Mar 2016 23:25:51 - 1.4
+++ distinfo6 Mar 2018 21:54:05 -
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.16.0.tar.gz) = T+T5fBCJkIbZi5QB1+jSvP9hx8P3zehieJHjb8bsG3Y=
-SIZE
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 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 - 1.39
> +++ Makefile 6 Mar 2018 21:53:56 -
> @@ -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
> +
> # 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_F
Re: [update] rsyslog 8.33.1
On Tue, 6 Mar 2018 23:45:50 +0100, Remi Locherer wrote: > > > This updates rsyslogd to the current version and adds two new > > > modules. /usr/ports/sysutils/rsyslog$ make lib-depends-check rsyslog-8.33.1(sysutils/rsyslog,-main): Missing: crypto.42 (/usr/local/sbin/rsyslogd) (system lib) Missing: iconv.6 from libiconv-1.14p3 (/usr/local/lib/rsyslog/omrelp.so) Missing: intl.6 from gettext-0.19.8.1p1 (/usr/local/lib/rsyslog/omrelp.so) Missing: nghttp2.0 from nghttp2-1.31.0 (/usr/local/sbin/rsyslogd) Missing: ssl.44 (/usr/local/sbin/rsyslogd) (system lib) WANTLIB += crypto iconv intl nghttp2 ssl rsyslog-normalize-8.33.1(sysutils/rsyslog,-normalize): Missing: estr.0 from libestr-0.1.10p0 (/usr/local/lib/rsyslog/mmnormalize.so) Missing: fastjson.0 from libfastjson-0.99.8 (/usr/local/lib/rsyslog/mmnormalize.so) Missing: pthread.25 (/usr/local/lib/rsyslog/mmnormalize.so) (system lib) WANTLIB += estr fastjson pthread rsyslog-pgsql-8.33.1(sysutils/rsyslog,-pgsql): Missing: pthread.25 (/usr/local/lib/rsyslog/ompgsql.so) (system lib) WANTLIB += pthread rsyslog-elasticsearch-8.33.1(sysutils/rsyslog,-elasticsearch): Missing: crypto.42 (/usr/local/lib/rsyslog/omelasticsearch.so) (system lib) Missing: curl.25 from curl-7.58.0p0 (/usr/local/lib/rsyslog/omelasticsearch.so) Missing: m.10 (/usr/local/lib/rsyslog/omelasticsearch.so) (system lib) Missing: nghttp2.0 from nghttp2-1.31.0 (/usr/local/lib/rsyslog/omelasticsearch.so) Missing: pthread.25 (/usr/local/lib/rsyslog/omelasticsearch.so) (system lib) Missing: ssl.44 (/usr/local/lib/rsyslog/omelasticsearch.so) (system lib) Missing: z.5 (/usr/local/lib/rsyslog/omelasticsearch.so) (system lib) WANTLIB += crypto curl m nghttp2 pthread ssl z Scanning: ok *** Error 1 in /usr/ports/sysutils/rsyslog (/usr/ports/infrastructure/mk/bsd.port.mk:2234 'lib-depends-check') other than that, seems fine > > > The "CFLAGS += -march=i686" seems not to be needed anymore for > > > i386. I guess because clang is now used. I don't know about that but since other didn't say anything, I guess it's fine
Re: [update] rsyslog 8.33.1
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.
> >
> > I looked into upstreaming the remaining patch but that is not necessary.
> > The next version of rsyslog will include 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.
>
> 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
--- Makefile18 Feb 2018 14:36:30 - 1.39
+++ Makefile6 Mar 2018 21:53:56 -
@@ -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
+
# 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
-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
Index: disti
