From owner-svn-src-head@freebsd.org Mon Mar 23 17:51:45 2020 Return-Path: Delivered-To: svn-src-head@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 DFA6E269E69; Mon, 23 Mar 2020 17:51:45 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48mMQ952Pzz4Rlv; Mon, 23 Mar 2020 17:51:45 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B6B71A3D2; Mon, 23 Mar 2020 17:51:45 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02NHpjAZ024011; Mon, 23 Mar 2020 17:51:45 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02NHpjg6024010; Mon, 23 Mar 2020 17:51:45 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <202003231751.02NHpjg6024010@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Mon, 23 Mar 2020 17:51:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359252 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 359252 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2020 17:51:46 -0000 Author: arichardson Date: Mon Mar 23 17:51:44 2020 New Revision: 359252 URL: https://svnweb.freebsd.org/changeset/base/359252 Log: Fix newvers.sh on macOS 10.15 It appears that the macOS /bin/sh echo now defaults to -e and therefore the `#define VERSTR` included newline characters instead of \n. This caused compiler errors due to unterminated strings. Fix by using printf instead of echo. A less fragile solution might be to bootstrap the in-tree /bin/sh but that requires more changes. Reviewed By: brooks Differential Revision: https://reviews.freebsd.org/D24136 Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Mon Mar 23 17:51:39 2020 (r359251) +++ head/sys/conf/newvers.sh Mon Mar 23 17:51:44 2020 (r359252) @@ -343,7 +343,7 @@ EOF ) vers_content_old=$(cat vers.c 2>/dev/null || true) if [ "$vers_content_new" != "$vers_content_old" ]; then - echo "$vers_content_new" > vers.c + printf "%s" "$vers_content_new" > vers.c fi echo $((v + 1)) > version