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 25772138330 for ; Wed, 10 Jan 2018 05:50:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B3D1E08A2; Wed, 10 Jan 2018 05:50:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 376C2E08A2 for ; Wed, 10 Jan 2018 05:50:55 +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 A8EB2335C3C for ; Wed, 10 Jan 2018 05:50:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1DF42126 for ; Wed, 10 Jan 2018 05:50:50 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1515563322.0b6c782b7853ff796d16200301ced0b34e16c594.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/files/, sys-apps/dtc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/dtc/dtc-1.4.4-r1.ebuild sys-apps/dtc/dtc-9999.ebuild sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch X-VCS-Directories: sys-apps/dtc/ sys-apps/dtc/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 0b6c782b7853ff796d16200301ced0b34e16c594 X-VCS-Branch: master Date: Wed, 10 Jan 2018 05:50:50 +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: c0361bd6-2d80-4896-8b31-87adaca885e6 X-Archives-Hash: a8540a4aabf353b47c4ea0feec909d8c commit: 0b6c782b7853ff796d16200301ced0b34e16c594 Author: Mike Frysinger chromium org> AuthorDate: Wed Jan 10 05:48:35 2018 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Jan 10 05:48:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6c782b sys-apps/dtc: change dtdiff to use /bin/sh .../dtc/{dtc-9999.ebuild => dtc-1.4.4-r1.ebuild} | 8 +++- sys-apps/dtc/dtc-9999.ebuild | 8 +++- sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch | 48 ++++++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-1.4.4-r1.ebuild similarity index 85% copy from sys-apps/dtc/dtc-9999.ebuild copy to sys-apps/dtc/dtc-1.4.4-r1.ebuild index 1dc3915445f..7521eebe76e 100644 --- a/sys-apps/dtc/dtc-9999.ebuild +++ b/sys-apps/dtc/dtc-1.4.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,9 +24,15 @@ DEPEND=" sys-devel/flex " DOCS=" + Documentation/dt-object-internal.txt + Documentation/dts-format.txt Documentation/manual.txt " +PATCHES=( + "${FILESDIR}"/${PN}-1.4.4-posix-shell.patch +) + src_prepare() { default diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild index 1dc3915445f..7521eebe76e 100644 --- a/sys-apps/dtc/dtc-9999.ebuild +++ b/sys-apps/dtc/dtc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,9 +24,15 @@ DEPEND=" sys-devel/flex " DOCS=" + Documentation/dt-object-internal.txt + Documentation/dts-format.txt Documentation/manual.txt " +PATCHES=( + "${FILESDIR}"/${PN}-1.4.4-posix-shell.patch +) + src_prepare() { default diff --git a/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch b/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch new file mode 100644 index 00000000000..b9b0175c0bd --- /dev/null +++ b/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch @@ -0,0 +1,48 @@ +From 4d9522764985462741c7bb4af1ab231b9251476b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Wed, 10 Jan 2018 00:41:43 -0500 +Subject: [PATCH] dtdiff: change to POSIX shell + +This changes from the bash-specific process substitution feature to +reading with pipes. It relies on /dev/fd or /proc/self/fd existing. + +URL: https://crbug.com/756559 +Signed-off-by: Mike Frysinger +--- + dtdiff | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +diff --git a/dtdiff b/dtdiff +index 5fa772b0ab62..4d1b71756c2f 100644 +--- a/dtdiff ++++ b/dtdiff +@@ -1,8 +1,4 @@ +-#! /bin/bash +- +-# This script uses the bash <(...) extension. +-# If you want to change this to work with a generic /bin/sh, make sure +-# you fix that. ++#! /bin/sh + + + DTC=dtc +@@ -35,4 +31,15 @@ if [ $# != 2 ]; then + exit 1 + fi + +-diff -u <(source_and_sort "$1") <(source_and_sort "$2") ++for dir in /dev/fd /proc/self/fd; do ++ if [ -d "${dir}" ]; then ++ break ++ fi ++done ++ ++source_and_sort "$1" | ( ++ # Duplicate current stdin from the first file to fd 3 so we can change fd 0 ++ # to the second file. ++ exec 3<&0 ++ source_and_sort "$2" | diff -u "${dir}/3" "${dir}/0" ++) +-- +2.15.1 +