From nobody Mon Jun 12 09:20:14 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QfmPB5MtYz4cRkm; Mon, 12 Jun 2023 09:20:14 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QfmPB4vX1z4QLV; Mon, 12 Jun 2023 09:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686561614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j/Ar7oCHpvqlcReY3P1Dwb06cYZj4esInD7nq7gM5bM=; b=lR7hOhl09Qcl4uzx4ZR6jS9PyrxM7JXKrNDGR3fLHm2jw0JSOx24rFnY3saaJgeD8CQsZT m+vYVD93/8o278KSJypDH7fUhXvIl8iARzfQNWqAA4/KEDWnc2XErwHVpWGdH4LkrlMqUq OxMLqhQP0JenSrFW30Fko9U3jj445eKgT2UH+UGmfEuBWBSuZGuj57uDis69iCFa4GKqjv Bof8iC95F6Mt1r+qOI9wHEROS4cYvVKJ6eo/eGNYDrhayIXgtNg5C0qVfO0yJqwi3//W+X FpXV9GCl4znz73eOHAcrBlt9jEreJUUVA5QWK4NAaJGh5p67GrP7/+m7M4RRgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686561614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j/Ar7oCHpvqlcReY3P1Dwb06cYZj4esInD7nq7gM5bM=; b=AQFl0kBWgM3ccOSM/0Z0ln69JkdNcuS84Bru+m7RyaF5E4h/2tiQecGIDQ/WXXay0RUC4k Enfg71KFgice+rarTbtbQ8kb0IbEVRDwSJ0Wbg5DF73WtaDIOw3MkfR4P08bWbcYXwZsXT ENdBbQQrbJeKMhDJa81bhhj6bKOkL6Lke6UQm11VwrYxfGkpus5bVJyvw0kaAajd3CU2km t2ol1+tXoIKPtofYF5QPndUZ29p8LjSRD+H3TJfqqTXKJlLuDrnREtg5aCuZ/tSTMQrHTr gTMpGtF8gsmPrImkEtyUz/WdVNS/a6mNsooepKUlEWrFunSGPxg5WZmlgTZlWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686561614; a=rsa-sha256; cv=none; b=xCDQkzF9yCWxZ2tROBpy5YPpHXnKMGzBM1NOB7wVWe9fF89kTV5UcRwN2txED3R3f4JP9n xwbIZ/R+uVv6kz9SBMdkPUc5twRWZzsIUA2Rl1tmOeCkRMABgeSI47IrqmgZFkHFkhcC70 NGLidNWXMEjfPw3WhPpHdvipkwIojFHC2E/2Nuho+XDtjYWGwrQ8SeUEaQUueOCLyuOMZD LY0zApCAqTsLvWxqPxw3/A4MWO5nJzqBBKmF/dGhNA9cb3+lWxOAg+T6vxjIdGJAyHJVkY IjjyXWr+SNcgmDJ/S1OWN9D6cSpym3PAT1D0of+BTO7wbWcGdyhspWZ1GsDfjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QfmPB3sgqzZJQ; Mon, 12 Jun 2023 09:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35C9KE9L043087; Mon, 12 Jun 2023 09:20:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35C9KEBp043080; Mon, 12 Jun 2023 09:20:14 GMT (envelope-from git) Date: Mon, 12 Jun 2023 09:20:14 GMT Message-Id: <202306120920.35C9KEBp043080@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: a2ba1fd2c5cd - main - shells/ksh: Fix ksh 1.0.5 Regression (issue #660) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2ba1fd2c5cdc5d3a672126b4c4a06251df3dfb5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a2ba1fd2c5cdc5d3a672126b4c4a06251df3dfb5 commit a2ba1fd2c5cdc5d3a672126b4c4a06251df3dfb5 Author: Cy Schubert AuthorDate: 2023-06-12 09:03:52 +0000 Commit: Cy Schubert CommitDate: 2023-06-12 09:19:55 +0000 shells/ksh: Fix ksh 1.0.5 Regression (issue #660) From issue #660: Globs are not expanded with the following: % echo "/"{bin,sbin}"/*" /bin/* /sbin/* % v=/; echo "$v"bin"/*" /bin/* But globbing is unexpectedly performed if both parameter substitution and brace expansion are present: % v=/; echo "$v"{bin,sbin}"/*" [output omitted for the sake of brevity] Obtained from: https://github.com/ksh93/ksh/issues/660 MFH: 2023Q3 --- shells/ksh/Makefile | 1 + shells/ksh/files/patch-src_cmd_ksh93_sh_macro.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/shells/ksh/Makefile b/shells/ksh/Makefile index 26617ec47ba0..319bdab02d59 100644 --- a/shells/ksh/Makefile +++ b/shells/ksh/Makefile @@ -11,6 +11,7 @@ DISTVERSIONPREFIX= v PORTNAME= ksh PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= shells MAINTAINER= cy@FreeBSD.org diff --git a/shells/ksh/files/patch-src_cmd_ksh93_sh_macro.c b/shells/ksh/files/patch-src_cmd_ksh93_sh_macro.c new file mode 100644 index 000000000000..391cff245ac6 --- /dev/null +++ b/shells/ksh/files/patch-src_cmd_ksh93_sh_macro.c @@ -0,0 +1,13 @@ +diff --git src/cmd/ksh93/sh/macro.c.orig src/cmd/ksh93/sh/macro.c +index aba6f9d..0d60219 100644 +--- src/cmd/ksh93/sh/macro.c.orig ++++ src/cmd/ksh93/sh/macro.c +@@ -2582,7 +2582,7 @@ static void endfield(Mac_t *mp,int split) + mp->atmode = 0; + if(mp->patfound) + { +- int musttrim = mp->wasexpan && !mp->noextpat && strchr(argp->argval,'\\'); ++ int musttrim = mp->wasexpan && !mp->quoted && !mp->noextpat && strchr(argp->argval,'\\'); + sh.argaddr = 0; + #if SHOPT_BRACEPAT + /* in POSIX mode, disallow brace expansion for unquoted expansions */