diff options
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch new file mode 100644 index 0000000000..c858f32b9e --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/enable_tls_ptests.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Enable tls ptest | ||
2 | |||
3 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | ||
4 | Upstream-Status: Pending | ||
5 | |||
6 | --- rsyslog-7.4.4/tests/Makefile.am.orig 2013-08-30 18:30:41.000000000 +0200 | ||
7 | +++ rsyslog-7.4.4/tests/Makefile.am 2015-10-01 09:38:45.176289031 +0200 | ||
8 | @@ -118,15 +118,13 @@ | ||
9 | endif | ||
10 | |||
11 | if ENABLE_GNUTLS | ||
12 | -# TODO: re-enable in newer version | ||
13 | -#TESTS += \ | ||
14 | - #sndrcv_tls_anon.sh \ | ||
15 | - #sndrcv_tls_anon_rebind.sh \ | ||
16 | - #imtcp-tls-basic.sh | ||
17 | +TESTS += \ | ||
18 | + imtcp-tls-basic.sh \ | ||
19 | + imtcp_conndrop_tls.sh | ||
20 | if HAVE_VALGRIND | ||
21 | TESTS += imtcp-tls-basic-vg.sh \ | ||
22 | - imtcp_conndrop_tls-vg.sh | ||
23 | - manytcp-too-few-tls-vg.sh | ||
24 | + imtcp_conndrop_tls-vg.sh \ | ||
25 | + manytcp-too-few-tls.sh | ||
26 | endif | ||
27 | endif | ||
28 | |||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb index 928434eb74..0f6b6cfe7e 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb | |||
@@ -27,6 +27,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t | |||
27 | file://json-0.12-fix.patch \ | 27 | file://json-0.12-fix.patch \ |
28 | file://replace_deprecated_GnuTLS_functions.patch \ | 28 | file://replace_deprecated_GnuTLS_functions.patch \ |
29 | file://use_gnutls_certificate_type_set_priority_only_if_available.patch \ | 29 | file://use_gnutls_certificate_type_set_priority_only_if_available.patch \ |
30 | file://enable_tls_ptests.patch \ | ||
30 | " | 31 | " |
31 | 32 | ||
32 | SRC_URI[md5sum] = "093c462a5245012bd9e7b82dd8aedffb" | 33 | SRC_URI[md5sum] = "093c462a5245012bd9e7b82dd8aedffb" |