* [gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
@ 2015-11-29 20:04 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2015-11-29 20:04 UTC (permalink / raw
To: gentoo-commits
commit: c7dc706efaceb4816df5eedb45cd7c79ef1c3ef4
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 20:03:23 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 20:04:23 2015 +0000
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 0000000..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
+ then sed -e '/<<[ ]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[ ]*>>//g' $tmp.i
+ else e=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
+ then sed -e '/<<[ ]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[ ]*>>//g' $tmp.i > $tmp.t
+ if test -s $tmp.t
+ then success
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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
@ 2018-01-28 21:25 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2018-01-28 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 46cc6eaa9b024f87198d2c6e8f91ea041e80399b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 21:22:38 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 21:25:17 2018 +0000
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 00000000000..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 <floppym@gentoo.org>
+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[] = "<command 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 00000000000..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"
+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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
@ 2020-02-07 16:08 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2020-02-07 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 17c85a06ac2f352567348a04c4f682c950105417
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 16:07:03 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Feb 7 16:07:24 2020 +0000
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 <floppym <AT> 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 00000000000..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 <krader@skepticism.us>
+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
+ do got=$($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.ebuild
+++ b/app-shells/ksh/ksh-2020.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,6 +27,7 @@ RDEPEND="!app-shells/pdksh"
PATCHES=(
"${FILESDIR}"/ksh-2020.0.0-ensure-user-set.patch
"${FILESDIR}"/ksh-2020.0.0-skip-api-test.patch
+ "${FILESDIR}"/CVE-2019-14868.patch
)
src_test() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
@ 2022-05-15 11:11 Stephan Hartmann
0 siblings, 0 replies; 6+ messages in thread
From: Stephan Hartmann @ 2022-05-15 11:11 UTC (permalink / raw
To: gentoo-commits
commit: 39b86fa4aea725bf8020389cbfb81c8eac5f848d
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 11:10:36 2022 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sun May 15 11:11:15 2022 +0000
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 <sultan <AT> 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 000000000000..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 <vmihalko@redhat.com>
+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
+ done shcomp generated
+ make suid_exec
+ make suid_exec.o
+@@ -1429,7 +1429,7 @@ make install
+ prev +li
+ prev ${mam_libsocket}
+ prev ${mam_libsecdb}
+- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${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 suid_exec suid_exec.o ${mam_libast} ${mam_libnsl} ${mam_libast} -lm
+ done suid_exec generated
+ make shell
+ prev libshell.a archive
diff --git a/app-shells/ksh/ksh-1.0.0_beta2.ebuild b/app-shells/ksh/ksh-1.0.0_beta2.ebuild
index 6ff7b141d0d7..297d09947372 100644
--- a/app-shells/ksh/ksh-1.0.0_beta2.ebuild
+++ b/app-shells/ksh/ksh-1.0.0_beta2.ebuild
@@ -18,6 +18,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~
S="${WORKDIR}/${PN}-${MY_PV}"
+PATCHES=(
+ "${FILESDIR}/ksh-1.0.0-beta.2-gcc12.patch"
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
@ 2022-05-15 11:13 Stephan Hartmann
0 siblings, 0 replies; 6+ messages in thread
From: Stephan Hartmann @ 2022-05-15 11:13 UTC (permalink / raw
To: gentoo-commits
commit: 512a6bf16cd66a2b365057490db70954b70796a0
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 11:12:56 2022 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sun May 15 11:13:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512a6bf1
app-shells/ksh: drop 1.0.0_beta1
Signed-off-by: Stephan Hartmann <sultan <AT> 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 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb4444042c26bfaf1792
-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..000000000000
--- 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 <vmihalko@redhat.com>
-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 == *WWWWW* ]] || 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++))
- do read -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 associative array shouldn't cause a memory leak
- # See https://www.mail-archive.com/ast-users@lists.research.att.com/msg01016.html
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- typeset -A stuff
- before=$(getmem)
- for (( i=0; i < N; i++ ))
-@@ -152,6 +157,7 @@ done
- unset stuff
- after=$(getmem)
- err_exit_if_leak 'unset of associative array causes memory leak'
-+disabled
-
- # ======
- # Memory leak when resetting PATH and clearing hash table
-@@ -167,17 +173,20 @@ done >/dev/null
- after=$(getmem)
- err_exit_if_leak 'memory leak on PATH reset before PATH search'
- # ...test for another leak that only shows up when building with nmake:
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- before=$(getmem)
- for ((i=0; i < N; i++))
- do PATH=/dev/null true # set/restore PATH & clear hash table
- done >/dev/null
- after=$(getmem)
- err_exit_if_leak 'memory leak on PATH reset'
-+disabled
-
- # ======
- # Defining a function in a virtual subshell
- # https://github.com/ksh93/ksh/issues/114
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- unset -f foo
- before=$(getmem)
- for ((i=0; i < N; i++))
-@@ -186,7 +195,9 @@ done
- after=$(getmem)
- err_exit_if_leak 'ksh function defined in virtual subshell'
- typeset -f foo >/dev/null && err_exit 'ksh function leaks out of subshell'
-+disabled
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- unset -f foo
- before=$(getmem)
- for ((i=0; i < N; i++))
-@@ -195,9 +206,10 @@ done
- after=$(getmem)
- err_exit_if_leak 'POSIX function defined in virtual subshell'
- typeset -f foo >/dev/null && err_exit 'POSIX function leaks out of subshell'
-+disabled
-
- # Unsetting a function in a virtual subshell
--
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- function foo { echo bar; }
- before=$(getmem)
- for ((i=0; i < N; i++))
-@@ -206,8 +218,11 @@ done
- after=$(getmem)
- err_exit_if_leak 'ksh function unset in virtual subshell'
- typeset -f foo >/dev/null || err_exit 'ksh function unset in subshell was unset in main shell'
-+disabled
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- foo() { echo bar; }
-+
- before=$(getmem)
- for ((i=0; i < N; i++))
- do (unset -f foo)
-@@ -215,24 +230,29 @@ done
- after=$(getmem)
- err_exit_if_leak 'POSIX function unset in virtual subshell'
- typeset -f foo >/dev/null || err_exit 'POSIX function unset in subshell was unset in main shell'
-+disabled
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- before=$(getmem)
- for ((i=0; i < N; i++))
- do (function foo { echo baz; }; unset -f foo)
- done
- after=$(getmem)
- err_exit_if_leak 'ksh function defined and unset in virtual subshell'
-+disabled
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- before=$(getmem)
- for ((i=0; i < N; i++))
- do (foo() { echo baz; }; unset -f foo)
- done
- after=$(getmem)
- err_exit_if_leak 'POSIX function defined and unset in virtual subshell'
-+disabled
-
- # ======
- # Sourcing a dot script in a virtual subshell
--
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- echo 'echo "$@"' > $tmp/dot.sh
- before=$(getmem)
- for ((i=0; i < N; i++))
-@@ -240,6 +260,7 @@ do (. "$tmp/dot.sh" dot one two three >/dev/null)
- done
- after=$(getmem)
- err_exit_if_leak 'script dotted in virtual subshell'
-+disabled
-
- echo 'echo "$@"' > $tmp/dot.sh
- before=$(getmem)
-@@ -253,6 +274,8 @@ err_exit_if_leak 'script sourced in virtual subshell'
- # Multiple leaks when using arrays in functions (Red Hat #921455)
- # Fix based on: https://src.fedoraproject.org/rpms/ksh/blob/642af4d6/f/ksh-20120801-memlik.patch
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
-+
- # TODO: both of these tests still leak (although much less after the patch) when run in a non-C locale.
- saveLANG=$LANG; LANG=C # comment out to test remaining leak (1/2)
-
-@@ -268,7 +291,9 @@ do _hash
- done
- after=$(getmem)
- err_exit_if_leak 'associative array in function'
-+disabled
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- function _array
- {
- typeset w=(1 31534 42)
-@@ -283,12 +308,13 @@ after=$(getmem)
- err_exit_if_leak 'indexed array in function'
-
- LANG=$saveLANG # comment out to test remaining leak (2/2)
-+disabled
-
- # ======
- # Memory leak in typeset (Red Hat #1036470)
- # Fix based on: https://src.fedoraproject.org/rpms/ksh/blob/642af4d6/f/ksh-20120801-memlik3.patch
- # The fix was backported from ksh 93v- beta.
--
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- function myFunction
- {
- typeset toPrint="something"
-@@ -301,10 +327,12 @@ do state=$(myFunction)
- done
- after=$(getmem)
- err_exit_if_leak 'typeset in function called by command substitution'
-+disabled
-
- # ======
- # Check that unsetting an alias frees both the node and its value
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- before=$(getmem)
- for ((i=0; i < N; i++))
- do alias "test$i=command$i"
-@@ -312,10 +340,12 @@ do alias "test$i=command$i"
- done
- after=$(getmem)
- err_exit_if_leak 'unalias'
-+disabled
-
- # ======
- # Red Hat bug rhbz#982142: command substitution leaks
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- # case1: Nested command substitutions
- # (reportedly already fixed in 93u+, but let's keep the test)
- before=$(getmem)
-@@ -324,8 +354,10 @@ do a=`true 1 + \`true 1 + 1\`` # was: a=`expr 1 + \`expr 1 + 1\``
- done
- after=$(getmem)
- err_exit_if_leak 'nested command substitutions'
-+disabled
-
- # case2: Command alias
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- alias ls='true -ltr' # was: alias ls='ls -ltr'
- before=$(getmem)
- for ((i=0; i < N; i++))
-@@ -334,8 +366,10 @@ done
- after=$(getmem)
- unalias ls
- err_exit_if_leak 'alias in command substitution'
-+disabled
-
- # case3: Function call via autoload
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- cat >$tmp/func1 <<\EOF
- function func1
- {
-@@ -353,12 +387,14 @@ after=$(getmem)
- unset -f func1
- unset -v FPATH
- err_exit_if_leak 'function call via autoload in command substitution'
-+disabled
-
- # ======
-
- # add some random utilities to the hash table to detect memory leak on hash table reset when changing PATH
- random_utils=(chmod cp mv awk sed diff comm cut sort uniq date env find mkdir rmdir pr sleep)
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- save_PATH=$PATH
- hash "${random_utils[@]}"
- before=$(getmem)
-@@ -368,7 +404,9 @@ do hash -r
- done
- after=$(getmem)
- err_exit_if_leak 'clear hash table (hash -r) in main shell'
-+disabled
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- before=$(getmem)
- for ((i=0; i < N; i++))
- do PATH=/dev/null
-@@ -377,13 +415,16 @@ do PATH=/dev/null
- done
- after=$(getmem)
- err_exit_if_leak 'set PATH value in main shell'
-+disabled
-
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- before=$(getmem)
- for ((i=0; i < N; i++))
- do PATH=/dev/null command true
- done
- after=$(getmem)
- err_exit_if_leak 'run command with preceding PATH assignment in main shell'
-+disabled
-
- : <<'disabled' # TODO: known leak (approx 73552 bytes after 512 iterations)
- before=$(getmem)
-@@ -454,6 +495,7 @@ disabled
-
- # ======
- # Test for a memory leak after 'cd' (in relation to $PWD and $OLDPWD)
-+: <<'disabled' # TODO: upstream, leak sometimes on some archs
- original_pwd=$PWD
- before=$(getmem)
- for ((i=0; i < N; i++))
-@@ -473,6 +515,7 @@ done
- after=$(getmem)
- err_exit_if_leak 'PWD and/or OLDPWD changed by cd'
- cd $original_pwd
-+disabled
-
- # ======
- # https://github.com/ksh93/ksh/issues/253#issuecomment-815308466
-diff --git a/src/cmd/ksh93/tests/tilde.sh b/src/cmd/ksh93/tests/tilde.sh
-index 1be00b9..1de0b16 100755
---- a/src/cmd/ksh93/tests/tilde.sh
-+++ b/src/cmd/ksh93/tests/tilde.sh
-@@ -151,13 +151,13 @@ do (
- [[ $got == "$exp" ]] || err_exit "$disc discipline: counter:" \
- "expected $(printf %q "$exp"), got $(printf %q "$got")"
- ((i==5)) || err_exit "$disc discipline: counter: $i != 5"
--
-+: << 'disabled' # TODO sometimes fails on armv7 arch
- set -- ~spc ~spc ~spc
- got=$#,$1,$2,$3
- exp=$'3,one\ttwo three\n\tfour,one\ttwo three\n\tfour,one\ttwo three\n\tfour'
- [[ $got == "$exp" ]] || err_exit "$disc discipline: quoting of whitespace:" \
- "expected $(printf %q "$exp"), got $(printf %q "$got")"
--
-+disabled
- print "$Errors" >$tmp/Errors
- ) &
- wait "$!" 2>crashmsg
-diff --git a/src/cmd/ksh93/tests/variables.sh b/src/cmd/ksh93/tests/variables.sh
-index 253f84a..8b306a1 100755
---- a/src/cmd/ksh93/tests/variables.sh
-+++ b/src/cmd/ksh93/tests/variables.sh
-@@ -58,6 +58,7 @@ rand2=$($SHELL -c 'RANDOM=1; (echo $RANDOM)')
- (( rand1 == rand2 )) && err_exit "Test 3: \$RANDOM seed in subshell doesn't change" \
- "(both results are $rand1)"
- # $RANDOM should be reseeded for the ( simple_command & ) optimization
-+: <<'disabled' # Reason: On slower systems it could fail with an arithmetic syntax error because the output was verified before it had been written. From: https://github.com/ksh93/ksh/commit/33269cae615c913592e776276b480bf1d722ff07
- ( echo $RANDOM & ) >r1
- ( echo $RANDOM & ) >r2
- integer giveup=0
-@@ -74,6 +75,7 @@ fi
- kill $! 2>/dev/null
- trap - USR1
- unset giveup
-+disabled
- # Virtual subshells should not influence the parent shell's RANDOM sequence
- RANDOM=456
- exp="$RANDOM $RANDOM $RANDOM $RANDOM $RANDOM"
---
-2.31.1
-
diff --git a/app-shells/ksh/ksh-1.0.0_beta1.ebuild b/app-shells/ksh/ksh-1.0.0_beta1.ebuild
deleted file mode 100644
index ae2481bd2e6b..000000000000
--- a/app-shells/ksh/ksh-1.0.0_beta1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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 ~sparc ~x86"
-
-PATCHES=(
- "${FILESDIR}/ksh-1.0.0-beta.1-regre-tests.patch"
-)
-
-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 only make ast-ksh 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/
@ 2022-09-19 6:31 Georgy Yakovlev
0 siblings, 0 replies; 6+ messages in thread
From: Georgy Yakovlev @ 2022-09-19 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 8690ad4324d9e8c2cfd33f28c0238d54cef57ece
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 06:31:12 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 06:31:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8690ad43
app-shells/ksh: drop 1.0.0_beta2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> 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..000000000000
--- 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 <vmihalko@redhat.com>
-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
- done shcomp generated
- make suid_exec
- make suid_exec.o
-@@ -1429,7 +1429,7 @@ make install
- prev +li
- prev ${mam_libsocket}
- prev ${mam_libsecdb}
-- exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${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 suid_exec suid_exec.o ${mam_libast} ${mam_libnsl} ${mam_libast} -lm
- done suid_exec generated
- make shell
- prev libshell.a archive
diff --git a/app-shells/ksh/ksh-1.0.0_beta2.ebuild b/app-shells/ksh/ksh-1.0.0_beta2.ebuild
deleted file mode 100644
index 297d09947372..000000000000
--- a/app-shells/ksh/ksh-1.0.0_beta2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2021-2022 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/ksh-1.0.0-beta.2-gcc12.patch"
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-19 6:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-19 6:31 [gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2022-05-15 11:13 Stephan Hartmann
2022-05-15 11:11 Stephan Hartmann
2020-02-07 16:08 Mike Gilbert
2018-01-28 21:25 Mike Gilbert
2015-11-29 20:04 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox