From a2810985afabcc31d3eace5e61d8ea25b852ba17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 7 May 2019 11:18:59 +0100 Subject: gentoo resync : 07.05.2019 --- app-shells/ksh/files/cpp.patch | 24 --------------- app-shells/ksh/files/ksh-prefix-r1.patch | 51 -------------------------------- app-shells/ksh/files/ksh-prefix.patch | 42 -------------------------- 3 files changed, 117 deletions(-) delete mode 100644 app-shells/ksh/files/cpp.patch delete mode 100644 app-shells/ksh/files/ksh-prefix-r1.patch delete mode 100644 app-shells/ksh/files/ksh-prefix.patch (limited to 'app-shells/ksh/files') diff --git a/app-shells/ksh/files/cpp.patch b/app-shells/ksh/files/cpp.patch deleted file mode 100644 index 7075bcfc1f7f..000000000000 --- 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 - 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/files/ksh-prefix-r1.patch b/app-shells/ksh/files/ksh-prefix-r1.patch deleted file mode 100644 index d2cfd6c0c154..000000000000 --- 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[] = "/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/files/ksh-prefix.patch b/app-shells/ksh/files/ksh-prefix.patch deleted file mode 100644 index c97cbe333ca1..000000000000 --- a/app-shells/ksh/files/ksh-prefix.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/src/cmd/ksh93/data/msg.c -+++ b/src/cmd/ksh93/data/msg.c -@@ -180,7 +180,7 @@ - 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"; -@@ -188,24 +188,24 @@ - 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_sysprofile[] = "@GENTOO_PORTAGE_EPREFIX@/etc/profile"; -+const char e_suidprofile[] = "@GENTOO_PORTAGE_EPREFIX@/etc/suid_profile"; - #if SHOPT_SYSRC --const char e_sysrc[] = "/etc/ksh.kshrc"; -+const char e_sysrc[] = "@GENTOO_PORTAGE_EPREFIX@/etc/ksh.kshrc"; - #endif - #if SHOPT_BASH - #if SHOPT_SYSRC --const char e_bash_sysrc[] = "/etc/bash.bashrc"; -+const char e_bash_sysrc[] = "@GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc"; - #endif - 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 --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"; - #if SHOPT_SUID_EXEC -- const char e_suidexec[] = "/etc/suid_exec"; -+ const char e_suidexec[] = "@GENTOO_PORTAGE_EPREFIX@/etc/suid_exec"; - #endif /* SHOPT_SUID_EXEC */ - const char hist_fname[] = "/.sh_history"; - const char e_dot[] = "."; -- cgit v1.2.3