1 |
commit: 17f054092e2c596c5d631345dff4cf1c1c51a374 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 29 12:25:31 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 29 15:21:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f05409 |
7 |
|
8 |
app-admin/rsyslog: fix tests |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
...004.0-skip-librelp-openssl-specific-tests.patch | 106 +++++++++++++++++++++ |
14 |
app-admin/rsyslog/rsyslog-8.2004.0.ebuild | 2 + |
15 |
2 files changed, 108 insertions(+) |
16 |
|
17 |
diff --git a/app-admin/rsyslog/files/rsyslog-8.2004.0-skip-librelp-openssl-specific-tests.patch b/app-admin/rsyslog/files/rsyslog-8.2004.0-skip-librelp-openssl-specific-tests.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..bc047a41a1e |
20 |
--- /dev/null |
21 |
+++ b/app-admin/rsyslog/files/rsyslog-8.2004.0-skip-librelp-openssl-specific-tests.patch |
22 |
@@ -0,0 +1,106 @@ |
23 |
+From 15f5a1bda22bc4586e7ad8d24222befd1933a822 Mon Sep 17 00:00:00 2001 |
24 |
+From: Andre lorbach <alorbach@×××××××.com> |
25 |
+Date: Wed, 29 Apr 2020 09:24:10 +0200 |
26 |
+Subject: [PATCH] SKIP librelp tlscmd tests if librelp was build without |
27 |
+ openssl support |
28 |
+ |
29 |
+closes https://github.com/rsyslog/rsyslog/issues/4131 |
30 |
+--- |
31 |
+ tests/imrelp-tls-cfgcmd.sh | 23 ++++++++++++----------- |
32 |
+ tests/sndrcv_relp_tls-cfgcmd.sh | 25 +++++++++++++------------ |
33 |
+ 2 files changed, 25 insertions(+), 23 deletions(-) |
34 |
+ |
35 |
+diff --git a/tests/imrelp-tls-cfgcmd.sh b/tests/imrelp-tls-cfgcmd.sh |
36 |
+index bbd63c9cd3..bb1af4ec91 100755 |
37 |
+--- a/tests/imrelp-tls-cfgcmd.sh |
38 |
++++ b/tests/imrelp-tls-cfgcmd.sh |
39 |
+@@ -1,6 +1,7 @@ |
40 |
+ #!/bin/bash |
41 |
+ # addd 2019-11-14 by alorbach, released under ASL 2.0 |
42 |
+ . ${srcdir:=.}/diag.sh init |
43 |
++require_relpEngineSetTLSLibByName |
44 |
+ export NUMMESSAGES=1000 |
45 |
+ export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout" |
46 |
+ export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.receiver.debuglog" |
47 |
+@@ -27,21 +28,21 @@ tcpflood --check-only -k "Protocol=-ALL,TLSv1.2" -u "openssl" -Trelp-tls -acertv |
48 |
+ shutdown_when_empty |
49 |
+ wait_shutdown |
50 |
+ |
51 |
+-content_check --check-only "parameter tls.tlslib ignored" ${RSYSLOG_DEBUGLOG} |
52 |
++content_check --check-only "relpTcpTLSSetPrio_gtls" ${RSYSLOG_DEBUGLOG} |
53 |
+ ret=$? |
54 |
+ if [ $ret == 0 ]; then |
55 |
+- echo "SKIP: Parameter tls.tlslib not supported" |
56 |
++ echo "SKIP: LIBRELP was build without OPENSSL Support" |
57 |
++ skip_test |
58 |
++fi |
59 |
++ |
60 |
++content_check --check-only "OpenSSL Version too old" ${RSYSLOG_DEBUGLOG} |
61 |
++ret=$? |
62 |
++if [ $ret == 0 ]; then |
63 |
++ echo "SKIP: OpenSSL Version too old" |
64 |
+ skip_test |
65 |
+ else |
66 |
+- content_check --check-only "OpenSSL Version too old" ${RSYSLOG_DEBUGLOG} |
67 |
+- ret=$? |
68 |
+- if [ $ret == 0 ]; then |
69 |
+- echo "SKIP: OpenSSL Version too old" |
70 |
+- skip_test |
71 |
+- else |
72 |
+- # Kindly check for a failed session |
73 |
+- content_check "relp connect failed with return 10031" ${RSYSLOG_DYNNAME}.tcpflood |
74 |
+- fi |
75 |
++ # Kindly check for a failed session |
76 |
++ content_check "relp connect failed with return 10031" ${RSYSLOG_DYNNAME}.tcpflood |
77 |
+ fi |
78 |
+ |
79 |
+ exit_test |
80 |
+\ No newline at end of file |
81 |
+diff --git a/tests/sndrcv_relp_tls-cfgcmd.sh b/tests/sndrcv_relp_tls-cfgcmd.sh |
82 |
+index ff7b3bb75c..57e0f720f0 100755 |
83 |
+--- a/tests/sndrcv_relp_tls-cfgcmd.sh |
84 |
++++ b/tests/sndrcv_relp_tls-cfgcmd.sh |
85 |
+@@ -1,6 +1,7 @@ |
86 |
+ #!/bin/bash |
87 |
+ # added 2019-11-13 by alorbach |
88 |
+ . ${srcdir:=.}/diag.sh init |
89 |
++require_relpEngineSetTLSLibByName |
90 |
+ export PORT_RCVR="$(get_free_port)" |
91 |
+ export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout" |
92 |
+ export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.receiver.debuglog" |
93 |
+@@ -40,22 +41,22 @@ wait_shutdown 2 |
94 |
+ shutdown_when_empty |
95 |
+ wait_shutdown |
96 |
+ |
97 |
+-content_check --check-only "parameter tls.tlslib ignored" ${RSYSLOG_DEBUGLOG} |
98 |
++content_check --check-only "relpTcpConnectTLSInit_gnutls" ${RSYSLOG_DEBUGLOG} |
99 |
+ ret=$? |
100 |
+ if [ $ret == 0 ]; then |
101 |
+- echo "SKIP: Parameter tls.tlslib not supported" |
102 |
++ echo "SKIP: LIBRELP was build without OPENSSL Support" |
103 |
++ skip_test |
104 |
++fi |
105 |
++ |
106 |
++content_check --check-only "OpenSSL Version too old" $RSYSLOG_DEBUGLOG |
107 |
++ret=$? |
108 |
++if [ $ret == 0 ]; then |
109 |
++ echo "SKIP: OpenSSL Version too old" |
110 |
+ skip_test |
111 |
+ else |
112 |
+- content_check --check-only "OpenSSL Version too old" $RSYSLOG_DEBUGLOG |
113 |
+- ret=$? |
114 |
+- if [ $ret == 0 ]; then |
115 |
+- echo "SKIP: OpenSSL Version too old" |
116 |
+- skip_test |
117 |
+- else |
118 |
+- # Kindly check for a failed session |
119 |
+- content_check "librelp error 10031" $RSYSLOG_DEBUGLOG |
120 |
+- # content_check "OpenSSL Error Stack:" |
121 |
+- fi |
122 |
++ # Kindly check for a failed session |
123 |
++ content_check "librelp error 10031" $RSYSLOG_DEBUGLOG |
124 |
++# content_check "OpenSSL Error Stack:" |
125 |
+ fi |
126 |
+ |
127 |
+ exit_test |
128 |
+\ No newline at end of file |
129 |
|
130 |
diff --git a/app-admin/rsyslog/rsyslog-8.2004.0.ebuild b/app-admin/rsyslog/rsyslog-8.2004.0.ebuild |
131 |
index e3157ed0808..8f08c7337b5 100644 |
132 |
--- a/app-admin/rsyslog/rsyslog-8.2004.0.ebuild |
133 |
+++ b/app-admin/rsyslog/rsyslog-8.2004.0.ebuild |
134 |
@@ -98,6 +98,8 @@ if [[ ${PV} == "9999" ]]; then |
135 |
DEPEND+=" >=dev-python/docutils-0.12" |
136 |
fi |
137 |
|
138 |
+PATCHES=( "${FILESDIR}"/${P}-skip-librelp-openssl-specific-tests.patch ) |
139 |
+ |
140 |
CONFIG_CHECK="~INOTIFY_USER" |
141 |
WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |