Merge branch 'beta'v6.3.5

Conflicts:
	configure.ac
	doc/manual.html
	tests/Makefile.am

1 files changed, 14 insertions, 15 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d0c056ad..9893afab 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -104,11 +104,11 @@ TESTS +=  \
 endif
 
 if ENABLE_GNUTLS
-TESTS +=  \
-	sndrcv_tls_anon.sh \
-	sndrcv_tls_anon_rebind.sh \
-	imtcp-tls-basic.sh \
-	imtcp_conndrop_tls.sh 
+# TODO: re-enable in newer version
+#TESTS +=  \
+	#sndrcv_tls_anon.sh \
+	#sndrcv_tls_anon_rebind.sh \
+	#imtcp-tls-basic.sh
 if HAVE_VALGRIND
 TESTS += imtcp-tls-basic-vg.sh \
 	 imtcp_conndrop_tls-vg.sh 
@@ -270,10 +270,6 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 	   imtcp-tls-basic.sh \
 	   imtcp-tls-basic-vg.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 \
@@ -369,12 +365,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 \
@@ -474,6 +464,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