From nobody Wed Jun 26 16:34:18 2024 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 4W8S2f387zz5Ppsw; Wed, 26 Jun 2024 16:34:18 +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 4W8S2f1Wv2z4v3n; Wed, 26 Jun 2024 16:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719419658; 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=Qtx21KgiRxh0YxZOvbqEEPcFTDk7OGH4yLwYLrbhPmY=; b=iE/DdAY+Fj8c3NCJ0YEWaA0bN2XyDIu4lGLOS30fopuXx6NdN25+qNqTt9OtBplEKb86Vs /qRQuhZTYg1QhPSKd/eGg7onMbe5LdfiLxfrWQW7UtmK2sdnl5UhEhajtR72visfQQzBva evXkRO6o3OQdYCEaXK/U/kB0qPZj5tSy6dH+8ayroHbB0irP3SKWHHg5K4OW1qt8ZZ44jM E6FeXbPqMEPoRKKuwSv0mZQwvhgfZFw7LaUMwtreV2G03OKzK3MCH9/V82vF7cBsUN4sRW zJih9mc2daTfVRfeXaQMZAAIyQSvSWC1ZhLfyqJM5tDVYlhvdhvYW/3nzcEh4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719419658; a=rsa-sha256; cv=none; b=dE+Z52hIxACbv819gdyx00XuzD0kQDKBlVdxkYXFfEGXPl/Y4/MPGNa8LwwEdkBvaCrenb vxhF9+0Dx0DN6gPbR+ZxXbYeMpvIaSn+FlCeCXh2lZAOwYN3QkUVUfAQV3AK6/X9wKXVAM +GozZJTSZEqn1I9D4GeusjIurbzkIss2KPiH7i6GN/y9l/l+vIHqOqHlXjWuwQ0MDLixsX cJXfEdyFTfi4d0Cdt20fVrPwNLipHtlvpuCp+yoqXX+2mI9PtD1/CI4t2UIjs+WqwQQHsu DSaYfeh7nrEzOWviikaVRUn7RlWvW7GhL7oK3rCqAW9s4I4DSM1Ql4aL7SMwoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719419658; 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=Qtx21KgiRxh0YxZOvbqEEPcFTDk7OGH4yLwYLrbhPmY=; b=xSvzCOCGB4wU58QcLQLJnY35J+kZMmV7JjZy0WSDImerMwGWwjTRC2/iUXkkTZau9fnxVR itg6i4s9lUxoHIWzgR+Mem9/JRKKytkSIAQc5zmFKSQ5auyHHp0V4bSnN6dfyq9GX5xQv6 4lzdb0y7ozncLA7/SGqFR2mLlSdjD/LOOtW+LQfsKZrq7wC9Wa6K5FoftW16CFdka/H3ck +CB22WG6QTyQiKNpmr88K+5OO8ouS6KH2QSsvpcG+0fyy8OzvLM8B3PjD0QwIIESWcBRp+ kpvlSfYhThJxgHAhtGFyvDxo2W+1/93M/vDPIaEw/lW8UQ2Qys96r+Zwyn7jXA== 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 4W8S2f1059zs87; Wed, 26 Jun 2024 16:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45QGYIgB053491; Wed, 26 Jun 2024 16:34:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45QGYIl9053488; Wed, 26 Jun 2024 16:34:18 GMT (envelope-from git) Date: Wed, 26 Jun 2024 16:34:18 GMT Message-Id: <202406261634.45QGYIl9053488@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: 6b2b72e2c8f8 - 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 6b2b72e2c8f8eb8a1a25d6fb95e8eb279ed7af8d Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b2b72e2c8f8eb8a1a25d6fb95e8eb279ed7af8d commit 6b2b72e2c8f8eb8a1a25d6fb95e8eb279ed7af8d Author: Cy Schubert AuthorDate: 2024-06-26 16:31:29 +0000 Commit: Cy Schubert CommitDate: 2024-06-26 16:33:40 +0000 shells/ksh-devel: update to the latest ksh93/ksh github commit A patch was added to revert upstream commit e8b45cc8. This upstream commit was causing numererous build failures. --- shells/ksh-devel/Makefile | 5 +-- shells/ksh-devel/distinfo | 6 +-- shells/ksh-devel/files/patch-src_INIT_mamake.c | 53 ++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 6 deletions(-) diff --git a/shells/ksh-devel/Makefile b/shells/ksh-devel/Makefile index 5aad003c2e6d..a8a8abf5509f 100644 --- a/shells/ksh-devel/Makefile +++ b/shells/ksh-devel/Makefile @@ -20,8 +20,8 @@ WWW= http://www.kornshell.com/ LICENSE= EPL -HASH= 2e8aeee9 -AST_COMMIT_DATE= 2024.04.06 +HASH= 1407f3be +AST_COMMIT_DATE= 2024.06.26 USES= compiler:c11 @@ -48,7 +48,6 @@ KSH93D_DESC= Install to ${PREFIX}/bin/ksh93d (development) CFLAGS+= -DMAP_TYPE LDFLAGS+= -lm MAKE_ENV= CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses" CFLAGS="${CFLAGS}" - STATIC_MAKE_ENV= LDFLAGS+=-static KSH_PLIST_SUB= 93="" diff --git a/shells/ksh-devel/distinfo b/shells/ksh-devel/distinfo index be3f2eec79b3..f67d22075699 100644 --- a/shells/ksh-devel/distinfo +++ b/shells/ksh-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715612864 -SHA256 (ksh93-ksh-2024.04.06-2e8aeee9_GH0.tar.gz) = 517634a35c66117cb82a5808752fcfad2a0286ca74a0364f1ae35960dee8c368 -SIZE (ksh93-ksh-2024.04.06-2e8aeee9_GH0.tar.gz) = 2089545 +TIMESTAMP = 1719406732 +SHA256 (ksh93-ksh-2024.06.26-1407f3be_GH0.tar.gz) = e91b0c27d60af06527feedd0745cd4c63941e88161a4aba61db9a6b044057238 +SIZE (ksh93-ksh-2024.06.26-1407f3be_GH0.tar.gz) = 2088543 diff --git a/shells/ksh-devel/files/patch-src_INIT_mamake.c b/shells/ksh-devel/files/patch-src_INIT_mamake.c new file mode 100644 index 000000000000..6373af9f9c7d --- /dev/null +++ b/shells/ksh-devel/files/patch-src_INIT_mamake.c @@ -0,0 +1,53 @@ +diff --git src/cmd/INIT/mamake.c src/cmd/INIT/mamake.c +index 1cc85f1f..6785ff03 100644 +--- src/cmd/INIT/mamake.c ++++ src/cmd/INIT/mamake.c +@@ -27,7 +27,7 @@ + * coded for portability + */ + +-#define RELEASE_DATE "2024-06-25" ++#define RELEASE_DATE "2024-04-02" + static char id[] = "\n@(#)$Id: mamake (ksh 93u+m) " RELEASE_DATE " $\0\n"; + + #if _PACKAGE_ast +@@ -297,6 +297,7 @@ static struct /* program state */ + int indent; /* debug indent */ + int keepgoing; /* do siblings on error */ + int never; /* never execute */ ++ int probed; /* probe already done */ + int verified; /* don't bother with verify() */ + + Stream_t streams[4]; /* input file stream stack */ +@@ -1346,7 +1347,7 @@ static unsigned long run(Rule_t *r, char *s) + /* find commands in the current working directory first */ + append(buf, + "case $PATH in\n" +- ".:* | :*) ;;\n" ++ ".:*) ;;\n" + "*) PATH=.:$PATH;;\n" + "esac\n" + ); +@@ -1860,7 +1861,7 @@ static unsigned long make(Rule_t *r, int inloop, unsigned long modtime, Buf_t ** + else + s = 0; + /* only bother if t is a path to a *.a we built (i.e. not -l...) */ +- if (t[0] && (t[0] != '-' || t[1] != 'l')) ++ if (t[0] != '-' || t[1] != 'l') + { + q = rule(expand(buf, t)); + attributes(q, v); +@@ -2112,8 +2113,11 @@ static unsigned long make(Rule_t *r, int inloop, unsigned long modtime, Buf_t ** + setval(state.vars, t, v); + if (strcmp(t, "MAMAKE_STRICT") == 0) + state.strict = *v ? atoi(v) : 1; +- else if (strcmp(t, "CC") == 0) +- probe(); ++ } ++ if (!state.probed && strcmp(t, "CC") == 0) ++ { ++ state.probed = 1; ++ probe(); + } + continue; +