From nobody Tue Jun 13 18:53:36 2023 X-Original-To: dev-commits-ports-main@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 4Qgd4K1m7Nz4dcwb; Tue, 13 Jun 2023 18:53:37 +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 4Qgd4J6RTKz3P1T; Tue, 13 Jun 2023 18:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686682416; 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=Epbjz6d0Piwpad9RbFOszaACUev8YydmJ3b6LTHwY/I=; b=uBPo2tpmDjUlJP9PiCQOwEbi0O3aSQLEe3F9WAv6XjCfzQ2Fm0vFp/oHg0Uc+IyX1btYqD nWOR3/xr+xTDAIQemh8H4Ms/CBAOA5nGd9aFGzzELpwjOameGaoJK1+PTJJEcpHG/ASFeS 8rzKj1MqLEMx44lxLI/Mp2wk4C2314FDjdP4B9IHlIgu399H+4shrB6s0Mic4HG9oVXkE9 4B+PGg2XMqlhOZ1YVJUb4edByAClTnKONcZgq6vh3EPT+c1tBu15U88KVUcBOU43gp2isK f9bXlPwq7KEM49QXIxQbvhYCVigqLBQiF5XLyPoy73+++UfKOqhvlbP687V3Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686682416; 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=Epbjz6d0Piwpad9RbFOszaACUev8YydmJ3b6LTHwY/I=; b=mq1bsAKcTYbqvXJty0eOPOWdaRod4Ph9VE3wd2K3c3paAQ8qLE8q1Hb0gWAjKTva7Q+LfW +UUcBBEsq+9ZZ3e2zlvBrNMX3PWaSfcjZdRcurqfThoIS3RV9IM1KrjnAcYQbMMQ0TzZLc uyaRBoYljx8A6cn1On2yLl1M9/d4dMBFFi3NTg20DEe3jNr9f9qoe8HbKi1TBnX2RFnHKh l1QFTJjjqi59vh8b7k+xpOX7v0jhvMAYX4I56LArADvHhMoUwaDVXLR9DE7mSjtF7fnRd4 iQq0h5jSaKH1RW59DZGlmXjBle4fmQvAFzk9nGowR3QTCEXqnMCmjA0HjlxmMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686682416; a=rsa-sha256; cv=none; b=src3yOXE7KOhDH4vez+V9ybmAwgQL/Agh2pWwuJzblI/IebHfkTBl9Knq4znA8uAqsPi0i hBlXfPpa0AqhUJ5sv2hOxmc9fCeK/49O6KGS0aMg62/++wbchjM5YYDsPUq+ZZ9uyLOsav 75Jk1UiR0yPkJjBM8vfb0MJcvB6JM4l5+yKPhszeQGAF0caRZYjNmH6nPCO1Kq31iWksnB 3DUemc2B8fp2mSDLsu+yFfgvjCCnriTZQoGxwS21tMoLY6pbBemcifLLjDq9MGRQ5Q2WYn 1vS9MfF+9MT/LmaC+Jg8aA3W1WGNu/C562x8JQ3DONlMt2sB21tDFJeUMER9TQ== 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 4Qgd4J5QtczY6V; Tue, 13 Jun 2023 18:53:36 +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 35DIratM070207; Tue, 13 Jun 2023 18:53:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35DIra8m070206; Tue, 13 Jun 2023 18:53:36 GMT (envelope-from git) Date: Tue, 13 Jun 2023 18:53:36 GMT Message-Id: <202306131853.35DIra8m070206@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: 7727c1a56b03 - main - shells/ksh-devel: update to the latest ksh93/ksh github commit List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 7727c1a56b036f6c32134778474b2f16751505cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7727c1a56b036f6c32134778474b2f16751505cf commit 7727c1a56b036f6c32134778474b2f16751505cf Author: Cy Schubert AuthorDate: 2023-06-13 18:52:21 +0000 Commit: Cy Schubert CommitDate: 2023-06-13 18:53:29 +0000 shells/ksh-devel: update to the latest ksh93/ksh github commit This includes an urgent bugfix release that fixes a serious regression in pathname expansion, see: https://github.com/ksh93/ksh/issues/660 --- shells/ksh-devel/Makefile | 5 +- shells/ksh-devel/distinfo | 6 +- .../ksh-devel/files/patch-src_cmd_ksh93_sh_macro.c | 84 ---------------------- 3 files changed, 5 insertions(+), 90 deletions(-) diff --git a/shells/ksh-devel/Makefile b/shells/ksh-devel/Makefile index 90300f060f96..e991db8811d1 100644 --- a/shells/ksh-devel/Makefile +++ b/shells/ksh-devel/Makefile @@ -10,7 +10,6 @@ PORTNAME= ksh PORTVERSION= ${AST_COMMIT_DATE} -PORTREVISION= 1 CATEGORIES= shells PKGNAMESUFFIX= -devel @@ -22,8 +21,8 @@ LICENSE= EPL BROKEN_FreeBSD_12= exit code 139 making lib/libcmd -HASH= c6ee0aa6 -AST_COMMIT_DATE= 2023.06.09 +HASH= 943089ec +AST_COMMIT_DATE= 2023.06.13 USES= compiler:c11 diff --git a/shells/ksh-devel/distinfo b/shells/ksh-devel/distinfo index 28c1c081e574..6047c11f7899 100644 --- a/shells/ksh-devel/distinfo +++ b/shells/ksh-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686561387 -SHA256 (ksh93-ksh-2023.06.09-c6ee0aa6_GH0.tar.gz) = d609c245bc1dc1ecbedb49a2b4161c7e6cf35e67ad2c205ffd9c1a0759a41e7d -SIZE (ksh93-ksh-2023.06.09-c6ee0aa6_GH0.tar.gz) = 2107610 +TIMESTAMP = 1686682002 +SHA256 (ksh93-ksh-2023.06.13-943089ec_GH0.tar.gz) = 18dcc47bf0435af5d797066d2356be4728e8bd6f620284d06d1eaf6c62a7f97d +SIZE (ksh93-ksh-2023.06.13-943089ec_GH0.tar.gz) = 2109804 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 deleted file mode 100644 index a3b6a4f2585e..000000000000 --- a/shells/ksh-devel/files/patch-src_cmd_ksh93_sh_macro.c +++ /dev/null @@ -1,84 +0,0 @@ ---- src/cmd/ksh93/sh/macro.c.orig 2023-06-08 23:30:08.000000000 -0700 -+++ src/cmd/ksh93/sh/macro.c 2023-06-12 19:26:31.718942000 -0700 -@@ -76,6 +76,7 @@ - char macsub; /* set to 1 when running mac_substitute */ - int dotdot; /* set for .. in subscript */ - void *nvwalk; /* for name space walking */ -+ char bracketexpr; /* set when in [brackets] within a non-ERE glob pattern */ - } Mac_t; - - #undef ESCAPE -@@ -437,7 +438,6 @@ - char oldquote = mp->quote; /* save "double quoted" state */ - char ansi_c = 0; /* set when processing ANSI C escape codes */ - int32_t ere = 0; /* bitmask of pattern options indicating an extended regular expression */ -- char bracketexpr = 0; /* set when in [brackets] within a non-ERE glob pattern */ - Sfio_t *sp = mp->sp; - Stk_t *stkp = sh.stk; - char *resume = 0; -@@ -533,7 +533,7 @@ - if(mp->pattern) - { - /* preserve \ for escaping glob pattern bracket expression operators */ -- if(bracketexpr && n==S_BRAOP) -+ if(mp->bracketexpr && n==S_BRAOP) - break; - /* preserve \digit for pattern matching */ - /* also \alpha for extended patterns */ -@@ -636,8 +636,8 @@ - mp->pattern = c; - break; - case S_ENDCH: -- if(bracketexpr && cp[-1]==RBRACT && !(mp->quote || mp->lit)) -- bracketexpr--; -+ if(mp->bracketexpr && cp[-1]==RBRACT && !(mp->quote || mp->lit)) -+ mp->bracketexpr--; - if((mp->lit || cp[-1]!=endch || mp->quote!=newquote)) - goto pattern; - if(endch==RBRACE && mp->pattern && brace) -@@ -738,12 +738,12 @@ - cp = first = fcseek(0); - break; - } -- if(mp->pattern==1 && !ere && !bracketexpr) -+ if(mp->pattern==1 && !ere && !mp->bracketexpr) - { -- bracketexpr++; -+ mp->bracketexpr++; - /* a ] following [, as in []abc], should not close the bracket expression */ - if(cp[0]==RBRACT && cp[1]) -- bracketexpr++; -+ mp->bracketexpr++; - } - /* FALLTHROUGH */ - case S_PAT: -@@ -883,7 +883,7 @@ - break; - case S_BRAOP: - /* escape a quoted !^- within a bracket expression */ -- if(!bracketexpr || !(mp->quote || mp->lit)) -+ if(!mp->bracketexpr || !(mp->quote || mp->lit)) - continue; - if(c) - sfwrite(stkp,first,c); -@@ -2481,7 +2481,10 @@ - continue; - } - if(n==S_ESC) -- sfputc(stkp,ESCAPE); -+ { -+ if(!mp->bracketexpr) -+ sfputc(stkp,ESCAPE); -+ } - else if(n==S_EPAT) - { - /* don't allow extended patterns in this case */ -@@ -2583,7 +2586,7 @@ - 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 */