From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1699B1396D0 for ; Sun, 24 Sep 2017 17:49:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B0042BC03A; Sun, 24 Sep 2017 17:49:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3BCEA2BC03A for ; Sun, 24 Sep 2017 17:49:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01645341699 for ; Sun, 24 Sep 2017 17:49:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9523B83F7 for ; Sun, 24 Sep 2017 17:49:45 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1506275377.2a2a8f96bfc5aeb4d7e70786f14f97b99b060780.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/8-stable/, app-admin/rsyslog/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild app-admin/rsyslog/rsyslog-8.28.0.ebuild app-admin/rsyslog/rsyslog-8.29.0.ebuild X-VCS-Directories: app-admin/rsyslog/ app-admin/rsyslog/files/8-stable/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 2a2a8f96bfc5aeb4d7e70786f14f97b99b060780 X-VCS-Branch: master Date: Sun, 24 Sep 2017 17:49:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a200b91a-c96d-4199-b420-44a4b5b97c31 X-Archives-Hash: 654f3237cc57514f2d1cab368c131d6e commit: 2a2a8f96bfc5aeb4d7e70786f14f97b99b060780 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Sep 24 17:49:24 2017 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Sep 24 17:49:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a2a8f96 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 .../rsyslog-8.27.0-fix-mmnormalize-tests.patch | 23 ++++++++++++++++++++++ app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild | 1 + app-admin/rsyslog/rsyslog-8.28.0.ebuild | 2 ++ app-admin/rsyslog/rsyslog-8.29.0.ebuild | 2 ++ 4 files changed, 28 insertions(+) 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 00000000000..6ef7e642628 --- /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 14c282597e3..129f495b9e7 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 00aaa3c6d18..dc74da9df9b 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 f3914443f42..d8b4b91b033 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"