[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 8b898bb76667b7a840d8335a5926a7ba5d012e49 Author: Sam James gentoo org> AuthorDate: Sun Aug 11 11:25:16 2024 + Commit: Sam James gentoo org> CommitDate: Sun Aug 11 11:28:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b898bb7 app-shells/ksh: add 1.0.10 Signed-off-by: Sam James gentoo.org> app-shells/ksh/Manifest | 1 + app-shells/ksh/ksh-1.0.10.ebuild | 68 2 files changed, 69 insertions(+) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 7f5bd74db1b1..9db785460a3b 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,3 +1,4 @@ +DIST ksh-v1.0.10.tar.gz 2019536 BLAKE2B 3de1328f7963d0953e5afcfe61c0eb001f7ad5f719a96415ccc3c7a9e9bb61deee59dbd161e8f0bf64c997c257b796f3b36124b7032117f513a446aa20cb85b8 SHA512 055bd2cf188c825ed684e6f95991a70f8b672e31a94a2294b8791de96be7d9dbf49e2d1eddb3490559c15736a2e0f40839529253481f1217e5e134f046cbe41f DIST ksh-v1.0.4.tar.gz 2127036 BLAKE2B c3bd7f8d8c86e8bf4f7482c99890f025365334b7ab826261b03f9a2f6bf72b4112ba0cec09c7d5388cbba4541a4e99a24e3b95a98e386b941a39f549c5c21525 SHA512 ca6ff4625a48a991d07a34c8d28656c131124e6cccbb495d8fbc2922db9f94a83c1df2be17a7fa7aa39ce5b9243573b0b806eef87d11c5a2936e7af564d2f5e6 DIST ksh-v1.0.8.tar.gz 2114262 BLAKE2B cf900c4dbdc750a6c4ff6906ab32b24722da3dbb84363517e4d7345c0bc591c346aa82fb58de5fd9662f20dd855deb6f1720002b7d91118ef8497e9f45412148 SHA512 4284ab98f6055877c0715a8b224eb5a75dc7fa022f38c9ee30d50786e997f70b507ee452fc8bbdfa67649a26e0fdfc8051f7e54ff9f6a0f96e44498757080548 DIST ksh-v1.0.9.tar.gz 2084378 BLAKE2B 9cb827003f00261df74e19c6b9dad5f25fba401bc9dabeb300b90b7f3e9e9c37d096e5e24dec7c2ac60b195008d69c9fc682b32b376f7c03cbf9c56779431958 SHA512 747a9b624ee898c84cf37958add17eee6ee8fcb6112701430f0d12d2913b3af22554a98a9836dee6bbbe62adbdb3cbc1d3fb7f2c654f2ce799805d9b1f407683 diff --git a/app-shells/ksh/ksh-1.0.10.ebuild b/app-shells/ksh/ksh-1.0.10.ebuild new file mode 100644 index ..96d8ebd86abd --- /dev/null +++ b/app-shells/ksh/ksh-1.0.10.ebuild @@ -0,0 +1,68 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ksh93/ksh"; +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + MY_PV=$(ver_rs 3 - 4 .) + SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +DESCRIPTION="The Original ATT Korn Shell" +HOMEPAGE="http://www.kornshell.com/"; + +LICENSE="EPL-1.0" +SLOT="0" + +src_compile() { + local extraflags=( + "-Wno-unknown-pragmas" + "-Wno-missing-braces" + "-Wno-unused-result" + "-Wno-return-type" + "-Wno-int-to-pointer-cast" + "-Wno-parentheses" + "-Wno-unused" + "-Wno-unused-but-set-variable" + "-Wno-cpp" + "-Wno-maybe-uninitialized" + "-P" + ) + append-cflags $(test-flags-CC ${extraflags[@]}) + append-cflags -fno-strict-aliasing + filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379 + filter-lto + + export CCFLAGS="${CFLAGS}" + tc-export AR CC LD NM + + sh bin/package make AR="${AR}" CC="${CC}" NM="${NM}" SHELL="${BROOT}"/bin/sh || die +} + +src_test() { + # test tries to catch IO error + addwrite /proc/self/mem + + # arith.sh uses A for tests + unset A + + sh bin/shtests --compile || die +} + +src_install() { + local myhost="$(sh bin/package host)" + cd "arch/${myhost}" || die + + into / + dobin bin/ksh + dosym ksh /bin/rksh + + newman man/man1/sh.1 ksh.1 +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 0104be940ba181a080bf45c6e9c74df8590754d8 Author: Joonas Niilola gentoo org> AuthorDate: Wed Jul 3 05:38:18 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Jul 3 05:38:30 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0104be94 app-shells/ksh: Stabilize 1.0.8 x86, #935380 Signed-off-by: Joonas Niilola gentoo.org> app-shells/ksh/ksh-1.0.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.8.ebuild b/app-shells/ksh/ksh-1.0.8.ebuild index 5d18e29dc3ca..1d31302e6655 100644 --- a/app-shells/ksh/ksh-1.0.8.ebuild +++ b/app-shells/ksh/ksh-1.0.8.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: e1e5febe40d1f00e1654e6cf06f9638382bb7ada Author: Sam James gentoo org> AuthorDate: Wed Jul 3 02:33:29 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jul 3 02:33:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e5febe app-shells/ksh: Stabilize 1.0.8 amd64, #935380 Signed-off-by: Sam James gentoo.org> app-shells/ksh/ksh-1.0.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.8.ebuild b/app-shells/ksh/ksh-1.0.8.ebuild index 518ca2d59d74..5d18e29dc3ca 100644 --- a/app-shells/ksh/ksh-1.0.8.ebuild +++ b/app-shells/ksh/ksh-1.0.8.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 5b2703a15c2e6b33dd90b18547820103cd4ee42c Author: Sam James gentoo org> AuthorDate: Wed Jul 3 02:10:19 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jul 3 02:10:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2703a1 app-shells/ksh: Stabilize 1.0.8 arm, #935380 Signed-off-by: Sam James gentoo.org> app-shells/ksh/ksh-1.0.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.8.ebuild b/app-shells/ksh/ksh-1.0.8.ebuild index c97a769209a6..63bca4e6ec7c 100644 --- a/app-shells/ksh/ksh-1.0.8.ebuild +++ b/app-shells/ksh/ksh-1.0.8.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: e988d6d57e3397b7b6cba321df3b6ec222357f12 Author: Sam James gentoo org> AuthorDate: Wed Jul 3 02:10:21 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jul 3 02:10:21 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e988d6d5 app-shells/ksh: Stabilize 1.0.8 arm64, #935380 Signed-off-by: Sam James gentoo.org> app-shells/ksh/ksh-1.0.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.8.ebuild b/app-shells/ksh/ksh-1.0.8.ebuild index 63bca4e6ec7c..41de753d122a 100644 --- a/app-shells/ksh/ksh-1.0.8.ebuild +++ b/app-shells/ksh/ksh-1.0.8.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: c94daf304a9012350d0dd0c0ee5e4c9326754b6c Author: Sam James gentoo org> AuthorDate: Wed Jul 3 02:10:22 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jul 3 02:10:22 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94daf30 app-shells/ksh: Stabilize 1.0.8 ppc, #935380 Signed-off-by: Sam James gentoo.org> app-shells/ksh/ksh-1.0.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.8.ebuild b/app-shells/ksh/ksh-1.0.8.ebuild index 41de753d122a..518ca2d59d74 100644 --- a/app-shells/ksh/ksh-1.0.8.ebuild +++ b/app-shells/ksh/ksh-1.0.8.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: e439e85e3a5bdfc83c6632a3b81c88a963884aa8 Author: Sam James gentoo org> AuthorDate: Wed Jul 3 00:40:38 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jul 3 00:50:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e439e85e app-shells/ksh: drop 1.0.3 Signed-off-by: Sam James gentoo.org> app-shells/ksh/Manifest | 1 - app-shells/ksh/ksh-1.0.3.ebuild | 76 - 2 files changed, 77 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index be1686c1b570..3624cb03ab83 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,3 +1,2 @@ -DIST ksh-v1.0.3.tar.gz 2110771 BLAKE2B 4316c78f7889fb2e4630a83dd0f1c5c4c4b418a822e8f7d3d9415a83bbef6e993cbd21b4842c7f56cd8647305c4bdddc04562b8788f2ee6e14698a9cb090f386 SHA512 9d6e664bc6c8d102ba09e692d057b9546b07ba3ecb060449df6648e7c99f8dfd670401e6fcf34f6f3de13338a3c31c09596344931ccfdf4cd4e49eabdf005c23 DIST ksh-v1.0.4.tar.gz 2127036 BLAKE2B c3bd7f8d8c86e8bf4f7482c99890f025365334b7ab826261b03f9a2f6bf72b4112ba0cec09c7d5388cbba4541a4e99a24e3b95a98e386b941a39f549c5c21525 SHA512 ca6ff4625a48a991d07a34c8d28656c131124e6cccbb495d8fbc2922db9f94a83c1df2be17a7fa7aa39ce5b9243573b0b806eef87d11c5a2936e7af564d2f5e6 DIST ksh-v1.0.8.tar.gz 2114262 BLAKE2B cf900c4dbdc750a6c4ff6906ab32b24722da3dbb84363517e4d7345c0bc591c346aa82fb58de5fd9662f20dd855deb6f1720002b7d91118ef8497e9f45412148 SHA512 4284ab98f6055877c0715a8b224eb5a75dc7fa022f38c9ee30d50786e997f70b507ee452fc8bbdfa67649a26e0fdfc8051f7e54ff9f6a0f96e44498757080548 diff --git a/app-shells/ksh/ksh-1.0.3.ebuild b/app-shells/ksh/ksh-1.0.3.ebuild deleted file mode 100644 index dd729029724d.. --- a/app-shells/ksh/ksh-1.0.3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -if [[ ${PV} == ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ksh93/ksh"; -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - MY_PV=$(ver_rs 3 - 4 .) - SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; - S="${WORKDIR}/${PN}-${MY_PV}" -fi - -DESCRIPTION="The Original ATT Korn Shell" -HOMEPAGE="http://www.kornshell.com/"; - -LICENSE="EPL-1.0" -SLOT="0" - -src_prepare() { - default - - # disable register for debugging - sed -i 1i"#define register" src/lib/libast/include/ast.h || die -} - -src_compile() { - local extraflags=( - "-Wno-unknown-pragmas" - "-Wno-missing-braces" - "-Wno-unused-result" - "-Wno-return-type" - "-Wno-int-to-pointer-cast" - "-Wno-parentheses" - "-Wno-unused" - "-Wno-unused-but-set-variable" - "-Wno-cpp" - "-Wno-maybe-uninitialized" - "-Wno-lto-type-mismatch" - "-Wno-error=int-conversion" - "-Wno-int-conversion" - "-P" - ) - append-cflags $(test-flags-CC ${extraflags[@]}) - filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379 - export CCFLAGS="${CFLAGS} -fno-strict-aliasing" - - tc-export AR CC LD NM - - sh bin/package make SHELL="${BROOT}"/bin/sh || die -} - -src_test() { - # test tries to catch IO error - addwrite /proc/self/mem - - # arith.sh uses A for tests - unset A - - sh bin/shtests --compile || die -} - -src_install() { - local myhost="$(sh bin/package host)" - cd "arch/${myhost}" || die - - into / - dobin bin/ksh - dosym ksh /bin/rksh - - newman man/man1/sh.1 ksh.1 -}
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: b2a5c6456e0fce45f91bd1d9ad3ac4d2d6e4dc8e Author: Sam James gentoo org> AuthorDate: Wed Jul 3 00:49:54 2024 + Commit: Sam James gentoo org> CommitDate: Wed Jul 3 00:50:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a5c645 app-shells/ksh: add 1.0.9 Also, drop obsolete register hack. As far as I can tell, it was either misguided from the beginning or is at the very least now-obsolete. The function (or lack) of 'register' in C is a misnomer anyway. Signed-off-by: Sam James gentoo.org> app-shells/ksh/Manifest | 1 + app-shells/ksh/{ksh-.ebuild => ksh-1.0.9.ebuild} | 7 --- app-shells/ksh/ksh-.ebuild | 7 --- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 3624cb03ab83..7f5bd74db1b1 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,2 +1,3 @@ DIST ksh-v1.0.4.tar.gz 2127036 BLAKE2B c3bd7f8d8c86e8bf4f7482c99890f025365334b7ab826261b03f9a2f6bf72b4112ba0cec09c7d5388cbba4541a4e99a24e3b95a98e386b941a39f549c5c21525 SHA512 ca6ff4625a48a991d07a34c8d28656c131124e6cccbb495d8fbc2922db9f94a83c1df2be17a7fa7aa39ce5b9243573b0b806eef87d11c5a2936e7af564d2f5e6 DIST ksh-v1.0.8.tar.gz 2114262 BLAKE2B cf900c4dbdc750a6c4ff6906ab32b24722da3dbb84363517e4d7345c0bc591c346aa82fb58de5fd9662f20dd855deb6f1720002b7d91118ef8497e9f45412148 SHA512 4284ab98f6055877c0715a8b224eb5a75dc7fa022f38c9ee30d50786e997f70b507ee452fc8bbdfa67649a26e0fdfc8051f7e54ff9f6a0f96e44498757080548 +DIST ksh-v1.0.9.tar.gz 2084378 BLAKE2B 9cb827003f00261df74e19c6b9dad5f25fba401bc9dabeb300b90b7f3e9e9c37d096e5e24dec7c2ac60b195008d69c9fc682b32b376f7c03cbf9c56779431958 SHA512 747a9b624ee898c84cf37958add17eee6ee8fcb6112701430f0d12d2913b3af22554a98a9836dee6bbbe62adbdb3cbc1d3fb7f2c654f2ce799805d9b1f407683 diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-1.0.9.ebuild similarity index 92% copy from app-shells/ksh/ksh-.ebuild copy to app-shells/ksh/ksh-1.0.9.ebuild index c97a769209a6..96d8ebd86abd 100644 --- a/app-shells/ksh/ksh-.ebuild +++ b/app-shells/ksh/ksh-1.0.9.ebuild @@ -21,13 +21,6 @@ HOMEPAGE="http://www.kornshell.com/"; LICENSE="EPL-1.0" SLOT="0" -src_prepare() { - default - - # disable register for debugging - sed -i 1i"#define register" src/lib/libast/include/ast.h || die -} - src_compile() { local extraflags=( "-Wno-unknown-pragmas" diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-.ebuild index c97a769209a6..96d8ebd86abd 100644 --- a/app-shells/ksh/ksh-.ebuild +++ b/app-shells/ksh/ksh-.ebuild @@ -21,13 +21,6 @@ HOMEPAGE="http://www.kornshell.com/"; LICENSE="EPL-1.0" SLOT="0" -src_prepare() { - default - - # disable register for debugging - sed -i 1i"#define register" src/lib/libast/include/ast.h || die -} - src_compile() { local extraflags=( "-Wno-unknown-pragmas"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 10cd51b1cac70e3f180a04b2e9ea3c6eb46150fd Author: Sam James gentoo org> AuthorDate: Tue Jan 9 02:39:38 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 9 02:39:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10cd51b1 app-shells/ksh: clean up flag handling * Filter LTO instead of just -Wno-erroring things indicating it's unsafe * Try to respect CC/AR/NM more Signed-off-by: Sam James gentoo.org> app-shells/ksh/ksh-1.0.8.ebuild | 9 - app-shells/ksh/ksh-.ebuild | 11 +-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app-shells/ksh/ksh-1.0.8.ebuild b/app-shells/ksh/ksh-1.0.8.ebuild index 4cda30c54705..c97a769209a6 100644 --- a/app-shells/ksh/ksh-1.0.8.ebuild +++ b/app-shells/ksh/ksh-1.0.8.ebuild @@ -40,18 +40,17 @@ src_compile() { "-Wno-unused-but-set-variable" "-Wno-cpp" "-Wno-maybe-uninitialized" - "-Wno-lto-type-mismatch" - "-Wno-error=int-conversion" - "-Wno-int-conversion" "-P" ) append-cflags $(test-flags-CC ${extraflags[@]}) + append-cflags -fno-strict-aliasing filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379 - export CCFLAGS="${CFLAGS} -fno-strict-aliasing" + filter-lto + export CCFLAGS="${CFLAGS}" tc-export AR CC LD NM - sh bin/package make SHELL="${BROOT}"/bin/sh || die + sh bin/package make AR="${AR}" CC="${CC}" NM="${NM}" SHELL="${BROOT}"/bin/sh || die } src_test() { diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-.ebuild index f59df92a2e4a..c97a769209a6 100644 --- a/app-shells/ksh/ksh-.ebuild +++ b/app-shells/ksh/ksh-.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -40,18 +40,17 @@ src_compile() { "-Wno-unused-but-set-variable" "-Wno-cpp" "-Wno-maybe-uninitialized" - "-Wno-lto-type-mismatch" - "-Wno-error=int-conversion" - "-Wno-int-conversion" "-P" ) append-cflags $(test-flags-CC ${extraflags[@]}) + append-cflags -fno-strict-aliasing filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379 - export CCFLAGS="${CFLAGS} -fno-strict-aliasing" + filter-lto + export CCFLAGS="${CFLAGS}" tc-export AR CC LD NM - sh bin/package make SHELL="${BROOT}"/bin/sh || die + sh bin/package make AR="${AR}" CC="${CC}" NM="${NM}" SHELL="${BROOT}"/bin/sh || die } src_test() {
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 81b4d68cb47299f3ead454add4d6c5dfa564f9fe Author: Sam James gentoo org> AuthorDate: Tue Jan 9 01:01:31 2024 + Commit: Sam James gentoo org> CommitDate: Tue Jan 9 01:01:42 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b4d68c app-shells/ksh: add 1.0.8 Closes: https://bugs.gentoo.org/883085 Bug: https://bugs.gentoo.org/829457 Bug: https://bugs.gentoo.org/833964 Signed-off-by: Sam James gentoo.org> app-shells/ksh/Manifest | 1 + app-shells/ksh/{ksh-.ebuild => ksh-1.0.8.ebuild} | 4 ++-- app-shells/ksh/ksh-.ebuild | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 1a0148a5cbcf..be1686c1b570 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,2 +1,3 @@ DIST ksh-v1.0.3.tar.gz 2110771 BLAKE2B 4316c78f7889fb2e4630a83dd0f1c5c4c4b418a822e8f7d3d9415a83bbef6e993cbd21b4842c7f56cd8647305c4bdddc04562b8788f2ee6e14698a9cb090f386 SHA512 9d6e664bc6c8d102ba09e692d057b9546b07ba3ecb060449df6648e7c99f8dfd670401e6fcf34f6f3de13338a3c31c09596344931ccfdf4cd4e49eabdf005c23 DIST ksh-v1.0.4.tar.gz 2127036 BLAKE2B c3bd7f8d8c86e8bf4f7482c99890f025365334b7ab826261b03f9a2f6bf72b4112ba0cec09c7d5388cbba4541a4e99a24e3b95a98e386b941a39f549c5c21525 SHA512 ca6ff4625a48a991d07a34c8d28656c131124e6cccbb495d8fbc2922db9f94a83c1df2be17a7fa7aa39ce5b9243573b0b806eef87d11c5a2936e7af564d2f5e6 +DIST ksh-v1.0.8.tar.gz 2114262 BLAKE2B cf900c4dbdc750a6c4ff6906ab32b24722da3dbb84363517e4d7345c0bc591c346aa82fb58de5fd9662f20dd855deb6f1720002b7d91118ef8497e9f45412148 SHA512 4284ab98f6055877c0715a8b224eb5a75dc7fa022f38c9ee30d50786e997f70b507ee452fc8bbdfa67649a26e0fdfc8051f7e54ff9f6a0f96e44498757080548 diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-1.0.8.ebuild similarity index 91% copy from app-shells/ksh/ksh-.ebuild copy to app-shells/ksh/ksh-1.0.8.ebuild index dd729029724d..4cda30c54705 100644 --- a/app-shells/ksh/ksh-.ebuild +++ b/app-shells/ksh/ksh-1.0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-.ebuild index dd729029724d..f59df92a2e4a 100644 --- a/app-shells/ksh/ksh-.ebuild +++ b/app-shells/ksh/ksh-.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: e95e5c74cbe70423216de726481fde229ee8c0e1 Author: Sam James gentoo org> AuthorDate: Mon Sep 18 09:49:05 2023 + Commit: Sam James gentoo org> CommitDate: Mon Sep 18 09:49:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e95e5c74 app-shells/ksh: retire sultan Signed-off-by: Sam James gentoo.org> app-shells/ksh/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/app-shells/ksh/metadata.xml b/app-shells/ksh/metadata.xml index 2526e8d0cb13..86387b2b102b 100644 --- a/app-shells/ksh/metadata.xml +++ b/app-shells/ksh/metadata.xml @@ -1,10 +1,6 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - sul...@gentoo.org - Stephan Hartmann - gyakov...@gentoo.org Georgy Yakovlev
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: a3329e18fe1e66677e6c10859aeda5cf398adf44 Author: Sam James gentoo org> AuthorDate: Tue Dec 27 19:47:11 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 19:53:22 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3329e18 app-shells/ksh: Stabilize 1.0.4 ppc64, #886017 Signed-off-by: Sam James gentoo.org> app-shells/ksh/ksh-1.0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.4.ebuild b/app-shells/ksh/ksh-1.0.4.ebuild index 9e2da9187a45..932916b79000 100644 --- a/app-shells/ksh/ksh-1.0.4.ebuild +++ b/app-shells/ksh/ksh-1.0.4.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: d90847f1f1122b38df79273cb7909c8472db0f9e Author: Sam James gentoo org> AuthorDate: Tue Dec 27 19:37:03 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 19:45:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d90847f1 app-shells/ksh: Stabilize 1.0.4 hppa, #886017 Signed-off-by: Sam James gentoo.org> app-shells/ksh/ksh-1.0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.4.ebuild b/app-shells/ksh/ksh-1.0.4.ebuild index c34455691fd9..cb540040e266 100644 --- a/app-shells/ksh/ksh-1.0.4.ebuild +++ b/app-shells/ksh/ksh-1.0.4.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 3f180e866470b7d34a38d7dc8ccd917c2eb19619 Author: Sam James gentoo org> AuthorDate: Tue Dec 27 13:39:38 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 13:39:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f180e86 app-shells/ksh: Stabilize 1.0.4 arm64, #886017 Signed-off-by: Sam James gentoo.org> app-shells/ksh/ksh-1.0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.4.ebuild b/app-shells/ksh/ksh-1.0.4.ebuild index 0ffa5fa38a5e..b487266dca45 100644 --- a/app-shells/ksh/ksh-1.0.4.ebuild +++ b/app-shells/ksh/ksh-1.0.4.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: de287316a75553826859d6c3a76f36f3a290eb4a Author: Sam James gentoo org> AuthorDate: Tue Dec 27 11:31:11 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 11:31:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de287316 app-shells/ksh: Stabilize 1.0.4 amd64, #886017 Signed-off-by: Sam James gentoo.org> app-shells/ksh/ksh-1.0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.4.ebuild b/app-shells/ksh/ksh-1.0.4.ebuild index f59df92a2e4a..fbe8124151f8 100644 --- a/app-shells/ksh/ksh-1.0.4.ebuild +++ b/app-shells/ksh/ksh-1.0.4.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 99db582bacdb6e2c19d858c6e1061c284f325186 Author: WANG Xuerui gentoo org> AuthorDate: Fri Dec 2 17:55:37 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Fri Dec 2 18:44:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99db582b app-shells/ksh: keyword 1.0.4 for ~loong Signed-off-by: WANG Xuerui gentoo.org> app-shells/ksh/ksh-1.0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.4.ebuild b/app-shells/ksh/ksh-1.0.4.ebuild index dd729029724d..f59df92a2e4a 100644 --- a/app-shells/ksh/ksh-1.0.4.ebuild +++ b/app-shells/ksh/ksh-1.0.4.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 9bc8f1ae9f5613932909eb9b5bf94d4668424c6e Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Nov 23 00:15:35 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Nov 23 00:24:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bc8f1ae app-shells/ksh: sync live ebuild Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-.ebuild index 8fb7af0f3c4b..dd729029724d 100644 --- a/app-shells/ksh/ksh-.ebuild +++ b/app-shells/ksh/ksh-.ebuild @@ -41,6 +41,8 @@ src_compile() { "-Wno-cpp" "-Wno-maybe-uninitialized" "-Wno-lto-type-mismatch" + "-Wno-error=int-conversion" + "-Wno-int-conversion" "-P" ) append-cflags $(test-flags-CC ${extraflags[@]})
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 3b917ff2d4fe6e2f8d468b51c15998cc904ebd6a Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Nov 23 00:24:05 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Nov 23 00:24:16 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b917ff2 app-shells/ksh: add 1.0.4 Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/Manifest | 1 + app-shells/ksh/ksh-1.0.4.ebuild | 76 + 2 files changed, 77 insertions(+) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index a9111f06f4fe..1a0148a5cbcf 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1 +1,2 @@ DIST ksh-v1.0.3.tar.gz 2110771 BLAKE2B 4316c78f7889fb2e4630a83dd0f1c5c4c4b418a822e8f7d3d9415a83bbef6e993cbd21b4842c7f56cd8647305c4bdddc04562b8788f2ee6e14698a9cb090f386 SHA512 9d6e664bc6c8d102ba09e692d057b9546b07ba3ecb060449df6648e7c99f8dfd670401e6fcf34f6f3de13338a3c31c09596344931ccfdf4cd4e49eabdf005c23 +DIST ksh-v1.0.4.tar.gz 2127036 BLAKE2B c3bd7f8d8c86e8bf4f7482c99890f025365334b7ab826261b03f9a2f6bf72b4112ba0cec09c7d5388cbba4541a4e99a24e3b95a98e386b941a39f549c5c21525 SHA512 ca6ff4625a48a991d07a34c8d28656c131124e6cccbb495d8fbc2922db9f94a83c1df2be17a7fa7aa39ce5b9243573b0b806eef87d11c5a2936e7af564d2f5e6 diff --git a/app-shells/ksh/ksh-1.0.4.ebuild b/app-shells/ksh/ksh-1.0.4.ebuild new file mode 100644 index ..dd729029724d --- /dev/null +++ b/app-shells/ksh/ksh-1.0.4.ebuild @@ -0,0 +1,76 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ksh93/ksh"; +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + MY_PV=$(ver_rs 3 - 4 .) + SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +DESCRIPTION="The Original ATT Korn Shell" +HOMEPAGE="http://www.kornshell.com/"; + +LICENSE="EPL-1.0" +SLOT="0" + +src_prepare() { + default + + # disable register for debugging + sed -i 1i"#define register" src/lib/libast/include/ast.h || die +} + +src_compile() { + local extraflags=( + "-Wno-unknown-pragmas" + "-Wno-missing-braces" + "-Wno-unused-result" + "-Wno-return-type" + "-Wno-int-to-pointer-cast" + "-Wno-parentheses" + "-Wno-unused" + "-Wno-unused-but-set-variable" + "-Wno-cpp" + "-Wno-maybe-uninitialized" + "-Wno-lto-type-mismatch" + "-Wno-error=int-conversion" + "-Wno-int-conversion" + "-P" + ) + append-cflags $(test-flags-CC ${extraflags[@]}) + filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379 + export CCFLAGS="${CFLAGS} -fno-strict-aliasing" + + tc-export AR CC LD NM + + sh bin/package make SHELL="${BROOT}"/bin/sh || die +} + +src_test() { + # test tries to catch IO error + addwrite /proc/self/mem + + # arith.sh uses A for tests + unset A + + sh bin/shtests --compile || die +} + +src_install() { + local myhost="$(sh bin/package host)" + cd "arch/${myhost}" || die + + into / + dobin bin/ksh + dosym ksh /bin/rksh + + newman man/man1/sh.1 ksh.1 +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
commit: 8690ad4324d9e8c2cfd33f28c0238d54cef57ece Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Sep 19 06:31:12 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Sep 19 06:31:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8690ad43 app-shells/ksh: drop 1.0.0_beta2 Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/Manifest | 1 - app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch | 63 --- app-shells/ksh/ksh-1.0.0_beta2.ebuild | 75 --- 3 files changed, 139 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 6b1143d68816..a9111f06f4fe 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,2 +1 @@ -DIST ksh-v1.0.0-beta.2.tar.gz 2238224 BLAKE2B b4eb8e116d0dd8fda498fb8d2805613a73291be628ce87ebc1c47c9bc8c49b236b285accaf35b4c9e411df23b99c6a949b672edeea1f1f317fc85a2b4db48779 SHA512 c2cd5a4b442bcff1dd2c1c054ee79c4cb131dce28d811dcd3476164d6cb7e88e6b317a094b16f227564a1266708ef0cfeca2af0929c00a19497cf1b67c647cf2 DIST ksh-v1.0.3.tar.gz 2110771 BLAKE2B 4316c78f7889fb2e4630a83dd0f1c5c4c4b418a822e8f7d3d9415a83bbef6e993cbd21b4842c7f56cd8647305c4bdddc04562b8788f2ee6e14698a9cb090f386 SHA512 9d6e664bc6c8d102ba09e692d057b9546b07ba3ecb060449df6648e7c99f8dfd670401e6fcf34f6f3de13338a3c31c09596344931ccfdf4cd4e49eabdf005c23 diff --git a/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch b/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch deleted file mode 100644 index 1d46cc3b3f5e.. --- a/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4a1dbcbaa04b6edf4c8c5d950031c6d853acf358 Mon Sep 17 00:00:00 2001 -From: Vincent Mihalkovic -Date: Wed, 11 May 2022 14:27:35 +0200 -Subject: [PATCH] Mamfile: add -lm flag where needed - - src/cmd/builtin/Mamfile | 2 +- - src/cmd/ksh93/Mamfile | 8 - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/cmd/builtin/Mamfile b/src/cmd/builtin/Mamfile -index 16974ae54ad2..f6e726105e43 100644 a/src/cmd/builtin/Mamfile -+++ b/src/cmd/builtin/Mamfile -@@ -50,7 +50,7 @@ make install - exec - ${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""builtin"\" -D_PACKAGE_ast -DCMD_STANDALONE=b_pty -c pty.c - done pty.o generated - bind -lutil dontcare -- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o ${mam_libutil} ${mam_libast} ${mam_libcmd} -+ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o ${mam_libutil} ${mam_libast} ${mam_libcmd} -lm - done pty generated - make ${INSTALLROOT}/bin - exec - if silent test ! -d ${INSTALLROOT}/bin -diff --git a/src/cmd/ksh93/Mamfile b/src/cmd/ksh93/Mamfile -index 3936ff926902..e2899523b634 100644 a/src/cmd/ksh93/Mamfile -+++ b/src/cmd/ksh93/Mamfile -@@ -1219,7 +1219,7 @@ make install - make data/math.tab implicit - done data/math.tab - done features/math.sh dontcare -- exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab -+ exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} -lm : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab - make ${PACKAGE_ast_INCLUDE}/ast_standards.h implicit - done ${PACKAGE_ast_INCLUDE}/ast_standards.h dontcare - make ${INSTALLROOT}/src/lib/libast/FEATURE/float implicit -@@ -1386,7 +1386,7 @@ make install - prev +li - prev ${mam_libsocket} - prev ${mam_libsecdb} -- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libast} -+ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: c3135b33e6c87323af4fa91fb048f9c282e62e7e Author: Stephan Hartmann gentoo org> AuthorDate: Mon Sep 19 06:26:42 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Sep 19 06:27:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3135b33 app-shells/ksh: fix 1.0.3 build with clang Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-1.0.3.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-shells/ksh/ksh-1.0.3.ebuild b/app-shells/ksh/ksh-1.0.3.ebuild index 8fb7af0f3c4b..dd729029724d 100644 --- a/app-shells/ksh/ksh-1.0.3.ebuild +++ b/app-shells/ksh/ksh-1.0.3.ebuild @@ -41,6 +41,8 @@ src_compile() { "-Wno-cpp" "-Wno-maybe-uninitialized" "-Wno-lto-type-mismatch" + "-Wno-error=int-conversion" + "-Wno-int-conversion" "-P" ) append-cflags $(test-flags-CC ${extraflags[@]})
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: fd7b9a178439a54d4acdc2e016a9c5403b2b786f Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Sep 16 20:53:35 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Sep 16 20:56:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7b9a17 app-shells/ksh: sync live ebuild Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-.ebuild index 8e02335af1d6..8fb7af0f3c4b 100644 --- a/app-shells/ksh/ksh-.ebuild +++ b/app-shells/ksh/ksh-.ebuild @@ -1,7 +1,7 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic toolchain-funcs @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 5f641efcaddc9abd72cd07621120fc4ff97460f4 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Sep 16 20:53:14 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Sep 16 20:56:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f641efc app-shells/ksh: keyword 1.0.3 Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-1.0.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.3.ebuild b/app-shells/ksh/ksh-1.0.3.ebuild index 932d1fb06d21..8fb7af0f3c4b 100644 --- a/app-shells/ksh/ksh-1.0.3.ebuild +++ b/app-shells/ksh/ksh-1.0.3.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ksh93/ksh"; else - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" MY_PV=$(ver_rs 3 - 4 .) SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/files/, app-shells/ksh/
commit: 74d540b0cf28755b117e35c6e5e7f10ba463e5b0 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Sep 16 20:50:48 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Sep 16 20:56:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74d540b0 app-shells/ksh: drop 2020.0.0-r1 Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/Manifest| 1 - app-shells/ksh/files/CVE-2019-14868.patch | 89 -- .../ksh/files/ksh-2020.0.0-ensure-user-set.patch | 30 .../ksh/files/ksh-2020.0.0-skip-api-test.patch | 36 - app-shells/ksh/ksh-2020.0.0-r1.ebuild | 50 5 files changed, 206 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 2e62c5d467c2..6b1143d68816 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,3 +1,2 @@ -DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb042c26bfaf1792 DIST ksh-v1.0.0-beta.2.tar.gz 2238224 BLAKE2B b4eb8e116d0dd8fda498fb8d2805613a73291be628ce87ebc1c47c9bc8c49b236b285accaf35b4c9e411df23b99c6a949b672edeea1f1f317fc85a2b4db48779 SHA512 c2cd5a4b442bcff1dd2c1c054ee79c4cb131dce28d811dcd3476164d6cb7e88e6b317a094b16f227564a1266708ef0cfeca2af0929c00a19497cf1b67c647cf2 DIST ksh-v1.0.3.tar.gz 2110771 BLAKE2B 4316c78f7889fb2e4630a83dd0f1c5c4c4b418a822e8f7d3d9415a83bbef6e993cbd21b4842c7f56cd8647305c4bdddc04562b8788f2ee6e14698a9cb090f386 SHA512 9d6e664bc6c8d102ba09e692d057b9546b07ba3ecb060449df6648e7c99f8dfd670401e6fcf34f6f3de13338a3c31c09596344931ccfdf4cd4e49eabdf005c23 diff --git a/app-shells/ksh/files/CVE-2019-14868.patch b/app-shells/ksh/files/CVE-2019-14868.patch deleted file mode 100644 index d5c80566bafc.. --- a/app-shells/ksh/files/CVE-2019-14868.patch +++ /dev/null @@ -1,89 +0,0 @@ -From c7de8b641266bac7c77942239ac659edfee9ecd2 Mon Sep 17 00:00:00 2001 -From: Kurtis Rader -Date: Thu, 12 Dec 2019 18:46:50 -0800 -Subject: [PATCH] Harden env var imports - - src/cmd/ksh93/sh/arith.c| 37 ++--- - src/cmd/ksh93/tests/subshell.sh | 23 - -diff --git a/src/cmd/ksh93/sh/arith.c b/src/cmd/ksh93/sh/arith.c -index 30b3067590a2..8e68cbdc868a 100644 a/src/cmd/ksh93/sh/arith.c -+++ b/src/cmd/ksh93/sh/arith.c -@@ -567,19 +567,32 @@ Sfdouble_t sh_strnum(Shell_t *shp, const char *str, char **ptr, int mode) { - char *last; - - if (*str == 0) { --if (ptr) *ptr = (char *)str; --return 0; --} --errno = 0; --d = number(str, &last, shp->inarith ? 0 : 10, NULL); --if (*last) { --if (*last != '.' || last[1] != '.') { --d = strval(shp, str, &last, arith, mode); --Varsubscript = true; -+d = 0.0; -+last = (char *)str; -+} else { -+d = number(str, &last, shp->inarith ? 0 : 10, NULL); -+if (*last && !shp->inarith && sh_isstate(shp, SH_INIT)) { -+// This call is to handle "base#value" literals if we're importing untrusted env vars. -+d = number(str, &last, 0, NULL); -+} -+if (*last) { -+if (sh_isstate(shp, SH_INIT)) { -+// Initializing means importing untrusted env vars. Since the string does not appear -+// to be a recognized numeric literal give up. We can't safely call strval() since -+// that allows arbitrary expressions which would create a security vulnerability. -+d = 0.0; -+} else { -+if (*last != '.' || last[1] != '.') { -+d = strval(shp, str, &last, arith, mode); -+Varsubscript = true; -+} -+if (!ptr && *last && mode > 0) { -+errormsg(SH_DICT, ERROR_exit(1), e_lexbadchar, *last, str); -+} -+} -+} else if (d == 0.0 && *str == '-') { -+d = -0.0; - } --if (!ptr && *last && mode > 0) errormsg(SH_DICT, ERROR_exit(1), e_lexbadchar, *last, str); --} else if (!d && *str == '-') { --d = -0.0; - } - if (ptr) *ptr = last; - return d; -diff --git a/src/cmd/ksh93/tests/subshell.sh b/src/cmd/ksh93/tests/subshell.sh -index b63a8051ed5c..3faba475d6de 100644 a/src/cmd/ksh93/tests/subshell.sh -+++ b/src/cmd/ksh93/tests/subshell.sh -@@ -856,3 +856,26 @@ for exp in 65535 65536 - dogot=$($SHELL -c 'x=$(printf "%.*c" '$exp' x); print ${#x}' 2>&1) - [[ $got == $exp ]] || log_error "large command substitution failed" "$exp" "$got" - done -+ -+# == -+# Verify that importing untrusted env vars does not allow evaluating arbitrary expressions but doe
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: cbf22f4ddf60e17b2dccd551b46371ba34f72768 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Sep 16 20:49:36 2022 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Sep 16 20:56:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf22f4d app-shells/ksh: add 1.0.3 Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/Manifest | 1 + app-shells/ksh/ksh-1.0.3.ebuild | 74 + 2 files changed, 75 insertions(+) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 28c24db77375..2e62c5d467c2 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,2 +1,3 @@ DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb042c26bfaf1792 DIST ksh-v1.0.0-beta.2.tar.gz 2238224 BLAKE2B b4eb8e116d0dd8fda498fb8d2805613a73291be628ce87ebc1c47c9bc8c49b236b285accaf35b4c9e411df23b99c6a949b672edeea1f1f317fc85a2b4db48779 SHA512 c2cd5a4b442bcff1dd2c1c054ee79c4cb131dce28d811dcd3476164d6cb7e88e6b317a094b16f227564a1266708ef0cfeca2af0929c00a19497cf1b67c647cf2 +DIST ksh-v1.0.3.tar.gz 2110771 BLAKE2B 4316c78f7889fb2e4630a83dd0f1c5c4c4b418a822e8f7d3d9415a83bbef6e993cbd21b4842c7f56cd8647305c4bdddc04562b8788f2ee6e14698a9cb090f386 SHA512 9d6e664bc6c8d102ba09e692d057b9546b07ba3ecb060449df6648e7c99f8dfd670401e6fcf34f6f3de13338a3c31c09596344931ccfdf4cd4e49eabdf005c23 diff --git a/app-shells/ksh/ksh-1.0.3.ebuild b/app-shells/ksh/ksh-1.0.3.ebuild new file mode 100644 index ..932d1fb06d21 --- /dev/null +++ b/app-shells/ksh/ksh-1.0.3.ebuild @@ -0,0 +1,74 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ksh93/ksh"; +else + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv" + MY_PV=$(ver_rs 3 - 4 .) + SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +DESCRIPTION="The Original ATT Korn Shell" +HOMEPAGE="http://www.kornshell.com/"; + +LICENSE="EPL-1.0" +SLOT="0" + +src_prepare() { + default + + # disable register for debugging + sed -i 1i"#define register" src/lib/libast/include/ast.h || die +} + +src_compile() { + local extraflags=( + "-Wno-unknown-pragmas" + "-Wno-missing-braces" + "-Wno-unused-result" + "-Wno-return-type" + "-Wno-int-to-pointer-cast" + "-Wno-parentheses" + "-Wno-unused" + "-Wno-unused-but-set-variable" + "-Wno-cpp" + "-Wno-maybe-uninitialized" + "-Wno-lto-type-mismatch" + "-P" + ) + append-cflags $(test-flags-CC ${extraflags[@]}) + filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379 + export CCFLAGS="${CFLAGS} -fno-strict-aliasing" + + tc-export AR CC LD NM + + sh bin/package make SHELL="${BROOT}"/bin/sh || die +} + +src_test() { + # test tries to catch IO error + addwrite /proc/self/mem + + # arith.sh uses A for tests + unset A + + sh bin/shtests --compile || die +} + +src_install() { + local myhost="$(sh bin/package host)" + cd "arch/${myhost}" || die + + into / + dobin bin/ksh + dosym ksh /bin/rksh + + newman man/man1/sh.1 ksh.1 +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
commit: 512a6bf16cd66a2b365057490db70954b70796a0 Author: Stephan Hartmann gentoo org> AuthorDate: Sun May 15 11:12:56 2022 + Commit: Stephan Hartmann gentoo org> CommitDate: Sun May 15 11:13:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512a6bf1 app-shells/ksh: drop 1.0.0_beta1 Signed-off-by: Stephan Hartmann gentoo.org> app-shells/ksh/Manifest| 1 - .../ksh/files/ksh-1.0.0-beta.1-regre-tests.patch | 365 - app-shells/ksh/ksh-1.0.0_beta1.ebuild | 75 - 3 files changed, 441 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 24f0f4e14531..28c24db77375 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,3 +1,2 @@ DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb042c26bfaf1792 -DIST ksh-v1.0.0-beta.1.tar.gz 2376823 BLAKE2B 0c985bd17bd0a6301205cffa703536c99322b99953e86b8e8266616f70c7d8cab01801f55c5ba2964628cef8c05878f4e721be39987c418b35859952d3a07719 SHA512 968d7c1aef38f0a29f3a32d0aba7bd5138b70d96486443d5b13c4830907aa7344fb7599ca153a55116758413640ba84ec9e6be19a6f0941814f2515a3961b312 DIST ksh-v1.0.0-beta.2.tar.gz 2238224 BLAKE2B b4eb8e116d0dd8fda498fb8d2805613a73291be628ce87ebc1c47c9bc8c49b236b285accaf35b4c9e411df23b99c6a949b672edeea1f1f317fc85a2b4db48779 SHA512 c2cd5a4b442bcff1dd2c1c054ee79c4cb131dce28d811dcd3476164d6cb7e88e6b317a094b16f227564a1266708ef0cfeca2af0929c00a19497cf1b67c647cf2 diff --git a/app-shells/ksh/files/ksh-1.0.0-beta.1-regre-tests.patch b/app-shells/ksh/files/ksh-1.0.0-beta.1-regre-tests.patch deleted file mode 100644 index d9f8b4697d6c.. --- a/app-shells/ksh/files/ksh-1.0.0-beta.1-regre-tests.patch +++ /dev/null @@ -1,365 +0,0 @@ -From 541dd6f286a71c0d1d874807e61551026d03f409 Mon Sep 17 00:00:00 2001 -From: Vincent Mihalkovic -Date: Tue, 3 Aug 2021 10:20:04 +0200 -Subject: [PATCH] src/cmd/ksh93/tests: (temporary) disable failing tests - - src/cmd/ksh93/tests/functions.sh | 2 ++ - src/cmd/ksh93/tests/io.sh| 2 ++ - src/cmd/ksh93/tests/leaks.sh | 49 ++-- - src/cmd/ksh93/tests/tilde.sh | 4 +-- - src/cmd/ksh93/tests/variables.sh | 2 ++ - 5 files changed, 54 insertions(+), 5 deletions(-) - -diff --git a/src/cmd/ksh93/tests/functions.sh b/src/cmd/ksh93/tests/functions.sh -index 731c1a6..43bb32a 100755 a/src/cmd/ksh93/tests/functions.sh -+++ b/src/cmd/ksh93/tests/functions.sh -@@ -146,10 +146,12 @@ fi - if[[ $PWD != "$dir" ]] - then err_exit 'cd inside nested subshell changes $PWD' - fi -+: <<'disabled'# TODO: failing only on i686 arch - fun() "$bin_echo" hello - if[[ $(fun) != hello ]] - then err_exit one line functions not working - fi -+disabled - cat > $tmp/script <<-\! - print -r -- "$1" - ! -diff --git a/src/cmd/ksh93/tests/io.sh b/src/cmd/ksh93/tests/io.sh -index 2752145..f94c801 100755 a/src/cmd/ksh93/tests/io.sh -+++ b/src/cmd/ksh93/tests/io.sh -@@ -241,7 +241,9 @@ then [[ $(3<#) -eq 0 ]] || err_exit "not at position 0" - read -u3 && err_exit "not found pattern not positioning at eof" - cat $tmp/seek | read -r <# *WWW* - [[ $REPLY == *W* ]] || err_exit '<# not working for pipes' -+: <<'disabled'# TODO: failing only on armv7, i686 arch. Reason: https://github.com/att/ast/commit/a5c692e1bd0d800e3f19be249d3170e69cbe001d - { < $tmp/seek <# ((2358336120)) ;} 2> /dev/null || err_exit 'long seek not working' -+disabled - else err_exit "$tmp/seek: cannot open for reading" - fi - redirect 3<&- || 'cannot close 3' -diff --git a/src/cmd/ksh93/tests/leaks.sh b/src/cmd/ksh93/tests/leaks.sh -index 0f50da2..6c8acfd 100755 a/src/cmd/ksh93/tests/leaks.sh -+++ b/src/cmd/ksh93/tests/leaks.sh -@@ -109,6 +109,7 @@ do got=$($SHELL -c 'x=$(printf "%.*c" '$exp' x); print ${#x}' 2>&1) - [[ $got == $exp ]] || err_exit "large command substitution failed -- expected $exp, got $got" - done - -+: <<'disabled'# TODO: upstream, leak sometimes on some archs - data="(v=;sid=;di=;hi=;ti='1328244300';lv='o';id='172.3.161.178';var=(k='conn_num._total';u=;fr=;l='Number of Connections';n='22';t='number';))" - read -C stat <<< "$data" - for ((i=0; i < 8; i++)) # steady state first -@@ -122,8 +123,10 @@ done |while read -u$n -C stat - done{n}<&0- - after=$(getmem) - err_exit_if_leak "memory leak with read -C when deleting compound variable" -+disabled - - # extra 'read's to get to steady state -+: <<'disabled'# TODO: upstream, leak sometimes on some archs - for ((i=0; i < 10; i++)) - doread -C stat <<< "$data" - done -@@ -133,10 +136,12 @@ do read -C stat <<< "$data" - done - after=$(getmem) - err
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
commit: 39b86fa4aea725bf8020389cbfb81c8eac5f848d Author: Stephan Hartmann gentoo org> AuthorDate: Sun May 15 11:10:36 2022 + Commit: Stephan Hartmann gentoo org> CommitDate: Sun May 15 11:11:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b86fa4 app-shells/ksh: fix building with gcc-12 Bug: https://bugs.gentoo.org/840538 Signed-off-by: Stephan Hartmann gentoo.org> app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch | 63 +++ app-shells/ksh/ksh-1.0.0_beta2.ebuild | 4 ++ 2 files changed, 67 insertions(+) diff --git a/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch b/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch new file mode 100644 index ..1d46cc3b3f5e --- /dev/null +++ b/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch @@ -0,0 +1,63 @@ +From 4a1dbcbaa04b6edf4c8c5d950031c6d853acf358 Mon Sep 17 00:00:00 2001 +From: Vincent Mihalkovic +Date: Wed, 11 May 2022 14:27:35 +0200 +Subject: [PATCH] Mamfile: add -lm flag where needed + +--- + src/cmd/builtin/Mamfile | 2 +- + src/cmd/ksh93/Mamfile | 8 + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/cmd/builtin/Mamfile b/src/cmd/builtin/Mamfile +index 16974ae54ad2..f6e726105e43 100644 +--- a/src/cmd/builtin/Mamfile b/src/cmd/builtin/Mamfile +@@ -50,7 +50,7 @@ make install + exec - ${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""builtin"\" -D_PACKAGE_ast -DCMD_STANDALONE=b_pty -c pty.c + done pty.o generated + bind -lutil dontcare +- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o ${mam_libutil} ${mam_libast} ${mam_libcmd} ++ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o ${mam_libutil} ${mam_libast} ${mam_libcmd} -lm + done pty generated + make ${INSTALLROOT}/bin + exec - if silent test ! -d ${INSTALLROOT}/bin +diff --git a/src/cmd/ksh93/Mamfile b/src/cmd/ksh93/Mamfile +index 3936ff926902..e2899523b634 100644 +--- a/src/cmd/ksh93/Mamfile b/src/cmd/ksh93/Mamfile +@@ -1219,7 +1219,7 @@ make install + make data/math.tab implicit + done data/math.tab + done features/math.sh dontcare +- exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab ++ exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} -lm : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab + make ${PACKAGE_ast_INCLUDE}/ast_standards.h implicit + done ${PACKAGE_ast_INCLUDE}/ast_standards.h dontcare + make ${INSTALLROOT}/src/lib/libast/FEATURE/float implicit +@@ -1386,7 +1386,7 @@ make install + prev +li + prev ${mam_libsocket} + prev ${mam_libsecdb} +- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libast} ++ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libast} -lm + done ksh generated + make shcomp + make shcomp.o +@@ -1408,7 +1408,7 @@ make install + prev +li + prev ${mam_libsocket} + prev ${mam_libsecdb} +- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libast} ++ exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libast} -lm + d
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: eeba5436efbda62abc9a0718cb5d8ea536312f4f Author: Matt Turner gentoo org> AuthorDate: Wed Feb 16 07:01:36 2022 + Commit: Matt Turner gentoo org> CommitDate: Wed Feb 16 07:01:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeba5436 app-shells/ksh: Keyword 1.0.0_beta2 alpha, #829226 Signed-off-by: Matt Turner gentoo.org> app-shells/ksh/ksh-1.0.0_beta2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta2.ebuild b/app-shells/ksh/ksh-1.0.0_beta2.ebuild index 4ea8bdc99c17..6ff7b141d0d7 100644 --- a/app-shells/ksh/ksh-1.0.0_beta2.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: cc06ef8686982cdb1179d0a1cadc6c566ca5afa2 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Dec 27 20:07:56 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Dec 27 20:07:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc06ef86 app-shells/ksh: Keyword 1.0.0_beta2 s390, #829226 Signed-off-by: Arthur Zamarin gentoo.org> app-shells/ksh/ksh-1.0.0_beta2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta2.ebuild b/app-shells/ksh/ksh-1.0.0_beta2.ebuild index 3cfdd740bc9a..4ea8bdc99c17 100644 --- a/app-shells/ksh/ksh-1.0.0_beta2.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 3b70f16ab7a93eadc02fff96de9676e3a8e1f482 Author: James Le Cuirot gentoo org> AuthorDate: Tue Dec 21 11:03:19 2021 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Dec 21 11:03:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b70f16a app-shells/ksh: Keyword 1.0.0_beta2 for ~m68k 27 tests failed. 3 of them were numerical, which is not unusual on this platform. 2 of them may have been due to building over NFS. The rest appear to have something to do with line endings, which is a bit more concerning. It generally seems to work though. Signed-off-by: James Le Cuirot gentoo.org> app-shells/ksh/ksh-1.0.0_beta2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta2.ebuild b/app-shells/ksh/ksh-1.0.0_beta2.ebuild index 0e9fc60a7871..3cfdd740bc9a 100644 --- a/app-shells/ksh/ksh-1.0.0_beta2.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86" S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: a5bb9d3829d733d1519925eb229c8b3d147468e2 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Dec 18 03:08:06 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Dec 18 03:08:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5bb9d38 app-shells/ksh: keyword 1.0.0_beta2 for ~sparc Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-1.0.0_beta2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta2.ebuild b/app-shells/ksh/ksh-1.0.0_beta2.ebuild index f9a81e836268..0e9fc60a7871 100644 --- a/app-shells/ksh/ksh-1.0.0_beta2.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 83153ffb182b8043c88ca71443e4ebc84a054414 Author: Rolf Eike Beer sf-mail de> AuthorDate: Fri Dec 17 13:06:37 2021 + Commit: Sam James gentoo org> CommitDate: Sat Dec 18 02:10:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83153ffb app-shells/ksh: keyword 1.0.0_beta1 for sparc, bug #829226 Package-Manager: Portage-3.0.28, Repoman-3.0.3 RepoMan-Options: --include-arches="sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sam James gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index edd609c996e2..ae2481bd2e6b 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" PATCHES=( "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: c0f04fa2a8b583d5832462cfc9e502a888af356b Author: Stephan Hartmann gentoo org> AuthorDate: Fri Dec 17 15:28:16 2021 + Commit: Stephan Hartmann gentoo org> CommitDate: Fri Dec 17 15:28:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f04fa2 app-shells/ksh: bump to 1.0.0_beta2 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Stephan Hartmann gentoo.org> app-shells/ksh/Manifest | 1 + app-shells/ksh/ksh-1.0.0_beta2.ebuild | 71 +++ 2 files changed, 72 insertions(+) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index cfd1ee45c7c6..24f0f4e14531 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,2 +1,3 @@ DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb042c26bfaf1792 DIST ksh-v1.0.0-beta.1.tar.gz 2376823 BLAKE2B 0c985bd17bd0a6301205cffa703536c99322b99953e86b8e8266616f70c7d8cab01801f55c5ba2964628cef8c05878f4e721be39987c418b35859952d3a07719 SHA512 968d7c1aef38f0a29f3a32d0aba7bd5138b70d96486443d5b13c4830907aa7344fb7599ca153a55116758413640ba84ec9e6be19a6f0941814f2515a3961b312 +DIST ksh-v1.0.0-beta.2.tar.gz 2238224 BLAKE2B b4eb8e116d0dd8fda498fb8d2805613a73291be628ce87ebc1c47c9bc8c49b236b285accaf35b4c9e411df23b99c6a949b672edeea1f1f317fc85a2b4db48779 SHA512 c2cd5a4b442bcff1dd2c1c054ee79c4cb131dce28d811dcd3476164d6cb7e88e6b317a094b16f227564a1266708ef0cfeca2af0929c00a19497cf1b67c647cf2 diff --git a/app-shells/ksh/ksh-1.0.0_beta2.ebuild b/app-shells/ksh/ksh-1.0.0_beta2.ebuild new file mode 100644 index ..f9a81e836268 --- /dev/null +++ b/app-shells/ksh/ksh-1.0.0_beta2.ebuild @@ -0,0 +1,71 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="The Original ATT Korn Shell" +HOMEPAGE="http://www.kornshell.com/"; + +MY_PV=$(ver_rs 3 - 4 .) +SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; + +LICENSE="EPL-1.0" +SLOT="0" + +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + default + + # disable register for debugging + sed -i 1i"#define register" src/lib/libast/include/ast.h || die +} + +src_compile() { + local extraflags=( + "-Wno-unknown-pragmas" + "-Wno-missing-braces" + "-Wno-unused-result" + "-Wno-return-type" + "-Wno-int-to-pointer-cast" + "-Wno-parentheses" + "-Wno-unused" + "-Wno-unused-but-set-variable" + "-Wno-cpp" + "-Wno-maybe-uninitialized" + "-Wno-lto-type-mismatch" + "-P" + ) + append-cflags $(test-flags-CC ${extraflags[@]}) + filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379 + export CCFLAGS="${CFLAGS} -fno-strict-aliasing" + + tc-export AR CC LD NM + + sh bin/package make SHELL="${BROOT}"/bin/sh || die +} + +src_test() { + # test tries to catch IO error + addwrite /proc/self/mem + + # arith.sh uses A for tests + unset A + + sh bin/shtests --compile || die +} + +src_install() { + local myhost="$(sh bin/package host)" + cd "arch/${myhost}" || die + + into / + dobin bin/ksh + dosym ksh /bin/rksh + + newman man/man1/sh.1 ksh.1 +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 0b7b5aa1f5ee7e9b042615b99815a7a1ad04017d Author: Mike Gilbert gentoo org> AuthorDate: Wed Dec 15 16:52:19 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Dec 15 16:53:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7b5aa1 app-shells/ksh: use dobin Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 4 ++-- app-shells/ksh/ksh-.ebuild| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index fc838994841f..edd609c996e2 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -67,8 +67,8 @@ src_install() { local myhost="$(sh bin/package host)" cd "arch/${myhost}" || die - dodir /bin - mv bin/ksh "${ED}"/bin/ || die + into / + dobin bin/ksh dosym ksh /bin/rksh newman man/man1/sh.1 ksh.1 diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-.ebuild index 15fbc5bb62c7..8e02335af1d6 100644 --- a/app-shells/ksh/ksh-.ebuild +++ b/app-shells/ksh/ksh-.ebuild @@ -66,8 +66,8 @@ src_install() { local myhost="$(sh bin/package host)" cd "arch/${myhost}" || die - dodir /bin - mv bin/ksh "${ED}"/bin/ || die + into / + dobin bin/ksh dosym ksh /bin/rksh newman man/man1/sh.1 ksh.1
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: a4413540ca1cb0c174a8b7286232f1f22c02ac47 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Dec 15 15:47:45 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Dec 15 15:48:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4413540 app-shells/ksh: Keyword 1.0.0_beta1 hppa, #829226 Signed-off-by: Arthur Zamarin gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index 1975fc029304..fc838994841f 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86" PATCHES=( "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 90d61f4d35b5ba451430b07824fe32ef9ef74d4a Author: Arthur Zamarin gentoo org> AuthorDate: Wed Dec 15 08:23:00 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Dec 15 08:23:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d61f4d app-shells/ksh: Keyword 1.0.0_beta1 ia64, #829226 Signed-off-by: Arthur Zamarin gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index 500621f54ee8..1975fc029304 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" PATCHES=( "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: e955b7302c96ee523b7d1bb5914d05186519eb27 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Dec 15 07:56:56 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Dec 15 07:57:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e955b730 app-shells/ksh: Keyword 1.0.0_beta1 arm, #829226 Signed-off-by: Arthur Zamarin gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index 55cb01657d83..500621f54ee8 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" PATCHES=( "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: eaa81db059dd8dd3d2ec05bf319b9670b27a4259 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Dec 15 07:13:26 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Dec 15 07:13:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa81db0 app-shells/ksh: Keyword 1.0.0_beta1 x86, #829226 Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index 3069f591bc44..55cb01657d83 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86" PATCHES=( "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 70583258fdc6ba1d97567b0246acc3899c000de7 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Dec 15 07:04:51 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Dec 15 07:06:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70583258 app-shells/ksh: add , based on https://github.com/ksh93/ksh Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-.ebuild | 74 ++ 1 file changed, 74 insertions(+) diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-.ebuild new file mode 100644 index ..15fbc5bb62c7 --- /dev/null +++ b/app-shells/ksh/ksh-.ebuild @@ -0,0 +1,74 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ksh93/ksh"; +else + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv" + MY_PV=$(ver_rs 3 - 4 .) + SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +DESCRIPTION="The Original ATT Korn Shell" +HOMEPAGE="http://www.kornshell.com/"; + +LICENSE="EPL-1.0" +SLOT="0" + +src_prepare() { + default + + # disable register for debugging + sed -i 1i"#define register" src/lib/libast/include/ast.h || die +} + +src_compile() { + local extraflags=( + "-Wno-unknown-pragmas" + "-Wno-missing-braces" + "-Wno-unused-result" + "-Wno-return-type" + "-Wno-int-to-pointer-cast" + "-Wno-parentheses" + "-Wno-unused" + "-Wno-unused-but-set-variable" + "-Wno-cpp" + "-Wno-maybe-uninitialized" + "-Wno-lto-type-mismatch" + "-P" + ) + append-cflags $(test-flags-CC ${extraflags[@]}) + filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379 + export CCFLAGS="${CFLAGS} -fno-strict-aliasing" + + tc-export AR CC LD NM + + sh bin/package make SHELL="${BROOT}"/bin/sh || die +} + +src_test() { + # test tries to catch IO error + addwrite /proc/self/mem + + # arith.sh uses A for tests + unset A + + sh bin/shtests --compile || die +} + +src_install() { + local myhost="$(sh bin/package host)" + cd "arch/${myhost}" || die + + dodir /bin + mv bin/ksh "${ED}"/bin/ || die + dosym ksh /bin/rksh + + newman man/man1/sh.1 ksh.1 +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: afb488c2a68d3c405c3b6ea0c3257c151b6be8b4 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Dec 15 06:55:16 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Dec 15 06:55:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb488c2 app-shells/ksh: drop Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-.ebuild | 44 -- 1 file changed, 44 deletions(-) diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-.ebuild deleted file mode 100644 index e5b08b6bef9c.. --- a/app-shells/ksh/ksh-.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson ninja-utils - -if [[ ${PV} == ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/att/ast"; -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"; - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" -HOMEPAGE="https://github.com/att/ast"; - -LICENSE="CPL-1.0 EPL-1.0" -SLOT="0" - -RDEPEND="!app-shells/pdksh" - -src_test() { - # https://bugs.gentoo.org/702570 - addwrite /proc/self - local cmd=( - meson test - -C "${BUILD_DIR}" - --num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})" - ) - echo "${cmd[@]}" >&2 - # https://github.com/att/ast/issues/1392 - env -u T "${cmd[@]}" || die -} - -src_install() { - meson_src_install - dodir /bin - mv "${ED}/usr/bin/ksh" "${ED}/bin/ksh" || die -}
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 98935d686000cce9258c2c97331c2e6f359c6f16 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Dec 15 06:00:32 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Dec 15 06:45:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98935d68 app-shells/ksh: add ~arm64 keyword to commented-out section Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index 21375eae704b..304130674c29 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -#KEYWORDS="~amd64 ~ppc64" +#KEYWORDS="~amd64 ~arm64 ~ppc64" PATCHES=( "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 402521153b1690fcb0c15eda2b5b6c403737765a Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Dec 15 06:16:36 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Dec 15 06:45:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40252115 app-shells/ksh: keyword 1.0.0_beta1 Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index ee1a65718159..3069f591bc44 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -#KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv" PATCHES=( "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 128f6e789994c96e1c190b120d0df30fbcc78bd1 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Dec 15 06:12:06 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Dec 15 06:45:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128f6e78 app-shells/ksh: add ~riscv keyword to commented-out section Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index 304130674c29..4b6a06c3c158 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -#KEYWORDS="~amd64 ~arm64 ~ppc64" +#KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" PATCHES=( "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 75e72eda9e7caf1c026161d720f6b023d500f5aa Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Dec 15 06:13:18 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Dec 15 06:45:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75e72eda app-shells/ksh: add ~ppc keyword to commented-out section Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index 4b6a06c3c158..ee1a65718159 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -#KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +#KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv" PATCHES=( "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/files/, app-shells/ksh/
commit: 934d7042efb591a3d37f6207bf35fd8680ee7599 Author: Stephan Hartmann gentoo org> AuthorDate: Sat Nov 20 20:10:40 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Dec 15 05:30:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=934d7042 app-shells/ksh: bump to 1.0.0_beta1 PR: https://github.com/gentoo/gentoo/pull/23012 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Stephan Hartmann gentoo.org> Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/Manifest| 1 + .../ksh/files/ksh-1.0.0-beta.1-regre-tests.patch | 365 + app-shells/ksh/ksh-1.0.0_beta1.ebuild | 74 + app-shells/ksh/metadata.xml| 11 +- 4 files changed, 449 insertions(+), 2 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 13f85b68cedb..cfd1ee45c7c6 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1 +1,2 @@ DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb042c26bfaf1792 +DIST ksh-v1.0.0-beta.1.tar.gz 2376823 BLAKE2B 0c985bd17bd0a6301205cffa703536c99322b99953e86b8e8266616f70c7d8cab01801f55c5ba2964628cef8c05878f4e721be39987c418b35859952d3a07719 SHA512 968d7c1aef38f0a29f3a32d0aba7bd5138b70d96486443d5b13c4830907aa7344fb7599ca153a55116758413640ba84ec9e6be19a6f0941814f2515a3961b312 diff --git a/app-shells/ksh/files/ksh-1.0.0-beta.1-regre-tests.patch b/app-shells/ksh/files/ksh-1.0.0-beta.1-regre-tests.patch new file mode 100644 index ..d9f8b4697d6c --- /dev/null +++ b/app-shells/ksh/files/ksh-1.0.0-beta.1-regre-tests.patch @@ -0,0 +1,365 @@ +From 541dd6f286a71c0d1d874807e61551026d03f409 Mon Sep 17 00:00:00 2001 +From: Vincent Mihalkovic +Date: Tue, 3 Aug 2021 10:20:04 +0200 +Subject: [PATCH] src/cmd/ksh93/tests: (temporary) disable failing tests + +--- + src/cmd/ksh93/tests/functions.sh | 2 ++ + src/cmd/ksh93/tests/io.sh| 2 ++ + src/cmd/ksh93/tests/leaks.sh | 49 ++-- + src/cmd/ksh93/tests/tilde.sh | 4 +-- + src/cmd/ksh93/tests/variables.sh | 2 ++ + 5 files changed, 54 insertions(+), 5 deletions(-) + +diff --git a/src/cmd/ksh93/tests/functions.sh b/src/cmd/ksh93/tests/functions.sh +index 731c1a6..43bb32a 100755 +--- a/src/cmd/ksh93/tests/functions.sh b/src/cmd/ksh93/tests/functions.sh +@@ -146,10 +146,12 @@ fi + if[[ $PWD != "$dir" ]] + then err_exit 'cd inside nested subshell changes $PWD' + fi ++: <<'disabled'# TODO: failing only on i686 arch + fun() "$bin_echo" hello + if[[ $(fun) != hello ]] + then err_exit one line functions not working + fi ++disabled + cat > $tmp/script <<-\! + print -r -- "$1" + ! +diff --git a/src/cmd/ksh93/tests/io.sh b/src/cmd/ksh93/tests/io.sh +index 2752145..f94c801 100755 +--- a/src/cmd/ksh93/tests/io.sh b/src/cmd/ksh93/tests/io.sh +@@ -241,7 +241,9 @@ then [[ $(3<#) -eq 0 ]] || err_exit "not at position 0" + read -u3 && err_exit "not found pattern not positioning at eof" + cat $tmp/seek | read -r <# *WWW* + [[ $REPLY == *W* ]] || err_exit '<# not working for pipes' ++: <<'disabled'# TODO: failing only on armv7, i686 arch. Reason: https://github.com/att/ast/commit/a5c692e1bd0d800e3f19be249d3170e69cbe001d + { < $tmp/seek <# ((2358336120)) ;} 2> /dev/null || err_exit 'long seek not working' ++disabled + else err_exit "$tmp/seek: cannot open for reading" + fi + redirect 3<&- || 'cannot close 3' +diff --git a/src/cmd/ksh93/tests/leaks.sh b/src/cmd/ksh93/tests/leaks.sh +index 0f50da2..6c8acfd 100755 +--- a/src/cmd/ksh93/tests/leaks.sh b/src/cmd/ksh93/tests/leaks.sh +@@ -109,6 +109,7 @@ do got=$($SHELL -c 'x=$(printf "%.*c" '$exp' x); print ${#x}' 2>&1) + [[ $got == $exp ]] || err_exit "large command substitution failed -- expected $exp, got $got" + done + ++: <<'disabled'# TODO: upstream, leak sometimes on some archs + data="(v=;sid=;di=;hi=;ti='1328244300';lv='o';id='172.3.161.178';var=(k='conn_num._total';u=;fr=;l='Number of Connections';n='22';t='number';))" + read -C stat <<< "$data" + for ((i=0; i < 8; i++)) # steady state first +@@ -122,8 +123,10 @@ done |while read -u$n -C stat + done{n}<&0- + after=$(getmem) + err_exit_if_leak "memory leak with read -C when deleting compound variable" ++disabled + + # extra 'read's to get to steady state ++: <<'disabled'# TODO: upstream, leak sometimes on some archs + for ((i=0; i < 10; i++)) + doread -C stat <<< "$data" + done +@@ -133,10 +136,12 @@ do read -C stat <<< "$data" + done + after=$(getmem) + err_exit_if_leak "memory leak with read -C when using <<<" ++disabled + + # == + # Unsetting an asso
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 9cfe249ff90948b321cabbca74af0166ff6d4329 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Dec 15 05:27:24 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Dec 15 05:30:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cfe249f app-shells/ksh: unkeyword 1.0.0_beta1 for ~amd64, ~ppc64 let's test it a bit more before adding keywords Closes: https://github.com/gentoo/gentoo/pull/23012 Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index 5ff5c24b8405..21375eae704b 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="~amd64 ~ppc64" +#KEYWORDS="~amd64 ~ppc64" PATCHES=( "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 26ec0abc9d4c8663015a2d17dac6fa2793ac7513 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Dec 15 05:27:08 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Dec 15 05:30:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ec0abc app-shells/ksh: keyword 1.0.0_beta1 for ~ppc64 PR: https://github.com/gentoo/gentoo/pull/23012 Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index 367ed0231350..5ff5c24b8405 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"; LICENSE="EPL-1.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~ppc64" PATCHES=( "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 19faca266aa99d0158a60bbdf4682b4023ab95b9 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Dec 14 21:34:49 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Dec 15 05:30:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19faca26 app-shells/ksh: filter out -fdiagnostics-color=always PR: https://github.com/gentoo/gentoo/pull/23012 Issue: https://github.com/ksh93/ksh/issues/379 Signed-off-by: Georgy Yakovlev gentoo.org> app-shells/ksh/ksh-1.0.0_beta1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild index 2ef94ea8022c..367ed0231350 100644 --- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-1.0.0_beta1.ebuild @@ -45,6 +45,7 @@ src_compile() { "-P" ) append-cflags $(test-flags-CC ${extraflags[@]}) + filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379 export CCFLAGS="${CFLAGS} -fno-strict-aliasing" tc-export AR CC LD NM
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 7a385d4edde581a6704e2051ed44881b5fbcce6c Author: Mike Gilbert gentoo org> AuthorDate: Sun Sep 5 18:51:09 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Sep 5 19:01:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a385d4e app-shells/ksh: inherit ninja-utils Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/ksh-2020.0.0-r1.ebuild | 4 ++-- app-shells/ksh/ksh-.ebuild| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-shells/ksh/ksh-2020.0.0-r1.ebuild b/app-shells/ksh/ksh-2020.0.0-r1.ebuild index 3c4891ea637..5eb45fad578 100644 --- a/app-shells/ksh/ksh-2020.0.0-r1.ebuild +++ b/app-shells/ksh/ksh-2020.0.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit meson +inherit meson ninja-utils if [[ ${PV} == ]]; then inherit git-r3 diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-.ebuild index 9e136daa8ef..e5b08b6bef9 100644 --- a/app-shells/ksh/ksh-.ebuild +++ b/app-shells/ksh/ksh-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit meson +inherit meson ninja-utils if [[ ${PV} == ]]; then inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: b645f9ce075bc2f69a15a24f400e38e35f20fda3 Author: Mike Gilbert gentoo org> AuthorDate: Tue Dec 1 16:12:53 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Dec 1 16:12:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b645f9ce app-shells/ksh: maintainer needed Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app-shells/ksh/metadata.xml b/app-shells/ksh/metadata.xml index 6018c787c35..c81eecc0500 100644 --- a/app-shells/ksh/metadata.xml +++ b/app-shells/ksh/metadata.xml @@ -1,10 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - flop...@gentoo.org - Mike Gilbert - + The KornShell language was designed and developed by David G. Korn at AT&T Bell Laboratories. It is an interactive command language that
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
commit: 17c85a06ac2f352567348a04c4f682c950105417 Author: Mike Gilbert gentoo org> AuthorDate: Fri Feb 7 16:07:03 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Feb 7 16:07:24 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c85a06 app-shells/ksh: add fix for CVE-2019-14868 Bug: https://bugs.gentoo.org/708618 Package-Manager: Portage-2.3.86_p1, Repoman-2.3.20_p43 Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/files/CVE-2019-14868.patch | 89 ++ ...{ksh-2020.0.0.ebuild => ksh-2020.0.0-r1.ebuild} | 3 +- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/app-shells/ksh/files/CVE-2019-14868.patch b/app-shells/ksh/files/CVE-2019-14868.patch new file mode 100644 index 000..d5c80566baf --- /dev/null +++ b/app-shells/ksh/files/CVE-2019-14868.patch @@ -0,0 +1,89 @@ +From c7de8b641266bac7c77942239ac659edfee9ecd2 Mon Sep 17 00:00:00 2001 +From: Kurtis Rader +Date: Thu, 12 Dec 2019 18:46:50 -0800 +Subject: [PATCH] Harden env var imports + +--- + src/cmd/ksh93/sh/arith.c| 37 ++--- + src/cmd/ksh93/tests/subshell.sh | 23 + +diff --git a/src/cmd/ksh93/sh/arith.c b/src/cmd/ksh93/sh/arith.c +index 30b3067590a2..8e68cbdc868a 100644 +--- a/src/cmd/ksh93/sh/arith.c b/src/cmd/ksh93/sh/arith.c +@@ -567,19 +567,32 @@ Sfdouble_t sh_strnum(Shell_t *shp, const char *str, char **ptr, int mode) { + char *last; + + if (*str == 0) { +-if (ptr) *ptr = (char *)str; +-return 0; +-} +-errno = 0; +-d = number(str, &last, shp->inarith ? 0 : 10, NULL); +-if (*last) { +-if (*last != '.' || last[1] != '.') { +-d = strval(shp, str, &last, arith, mode); +-Varsubscript = true; ++d = 0.0; ++last = (char *)str; ++} else { ++d = number(str, &last, shp->inarith ? 0 : 10, NULL); ++if (*last && !shp->inarith && sh_isstate(shp, SH_INIT)) { ++// This call is to handle "base#value" literals if we're importing untrusted env vars. ++d = number(str, &last, 0, NULL); ++} ++if (*last) { ++if (sh_isstate(shp, SH_INIT)) { ++// Initializing means importing untrusted env vars. Since the string does not appear ++// to be a recognized numeric literal give up. We can't safely call strval() since ++// that allows arbitrary expressions which would create a security vulnerability. ++d = 0.0; ++} else { ++if (*last != '.' || last[1] != '.') { ++d = strval(shp, str, &last, arith, mode); ++Varsubscript = true; ++} ++if (!ptr && *last && mode > 0) { ++errormsg(SH_DICT, ERROR_exit(1), e_lexbadchar, *last, str); ++} ++} ++} else if (d == 0.0 && *str == '-') { ++d = -0.0; + } +-if (!ptr && *last && mode > 0) errormsg(SH_DICT, ERROR_exit(1), e_lexbadchar, *last, str); +-} else if (!d && *str == '-') { +-d = -0.0; + } + if (ptr) *ptr = last; + return d; +diff --git a/src/cmd/ksh93/tests/subshell.sh b/src/cmd/ksh93/tests/subshell.sh +index b63a8051ed5c..3faba475d6de 100644 +--- a/src/cmd/ksh93/tests/subshell.sh b/src/cmd/ksh93/tests/subshell.sh +@@ -856,3 +856,26 @@ for exp in 65535 65536 + dogot=$($SHELL -c 'x=$(printf "%.*c" '$exp' x); print ${#x}' 2>&1) + [[ $got == $exp ]] || log_error "large command substitution failed" "$exp" "$got" + done ++ ++# == ++# Verify that importing untrusted env vars does not allow evaluating arbitrary expressions but does ++# recognize all integer literals recognized by ksh. ++expect=8 ++actual=$(env SHLVL='7' $SHELL -c 'echo $SHLVL') ++[[ $actual == $expect ]] || log_error "decimal int literal not recognized" "$expect" "$actual" ++ ++expect=14 ++actual=$(env SHLVL='013' $SHELL -c 'echo $SHLVL') ++[[ $actual == $expect ]] || log_error "leading zeros int literal not recognized" "$expect" "$actual" ++ ++expect=4 ++actual=$(env SHLVL='2#11' $SHELL -c 'echo $SHLVL') ++[[ $actual == $expect ]] || log_error "base#value int literal not recognized" "$expect" "$actual" ++ ++expect=12 ++actual=$(env SHLVL='16#B' $SHELL -c 'echo $SHLVL') ++[[ $actual == $expect ]] || log_error "base#value int literal not recognized" "$expect" "$actual" ++ ++expect=1 ++actual=$(env SHLVL="2#11+x[\$($bin_echo DANGER WILL ROBINSON >&2)0]" $SHELL -c 'echo $SHLVL') ++[[ $actual == $expect ]] || log_error "expression allowed on env var import" "$expect" "$actual" diff --git a/app-shells/ksh/ksh-2020.0.0.ebuild b/app-shells/ksh/ksh-2020.0.0-r1.ebuild similarity index 93% rename from app-shells/ksh/ksh-2020.0.0.ebuild rename to app-shells/ksh/ksh-2020.0.0-r1.ebuild index 6b40cd31299..3c4891ea637 100644 --- a/app-shells/ksh/ksh-2020.0.0.eb
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 8b42bd86078841fb1a871588694463c63f4a48ab Author: Mike Gilbert gentoo org> AuthorDate: Wed Dec 11 20:38:42 2019 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Dec 11 20:39:08 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b42bd86 app-shells/ksh: addwrite /proc/self for tests Closes: https://bugs.gentoo.org/702570 Package-Manager: Portage-2.3.80_p5, Repoman-2.3.19_p4 Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/ksh-2020.0.0.ebuild | 3 ++- app-shells/ksh/ksh-.ebuild | 13 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-2020.0.0.ebuild b/app-shells/ksh/ksh-2020.0.0.ebuild index c2f9bb7797e..6b40cd31299 100644 --- a/app-shells/ksh/ksh-2020.0.0.ebuild +++ b/app-shells/ksh/ksh-2020.0.0.ebuild @@ -30,12 +30,13 @@ PATCHES=( ) src_test() { + # https://bugs.gentoo.org/702570 + addwrite /proc/self local cmd=( meson test -C "${BUILD_DIR}" --num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})" ) - echo "${cmd[@]}" >&2 # https://github.com/att/ast/issues/1392 env -u T "${cmd[@]}" || die diff --git a/app-shells/ksh/ksh-.ebuild b/app-shells/ksh/ksh-.ebuild index 2ccad3528bf..9e136daa8ef 100644 --- a/app-shells/ksh/ksh-.ebuild +++ b/app-shells/ksh/ksh-.ebuild @@ -24,6 +24,19 @@ SLOT="0" RDEPEND="!app-shells/pdksh" +src_test() { + # https://bugs.gentoo.org/702570 + addwrite /proc/self + local cmd=( + meson test + -C "${BUILD_DIR}" + --num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})" + ) + echo "${cmd[@]}" >&2 + # https://github.com/att/ast/issues/1392 + env -u T "${cmd[@]}" || die +} + src_install() { meson_src_install dodir /bin
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/files/, app-shells/ksh/
commit: d9c8bde42bba32c9b5c09096a039902de6ce9fbe Author: Mike Gilbert gentoo org> AuthorDate: Thu Oct 10 18:51:35 2019 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Oct 10 18:51:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c8bde4 app-shells/ksh: bump to 2020.0.0 Package-Manager: Portage-2.3.76_p10, Repoman-2.3.17_p62 Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/Manifest| 5 +-- .../ksh/files/ksh-2020.0.0-ensure-user-set.patch | 30 ++ .../ksh/files/ksh-2020.0.0-skip-api-test.patch | 36 ++ ...h-2020.0.0_beta1.ebuild => ksh-2020.0.0.ebuild} | 17 ++ app-shells/ksh/ksh-2020.0.0_alpha1.ebuild | 33 5 files changed, 84 insertions(+), 37 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index b16fc0418a8..13f85b68ced 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,4 +1 @@ -DIST ksh-2020.0.0-alpha1-conftab.patch 118773 BLAKE2B 63466e18a77cb86af80d6f6b4af74e3ac1edbfa735decfcd772633808a4593f6d4b057a99547482d17b22445e68c6d3e2becdf68516f913c73550da718f2abc3 SHA512 b29a70e8e31a259ac5bf556ddcdb5d4742a8dac4d11c06e4b5fc3043012e08b26d136cce8c18e9e8a1fe751044699d2258388d618408b09379732bea89a51765 -DIST ksh-2020.0.0-alpha1-solaris.patch 12317 BLAKE2B 90681bde2f3bad0e097a9367ea5a3f1d4c95f70c6e0c872dad769609f97a6332328e21399a3b9ba20f3840b3387a02370831ae4663457728bd8e41b7471c675b SHA512 5a0b818f44a860210e2a7795335d0edec01c61dd5ad04670bb2ca505690ff1b111dbda12d0d15e8b264113d4e7a5a42a49f64c9aba0cff809c2ce3185921acad -DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981 -DIST ksh-2020.0.0-beta1.tar.gz 2022254 BLAKE2B 650ad8ea1140bdbe1fb9fc3e2ecbceedb4605525523584d9ac8a067511ed385f1c83d284c781b31140760500f3de13d1ad8fc695c9c553a3285d5c286a99c7ea SHA512 6f54cdc3c59b44055cc6b670b38ce1685463c841a093a28c5f974dd153eaec3b8924308b353ed7c29a0ec3917ee87cfe57b6cabaca9841633d3599d9c6731330 +DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb042c26bfaf1792 diff --git a/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch b/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch new file mode 100644 index 000..9f5d70f4d33 --- /dev/null +++ b/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch @@ -0,0 +1,30 @@ +From cb9f6d3498622b46de021a7f4798512d203747e9 Mon Sep 17 00:00:00 2001 +From: Kurtis Rader +Date: Sun, 1 Sep 2019 15:44:40 -0700 +Subject: [PATCH] Ensure USER is set when unit tests run + +Related #1391 +--- + src/cmd/ksh93/tests/util/run_test.sh | 9 + + 1 file changed, 9 insertions(+) + +diff --git a/src/cmd/ksh93/tests/util/run_test.sh b/src/cmd/ksh93/tests/util/run_test.sh +index 20d24ed1fda..ebc74770cae 100644 +--- a/src/cmd/ksh93/tests/util/run_test.sh b/src/cmd/ksh93/tests/util/run_test.sh +@@ -62,6 +62,15 @@ fi + # + export OS_NAME=$(uname -s | tr '[A-Z]' '[a-z]') + ++# ++# Make sure $USER is set. A CI/CB environment might not set it. ++# See https://github.com/att/ast/issues/1391 ++# ++if [[ -z $USER ]] ++then ++export USER=$(id -un) ++fi ++ + # TODO: Enable the `io` test on Travis macOS once we understand why it dies from an abort(). + # I'm not seeing that failure happen on either of my macOS 10.12 or 10.13 systems. + if [[ $test_name == io && $OS_NAME == darwin && $CI == true ]] diff --git a/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch b/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch new file mode 100644 index 000..f832d175454 --- /dev/null +++ b/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch @@ -0,0 +1,36 @@ +From d89753b5d38482f4a3f17ba3b7d09ab07cfe7419 Mon Sep 17 00:00:00 2001 +From: Kurtis Rader +Date: Sun, 1 Sep 2019 13:47:40 -0700 +Subject: [PATCH] Skip API test if build type != debug + +Fixes #1390 +--- + src/lib/libast/tests/misc/meson.build | 8 +++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/lib/libast/tests/misc/meson.build b/src/lib/libast/tests/misc/meson.build +index 67a178762fa..a4c864428d8 100644 +--- a/src/lib/libast/tests/misc/meson.build b/src/lib/libast/tests/misc/meson.build +@@ -10,6 +10,12 @@ tests_to_skip = [ + ['freebsd', 'debug'], + ] + ++# Non-debug build types affect the behavior of `backtrace()`. Which means it will almost certainly ++# break the "debug" test. See https://github.com/att/ast/issues/1390. ++if get_option('buildtype') != 'debug' ++t
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 5b861f24a87a9b57d7ecc45e8d7ea446f0577c93 Author: Mike Gilbert gentoo org> AuthorDate: Tue Sep 17 02:19:33 2019 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Sep 17 02:19:33 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b861f24 app-shells/ksh: add live ebuild Package-Manager: Portage-2.3.75_p7, Repoman-2.3.17_p49 Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/ksh-2020.0.0_beta1.ebuild| 17 +++-- .../ksh/{ksh-2020.0.0_beta1.ebuild => ksh-.ebuild} | 17 +++-- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app-shells/ksh/ksh-2020.0.0_beta1.ebuild b/app-shells/ksh/ksh-2020.0.0_beta1.ebuild index 4927a8e7fe1..2ccad3528bf 100644 --- a/app-shells/ksh/ksh-2020.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-2020.0.0_beta1.ebuild @@ -5,17 +5,22 @@ EAPI=7 inherit meson +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/att/ast"; +else + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" + MY_PV="${PV/_/-}" + MY_P="${PN}-${MY_PV}" + SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"; + S="${WORKDIR}/${MY_P}" +fi + DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" HOMEPAGE="https://github.com/att/ast"; -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" -SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"; -S="${WORKDIR}/${MY_P}" - LICENSE="CPL-1.0 EPL-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" RDEPEND="!app-shells/pdksh" diff --git a/app-shells/ksh/ksh-2020.0.0_beta1.ebuild b/app-shells/ksh/ksh-.ebuild similarity index 55% copy from app-shells/ksh/ksh-2020.0.0_beta1.ebuild copy to app-shells/ksh/ksh-.ebuild index 4927a8e7fe1..2ccad3528bf 100644 --- a/app-shells/ksh/ksh-2020.0.0_beta1.ebuild +++ b/app-shells/ksh/ksh-.ebuild @@ -5,17 +5,22 @@ EAPI=7 inherit meson +if [[ ${PV} == ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/att/ast"; +else + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" + MY_PV="${PV/_/-}" + MY_P="${PN}-${MY_PV}" + SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"; + S="${WORKDIR}/${MY_P}" +fi + DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" HOMEPAGE="https://github.com/att/ast"; -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" -SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"; -S="${WORKDIR}/${MY_P}" - LICENSE="CPL-1.0 EPL-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" RDEPEND="!app-shells/pdksh"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 144cd2d0c6b7ae38bab29a05a3fa77af411fdb56 Author: Mike Gilbert gentoo org> AuthorDate: Sun Sep 1 16:24:53 2019 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Sep 1 16:24:53 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=144cd2d0 app-shells/ksh: fix patches Package-Manager: Portage-2.3.74, Repoman-2.3.17_p35 Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/ksh-2020.0.0_alpha1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild index 9feb017356e..3c91825f17c 100644 --- a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild +++ b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild @@ -22,8 +22,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" RDEPEND="!app-shells/pdksh" PATCHES=( - "${DISTDIR}"/${MY_P}.patch - "${DISTDIR}"/${MY_P}.patch + "${DISTDIR}"/${MY_P}-solaris.patch + "${DISTDIR}"/${MY_P}-conftab.patch ) src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 4167612d30b0cf5fe1842b171938910f9329165c Author: Mike Gilbert gentoo org> AuthorDate: Sun Sep 1 14:31:03 2019 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Sep 1 14:32:07 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4167612d app-shells/ksh: bump to 2020.0.0-beta1 Package-Manager: Portage-2.3.74, Repoman-2.3.17_p35 Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/Manifest | 5 +++-- app-shells/ksh/ksh-2020.0.0_alpha1.ebuild| 8 .../{ksh-2020.0.0_alpha1.ebuild => ksh-2020.0.0_beta1.ebuild}| 9 + 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 01a1b802428..b16fc0418a8 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,3 +1,4 @@ +DIST ksh-2020.0.0-alpha1-conftab.patch 118773 BLAKE2B 63466e18a77cb86af80d6f6b4af74e3ac1edbfa735decfcd772633808a4593f6d4b057a99547482d17b22445e68c6d3e2becdf68516f913c73550da718f2abc3 SHA512 b29a70e8e31a259ac5bf556ddcdb5d4742a8dac4d11c06e4b5fc3043012e08b26d136cce8c18e9e8a1fe751044699d2258388d618408b09379732bea89a51765 +DIST ksh-2020.0.0-alpha1-solaris.patch 12317 BLAKE2B 90681bde2f3bad0e097a9367ea5a3f1d4c95f70c6e0c872dad769609f97a6332328e21399a3b9ba20f3840b3387a02370831ae4663457728bd8e41b7471c675b SHA512 5a0b818f44a860210e2a7795335d0edec01c61dd5ad04670bb2ca505690ff1b111dbda12d0d15e8b264113d4e7a5a42a49f64c9aba0cff809c2ce3185921acad DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981 -DIST ksh-conftab.patch 118773 BLAKE2B 63466e18a77cb86af80d6f6b4af74e3ac1edbfa735decfcd772633808a4593f6d4b057a99547482d17b22445e68c6d3e2becdf68516f913c73550da718f2abc3 SHA512 b29a70e8e31a259ac5bf556ddcdb5d4742a8dac4d11c06e4b5fc3043012e08b26d136cce8c18e9e8a1fe751044699d2258388d618408b09379732bea89a51765 -DIST ksh-solaris.patch 12317 BLAKE2B 90681bde2f3bad0e097a9367ea5a3f1d4c95f70c6e0c872dad769609f97a6332328e21399a3b9ba20f3840b3387a02370831ae4663457728bd8e41b7471c675b SHA512 5a0b818f44a860210e2a7795335d0edec01c61dd5ad04670bb2ca505690ff1b111dbda12d0d15e8b264113d4e7a5a42a49f64c9aba0cff809c2ce3185921acad +DIST ksh-2020.0.0-beta1.tar.gz 2022254 BLAKE2B 650ad8ea1140bdbe1fb9fc3e2ecbceedb4605525523584d9ac8a067511ed385f1c83d284c781b31140760500f3de13d1ad8fc695c9c553a3285d5c286a99c7ea SHA512 6f54cdc3c59b44055cc6b670b38ce1685463c841a093a28c5f974dd153eaec3b8924308b353ed7c29a0ec3917ee87cfe57b6cabaca9841633d3599d9c6731330 diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild index b8f743ad437..9feb017356e 100644 --- a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild +++ b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild @@ -11,8 +11,8 @@ HOMEPAGE="https://github.com/att/ast"; MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz - https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ksh-solaris.patch - https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ksh-conftab.patch" + https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ${MY_P}-solaris.patch + https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ${MY_P}-conftab.patch" S="${WORKDIR}/${MY_P}" LICENSE="CPL-1.0 EPL-1.0" @@ -22,8 +22,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" RDEPEND="!app-shells/pdksh" PATCHES=( - "${DISTDIR}"/ksh-solaris.patch - "${DISTDIR}"/ksh-conftab.patch + "${DISTDIR}"/${MY_P}.patch + "${DISTDIR}"/${MY_P}.patch ) src_install() { diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_beta1.ebuild similarity index 66% copy from app-shells/ksh/ksh-2020.0.0_alpha1.ebuild copy to app-shells/ksh/ksh-2020.0.0_beta1.ebuild index b8f743ad437..4927a8e7fe1 100644 --- a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild +++ b/app-shells/ksh/ksh-2020.0.0_beta1.ebuild @@ -10,9 +10,7 @@ HOMEPAGE="https://github.com/att/ast"; MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" -SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz - https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ksh-solaris.patch - https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ksh-conftab.patch" +SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"; S="${WORKDIR}/${MY_P}" LICENSE="CPL-1.0 EPL-1.0" @@ -21,11 +19,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" RDEPEND="!app-
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 90fd7eb38db6b71a1c8f8d0ce98ee71563cc41f5 Author: Mike Gilbert gentoo org> AuthorDate: Tue May 28 02:45:55 2019 + Commit: Mike Gilbert gentoo org> CommitDate: Tue May 28 04:01:28 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90fd7eb3 app-shells/ksh: backport fix for gcc 9 Closes: https://bugs.gentoo.org/686560 Package-Manager: Portage-2.3.66_p2, Repoman-2.3.12_p111 Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/Manifest | 2 ++ app-shells/ksh/ksh-2020.0.0_alpha1.ebuild | 9 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 175a6d279d8..01a1b802428 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1 +1,3 @@ DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981 +DIST ksh-conftab.patch 118773 BLAKE2B 63466e18a77cb86af80d6f6b4af74e3ac1edbfa735decfcd772633808a4593f6d4b057a99547482d17b22445e68c6d3e2becdf68516f913c73550da718f2abc3 SHA512 b29a70e8e31a259ac5bf556ddcdb5d4742a8dac4d11c06e4b5fc3043012e08b26d136cce8c18e9e8a1fe751044699d2258388d618408b09379732bea89a51765 +DIST ksh-solaris.patch 12317 BLAKE2B 90681bde2f3bad0e097a9367ea5a3f1d4c95f70c6e0c872dad769609f97a6332328e21399a3b9ba20f3840b3387a02370831ae4663457728bd8e41b7471c675b SHA512 5a0b818f44a860210e2a7795335d0edec01c61dd5ad04670bb2ca505690ff1b111dbda12d0d15e8b264113d4e7a5a42a49f64c9aba0cff809c2ce3185921acad diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild index 4927a8e7fe1..b8f743ad437 100644 --- a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild +++ b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild @@ -10,7 +10,9 @@ HOMEPAGE="https://github.com/att/ast"; MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" -SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"; +SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz + https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ksh-solaris.patch + https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ksh-conftab.patch" S="${WORKDIR}/${MY_P}" LICENSE="CPL-1.0 EPL-1.0" @@ -19,6 +21,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" RDEPEND="!app-shells/pdksh" +PATCHES=( + "${DISTDIR}"/ksh-solaris.patch + "${DISTDIR}"/ksh-conftab.patch +) + src_install() { meson_src_install dodir /bin
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/files/, app-shells/ksh/
commit: a3d3021af084e1b75ba80eaf575ce11870fa35ae Author: Mike Gilbert gentoo org> AuthorDate: Sat May 4 16:03:13 2019 + Commit: Mike Gilbert gentoo org> CommitDate: Sat May 4 16:03:24 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d3021a app-shells/ksh: remove old Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87 Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/Manifest | 2 -- app-shells/ksh/files/cpp.patch | 24 --- app-shells/ksh/files/ksh-prefix-r1.patch | 51 app-shells/ksh/files/ksh-prefix.patch| 42 -- app-shells/ksh/ksh-93.20180215.ebuild| 36 -- app-shells/ksh/ksh-93.20180331.ebuild| 36 -- 6 files changed, 191 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index ce546d54207..175a6d279d8 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,3 +1 @@ DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981 -DIST ksh-93.20180215.tar.gz 16056027 BLAKE2B 22ce7346ed2d034d4738b9fdb03559d93b08b92d32e7fd1ea18c1c4fb711e282e98561a0a6d24b1ce11ebaa813b49e5ffa4653f5efb41905aaf29418702e0e5b SHA512 175f6fdc9ab425ac08a5907b552faa25d2e3e7248d0077af300a9f0ca28a4cf46e48081c76f1126bedcc4fbf7db4a432d58f620b29a9543f887a60649f389d5b -DIST ksh-93.20180331.tar.gz 16052423 BLAKE2B 63e1d08faec3f96ef6cf106404821497ff2b35fdd8bf5db0fbe6958b16fc760a46b8d840252402e12a32a37761ca419fb621335b46f5f43a2f441bb9256358b3 SHA512 6bc6c35804ef7a60f0592dd956c6f51588639dc69196b79548c3ea60d5168f46bdb8c446aeadfdb3b23994778f882d1d4b4869955fd654dba59a02ae2d9c7196 diff --git a/app-shells/ksh/files/cpp.patch b/app-shells/ksh/files/cpp.patch deleted file mode 100644 index 7075bcfc1f7..000 --- a/app-shells/ksh/files/cpp.patch +++ /dev/null @@ -1,24 +0,0 @@ -iffe depends on cc -E not inserting newlines between tokens - -https://build.opensuse.org/package/view_file/home:Andreas_Schwab:Factory/ksh/cpp.patch?expand=1 - a/src/cmd/INIT/iffe.sh -+++ b/src/cmd/INIT/iffe.sh -@@ -3427,7 +3427,7 @@ - (eval "$src") <&$nullin || e=1 - ;; - mac*|nomac*) -- if compile $cc -E $tmp.c <&$nullin >$tmp.i -+ if compile $cc -E -P $tmp.c <&$nullin >$tmp.i - thensed -e '/<<[]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[]*>>//g' $tmp.i - elsee=1 - fi -@@ -3718,7 +3718,7 @@ - <<\"#define $v\">>$v <<\"/* native $v */\">> - <<\"#endif\">> - #endif" > $tmp.c -- if compile $cc -E $tmp.c <&$nullin >$tmp.i -+ if compile $cc -E -P $tmp.c <&$nullin >$tmp.i - thensed -e '/<<[]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[]*>>//g' $tmp.i > $tmp.t - if test -s $tmp.t - thensuccess diff --git a/app-shells/ksh/files/ksh-prefix-r1.patch b/app-shells/ksh/files/ksh-prefix-r1.patch deleted file mode 100644 index d2cfd6c0c15..000 --- a/app-shells/ksh/files/ksh-prefix-r1.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b7769b1f336ba533c4510f1b112fecf84a638a08 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sun, 28 Jan 2018 16:14:42 -0500 -Subject: [PATCH] EPREFIX support - - src/cmd/ksh93/data/msg.c | 14 +++--- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/cmd/ksh93/data/msg.c b/src/cmd/ksh93/data/msg.c -index eabe59e2..61512280 100644 a/src/cmd/ksh93/data/msg.c -+++ b/src/cmd/ksh93/data/msg.c -@@ -182,7 +182,7 @@ const char e_heading[] = "Current option settings"; - const char e_sptbnl[] = " \t\n"; - const char e_tolower[] = "tolower"; - const char e_toupper[] = "toupper"; --const char e_defpath[] = "/bin:/usr/bin:"; -+const char e_defpath[] = "@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:"; - const char e_defedit[] = _pth_ed; - const char e_unknown[] = ""; - const char e_devnull[] = "/dev/null"; -@@ -190,19 +190,19 @@ const char e_traceprompt[] = "+ "; - const char e_supprompt[] = "# "; - const char e_stdprompt[] = "$ "; - const char e_profile[] = "$HOME/.profile"; --const char e_sysprofile[] = "/etc/profile"; --const char e_suidprofile[] =
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 01d686873b6668c056b44a205713b1e356f32c84 Author: Mike Gilbert gentoo org> AuthorDate: Sat May 4 15:55:48 2019 + Commit: Mike Gilbert gentoo org> CommitDate: Sat May 4 16:03:23 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d68687 app-shells/ksh: bump to 2020.0.0_alpha1 Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87 Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/Manifest | 1 + app-shells/ksh/ksh-2020.0.0_alpha1.ebuild | 26 ++ 2 files changed, 27 insertions(+) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 06a7f55ea31..0b4baa9a2ec 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,5 +1,6 @@ DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa293fbd21a94893443392cee5978c4526a09c47c19f650fc1b36eef0b0241ece4ebe6d4b6bdf2546195a5c26ad SHA512 9034cdf5b798c134472d786195d0f5d14e7e7a1f8226dcbccf962880cd59cd59d3a5597307587163f90a9187cce0232235cf79bcd66842044b2c624b335ba730 DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737 +DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981 DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688 DIST ksh-93.20180215.tar.gz 16056027 BLAKE2B 22ce7346ed2d034d4738b9fdb03559d93b08b92d32e7fd1ea18c1c4fb711e282e98561a0a6d24b1ce11ebaa813b49e5ffa4653f5efb41905aaf29418702e0e5b SHA512 175f6fdc9ab425ac08a5907b552faa25d2e3e7248d0077af300a9f0ca28a4cf46e48081c76f1126bedcc4fbf7db4a432d58f620b29a9543f887a60649f389d5b DIST ksh-93.20180331.tar.gz 16052423 BLAKE2B 63e1d08faec3f96ef6cf106404821497ff2b35fdd8bf5db0fbe6958b16fc760a46b8d840252402e12a32a37761ca419fb621335b46f5f43a2f441bb9256358b3 SHA512 6bc6c35804ef7a60f0592dd956c6f51588639dc69196b79548c3ea60d5168f46bdb8c446aeadfdb3b23994778f882d1d4b4869955fd654dba59a02ae2d9c7196 diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild new file mode 100644 index 000..4927a8e7fe1 --- /dev/null +++ b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" +HOMEPAGE="https://github.com/att/ast"; + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" +SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"; +S="${WORKDIR}/${MY_P}" + +LICENSE="CPL-1.0 EPL-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" + +RDEPEND="!app-shells/pdksh" + +src_install() { + meson_src_install + dodir /bin + mv "${ED}/usr/bin/ksh" "${ED}/bin/ksh" || die +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 4d7b72b57165f522eb9755aa88356900764b0028 Author: Mike Gilbert gentoo org> AuthorDate: Sat May 4 16:01:54 2019 + Commit: Mike Gilbert gentoo org> CommitDate: Sat May 4 16:03:23 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7b72b5 app-shells/ksh: remove broken versions Bug: https://bugs.gentoo.org/685034 Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87 Signed-off-by: Mike Gilbert gentoo.org> app-shells/ksh/Manifest | 3 --- app-shells/ksh/ksh-93.20140625.ebuild | 50 -- app-shells/ksh/ksh-93.20160110.ebuild | 51 --- 3 files changed, 104 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 0b4baa9a2ec..ce546d54207 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,6 +1,3 @@ -DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa293fbd21a94893443392cee5978c4526a09c47c19f650fc1b36eef0b0241ece4ebe6d4b6bdf2546195a5c26ad SHA512 9034cdf5b798c134472d786195d0f5d14e7e7a1f8226dcbccf962880cd59cd59d3a5597307587163f90a9187cce0232235cf79bcd66842044b2c624b335ba730 -DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737 DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981 -DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688 DIST ksh-93.20180215.tar.gz 16056027 BLAKE2B 22ce7346ed2d034d4738b9fdb03559d93b08b92d32e7fd1ea18c1c4fb711e282e98561a0a6d24b1ce11ebaa813b49e5ffa4653f5efb41905aaf29418702e0e5b SHA512 175f6fdc9ab425ac08a5907b552faa25d2e3e7248d0077af300a9f0ca28a4cf46e48081c76f1126bedcc4fbf7db4a432d58f620b29a9543f887a60649f389d5b DIST ksh-93.20180331.tar.gz 16052423 BLAKE2B 63e1d08faec3f96ef6cf106404821497ff2b35fdd8bf5db0fbe6958b16fc760a46b8d840252402e12a32a37761ca419fb621335b46f5f43a2f441bb9256358b3 SHA512 6bc6c35804ef7a60f0592dd956c6f51588639dc69196b79548c3ea60d5168f46bdb8c446aeadfdb3b23994778f882d1d4b4869955fd654dba59a02ae2d9c7196 diff --git a/app-shells/ksh/ksh-93.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild deleted file mode 100644 index c8a15396a51..000 --- a/app-shells/ksh/ksh-93.20140625.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs prefix eutils - -DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" -HOMEPAGE="http://www.kornshell.com/"; - -KSH_PV=${PV:3:4}-${PV:7:2}-${PV:9:2} - -SRC_URI="https://dev.gentoo.org/~floppym/distfiles/INIT.${KSH_PV}.tgz - https://dev.gentoo.org/~floppym/distfiles/ast-base.${KSH_PV}.tgz"; - -LICENSE="CPL-1.0 EPL-1.0" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="!app-shells/pdksh" - -S=${WORKDIR} - -src_prepare() { - # Bug 238906. - sed -i -e 's,cd /tmp,cd "${TMPDIR:-/tmp}",' \ - bin/package src/cmd/INIT/package.sh || die - - epatch "${FILESDIR}"/${PN}-prefix.patch - epatch "${FILESDIR}"/cpp.patch - eprefixify src/cmd/ksh93/data/msg.c -} - -src_compile() { - tc-export AR CC LD NM - export CCFLAGS="${CFLAGS}" - sh bin/package flat only make ast-ksh SHELL=sh SHOPT_SYSRC=1 || die -} - -src_install() { - dodoc lib/package/ast-base.README - dohtml lib/package/ast-base.html - - local myhost=$(sh bin/package host) - into / - dobin bin/ksh - dosym ksh /bin/rksh - newman man/man1/sh.1 ksh.1 -} diff --git a/app-shells/ksh/ksh-93.20160110.ebuild b/app-shells/ksh/ksh-93.20160110.ebuild deleted file mode 100644 index 13f64f1a69e..000 --- a/app-shells/ksh/ksh-93.20160110.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs prefix eutils - -DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" -HOMEPAGE="http://www.kornshell.com/"; - -COMMIT="c506cb548d9b4bcebef92c86e948657728760e15" -SRC_URI="https://github.com/att/ast/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="CPL-1.0 EPL-1.0" -SLOT="0" -KEYWORDS="~alph
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 7e9531ff8c3339f31aa1a45d7a5f5066c941bbc0 Author: Mike Gilbert gentoo org> AuthorDate: Sun Apr 1 20:07:43 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Apr 1 20:07:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9531ff app-shells/ksh: bump Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81 app-shells/ksh/Manifest | 1 + app-shells/ksh/ksh-93.20180331.ebuild | 36 +++ 2 files changed, 37 insertions(+) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 7e354150aed..06a7f55ea31 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -2,3 +2,4 @@ DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa2 DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737 DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688 DIST ksh-93.20180215.tar.gz 16056027 BLAKE2B 22ce7346ed2d034d4738b9fdb03559d93b08b92d32e7fd1ea18c1c4fb711e282e98561a0a6d24b1ce11ebaa813b49e5ffa4653f5efb41905aaf29418702e0e5b SHA512 175f6fdc9ab425ac08a5907b552faa25d2e3e7248d0077af300a9f0ca28a4cf46e48081c76f1126bedcc4fbf7db4a432d58f620b29a9543f887a60649f389d5b +DIST ksh-93.20180331.tar.gz 16052423 BLAKE2B 63e1d08faec3f96ef6cf106404821497ff2b35fdd8bf5db0fbe6958b16fc760a46b8d840252402e12a32a37761ca419fb621335b46f5f43a2f441bb9256358b3 SHA512 6bc6c35804ef7a60f0592dd956c6f51588639dc69196b79548c3ea60d5168f46bdb8c446aeadfdb3b23994778f882d1d4b4869955fd654dba59a02ae2d9c7196 diff --git a/app-shells/ksh/ksh-93.20180331.ebuild b/app-shells/ksh/ksh-93.20180331.ebuild new file mode 100644 index 000..5d2cbc31a7d --- /dev/null +++ b/app-shells/ksh/ksh-93.20180331.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit meson prefix + +DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" +HOMEPAGE="http://www.kornshell.com/"; + +COMMIT="b9d0b8ebfead0edba9004fc32b1782d1e1410aeb" +SRC_URI="https://github.com/att/ast/archive/${COMMIT}/${P}.tar.gz"; + +LICENSE="CPL-1.0 EPL-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="" + +RDEPEND="!app-shells/pdksh" + +S="${WORKDIR}/ast-${COMMIT}" + +PATCHES=( + "${FILESDIR}"/ksh-prefix-r1.patch +) + +src_prepare() { + default + eprefixify src/cmd/ksh93/data/msg.c +} + +src_install() { + meson_src_install + dodir /bin + mv "${ED%/}"{/usr,}/bin/ksh || die +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 38aaac20482503641b98776fec2fc522ac8ff1d1 Author: Mike Gilbert gentoo org> AuthorDate: Thu Feb 15 17:19:56 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Feb 15 17:20:30 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38aaac20 app-shells/ksh: bump to 93.20180215 Closes: https://bugs.gentoo.org/646768 Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99 app-shells/ksh/Manifest| 3 +- app-shells/ksh/ksh-93.20180213.ebuild | 36 -- ...h-93.20180129.ebuild => ksh-93.20180215.ebuild} | 2 +- 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index ac817586a44..7e354150aed 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,5 +1,4 @@ DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa293fbd21a94893443392cee5978c4526a09c47c19f650fc1b36eef0b0241ece4ebe6d4b6bdf2546195a5c26ad SHA512 9034cdf5b798c134472d786195d0f5d14e7e7a1f8226dcbccf962880cd59cd59d3a5597307587163f90a9187cce0232235cf79bcd66842044b2c624b335ba730 DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737 DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688 -DIST ksh-93.20180129.tar.gz 16056700 BLAKE2B a4f31243c67aa91d67a2d0f456053b716f0ee3ee58c5ef6c4bea236d7b58676170f236d36e084086c24b53b431cf8b88b174f9c92f8f94f27073c7a6ef2859c6 SHA512 6f2ec44f756bdeb8d8792cf55a2c19b38ea85947658648f521cf895562211604e2395cf60a5e72c451213065326207eb7a67c2efb768581ce84abbe11c237319 -DIST ksh-93.20180213.tar.gz 1605 BLAKE2B e8a79af8c047f2913f7104a3600f17d61023f756ba6e6b4b1591c748875279d68ed7b00319826ea97acb9b783be3f07c7de1f9ce5e1fbf88ab6136285078 SHA512 a9f699e327e1d0446d39aafeda68c66c0b51d773a9e11dbab32471ae1a9db89b718b18bd4a4c2cdf87dcca6d33d8bd7f47f59c13055e7616a67c8b9e32a19b42 +DIST ksh-93.20180215.tar.gz 16056027 BLAKE2B 22ce7346ed2d034d4738b9fdb03559d93b08b92d32e7fd1ea18c1c4fb711e282e98561a0a6d24b1ce11ebaa813b49e5ffa4653f5efb41905aaf29418702e0e5b SHA512 175f6fdc9ab425ac08a5907b552faa25d2e3e7248d0077af300a9f0ca28a4cf46e48081c76f1126bedcc4fbf7db4a432d58f620b29a9543f887a60649f389d5b diff --git a/app-shells/ksh/ksh-93.20180213.ebuild b/app-shells/ksh/ksh-93.20180213.ebuild deleted file mode 100644 index f1059a6fbb4..000 --- a/app-shells/ksh/ksh-93.20180213.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit meson prefix - -DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" -HOMEPAGE="http://www.kornshell.com/"; - -COMMIT="b6aaffac888a9f5343e9dfd78ff2a7964b51" -SRC_URI="https://github.com/att/ast/archive/${COMMIT}/${P}.tar.gz"; - -LICENSE="CPL-1.0 EPL-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -RDEPEND="!app-shells/pdksh" - -S="${WORKDIR}/ast-${COMMIT}" - -PATCHES=( - "${FILESDIR}"/ksh-prefix-r1.patch -) - -src_prepare() { - default - eprefixify src/cmd/ksh93/data/msg.c -} - -src_install() { - meson_src_install - dodir /bin - mv "${ED%/}"{/usr,}/bin/ksh || die -} diff --git a/app-shells/ksh/ksh-93.20180129.ebuild b/app-shells/ksh/ksh-93.20180215.ebuild similarity index 93% rename from app-shells/ksh/ksh-93.20180129.ebuild rename to app-shells/ksh/ksh-93.20180215.ebuild index e49bb4ef303..576ab31e881 100644 --- a/app-shells/ksh/ksh-93.20180129.ebuild +++ b/app-shells/ksh/ksh-93.20180215.ebuild @@ -8,7 +8,7 @@ inherit meson prefix DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" HOMEPAGE="http://www.kornshell.com/"; -COMMIT="c266cbe4ecbc16adc66a2d5c9ea17fa4497284c8" +COMMIT="e3dd5b1a4b1bf58a018bbd9c8626b15113b72717" SRC_URI="https://github.com/att/ast/archive/${COMMIT}/${P}.tar.gz"; LICENSE="CPL-1.0 EPL-1.0"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: fd35ec95c662b9182fd3d40c1a013f8516596266 Author: Mike Gilbert gentoo org> AuthorDate: Wed Feb 14 20:04:23 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Feb 14 20:07:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd35ec95 app-shells/ksh: bump to 93.20180213 Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99 app-shells/ksh/Manifest | 1 + app-shells/ksh/ksh-93.20180213.ebuild | 36 +++ 2 files changed, 37 insertions(+) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index ebefbb1142e..ac817586a44 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -2,3 +2,4 @@ DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa2 DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737 DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688 DIST ksh-93.20180129.tar.gz 16056700 BLAKE2B a4f31243c67aa91d67a2d0f456053b716f0ee3ee58c5ef6c4bea236d7b58676170f236d36e084086c24b53b431cf8b88b174f9c92f8f94f27073c7a6ef2859c6 SHA512 6f2ec44f756bdeb8d8792cf55a2c19b38ea85947658648f521cf895562211604e2395cf60a5e72c451213065326207eb7a67c2efb768581ce84abbe11c237319 +DIST ksh-93.20180213.tar.gz 1605 BLAKE2B e8a79af8c047f2913f7104a3600f17d61023f756ba6e6b4b1591c748875279d68ed7b00319826ea97acb9b783be3f07c7de1f9ce5e1fbf88ab6136285078 SHA512 a9f699e327e1d0446d39aafeda68c66c0b51d773a9e11dbab32471ae1a9db89b718b18bd4a4c2cdf87dcca6d33d8bd7f47f59c13055e7616a67c8b9e32a19b42 diff --git a/app-shells/ksh/ksh-93.20180213.ebuild b/app-shells/ksh/ksh-93.20180213.ebuild new file mode 100644 index 000..f1059a6fbb4 --- /dev/null +++ b/app-shells/ksh/ksh-93.20180213.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit meson prefix + +DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" +HOMEPAGE="http://www.kornshell.com/"; + +COMMIT="b6aaffac888a9f5343e9dfd78ff2a7964b51" +SRC_URI="https://github.com/att/ast/archive/${COMMIT}/${P}.tar.gz"; + +LICENSE="CPL-1.0 EPL-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="" + +RDEPEND="!app-shells/pdksh" + +S="${WORKDIR}/ast-${COMMIT}" + +PATCHES=( + "${FILESDIR}"/ksh-prefix-r1.patch +) + +src_prepare() { + default + eprefixify src/cmd/ksh93/data/msg.c +} + +src_install() { + meson_src_install + dodir /bin + mv "${ED%/}"{/usr,}/bin/ksh || die +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 8265b3c689d1577710b959d49843818820266937 Author: Mike Gilbert gentoo org> AuthorDate: Mon Jan 29 23:10:41 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Jan 29 23:10:41 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8265b3c6 app-shells/ksh: bump to 93.20180129 Package-Manager: Portage-2.3.19_p11, Repoman-2.3.6_p45 app-shells/ksh/Manifest | 2 +- app-shells/ksh/{ksh-93.20180128.ebuild => ksh-93.20180129.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index caf1dcac4ed..ebefbb1142e 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,4 +1,4 @@ DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa293fbd21a94893443392cee5978c4526a09c47c19f650fc1b36eef0b0241ece4ebe6d4b6bdf2546195a5c26ad SHA512 9034cdf5b798c134472d786195d0f5d14e7e7a1f8226dcbccf962880cd59cd59d3a5597307587163f90a9187cce0232235cf79bcd66842044b2c624b335ba730 DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737 DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688 -DIST ksh-93.20180128.tar.gz 16076705 BLAKE2B 1787a883827211f7573a97c78c4b7fca10ea9ca91ada66b148942bdbd36039bb420a6a44659010e870303e8840bf34828233130626c997d5bc264301880b35ad SHA512 d88e369aa79a273971756111d3c019a0dea830bb4ae26741fe91f4182ac46a4d178452a36433ee26db64ad8ec7dd2b003bb50acf51868a28ee1c7203a7f10f4a +DIST ksh-93.20180129.tar.gz 16056700 BLAKE2B a4f31243c67aa91d67a2d0f456053b716f0ee3ee58c5ef6c4bea236d7b58676170f236d36e084086c24b53b431cf8b88b174f9c92f8f94f27073c7a6ef2859c6 SHA512 6f2ec44f756bdeb8d8792cf55a2c19b38ea85947658648f521cf895562211604e2395cf60a5e72c451213065326207eb7a67c2efb768581ce84abbe11c237319 diff --git a/app-shells/ksh/ksh-93.20180128.ebuild b/app-shells/ksh/ksh-93.20180129.ebuild similarity index 93% rename from app-shells/ksh/ksh-93.20180128.ebuild rename to app-shells/ksh/ksh-93.20180129.ebuild index 32db068808f..e49bb4ef303 100644 --- a/app-shells/ksh/ksh-93.20180128.ebuild +++ b/app-shells/ksh/ksh-93.20180129.ebuild @@ -8,7 +8,7 @@ inherit meson prefix DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" HOMEPAGE="http://www.kornshell.com/"; -COMMIT="0c8dbe3001d1bbef4f76673dc9c1629d90da9862" +COMMIT="c266cbe4ecbc16adc66a2d5c9ea17fa4497284c8" SRC_URI="https://github.com/att/ast/archive/${COMMIT}/${P}.tar.gz"; LICENSE="CPL-1.0 EPL-1.0"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
commit: 46cc6eaa9b024f87198d2c6e8f91ea041e80399b Author: Mike Gilbert gentoo org> AuthorDate: Sun Jan 28 21:22:38 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Jan 28 21:25:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46cc6eaa app-shells/ksh: bump to 93.20180128 Package-Manager: Portage-2.3.19_p11, Repoman-2.3.6_p45 app-shells/ksh/Manifest | 1 + app-shells/ksh/files/ksh-prefix-r1.patch | 51 app-shells/ksh/ksh-93.20180128.ebuild| 36 ++ 3 files changed, 88 insertions(+) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index a7b9569906b..caf1dcac4ed 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,3 +1,4 @@ DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa293fbd21a94893443392cee5978c4526a09c47c19f650fc1b36eef0b0241ece4ebe6d4b6bdf2546195a5c26ad SHA512 9034cdf5b798c134472d786195d0f5d14e7e7a1f8226dcbccf962880cd59cd59d3a5597307587163f90a9187cce0232235cf79bcd66842044b2c624b335ba730 DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737 DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688 +DIST ksh-93.20180128.tar.gz 16076705 BLAKE2B 1787a883827211f7573a97c78c4b7fca10ea9ca91ada66b148942bdbd36039bb420a6a44659010e870303e8840bf34828233130626c997d5bc264301880b35ad SHA512 d88e369aa79a273971756111d3c019a0dea830bb4ae26741fe91f4182ac46a4d178452a36433ee26db64ad8ec7dd2b003bb50acf51868a28ee1c7203a7f10f4a diff --git a/app-shells/ksh/files/ksh-prefix-r1.patch b/app-shells/ksh/files/ksh-prefix-r1.patch new file mode 100644 index 000..d2cfd6c0c15 --- /dev/null +++ b/app-shells/ksh/files/ksh-prefix-r1.patch @@ -0,0 +1,51 @@ +From b7769b1f336ba533c4510f1b112fecf84a638a08 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 28 Jan 2018 16:14:42 -0500 +Subject: [PATCH] EPREFIX support + +--- + src/cmd/ksh93/data/msg.c | 14 +++--- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/cmd/ksh93/data/msg.c b/src/cmd/ksh93/data/msg.c +index eabe59e2..61512280 100644 +--- a/src/cmd/ksh93/data/msg.c b/src/cmd/ksh93/data/msg.c +@@ -182,7 +182,7 @@ const char e_heading[] = "Current option settings"; + const char e_sptbnl[] = " \t\n"; + const char e_tolower[] = "tolower"; + const char e_toupper[] = "toupper"; +-const char e_defpath[] = "/bin:/usr/bin:"; ++const char e_defpath[] = "@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:"; + const char e_defedit[] = _pth_ed; + const char e_unknown[] = ""; + const char e_devnull[] = "/dev/null"; +@@ -190,19 +190,19 @@ const char e_traceprompt[] = "+ "; + const char e_supprompt[] = "# "; + const char e_stdprompt[] = "$ "; + const char e_profile[] = "$HOME/.profile"; +-const char e_sysprofile[] = "/etc/profile"; +-const char e_suidprofile[] = "/etc/suid_profile"; +-const char e_sysrc[] = "/etc/ksh.kshrc"; ++const char e_sysprofile[] = "@GENTOO_PORTAGE_EPREFIX@/etc/profile"; ++const char e_suidprofile[] = "@GENTOO_PORTAGE_EPREFIX@/etc/suid_profile"; ++const char e_sysrc[] = "@GENTOO_PORTAGE_EPREFIX@/etc/ksh.kshrc"; + #if SHOPT_BASH +-const char e_bash_sysrc[] = "/etc/bash.bashrc"; ++const char e_bash_sysrc[] = "@GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc"; + const char e_bash_rc[] = "$HOME/.bashrc"; + const char e_bash_login[] = "$HOME/.bash_login"; + const char e_bash_logout[] = "$HOME/.bash_logout"; + const char e_bash_profile[] = "$HOME/.bash_profile"; + #endif // SHOPT_BASH +-const char e_crondir[] = "/usr/spool/cron/atjobs"; ++const char e_crondir[] = "@GENTOO_PORTAGE_EPREFIX@/usr/spool/cron/atjobs"; + const char e_prohibited[] = "login setuid/setgid shells prohibited"; +-const char e_suidexec[] = "/etc/suid_exec"; ++const char e_suidexec[] = "@GENTOO_PORTAGE_EPREFIX@/etc/suid_exec"; + const char hist_fname[] = "/.sh_history"; + const char e_dot[] = "."; + const char e_envmarker[] = "A__z"; +-- +2.16.1 + diff --git a/app-shells/ksh/ksh-93.20180128.ebuild b/app-shells/ksh/ksh-93.20180128.ebuild new file mode 100644 index 000..32db068808f --- /dev/null +++ b/app-shells/ksh/ksh-93.20180128.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit meson prefix + +DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" +HOMEPAGE="http://www.kornshell.com/"; + +COMMIT="0c8dbe3001d1bbef4f76673dc9c1629d90da9862" +S
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 5055531e9a9850a09e3f3f33b98199e68e250949 Author: Justin Lecher gentoo org> AuthorDate: Sun Jan 1 16:40:18 2017 + Commit: Justin Lecher gentoo org> CommitDate: Mon Jan 2 08:00:24 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5055531e app-shells/ksh: Drop old obsoletes Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=522938 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Signed-off-by: Justin Lecher gentoo.org> app-shells/ksh/Manifest | 6 app-shells/ksh/ksh-93.20110208.ebuild | 52 app-shells/ksh/ksh-93.20120229.ebuild | 56 --- app-shells/ksh/ksh-93.20140606.ebuild | 51 --- 4 files changed, 165 deletions(-) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index a96b3d0..782aacf 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,9 +1,3 @@ -DIST INIT.2012-01-01.tgz 376375 SHA256 60d9a57885f2f37affb6ddab6090275d715236058561f333f351566bedcc2cd1 SHA512 ad933982d819b594f1303e31b3040b7c5f6ceaf7099d1203b0b7d0949709adf9e953586c9980e1b1cf311902e8a6c8fe6a6118e982d461ffeceddaf8b6f18bbe WHIRLPOOL 718f7275d51386960227bd04cfa51ac8c2f83e1ad0a9f6a7c57f2066e86450a232dd94085ad3357ccbc044e586b15cda46cdcdf9f855db0521e75f96c766 -DIST INIT.2012-02-29.tgz 379873 SHA256 da4a886d28f75f8a011d522697272cd196cdcfb406f92d47f8b0a6608d786896 SHA512 2ac9d7ce48f1dc7e0870d87d34fa1688461268140c0747f507f3677a38fba0b8ca2f44020a4c50e0beaed63949dc347ee48c53b6e09bfb0e6c3e51e128a6302e WHIRLPOOL e4e4bc5bebbccb5e8ce3a8fdd73d1e796f9823291eb7980caa06e40bcea1f41d7122c88af50848f3bda58c340884a0a0071b3ba2559248d470e970362b918d4f -DIST INIT.2014-06-06.tgz 385532 SHA256 73cc2f6a3edd6ffbfcf5002408f7b35c36000729306c6e60788e1ccbc481886f SHA512 94fd97fa069a2857202f7e12bbd920a1e18be13a3f64a3bb72dfdc78bc5db8d585e4123036f3d12fc8e5ce6ae5469831f7377189daf905debeb07034cf10196a WHIRLPOOL a759f435bba62337badb50f00b3760c0d34ae671868875317452bc53e79baabeaf55a943a8b80dff75b8e501500aa5fc68ed933819fd24af7dffcdb192260beb DIST INIT.2014-06-25.tgz 385531 SHA256 e73302b6ab2854421c960f179c3ac079f9e21f0362cfdec58476bda36c163f14 SHA512 9034cdf5b798c134472d786195d0f5d14e7e7a1f8226dcbccf962880cd59cd59d3a5597307587163f90a9187cce0232235cf79bcd66842044b2c624b335ba730 WHIRLPOOL 9e33c998c90878829e6e3007a3fa1b0b7d3128f4761a75630bb449e9e3e29b49c6c54e509c56a1e73119ff87aabc1a84108f4943928920745156d95abf2b0d20 -DIST ast-base.2011-02-08.tgz 6111018 SHA256 44ae3913e6c0c8992c6c3cba16864fd4c4a18c6da8e7d87c85a23060cea7cd1a SHA512 f8bfa1104778968dc66cc693da1100b624a7016f6d24281f401aec564ec25047b01473755ed55f19638b7060a7007ae8d1092c521f645147b0babfd359586e95 WHIRLPOOL 6510a55ca151d82e5b7fcb64ba32078fba50ebb70da1362f53052aeb3360cc4741789f6334e4d09731075c3b495c88fad3160653e6de0c6dcb915aedaeb48394 -DIST ast-base.2012-02-29.tgz 9068922 SHA256 08223dc93da5a8e3d1b46d772be16cdcfc11b6e41c00b696e8fcf7160b48541b SHA512 95cc909ecb5b2bbfae10a44650dfd1aabf2f2461e82f4c77137696a57c41361cded3e3c0697ab5cc9e63fb72645fe442f5fc32ca0a53370b5f43b396595c4d94 WHIRLPOOL f0324fd98b6f14e4001786620ccd56cf81e87dc68397d74fa214025da8cf605fe3f24d3f809aeef8d692287d898b57725769e77ce6f5d52ac24978bf8cd4671b -DIST ast-base.2014-06-06.tgz 9605517 SHA256 c08c895f1412d80dc85227d9b9c77dbd55bedb586965972ebe14f6b0e5ac92db SHA512 265cd4763006471e4deb1ee79c6d668f7e56f2a721589054faa7b6fb103d65d963f9101c073f1b748be63d3195ef6dfbda2a3753d06de1d2517f8ed04cad3ff1 WHIRLPOOL 994f416cd9ffd19f3a14f5f6b27be265263541654f793143d896a91c86533928daf44b5154e1bcb01e8456ef3a0e0492f209dc8ca41cf77a110b45cbc3d4a19b DIST ast-base.2014-06-25.tgz 9609090 SHA256 58588b07b076f05dbbd5f4f095d5753309a8356ba1e5475262ce77d6bff42dae SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737 WHIRLPOOL b07c4809e729359d0ed613310f49fa391c199a225e4a3c589f9015af54d1159e199135ee4eadebd9d09f21f3131103550c1c17badc3a643943e3828df79d98d2 DIST ksh-93.20160110.tar.gz 26416127 SHA256 59cf3c8e8945b593e10946bc0ae1172f62c18ddde1de0f7427599195aecbd591 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688 WHIRLPOOL e7548707b3bb8d3ac8fab749f826ae4db775ca03af2fd51b7fcecd7ba766b64065d18a6ded1b64e1e9aecd4e8ef3bb613dfd744eaf788ca227068bb20d444d62 diff --git a/app-shells/ksh/ksh-93.20110208.ebuild b/app-shells/ksh/ksh-93.20110208.ebuild deleted file mode 100644 index 651adca.. --- a/app-shells/ksh/ksh-93.20110208.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit toolchain-funcs versionator - -DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" -HOMEPAGE="http://www.kornshell.com/"; - -INIT_RELEASE="2012-01-01" -ksh_release() { - local v="$(g
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: bc2e8e38fb7c0722849f8e2cef6299624fb0f241 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Dec 30 09:36:39 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Dec 30 09:36:39 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2e8e38 app-shells/ksh: sparc stable wrt bug #580346 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/ksh/ksh-93.20140625.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-93.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild index f9aeb7a..27f41c4 100644 --- a/app-shells/ksh/ksh-93.20140625.ebuild +++ b/app-shells/ksh/ksh-93.20140625.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/distfiles/INIT.${KSH_PV}.tgz LICENSE="CPL-1.0 EPL-1.0" SLOT="0" -KEYWORDS="alpha amd64 arm ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="!app-shells/pdksh"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 7c69f1d735aa0fb07be92e363e01efd05b88b8f0 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Dec 30 11:09:46 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Dec 30 11:09:46 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c69f1d7 app-shells/ksh: ia64 stable wrt bug #580346 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="ia64" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/ksh/ksh-93.20140625.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-93.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild index 27f41c4..913ca29 100644 --- a/app-shells/ksh/ksh-93.20140625.ebuild +++ b/app-shells/ksh/ksh-93.20140625.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/distfiles/INIT.${KSH_PV}.tgz LICENSE="CPL-1.0 EPL-1.0" SLOT="0" -KEYWORDS="alpha amd64 arm ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="!app-shells/pdksh"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 396ed1a043ed4463735e018d7bf3b849e1f230ee Author: Mike Gilbert gentoo org> AuthorDate: Mon Sep 5 00:31:20 2016 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Sep 5 00:33:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=396ed1a0 app-shells/ksh: bump to 2016-01-10 Package-Manager: portage-2.3.0_p24 app-shells/ksh/Manifest | 1 + app-shells/ksh/ksh-93.20160110.ebuild | 52 +++ 2 files changed, 53 insertions(+) diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index 8a4c61c..a96b3d0 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -6,3 +6,4 @@ DIST ast-base.2011-02-08.tgz 6111018 SHA256 44ae3913e6c0c8992c6c3cba16864fd4c4a1 DIST ast-base.2012-02-29.tgz 9068922 SHA256 08223dc93da5a8e3d1b46d772be16cdcfc11b6e41c00b696e8fcf7160b48541b SHA512 95cc909ecb5b2bbfae10a44650dfd1aabf2f2461e82f4c77137696a57c41361cded3e3c0697ab5cc9e63fb72645fe442f5fc32ca0a53370b5f43b396595c4d94 WHIRLPOOL f0324fd98b6f14e4001786620ccd56cf81e87dc68397d74fa214025da8cf605fe3f24d3f809aeef8d692287d898b57725769e77ce6f5d52ac24978bf8cd4671b DIST ast-base.2014-06-06.tgz 9605517 SHA256 c08c895f1412d80dc85227d9b9c77dbd55bedb586965972ebe14f6b0e5ac92db SHA512 265cd4763006471e4deb1ee79c6d668f7e56f2a721589054faa7b6fb103d65d963f9101c073f1b748be63d3195ef6dfbda2a3753d06de1d2517f8ed04cad3ff1 WHIRLPOOL 994f416cd9ffd19f3a14f5f6b27be265263541654f793143d896a91c86533928daf44b5154e1bcb01e8456ef3a0e0492f209dc8ca41cf77a110b45cbc3d4a19b DIST ast-base.2014-06-25.tgz 9609090 SHA256 58588b07b076f05dbbd5f4f095d5753309a8356ba1e5475262ce77d6bff42dae SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737 WHIRLPOOL b07c4809e729359d0ed613310f49fa391c199a225e4a3c589f9015af54d1159e199135ee4eadebd9d09f21f3131103550c1c17badc3a643943e3828df79d98d2 +DIST ksh-93.20160110.tar.gz 26416127 SHA256 59cf3c8e8945b593e10946bc0ae1172f62c18ddde1de0f7427599195aecbd591 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688 WHIRLPOOL e7548707b3bb8d3ac8fab749f826ae4db775ca03af2fd51b7fcecd7ba766b64065d18a6ded1b64e1e9aecd4e8ef3bb613dfd744eaf788ca227068bb20d444d62 diff --git a/app-shells/ksh/ksh-93.20160110.ebuild b/app-shells/ksh/ksh-93.20160110.ebuild new file mode 100644 index ..9306af7 --- /dev/null +++ b/app-shells/ksh/ksh-93.20160110.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit toolchain-funcs prefix eutils + +DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" +HOMEPAGE="http://www.kornshell.com/"; + +COMMIT="c506cb548d9b4bcebef92c86e948657728760e15" +SRC_URI="https://github.com/att/ast/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="CPL-1.0 EPL-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="!app-shells/pdksh" + +S="${WORKDIR}/ast-${COMMIT}" + +PATCHES=( + "${FILESDIR}"/ksh-prefix.patch + "${FILESDIR}"/cpp.patch +) + +src_prepare() { + default + + # Bug 238906. + sed -i -e 's,cd /tmp,cd "${TMPDIR:-/tmp}",' \ + bin/package src/cmd/INIT/package.sh || die + + eprefixify src/cmd/ksh93/data/msg.c +} + +src_compile() { + tc-export AR CC LD NM + export CCFLAGS="${CFLAGS}" + sh bin/package flat only make ast-ksh SHELL=sh SHOPT_SYSRC=1 || die + # The build system doesn't exit properly + [[ -e bin/ksh ]] || die +} + +src_install() { + into / + dobin bin/ksh + dosym ksh /bin/rksh + newman man/man1/sh.1 ksh.1 +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 7021df4e16662fb879e745bc4ddf479808d40a62 Author: Tobias Klausmann gentoo org> AuthorDate: Tue May 31 15:04:50 2016 + Commit: Tobias Klausmann gentoo org> CommitDate: Tue May 31 15:05:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7021df4e app-shells/ksh-93.20140625-r0: add alpha keyword Gentoo-Bug: 580346 Package-Manager: portage-2.3.0_rc1 app-shells/ksh/ksh-93.20140625.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-shells/ksh/ksh-93.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild index ee4e5db..a40bec9 100644 --- a/app-shells/ksh/ksh-93.20140625.ebuild +++ b/app-shells/ksh/ksh-93.20140625.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/distfiles/INIT.${KSH_PV}.tgz LICENSE="CPL-1.0 EPL-1.0" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="!app-shells/pdksh"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: ba0c4a8fd2507d029b8905b5387f95f8f2408b2b Author: Agostino Sarubbo gentoo org> AuthorDate: Fri May 13 08:39:17 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri May 13 08:41:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0c4a8f app-shells/ksh: amd64 stable wrt bug #580346 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/ksh/ksh-93.20140625.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-93.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild index 2ede236..ee4e5db 100644 --- a/app-shells/ksh/ksh-93.20140625.ebuild +++ b/app-shells/ksh/ksh-93.20140625.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/distfiles/INIT.${KSH_PV}.tgz LICENSE="CPL-1.0 EPL-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="!app-shells/pdksh"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/
commit: 822d9b861f19ec0452769392b79eb5be8afd4a34 Author: Markus Meier gentoo org> AuthorDate: Tue Apr 26 17:35:33 2016 + Commit: Markus Meier gentoo org> CommitDate: Tue Apr 26 17:35:33 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=822d9b86 app-shells/ksh: arm stable, bug #580346 Package-Manager: portage-2.2.28 RepoMan-Options: --include-arches="arm" app-shells/ksh/ksh-93.20140625.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/ksh/ksh-93.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild index 020d6b9..2ede236 100644 --- a/app-shells/ksh/ksh-93.20140625.ebuild +++ b/app-shells/ksh/ksh-93.20140625.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/distfiles/INIT.${KSH_PV}.tgz LICENSE="CPL-1.0 EPL-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="!app-shells/pdksh"
[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
commit: c7dc706efaceb4816df5eedb45cd7c79ef1c3ef4 Author: Mike Gilbert gentoo org> AuthorDate: Sun Nov 29 20:03:23 2015 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Nov 29 20:04:23 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7dc706e app-shells/ksh: Fix build with GCC 5 Bug: https://bugs.gentoo.org/555670 Package-Manager: portage-2.2.26_p3 app-shells/ksh/files/cpp.patch| 24 app-shells/ksh/ksh-93.20140625.ebuild | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app-shells/ksh/files/cpp.patch b/app-shells/ksh/files/cpp.patch new file mode 100644 index 000..7075bcf --- /dev/null +++ b/app-shells/ksh/files/cpp.patch @@ -0,0 +1,24 @@ +iffe depends on cc -E not inserting newlines between tokens + +https://build.opensuse.org/package/view_file/home:Andreas_Schwab:Factory/ksh/cpp.patch?expand=1 + +--- a/src/cmd/INIT/iffe.sh b/src/cmd/INIT/iffe.sh +@@ -3427,7 +3427,7 @@ + (eval "$src") <&$nullin || e=1 + ;; + mac*|nomac*) +- if compile $cc -E $tmp.c <&$nullin >$tmp.i ++ if compile $cc -E -P $tmp.c <&$nullin >$tmp.i + thensed -e '/<<[]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[]*>>//g' $tmp.i + elsee=1 + fi +@@ -3718,7 +3718,7 @@ + <<\"#define $v\">>$v <<\"/* native $v */\">> + <<\"#endif\">> + #endif" > $tmp.c +- if compile $cc -E $tmp.c <&$nullin >$tmp.i ++ if compile $cc -E -P $tmp.c <&$nullin >$tmp.i + thensed -e '/<<[]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[]*>>//g' $tmp.i > $tmp.t + if test -s $tmp.t + thensuccess diff --git a/app-shells/ksh/ksh-93.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild index 5276f82..020d6b9 100644 --- a/app-shells/ksh/ksh-93.20140625.ebuild +++ b/app-shells/ksh/ksh-93.20140625.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -29,6 +29,7 @@ src_prepare() { bin/package src/cmd/INIT/package.sh || die epatch "${FILESDIR}"/${PN}-prefix.patch + epatch "${FILESDIR}"/cpp.patch eprefixify src/cmd/ksh93/data/msg.c }