From owner-svn-src-all@freebsd.org Tue Aug 11 16:59:53 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A03623B2AAC for ; Tue, 11 Aug 2020 16:59:53 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BQzbD6ygnz3X2w for ; Tue, 11 Aug 2020 16:59:52 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f51.google.com with SMTP id 184so3545327wmb.0 for ; Tue, 11 Aug 2020 09:59:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=31Dywo7nKUD/y8Z/HvAfLp/eimwYuuDVq667WJTjaBY=; b=maaRkBuEzNVNZWzmLXqtWOitsoGdNSrY3OIpTm8JYJGUZg960jFIjbCKLjE4WONoyI WeyKc6BSvb7q2Xn2meY6gJoTO8e5YihgxDCOy+k/up9WtyllNjc/JYFXzOQLk8Cnbc1b O+uPByXYd5V4PMdrG3vBQXTsiC1P7MQfj2BvSRghOkr6pFA7mbBlrOqvw/wONV1oaqB6 H8ZfDMZdYs3E1ujJpml1M0zfHAY1y4pCtjV2fvuDV3gbN/tpbiWsu5PAQGRz8hsy1R33 utTgDfb8veR/FTrOkfvWn886QWyw3CXt1pj13nypunFm33CyaltQM7pFfaEP1sggOPoa PdrQ== X-Gm-Message-State: AOAM5333GIlUmjh1dz5KwhuJAbDN5x8GPXjKTUtyWRW0DtWj7h6SbtUz yqX/eM4uhngVsPHAsoSSEaOjfQ== X-Google-Smtp-Source: ABdhPJzb3cyapS2eY5X3Cc0FArqq1lOo2spde8POiNWgVT6EQdASsRXeLv38golY3Jiq7LJm3+uT7g== X-Received: by 2002:a1c:e919:: with SMTP id q25mr4659872wmc.123.1597165191350; Tue, 11 Aug 2020 09:59:51 -0700 (PDT) Received: from [192.168.149.251] (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id b8sm27454161wrv.4.2020.08.11.09.59.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Aug 2020 09:59:50 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Subject: Re: svn commit: r364124 - head/cddl/contrib/opensolaris/lib/libdtrace/common From: Jessica Clarke In-Reply-To: <202008111646.07BGktOZ013812@repo.freebsd.org> Date: Tue, 11 Aug 2020 17:59:50 +0100 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <1E4AE078-4233-4790-A0B4-9A7B4809CAF0@freebsd.org> References: <202008111646.07BGktOZ013812@repo.freebsd.org> To: Alex Richardson X-Mailer: Apple Mail (2.3608.120.23.2.1) X-Rspamd-Queue-Id: 4BQzbD6ygnz3X2w X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.35 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.01)[-1.010]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.86)[-0.857]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.51:from]; NEURAL_HAM_MEDIUM(-0.98)[-0.983]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.51:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2020 16:59:53 -0000 On 11 Aug 2020, at 17:46, Alex Richardson = wrote: >=20 > Author: arichardson > Date: Tue Aug 11 16:46:54 2020 > New Revision: 364124 > URL: https://svnweb.freebsd.org/changeset/base/364124 >=20 > Log: > Fix libdtrace build with zsh as /bin/sh >=20 > When zsh runs in POSIX sh mode it does not support the -e flag to = echo. > Use printf instead of echo to avoid the "-e" characters being = printed. >=20 > Obtained from: CheriBSD > Reviewed By: markj > Differential Revision: https://reviews.freebsd.org/D26026 >=20 > Modified: > head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh > head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh > head/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh > head/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh >=20 > Modified: = head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh = Tue Aug 11 16:46:48 2020 (r364123) > +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh = Tue Aug 11 16:46:54 2020 (r364124) > @@ -24,16 +24,15 @@ > # Copyright 2003 Sun Microsystems, Inc. All rights reserved. > # Use is subject to license terms. > # > -#ident "%Z%%M% %I% %E% SMI" > set -e >=20 > -echo "\ > -/*\n\ > - * Copyright 2003 Sun Microsystems, Inc. All rights reserved.\n\ > - * Use is subject to license terms.\n\ > - */\n\ > -\n\ > -#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n" > +printf "%s" " > +/* > + * Copyright 2003 Sun Microsystems, Inc. All rights reserved. > + * Use is subject to license terms. > + */ > + > +" Surely these would be much better as a heredoc? cat <