From nobody Mon Jun 12 09:20:15 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 4QfmPD0N1wz4cRnL; Mon, 12 Jun 2023 09:20:16 +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 4QfmPC6m3lz4QLy; Mon, 12 Jun 2023 09:20:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686561616; 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=WdwTY4fXRDa6FUYlhBqJEhbRMv5TIWhygNer5xUE1jg=; b=pH8cT1D5dhXBU+R3rEXJLFhOvNfNeVCDx1NKl/eOQuMtp3/fTfeu/dbtXFQwEiFQJQoQ12 QFYUfG4EqR0L8aXdCPql9y9gupx0tZ4GLsDbhtxyma+yG3ipswbuWKW82Qp2kz7rMZUwT+ c9tf193DuH0hC4Xyw9RWAQYDEZ9IOraCskeoApDzifLVmR4st8xJIFqD5ghEsWF3sCR4df XYadjDla9Owf843WxuW2M38bvQZyRSrceX5SWeZjiRYUg1qyg8ZZ9haTKPV9zeUxJxJeUc a+Eya7YaBxU0mI9ExvK87EaklbJSOMcwLOCXNUzoWo06RKPyakMizhxGOXPGkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686561616; 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=WdwTY4fXRDa6FUYlhBqJEhbRMv5TIWhygNer5xUE1jg=; b=Pln20t6YkBIyOCqbUVuPmSLREGsv/qQ+1FSWOfSZniNjzHkwmk5YM2pRJeghAk8T+zQnFu yp+2ZG0gWR410LARnhL4KeJoiCnZDi78BFKzVuK+fTFEOm+MGRmOXNzncjGoXuO0YAOLd4 lu4vy/BXlaLnP77C1P1agHXkUKKxEDHB9uy+1osQoYD810uumCWuAQU33Gl3Jq0WztY5Ww Fv1lA/3yeaHMQF3Y5VQpIES3swaMvzOGEGNBmI3fxyvOyQ5NT63zM15lk6CsLD+umKR6ai HU76KsUE+g/m2lxVQ5rH7Vg31aG+yBr1vuggPenrtijOKwv0NQ4HzmhPzzTl7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686561616; a=rsa-sha256; cv=none; b=CW0KRLWiZwb9HKVmG+I8INxjsXkvXzxEOvJOoZSC+0HaqfkSHSWkPJhmkE+6hA/B7NlT8U EBFkvBV67IXbCVQn71CGTHKA90/QJ0P3Clo66L0NzOdhWZTGkmA5kNwsTbZnBma+IIrMdf AkmKNNavJKc+1EyE8I2Z0YT45eM2UaI8+EscvAGWTbu3CMn1tGInDS4DwgWt1GdW5yMgh2 8F2/spVxITx0cS4UOjBqjANTrSVH+qlhkUNs4DN0KWB58lfwqL84AIqRxctwHDXOewtTju oGhQTxCqwE5+zRiTTcsFpnw0Md5anVKk+/JZfVk4Hpy0HEqgzEOeKASw+clBPw== 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 4QfmPC46K1zZM0; Mon, 12 Jun 2023 09:20:15 +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 35C9KFY7043752; Mon, 12 Jun 2023 09:20:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35C9KFtj043743; Mon, 12 Jun 2023 09:20:15 GMT (envelope-from git) Date: Mon, 12 Jun 2023 09:20:15 GMT Message-Id: <202306120920.35C9KFtj043743@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: a7c0df3a9c1c - main - shells/ksh-devel: 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: a7c0df3a9c1c5235723f9db41e6c11ee4330123f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7c0df3a9c1c5235723f9db41e6c11ee4330123f commit a7c0df3a9c1c5235723f9db41e6c11ee4330123f Author: Cy Schubert AuthorDate: 2023-06-12 09:13:16 +0000 Commit: Cy Schubert CommitDate: 2023-06-12 09:19:56 +0000 shells/ksh-devel: 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 --- shells/ksh-devel/Makefile | 1 + shells/ksh-devel/files/patch-src_cmd_ksh93_sh_macro.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/shells/ksh-devel/Makefile b/shells/ksh-devel/Makefile index 50dc9ae2290c..17c7428c9a9a 100644 --- a/shells/ksh-devel/Makefile +++ b/shells/ksh-devel/Makefile @@ -10,6 +10,7 @@ PORTNAME= ksh PORTVERSION= ${AST_COMMIT_DATE} +PORTREVISION= 1 CATEGORIES= shells PKGNAMESUFFIX= -devel diff --git a/shells/ksh-devel/files/patch-src_cmd_ksh93_sh_macro.c b/shells/ksh-devel/files/patch-src_cmd_ksh93_sh_macro.c new file mode 100644 index 000000000000..391cff245ac6 --- /dev/null +++ b/shells/ksh-devel/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 */