app-admin/rsyslog: Run mmnormalize tests only when mmnormalize module was actually...

Bug: https://bugs.gentoo.org/631246
Package-Manager: Portage-2.3.10, Repoman-2.3.3

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 (file)
index 0000000..6ef7e64
--- /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 14c282597e3f6a3580b140dde7cdf8ccdc1dda04..129f495b9e7cfce8741a396741231cc7cf17299e 100644 (file)
--- 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 00aaa3c6d189451f40f815821be251179b74d781..dc74da9df9b069f8537349b28ba7670fb8b25864 100644 (file)
--- 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 f3914443f422df99d1a0f6badb5eda182263b015..d8b4b91b03365a4f1e94a9a5187d137e8edf7e07 100644 (file)
--- 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"