From adf7ed201f081660716b56d8223f0b1a6c6a4b88 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 7 Dec 2012 15:29:51 +0100 Subject: build: fix uuid configure check --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index e1f7b37d..3d8bbfeb 100644 --- a/configure.ac +++ b/configure.ac @@ -711,13 +711,13 @@ AC_SUBST(SNMP_LIBS) AC_ARG_ENABLE(uuid, [AS_HELP_STRING([--enable-uuid],[Enable support for uuid generation @<:@default=yes@:>@])], [case "${enableval}" in - yes) enable_elasticsearch="yes" ;; - no) enable_elasticsearch="no" ;; + yes) enable_uuid="yes" ;; + no) enable_uuid="no" ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-uuid) ;; esac], [enable_uuid=yes] ) -if test "x$enable_elasticsearch" = "xyes"; then +if test "x$enable_uuid" = "xyes"; then PKG_CHECK_MODULES([LIBUUID], [uuid]) AC_DEFINE(USE_LIBUUID, 1, [Define if you want to enable libuuid support]) fi -- cgit v1.2.3 From a7dfc4bb93069c8ac3583273c7a0ba1864aa5ffd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 7 Dec 2012 15:38:40 +0100 Subject: build: drop obsolete --enable-pthreads configure switch Building without pthreads support hasn't been support for a while. --- configure.ac | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 3d8bbfeb..d4ff50c4 100644 --- a/configure.ac +++ b/configure.ac @@ -243,22 +243,7 @@ AM_CONDITIONAL(ENABLE_GSSAPI, test x$enable_gssapi_krb5 = xyes) # multithreading via pthreads -AC_ARG_ENABLE(pthreads, - [AS_HELP_STRING([--enable-pthreads],[Enable multithreading via pthreads @<:@default=yes@:>@])], - [case "${enableval}" in - yes) enable_pthreads="yes" ;; - no) enable_pthreads="no" ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-pthreads) ;; - esac], - [enable_pthreads=yes] -) - -if test "x$enable_pthreads" = "xno"; then - AC_MSG_ERROR(rsyslog v3+ does no longer support single threading mode -- use a previous version for that); -fi - -if test "x$enable_pthreads" != "xno"; then - AC_CHECK_HEADERS( +AC_CHECK_HEADERS( [pthread.h], [ AC_CHECK_LIB( @@ -279,8 +264,7 @@ if test "x$enable_pthreads" != "xno"; then ) ], [AC_MSG_FAILURE([pthread is missing])] - ) -fi +) AC_CHECK_FUNCS( [pthread_setschedparam], -- cgit v1.2.3 From 2ab69c601923374f3d0ecb51e3f8a021d2d7e519 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 13 Dec 2012 16:02:22 +0100 Subject: build: link omelasticsearch against -lm Use LT_LIB_M to find the math library which is needed for pow(). --- configure.ac | 1 + plugins/omelasticsearch/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d4ff50c4..70e89d4d 100644 --- a/configure.ac +++ b/configure.ac @@ -720,6 +720,7 @@ AC_ARG_ENABLE(elasticsearch, ) if test "x$enable_elasticsearch" = "xyes"; then PKG_CHECK_MODULES([CURL], [libcurl]) + LT_LIB_M fi AM_CONDITIONAL(ENABLE_ELASTICSEARCH, test x$enable_elasticsearch = xyes) diff --git a/plugins/omelasticsearch/Makefile.am b/plugins/omelasticsearch/Makefile.am index a574c72f..2fadb74d 100644 --- a/plugins/omelasticsearch/Makefile.am +++ b/plugins/omelasticsearch/Makefile.am @@ -3,6 +3,6 @@ pkglib_LTLIBRARIES = omelasticsearch.la omelasticsearch_la_SOURCES = omelasticsearch.c omelasticsearch_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) omelasticsearch_la_LDFLAGS = -module -avoid-version -omelasticsearch_la_LIBADD = $(CURL_LIBS) +omelasticsearch_la_LIBADD = $(CURL_LIBS) $(LIBM) EXTRA_DIST = -- cgit v1.2.3 From 153998322ba0ae970586658c0f89e6123f891e00 Mon Sep 17 00:00:00 2001 From: Scott Severtson Date: Thu, 13 Dec 2012 18:22:38 +0100 Subject: bugfix: invalid DST handling under Solaris --- ChangeLog | 2 ++ runtime/datetime.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1b9fb6c9..938e8793 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,8 @@ Version 5.10.2 [V5-STABLE], 201?-??-?? ... actually, they are microseconds. So the fractional part of the timestamp was not properly formatted. Thanks to Marius Tomaschewski for the bug report and the patch idea. +- bugfix: invalid DST handling under Solaris + Thanks to Scott Severtson for the patch. --------------------------------------------------------------------------- Version 5.10.1 [V5-STABLE], 2012-10-17 - bugfix: imuxsock and imklog truncated head of received message diff --git a/runtime/datetime.c b/runtime/datetime.c index 85cbab84..43346945 100644 --- a/runtime/datetime.c +++ b/runtime/datetime.c @@ -78,7 +78,7 @@ timeval2syslogTime(struct timeval *tp, struct syslogTime *t) /* Solaris uses a different method of exporting the time zone. * It is UTC - localtime, which is the opposite sign of mins east of GMT. */ - lBias = -(daylight ? altzone : timezone); + lBias = -(tm->tm_isdst ? altzone : timezone); # elif defined(__hpux) lBias = tz.tz_dsttime ? - tz.tz_minuteswest : 0; # else -- cgit v1.2.3 From 93457e4035f9ba9a45721086ffaf54c75c278744 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 13 Dec 2012 18:26:33 +0100 Subject: doc: mention recent patches in ChangeLog --- ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0bebf4f2..6114dee3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ ---------------------------------------------------------------------------- +Version 7.2.5 [v7-stable] 2013-01-?? +- build system cleanup (thanks to Michael Biebl for this!) +- bugfix: omelasticsearch did not properly compile on some platforms + due to missing libmath. Thanks to Michael Biebl for the fix +- bugfix: invalid DST handling under Solaris + Thanks to Scott Severtson for the patch. +---------------------------------------------------------------------------- Version 7.2.4 [v7-stable] 2012-12-07 - enhance: permit RFC3339 timestamp in local log socket messages Thanks to Sebastien Ponce for the patch. -- cgit v1.2.3