diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2017-09-24 19:49:24 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2017-09-24 19:49:37 +0200 |
| commit | 2a2a8f96bfc5aeb4d7e70786f14f97b99b060780 (patch) | |
| tree | e26bf89488912030492ca62e075e7fdf1f4d4a57 /app-admin/rsyslog | |
| parent | sys-boot/plymouth: stable 0.9.3-r1 for ppc, bug #630530 (diff) | |
| download | gentoo-2a2a8f96bfc5aeb4d7e70786f14f97b99b060780.tar.gz gentoo-2a2a8f96bfc5aeb4d7e70786f14f97b99b060780.tar.bz2 gentoo-2a2a8f96bfc5aeb4d7e70786f14f97b99b060780.zip | |
app-admin/rsyslog: Run mmnormalize tests only when mmnormalize module was actually enabled
Bug: https://bugs.gentoo.org/631246
Package-Manager: Portage-2.3.10, Repoman-2.3.3
Diffstat (limited to 'app-admin/rsyslog')
4 files changed, 28 insertions, 0 deletions
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch new file mode 100644 index 000000000000..6ef7e6426287 --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch @@ -0,0 +1,23 @@ +https://github.com/rsyslog/rsyslog/pull/1791 +--- + tests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -498,7 +498,6 @@ TESTS += msgvar-concurrency-array.sh \ + mmnormalize_processing_test2.sh \ + mmnormalize_processing_test3.sh \ + mmnormalize_processing_test4.sh +-endif + + if ENABLE_IMPTCP + TESTS += \ +@@ -512,6 +511,7 @@ if LOGNORM_REGEX_SUPPORTED + TESTS += \ + mmnormalize_regex.sh + endif ++endif + + if ENABLE_MMJSONPARSE + TESTS += \ diff --git a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild index 14c282597e3f..129f495b9e7c 100644 --- a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild @@ -51,6 +51,7 @@ else "${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch + "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch ) fi diff --git a/app-admin/rsyslog/rsyslog-8.28.0.ebuild b/app-admin/rsyslog/rsyslog-8.28.0.ebuild index 00aaa3c6d189..dc74da9df9b0 100644 --- a/app-admin/rsyslog/rsyslog-8.28.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.28.0.ebuild @@ -46,6 +46,8 @@ else http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) " + + PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0" diff --git a/app-admin/rsyslog/rsyslog-8.29.0.ebuild b/app-admin/rsyslog/rsyslog-8.29.0.ebuild index f3914443f422..d8b4b91b0336 100644 --- a/app-admin/rsyslog/rsyslog-8.29.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.29.0.ebuild @@ -46,6 +46,8 @@ else http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) " + + PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0" |