From 715b9fe052f5a7c622a1f71f905461e06e398de8 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Sat, 21 May 2011 04:18:51 +0200 Subject: preparing for 6.1.8 release --- ChangeLog | 6 ++++++ Makefile.am | 1 + configure.ac | 2 +- doc/manual.html | 2 +- tests/Makefile.am | 6 ++++++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e02890d..45ed6501 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ --------------------------------------------------------------------------- +Version 6.1.8 [BETA] (rgerhards), 2011-05-20 +- official new beta version (note that in a sense 6.1.7 was already beta, + so we may release the first stable v6 earlier than usual) +- new module mmsnmptrapd, a sample message modification module +- import of minor bug fixes from v4 & v5 +--------------------------------------------------------------------------- Version 6.1.7 [DEVEL] (rgerhards), 2011-04-15 - added log classification capabilities (via mmnormalize & tags) - speeded up tcp forwarding by reducing number of API calls diff --git a/Makefile.am b/Makefile.am index 037ad88c..d689b9ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -224,6 +224,7 @@ SUBDIRS += tests # in a make distcheck is so that we detect code that accidently was not updated # when some global update happened. DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ + --enable-gnutls \ --enable-imfile \ --enable-snmp \ --enable-pgsql \ diff --git a/configure.ac b/configure.ac index 5d00737f..f6a09fa7 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[6.1.7],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[6.1.8],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/doc/manual.html b/doc/manual.html index c725a412..798680ba 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support available directly from the source!

Please visit the rsyslog sponsor's page to honor the project sponsors or become one yourself! We are very grateful for any help towards the project goals.

-

This documentation is for version 6.1.7 (devel branch) of rsyslog. +

This documentation is for version 6.1.8 (devel branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might diff --git a/tests/Makefile.am b/tests/Makefile.am index c3dfac55..6272c0dd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -155,6 +155,12 @@ test_files = testbench.h runtime-dummy.c EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ validation-run.sh \ + testsuites/x.509/ca.pem \ + testsuites/x.509/ca-key.pem \ + testsuites/x.509/client-cert.pem \ + testsuites/x.509/client-key.pem \ + testsuites/x.509/machine-cert.pem \ + testsuites/x.509/machine-key.pem \ testsuites/invalid.conf \ testsuites/valid.conf \ cfg.sh \ -- cgit v1.2.3