summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
-rw-r--r--tests/Makefile.am28
3 files changed, 16 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac
index d8988c20..11fceafc 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.11],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.1.12],[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 58796e34..1184ad5e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
<p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
project goals.</p>
-<p><b>This documentation is for version 6.1.11 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.1.12 (beta branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3f6110db..38d10da6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -103,10 +103,11 @@ TESTS += \
endif
if ENABLE_GNUTLS
-TESTS += \
- sndrcv_tls_anon.sh \
- sndrcv_tls_anon_rebind.sh \
- imtcp-tls-basic.sh
+# TODO: re-enable in newer version
+#TESTS += \
+ #sndrcv_tls_anon.sh \
+ #sndrcv_tls_anon_rebind.sh \
+ #imtcp-tls-basic.sh
if HAVE_VALGRIND
# This test does not work on v5 as we keep DH params
#TESTS += manytcp-too-few-tls.sh
@@ -266,10 +267,6 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/diskqueue-fsync.conf \
imtcp-tls-basic.sh \
testsuites/imtcp-tls-basic.conf \
- tls-certs/ca-key.pem \
- tls-certs/ca.pem \
- tls-certs/cert.pem \
- tls-certs/key.pem \
imtcp-multiport.sh \
testsuites/imtcp-multiport.conf \
udp-msgreduc-orgmsg-vg.sh \
@@ -360,12 +357,6 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
sndrcv_gzip.sh \
testsuites/sndrcv_gzip_sender.conf \
testsuites/sndrcv_gzip_rcvr.conf \
- sndrcv_tls_anon_rebind.sh \
- testsuites/sndrcv_tls_anon_rebind_sender.conf \
- testsuites/sndrcv_tls_anon_rebind_rcvr.conf \
- sndrcv_tls_anon.sh \
- testsuites/sndrcv_tls_anon_sender.conf \
- testsuites/sndrcv_tls_anon_rcvr.conf \
pipeaction.sh \
testsuites/pipeaction.conf \
pipe_noreader.sh \
@@ -465,6 +456,15 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/mysql-asyn.conf \
cfg.sh
+# TODO: re-enable
+#sndrcv_tls_anon_rebind.sh \
+#testsuites/sndrcv_tls_anon_rebind_sender.conf \
+#testsuites/sndrcv_tls_anon_rebind_rcvr.conf \
+#sndrcv_tls_anon.sh \
+#testsuites/sndrcv_tls_anon_sender.conf \
+#testsuites/sndrcv_tls_anon_rcvr.conf \
+#
+
ourtail_SOURCES = ourtail.c
msleep_SOURCES = msleep.c
chkseq_SOURCES = chkseq.c