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 D98951382C5 for ; Sun, 4 Mar 2018 04:07:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B01CFE08F7; Sun, 4 Mar 2018 04:07:08 +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 89E06E08F7 for ; Sun, 4 Mar 2018 04:07:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E4320335C0C for ; Sun, 4 Mar 2018 04:07:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 485361F0 for ; Sun, 4 Mar 2018 04:07:05 +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: <1520136419.6c4b4150232cc25072b3b81c18341a0486d5c305.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/, sys-devel/automake/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/automake/automake-1.13.4-r2.ebuild sys-devel/automake/files/automake-1.13-hash-order-workaround.patch X-VCS-Directories: sys-devel/automake/ sys-devel/automake/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 6c4b4150232cc25072b3b81c18341a0486d5c305 X-VCS-Branch: master Date: Sun, 4 Mar 2018 04:07:05 +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: 14ece380-0999-4319-b86d-28aeb8935f3d X-Archives-Hash: a91fb70352b5211be5bbdb5218e37677 commit: 6c4b4150232cc25072b3b81c18341a0486d5c305 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Mar 4 04:06:22 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Mar 4 04:06:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4b4150 sys-devel/automake: Fix primary-prefix-invalid-couples.tap test failure due to changed hash order Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/automake/automake-1.13.4-r2.ebuild | 1 + .../files/automake-1.13-hash-order-workaround.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild index 6f00929967d..1cd07c36c0c 100644 --- a/sys-devel/automake/automake-1.13.4-r2.ebuild +++ b/sys-devel/automake/automake-1.13.4-r2.ebuild @@ -27,6 +27,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch + "${FILESDIR}"/${PN}-1.13-hash-order-workaround.patch "${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch ) diff --git a/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch b/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch new file mode 100644 index 00000000000..79b81e6fa40 --- /dev/null +++ b/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch @@ -0,0 +1,14 @@ +--- a/t/primary-prefix-invalid-couples.tap ++++ b/t/primary-prefix-invalid-couples.tap +@@ -186,8 +186,10 @@ grep -v 'dir.* not a legitimate directory' stderr && exit 1 + # Check that the same failures are present without the '--add-missing' + # option. + mv stderr stderr.old ++cat stderr.old | sort > a + AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples" ++cat stderr | sort > b + command_ok_ "... and with the same diagnostic of 'automake -a'" \ +- diff stderr.old stderr ++ diff a b + + :