* [gentoo-commits] repo/proj/prefix:master commit in: app-shells/bash/, app-shells/bash/files/
@ 2016-04-13 13:21 Michael Haubenwallner
0 siblings, 0 replies; 4+ messages in thread
From: Michael Haubenwallner @ 2016-04-13 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 4d3552c6223cf4b6ea85583a8a4dbf29e51319be
Author: Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Wed Apr 13 07:52:29 2016 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 11:46:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4d3552c6
bash-4.3_p39: add cygwin patch
app-shells/bash/bash-4.3_p39.ebuild | 2 +
app-shells/bash/files/bash-4.3_p39-cygwin-r2.patch | 690 +++++++++++++++++++++
2 files changed, 692 insertions(+)
diff --git a/app-shells/bash/bash-4.3_p39.ebuild b/app-shells/bash/bash-4.3_p39.ebuild
index 549dee6..e38462f 100644
--- a/app-shells/bash/bash-4.3_p39.ebuild
+++ b/app-shells/bash/bash-4.3_p39.ebuild
@@ -94,6 +94,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
+ epatch "${FILESDIR}"/${P}-cygwin-r2.patch
+
# Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
# sh while bootstrapping for the first time, This works around bug 309825
sed -i -e '1s:sh:bash:' support/bashbug.sh || die
diff --git a/app-shells/bash/files/bash-4.3_p39-cygwin-r2.patch b/app-shells/bash/files/bash-4.3_p39-cygwin-r2.patch
new file mode 100644
index 0000000..1a0ffc3
--- /dev/null
+++ b/app-shells/bash/files/bash-4.3_p39-cygwin-r2.patch
@@ -0,0 +1,690 @@
+based on Cygwin bash-4.3.39-2.src package
+
+--- origsrc/bash-4.3/bashline.c 2015-06-01 22:41:57.804475900 -0600
++++ src/bash-4.3/bashline.c 2015-06-02 22:22:59.745114200 -0600
+@@ -264,6 +274,11 @@ int no_empty_command_completion;
+ are the only possible matches, even if FIGNORE says to. */
+ int force_fignore = 1;
+
++#if __CYGWIN__
++/* If set, shorten "foo.exe" to "foo" when they are the same file. */
++int completion_strip_exe;
++#endif /* __CYGWIN__ */
++
+ /* Perform spelling correction on directory names during word completion */
+ int dircomplete_spelling = 0;
+
+@@ -2109,6 +2127,21 @@ globword:
+
+ if (match && executable_completion ((searching_path ? val : cval), searching_path))
+ {
++#if __CYGWIN__
++ if (completion_strip_exe)
++ {
++ size_t val_len = strlen (val);
++ char *candidate;
++ if (val_len > 4 && !strcasecmp (&val[val_len - 4], ".exe")
++ && (candidate = strdup (val)))
++ {
++ candidate[val_len - 4] = '\0';
++ if (same_file (val, candidate, NULL, NULL))
++ temp[strlen (temp) - 4] = '\0';
++ free (candidate);
++ }
++ }
++#endif
+ if (cval != val)
+ free (cval);
+ free (val);
+@@ -2844,6 +2877,17 @@ test_for_directory (name)
+ int r;
+
+ fn = bash_tilde_expand (name, 0);
++#if __CYGWIN__
++ /* stat("//server") can only be successful as a directory, but takes
++ a several-second timeout to fail. It is much faster to assume
++ that //server is a valid name than it is to wait for the stat,
++ even though it gives false positives on bad names. */
++ if (fn[0] == '/' && fn[1] == '/' && ! strchr (&fn[2], '/'))
++ {
++ free (fn);
++ return 1;
++ }
++#endif /* __CYGWIN__ */
+ r = file_isdir (fn);
+ free (fn);
+
+--- origsrc/bash-4.3/builtins/set.def 2015-06-01 22:41:57.850941500 -0600
++++ src/bash-4.3/builtins/set.def 2015-06-02 22:22:59.760951100 -0600
+@@ -56,6 +56,13 @@ extern int dont_save_function_defs;
+ #if defined (READLINE)
+ extern int no_line_editing;
+ #endif /* READLINE */
++#if __CYGWIN__
++extern int igncr;
++static int set_minus_o_option_maybe (int, const char *, int);
++# define INTERACTIVE_ONLY ,1
++#else /* ! __CYGWIN__ */
++# define INTERACTIVE_ONLY
++#endif
+
+ $BUILTIN set
+ $FUNCTION set_builtin
+@@ -92,6 +99,9 @@ Options:
+ #if defined (HISTORY)
+ history enable command history
+ #endif
++#if __CYGWIN__
++ igncr on cygwin, ignore \r in line endings
++#endif
+ ignoreeof the shell will not exit upon reading EOF
+ interactive-comments
+ allow comments to appear in interactive commands
+@@ -188,29 +198,41 @@ const struct {
+ int *variable;
+ setopt_set_func_t *set_func;
+ setopt_get_func_t *get_func;
++#if __CYGWIN__
++ /* Cygwin users have taken to exporting SHELLOPTS for the
++ cygwin-specific igncr. As a result, we need to make sure
++ SHELLOPTS parsing does not turn on interactive options when
++ exported from an interactive shell, but parsed in a
++ non-interactive setting, since some interactive options violate
++ POSIX /bin/sh rules. */
++ int interactive_only;
++#endif /* __CYGWIN__ */
+ } o_options[] = {
+ { "allexport", 'a', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ #if defined (BRACE_EXPANSION)
+ { "braceexpand",'B', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ #endif
+ #if defined (READLINE)
+- { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode },
++ { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY},
+ #endif
+ { "errexit", 'e', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ { "errtrace", 'E', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ { "functrace", 'T', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ { "hashall", 'h', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ #if defined (BANG_HISTORY)
+- { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
++ { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY},
+ #endif /* BANG_HISTORY */
+ #if defined (HISTORY)
+- { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL },
++ { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL INTERACTIVE_ONLY},
++#endif
++#if __CYGWIN__
++ { "igncr", '\0', &igncr, NULL, (setopt_get_func_t *)NULL },
+ #endif
+ { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL },
+ { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ { "keyword", 'k', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ #if defined (JOB_CONTROL)
+- { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
++ { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY},
+ #endif
+ { "noclobber", 'C', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ { "noexec", 'n', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+@@ -229,7 +251,7 @@ const struct {
+ { "privileged", 'p', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ { "verbose", 'v', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ #if defined (READLINE)
+- { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode },
++ { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY},
+ #endif
+ { "xtrace", 'x', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ {(char *)NULL, 0 , (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+@@ -416,6 +438,15 @@ int
+ set_minus_o_option (on_or_off, option_name)
+ int on_or_off;
+ char *option_name;
++#if __CYGWIN__
++{
++ /* See cygwin comments above. */
++ return set_minus_o_option_maybe (on_or_off, option_name, 0);
++}
++static int
++set_minus_o_option_maybe (int on_or_off, const char *option_name,
++ int avoid_interactive)
++#endif /* __CYGWIN__ */
+ {
+ register int i;
+
+@@ -423,6 +454,10 @@ set_minus_o_option (on_or_off, option_na
+ {
+ if (STREQ (option_name, o_options[i].name))
+ {
++#if __CYGWIN__
++ if (o_options[i].interactive_only && avoid_interactive)
++ return EXECUTION_SUCCESS;
++#endif /* __CYGWIN__ */
+ if (o_options[i].letter == 0)
+ {
+ SET_BINARY_O_OPTION_VALUE (i, on_or_off, option_name);
+@@ -548,7 +583,11 @@ parse_shellopts (value)
+ vptr = 0;
+ while (vname = extract_colon_unit (value, &vptr))
+ {
++#if __CYGWIN__
++ set_minus_o_option_maybe (FLAG_ON, vname, !interactive_shell);
++#else /* !__CYGWIN__ */
+ set_minus_o_option (FLAG_ON, vname);
++#endif
+ free (vname);
+ }
+ }
+--- origsrc/bash-4.3/builtins/shopt.def 2013-02-27 07:43:20.000000000 -0700
++++ src/bash-4.3/builtins/shopt.def 2015-06-02 22:22:59.760951100 -0600
+@@ -91,6 +91,11 @@ extern int glob_star;
+ extern int glob_asciirange;
+ extern int lastpipe_opt;
+
++#if __CYGWIN__
++extern int completion_strip_exe;
++#endif
++
++
+ #if defined (EXTENDED_GLOB)
+ extern int extended_glob;
+ #endif
+@@ -161,6 +166,9 @@ static struct {
+ { "compat40", &shopt_compat40, set_compatibility_level },
+ { "compat41", &shopt_compat41, set_compatibility_level },
+ { "compat42", &shopt_compat42, set_compatibility_level },
++#if __CYGWIN__
++ { "completion_strip_exe", &completion_strip_exe, NULL },
++#endif
+ #if defined (READLINE)
+ { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
+ { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
+--- origsrc/bash-4.3/doc/bash.1 2014-02-06 07:03:52.000000000 -0700
++++ src/bash-4.3/doc/bash.1 2015-06-02 22:22:59.760951100 -0600
+@@ -1658,6 +1658,14 @@ subsequently reset.
+ Expands to the effective user ID of the current user, initialized at
+ shell startup. This variable is readonly.
+ .TP
++.B EXECIGNORE
++A colon-separated list of extended glob (see \fBPattern Matching\fP)
++patterns. Files with full paths matching one of these patterns are
++not considered executable for the purposes of completion and PATH
++searching, but the \fB[\fP, \fB[[\fP, and \fBtest\fP builtins are not
++affected. Use this variable to deal with systems that set the
++executable bit on files that are not actually executable.
++.TP
+ .B FUNCNAME
+ An array variable containing the names of all shell functions
+ currently in the execution call stack.
+@@ -3308,6 +3316,10 @@ the character
+ .B ``.''
+ at the start of a name or immediately following a slash
+ must be matched explicitly, unless the shell option
++.B completion_strip_exe
++If set, whenever bash sees `foo.exe' during completion, it checks if
++`foo' is the same file and strips the suffix.
++.TP 8
+ .B dotglob
+ is set.
+ When matching a pathname, the slash character must always be
+--- origsrc/bash-4.3/doc/bashref.texi 2014-02-22 11:20:36.000000000 -0700
++++ src/bash-4.3/doc/bashref.texi 2015-06-02 22:22:59.776306300 -0600
+@@ -4992,6 +4992,10 @@ filenames.
+ This variable is set by default, which is the default Bash behavior in
+ versions through 4.2.
+
++@item completion_strip_exe
++If set, whenever bash sees `foo.exe' during completion, it checks if
++`foo' is the same file and strips the suffix.
++
+ @item direxpand
+ If set, Bash
+ replaces directory names with the results of word expansion when performing
+@@ -5578,6 +5582,14 @@ Similar to @code{BASH_ENV}; used when th
+ The numeric effective user id of the current user. This variable
+ is readonly.
+
++@item EXECIGNORE
++A colon-separated list of extended glob ((@pxref{Pattern Matching})
++patterns. Files with full paths matching one of these patterns are
++not considered executable for the purposes of completion and PATH
++searching, but the @code{[}, @code{[[}, and @code{test} builtins are
++not affected. Use this variable to deal with systems that set the
++executable bit on files that are not actually executable.
++
+ @item FCEDIT
+ The editor used as a default by the @option{-e} option to the @code{fc}
+ builtin command.
+--- origsrc/bash-4.3/execute_cmd.c 2015-06-01 22:41:57.242554200 -0600
++++ src/bash-4.3/execute_cmd.c 2015-06-02 22:22:59.776306300 -0600
+@@ -58,6 +58,7 @@ extern int errno;
+ #endif
+
+ #define NEED_FPURGE_DECL
++#define NEED_SH_SETLINEBUF_DECL /* used in externs.h */
+
+ #include "bashansi.h"
+ #include "bashintl.h"
+--- origsrc/bash-4.3/expr.c 2014-01-03 06:55:00.000000000 -0700
++++ src/bash-4.3/expr.c 2015-06-02 22:22:59.776306300 -0600
+@@ -83,6 +83,7 @@
+
+ #include "shell.h"
+ #include "typemax.h" /* INTMAX_MAX, INTMAX_MIN */
++#define exp2 exp2_
+
+ /* Because of the $((...)) construct, expressions may include newlines.
+ Here is a macro which accepts newlines, tabs and spaces as whitespace. */
+--- origsrc/bash-4.3/findcmd.c 2012-10-15 05:45:04.000000000 -0600
++++ src/bash-4.3/findcmd.c 2015-06-02 22:22:59.776306300 -0600
+@@ -48,6 +48,8 @@
+ extern int errno;
+ #endif
+
++#include <glob/strmatch.h>
++
+ extern int posixly_correct;
+ extern int last_command_exit_value;
+
+@@ -77,6 +79,38 @@ int check_hashed_filenames;
+ containing the file of interest. */
+ int dot_found_in_search = 0;
+
++static struct ignorevar execignore =
++{
++ "EXECIGNORE",
++ (struct ign *)0,
++ 0,
++ (char *)0,
++ (sh_iv_item_func_t *)0,
++};
++
++void
++setup_exec_ignore (char *varname)
++{
++ setup_ignore_patterns (&execignore);
++}
++
++/* Return whether we should never consider file executable
++ * even if the system tells us it is. */
++static int
++is_on_exec_blacklist (char *name)
++{
++ struct ign *p;
++ int flags = FNM_EXTMATCH | FNM_CASEFOLD;
++
++ for (p = execignore.ignores; p && p->val; p++)
++ {
++ if (strmatch (p->val, (char *)name, flags) != FNM_NOMATCH)
++ return (1);
++ }
++
++ return (0);
++}
++
+ /* Return some flags based on information about this file.
+ The EXISTS bit is non-zero if the file is found.
+ The EXECABLE bit is non-zero the file is executble.
+@@ -104,7 +138,7 @@ file_status (name)
+ file access mechanisms into account. eaccess uses the effective
+ user and group IDs, not the real ones. We could use sh_eaccess,
+ but we don't want any special treatment for /dev/fd. */
+- if (eaccess (name, X_OK) == 0)
++ if (!is_on_exec_blacklist (name) && eaccess (name, X_OK) == 0)
+ r |= FS_EXECABLE;
+ if (eaccess (name, R_OK) == 0)
+ r |= FS_READABLE;
+--- origsrc/bash-4.3/findcmd.h 2012-01-14 16:56:25.000000000 -0700
++++ src/bash-4.3/findcmd.h 2015-06-02 22:22:59.776306300 -0600
+@@ -31,5 +31,6 @@ extern char *find_user_command __P((cons
+ extern char *find_path_file __P((const char *));
+ extern char *search_for_command __P((const char *, int));
+ extern char *user_command_matches __P((const char *, int, int));
++extern void setup_exec_ignore __P((char *));
+
+ #endif /* _FINDCMD_H_ */
+--- origsrc/bash-4.3/general.c 2014-01-30 14:46:15.000000000 -0700
++++ src/bash-4.3/general.c 2015-06-02 22:22:59.791899800 -0600
+@@ -44,6 +44,10 @@
+
+ #include <tilde/tilde.h>
+
++#ifdef __CYGWIN__
++# include <sys/cygwin.h>
++#endif
++
+ #if !defined (errno)
+ extern int errno;
+ #endif /* !errno */
+@@ -632,7 +636,8 @@ make_absolute (string, dot_path)
+ {
+ char pathbuf[PATH_MAX + 1];
+
+- cygwin_conv_to_full_posix_path (string, pathbuf);
++ cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, string, pathbuf,
++ sizeof pathbuf);
+ result = savestring (pathbuf);
+ }
+ #else
+--- origsrc/bash-4.3/include/posixjmp.h 2012-12-23 20:20:50.000000000 -0700
++++ src/bash-4.3/include/posixjmp.h 2015-06-02 22:22:59.791899800 -0600
+@@ -27,13 +27,15 @@
+
+ #if defined (HAVE_POSIX_SIGSETJMP)
+ # define procenv_t sigjmp_buf
+-# if !defined (__OPENNT)
++# if !defined (__OPENNT) && !defined __CYGWIN__
+ # undef setjmp
+ # define setjmp(x) sigsetjmp((x), 1)
+-# define setjmp_nosigs(x) sigsetjmp((x), 0)
+ # undef longjmp
+ # define longjmp(x, n) siglongjmp((x), (n))
+-# endif /* !__OPENNT */
++# endif /* !__OPENNT && !__CYGWIN__ */
++# if !defined (__OPENNT)
++# define setjmp_nosigs(x) sigsetjmp((x), 0)
++# endif /* !__OPENNT */
+ #else
+ # define procenv_t jmp_buf
+ # define setjmp_nosigs setjmp
+--- origsrc/bash-4.3/input.c 2014-02-07 07:13:08.000000000 -0700
++++ src/bash-4.3/input.c 2015-06-02 22:22:59.791899800 -0600
+@@ -44,6 +44,10 @@
+ #include "quit.h"
+ #include "trap.h"
+
++#if __CYGWIN__
++int igncr;
++#endif
++
+ #if !defined (errno)
+ extern int errno;
+ #endif /* !errno */
+@@ -561,6 +565,19 @@ buffered_getchar ()
+ {
+ CHECK_TERMSIG;
+
++#if __CYGWIN__
++ /* shopt igncr means to discard carriage returns from input stream.
++ If cr is the only character in the buffer, then recurse to pick
++ up the next character; otherwise flatten the buffer. */
++ if (igncr)
++ {
++ int ch;
++ while ((ch = bufstream_getc (buffers[bash_input.location.buffered_fd]))
++ == '\r')
++ ;
++ return ch;
++ }
++#endif /* __CYGWIN__ */
+ #if !defined (DJGPP)
+ return (bufstream_getc (buffers[bash_input.location.buffered_fd]));
+ #else
+--- origsrc/bash-4.3/lib/sh/pathphys.c 2013-05-28 13:33:58.000000000 -0600
++++ src/bash-4.3/lib/sh/pathphys.c 2015-06-02 22:22:59.823097800 -0600
+@@ -35,6 +35,7 @@
+ #include <stdio.h>
+ #include <chartypes.h>
+ #include <errno.h>
++#include <stdlib.h>
+
+ #include "shell.h"
+
+@@ -76,6 +77,10 @@ sh_physpath (path, flags)
+ char *path;
+ int flags;
+ {
++#if __CYGWIN__
++ /* realpath does this correctly without all the hassle */
++ return realpath (path, NULL);
++#else
+ char tbuf[PATH_MAX+1], linkbuf[PATH_MAX+1];
+ char *result, *p, *q, *qsave, *qbase, *workpath;
+ int double_slash_path, linklen, nlink;
+@@ -214,11 +219,7 @@ error:
+ {
+ q = result;
+ /* Duplicating some code here... */
+-#if defined (__CYGWIN__)
+- qbase = (ISALPHA((unsigned char)workpath[0]) && workpath[1] == ':') ? workpath + 3 : workpath + 1;
+-#else
+ qbase = workpath + 1;
+-#endif
+ double_slash_path = DOUBLE_SLASH (workpath);
+ qbase += double_slash_path;
+
+@@ -249,6 +250,7 @@ error:
+ }
+
+ return (result);
++#endif /* ! __CYGWIN__ */
+ }
+
+ char *
+--- origsrc/bash-4.3/lib/sh/tmpfile.c 2013-12-18 15:50:13.000000000 -0700
++++ src/bash-4.3/lib/sh/tmpfile.c 2015-06-02 22:22:59.823097800 -0600
+@@ -96,7 +96,7 @@ get_tmpdir (flags)
+ if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX))
+ tdir = 0;
+
+- if (tdir == 0)
++ if (tdir == 0 || !file_iswdir (tdir))
+ tdir = get_sys_tmpdir ();
+
+ #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX)
+@@ -118,14 +118,15 @@ sh_mktmpname (nameroot, flags)
+ struct stat sb;
+ int r, tdlen;
+
+- filename = (char *)xmalloc (PATH_MAX + 1);
++ filename = NULL;
+ tdir = get_tmpdir (flags);
+ tdlen = strlen (tdir);
+
+ lroot = nameroot ? nameroot : DEFAULT_NAMEROOT;
+
+ #ifdef USE_MKTEMP
+- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot);
++ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0)
++ return NULL;
+ if (mktemp (filename) == 0)
+ {
+ free (filename);
+@@ -138,7 +139,9 @@ sh_mktmpname (nameroot, flags)
+ (unsigned long) time ((time_t *)0) ^
+ (unsigned long) dollar_dollar_pid ^
+ (unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++);
+- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
++ free (filename);
++ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0)
++ return NULL;
+ if (tmpnamelen > 0 && tmpnamelen < 32)
+ filename[tdlen + 1 + tmpnamelen] = '\0';
+ # ifdef HAVE_LSTAT
+@@ -163,14 +166,19 @@ sh_mktmpfd (nameroot, flags, namep)
+ char *filename, *tdir, *lroot;
+ int fd, tdlen;
+
+- filename = (char *)xmalloc (PATH_MAX + 1);
++ filename = NULL;
+ tdir = get_tmpdir (flags);
+ tdlen = strlen (tdir);
+
+ lroot = nameroot ? nameroot : DEFAULT_NAMEROOT;
+
+ #ifdef USE_MKSTEMP
+- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot);
++ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0)
++ {
++ if (namep)
++ *namep = NULL;
++ return -1;
++ }
+ fd = mkstemp (filename);
+ if (fd < 0 || namep == 0)
+ {
+@@ -187,7 +195,13 @@ sh_mktmpfd (nameroot, flags, namep)
+ (unsigned long) time ((time_t *)0) ^
+ (unsigned long) dollar_dollar_pid ^
+ (unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++);
+- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
++ free (filename);
++ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0)
++ {
++ if (namep)
++ *namep = NULL;
++ return -1;
++ }
+ if (tmpnamelen > 0 && tmpnamelen < 32)
+ filename[tdlen + 1 + tmpnamelen] = '\0';
+ fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY), 0600);
+--- origsrc/bash-4.3/parse.y 2015-06-01 22:41:58.022560000 -0600
++++ src/bash-4.3/parse.y 2015-06-02 22:22:59.838697600 -0600
+@@ -1531,14 +1531,20 @@ yy_string_get ()
+ string = bash_input.location.string;
+
+ /* If the string doesn't exist, or is empty, EOF found. */
+- if (string && *string)
++ while (string && *string)
+ {
+ c = *string++;
+ bash_input.location.string = string;
++#if __CYGWIN__
++ {
++ extern int igncr;
++ if (igncr && c == '\r')
++ continue;
++ }
++#endif
+ return (c);
+ }
+- else
+- return (EOF);
++ return (EOF);
+ }
+
+ static int
+@@ -2305,7 +2311,7 @@ shell_getc (remove_quoted_newline)
+ if (n <= 2) /* we have to save 1 for the newline added below */
+ {
+ if (truncating == 0)
+- internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%llu): line truncated", shell_input_line_size, SIZE_MAX);
++ internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%zu): line truncated", shell_input_line_size, SIZE_MAX);
+ shell_input_line[i] = '\0';
+ truncating = 1;
+ }
+@@ -3587,7 +3593,6 @@ parse_comsub (qc, open, close, lenp, fla
+
+ while (count)
+ {
+-comsub_readchar:
+ ch = shell_getc (qc != '\'' && (tflags & (LEX_INCOMMENT|LEX_PASSNEXT)) == 0);
+
+ if (ch == EOF)
+--- origsrc/bash-4.3/pathexp.h 2009-01-04 12:32:40.000000000 -0700
++++ src/bash-4.3/pathexp.h 2015-06-02 22:22:59.838697600 -0600
+@@ -86,7 +86,7 @@ struct ign {
+ typedef int sh_iv_item_func_t __P((struct ign *));
+
+ struct ignorevar {
+- char *varname; /* FIGNORE or GLOBIGNORE */
++ char *varname; /* FIGNORE or GLOBIGNORE or EXECIGNORE */
+ struct ign *ignores; /* Store the ignore strings here */
+ int num_ignores; /* How many are there? */
+ char *last_ignoreval; /* Last value of variable - cached for speed */
+--- origsrc/bash-4.3/subst.c 2015-06-01 22:41:57.367407300 -0600
++++ src/bash-4.3/subst.c 2015-06-02 22:22:59.838697600 -0600
+@@ -41,6 +41,7 @@
+ #include "posixstat.h"
+ #include "bashintl.h"
+
++#define NEED_SH_SETLINEBUF_DECL /* used in externs.h */
+ #include "shell.h"
+ #include "parser.h"
+ #include "flags.h"
+@@ -5268,6 +5269,13 @@ read_comsub (fd, quoted, rflag)
+ #endif
+ continue;
+ }
++#if __CYGWIN__
++ {
++ extern int igncr;
++ if (igncr && c == '\r')
++ continue;
++ }
++#endif /* __CYGWIN__ */
+
+ /* Add the character to ISTRING, possibly after resizing it. */
+ RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE);
+@@ -5385,6 +5393,28 @@ command_substitute (string, quoted)
+ goto error_exit;
+ }
+
++#if __CYGWIN__
++ /* Passing a pipe through std fds can cause hangs when talking to a
++ non-cygwin child. Move it. */
++ if (fildes[0] < 3)
++ {
++ int fd = fcntl (fildes[0], F_DUPFD, 3);
++ close (fildes[0]);
++ fildes[0] = fd;
++ }
++ if (fildes[1] < 3)
++ {
++ int fd = fcntl (fildes[1], F_DUPFD, 3);
++ close (fildes[1]);
++ fildes[1] = fd;
++ }
++ if (fildes[0] < 0 || fildes[1] < 0)
++ {
++ sys_error (_("cannot make pipe for command substitution"));
++ goto error_exit;
++ }
++#endif /* __CYGWIN__ */
++
+ old_pid = last_made_pid;
+ #if defined (JOB_CONTROL)
+ old_pipeline_pgrp = pipeline_pgrp;
+--- origsrc/bash-4.3/variables.c 2015-06-01 22:41:57.928984100 -0600
++++ src/bash-4.3/variables.c 2015-06-02 22:22:59.854339600 -0600
+@@ -4681,6 +4681,8 @@ static struct name_and_function special_
+ { "COMP_WORDBREAKS", sv_comp_wordbreaks },
+ #endif
+
++ { "EXECIGNORE", sv_execignore },
++
+ { "FUNCNEST", sv_funcnest },
+
+ { "GLOBIGNORE", sv_globignore },
+@@ -4879,6 +4881,13 @@ sv_globignore (name)
+ setup_glob_ignore (name);
+ }
+
++/* What to do when EXECIGNORE changes. */
++void
++sv_execignore (char *name)
++{
++ setup_exec_ignore (name);
++}
++
+ #if defined (READLINE)
+ void
+ sv_comp_wordbreaks (name)
+@@ -4952,7 +4961,7 @@ sv_winsize (name)
+ /* Update the value of HOME in the export environment so tilde expansion will
+ work on cygwin. */
+ #if defined (__CYGWIN__)
+-sv_home (name)
++void sv_home (name)
+ char *name;
+ {
+ array_needs_making = 1;
+--- origsrc/bash-4.3/variables.h 2014-01-08 13:33:29.000000000 -0700
++++ src/bash-4.3/variables.h 2015-06-02 22:22:59.854339600 -0600
+@@ -372,6 +372,7 @@ extern void sv_ifs __P((char *));
+ extern void sv_path __P((char *));
+ extern void sv_mail __P((char *));
+ extern void sv_funcnest __P((char *));
++extern void sv_execignore __P((char *));
+ extern void sv_globignore __P((char *));
+ extern void sv_ignoreeof __P((char *));
+ extern void sv_strict_posix __P((char *));
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: app-shells/bash/, app-shells/bash/files/
@ 2016-10-25 8:53 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2016-10-25 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 3b26173352658140d096e97387ad116085d9046f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 08:50:43 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 08:50:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3b261733
app-shells/bash: sync
Package-Manager: portage-2.2.28-prefix
app-shells/bash/Manifest | 10 +
app-shells/bash/bash-4.3_p48.ebuild | 288 +++++++++++++++++++++
app-shells/bash/bash-4.4-r1.ebuild | 251 ++++++++++++++++++
app-shells/bash/files/bash-4.3-protos.patch | 10 +
.../bash/files/bash-4.4-history-alloclist.patch | 26 ++
app-shells/bash/metadata.xml | 13 +-
6 files changed, 593 insertions(+), 5 deletions(-)
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index aee21e9..972e069 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -2,6 +2,7 @@ DIST bash-4.0.tar.gz 6230779 SHA256 9793d394f640a95030c77d5ac989724afe196921956d
DIST bash-4.1.tar.gz 6598300 SHA256 3f627124a83c6d34db503a923e20710d370573a29dd5d11d6f116d1aee7be1da SHA512 2f2a053d98be9a31cd089e1293e3369ad05406f6543d1d1662d8b5807fdcfebc1dda79db9bf2c596a6351ea463fb9bd9c8943c1d45da9b82f2fd3bab0b8a581a WHIRLPOOL 0259149d6f0d8f8a19e4b5a88e127c55efae0df4459063295aa6a9de69450b5f4b4b579894e4410ddfc0119eeb0356865b7cc4dbc7e4a75ad98acce0dfe2d46f
DIST bash-4.2.tar.gz 7009201 SHA256 a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 SHA512 fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c WHIRLPOOL fd5f321a8a89381904b1dd1f5acb5100186ce48cccc9b248cf68b35a1c1932177df1fc2b0215131999ee6018decf3264c45e54d407bf4b74ff8e4cc8215c630a
DIST bash-4.3.tar.gz 7955839 SHA256 afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651 WHIRLPOOL d82eb296b1bdee517b20e40d2231697dc41e2040d34e2da24c4fa40755c723d732929805ebef6f6923cd8ffecfb0db7063ec1dc3ab4e695a93916f2d872e236f
+DIST bash-4.4.tar.gz 9377313 SHA256 d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb SHA512 73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29 WHIRLPOOL cb88bb6f565d66346f5eb358a179e52637a2ede2fda3358899730795f1ac6f9540d116202f2d0d1ebb9d983ad7054c5fbf9be8b06a1ca0b4fe1eb62bb30a15ce
DIST bash40-001 5156 SHA256 e3b514204e5da7bf1aecf7d0981514b2367d4b529da6d4a45d09dc29e2f0031b SHA512 2898b793404656d63739e478332789a6ba51844c3a388ca4a18e42953883065c3164cb90e525cc6ad8e59d1f47e7e8058ff7ca42194569729aebbbcb5e93dab0 WHIRLPOOL 747515eff1af46bbb1423086f4f852b93fa20963eddd1591ead15bec39f9e22e5e9db52cb6785b7afe90746a6b42c110ae0b4c3982fd0449001bad71633bc073
DIST bash40-002 1220 SHA256 495117e566019b9cb0ab49504945b30cdda6e5b59597e43e18eae1f06b1d5cf4 SHA512 5af8cddc9ebff7433fc200780e46becca4b13a407c2b85aa08871e3a3019daab9787aeaacf4fd86ae3666119a3f35c8548ab488c72cef4fbaf991307d6bbd348 WHIRLPOOL b36c8bc8d6e7ac48029904a915a052817b3f4a2639ae93a55fee772e70b9af5e52144735a59142baee81c45d3f67fe31826513b5bdd00696fec30a1f4f926ec5
DIST bash40-003 1749 SHA256 e300c40611b1e3775b7d1fb73bd770ad19973c22d7016d126af3304bae797bd8 SHA512 700821bfd1e890118c2c051a589911fff5ae2aae7ecf6aa6eb2da019ad45136ccc5bccf8103fc923a1b4bf0b1d2aa2e2d4e3cfc9a5cb0b5179f1221255e0de47 WHIRLPOOL bf67f7568ee25b37d663a68911033669c5013e3813ff00a926db2092517c196ef3088442e442475e5c61bf7748b0f62a2fed6be9b064b580fc4b93ccf96e6b54
@@ -155,3 +156,12 @@ DIST bash43-036 1539 SHA256 ac5f82445b36efdb543dbfae64afed63f586d7574b833e9aa9cd
DIST bash43-037 1284 SHA256 33f170dd7400ab3418d749c55c6391b1d161ef2de7aced1873451b3a3fca5813 SHA512 7977c0fb9142cdea259b06322092aab3231b9773cc397519bedb6f731aea02a46441c67615b31fd19c886678eb1985687d07357d15fc7f08e946404efc564966 WHIRLPOOL fc3e010f065aa3087ac4e22352459dc2cdd5a232653749250dfebf17023a405ed78e0b2dd8ad66727aaa2645173dc14be111e32e8fb71a13786f4fe6ac6875ac
DIST bash43-038 2354 SHA256 adbeaa500ca7a82535f0e88d673661963f8a5fcdc7ad63445e68bf5b49786367 SHA512 2ef2557b17867b5820a9e5619daa1cddb3fadcff7470504c148828a3007217767da4bf540dc835cf263f9c943b2c1aa909c845f8410f69e2d04c8b3d659efee3 WHIRLPOOL 66a2878b850cce96e532625cdcd88d0402c775dc585419c946ddebb206fbf8bee91846cbdce7a88b9caef09e1b02c144e3e71734c918c1b2c09cec67c68fa8d0
DIST bash43-039 1531 SHA256 ab94dced2215541097691f60c3eb323cc28ef2549463e6a5334bbcc1e61e74ec SHA512 f9745a05bfbbe39f8e5af3865de3a32391d7ff291289977e23340c79a3783b4fad15bdcf8ce62478916b43fe18501c4d7c65cd54d3c20e8bb889919df48a9a19 WHIRLPOOL 3ee69bc81a25afe4998f76d43c9c2f4f6aca61f545a7304156fceda0f8a99c86379b673967bc7f72c26f5bde01248f77d7aee6372164c2e3b94c7781c7f6bd08
+DIST bash43-040 1532 SHA256 84bb396b9262992ca5424feab6ed3ec39f193ef5c76dfe4a62b551bd8dd9d76b SHA512 25a0696f1f0e78cb971afa404e0b7fe634b70d49d6a5a9d6ff5506c42063968e8ede83ad80bd0b79601363676fe3abfedc3b76984f6f9ad2e7798790682e21d0 WHIRLPOOL a435f25ae432161f676b4965cc20cc096fa18af8a191dca7cb311a41e3504e5d27c668fb3430fece1de45e0eed9cb34357dc887e83ace9819f24d585eddf6720
+DIST bash43-041 2362 SHA256 4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a SHA512 d75cdd6a1fb8aeb1a4e88f046cfea3ec493b994b96f60f27d5577b59408422bb7c51cc4525cadab821fd8c57f44fb07f811b087d077359242caff3b54cfc6819 WHIRLPOOL c88e754d694b69bcb3ce390ab3e29932b30a74f8f15b75b570cc46699c072b0f872824766c45bc2a98627529896bdf5aaf6493a493ffd33932d9ed6a362defb3
+DIST bash43-042 1535 SHA256 ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919 SHA512 01a6601029c0a55c9bf1a4ace3f387f9d094a9b9ee3511e2113c000123d85b1d5813c369e62d5a6dd329f515ef0d67d11394a6c0e4516956387556c13d13009a WHIRLPOOL 790b15282a81f5717fb675ea4ae752382ddb1b101766e32c68deb1ec1d64fcf8841b3da556b87ac685e18b528a1de31bc4b94900369f6386f8e3991ed76232c1
+DIST bash43-043 1942 SHA256 47a8a3c005b46e25821f4d8f5ccb04c1d653b1c829cb40568d553dc44f7a6180 SHA512 eb05e537fac08587d0755ad59218bb5a51685aefc1476d6e3feaf72acd1e08cbda512988d8c157425e7939863b313d1e36f51b32f8a8497655c6b0710a24b738 WHIRLPOOL 3c9a466b68ea5d94b5ad9d1868ad1ace80df6608a9bd1b77c1cd06f7edb588090061f7f4e2639dd7190763864511d573dec33aad77be722516a1300e8a45ce31
+DIST bash43-044 1658 SHA256 9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a0aed12567f99 SHA512 2937ef80c99e93094e4aaa6a93d077efc3e433a4712c17e30590a0abeb5488293365cb8aa19e37d25b7d5c38d3ad26cdea12b904e5ffb2cdb16f18ab12f422fd WHIRLPOOL 488f567b900e49a9de9b92e9a8e29a92a087d390e9f24c3986bf1d89524878c88c7a3c2cae959844427fb20e6858a7b8eae112aac640f3d97ba1f79888f9f25d
+DIST bash43-045 1312 SHA256 ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023 SHA512 7b79dacff44e5358da736334d2277a2879ca1389e22e9dac50e139f30dab623bc89a56930d89e74efc468a00d051f6747ccaffcd1a30d7c737d49780b9830e3d WHIRLPOOL f361e523879ff1898574ac5eca480661bd787dc278fff204e7f27da89e85439b4e9d36a5f556046b760f3beb115302e745b5196bfa081b402d3f76fb44463558
+DIST bash43-046 1494 SHA256 b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f SHA512 c036b659fa681f8129110356bec33fad00fb8e469f3b4bcefd0b7ddf5e20030977716adf5c65f58f3ff68cd7af0bdd42392ee077100bc7f45ee123749d082f7d WHIRLPOOL d58384a2ca77f9a80a69a117221da51a701539cf5497d8e0fc634cd1cc0cb0024e02675bea810a0f42b873b557d479ba1b7aee6e6f73bd1422df2dbb29396477
+DIST bash43-047 4437 SHA256 c69248de7e78ba6b92f118fe1ef47bc86479d5040fe0b1f908ace1c9e3c67c4a SHA512 9332d680ac226491cf8e5986a3261eb76b53ef4b0b2a43405564b088afc0e8658077812c9177bdab7900e05394e69f3047d82ddb59553fc01ef721acfa9d5553 WHIRLPOOL 719fa31d0fb09a75d5abbb63ee5a485802c5eadd06720d6074c2282d117aa6e234f5f75cabd340643710bd14e99260047183386bd1df278c9715aed7b98232d7
+DIST bash43-048 1612 SHA256 5b8215451c5d096ca1e115307ffe6613553551a70369525a0778f216c3a4dfa2 SHA512 7c3963bfbc730b4592668460e86c166e727e9897c1a9235a6860a01bc90d365ef0707f0fac7ed62780dcc84e80dbe8484ec59e9e948def22f44ae03e8a169780 WHIRLPOOL e1a435c3b9fbc0deca80dd89bfd3adcbff1d5a3af50884d2aef54635b8ba1063903e2d99a5a23bd1c64c19c5e9c19de6b479ac777cecdb812555dc5683b8cf71
diff --git a/app-shells/bash/bash-4.3_p48.ebuild b/app-shells/bash/bash-4.3_p48.ebuild
new file mode 100644
index 0000000..8fe1792
--- /dev/null
+++ b/app-shells/bash/bash-4.3_p48.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+ local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ [[ ${plevel} -eq 0 ]] && return 1
+ eval set -- {1..${plevel}}
+ set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+ if [[ ${opt} == -s ]] ; then
+ echo "${@/#/${DISTDIR}/}"
+ else
+ local u
+ for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+ printf "${u}/${pn}-${pv}-patches/%s " "$@"
+ done
+ fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="6.3"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2:0=
+ readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+ nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+ !<sys-apps/portage-2.1.6.7_p1
+ !<sys-apps/paludis-0.26.0_alpha5"
+# we only need yacc when the .y files get patched (bash42-005)
+DEPEND+=" virtual/yacc"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
+ "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
+ "${FILESDIR}"/${PN}-4.3-protos.patch
+ "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
+ "${FILESDIR}"/${PN}-4.3_p39-cygwin-r2.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if is-flag -malign-double ; then #7332
+ eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
+ eerror "as it breaks LFS (struct stat64) on x86."
+ die "remove -malign-double from your CFLAGS mr ricer"
+ fi
+ if use bashlogger ; then
+ ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+ ewarn "This will log ALL output you enter into the shell, you have been warned."
+ fi
+}
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+ # Include official patches
+ [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+
+ # Clean out local libs so we know we use system ones w/releases.
+ if [[ ${PV} != *_rc* ]] ; then
+ rm -rf lib/{readline,termcap}/*
+ touch lib/{readline,termcap}/Makefile.in # for config.status
+ sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+ fi
+
+ # Prefixify hardcoded path names. No-op for non-prefix.
+ hprefixify pathnames.h.in
+
+ # Avoid regenerating docs after patches #407985
+ sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+ touch -r . doc/*
+
+ epatch "${PATCHES[@]}"
+
+ # Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
+ # sh while bootstrapping for the first time, This works around bug 309825
+ sed -i -e '1s:sh:bash:' support/bashbug.sh || die
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf=()
+
+ # For descriptions of these, see config-top.h
+ # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+ append-cppflags \
+ -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+ -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+ -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+ -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+ -DNON_INTERACTIVE_LOGIN_SHELLS \
+ -DSSH_SOURCE_BASHRC \
+ -DUSE_MKTEMP -DUSE_MKSTEMP \
+ $(use bashlogger && echo -DSYSLOG_HISTORY)
+ [[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
+
+ if [[ ${CHOST} == *-aix* ]] || [[ ${CHOST} == *-hpux* ]] ; then
+ # Avoid finding tgetent() in anything else but ncurses library,
+ # as <termcap.h> is provided by ncurses, even during bootstrap
+ # on AIX and HP-UX, and we would get undefined symbols like
+ # BC, PC, UP if linking against something else.
+ # The bash-bug is that it doesn't check for <termcap.h> provider,
+ # and unfortunately {,n}curses is checked last.
+ # Even if ncurses provides libcurses.so->libncurses.so symlink,
+ # it feels more clean to link against libncurses.so directly.
+ # (all configure-variables for tgetent() are shown here)
+ export ac_cv_func_tgetent=no
+ export ac_cv_lib_termcap_tgetent=no # found on HP-UX
+ export ac_cv_lib_tinfo_tgetent=no
+ export ac_cv_lib_curses_tgetent=no # found on AIX
+ #export ac_cv_lib_ncurses_tgetent=no
+
+ # Without /dev/fd/*, bash uses named pipes instead, but the
+ # pipe names are not unique enough for portage's multijob.
+ append-cppflags -DUSE_MKTEMP
+ fi
+
+ # Don't even think about building this statically without
+ # reading Bug 7714 first. If you still build it statically,
+ # don't come crying to us with bugs ;).
+ #use static && export LDFLAGS="${LDFLAGS} -static"
+ use nls || myconf+=( --disable-nls )
+
+ # Historically, we always used the builtin readline, but since
+ # our handling of SONAME upgrades has gotten much more stable
+ # in the PM (and the readline ebuild itself preserves the old
+ # libs during upgrades), linking against the system copy should
+ # be safe.
+ # Exact cached version here doesn't really matter as long as it
+ # is at least what's in the DEPEND up above.
+ export ac_cv_rl_version=${READLINE_VER}
+
+ # Force linking with system curses ... the bundled termcap lib
+ # sucks bad compared to ncurses. For the most part, ncurses
+ # is here because readline needs it. But bash itself calls
+ # ncurses in one or two small places :(.
+
+ if [[ ${PV} != *_rc* ]] ; then
+ # Use system readline only with released versions.
+ myconf+=( --with-installed-readline=. )
+ fi
+
+ if use plugins; then
+ case ${CHOST} in
+ *-linux-gnu | *-solaris* | *-freebsd* )
+ append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+ ;;
+ # Darwin doesn't need an rpath here (in fact doesn't grok the argument)
+ esac
+ else
+ # Disable the plugins logic by hand since bash doesn't
+ # provide a way of doing it.
+ export ac_cv_func_dl{close,open,sym}=no \
+ ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+ sed -i \
+ -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+ configure || die
+ fi
+ tc-export AR #444070
+ econf \
+ --docdir='$(datarootdir)'/doc/${PF} \
+ --htmldir='$(docdir)/html' \
+ --with-curses \
+ $(use_with afs) \
+ $(use_enable net net-redirections) \
+ --disable-profiling \
+ $(use_enable mem-scramble) \
+ $(use_with mem-scramble bash-malloc) \
+ $(use_enable readline) \
+ $(use_enable readline history) \
+ $(use_enable readline bang-history) \
+ "${myconf[@]}"
+}
+
+src_compile() {
+ emake
+
+ if use plugins ; then
+ emake -C examples/loadables all others
+ fi
+}
+
+src_install() {
+ local d f
+
+ default
+
+ dodir /bin
+ mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+ dosym bash /bin/rbash
+
+ insinto /etc/bash
+ doins "${FILESDIR}"/bash_logout
+ doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+ keepdir /etc/bash/bashrc.d
+ insinto /etc/skel
+ for f in bash{_logout,_profile,rc} ; do
+ newins "${FILESDIR}"/dot-${f} .${f}
+ done
+
+ local sed_args=(
+ -e "s:#${USERLAND}#@::"
+ -e '/#@/d'
+ )
+ if ! use readline ; then
+ sed_args+=( #432338
+ -e '/^shopt -s histappend/s:^:#:'
+ -e 's:use_color=true:use_color=false:'
+ )
+ fi
+ sed -i \
+ "${sed_args[@]}" \
+ "${ED}"/etc/skel/.bashrc \
+ "${ED}"/etc/bash/bashrc || die
+
+ if use plugins ; then
+ exeinto /usr/$(get_libdir)/bash
+ doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+ insinto /usr/include/bash-plugins
+ doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+ fi
+
+ if use examples ; then
+ for d in examples/{functions,misc,scripts,startup-files} ; do
+ exeinto /usr/share/doc/${PF}/${d}
+ insinto /usr/share/doc/${PF}/${d}
+ for f in ${d}/* ; do
+ if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+ doexe ${f}
+ else
+ doins ${f}
+ fi
+ done
+ done
+ fi
+
+ doman doc/*.1
+ newdoc CWRU/changelog ChangeLog
+ dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+ if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+ mkdir -p "${EROOT}"/etc/bash
+ mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+ fi
+
+ if [[ -L ${EROOT}/bin/sh ]] ; then
+ # rewrite the symlink to ensure that its mtime changes. having /bin/sh
+ # missing even temporarily causes a fatal error with paludis.
+ local target=$(readlink "${EROOT}"/bin/sh)
+ local tmp=$(emktemp "${EROOT}"/bin)
+ ln -sf "${target}" "${tmp}"
+ mv -f "${tmp}" "${EROOT}"/bin/sh
+ fi
+}
+
+pkg_postinst() {
+ # If /bin/sh does not exist, provide it
+ if [[ ! -e ${EROOT}/bin/sh ]] ; then
+ ln -sf bash "${EROOT}"/bin/sh
+ fi
+}
diff --git a/app-shells/bash/bash-4.4-r1.ebuild b/app-shells/bash/bash-4.4-r1.ebuild
new file mode 100644
index 0000000..b818de4
--- /dev/null
+++ b/app-shells/bash/bash-4.4-r1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+ local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ [[ ${plevel} -eq 0 ]] && return 1
+ eval set -- {1..${plevel}}
+ set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+ if [[ ${opt} == -s ]] ; then
+ echo "${@/#/${DISTDIR}/}"
+ else
+ local u
+ for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+ printf "${u}/${pn}-${pv}-patches/%s " "$@"
+ done
+ fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="7.0"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+case ${PV} in
+*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
+*) SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" ;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2:0=
+ readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+ nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+ !<sys-apps/portage-2.1.6.7_p1
+ !<sys-apps/paludis-0.26.0_alpha5"
+# we only need yacc when the .y files get patched (bash42-005)
+#DEPEND+=" virtual/yacc"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if is-flag -malign-double ; then #7332
+ eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
+ eerror "as it breaks LFS (struct stat64) on x86."
+ die "remove -malign-double from your CFLAGS mr ricer"
+ fi
+ if use bashlogger ; then
+ ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+ ewarn "This will log ALL output you enter into the shell, you have been warned."
+ fi
+}
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+ # Include official patches
+ [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+
+ # bug 597006: large HISTFILESIZE value may result in upfront memory exhaustion
+ epatch "${FILESDIR}"/${PN}-4.4-history-alloclist.patch
+
+ # Clean out local libs so we know we use system ones w/releases.
+ if [[ ${PV} != *_rc* ]] ; then
+ rm -rf lib/{readline,termcap}/*
+ touch lib/{readline,termcap}/Makefile.in # for config.status
+ sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+ fi
+
+ # Prefixify hardcoded path names. No-op for non-prefix.
+ hprefixify pathnames.h.in
+
+ # Avoid regenerating docs after patches #407985
+ sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+ touch -r . doc/*
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf=()
+
+ # For descriptions of these, see config-top.h
+ # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+ append-cppflags \
+ -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+ -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+ -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+ -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+ -DNON_INTERACTIVE_LOGIN_SHELLS \
+ -DSSH_SOURCE_BASHRC \
+ $(use bashlogger && echo -DSYSLOG_HISTORY)
+
+ # Don't even think about building this statically without
+ # reading Bug 7714 first. If you still build it statically,
+ # don't come crying to us with bugs ;).
+ #use static && export LDFLAGS="${LDFLAGS} -static"
+ use nls || myconf+=( --disable-nls )
+
+ # Historically, we always used the builtin readline, but since
+ # our handling of SONAME upgrades has gotten much more stable
+ # in the PM (and the readline ebuild itself preserves the old
+ # libs during upgrades), linking against the system copy should
+ # be safe.
+ # Exact cached version here doesn't really matter as long as it
+ # is at least what's in the DEPEND up above.
+ export ac_cv_rl_version=${READLINE_VER%%_*}
+
+ # Force linking with system curses ... the bundled termcap lib
+ # sucks bad compared to ncurses. For the most part, ncurses
+ # is here because readline needs it. But bash itself calls
+ # ncurses in one or two small places :(.
+
+ if [[ ${PV} != *_rc* ]] ; then
+ # Use system readline only with released versions.
+ myconf+=( --with-installed-readline=. )
+ fi
+
+ if use plugins; then
+ append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+ else
+ # Disable the plugins logic by hand since bash doesn't
+ # provide a way of doing it.
+ export ac_cv_func_dl{close,open,sym}=no \
+ ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+ sed -i \
+ -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+ configure || die
+ fi
+ tc-export AR #444070
+ econf \
+ --docdir='$(datarootdir)'/doc/${PF} \
+ --htmldir='$(docdir)/html' \
+ --with-curses \
+ $(use_with afs) \
+ $(use_enable net net-redirections) \
+ --disable-profiling \
+ $(use_enable mem-scramble) \
+ $(use_with mem-scramble bash-malloc) \
+ $(use_enable readline) \
+ $(use_enable readline history) \
+ $(use_enable readline bang-history) \
+ "${myconf[@]}"
+}
+
+src_compile() {
+ emake
+
+ if use plugins ; then
+ emake -C examples/loadables all others
+ fi
+}
+
+src_install() {
+ local d f
+
+ default
+
+ dodir /bin
+ mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+ dosym bash /bin/rbash
+
+ insinto /etc/bash
+ doins "${FILESDIR}"/bash_logout
+ doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+ keepdir /etc/bash/bashrc.d
+ insinto /etc/skel
+ for f in bash{_logout,_profile,rc} ; do
+ newins "${FILESDIR}"/dot-${f} .${f}
+ done
+
+ local sed_args=(
+ -e "s:#${USERLAND}#@::"
+ -e '/#@/d'
+ )
+ if ! use readline ; then
+ sed_args+=( #432338
+ -e '/^shopt -s histappend/s:^:#:'
+ -e 's:use_color=true:use_color=false:'
+ )
+ fi
+ sed -i \
+ "${sed_args[@]}" \
+ "${ED}"/etc/skel/.bashrc \
+ "${ED}"/etc/bash/bashrc || die
+
+ if use plugins ; then
+ exeinto /usr/$(get_libdir)/bash
+ doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+ insinto /usr/include/bash-plugins
+ doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+ fi
+
+ if use examples ; then
+ for d in examples/{functions,misc,scripts,startup-files} ; do
+ exeinto /usr/share/doc/${PF}/${d}
+ insinto /usr/share/doc/${PF}/${d}
+ for f in ${d}/* ; do
+ if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+ doexe ${f}
+ else
+ doins ${f}
+ fi
+ done
+ done
+ fi
+
+ doman doc/*.1
+ newdoc CWRU/changelog ChangeLog
+ dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+ if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+ mkdir -p "${EROOT}"/etc/bash
+ mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+ fi
+
+ if [[ -L ${EROOT}/bin/sh ]] ; then
+ # rewrite the symlink to ensure that its mtime changes. having /bin/sh
+ # missing even temporarily causes a fatal error with paludis.
+ local target=$(readlink "${EROOT}"/bin/sh)
+ local tmp=$(emktemp "${EROOT}"/bin)
+ ln -sf "${target}" "${tmp}"
+ mv -f "${tmp}" "${EROOT}"/bin/sh
+ fi
+}
+
+pkg_postinst() {
+ # If /bin/sh does not exist, provide it
+ if [[ ! -e ${EROOT}/bin/sh ]] ; then
+ ln -sf bash "${EROOT}"/bin/sh
+ fi
+}
diff --git a/app-shells/bash/files/bash-4.3-protos.patch b/app-shells/bash/files/bash-4.3-protos.patch
new file mode 100644
index 0000000..7af84ff
--- /dev/null
+++ b/app-shells/bash/files/bash-4.3-protos.patch
@@ -0,0 +1,10 @@
+--- a/redir.c
++++ b/redir.c
+@@ -31,6 +31,7 @@
+ #endif
+ #include "filecntl.h"
+ #include "posixstat.h"
++#include "trap.h"
+
+ #if defined (HAVE_UNISTD_H)
+ # include <unistd.h>
diff --git a/app-shells/bash/files/bash-4.4-history-alloclist.patch b/app-shells/bash/files/bash-4.4-history-alloclist.patch
new file mode 100644
index 0000000..8072bde
--- /dev/null
+++ b/app-shells/bash/files/bash-4.4-history-alloclist.patch
@@ -0,0 +1,26 @@
+*** ../bash-4.4/lib/readline/history.c 2015-12-28 13:50:31.000000000 -0500
+--- lib/readline/history.c 2016-09-30 14:28:40.000000000 -0400
+***************
+*** 58,61 ****
+--- 58,63 ----
+ #define DEFAULT_HISTORY_INITIAL_SIZE 502
+
++ #define MAX_HISTORY_INITIAL_SIZE 8192
++
+ /* The number of slots to increase the_history by. */
+ #define DEFAULT_HISTORY_GROW_SIZE 50
+***************
+*** 308,312 ****
+ {
+ if (history_stifled && history_max_entries > 0)
+! history_size = history_max_entries + 2;
+ else
+ history_size = DEFAULT_HISTORY_INITIAL_SIZE;
+--- 310,316 ----
+ {
+ if (history_stifled && history_max_entries > 0)
+! history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
+! ? MAX_HISTORY_INITIAL_SIZE
+! : history_max_entries + 2;
+ else
+ history_size = DEFAULT_HISTORY_INITIAL_SIZE;
diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index 8598dc9..9b5e498 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<use>
- <flag name='bashlogger'>Log ALL commands typed into bash; should ONLY be
+ <flag name="bashlogger">Log ALL commands typed into bash; should ONLY be
used in restricted environments such as honeypots</flag>
- <flag name='mem-scramble'>Build with custom malloc/free overwriting allocated/freed memory</flag>
- <flag name='net'>Enable /dev/tcp/host/port redirection</flag>
- <flag name='plugins'>Add support for loading builtins at runtime via
+ <flag name="mem-scramble">Build with custom malloc/free overwriting allocated/freed memory</flag>
+ <flag name="net">Enable /dev/tcp/host/port redirection</flag>
+ <flag name="plugins">Add support for loading builtins at runtime via
'enable'</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: app-shells/bash/, app-shells/bash/files/
@ 2017-08-22 13:09 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2017-08-22 13:09 UTC (permalink / raw
To: gentoo-commits
commit: b4d3d699439a21e47e816a94cdaedd2755fe1b22
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 13:09:33 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 13:09:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b4d3d699
app-shells/bash: sync, bug #628156
Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3
app-shells/bash/Manifest | 117 --------
app-shells/bash/bash-4.0_p43.ebuild | 192 -------------
app-shells/bash/bash-4.0_p44.ebuild | 192 -------------
app-shells/bash/bash-4.1_p16.ebuild | 192 -------------
app-shells/bash/bash-4.1_p17.ebuild | 192 -------------
app-shells/bash/bash-4.2_p52.ebuild | 298 --------------------
app-shells/bash/bash-4.2_p53.ebuild | 298 --------------------
app-shells/bash/bash-4.3_p29.ebuild | 310 ---------------------
app-shells/bash/bash-4.3_p30.ebuild | 310 ---------------------
...{bash-4.3_p39.ebuild => bash-4.3_p48-r1.ebuild} | 75 ++---
.../bash/files/bash-4.4-popd-offset-overflow.patch | 30 ++
app-shells/bash/files/bashrc | 93 ++++---
app-shells/bash/files/dot-bash_profile | 4 +-
13 files changed, 118 insertions(+), 2185 deletions(-)
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 972e069193..55641135cf 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,122 +1,5 @@
-DIST bash-4.0.tar.gz 6230779 SHA256 9793d394f640a95030c77d5ac989724afe196921956db741bcaf141801c50518 SHA512 dccd099d11d649b26d5b5c2ab5fb8f33915631e1d86fba519a0464f2bd3a3289655e956cf161a0dc3671b8be193b6b065bede8a407d98af3012dd4b824711255 WHIRLPOOL b8223f5dcee9dee92b9bb0c6d09a90ea2fd71bbd0894a9927be459e0a2e2b3f0413f57062f4ba7c1f806d778bca71641df4c2892fd6224861d2cd802bebe64f8
-DIST bash-4.1.tar.gz 6598300 SHA256 3f627124a83c6d34db503a923e20710d370573a29dd5d11d6f116d1aee7be1da SHA512 2f2a053d98be9a31cd089e1293e3369ad05406f6543d1d1662d8b5807fdcfebc1dda79db9bf2c596a6351ea463fb9bd9c8943c1d45da9b82f2fd3bab0b8a581a WHIRLPOOL 0259149d6f0d8f8a19e4b5a88e127c55efae0df4459063295aa6a9de69450b5f4b4b579894e4410ddfc0119eeb0356865b7cc4dbc7e4a75ad98acce0dfe2d46f
-DIST bash-4.2.tar.gz 7009201 SHA256 a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 SHA512 fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c WHIRLPOOL fd5f321a8a89381904b1dd1f5acb5100186ce48cccc9b248cf68b35a1c1932177df1fc2b0215131999ee6018decf3264c45e54d407bf4b74ff8e4cc8215c630a
DIST bash-4.3.tar.gz 7955839 SHA256 afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651 WHIRLPOOL d82eb296b1bdee517b20e40d2231697dc41e2040d34e2da24c4fa40755c723d732929805ebef6f6923cd8ffecfb0db7063ec1dc3ab4e695a93916f2d872e236f
DIST bash-4.4.tar.gz 9377313 SHA256 d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb SHA512 73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29 WHIRLPOOL cb88bb6f565d66346f5eb358a179e52637a2ede2fda3358899730795f1ac6f9540d116202f2d0d1ebb9d983ad7054c5fbf9be8b06a1ca0b4fe1eb62bb30a15ce
-DIST bash40-001 5156 SHA256 e3b514204e5da7bf1aecf7d0981514b2367d4b529da6d4a45d09dc29e2f0031b SHA512 2898b793404656d63739e478332789a6ba51844c3a388ca4a18e42953883065c3164cb90e525cc6ad8e59d1f47e7e8058ff7ca42194569729aebbbcb5e93dab0 WHIRLPOOL 747515eff1af46bbb1423086f4f852b93fa20963eddd1591ead15bec39f9e22e5e9db52cb6785b7afe90746a6b42c110ae0b4c3982fd0449001bad71633bc073
-DIST bash40-002 1220 SHA256 495117e566019b9cb0ab49504945b30cdda6e5b59597e43e18eae1f06b1d5cf4 SHA512 5af8cddc9ebff7433fc200780e46becca4b13a407c2b85aa08871e3a3019daab9787aeaacf4fd86ae3666119a3f35c8548ab488c72cef4fbaf991307d6bbd348 WHIRLPOOL b36c8bc8d6e7ac48029904a915a052817b3f4a2639ae93a55fee772e70b9af5e52144735a59142baee81c45d3f67fe31826513b5bdd00696fec30a1f4f926ec5
-DIST bash40-003 1749 SHA256 e300c40611b1e3775b7d1fb73bd770ad19973c22d7016d126af3304bae797bd8 SHA512 700821bfd1e890118c2c051a589911fff5ae2aae7ecf6aa6eb2da019ad45136ccc5bccf8103fc923a1b4bf0b1d2aa2e2d4e3cfc9a5cb0b5179f1221255e0de47 WHIRLPOOL bf67f7568ee25b37d663a68911033669c5013e3813ff00a926db2092517c196ef3088442e442475e5c61bf7748b0f62a2fed6be9b064b580fc4b93ccf96e6b54
-DIST bash40-004 1347 SHA256 4b03ed1f8aea99dec4ab3ba930bd126c6b7dbaeebf219e21ce3aa6274c52d2ae SHA512 e9e88426a4f8222b32e59af4b32a781b9dff7fbfc50d6c40f97fd62fe4dabf08b8c257c685b3be01ffbcef2a918d30dd951b86e670ef283804c7ef4d923c3985 WHIRLPOOL 502656caab4b7ba108c453474dd9999bad755e4495c6348c3da3383e6fc2b4a14307a2dc9c4ba0c42eb95bdcb7cf6b9b96a0a677bcf937ab2effce7fdf5f6168
-DIST bash40-005 2021 SHA256 420658c026916610a07d40b71eb70f6674b78c3b3da10384c7535c15b3309450 SHA512 1d84d131c3677db0e827040174d78aa45b4444e4164bcd392ad630a41e10cb3445dc4abcde214c2d808a4ca23cae8b7005a290df463074851c598a9df5eef2e1 WHIRLPOOL 15585ce3b26abcb93d3145f23958aca4cda96a51c7a3d8d6cb37cdc49f5d936e67900efbdedea86f6e4242f6701b17b6eaeeedc3983aecd7c7b234685cad2149
-DIST bash40-006 1133 SHA256 c78762520f3da5f39319c3143f9eb4f4ca3351a6306cf94b7c42b3b2844d82e4 SHA512 49e83eab424e3423e65f3793c53daecf2e809194cbf2b8edd5fefafb0478c1ce42d6e7057ca367908949698a7be20269a03dcbfee3f1c1c5c288a67ad3b01459 WHIRLPOOL 6aad1ae263e5e598a7cb2ff5bfd52017fcfa78ebfe8328103598249d7639ec63b2a69746bbecb81c4779f2cf875cacbfd16a77963d7ca9a68a78a081b754ffbf
-DIST bash40-007 6920 SHA256 558d559e24d15a9eedb42951f4706839322c644791d20c11ca5e958cfc0e616d SHA512 3ddbff2676fa94d88e1bb824affeb3cb067089cf1c6c48a0ff0a3323f6e64ff59da4dc1126829925b4ec86f11c55a20ef2bd1e517b4661546402061a0aab73e6 WHIRLPOOL fdba9c77f60bda4ea47703652d910a2f7866a4fe0f2501985625249870922709dca06db468366054b4693e8b8964455627e5e5f8c78cd16c7a35ca17b4cb26cd
-DIST bash40-008 1196 SHA256 87db24c00f83db7bdeab585dfecc76cc6ce6fd9269fce0ac7197771f3005d8fc SHA512 1a51acefb80e78bee86fd1ec48da376028e15570bb79c6d108cf8c89802f8dad5d89fe99d492f64662c687e3ae747a8658037579e43b143c0112ebb89697dd03 WHIRLPOOL 6f3023dcb5cba32d42d8f7a283aa39b2a34f95ec9cf48c671d3a90e04637ee0c03a793bd317a8d7a99331ff69c6bfb20d616abd620e5f5bd1f2baa87af2bca33
-DIST bash40-009 1821 SHA256 0047c240617a4aa633bb699f93a4fa9caf77051f2bb85fc2e9c6c899d1df7e2b SHA512 a732f24b5d39a7ba0f2c9b88fea97fc50c96ee73a15bd40085184620eea1c76d07224179b9e9a47ab20401259c548519c0801a3d8260ef47e830e8176e289232 WHIRLPOOL 4a504eb69d92b4ae7fa194328aa3d185d13390505eeffcab94f26c1b6793438b1d7dc278d7eecc217d176b836203400b97baab0e61290d1d75ba0c5db9d12489
-DIST bash40-010 2152 SHA256 f2416f6b45ff3d9a315e41b3da023eb727f53e7dd6e8a07e88d1f2a005ee4816 SHA512 bb0a48acdae924dfa482f2403802454bc3ce276b6179cedd6abe7451709c942b0e6253c18c6d75347364578604619cac9b701540c09148077f65bfae5ddc123a WHIRLPOOL a39d5e3d5ef2d66290adde4a2230626c0026130315ccf15650e5fc7abe925c82aeea2522c14f59f6f6e28c8b61b3b245c3d737ec3a30c73f2a345a36587103e3
-DIST bash40-011 1383 SHA256 ffc81429efe88958356684c27a914d832c1cacb16ca6881192832ee3a18354d4 SHA512 2c33054e6ef2d2816b62a7b6ce0db8a207e99e7a00ce9b9fe005d2de20b4d94a2ba74cc301848b3c72b5319ec4ca76a9113092c3663ca5278810bed4045801ad WHIRLPOOL b688fd9ffc6688b75252061845a24c1fb2ff7dac9d93c3165ae888b62ca5c0a25b001aa89e6ff5f31e7528526944238ede553bc6cf1910224e0749dd15265665
-DIST bash40-012 1459 SHA256 b2c4d6e9c12a8695bc177798b9857b9dbc85a035ad83fce401e668a2de1183f3 SHA512 d39c5a9697dec009bfe3ee3a102f2acce3723444a1e575afce152b082f4dce12c126e391ed1bad10c718a08d9d5cdb571d1e9b86bac5559f57e6c0549a0fc48c WHIRLPOOL f529dfc3bdebd271472e5af13c73f7e41c210281c184393630c2d9379315d61770a2b4d24e3ab80de9cd67d15faf28f05c435547dd7fb278b5bb65f2dce6cf6a
-DIST bash40-013 4629 SHA256 760ccaf9d1f3be5d81e6bc1f8201820b42a2cdcd2a561cb0fb021b4c241e4c3a SHA512 1108f2231c531fddfc021db2ce17b5f1e522039a708493447af5fc8298c6268cfb6080fd38a79edb6877eb2c92ef79b77eedfab14842af91f6bf5037beab0825 WHIRLPOOL 1d22b6b72226b04d7a4a9a9a416f995c47d29c9b90e69db5c269940caa6e4b3158a100a253026437ea0e68133d8d2c87edfd1192c22164c1c93c35763fb99481
-DIST bash40-014 3709 SHA256 13edc4c691768672f680b4f266bdd1c12e7b247349eba4d30d0bd923cca1c39a SHA512 7f05486fdd76e35700d8eb690d90d4fb3e24677a648036fba2f06528f61f7cb230e64cd1f1b374a865acccab4a57841e465088fcb69727e9e8f5f999d673cc34 WHIRLPOOL ddaee711e067ce4874a7306304452ee639315fb82f903816dd174cc8deb0bcc36ba14087186768a39d467330df3642ac528854849107832dbc83979033dc893e
-DIST bash40-015 1914 SHA256 7ba0e2bedf54c80b58e0f471e7372c539e5a43d55eb3f1881f5b8fb649758814 SHA512 f99c9cfb03f2ce9971d866a76b48e3d045fb244d0b223e6db0a7fb3e445107de624bf0c9cdc6fbbe0664d054e5973c5b0fbf15e5d231d8030b256f8d75dce358 WHIRLPOOL 4e3804a77d4c5dff7349082fef77b7073e50bbb29cc651da8fb08410eaa3521cb89f752c1939f48dd30dfa8fbeb9be6748f57bd23557b0496e50d83f205f8eea
-DIST bash40-016 3032 SHA256 8f3a936e928fe78ae10df109d226f79207a5418a7eded376e880fe57a571d519 SHA512 9ae370aa3943731c62209fc15edbcd99d66ea3f7fa8c834262dfc2fc06dc17ad3a509013f902130f5c72ac5411322b018ae8e821158d65ba00c015e23cdac779 WHIRLPOOL 3b8b5763681a9e71c3186ae813d2907b940d91ab7368aa9410b294df66b7bce2ec6515f8c2eaa42edd91b04b72aed4e91ef50b0a8356884990371712eecb6c0b
-DIST bash40-017 1496 SHA256 2bee2afe6339b034e3a8d88bfbf922f6f4704abf0fb56041fa693075f530f021 SHA512 6a78c3fee549b37850ab2e3c0049572c951e5f3717f54d6661d008b6240f7ae869f7a333a422d008025dce47ba222ec350d06d6c8764b06937431bda5b09e320 WHIRLPOOL a098a8282658f77a7cfd681a59b12261b680ffcc4e2b34d6ce1c94b4c88186299b012e2f75001d54f02fc4ce75418cac90c53ffd98c2f173c819540f0627fb29
-DIST bash40-018 2614 SHA256 1db3bb8db0e386be938ce3ca9d3aff10edee57e696dec353fb134960ddc0e631 SHA512 76072a06cdccd49425d77ecc47908137473bd128e3186c4149b93ec06b9809086a46af6f215a63d03c4c178f1a26c061eafffbe86c65e90028d28fd93dcd2420 WHIRLPOOL 4f30e646d3585b84cec237003a8b3d891fd0addabd7366a711024f7321b405d8c321280cc46b48a7f1556b5452c2dc00709ab5801049b0c3e85c23e9bddd5097
-DIST bash40-019 3309 SHA256 5049948f077090c02286445a441cf8efa3a2d95d5660dd8acef512408b0b7475 SHA512 56c751098f9395ee48d35c921b03a089edabf94060cff404614d0ce14aeed3ab904562c0ad6e3fec3e18da701ab4eaf31b3599b4ac94820c06fb114d95ab94df WHIRLPOOL a435bf3a223cae0e2b7d30d96b93d7e00b0f99de341ab482c14c6115b5f18f7fc7dbbbfecad6a32c84137e86dc1aebebe35312e900cabffe82c6ca326b1b498b
-DIST bash40-020 2666 SHA256 1c9a9aebe316867c71fdf94f1b2d3c2b40c0d291b3d220e36785e1ac340c6784 SHA512 0176a995921e565855938f916288f3ed40cb027b2af29bac7e2fd0678f81e8dad16437cbb94428a4391d1951adf844be355deb520b11eaa8e7ae493a7a167c86 WHIRLPOOL dd21d4f1882cd7caf7a2eb3b5e97d129050ca43aa15f26a3139d6105e7bb7215090ea19a212364723fde64189923c6f62f7fc4460c397a6350c2c1b48294ff52
-DIST bash40-021 1547 SHA256 02472d6f8b104941a2b6d4c9ad823cb0e7cfe6e5c20f0b12ab1d7eb23c88114d SHA512 fb72106b26803aeb5afcba89ad3824943accca2c162d6ae533ee1d86b7f66d3d3d8ac8be4a682de9c8deae93c9667315d28320e5f9e2df58478c1c01cf9d43a3 WHIRLPOOL b418f561cf2af8876bc5378bff62b44a6cd2f2b3164b1ae4e0fc172b74f03f0f6719a5886ae91abfb44cf268dade2e97fe6b5b3579b022f1a45a7ef8a1fdd964
-DIST bash40-022 1592 SHA256 045a1dc71aa1863f73ad7be00ec4e18ee3c43c20fafe58d9e2c6c51592359012 SHA512 51ba81c6fe4f03e20f4d80a6fd5aa86848adabab8cd43cbf5120ad16358917904b7ad0989115a0220e7bc4b6be6f6d5a1175c49bd93b93096e9510eb67739b10 WHIRLPOOL 5b4445bfaa70cc1fd5672291ae1748f102c6099bb002aa8be4a38ef021fe5c9bfc3678a1a5543505b49219bb3ee0a571b8d71c0ba1db44d16e7ba7974c83f02d
-DIST bash40-023 2148 SHA256 580b522375f762ca5ddf9dedb6431ef4a9b6e887ea25fc0ce152d747ae5ddc86 SHA512 1ab80dda1164c1edce11c7ee31999be2ab6c6e7fa8e755c9c490164308e898d05a9d46a119e60e98c2bd6fa6715375c02d3569e7d68a0f713b80e7a7ce60c401 WHIRLPOOL 5ded44ffdcc0c659ce10ef34527579d2a0dce26ad3faadeeb6152ce133109d8d297fc2aeca55edfa918d1c131b79e5eb8b5e2f291522e4b10043edbb04cda15f
-DIST bash40-024 3049 SHA256 a59ebac47efe31b951e1732e4223cc725b2748c331bec98248355c5ac53717ab SHA512 6142ff4c0315397d84eb365382cfbbf2e0e14b5d180c8d59b437925ba3d683567ed2a8eb7838d41e9beb07b5500f345c60a9aa55dc5f5709aed7b8f568a1369a WHIRLPOOL 64e5a6c7b057b8fff529419232d6fce9bd46b2177fc6bed516902e5f9dd0fdd2da1d135e5c504ee92913a81607e1e189d012018e2ca6926e4f7aeccbe051818c
-DIST bash40-025 3435 SHA256 f77900d636033474bc15d39c4948515fdfe718164ea668edd64d8d4d5a8f6a08 SHA512 ac84f5d5f997f2bd10d5c0cd79a2dd1c2cf510eee0ebfc291597df95fba9f5851d0449f477f82bbf860652ce618ffa2f2b0108921b8c8e6e582da0f43d4ccbd4 WHIRLPOOL 480f3c5f510ff0744e48e8d1be8aa07d51f5a7a411e97a85892d0d272176ce22710a43ebee06a8f8605b046be3e135423b8e49536814b18d447f0b38e0f29c15
-DIST bash40-026 1433 SHA256 a9bdf4409c6625561884be58026a52ccb47600407f3d5b8d0889f0585040f6cb SHA512 92d65885d5989fdd243074ee4446e51a721bc501f39e3887530d6422c25fce1f2ede2ad567d5acc8d1e2754e2f73001b8c1db33d95032f68fa4211d5786c0d29 WHIRLPOOL ace91c92a48e03eb0d7ef8f300382f772f1744572f84d5c318da9caaf6273d6a59b83b181cca0486ddf9a9eb8288e70ca0fba8d7da8ddd0553802eecc843a43a
-DIST bash40-027 2010 SHA256 f65dc26bb1bacc8a66610cd5f6f2b8e70be8d8c4e397e7a5ad6f3306224b77f2 SHA512 89688509123ef15bda34528569d5e3c2bc6627bf669e8dcf979d81336875457e82b669b9ab50dccdad1ac40d5f07a4d5c6cae963d94ee2ac2b19b7677aa187fd WHIRLPOOL 5484470dfe6b28ad12c6d7143026c7a5012de79993a7fb24994fb0022bb3b4439d79d8be6c1835cdf0fa417b9b214317c8950c80702b14517c28f3e1c5025c98
-DIST bash40-028 5567 SHA256 5b222cbaf3ab1c1d9b4c5956a0e28cad49660f5746af08efe174e7b474022d1a SHA512 037ce07c6fd5872054f2d924ff81753af2a28a2e70b1da498b8278d08a5bcc49cb8f242f4960ab465f2db3b6d05f9606c7d6d362b028ef898d08a2ad08c9d682 WHIRLPOOL 57d810856daf96e752729f1d1e1f1a7fc1998ae08f2b80905e95670d14c93a8bfa24890122e65a44e8f8b8ac2dfdd5b7fa6b4a1743392f47fa4268825078e4e2
-DIST bash40-029 3119 SHA256 15f5a21f91fc19c20e2befa568364f11e72ba30e86e4c61eebb6d7544555fa66 SHA512 cdeec36c7d448c167fd3e8bdfe1234685dafb5c4010efa5ae605be228006b89f3ce68d143617ab62159f790b381067d57d0ac25dade3bdf55a2f0abb0dd852a3 WHIRLPOOL d1b9a956ca26235d91fdde4a03ed18c757356b85e3ed0de29b435aacb404f8662cf0e9b2ca58fff764de291ac555d5937cbdca5609e192b261fddbad351e87ef
-DIST bash40-030 1649 SHA256 7f85de6839a6180922c2fec86f4c150036fca096e43a046a117e97e50e958af3 SHA512 1c27708eada140d99155144b622e8202591ed3680bd8d099803a4072293d6576a850a42bee67c1968fb74e30847d36b81b2d84d6eddd657e3e962095c8e7f822 WHIRLPOOL cae87c4e268ffeaebc109565fbddae3b0610ec8086b025285109de8a22b26c125db43358c05e15c746c11e70710b528c467d5cbb79eaa5eaf2ca7bb6b52076b9
-DIST bash40-031 1633 SHA256 603f318906ee4cd5fdc6a32360b59a5b64bcb50e393fe77d6116269ba28ffb0c SHA512 e6b78291d4aba78cfbb4a3ea0ca14f94a0986f0cd9f1a286996745037ac79da87b70c3936c32bf9e69d99dbab0d782c8811ae6d3d821106d135a19fd07d681d5 WHIRLPOOL 4f97fbb83d54a421241821dcac01f36274553b8234cb23af5ce364990b55d9d1dc1db2e2c85e6b585a835f434805d6baaab4a242ff0d3eb029e56aea8d4a996a
-DIST bash40-032 1154 SHA256 ea6b4736bedcf73cbf2a2558a2c3a04e3b18064a9730ac7e0c03e15d103faade SHA512 9e6bf2123557d8b4b908fa3afc278c8d10b8f647dd7de426ffe2a88098a9932d9f2fcd5fff922d731a7330a0a5067306b9bb626f89980c6b6d66d7e77a73d69f WHIRLPOOL 3bd5510cdedf80fb83e7a256589c03e23373ad4e1c7e3740468ca893b6b3f7edbb73cce4c5578b3fefb770de6f74966f7ccaf40c8bee76ada2ffaefbf860d01e
-DIST bash40-033 1380 SHA256 c496f6e0329940925dbdfc002ec08b8b06dc7e6e3269ca490f99a3879d2d04f5 SHA512 ff7af4d5d2da49e60741749b1e3814704bcf867480cab33108bf23dc27358d0a1c6f79d98991f245f65e5bfc67fdcc4ab05dd84f8f90c7a2c922978f8d95cf1c WHIRLPOOL 30271463a7c704ce80511cb0209b19a6bcc04fa3aef5c98b719e91a56b4a4d12780b2af6768e1235bb3bb6df2b87f08a68e108438e4ef4b809635aa9ea794df2
-DIST bash40-034 2160 SHA256 37d2f304c5c283602bde8195a501c19ef5ade3fb5494d25ca22fe1f00cbb42f7 SHA512 90248b7bf39fc9592a14b67d4aa0367daa50afce230e406a31c8f2e6dce091fbaa80092bc3f98ce4e9b3c20b6c66c827882dc1eea669dccc5b87ded185d60eeb WHIRLPOOL 6eb58c9514beb153f542eab6f98ad9c34eb4896917004fe1e9d54616248e1cb65370d4375ea16a33f4b8010dd81d403a609d13a47716ed6fcdb64e7c12143e0c
-DIST bash40-035 1884 SHA256 1806e4efa9b7dc796cec0acc4062cd501b2646591699c14b4899c26438c8f673 SHA512 17a926fefb672991331ee278e94ccaf880054379f0c6e4cc2b847937f54153b8e304ac9d54b65961f3e24fe89a32b961ac219453aeb6e182bd657e103c6ff8d3 WHIRLPOOL c24d7fed7adda74a7bb76ac5365eaa3ee51b1d78e84afb91f6276837a2fe2c56c013057219f5dc99d7f026fcc65f472f0e46677febc0bf5d2458f4e2d66e6471
-DIST bash40-036 2618 SHA256 7a78204900f68668dabf7b30a6df2398b47e810c51929e1c2b3f69f5a917102f SHA512 5c3f84b70420ef1ce55cd1c9fd30420754f93d7ebac6b2191e1c879b2aa2a147f25e3f881dc845d9d6f21526f0a294275725d41428fe1e214665262d20743250 WHIRLPOOL 928e3af0120b2a19d82052e347944ff76b650d3ff18bbf11aa1d6df31225d6f09822b86cadc7ada741326ff583f958535c448aab51bd8f9f8c3876da17c69ac0
-DIST bash40-037 1626 SHA256 f02284ad64deccb232bfc6c12fe2bc365c731d7e3ada354dd9527164c98cdf0a SHA512 24f64f9457ef4dfb31cb81bf4e683d94a71b269c03c1189309d3bc6dfc3354594069960bfa704c76141b9dd9a1d7994bb17e803c341b94199752d44d18b57d8a WHIRLPOOL 82fd2fe6d5105f1ffa69cb0e86777f59e44b0d4970b03e1291ddd046123f0f5185fb74c3bce4f2522a1ff015738b13b82dedea8f025d2d786c6294b154c793d6
-DIST bash40-038 1620 SHA256 b31ea07d9ac47b261065265beb01a5420939447aa0932ff9f78b049117afc19f SHA512 8116da5e07a7aa8afbeea7f868227ab5d21f7893a43fb4754da9a4c6598de099e32cf47eb028289a257cef100a5e952ca9f87e7943674a713b63ae59b455346e WHIRLPOOL 06a6f29301ed0d60df149853178ad6a6465b669d2de7ba6f72a52bba0cf490040490d220fb7f99bcf1e86d652bfcc6ef337cb81fa0e5a3f3b75b920fd03d06bc
-DIST bash40-039 3272 SHA256 09de2a4309fdcdff470754357073b6e9b1e4662add5981888acba27a53954a1e SHA512 3db7ab0fd9ab1e2fc8a4b457112053a3a04fbc2857161f765937753f75eab15595f0454bcfbf895c31774a5b5d96152b95a3d9009f53f8caa4df4854bc260769 WHIRLPOOL b0d4483ef339a8cb17a9fc65b0978890b1f96f04cc8d119963bc16b5c7b0d6a0b7f9c97566855ebd160bf6601c258a273b08f38d6a8532233956767cce5b235e
-DIST bash40-040 1173 SHA256 d71810ce346bfa8c6b77e5070e80207de4b8362678516be8febf50a7ec748039 SHA512 adcd63fd74f0d9c17cae0595bb6e8a3d678e296d5ab37b3c601af47cc64bae2c2a63367f32a9b93033423f819e0aa0fc4cbca7051003c296cf108133cef0ed92 WHIRLPOOL 1ce87e303522a56b2f2910a038f839c4c270278a09477a6dab001732b66fbf43cb1a4cb879fc911539fcd716ea9786284d1d4870baee7bc5175c72920604e885
-DIST bash40-041 6639 SHA256 9adecc88b5b3f2d87b8469d00d1b37624d38d6ca13227e787b46df723fab1c60 SHA512 bb71f3a26d6f0d099c69e3f4c5b25a4644f7c1217082fba65c999317ec5611edb8733057f973e84eb0ddfd3149cdedc1e1430f062a361523bc04a053e125de6e WHIRLPOOL 327f47ec9fb3816df7eef3d07487601a01f38b0af0aeeefe65bd9c604d693d0985f23ebba154cee3711f42b2d340432f20070e2c3a48ea0a144b8936ebe70988
-DIST bash40-042 4056 SHA256 8eccf5a7a67368c32b145d30a75aebc4530b1676f1ec300fcafb9a61e217acc6 SHA512 98bd4d05af90454b26831af690760544f3074854acf6fbecfab30258bd8aa8a010d05395867b7bb3c1bea80b3baeb6cde643c4ce99bfeaef65021ea7a088503c WHIRLPOOL d97c2ae7ce64433d8429f27e69d718fdd623a754838340fab46ea8d1e8b82ea5eb2f00eaa7f1cdce5d6b23c9465744df38e9fd9ab3378b2bad0521309c275c7c
-DIST bash40-043 1824 SHA256 1e077dea323010fff5c625d506530d9f05b76e179f3bc8efb46e17cdd4a6ffec SHA512 bef809c83803d2c48de2e7181699b0a49c31990fdb7ed7a056312d1d20963b07c33e97bff746715381ac9114afd3338c3256dc79813d593880418bc6099bfa6f WHIRLPOOL 3b4e73a686a134e80e4d72401ef8a39010d47dc60a05127477f3d84b74b2cb6a0a4e978302cd1f46442532957fd7b2415103b4be09ed46840a7fa0d2261818a5
-DIST bash40-044 3882 SHA256 05eeb7818fd4409ef41b6308b9de7f47217a0e956067219c7300c009212a5c88 SHA512 89b36451b46efce43772663ee3c1cc6090f9c66fdf689b4a2cc0c56fc000df27deb304d85713d22f0d014cfb5fdbed5889b3463cee82614cfa8dd1a0effe8162 WHIRLPOOL 97b1a6f58ff0605accd335e5a58c12aacb7a61248a7582f7fd1b0b30c8ec797dfeaf21d9ede1e59405e5f193ce1e407cfc04852867caef2df5d44d8af4471284
-DIST bash41-001 1445 SHA256 a6e47fa108f853d0f0999520509c11680d37c8b7823b92b96d431766dd620278 SHA512 22ec94f2459a3bb966b16e8216a35cba0d58d532c553308191c2d9aabc2c38eedb0aa2fcf972f1f9ebd1681230a5a7d49764dd435991db69c0f025f6de9243f4 WHIRLPOOL 9ca873752e778c71aa300b51aaf0054af2b420a73060551b4709b648a4432f59399d67b2030d2132a87ed2eb39a4d9e3466f6aba51945f038139b525a954cdf3
-DIST bash41-002 1799 SHA256 322e229de186b3bd87dedabfbad8386716f103e87ff00cd1b2db844e0dff78f8 SHA512 0e0aa000db8bf56cd0948579cd96c3bc0aec4e4ec0bd129bedab57e9d7a4c54450f0e4739255c3be4bf4f4ff679eadb1ca6bff07d76a2951fb11cec20257751c WHIRLPOOL 402ab8fe47ed28f8219d0324d25d4bcd77f411c1574ca05c86b7680ee637e7471ee32d641810093099120c9a8d8030304eb9bea52dbf0aa3d4f524f0dfd87912
-DIST bash41-003 1407 SHA256 91763dddbbb98c3ff7deb3faea3b3ad6e861e7bfd2e46c045c0d1d85d1b3256d SHA512 3d8db77e8472c232cde67f6dd25409efc8ef3f40396d5bddd22b15622a55a664887d46b7bf9f4a7bcc573e8de9dccaa39575d0822b61bdae5c4e98553336aa65 WHIRLPOOL bd270f3de36ae1a39eaa61143560eece549b5b857674a889853f95d8ef495e561c97d3c32104b802116d027566f6bcdc0ee74c58320ba910def3d69250d48060
-DIST bash41-004 1705 SHA256 78c063ba34c1f390a5bf2e5727624ca2e253bbef49ce187cabb240eee7f4ff9e SHA512 e95f64cf4e59cf616072a46022f61e9289452bfdc625f410d7688e8a54e40ef738d8d6c78d567cc0a5aa7e5dbd4701d7dbe7a457f761ec1c9151f6b9adaae6e7 WHIRLPOOL 874b569fb97b112c74ae7ec2b48916b7416deb97044cbe7477a3a59be81d048025ace9cd53394aca7e710643de979781a1a840714c70b2e8993d64494aba0f8a
-DIST bash41-005 1626 SHA256 519639d8d1664be74d7ec15879d16337fe8c71af8d648b02f84ccdd4fb739c1a SHA512 48023385e399ff55fa8197503147c229c33ac29f986323677cd810c305c5b58d175f1c8156664dfa70f3d466b5d5b17fd71e5f26e800946e326454c16db58824 WHIRLPOOL 798955b7c8fd3a419a6e47e777f83b4ff6bf30a98bb2880a2254607405659d10d409f6b5c770e9d73da460d128c6c897a8dcb197acdc7c8d33bd4321200c8f19
-DIST bash41-006 2166 SHA256 5986abcf33c0b087bd5670f1ae6a6400a8ce6ab7e7c4de18b9826d0ee10f2c49 SHA512 bd5365314d3dbf27e23697be6218b54f2d547990a979e85beb97d49ca5e42b078a5b693bbab6b778bc67a7db022b1b0e0babd898023dc61951e431676a01bfd2 WHIRLPOOL 04b13d5f65f6840af3e841dda269aeb6d3bd55a7aa32102d403ef420575187d279a008d890b1714db556276a4d0dcd95a8a4e1eabf4c7687da58e67b875c6d0a
-DIST bash41-007 1610 SHA256 74012a2c28ba4fb532c3eb69155ac870aac8d53990fa4e1e52cdc173d4c205a7 SHA512 757e11b04562d016f7479ddede52d6ed7480c87c3cd6d675d2147a100cff8344015bbff55e486f2847f6500922d195a41ede14e21829554ccee549a2fd6542cb WHIRLPOOL c9c7bb081f53fcdf4317505310eaf65059032cbe58690171ae68d27dc07c384b4e1e7a41e69ae2642793b029ae61bcaf0cd4b26809c1e157a01159402f888f79
-DIST bash41-008 1610 SHA256 4e2c2c251432cdf6b84dd5b4fd06d698f4dbeabb56a6c247ca8bf18443481215 SHA512 e7bdfa2ff43ee48ea9941f7df53794fb00673554a67b8e6334204f9b66e05b20aa052766cbf27b495977d3f0812a1117bf1eb923f407bb7f4a0f8394ce9ad6cb WHIRLPOOL 0b9ea934fe270156c786b30260c70de103be26ec9a31de87318fcc5a02f3a9579234f61419c22c095a7aec585a4f94923f1d8e7b9a27077c34d8e01cfa5db0d2
-DIST bash41-009 1323 SHA256 bd4006964ae88a5ed8032c16208130084efd43866afe19bb88a167e0c0f156d1 SHA512 7bb1b8b6c36a4704cff39c25abc48c87129981d340e51c70e53e54f222867c62327211a9fd431f176bc40ba4bd345835aa7f5d5a38cac94d4525a898e9e0702d WHIRLPOOL f0645393d1065c35baf7f48e9a68d5988934d5148220f674fe6f6b9ab8f8d99f6690d844728b20c768cb19ad78ea8ca38c8f89dab4ef81f4707e850565543ac4
-DIST bash41-010 1801 SHA256 797758a867b6c93530be0217bf0f82edf747a3f5d7733186ff313d11f8d9d815 SHA512 bacd653d3d8adcd5bc3ea8e2da089a57158d5f5241fc1b2a94bba821a3275ec52df412202d2067015172027f9388ce6ceab6e50c22548752cfe6c9224cb98816 WHIRLPOOL 570218cd68f0db6388f1cfe06fc718c7cca17b2d40e1ad5b8111cbdc18faced81dad17ced0ffd853ee69418b522f2e19e25698539f0edba7ccde37b73130abed
-DIST bash41-011 2444 SHA256 1b2b81a20712cb56c10696a940d583ac2a01d07836f8139252e8fe023d291621 SHA512 9ce8249dad5646d6620188c3d844a1d66f0e5429bffedfe3f87816e801e29c74f18f21c6d1558ccb8fb7c7fbade12a08d532e6b844b285e57529b477a93de3ec WHIRLPOOL 02608ad64cb861d8976251ebe124f241159eac218caef6e4fb283edf3cb1282fff9228d0a97286a80154a3820e2af7b5c5ce6310e14f710b3608f0b7c4036058
-DIST bash41-012 3280 SHA256 272e24a9a2802e896b20dae7c88d6a34b8dc89692c9bc90542cd4bda77607b6d SHA512 8a269842db2bcfb37b94a15cf75f0d1c357f4a451e1d69cf3dbfd71ede9eabeedfdfbfab78e67a4fc07dfd47e52100c34f5cc1d71f7e6bd3d5b27f2b3e255c5a WHIRLPOOL 6eeffda0ad369f196bb719f19c2295c06f9e1c5c5c338199839c568b1a8da44f319c5770ec3adb5cdd702affc64cf3f2046b32573bd58b7eb05132cafde7f04d
-DIST bash41-013 1181 SHA256 cad722e20534882ed6177f7287eedf21dc966816757fd964ca930f0ca230fdf8 SHA512 ae1a0c2a7efd1fa9858801b68f47bd4a2d3eb0f7a37d24029cabb97b980d40b6e116a8559c358d67ce7f8fa290cbc3b88e5c07743a78a8939a41aabd474044dd WHIRLPOOL 86ec7a12959018a6491df9b184ce322af7a2422ce24ac2b2419e1eaac8b126c1b0da9d5d5567d347f87c5d7fd9ebd2aa1ca6ff9c15c13a7cbe49efc3623f2cba
-DIST bash41-014 6672 SHA256 595d1efedea8d63e2eb426e0a800b52a5fa8b62d3d8476b912e1f0d0d7fbf13e SHA512 762e7487e9ba079c18d35dcdf3a2453b7de3ddd176986c502286544e735325ae3b6d710dacb250bece0e8a1251ccb026ddcd0f881f8a95a94d02c1be241ec572 WHIRLPOOL b80fd4f95c5fa1d81bb8072efb4e085f96044f5bca46cb0c1bc842145136d45afebca0721742d37cc793e73578490915dc319b4549ee149372769ebf75acb397
-DIST bash41-015 5085 SHA256 ec580a8e31c04db9d5e7ca279740a0565c4e32b27e87f56db2bfc21df834ce9e SHA512 3044a1acdd380f21317da0bc3b8455f7deddf464c9a70bf35e30ea434278b9b0c04756644e6037a133442b52f673757e223157b3b3301d64bacb939b4cc721a9 WHIRLPOOL 04a6467de9d962f32f5dd63943bb14cdf55c421390a658eec9f6cf19a0fb23ce931be73dcd7a3ea7fe875f32848ac6f5c5b38021d749f2d3abb9b0375245dfc6
-DIST bash41-016 1832 SHA256 743088c7d6dfaeacac0986ba74a959f2beac4c758441b97280b9c3fea29d3089 SHA512 d2e76f9e63787d6c9ece914d75ad4292235d753f146858c9597137b148d56b1847a322a0f7e07092f3d717815b337d3eb369e4b9d661d10561a0857daac5bad8 WHIRLPOOL 05869cdf9c8f98de357655d547ca762f33a1eddcc19107d7c861a0716bd42ce80d780aaf1b9abffecc3b79d5d0f1b90f71181342d5e3dc134b8c3e7574ca92c3
-DIST bash41-017 3771 SHA256 e5bdeaebf7deac2514f3f100e5ff5bccde843377249f648d89a6ddea4c17c06f SHA512 38c90ebf7ffae6b7f93062232a467f789ff1a642f791c8270e47562ddcb6472f696a0ce9336c5f0046b724c495f90e8090bfc48a50ea556782353e00d2ef374a WHIRLPOOL 456cca01a2adcb767b32c1c17a84fb8dde6034567613de66f1e43c8568c07cc29595027cfc447e3e0fcb712da07dc6129c3d4f7e9c2c13afcb76188778fe1dbc
-DIST bash42-001 2944 SHA256 8d6ca028576c4af23e660a2fbc2112221a11c8a785c0b37f033967e5cd12b47a SHA512 931f2f1d4e677925b5057558ea6f157073a9ba87bf4ed59e7d8fe20957c5fc40f3384a98fc4a2d5d7b458129ec096d9e28a860b6844ebf15f377778a6ef8aade WHIRLPOOL 72f1c1453d00f72efe77bd31253ee6978415abb3c943e2de4ba458de09af8e9f76469febfbdda54336e4399ea0f63a2cdc93d023b09b8caa97c435e4eab27a52
-DIST bash42-002 1780 SHA256 febac927e199aceeba2004908d971d4afb49b521796c3f42d1166f9fbbfbcef9 SHA512 b9ca62e397a05b368b74920d8d1b168367ffe840cf168e312b530c5b390cef3ca53e31db63c9fe15fe1a36e4c98369bf10573db40d20712fb1a016f10e0fc893 WHIRLPOOL d0803c477e120a323e79d842269db60eca7ce0eef8e2b829926a8b337d27cead87e9f8bb26c51f8f68eacfcc280123ad4ebd654c3d6744f361a88ef5c12f2a97
-DIST bash42-003 6896 SHA256 5a0a7c15018c87348ea87cb0beea14345faf878dbb0e25c17fa70677194cb4cd SHA512 6cf944ab0f554ab53831cbe114f771671c7a9420778d2caa524c09a24ec8064e7a7ef1355e66ed3a53100b72736284a5b44e2c6bda03a8234a2f2d340ed47ce4 WHIRLPOOL 8ff610b9bf6f81eb7ea68691c6d2bcfdcdc6ae2a5ed503306f4b5cac1f020c59901c3c3a35a6206934407d65be58db60fd2c0e74497a0fd30fc87822e8fbf36f
-DIST bash42-004 1686 SHA256 4e34b0f830d2583d56e14225a66937abc81f45bbafcd2eb49daf61c9462140c1 SHA512 aef5e753e59a82df07e18269064ff1d075e3b7558ac5aff7465da997370496bd4ef9c25920d7a47f66110d2ab719742033d96646921782d9ae15a27541765067 WHIRLPOOL 5cb128049a38905a4aef54c69fd1dbe7c0257c5e13de7bdab4c7a0c35b0979df0d6c34706077889f9e17ccb132f0edea96405caf0d2a3861f18c57c6635a05bc
-DIST bash42-005 3424 SHA256 a81749e73004b81cfdf0fe075bec365dc1fef756ee5e3fd142821e317d1459a0 SHA512 ef7fbc3fcc8174e7dfb27fb5e977d3a52b1b4b989cd7f748b1b35ea0e581a59668f41ec030e80f2afdc8b43dfcf472fad2985da284632b9228a6fd30ba4d0556 WHIRLPOOL fe5d6d320a4f3c3bf939b3b872b4dfdeeb2ac3baaea0ee871745aed01609e9fd8bfa555711a7e0190a32736e9362fe1c65148ac8d66d10877c59913c41855856
-DIST bash42-006 1187 SHA256 c91148945a2ddafa792682d7c8668c59e7e645eae1334b15b0d5d9ad22634bd1 SHA512 018031cc0cb2078937c81bd42459b98cfe793ff7d638ed2bd2859ec1c73da6a420d649f7dd49f2367035fd08af430ba783c68417088b1e4126095ab9467c55c9 WHIRLPOOL 1471ec01a11030b31d479913a952a6b52c65fcdfbcfbc41a76f231ca9de62031bdfa1eef58e5ef1ce493eb018bb97c5a88ff1f371e2337535eb23c770f1af944
-DIST bash42-007 1394 SHA256 405826acf443dd1084f236a15cb76d7f0ee2dbe5edff45c5fb836db571fb7e95 SHA512 65cef48b77530a3b87dec1c8c3fb28f553e83f28f24d5e170022b4962472e3e0021a57051800e1ddeebdb78548a3c192c4e1fef0f6e82612321c5d1335e2f8f8 WHIRLPOOL d937f89d9ddd3695c4f8ea73b555baa3073f31331f541e27baab16fbd476192e198f52c337d25afd153cc5fe5673dcdb747482350cb3ecf962c84c09de41996b
-DIST bash42-008 2164 SHA256 23080d11a60a78941210e2477f6bca066b45db03defa60da86fd765107ba2437 SHA512 5a782a165701967dc3c34d7723d13668b9ca0c4679de0f6150f42a183425e110281d893f30fa81eae27821a6d89e8ce9d9631268d9e02bca57cb8fece0389f3d WHIRLPOOL 98e06ac0869bc789f62b9e0bdfe7cc7d5a8107bddd2c8a4646072537016afb1d97d9999fde06a85d226770ac4a59ca5c19e7e11f2f878bb72383411c9e8d1914
-DIST bash42-009 2384 SHA256 e7ed5440b4c19765786e90e4f1ded43195d38b3e4d1c4b39fcc23de9a74ccb20 SHA512 ad0b58d00f37e8626a0bb664df7e24e0f19dc637aa829ae8f92fbe02a53140a3ca7de00f620c5b53001223a002ec774e5088354b342a640666810fd57cd1ff9a WHIRLPOOL b1af4e438027f10e51112b9e6476d8b3aa14917ccba708634f7927b80adf9333bcaae0a0d91c9aecf32b491b54fac4c8e88cfd355a20d18c7cc28dc6dcc5f05f
-DIST bash42-010 1818 SHA256 acfc5482c25e6923116fcf4b4f7f6345b80f75ad7299749db4b736ad67aa43dc SHA512 66e84164be08be47b0d7c8286b7d94a4da8538316dce8f8be54702fed2a44798d5f717ae3f524ce735d071430195ce10052a264f3f458b950fe26381fe6506d0 WHIRLPOOL 5694177e891a3f4b1906819e59b2d0fefd5537da9adecbe067b1c63c1c6a54fad6ecf8a7cd9e31175ac223fd1893d79229ebbea453ead39b8dc29ce4d579bdde
-DIST bash42-011 1426 SHA256 a491ae359a7ebbd7321aede561728289d71e1fc84777f402766a8afd4d261532 SHA512 0664fe80f3da9e5e64f1f0fc227e3937db6999526f743e74cf8d6eb589add10449c505422e241f1dfa0cd1e02c03c029cc0b7459850a52cc17d9c3a8d9c26a71 WHIRLPOOL bd72e7865c1f89ee4f1b7a7393b322c7ee3e2c053c0b693f50d3de4fa965d66e182a63b4b8452891638d41cfd4d44e7ffd17843fbc1c8672320bf395946df6a5
-DIST bash42-012 4247 SHA256 354433f1d2da02f1b9652cd20a5b85bbfb5bc2aaf79c42461ebd929d89b9b7b8 SHA512 0da4822a29d26d713aa5bfae00911db2db37242ec962edc4f256c8740e345b68e23dcaa4ca8bf37eaaa9e58facde6fe87c3b20c5bad565725a178555aed49503 WHIRLPOOL 23e090f6041c85a5f0057b866200c23852b81aacb8bcfabf44ed6aca4e33eeecb7b0d17b50190b663acffd8ee79c877b4c0b408d1f3cf7b405f2e834cf64d150
-DIST bash42-013 1340 SHA256 3412c5c6cbbce6c88592604aec054d8182ce64410038b5ecea69fc3968cf85ea SHA512 25f4caed2f4eb3f65dfb052b4b9b30a02fff8a1e6d6575e2da6bc1ce02d10aeb113870916f0b74ea2cd0722f81bcf8c05f70be1af178cff3c7091151d5791de5 WHIRLPOOL 5320dfe584243fba6c6c538d5a71304d63a4dee784d87714c2d3e9a9987ea7f39113a83076c431140fb5195645c91b7e51f3ed1e32ce6652ed90ba17aeebb7e3
-DIST bash42-014 1434 SHA256 b5a678e609858532735f94faedb5fabce00dfd6577a4e9ec5eec85fe682c8b33 SHA512 ea8dbe73d40bdc0bfc1752ad6fea9503b72bf4c204a6b0d04ee898429f2b16bf9fd21f8ce25b72e87efb82769a228ace31f1624f03491383129ce7935ead97aa WHIRLPOOL 868ffa5468262939845fba686377c93f1921d3c83b1070e0b9e937c8587a6b25e4bdf8cc41d584d549b647937949b8d515426ac7adf66cb3c6600218d1826660
-DIST bash42-015 1991 SHA256 2d876a8304bdf3d664e87e0a8d73bc4ccc100a9dd8c0d054e8649472d8748a98 SHA512 dd572539a26ae5c80b1c39cce8c548b9de0ab5b5f7e711974413322cb20845690f15d985713facab71957b6988553c0a613d5fa3dee2d263bdd9a8d7a5599ea9 WHIRLPOOL 22a67c207e4f3bd1bfe059d6814b779b5d2efaafad2bdb0442ba40b0344729cfb2ff7ef17c10a970c865d9afe1c28ba9964c8cf319066b7e307668a0bdf357bc
-DIST bash42-016 1410 SHA256 2895ccbcf7fc98da73a8fa3ba7440aaf2bfaef6c0af8bdd3a9c39403cf03e2a6 SHA512 2203fd108df4e9c8c93974ce2ac10d8d7bc9b6df1db92ff88b3b394d6fa26ca13de6e308480c192907ecd658df5b4bd3b077a946127b82167c3cac431c3defa3 WHIRLPOOL 89b9dad82200501de1358d8bfffc533bd4909fb58d3d05e901576fd4cfd862474877912c3221eefe65d6c7886057f0c17d688a5cdeb649c34ae4af2ef5214104
-DIST bash42-017 1399 SHA256 73552444498c761d6073dd67ccfe043b36ef24bb418c266d91d9750884daee7f SHA512 e2b93fb5f904a0064addd2d2d20bf4f8d868120bad1486916ae0774e41ef4123cbf5b31ef64109361d091ff317cbadbd28882d6571d3014052229a14993ed933 WHIRLPOOL cece85996181372a8406fac605f720562161f66d49a57592ee9bb4c5f409edff166854164093d531343773eaa22990702fb756c6783b235006843f77db67e5ad
-DIST bash42-018 1929 SHA256 e2a9457172370d454d31b84bbcba758ee6394316dbe755374553b52aadbb494d SHA512 facbe3d258e0e7514bfe3a8c6516aaf2e405facd233e205794ffab815f850ba7385d2d18d7b3a9c000cfe254a771779c6d8829b2fee66a9d6071b1888155b5a1 WHIRLPOOL 28737af2a1a954d5a34e9fc9faff5a05754f72cfaa51a270108ce90457b2c56a7870ce3017ca05e56ef2938e2e2a601f783f64e4bbe8db304a28aff284376fc6
-DIST bash42-019 1415 SHA256 a8b7cd02207656976016d93cab48e073cb5da002ceb27b7a63fc5ea62007eb56 SHA512 f8086b8358201c10e96d9533b90a58248e26bc379be96a8a9fba88e09c227acf85cddb26c04e93043b35371c12cbf156f591c9af88b1eb61ba8acca53f6d07a1 WHIRLPOOL 0c825c577ffcdb1102f3f9cfb69f6a92ebf73781c0170ff0788090ddfde0d7fb5f3534d06532b4f86b5b8cab7f6c07e30dee4e8f2cbc40bf11a0dd69addf6974
-DIST bash42-020 1825 SHA256 494773f0d0078cb35372d24caa523b00d8fdbbaed71e41dc14c9e47579da3c6f SHA512 23549c7a56e43f9aff7ebc376657ff498d07b47ebbfe6707ba3711e095fd80ca86d077c5379ee62c86711880979debd7b60733d83e12f349ced9e93860d8fc8c WHIRLPOOL 3f4aea688452e778ba440bbccfd0a4e76735ec7b7b3916d5896fcfdc3c4aeafce4c52c4cd21282915b21d12cfc03c170535d2bee86232f90ded87f2731f9cc07
-DIST bash42-021 1532 SHA256 a887a97be226575ecf483be2c76655bd6d1edde1cdfe199c27bd2e6baf32badc SHA512 09783ce72651af6abffebdfb3d3e7446b29ac4bfd395aeec66ef1f5c8a2bdc2238957b7e6f4e896178a5e4e24987de209e6776f29330879c0d8e14e8495d8284 WHIRLPOOL 821d16cfec3cabb2b48a6d46518993d47abd71d1ddcea90301d5f8a7b203c6e224031b344d543ebce2f534e14469b03079d09caa26cf4af4de6006bd477b4a61
-DIST bash42-022 1395 SHA256 9dcdf69df7f8cd2ba88d18c45a0d8f55fbe4f0e273411179db94dd6198b85c6b SHA512 ab6f3f175581f34dc106176fbbf5c2d19e9f421e16f328cffe98f11ee01462b63e0f1e720ec467780d91eb240a4a7fd4fd1cfdf6e0cb1293a8e42e8a4805c152 WHIRLPOOL 80eb65f4cf97167983ead281acb6a114cd866e22a8715b7106c342a442c942992916bd9918931422ee0ddc993762d86a21537724adb7fe4f3543f7fa7b2bf666
-DIST bash42-023 1699 SHA256 5dc11394f1a6c887373c081396efd4f4cc04492696722c57a4811c207965f0bf SHA512 b9d7044800a988dac8c59c48bd4845d3197d6ba965d22fb8f62b51b9d48f5a55519104a16283fb638264a6f858a6d574f8547d75721b96da640721bbdf097d81 WHIRLPOOL 7dee6a8915675019396d0003bd870315a44268c8af1015b29da802cd744fa340a7303d26d189b5a7a162a58f5931ee268a8e8129349b9bf3fa899720b0b119dc
-DIST bash42-024 1363 SHA256 99c826bdd33bee281d0a9191550d62a24d0b256cd41c90afd10abd63a66b99e6 SHA512 b4964ff258905cef806add58eadda17501e98bb3b3b5c8ce8ee0a9250e5bdf0a01329e1bfa973204b1c8e5da8fd068bcef624ec65c2f401c41d0b6b55cb2ba76 WHIRLPOOL c5c615b6d14ec8069b0990be04aa5e4c4ce3d41e910186e041c6ece46311c1591d327598981130c98a2a54144ff0efecfdaad9f6540173c4b0deb7927c70f736
-DIST bash42-025 3969 SHA256 0db0646fd7a559d5702911192bdd387acbbc61cf3c29a34007c3ec840e275515 SHA512 b4b80ef1a7599506454a912e2ee23f422bd199a675199b926c3770ba9091fb69583ddde84e67d897c79e6a047ebecbd18a5ee72557e7526c4108476eb5cff71b WHIRLPOOL c97157bec29f43d3d1367dc3a1625f51cd650646feecf8efc4b902175898c8cd90b7f403a7fb8798cde8232e770933de2e0bfef4f8fc0bd8a3e2bd24ae6fc8d4
-DIST bash42-026 1577 SHA256 e7e90cfaabbce3b4b9c699994e9d9ea4a2f084fd9f37788a80b0b70b47d323d2 SHA512 b00200d0b9040c74117e0150c589abb9e511abb01888c485eac770ab61c234669aeae3957a6752ab99c378ffd8188154bbec713c608b92cd3185a649b71615bf WHIRLPOOL c6851fde44599df98bb1c46bce45fadba204cbf7c368b8c5234ef992d24a2dc43fb107dbc36245ba4d48edda3cdc5c5f6c357c1fc2492ec4c66a36ffc8d97b3f
-DIST bash42-027 1461 SHA256 0c1f6b7256fcc17f42c05f9bbb4138f8e8bb67e79c622c3485711b6f37f7ed42 SHA512 107e13482deb9f6355196b2be9b717090aaffd8cf1580ab347bf38600e607c31cef5173b68e426a45d1678c7c64e7e095d5b6da941a5f53218919a0629e2fcfe WHIRLPOOL b4771a0bb540aa3f196400e4873c565a293ea656831a600d233755b3bc8bddce3d881b39a6f52a57b8ce5f622e9031a624f182a192de7e546b11f999f41a1294
-DIST bash42-028 1834 SHA256 204226de39ba81aaf3dd5a29cd59de052ec9f648538bb9e7f1c8150852b1ed7a SHA512 6e6ad04e7cff2d65045a9afb617c041b571b6c8cc728f9994825545b7d43c0c7868c68b22546784a6f604d3e0ec22b7bf0423e9d49b7109fefdc5d3db4b31399 WHIRLPOOL b13fa3ffaf6a38766743d2760493f58a4787aa7a244038e2fdf266270443d678cdc7aa6205be48665d2455e031f346d2d9095776f2aa879d70857e3132136aa0
-DIST bash42-029 16812 SHA256 d0b08c0817bc5acdb28b466727622a8422ca4d61188313cf162443b7f338f581 SHA512 9349625892201cb46f3669c18a38c86d609c1c9521fb8caecd6880df822897c6d2541dc0cf5d3d11d27779a3be636b0c6550b7e3b010d37e83804fd1ab27d35c WHIRLPOOL 045d8bec5da9508863fe93843cdacbb9fb2ca56e048d1a5bbfa305742688a9476568441633b9dec27a6e9bc56501d96a798714bcc1f9079de6c57d6bd3281cce
-DIST bash42-030 5046 SHA256 12594366591a136d8ccdcb8e218010f2ddab6be28a7f96d0ed32ca927e44afae SHA512 4643252a45b7fe84451c0bea95bd0089a1685067032c8a2e42bc78587deef5b6095de77500d1c54227f92940b201d193984852f65ef886237dd435617639a46a WHIRLPOOL 26c5209c8a29d6c12f61beadbf91d49707d090213d82b44da0aebde28f6ef0d26e256eabb89ef343c24e941a837a6bf57538ca6dc10227dca69536a67bb0f8a6
-DIST bash42-031 2047 SHA256 55f38c4d34775fbb063510c4222b195d998dd86f88288b64a6103e3812f8d9f9 SHA512 de0ea5c279ac956aca48f12e2962dcd4ae2f653349bf2350ae7b53e8370aaf882109fcb29bf559cd81512362bf31a100193de6bf193ff52331e8325df2f82e91 WHIRLPOOL 2dc6e5197beb2204b15493de41c041ef8df948d656d06e18cbaead2ece15d508980306ea7fbb02a1b926bdc92f6e09d182586b07c51fc93716c7c438e2dcbe63
-DIST bash42-032 2416 SHA256 e3a8b563dbb1e5cb7ca85a53515da8b2941213973496d48c4cc5a11c604791ed SHA512 ed35285989290c10f5013770397aa14897e63a28f5ae5a61319ea5881b0abd84410686288cf0f14dd9486d8fd623c410f857b48fbdb62350121e3596527dd3bf WHIRLPOOL f1d156a6b8d68eb71eae54c33aac8c6d24b09bc7ba07e856a71e39ba0f4e4ea7e1a4084d710f4239f7002af2ec73ca8953e81827d4f782ee0fe88406ace86311
-DIST bash42-033 1634 SHA256 f5d12790d69fdfb2f47ac86fa1ea1ecc088880141570273f38dfd3fa4a46434b SHA512 89e277e5a2f43fe75678c0dab57cd7c8761efa38f5902ed0b311ef6a0cdf48f683d3f28fd419908db43afdaf4f81d831f0fd630795f4d20b317543cb9ab95970 WHIRLPOOL 188eb57de7957a73c587904701a16dfa6043e785f47d685b6c4823729806080bb0a11b9c3409b4df69769c3f31ea00306ab42daa73dcfefe37c85ded518b6162
-DIST bash42-034 1345 SHA256 01c1f332101389cedf347c7736102966722a3b213900954e5d625bbc2f1e41b8 SHA512 d59a4a67a241d262de5fb27b96af0f15b0f6e7e922b2d61ea86e037dcd07ea77ec3c1ef6b289e5bbccd011b632538f264bb6426c3a07dba1946c094be56e0b16 WHIRLPOOL e2a2310a55db78a4d668235a4a70d266c28108ac4a04b50864704f7ba745d3e1cf080cf34544b426c1a2d6067adedc32d7491163f0ef5d09df3d51c99451b5cf
-DIST bash42-035 1920 SHA256 cecde463b038b4849635ff0993d9b264fc92403e7ae0accb52c7877aeaed78df SHA512 9f294177e91600f65cfee1b9dbf59b3ad7db449a99cc1013b7c97ef6c814b51afa7a2d2516a37fcc110ff3f0b25c4b06e42094f4665e03e41650bfa69c15eaf7 WHIRLPOOL e8806743da1f16375ffd29fb7c9ae78d8966d6f7faa833025e57fb59bd290a2afdf94777e9ac51917f378312fc8ce05d72ee14525352412c5826e8a2a9909fed
-DIST bash42-036 3123 SHA256 fe293a1bc92ac4d272ae9b9a0de3afef7c06145a2b52337a09cacccc5305aafa SHA512 7e114b99d8f5b210b826715c77adfdbb115e86ace35f7ff331fc6f595a4d0f689a055ccf7adfbafc057c7549f5597e4de455ab9e18a6ffeb5b4fd1d3a2aab99c WHIRLPOOL 6f4e9e9e8251b5a703bad2202301edb45546d94f452669ef681786ff5882269b70791456c7c2040731b5b7cff27c4028823592a61d46204a1271218f7e6c7b8c
-DIST bash42-037 3483 SHA256 c7578cddd3bb2430689c740f58a03403800726dcd1268b28f91bf37f368e1674 SHA512 4466990dc3499ccde5940ddfb383052fa345d4e53fff7c8963ac7482fa280658b4516a1583486175cab2f3a5c8afbbedda8461e3cb1802031bce8db386404608 WHIRLPOOL 918dd53aea5ba7c5da2b6ef3325289d80d5c9e01aa57bd5bf9b9e6a22302865929a670ed7b20a5916237e2078aa69223c681e00c79c5db40dcf4d9ffa455b603
-DIST bash42-038 1290 SHA256 b8c9a81bdf206be58ba491dfad80373b3348af769e80aaf72f7611ddbbbe6d57 SHA512 f835bb393153310fa2e4c2d95a98c0db53a97075f8989d61cccb095db223495777e413b21e9b235391a4a0f34d935a828ff5ccf337520d5dc87d380170efb351 WHIRLPOOL 3625b8a1e17e2ec7925027b6e048262126366ec2691e7a2bdfd23f8da2eefcea6ce967382067c8d6969d1a9cc641ffcd05ab71a713a61762c43d77df01082b8a
-DIST bash42-039 1603 SHA256 f4f9300a60321a5088ae9e54052a64c4d3e876f9a3a17ca104d58fa38b9c1791 SHA512 4c5e44a623840c7efe7894f313a5691307b12aea325dbc923b48deb6ee6ac0bb2ff7afb0d2ee12ab97b04d60c1b9e2a4facc51b66c93be9fe0beda317ec7318f WHIRLPOOL e863174def546d9e9cbcdf5cfa1f735a1503a7caa10ab25a017add965cde524412e37c7fdc43ee80b6dd23676f2231093df64de1d1f41aa823e6cf5c79136531
-DIST bash42-040 1710 SHA256 b265f9caf3c7321f95bc8e0b9e2c46bd86c226f00f05e823699aafb83c4aaa6c SHA512 ff5cfdd2aa846f0831a1f2f7b477e70fc6b68b6c4f4785293c417039a7f3fd4822ade4658ea17046ab9616c3fed02b463e6a3e60aeb7daf6ab667da14b9a482e WHIRLPOOL 7b4672ee3112be3919cef4a30e730daa534ee61c2b5a8e48cef799bf5e17a9bbf58dfbb96626f6edcdad595c92bec0dfc9b5f41a9785c20af7cf3e829553fe65
-DIST bash42-041 1463 SHA256 05cc1951bd9f6624088dd6067486ff47f1825e333273d7df5f1b06b23baaf5eb SHA512 7c9c12fc77bb764dbe8061e6df9419ab84d296a76c4a8bd96cf0f507bf70652a1c869162ac8d8c36f2d16ea0912a142fe14d6db45636bcb6e6fdf1444f0672a6 WHIRLPOOL bfcc374321554787373bac3d1cf22e2cdf4064a0ece447bda2426b90bd55c09f7d2ea2491bbdf2e03c2152783e45bccc98797fb4f12e4fe8095543ddb51f0457
-DIST bash42-042 1571 SHA256 faaa5c1f456517b258b2a65eaa664dd6a01eeff73c8ca4447c3a6de371bbf304 SHA512 99fd4f5f70e3d7d2e8dc1dac80e6ee6e0bb9ba1f629f41019b13f36aba2404aa4d786049bb0039e5fee138a01b813d295d4303c7c3d561a3cf565ffa19bb081e WHIRLPOOL 944cf532a9cdc42dcda55f3b2af96337d31596bcb39e83fb3e223bc3aeb1a45696dfc69e60ef0a68fd0c133728d9d23a037d633d9a267b09f51954ba7693e262
-DIST bash42-043 2110 SHA256 dc2683840f3e890a9c5f85338366ff6cd923285e558eb46aa818a03fa67c5c57 SHA512 70503181c392faf565ef0b23a2f6d1614836ffb9c04791cc4bfb31aff7786fd5efab4072034a4cfba0035595140cf7f9461b1565e4854ec34823cbd4f5ab419d WHIRLPOOL e988a962aac3ed9cd1f105cc5c9a477aaa52defdb049be8d9cd37da40177664507c06550193855cddea3b0a9fea3a04ec027ad14eea845317ee67e1b89697076
-DIST bash42-044 1871 SHA256 10d32d6c9ccdedb1d826f46468631d475f9dcf983fac087766e16df7b99766e6 SHA512 e94cf93c5760225d4ac16f9c73078c3ce9913ffe1e20ffed8fa31084a0efd3dd63762b5437221f6b570078667e3ec19d882169ffe0ba4c498e258e56f17d2511 WHIRLPOOL 23e3fd1ed1a708eead2ce463c0e5acd720accbe9727462b7fd3916b14b8eabf2339c1f7b1dc973249e075bff4fa566753ae43c540ce3ddc84b5cdd72814d568d
-DIST bash42-045 1572 SHA256 ddb7eff0f59d394a483b09feec3771d9026f81ba90afac32846a19b172b2986d SHA512 64f62b19c79eb2c581feda2b9f3c36196b3a794ee9996f6d72078fbb0b8c5878aa2d8ff3e2698cf9769e42083704dd9342bb108212d02aeb79875fad70895560 WHIRLPOOL 02fa25cf02c831675a78a5625e0ba5606b52eb9f3dbdf546cd62983d83cea7fd159b535df94b3c8d39907a7739de7459b69cde3583f28d952a54b384122d264e
-DIST bash42-046 1988 SHA256 95c1323b68c0ecc0ca09565ef2d5218625ced3957b702e04c8bcaad9e7b3816d SHA512 7e4a9d3961cb8bf8559f82684cb75fe8600a377522f582e1a9537696ceccab32d15d1045f850ea91ea8bd2cf286d79412bb47460af26bec8486d5f3137f5d54f WHIRLPOOL 68d83498307dec79bea516c7e7b03dfdff10116a716922c780c66d9017abb38cf6b32f17674490fed93b2701d8271f71f4aaeab6712b184fe4d880b818fab988
-DIST bash42-047 1353 SHA256 c1979201d0345011c419a1c82407cd2a00c60a0c75b7f07e145d17f3718daf7a SHA512 0b43eefcc0ef3a55e309dff339db31a07849ce794e645d917f1836f48c71b84bdc50aa3315b3b2e33acef2e6e81a07f2a026cb43381d0f809c8271cc0a0699a0 WHIRLPOOL 5b2a3000dd72b4cd34f74ffcfe160fe891c8e55766913260207cdad0ed205843398ca9a261f41ef5d54c76782ae291809be0b78c3bb960ea84bb0676cdc6e263
-DIST bash42-048 3258 SHA256 751a5d2330b21ac9aba7323acbbc91c948285f30a4bb41f56796f9a36b983d24 SHA512 4218377052da8900ab6d49b855ae6f7779ad94e9e76daf3424240fbbb1bab37b929989b976ecc3ccbfb66f3c278a7ba546e5d34b214382b41767991945d960b4 WHIRLPOOL 16da3dfb42b1cbb50841e381428135a9d0439d30c519725bd52bf55093c618b7ca8983b4638749dc87d5893a20b4cc5546c1ef5141f62d78fad8ccd5b4261fe7
-DIST bash42-049 1159 SHA256 901cd74cdd9f3e9bb5cc907d563e3d4dcdf9d5f6a751e85b706a958f51bc510e SHA512 a0472af2c3bb30fb3ebf0217b34261aa586314a05fc19c959b4931dcd064e0a6a8b4e37f8b4a9dd13d8fff38822e32e12fb28f4fcb73b0f6dcf42827fa5aba05 WHIRLPOOL a34df0a257a3db06b887abbda2afa823b471e1ba705318822e98d4740ce41fe906edf2d91602bcbbf97f1202067086b33217824af7cf8f2f71c58fb4d6fd65eb
-DIST bash42-050 6650 SHA256 1a19b84455e83b46fcaa27759a5dd643dde2e11ceacd1e84e351970ea04d8ba6 SHA512 317a5f90d909a5db697025894b50f35f26f8293b3ce1ad9b8e9dc6d0661f277659c8cc0a70a113d3889b2de6e932e5af5ba89a427f32879c69d4e3db24e6a2a8 WHIRLPOOL 2d77d23cd0e2baa59f8024e3e09f9db48f0ab999157d9c6911c4893abcf6a3e320f8f1614049ebf2b7b9ff5da57041ef1fd1b873746a940cf720ca947ad75d43
-DIST bash42-051 5063 SHA256 3e15347bc23a116b8ee898acec9d0ac744612ce9bbc0096fff47c4cf1149051c SHA512 de9d35fae23b9c7782139b9812460a602252675a9db556d7e38e8c15ae914db0e4a1f2e06db909e249a36f33ca1f04aed25fc8e036d9b1fc6ab58d8148524e2a WHIRLPOOL 8a61a34206d97e087a298dabe5b6347eaf22e846bdfebedfed1c534063e7b78f9e2a6a68de330f6069aeb736444ec50bcad105c683ecefc64f288abbe8a44b96
-DIST bash42-052 1810 SHA256 f098fa7148f76c80ec82c704a1aab6ae246960a7ce05624ecc8844fa1561dc0c SHA512 94654d078a58a7acdea99c955315f9537575c7965514eeb19d5af9a18973042338500a72e917094ebda60fee1016cac8328f37e1bc011f2b485f167cba2aabdf WHIRLPOOL 9cc299e57c9039ec0d34cfa0031fc89f9a59aca394389b807bfc193bb29ef8b9dc7aec8a0f8a4349bb0b0dab2bbca76a7bc154566188164528e5d05067ee08fe
-DIST bash42-053 3859 SHA256 20e693d7543885c8da78db873782e56206f522d27da2c953103f23b950ffd3de SHA512 241dcc2d3b944d0f136ca5f2564dbf3593491664c5bc18d5643d9861f273ca18dfa92da2f98e2c8d62e770b7450ffc27b82260fd50974708cddc4c26604942e3 WHIRLPOOL 78683a3107521a2dd76b98f8412d96eed69b6402f111f6ecca2bd91b2cb753eb22a7bce302f9618d7a99010e8022259387350258a463e78865f5f9ecdea71cb7
DIST bash43-001 1617 SHA256 ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742 SHA512 a1011392652180a28f9837af4a341a80beb929c1458e2384e282f0007713c5fe8d0b315abf1340b3707748d3caed322135dee87b59eeb7612ee5130f87d79888 WHIRLPOOL 94d34b6ae2496b4007bf9b3af69847828179dfa90528d7fc2f9a91facc451535e2fa46120cc3ea22156974c92f2633f91423f2d43b4733f8960cde69dfff81b9
DIST bash43-002 1594 SHA256 eee7cd7062ab29a9e4f02924d9c367264dcb8b162703f74ff6eb8f175a91502b SHA512 e3178c85f553522d5d1c5fd39e76f015b680a8ccc84836a5e10283b2aed6e5b7cc3d23af0e67a270b7622dce0abf35dd8a95afa9bb6f89b73a9439f7435175a4 WHIRLPOOL 2d1b6679a1263f7a4325b692c3edac9f5daaa72e3f06dfa88958e70ad64c1fc74b92d8325becfff2c21dd28c002470bdaad50f57037c2676352078291bf0b0bc
DIST bash43-003 1465 SHA256 000e6eac50cd9053ce0630db01239dcdead04a2c2c351c47e2b51dac1ac1087d SHA512 dc2c5fad8d357d1301e419afd959dfaf015a63172857080c11f77ab1bb7d1d737f411eb0e70a861f98a36bed1b19edb7217a4fa9f4773e21706b62dc56ec3464 WHIRLPOOL 1ef78321cfe3ca6e9f690ae3dd6a7c06bc72d2e6590bfdaa8543b0ac3ff84eae998e4a2aa44531423cab1137c974b09ac30baf5fa2746e2e5a2006cde03a2b32
diff --git a/app-shells/bash/bash-4.0_p43.ebuild b/app-shells/bash/bash-4.0_p43.ebuild
deleted file mode 100644
index 740b668778..0000000000
--- a/app-shells/bash/bash-4.0_p43.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p43.ebuild,v 1.3 2014/10/03 21:37:33 jer Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="${MY_PV}"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs mem-scramble +net nls +readline"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
- readline? ( >=sys-libs/readline-6.2 )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if is-flag -malign-double ; then #7332
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
- # Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-
- epatch "${FILESDIR}"/${PN}-4.0-configure.patch #304901
- epatch "${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
- sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
- epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
- epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
- epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
- epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
- sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613
-
- # this adds additional prefixes
- epatch "${FILESDIR}"/${PN}-4.0-configs-prefix.patch
- eprefixify pathnames.h.in
-
- epatch "${FILESDIR}"/${PN}-3.2-getcwd-interix.patch
- epatch "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
- epatch "${FILESDIR}"/${PN}-4.0-cflags_for_build.patch
-
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-3.2-interix-stdint.patch
- epatch "${FILESDIR}"/${PN}-4.0-interix.patch
- epatch "${FILESDIR}"/${PN}-4.0-interix-access-suacomp.patch
- epatch "${FILESDIR}"/${PN}-4.0-interix-x64.patch
- fi
-
- # Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
- # sh while bootstrapping for the first time, This works around bug 309825
- sed -i -e '1s:sh:bash:' support/bashbug.sh || die
-
- # modify the bashrc file for prefix
- cp "${FILESDIR}"/bashrc "${T}"
- cd "${T}"
- epatch "${FILESDIR}"/bashrc-prefix.patch
- eprefixify "${T}"/bashrc
-
- # DON'T YOU EVER PUT eautoreconf OR SIMILAR HERE! THIS IS A CRITICAL
- # PACKAGE THAT MUST NOT RELY ON AUTOTOOLS, USE A SELF-SUFFICIENT PATCH
- # INSTEAD!!!
-
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762
- if use prefix ; then
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC
- else
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC
- fi
-
- # IRIX's MIPSpro produces garbage with >= -O2, bug #209137
- [[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
-
- # Don't even think about building this statically without
- # reading Bug 7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=6.2
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
-
- if [[ ${CHOST} == *-interix* ]]; then
- export ac_cv_header_inttypes_h=no
- export gt_cv_header_inttypes_h=no
- export jm_ac_cv_header_inttypes_h=no
-
- # argh... something doomed this test on windows ... ???
- export bash_cv_type_intmax_t=yes
- export bash_cv_type_uintmax_t=yes
- fi
-
- tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
-}
-
-src_install() {
- into /
- newbin bash bash-${SLOT}
-
- newman doc/bash.1 bash-${SLOT}.1
- newman doc/builtins.1 builtins-${SLOT}.1
-
- insinto /usr/share/info
- newins doc/bashref.info bash-${SLOT}.info
- dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
-
- dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-}
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
deleted file mode 100644
index f64e98dd8a..0000000000
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p44.ebuild,v 1.5 2014/10/19 20:30:15 vapier Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="${MY_PV}"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs mem-scramble +net nls +readline"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
- readline? ( >=sys-libs/readline-6.2 )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if is-flag -malign-double ; then #7332
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
- # Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-
- epatch "${FILESDIR}"/${PN}-4.0-configure.patch #304901
- epatch "${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
- sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
- epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
- epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
- epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
- epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
- sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613
-
- # this adds additional prefixes
- epatch "${FILESDIR}"/${PN}-4.0-configs-prefix.patch
- eprefixify pathnames.h.in
-
- epatch "${FILESDIR}"/${PN}-3.2-getcwd-interix.patch
- epatch "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
- epatch "${FILESDIR}"/${PN}-4.0-cflags_for_build.patch
-
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-3.2-interix-stdint.patch
- epatch "${FILESDIR}"/${PN}-4.0-interix.patch
- epatch "${FILESDIR}"/${PN}-4.0-interix-access-suacomp.patch
- epatch "${FILESDIR}"/${PN}-4.0-interix-x64.patch
- fi
-
- # Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
- # sh while bootstrapping for the first time, This works around bug 309825
- sed -i -e '1s:sh:bash:' support/bashbug.sh || die
-
- # modify the bashrc file for prefix
- cp "${FILESDIR}"/bashrc "${T}"
- cd "${T}"
- epatch "${FILESDIR}"/bashrc-prefix.patch
- eprefixify "${T}"/bashrc
-
- # DON'T YOU EVER PUT eautoreconf OR SIMILAR HERE! THIS IS A CRITICAL
- # PACKAGE THAT MUST NOT RELY ON AUTOTOOLS, USE A SELF-SUFFICIENT PATCH
- # INSTEAD!!!
-
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762
- if use prefix ; then
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC
- else
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC
- fi
-
- # IRIX's MIPSpro produces garbage with >= -O2, bug #209137
- [[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
-
- # Don't even think about building this statically without
- # reading Bug 7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=6.2
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
-
- if [[ ${CHOST} == *-interix* ]]; then
- export ac_cv_header_inttypes_h=no
- export gt_cv_header_inttypes_h=no
- export jm_ac_cv_header_inttypes_h=no
-
- # argh... something doomed this test on windows ... ???
- export bash_cv_type_intmax_t=yes
- export bash_cv_type_uintmax_t=yes
- fi
-
- tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
-}
-
-src_install() {
- into /
- newbin bash bash-${SLOT}
-
- newman doc/bash.1 bash-${SLOT}.1
- newman doc/builtins.1 builtins-${SLOT}.1
-
- insinto /usr/share/info
- newins doc/bashref.info bash-${SLOT}.info
- dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
-
- dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-}
diff --git a/app-shells/bash/bash-4.1_p16.ebuild b/app-shells/bash/bash-4.1_p16.ebuild
deleted file mode 100644
index 686fce6abb..0000000000
--- a/app-shells/bash/bash-4.1_p16.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p16.ebuild,v 1.3 2014/10/03 21:37:33 jer Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="${MY_PV}"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="afs mem-scramble +net nls +readline"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
- readline? ( >=sys-libs/readline-6.2 )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if is-flag -malign-double ; then #7332
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
- # Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-
- epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
- sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
- epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
- epatch "${FILESDIR}"/${PN}-4.1-blocking-namedpipe.patch # aix lacks /dev/fd/
-
- # this adds additional prefixes
- epatch "${FILESDIR}"/${PN}-4.0-configs-prefix.patch
- eprefixify pathnames.h.in
-
- epatch "${FILESDIR}"/${PN}-3.2-getcwd-interix.patch
- epatch "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
- epatch "${FILESDIR}"/${PN}-4.0-cflags_for_build.patch
- epatch "${FILESDIR}"/${PN}-4.0-childmax-pids.patch # AIX, Interix
-
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-4.1-interix-stdint.patch
- epatch "${FILESDIR}"/${PN}-4.0-interix.patch
- epatch "${FILESDIR}"/${PN}-4.1-interix-access-suacomp.patch
- epatch "${FILESDIR}"/${PN}-4.0-interix-x64.patch
- fi
-
- # Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
- # sh while bootstrapping for the first time, This works around bug 309825
- sed -i -e '1s:sh:bash:' support/bashbug.sh || die
-
- # modify the bashrc file for prefix
- cp "${FILESDIR}"/bashrc "${T}"
- cd "${T}"
- epatch "${FILESDIR}"/bashrc-prefix.patch
- eprefixify "${T}"/bashrc
-
- # DON'T YOU EVER PUT eautoreconf OR SIMILAR HERE! THIS IS A CRITICAL
- # PACKAGE THAT MUST NOT RELY ON AUTOTOOLS, USE A SELF-SUFFICIENT PATCH
- # INSTEAD!!!
-
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- myconf+=( --without-lispdir ) #335896
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762
- if use prefix ; then
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC
- else
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC
- fi
-
- # IRIX's MIPSpro produces garbage with >= -O2, bug #209137
- [[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
-
- # Don't even think about building this statically without
- # reading Bug 7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=6.2
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
-
- if [[ ${CHOST} == *-interix* ]]; then
- export ac_cv_header_inttypes_h=no
- export gt_cv_header_inttypes_h=no
- export jm_ac_cv_header_inttypes_h=no
-
- # argh... something doomed this test on windows ... ???
- export bash_cv_type_intmax_t=yes
- export bash_cv_type_uintmax_t=yes
- fi
-
- tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
-}
-
-src_install() {
- into /
- newbin bash bash-${SLOT}
-
- newman doc/bash.1 bash-${SLOT}.1
- newman doc/builtins.1 builtins-${SLOT}.1
-
- insinto /usr/share/info
- newins doc/bashref.info bash-${SLOT}.info
- dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
-
- dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-}
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
deleted file mode 100644
index 0b38ff0807..0000000000
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p17.ebuild,v 1.4 2014/10/08 06:21:18 armin76 Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="${MY_PV}"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="afs mem-scramble +net nls +readline"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
- readline? ( >=sys-libs/readline-6.2 )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if is-flag -malign-double ; then #7332
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
- # Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-
- epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
- sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
- epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
- epatch "${FILESDIR}"/${PN}-4.1-blocking-namedpipe.patch # aix lacks /dev/fd/
-
- # this adds additional prefixes
- epatch "${FILESDIR}"/${PN}-4.0-configs-prefix.patch
- eprefixify pathnames.h.in
-
- epatch "${FILESDIR}"/${PN}-3.2-getcwd-interix.patch
- epatch "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
- epatch "${FILESDIR}"/${PN}-4.0-cflags_for_build.patch
- epatch "${FILESDIR}"/${PN}-4.0-childmax-pids.patch # AIX, Interix
-
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-4.1-interix-stdint.patch
- epatch "${FILESDIR}"/${PN}-4.0-interix.patch
- epatch "${FILESDIR}"/${PN}-4.1-interix-access-suacomp.patch
- epatch "${FILESDIR}"/${PN}-4.0-interix-x64.patch
- fi
-
- # Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
- # sh while bootstrapping for the first time, This works around bug 309825
- sed -i -e '1s:sh:bash:' support/bashbug.sh || die
-
- # modify the bashrc file for prefix
- cp "${FILESDIR}"/bashrc "${T}"
- cd "${T}"
- epatch "${FILESDIR}"/bashrc-prefix.patch
- eprefixify "${T}"/bashrc
-
- # DON'T YOU EVER PUT eautoreconf OR SIMILAR HERE! THIS IS A CRITICAL
- # PACKAGE THAT MUST NOT RELY ON AUTOTOOLS, USE A SELF-SUFFICIENT PATCH
- # INSTEAD!!!
-
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- myconf+=( --without-lispdir ) #335896
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762
- if use prefix ; then
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC
- else
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC
- fi
-
- # IRIX's MIPSpro produces garbage with >= -O2, bug #209137
- [[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
-
- # Don't even think about building this statically without
- # reading Bug 7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=6.2
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
-
- if [[ ${CHOST} == *-interix* ]]; then
- export ac_cv_header_inttypes_h=no
- export gt_cv_header_inttypes_h=no
- export jm_ac_cv_header_inttypes_h=no
-
- # argh... something doomed this test on windows ... ???
- export bash_cv_type_intmax_t=yes
- export bash_cv_type_uintmax_t=yes
- fi
-
- tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
-}
-
-src_install() {
- into /
- newbin bash bash-${SLOT}
-
- newman doc/bash.1 bash-${SLOT}.1
- newman doc/builtins.1 builtins-${SLOT}.1
-
- insinto /usr/share/info
- newins doc/bashref.info bash-${SLOT}.info
- dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
-
- dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-}
diff --git a/app-shells/bash/bash-4.2_p52.ebuild b/app-shells/bash/bash-4.2_p52.ebuild
deleted file mode 100644
index 3ddfc3bfcf..0000000000
--- a/app-shells/bash/bash-4.2_p52.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p52.ebuild,v 1.3 2014/10/03 21:37:33 jer Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
- readline? ( >=sys-libs/readline-6.2 )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
- !!<sys-apps/portage-2.1.6.7_p1
- !!<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if is-flag -malign-double ; then #7332
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
- if use bashlogger ; then
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
- ewarn "This will log ALL output you enter into the shell, you have been warned."
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
- # Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-
- # Avoid regenerating docs after patches #407985
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/*
-
- epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
- epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
- epatch "${FILESDIR}"/${PN}-4.2-no-readline.patch
- epatch "${FILESDIR}"/${PN}-4.2-read-retry.patch #447810
- if ! use vanilla ; then
- epatch "${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
- fi
-
- # this adds additional prefixes
- epatch "${FILESDIR}"/${PN}-4.0-configs-prefix.patch
- eprefixify pathnames.h.in
-
- epatch "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
- epatch "${FILESDIR}"/${PN}-4.0-cflags_for_build.patch
-
- epatch "${FILESDIR}"/${PN}-4.2-darwin13.patch # patch from 4.3
- epatch "${FILESDIR}"/${PN}-4.1-blocking-namedpipe.patch # aix lacks /dev/fd/
- epatch "${FILESDIR}"/${PN}-4.0-childmax-pids.patch # AIX, Interix
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-4.0-interix-x64.patch
- fi
-
- # Fix not to reference a disabled symbol if USE=-readline, breaks
- # Darwin, bug #500932
- if use !readline ; then
- sed -i -e 's/enable_hostname_completion//' builtins/shopt.def || die
- fi
-
- # Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
- # sh while bootstrapping for the first time, This works around bug 309825
- sed -i -e '1s:sh:bash:' support/bashbug.sh || die
-
- # modify the bashrc file for prefix
- pushd "${T}" > /dev/null || die
- cp "${FILESDIR}"/bashrc .
- epatch "${FILESDIR}"/bashrc-prefix.patch
- eprefixify bashrc
- popd > /dev/null
-
- # DON'T YOU EVER PUT eautoreconf OR SIMILAR HERE! THIS IS A CRITICAL
- # PACKAGE THAT MUST NOT RELY ON AUTOTOOLS, USE A SELF-SUFFICIENT PATCH
- # INSTEAD!!!
-
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762
- if use prefix ; then
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
- else
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
- fi
-
- # IRIX's MIPSpro produces garbage with >= -O2, bug #209137
- [[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
-
- if [[ ${CHOST} == *-aix* ]] || [[ ${CHOST} == *-hpux* ]] ; then
- # Avoid finding tgetent() in anything else but ncurses library,
- # as <termcap.h> is provided by ncurses, even during bootstrap
- # on AIX and HP-UX, and we would get undefined symbols like
- # BC, PC, UP if linking against something else.
- # The bash-bug is that it doesn't check for <termcap.h> provider,
- # and unfortunately {,n}curses is checked last.
- # Even if ncurses provides libcurses.so->libncurses.so symlink,
- # it feels more clean to link against libncurses.so directly.
- # (all configure-variables for tgetent() are shown here)
- export ac_cv_func_tgetent=no
- export ac_cv_lib_termcap_tgetent=no # found on HP-UX
- export ac_cv_lib_tinfo_tgetent=no
- export ac_cv_lib_curses_tgetent=no # found on AIX
- #export ac_cv_lib_ncurses_tgetent=no
- fi
-
- # Don't even think about building this statically without
- # reading Bug 7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=6.2
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
-
- use plugins && case ${CHOST} in
- *-linux-gnu | *-solaris* | *-freebsd* )
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
- ;;
- # Darwin doesn't need an rpath here (in fact doesn't grok the argument)
- esac
- tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use plugins ; then
- emake -C examples/loadables all others
- fi
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-
- dodir /bin
- mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
- dosym bash /bin/rbash
-
- insinto /etc/bash
- doins "${T}"/bashrc
- doins "${FILESDIR}"/bash_logout
- insinto /etc/skel
- for f in bash{_logout,_profile,rc} ; do
- newins "${FILESDIR}"/dot-${f} .${f}
- done
-
- local sed_args=(
- -e "s:#${USERLAND}#@::"
- -e '/#@/d'
- )
- if ! use readline ; then
- sed_args+=( #432338
- -e '/^shopt -s histappend/s:^:#:'
- -e 's:use_color=true:use_color=false:'
- )
- fi
- sed -i \
- "${sed_args[@]}" \
- "${ED}"/etc/skel/.bashrc \
- "${ED}"/etc/bash/bashrc || die
-
- if use plugins ; then
- exeinto /usr/$(get_libdir)/bash
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
- insinto /usr/include/bash-plugins
- doins *.h builtins/*.h examples/loadables/*.h include/*.h \
- lib/{glob/glob.h,tilde/tilde.h}
- fi
-
- if use examples ; then
- for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do
- exeinto /usr/share/doc/${PF}/${d}
- insinto /usr/share/doc/${PF}/${d}
- for f in ${d}/* ; do
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
- doexe ${f}
- else
- doins ${f}
- fi
- done
- done
- fi
-
- doman doc/*.1
- dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
- dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
- mkdir -p "${EROOT}"/etc/bash
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
- fi
-
- if [[ -L ${EROOT}/bin/sh ]]; then
- # rewrite the symlink to ensure that its mtime changes. having /bin/sh
- # missing even temporarily causes a fatal error with paludis.
- local target=$(readlink "${EROOT}"/bin/sh)
- local tmp=$(emktemp "${EROOT}"/bin)
- ln -sf "${target}" "${tmp}"
- mv -f "${tmp}" "${EROOT}"/bin/sh
- fi
-}
-
-pkg_postinst() {
- # If /bin/sh does not exist, provide it
- if [[ ! -e ${EROOT}/bin/sh ]]; then
- ln -sf bash "${EROOT}"/bin/sh
- fi
-}
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
deleted file mode 100644
index 2af519410a..0000000000
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p53.ebuild,v 1.4 2014/10/08 06:21:18 armin76 Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
- readline? ( >=sys-libs/readline-6.2 )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
- !!<sys-apps/portage-2.1.6.7_p1
- !!<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if is-flag -malign-double ; then #7332
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
- if use bashlogger ; then
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
- ewarn "This will log ALL output you enter into the shell, you have been warned."
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
- # Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-
- # Avoid regenerating docs after patches #407985
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/*
-
- epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
- epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
- epatch "${FILESDIR}"/${PN}-4.2-no-readline.patch
- epatch "${FILESDIR}"/${PN}-4.2-read-retry.patch #447810
- if ! use vanilla ; then
- epatch "${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
- fi
-
- # this adds additional prefixes
- epatch "${FILESDIR}"/${PN}-4.0-configs-prefix.patch
- eprefixify pathnames.h.in
-
- epatch "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
- epatch "${FILESDIR}"/${PN}-4.0-cflags_for_build.patch
-
- epatch "${FILESDIR}"/${PN}-4.2-darwin13.patch # patch from 4.3
- epatch "${FILESDIR}"/${PN}-4.1-blocking-namedpipe.patch # aix lacks /dev/fd/
- epatch "${FILESDIR}"/${PN}-4.0-childmax-pids.patch # AIX, Interix
- if [[ ${CHOST} == *-interix* ]]; then
- epatch "${FILESDIR}"/${PN}-4.0-interix-x64.patch
- fi
-
- # Fix not to reference a disabled symbol if USE=-readline, breaks
- # Darwin, bug #500932
- if use !readline ; then
- sed -i -e 's/enable_hostname_completion//' builtins/shopt.def || die
- fi
-
- # Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
- # sh while bootstrapping for the first time, This works around bug 309825
- sed -i -e '1s:sh:bash:' support/bashbug.sh || die
-
- # modify the bashrc file for prefix
- pushd "${T}" > /dev/null || die
- cp "${FILESDIR}"/bashrc .
- epatch "${FILESDIR}"/bashrc-prefix.patch
- eprefixify bashrc
- popd > /dev/null
-
- # DON'T YOU EVER PUT eautoreconf OR SIMILAR HERE! THIS IS A CRITICAL
- # PACKAGE THAT MUST NOT RELY ON AUTOTOOLS, USE A SELF-SUFFICIENT PATCH
- # INSTEAD!!!
-
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762
- if use prefix ; then
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
- else
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
- fi
-
- # IRIX's MIPSpro produces garbage with >= -O2, bug #209137
- [[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
-
- if [[ ${CHOST} == *-aix* ]] || [[ ${CHOST} == *-hpux* ]] ; then
- # Avoid finding tgetent() in anything else but ncurses library,
- # as <termcap.h> is provided by ncurses, even during bootstrap
- # on AIX and HP-UX, and we would get undefined symbols like
- # BC, PC, UP if linking against something else.
- # The bash-bug is that it doesn't check for <termcap.h> provider,
- # and unfortunately {,n}curses is checked last.
- # Even if ncurses provides libcurses.so->libncurses.so symlink,
- # it feels more clean to link against libncurses.so directly.
- # (all configure-variables for tgetent() are shown here)
- export ac_cv_func_tgetent=no
- export ac_cv_lib_termcap_tgetent=no # found on HP-UX
- export ac_cv_lib_tinfo_tgetent=no
- export ac_cv_lib_curses_tgetent=no # found on AIX
- #export ac_cv_lib_ncurses_tgetent=no
- fi
-
- # Don't even think about building this statically without
- # reading Bug 7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=6.2
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
-
- use plugins && case ${CHOST} in
- *-linux-gnu | *-solaris* | *-freebsd* )
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
- ;;
- # Darwin doesn't need an rpath here (in fact doesn't grok the argument)
- esac
- tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use plugins ; then
- emake -C examples/loadables all others
- fi
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-
- dodir /bin
- mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
- dosym bash /bin/rbash
-
- insinto /etc/bash
- doins "${T}"/bashrc
- doins "${FILESDIR}"/bash_logout
- insinto /etc/skel
- for f in bash{_logout,_profile,rc} ; do
- newins "${FILESDIR}"/dot-${f} .${f}
- done
-
- local sed_args=(
- -e "s:#${USERLAND}#@::"
- -e '/#@/d'
- )
- if ! use readline ; then
- sed_args+=( #432338
- -e '/^shopt -s histappend/s:^:#:'
- -e 's:use_color=true:use_color=false:'
- )
- fi
- sed -i \
- "${sed_args[@]}" \
- "${ED}"/etc/skel/.bashrc \
- "${ED}"/etc/bash/bashrc || die
-
- if use plugins ; then
- exeinto /usr/$(get_libdir)/bash
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
- insinto /usr/include/bash-plugins
- doins *.h builtins/*.h examples/loadables/*.h include/*.h \
- lib/{glob/glob.h,tilde/tilde.h}
- fi
-
- if use examples ; then
- for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do
- exeinto /usr/share/doc/${PF}/${d}
- insinto /usr/share/doc/${PF}/${d}
- for f in ${d}/* ; do
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
- doexe ${f}
- else
- doins ${f}
- fi
- done
- done
- fi
-
- doman doc/*.1
- dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
- dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
- mkdir -p "${EROOT}"/etc/bash
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
- fi
-
- if [[ -L ${EROOT}/bin/sh ]]; then
- # rewrite the symlink to ensure that its mtime changes. having /bin/sh
- # missing even temporarily causes a fatal error with paludis.
- local target=$(readlink "${EROOT}"/bin/sh)
- local tmp=$(emktemp "${EROOT}"/bin)
- ln -sf "${target}" "${tmp}"
- mv -f "${tmp}" "${EROOT}"/bin/sh
- fi
-}
-
-pkg_postinst() {
- # If /bin/sh does not exist, provide it
- if [[ ! -e ${EROOT}/bin/sh ]]; then
- ln -sf bash "${EROOT}"/bin/sh
- fi
-}
diff --git a/app-shells/bash/bash-4.3_p29.ebuild b/app-shells/bash/bash-4.3_p29.ebuild
deleted file mode 100644
index bd258b7188..0000000000
--- a/app-shells/bash/bash-4.3_p29.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p29.ebuild,v 1.1 2014/10/03 09:56:11 polynomial-c Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="6.3"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
- readline? ( >=sys-libs/readline-${READLINE_VER} )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
- !<sys-apps/portage-2.1.6.7_p1
- !<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if is-flag -malign-double ; then #7332
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
- if use bashlogger ; then
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
- ewarn "This will log ALL output you enter into the shell, you have been warned."
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
- # Clean out local libs so we know we use system ones w/releases.
- if [[ ${PV} != *_rc* ]] ; then
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
- fi
-
- # Avoid regenerating docs after patches #407985
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/*
-
- epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch
- epatch "${FILESDIR}"/${PN}-4.3-parse-time-keyword.patch
- epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
- epatch "${FILESDIR}"/${PN}-4.3-term-cleanup.patch
-
- # this adds additional prefixes
- epatch "${FILESDIR}"/${PN}-4.0-configs-prefix.patch
- eprefixify pathnames.h.in
-
- epatch "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
-
- # Fix not to reference a disabled symbol if USE=-readline, breaks
- # Darwin, bug #500932
-# if use !readline ; then
-# sed -i -e 's/enable_hostname_completion//' builtins/shopt.def || die
-# fi
-
- # Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
- # sh while bootstrapping for the first time, This works around bug 309825
- sed -i -e '1s:sh:bash:' support/bashbug.sh || die
-
- # modify the bashrc file for prefix
- pushd "${T}" > /dev/null || die
- cp "${FILESDIR}"/bashrc .
- epatch "${FILESDIR}"/bashrc-prefix.patch
- eprefixify bashrc
- popd > /dev/null
-
- # DON'T YOU EVER PUT eautoreconf OR SIMILAR HERE! THIS IS A CRITICAL
- # PACKAGE THAT MUST NOT RELY ON AUTOTOOLS, USE A SELF-SUFFICIENT PATCH
- # INSTEAD!!!
-
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762
- if use prefix ; then
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
- else
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
- fi
-
- # IRIX's MIPSpro produces garbage with >= -O2, bug #209137
- [[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
-
- if [[ ${CHOST} == *-aix* ]] || [[ ${CHOST} == *-hpux* ]] ; then
- # Avoid finding tgetent() in anything else but ncurses library,
- # as <termcap.h> is provided by ncurses, even during bootstrap
- # on AIX and HP-UX, and we would get undefined symbols like
- # BC, PC, UP if linking against something else.
- # The bash-bug is that it doesn't check for <termcap.h> provider,
- # and unfortunately {,n}curses is checked last.
- # Even if ncurses provides libcurses.so->libncurses.so symlink,
- # it feels more clean to link against libncurses.so directly.
- # (all configure-variables for tgetent() are shown here)
- export ac_cv_func_tgetent=no
- export ac_cv_lib_termcap_tgetent=no # found on HP-UX
- export ac_cv_lib_tinfo_tgetent=no
- export ac_cv_lib_curses_tgetent=no # found on AIX
- #export ac_cv_lib_ncurses_tgetent=no
- fi
-
- # Don't even think about building this statically without
- # reading Bug 7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=${READLINE_VER}
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
-
- if [[ ${PV} != *_rc* ]] ; then
- # Use system readline only with released versions.
- myconf+=( --with-installed-readline=. )
- fi
-
- if use plugins; then
- case ${CHOST} in
- *-linux-gnu | *-solaris* | *-freebsd* )
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
- ;;
- # Darwin doesn't need an rpath here (in fact doesn't grok the argument)
- esac
- else
- # Disable the plugins logic by hand since bash doesn't
- # provide a way of doing it.
- export ac_cv_func_dl{close,open,sym}=no \
- ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
- sed -i \
- -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
- configure || die
- fi
- tc-export AR #444070
- econf \
- --docdir='$(datarootdir)'/doc/${PF} \
- --htmldir='$(docdir)/html' \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use plugins ; then
- emake -C examples/loadables all others
- fi
-}
-
-src_install() {
- local d f
-
- default
-
- dodir /bin
- mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
- dosym bash /bin/rbash
-
- insinto /etc/bash
- doins "${T}"/bashrc
- doins "${FILESDIR}"/bash_logout
- insinto /etc/skel
- for f in bash{_logout,_profile,rc} ; do
- newins "${FILESDIR}"/dot-${f} .${f}
- done
-
- local sed_args=(
- -e "s:#${USERLAND}#@::"
- -e '/#@/d'
- )
- if ! use readline ; then
- sed_args+=( #432338
- -e '/^shopt -s histappend/s:^:#:'
- -e 's:use_color=true:use_color=false:'
- )
- fi
- sed -i \
- "${sed_args[@]}" \
- "${ED}"/etc/skel/.bashrc \
- "${ED}"/etc/bash/bashrc || die
-
- if use plugins ; then
- exeinto /usr/$(get_libdir)/bash
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
- insinto /usr/include/bash-plugins
- doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
- fi
-
- if use examples ; then
- for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do
- exeinto /usr/share/doc/${PF}/${d}
- insinto /usr/share/doc/${PF}/${d}
- for f in ${d}/* ; do
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
- doexe ${f}
- else
- doins ${f}
- fi
- done
- done
- fi
-
- doman doc/*.1
- newdoc CWRU/changelog ChangeLog
- dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
- mkdir -p "${EROOT}"/etc/bash
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
- fi
-
- if [[ -L ${EROOT}/bin/sh ]] ; then
- # rewrite the symlink to ensure that its mtime changes. having /bin/sh
- # missing even temporarily causes a fatal error with paludis.
- local target=$(readlink "${EROOT}"/bin/sh)
- local tmp=$(emktemp "${EROOT}"/bin)
- ln -sf "${target}" "${tmp}"
- mv -f "${tmp}" "${EROOT}"/bin/sh
- fi
-}
-
-pkg_postinst() {
- # If /bin/sh does not exist, provide it
- if [[ ! -e ${EROOT}/bin/sh ]] ; then
- ln -sf bash "${EROOT}"/bin/sh
- fi
-}
diff --git a/app-shells/bash/bash-4.3_p30.ebuild b/app-shells/bash/bash-4.3_p30.ebuild
deleted file mode 100644
index 668f4d3481..0000000000
--- a/app-shells/bash/bash-4.3_p30.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p30.ebuild,v 1.1 2014/10/06 06:32:08 polynomial-c Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="6.3"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
- readline? ( >=sys-libs/readline-${READLINE_VER} )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
- !<sys-apps/portage-2.1.6.7_p1
- !<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if is-flag -malign-double ; then #7332
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
- if use bashlogger ; then
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
- ewarn "This will log ALL output you enter into the shell, you have been warned."
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
- # Clean out local libs so we know we use system ones w/releases.
- if [[ ${PV} != *_rc* ]] ; then
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
- fi
-
- # Avoid regenerating docs after patches #407985
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/*
-
- epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch
- epatch "${FILESDIR}"/${PN}-4.3-parse-time-keyword.patch
- epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
- epatch "${FILESDIR}"/${PN}-4.3-term-cleanup.patch
-
- # this adds additional prefixes
- epatch "${FILESDIR}"/${PN}-4.0-configs-prefix.patch
- eprefixify pathnames.h.in
-
- epatch "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
-
- # Fix not to reference a disabled symbol if USE=-readline, breaks
- # Darwin, bug #500932
-# if use !readline ; then
-# sed -i -e 's/enable_hostname_completion//' builtins/shopt.def || die
-# fi
-
- # Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
- # sh while bootstrapping for the first time, This works around bug 309825
- sed -i -e '1s:sh:bash:' support/bashbug.sh || die
-
- # modify the bashrc file for prefix
- pushd "${T}" > /dev/null || die
- cp "${FILESDIR}"/bashrc .
- epatch "${FILESDIR}"/bashrc-prefix.patch
- eprefixify bashrc
- popd > /dev/null
-
- # DON'T YOU EVER PUT eautoreconf OR SIMILAR HERE! THIS IS A CRITICAL
- # PACKAGE THAT MUST NOT RELY ON AUTOTOOLS, USE A SELF-SUFFICIENT PATCH
- # INSTEAD!!!
-
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762
- if use prefix ; then
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
- else
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
- fi
-
- # IRIX's MIPSpro produces garbage with >= -O2, bug #209137
- [[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
-
- if [[ ${CHOST} == *-aix* ]] || [[ ${CHOST} == *-hpux* ]] ; then
- # Avoid finding tgetent() in anything else but ncurses library,
- # as <termcap.h> is provided by ncurses, even during bootstrap
- # on AIX and HP-UX, and we would get undefined symbols like
- # BC, PC, UP if linking against something else.
- # The bash-bug is that it doesn't check for <termcap.h> provider,
- # and unfortunately {,n}curses is checked last.
- # Even if ncurses provides libcurses.so->libncurses.so symlink,
- # it feels more clean to link against libncurses.so directly.
- # (all configure-variables for tgetent() are shown here)
- export ac_cv_func_tgetent=no
- export ac_cv_lib_termcap_tgetent=no # found on HP-UX
- export ac_cv_lib_tinfo_tgetent=no
- export ac_cv_lib_curses_tgetent=no # found on AIX
- #export ac_cv_lib_ncurses_tgetent=no
- fi
-
- # Don't even think about building this statically without
- # reading Bug 7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=${READLINE_VER}
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
-
- if [[ ${PV} != *_rc* ]] ; then
- # Use system readline only with released versions.
- myconf+=( --with-installed-readline=. )
- fi
-
- if use plugins; then
- case ${CHOST} in
- *-linux-gnu | *-solaris* | *-freebsd* )
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
- ;;
- # Darwin doesn't need an rpath here (in fact doesn't grok the argument)
- esac
- else
- # Disable the plugins logic by hand since bash doesn't
- # provide a way of doing it.
- export ac_cv_func_dl{close,open,sym}=no \
- ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
- sed -i \
- -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
- configure || die
- fi
- tc-export AR #444070
- econf \
- --docdir='$(datarootdir)'/doc/${PF} \
- --htmldir='$(docdir)/html' \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use plugins ; then
- emake -C examples/loadables all others
- fi
-}
-
-src_install() {
- local d f
-
- default
-
- dodir /bin
- mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
- dosym bash /bin/rbash
-
- insinto /etc/bash
- doins "${T}"/bashrc
- doins "${FILESDIR}"/bash_logout
- insinto /etc/skel
- for f in bash{_logout,_profile,rc} ; do
- newins "${FILESDIR}"/dot-${f} .${f}
- done
-
- local sed_args=(
- -e "s:#${USERLAND}#@::"
- -e '/#@/d'
- )
- if ! use readline ; then
- sed_args+=( #432338
- -e '/^shopt -s histappend/s:^:#:'
- -e 's:use_color=true:use_color=false:'
- )
- fi
- sed -i \
- "${sed_args[@]}" \
- "${ED}"/etc/skel/.bashrc \
- "${ED}"/etc/bash/bashrc || die
-
- if use plugins ; then
- exeinto /usr/$(get_libdir)/bash
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
- insinto /usr/include/bash-plugins
- doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
- fi
-
- if use examples ; then
- for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do
- exeinto /usr/share/doc/${PF}/${d}
- insinto /usr/share/doc/${PF}/${d}
- for f in ${d}/* ; do
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
- doexe ${f}
- else
- doins ${f}
- fi
- done
- done
- fi
-
- doman doc/*.1
- newdoc CWRU/changelog ChangeLog
- dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
- mkdir -p "${EROOT}"/etc/bash
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
- fi
-
- if [[ -L ${EROOT}/bin/sh ]] ; then
- # rewrite the symlink to ensure that its mtime changes. having /bin/sh
- # missing even temporarily causes a fatal error with paludis.
- local target=$(readlink "${EROOT}"/bin/sh)
- local tmp=$(emktemp "${EROOT}"/bin)
- ln -sf "${target}" "${tmp}"
- mv -f "${tmp}" "${EROOT}"/bin/sh
- fi
-}
-
-pkg_postinst() {
- # If /bin/sh does not exist, provide it
- if [[ ! -e ${EROOT}/bin/sh ]] ; then
- ln -sf bash "${EROOT}"/bin/sh
- fi
-}
diff --git a/app-shells/bash/bash-4.3_p39.ebuild b/app-shells/bash/bash-4.3_p48-r1.ebuild
similarity index 77%
rename from app-shells/bash/bash-4.3_p39.ebuild
rename to app-shells/bash/bash-4.3_p48-r1.ebuild
index 389cf14898..6d5d03b742 100644
--- a/app-shells/bash/bash-4.3_p39.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r1.ebuild
@@ -1,10 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p39.ebuild,v 1.1 2015/05/21 04:06:28 vapier Exp $
-EAPI="4"
+EAPI="5"
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
+inherit eutils flag-o-matic toolchain-funcs multilib
# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
@@ -38,11 +37,11 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-DEPEND=">=sys-libs/ncurses-5.2-r2
- readline? ( >=sys-libs/readline-${READLINE_VER} )
+DEPEND=">=sys-libs/ncurses-5.2-r2:0=
+ readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
!<sys-apps/portage-2.1.6.7_p1
@@ -50,6 +49,15 @@ RDEPEND="${DEPEND}
# we only need yacc when the .y files get patched (bash42-005)
DEPEND+=" virtual/yacc"
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
+ "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
+ "${FILESDIR}"/${PN}-4.3-protos.patch
+ "${FILESDIR}"/${PN}-4.4-popd-offset-overflow.patch #600174
+ "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
+ "${FILESDIR}"/${PN}-4.3_p39-cygwin-r2.patch
+)
+
S=${WORKDIR}/${MY_P}
pkg_setup() {
@@ -79,38 +87,19 @@ src_prepare() {
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
fi
+ # Prefixify hardcoded path names. No-op for non-prefix.
+ hprefixify pathnames.h.in
+
# Avoid regenerating docs after patches #407985
sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
touch -r . doc/*
- epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch
- epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
- epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
- epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
-
- # this adds additional prefixes
- epatch "${FILESDIR}"/${PN}-4.0-configs-prefix.patch
- eprefixify pathnames.h.in
-
- epatch "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
-
- epatch "${FILESDIR}"/${P}-cygwin-r2.patch
+ epatch "${PATCHES[@]}"
# Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
# sh while bootstrapping for the first time, This works around bug 309825
sed -i -e '1s:sh:bash:' support/bashbug.sh || die
- # modify the bashrc file for prefix
- pushd "${T}" > /dev/null || die
- cp "${FILESDIR}"/bashrc-r2 .
- epatch "${FILESDIR}"/bashrc-r2-prefix.patch
- eprefixify bashrc-r2
- popd > /dev/null
-
- # DON'T YOU EVER PUT eautoreconf OR SIMILAR HERE! THIS IS A CRITICAL
- # PACKAGE THAT MUST NOT RELY ON AUTOTOOLS, USE A SELF-SUFFICIENT PATCH
- # INSTEAD!!!
-
epatch_user
}
@@ -118,28 +107,16 @@ src_configure() {
local myconf=()
# For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762
- if use prefix ; then
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
- else
+ # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
+ -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+ -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+ -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+ -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
-DNON_INTERACTIVE_LOGIN_SHELLS \
-DSSH_SOURCE_BASHRC \
+ -DUSE_MKTEMP -DUSE_MKSTEMP \
$(use bashlogger && echo -DSYSLOG_HISTORY)
- fi
-
- # IRIX's MIPSpro produces garbage with >= -O2, bug #209137
[[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
if [[ ${CHOST} == *-aix* ]] || [[ ${CHOST} == *-hpux* ]] ; then
@@ -239,7 +216,7 @@ src_install() {
insinto /etc/bash
doins "${FILESDIR}"/bash_logout
- newins "${T}"/bashrc-r2 bashrc
+ doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
keepdir /etc/bash/bashrc.d
insinto /etc/skel
for f in bash{_logout,_profile,rc} ; do
diff --git a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
new file mode 100644
index 0000000000..c6ef19d03f
--- /dev/null
+++ b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/600174
+https://lists.gnu.org/archive/html/bug-bash/2016-11/msg00099.html
+
+*** ../bash-4.4-patched/builtins/pushd.def 2016-01-25 13:31:49.000000000 -0500
+--- builtins/pushd.def 2016-10-28 10:46:49.000000000 -0400
+***************
+*** 366,370 ****
+ }
+
+! if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
+ {
+ pushd_error (directory_list_offset, which_word ? which_word : "");
+--- 366,370 ----
+ }
+
+! if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
+ {
+ pushd_error (directory_list_offset, which_word ? which_word : "");
+***************
+*** 388,391 ****
+--- 388,396 ----
+ of the list into place. */
+ i = (direction == '+') ? directory_list_offset - which : which;
++ if (i < 0 || i > directory_list_offset)
++ {
++ pushd_error (directory_list_offset, which_word ? which_word : "");
++ return (EXECUTION_FAILURE);
++ }
+ free (pushd_directory_list[i]);
+ directory_list_offset--;
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
index a398eb1ed4..03694691d4 100644
--- a/app-shells/bash/files/bashrc
+++ b/app-shells/bash/files/bashrc
@@ -20,54 +20,75 @@ fi
# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
shopt -s checkwinsize
-# Enable history appending instead of overwriting. #139609
+# Disable completion when the input buffer is empty. i.e. Hitting tab
+# and waiting a long time for bash to expand all of $PATH.
+shopt -s no_empty_cmd_completion
+
+# Enable history appending instead of overwriting when exiting. #139609
shopt -s histappend
+# Save each command to the history file as it's executed. #517342
+# This does mean sessions get interleaved when reading later on, but this
+# way the history is always up to date. History is not synced across live
+# sessions though; that is what `history -n` does.
+# Disabled by default due to concerns related to system recovery when $HOME
+# is under duress, or lives somewhere flaky (like NFS). Constantly syncing
+# the history will halt the shell prompt until it's finished.
+#PROMPT_COMMAND='history -a'
+
# Change the window title of X terminals
case ${TERM} in
- xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
- PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\007"'
+ [aEkx]term*|rxvt*|gnome*|konsole*|interix)
+ PS1='\[\033]0;\u@\h:\w\007\]'
;;
screen*)
- PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/~}\033\\"'
+ PS1='\[\033k\u@\h:\w\033\\\]'
+ ;;
+ *)
+ unset PS1
;;
esac
-use_color=false
-#BSD#@# BSD doesn't typically come with dircolors so we need
-#BSD#@# to hardcode some terminals in here.
-#BSD#@case ${TERM} in
-#BSD#@ xterm*|rxvt*|Eterm|aterm|kterm|gnome*|screen|cons25) use_color=true;;
-#BSD#@esac
-
# Set colorful PS1 only on colorful terminals.
# dircolors --print-database uses its own built-in database
# instead of using /etc/DIR_COLORS. Try to use the external file
-# first to take advantage of user additions. Use internal bash
-# globbing instead of external grep binary.
-safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM
-match_lhs=""
-[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
-[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
-[[ -z ${match_lhs} ]] \
- && type -P dircolors >/dev/null \
- && match_lhs=$(dircolors --print-database)
-[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
-
-if ${use_color} ; then
+# first to take advantage of user additions.
+# We run dircolors directly due to its changes in file syntax and
+# terminal name patching.
+use_color=false
+if type -P dircolors >/dev/null ; then
# Enable colors for ls, etc. Prefer ~/.dir_colors #64489
- if type -P dircolors >/dev/null ; then
- if [[ -f ~/.dir_colors ]] ; then
- eval $(dircolors -b ~/.dir_colors)
- elif [[ -f /etc/DIR_COLORS ]] ; then
- eval $(dircolors -b /etc/DIR_COLORS)
- fi
+ LS_COLORS=
+ if [[ -f ~/.dir_colors ]] ; then
+ eval "$(dircolors -b ~/.dir_colors)"
+ elif [[ -f /etc/DIR_COLORS ]] ; then
+ eval "$(dircolors -b /etc/DIR_COLORS)"
+ else
+ eval "$(dircolors -b)"
+ fi
+ # Note: We always evaluate the LS_COLORS setting even when it's the
+ # default. If it isn't set, then `ls` will only colorize by default
+ # based on file attributes and ignore extensions (even the compiled
+ # in defaults of dircolors). #583814
+ if [[ -n ${LS_COLORS:+set} ]] ; then
+ use_color=true
+ else
+ # Delete it if it's empty as it's useless in that case.
+ unset LS_COLORS
fi
+else
+ # Some systems (e.g. BSD & embedded) don't typically come with
+ # dircolors so we need to hardcode some terminals in here.
+ case ${TERM} in
+ [aEkx]term*|rxvt*|gnome*|konsole*|screen|cons25|*color) use_color=true;;
+ esac
+fi
+if ${use_color} ; then
if [[ ${EUID} == 0 ]] ; then
- PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
+ PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \w \$\[\033[00m\] '
else
- PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+ PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
fi
#BSD#@export CLICOLOR=1
@@ -78,11 +99,15 @@ if ${use_color} ; then
else
if [[ ${EUID} == 0 ]] ; then
# show root@ when we don't have colors
- PS1='\u@\h \W \$ '
+ PS1+='\u@\h \w \$ '
else
- PS1='\u@\h \w \$ '
+ PS1+='\u@\h \w \$ '
fi
fi
+for sh in /etc/bash/bashrc.d/* ; do
+ [[ -r ${sh} ]] && source "${sh}"
+done
+
# Try to keep environment pollution down, EPA loves us.
-unset use_color safe_term match_lhs
+unset use_color sh
diff --git a/app-shells/bash/files/dot-bash_profile b/app-shells/bash/files/dot-bash_profile
index 94a6622b5c..1de05a45e3 100644
--- a/app-shells/bash/files/dot-bash_profile
+++ b/app-shells/bash/files/dot-bash_profile
@@ -2,4 +2,6 @@
# This file is sourced by bash for login shells. The following line
# runs your .bashrc and is recommended by the bash info pages.
-[[ -f ~/.bashrc ]] && . ~/.bashrc
+if [[ -f ~/.bashrc ]] ; then
+ . ~/.bashrc
+fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: app-shells/bash/, app-shells/bash/files/
@ 2018-12-28 10:26 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2018-12-28 10:26 UTC (permalink / raw
To: gentoo-commits
commit: b7c921b97b592678aa3185daeec17a3479b71e99
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 10:25:37 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 10:26:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b7c921b9
app-shells/bash: migrate to gx86
bash-4.4_p23 was actually identical to gx86 version except its keywords
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-shells/bash/Manifest | 73 ---
app-shells/bash/bash-4.3_p48-r1.ebuild | 288 ---------
app-shells/bash/bash-4.3_p48.ebuild | 288 ---------
app-shells/bash/bash-4.4_p23.ebuild | 259 --------
app-shells/bash/files/autoconf-mktime-2.59.patch | 197 ------
.../bash/files/bash-2.05b-parallel-build.patch | 15 -
.../bash/files/bash-3.0-configs-prefix.patch | 48 --
app-shells/bash/files/bash-3.0-configs.patch | 71 ---
.../bash/files/bash-3.0-trap-fg-signals.patch | 23 -
app-shells/bash/files/bash-3.1-bash-logger.patch | 89 ---
app-shells/bash/files/bash-3.1-gentoo.patch | 55 --
.../bash/files/bash-3.2-dev-fd-test-as-user.patch | 26 -
.../bash/files/bash-3.2-getcwd-interix.patch | 51 --
.../bash/files/bash-3.2-interix-stdint.patch | 59 --
.../bash/files/bash-3.2-ldflags-for-build.patch | 37 --
app-shells/bash/files/bash-3.2-loadables.patch | 239 -------
.../bash/files/bash-3.2-parallel-build.patch | 16 -
app-shells/bash/files/bash-3.2-process-subst.patch | 12 -
app-shells/bash/files/bash-3.2-protos.patch | 57 --
.../bash/files/bash-3.2-session-leader.patch | 65 --
app-shells/bash/files/bash-3.2-ulimit.patch | 13 -
.../bash/files/bash-4.0-bashintl-in-siglist.patch | 12 -
.../bash/files/bash-4.0-cflags_for_build.patch | 23 -
app-shells/bash/files/bash-4.0-childmax-pids.patch | 123 ----
.../bash/files/bash-4.0-configs-prefix.patch | 15 -
app-shells/bash/files/bash-4.0-configure.patch | 25 -
.../files/bash-4.0-interix-access-suacomp.patch | 50 --
.../bash/files/bash-4.0-interix-access.patch | 103 ---
app-shells/bash/files/bash-4.0-interix-x64.patch | 40 --
app-shells/bash/files/bash-4.0-interix.patch | 14 -
.../bash/files/bash-4.0-ldflags-for-build.patch | 15 -
.../bash/files/bash-4.0-negative-return.patch | 33 -
.../bash/files/bash-4.0-parallel-build.patch | 65 --
.../bash/files/bash-4.1-blocking-namedpipe.patch | 14 -
app-shells/bash/files/bash-4.1-fbsd-eaccess.patch | 29 -
.../files/bash-4.1-interix-access-suacomp.patch | 40 --
.../bash/files/bash-4.1-interix-stdint.patch | 34 -
.../bash/files/bash-4.1-parallel-build.patch | 23 -
app-shells/bash/files/bash-4.2-darwin13.patch | 41 --
.../bash/files/bash-4.2-execute-job-control.patch | 24 -
.../files/bash-4.2-freebsd-pipe-open-eintr.patch | 18 -
app-shells/bash/files/bash-4.2-no-readline.patch | 19 -
.../bash/files/bash-4.2-parallel-build.patch | 106 ----
app-shells/bash/files/bash-4.2-read-retry.patch | 41 --
.../bash/files/bash-4.2-speed-up-read-N.patch | 112 ----
.../files/bash-4.3-append-process-segfault.patch | 18 -
app-shells/bash/files/bash-4.3-arrayfunc.patch | 15 -
app-shells/bash/files/bash-4.3-compat-lvl.patch | 13 -
....3-mapfile-improper-array-name-validation.patch | 13 -
.../bash/files/bash-4.3-parse-time-keyword.patch | 30 -
app-shells/bash/files/bash-4.3-protos.patch | 10 -
app-shells/bash/files/bash-4.3-term-cleanup.patch | 47 --
app-shells/bash/files/bash-4.3_p39-cygwin-r2.patch | 690 ---------------------
.../bash/files/bash-4.4-history-alloclist.patch | 26 -
app-shells/bash/files/bash-4.4-jobs_overflow.patch | 14 -
.../bash/files/bash-4.4-popd-offset-overflow.patch | 30 -
.../bash/files/bash-4.x-deferred-heredocs.patch | 47 --
app-shells/bash/files/bash-eol-pushback.patch | 11 -
app-shells/bash/files/bash_logout | 9 -
app-shells/bash/files/bashrc | 113 ----
app-shells/bash/files/bashrc-prefix.patch | 40 --
app-shells/bash/files/bashrc-r2 | 108 ----
app-shells/bash/files/bashrc-r2-prefix.patch | 37 --
app-shells/bash/files/dot-bash_logout | 6 -
app-shells/bash/files/dot-bash_profile | 7 -
app-shells/bash/files/dot-bashrc | 18 -
app-shells/bash/metadata.xml | 19 -
67 files changed, 4321 deletions(-)
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
deleted file mode 100644
index 19bef7dd3e..0000000000
--- a/app-shells/bash/Manifest
+++ /dev/null
@@ -1,73 +0,0 @@
-DIST bash-4.3.tar.gz 7955839 BLAKE2B 398461e90a1ab6fd726b1a9db41c4c2a1e184034e3b96029bd17097338f1f9869d1c2216bde0b5b3c8e561629824348a0da3045cc425914e8e024180a175efe4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651
-DIST bash-4.4.tar.gz 9377313 BLAKE2B ac0e481dd4f2d5b91eea4f0156f1fc398ef8bd1ccd941366aa9b041be576114c51e1ff1431ec871e96fb72257c2a05a0ebcbd88c43c221610fef7dfdb2502fc0 SHA512 73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29
-DIST bash43-001 1617 BLAKE2B c268cb0b2cd02e1bf5ef20eb84f317193f40e00b8f1ecf082640777b03ca070ad9b70cda746a0bad7fd94076126d4fdcc48e31c88bdb66c451eba4fd31bdf83b SHA512 a1011392652180a28f9837af4a341a80beb929c1458e2384e282f0007713c5fe8d0b315abf1340b3707748d3caed322135dee87b59eeb7612ee5130f87d79888
-DIST bash43-002 1594 BLAKE2B d1465949ab51e582498068e4e7b2988ce39ea9ca959aea7a90f5e050f119ba5cb96f1291d3ab9fae187e0b8894ffef73823139a6059a3e227bb1fd3934a28f10 SHA512 e3178c85f553522d5d1c5fd39e76f015b680a8ccc84836a5e10283b2aed6e5b7cc3d23af0e67a270b7622dce0abf35dd8a95afa9bb6f89b73a9439f7435175a4
-DIST bash43-003 1465 BLAKE2B 8fc9e83e39e0c43dc9365e3014f61d7a6643832c78c29da71dfd0f3adaf3dced5075f57ef42e183fe892e4db837214fedb1b8fd00f717e105c56b460685f5409 SHA512 dc2c5fad8d357d1301e419afd959dfaf015a63172857080c11f77ab1bb7d1d737f411eb0e70a861f98a36bed1b19edb7217a4fa9f4773e21706b62dc56ec3464
-DIST bash43-004 1534 BLAKE2B e227900b10cf9a35055c79f6a25fa1c6db13c5ef652b2733570297c7fde5001518aff2c7b3bd0e072ac2d6e950d916f6f7d4c318db048aa15c1fc8791fbc1ebf SHA512 6a5177d5f4205ca9d3824601052dc6d0cd768638cdfc125501c5643dd51d537f5d075cbd11a10356caf4205e47a0287c72636065789ecce264129fc92fbda420
-DIST bash43-005 2636 BLAKE2B 659e60ce3571571e74c116b1bc502168641eeaa6fd48131842c022bbcfd9679f4e1e7e7f593538dd51caefcc0fe3b122e5e73cb8384e4fea9212f810cbe5cd43 SHA512 e201aa8ef0ce0d74fa5ee42e8171bbb5ba633d831d863a8e8afc5d5157581bb055d16c52b316cc945979a852b0eae7921244a24b89818acfb7c96572ed04d1f8
-DIST bash43-006 1445 BLAKE2B 40c0af5e2ff2d97f30c0de260ec32ece50b43651a89bc75dd4e1fa2558a54d687c577a0f44ab4464abe4db79520a08eb1ea23d090d72012ab9bf472cbf29a2ef SHA512 d1da3c9d3781482d87cdcbfd69ab3958ed4950f2a00e9d15228ecb4ad5ca8ae253eff378010b4908d04df2ecf658e08f7c2efc97d6a0b8dd2317552c1895d7b2
-DIST bash43-007 1331 BLAKE2B 66b94d60ae4262aecb23ba1beaf09eb976c93c60e64424e0fb3dca1bde24323a09f71c523c3d32085c7888dd99e1fc5e3aa774a2e1f56e1cdbaefd93e7f688dc SHA512 c445b5cdd486d06991c78d4c88e2e44e49f74d1fc07b8e4bc9492cccfc4ff4045587bed6b24d745974c6339340e45b9756c27723fdb79e7591e7d6c5d350a86e
-DIST bash43-008 4575 BLAKE2B 32bb0cb4dc247545e72060a8ce658fa8cbde0113e38d0058d0f85bb5036d6eeeb053989aedf21f5f13d8316af6aacff8f4a9b09650f50b58481386352af8718c SHA512 53bae88cd3341a4ef8c60d6a294c09402103d1b20f485cf85775e6730a3d2eec8e6ebe15aa6dd95336e4a1f540f21db394823b9d04b416e5af071a7a6c618900
-DIST bash43-009 2413 BLAKE2B 42cf000b7f52b4f31a72387f655366f42f6241a2ea7834eeb0bda9b26008bd462637079f8abc0ebda6f80b88127a5c8f0da70a10a090ba43b44417563287939a SHA512 8d06fe612cd32cb414fdcdc34d4420b8991b268dd3ddd2dd47b3d01679954debd78e21f697a7f495d2340f0dcc8acdc3ad6809b8870bf5fd300afb1439788776
-DIST bash43-010 5357 BLAKE2B fee1bf3723344b671ed0221a0083cc1156a140b71357113277b8f71f8bad4931ff644f31a965bbe14aa9bcbce7db958017207795c6ce58ef76e127055e7934dd SHA512 e36e550d749f52bab01256ed5f8f1b48fe53190c1a0a0a15c545328261c1f50b85f574b44188855858de1f2d045945770c4940bdecadd8381ea2cf174bde2fee
-DIST bash43-011 1533 BLAKE2B 2ebc249170e4a08cc0bbb069ba57110b0884b87c0341ed90e0f8f4b029940e4d1d169013ec2a289ac237bb68d61f93a9b380103f50081c688ab6186dc1077912 SHA512 678bbcd92b927c86631cd42d6d3ab7596a3ffd20b640f471a9783a7972f05d2d4fb15970c12e7645e90d407c5a2d2aadcad698113211724b0ef8d89eccd2cd66
-DIST bash43-012 1365 BLAKE2B 27460ae8f102032cd7367da8c050e08f69fe20a0dcb25804c4fa5b0e04238b6c71732038627a7b8a9b55a95e1aafba8ed06d9f3a2b7c6945daa1b61667af8be5 SHA512 169453248edb55baf761b0c9c7b296ed2c24543b80fcf4756b8dd398054b6317da285c5e9cd68828f2620b05874f21a08773844ee32416daef76b88d0ef3ee6d
-DIST bash43-013 2151 BLAKE2B 8732cabe5634ee11869b708b34edab1e7bea13d9e2f2f34371587c532447d04185193ebff87c04e6a9cacaba5574ecda03e0c0d731ed6d4b0261141bbb925dfe SHA512 536bbf0c9b23eb824579955e7fce892cfc1e1d9fbcfc66810353ac4ff238e9e57361c0a46b3f3573ca8ca563331070ce55442ffea38e2a632840b6a318db1c88
-DIST bash43-014 3533 BLAKE2B 210d0a0af40d42342ca4e87ce866c5bb12b6f630b2921f6c187fbb289070dbc05a2bac9c7a47cf7631f7f6ddd218248ce700b3db40c33d3cc54b3069f80fbf93 SHA512 79fb50f62dbdca5e45a1359570e6d2173d442b3d4ddd4eb44809ed45ac022de4fe3f0aadd7672b4c8d9739405d51762486ee0c677b56f9c7d60e6224be84b87a
-DIST bash43-015 1894 BLAKE2B e8111717c9f2d8adb4301590a55837b087c3a30fcb697331d1b0903c9cce268b51c57930e99f879a8808763a947a563c9787dee04d74f4a5203418d49f5e05de SHA512 38a7af22f13f1f45705ceadf3abb52be75f3239959c2b1d57f333d137f25f14ed92c4d209b35417d449b1ec4291bbd984bb5fd11ad40375b22d2668b33fb8efb
-DIST bash43-016 3674 BLAKE2B 1a356023d42d94a570cf019c13f228f5a9327a92fabae762ada8b420350256aae652c46e1b9abb7cb039ee1564d3591ea64fd35f13cc699b82a8c1f48ed853b7 SHA512 52ab2966ccd42554c8bd76041e07921388220b46c93c34190197cdda38a085fd499d71e2e0a10daea130e6782ada556f35b1a37d06d023e83c4c4d665d07cd3f
-DIST bash43-017 1565 BLAKE2B fa1a2b066a58d77eb5376c47799a0c059135265a6569796761f15ec07d314d7c171902f9e077d1c86648243264cc7811d57c7eb58891cfb07fcbb1f4b9e8e970 SHA512 88b11f324a780823b459b1e8a0904348c56079b4103cb86025d34dbba02543b0b7fbc2397bf043c24c1363f30539a6fe9b9f9fc717be9798f466071d1d420bb9
-DIST bash43-018 1315 BLAKE2B 267b2a1e4c6e27ac4e496de42b2891bf97b445ce853993a46b619000fdc2c3acf8f404d10cf247b7ec72469b97d861b2bf31356ea71ff2e88d71ccf5d5973e0c SHA512 f83d8e1d6d8fa8adf1715b8d4130730a13f5cd626f75e9e4b8c63244645a45a3f1fbac03081bb9d1e46864919d1b3189a9bb6d7a5e7a8854e6270ab3269c771f
-DIST bash43-019 2610 BLAKE2B 7fec02f35c2d99fcaa2167e269fa9569ecdfdab8f88b21182f658f16206bebcb45cee9a1c65eb76079890b8159e760d90f7167d8beb8ac3480cb45fd161f07bc SHA512 77e6dac3079d9282f6f85940a762b0da2473ac0d35e9bad2ebc2862bf0f3c4376a6220c746c1c37de0b4d492251ec9531a62c8a042a1be5e485f8f5ae6fa0704
-DIST bash43-020 2777 BLAKE2B 6b8d6af840871080ad768fd899bdf559a2e2d64522f8b525e68f96f9641fc3a86729e52c72bed9a2636ba9c210f29a9697f2f35f43450e463c99c6bba3a30588 SHA512 fa06563eb46609115750ffa88098b07c608cc8b13fc31356f33e1428a4da4d2610e122e0241356afcfadfecc5ccee5db4b7cf07f74005e7f30240ada4a81b5f7
-DIST bash43-021 1623 BLAKE2B f394d58c914191c36bcf4e272c690c44e644d690793ac47e679f434c964dd052fdcd754282c3b164dbcde80941dcdb471dd52315c9fb96654419f26edd9a08ec SHA512 90dc85302d9bc60e68fa8cce472b7e022d8a6ccee361f97aad4cbe5f1585b4870ab9997a3e6fac420aaf84c3dce9757716eb08f4fa6b38e14bac4f2d5d503731
-DIST bash43-022 1782 BLAKE2B cd3e9e3ce3b7bd3902ca3253dd05fabe1fd4fd3eafcce6c21790cb6d30f8f891620cf33acda4d8496d119d5ac3ab8725fe62923c288d0ea13fe5cf9536de6e99 SHA512 721b772349f9e0cc65975e419fabe4acdb23c77796a5d8fde01f110687ea1cb7d23fb706fc0452fb3c2082958a81c95b82f277e1f8f722b1156913efd59afc30
-DIST bash43-023 3414 BLAKE2B 521df59dc795da45cbb7c1fd09cedc5bf71d5167adabfcbd1c30a0d8fa87b27cad0dee873c01cd9ebc1cd7f2bf71bc4190309dda3452adbfe563a41bdc3b55b9 SHA512 d45b5f5dc4682c7260c8b6ef6faa99c929d2159cc34534931790f71f76e7324376e4a5d4a2a3bc21c16c25a8206554580943e7a3f672ec5a4af16cbccd216819
-DIST bash43-024 1909 BLAKE2B bd9f5997e9509f70eaafa4fc4a1b508e013fb50a48d872b08c98219ea8444fbf1de8cf6ae86b97885f382231d8b6f04f9e1debc381078b4e306e341c585ca28d SHA512 eada2b4839b81f28f63a874e08c72dfee9708c0982d2447347c17770a29c8fbb3d3f8c58c8a22b0d46a9d10abbd79dec11b5815257fb39af06420ef3602f8499
-DIST bash43-025 3940 BLAKE2B 4b935b826c80a5704a38d066d213c43c0254bd68b5dbb35e353c6e3ce109aaf87e02efc179df6d4274dc991658822baf91177c1343f4dcd080124ce391711be6 SHA512 b4ea28ea0a24c8609d5c3a10114c5fec87ab978ec60700c36992d093e7afd976dbaee4a0d62c6e41e8ed6674c356fc26589f4c5168642dec8df8d727d7127822
-DIST bash43-026 1575 BLAKE2B dcd77389fe1236854210fe67cc720e33babbb1c3c54c5d994ed3a4a6073cfa4b8a8b210d9ffd1a38f16900b81cd6907bd6e2df029adac8e9b1bdc98ba0869002 SHA512 d55620c86ab4835eaf53c18033a939e00ebbef7045d1429bd6fb212be6da167c368b4c03aec6c00ba60a1363b9cf8a4828e85c8108c5476b4a342e6c57f03897
-DIST bash43-027 6889 BLAKE2B 64f0f71a15f3469f75cad1be4f09860b18847172c6c56d12b7163804f0b0790dd70a82c0d4359e8d1c6c6b6c9769c1128522f049e71992827f9c76329ae9afe7 SHA512 6941156db9a6ab35b2d6ddc63eec064e03da779e29f47e33b467711e3405c9adb58ad33be3ad3c77aea1e84a314d5404c8e1a8475408991f5f719b93c5a276b3
-DIST bash43-028 69606 BLAKE2B 467d6077ff4f377cb0f996b0eb96dbcb4a81a476fa460e0507eeddf33ded5b4d167316eed49305cf304b60f3628f4745dadc93b4692fb5f79b60ac3d7b4203a2 SHA512 4317380539e3a93167f195eddd0acf0c75a5d86d5ef243cb7f7dca43e745badc3ebbc081b099678ac17dc03d9a3ed4a3ff3c6636bb1887e73e94b8ff9ced7c88
-DIST bash43-029 1824 BLAKE2B 44d601556420815c3c128c46b6a50f1f82e24edee0f99654af2ba9f343576fd60fdfd985baaa5d83c00ff225aea33e8c13b4d4c679eafefd6e0c9d0c2fc88fe9 SHA512 e25783c7557c1cda8344ba779d59f83e26b90b0aca393b5f7ee389e0583ccf81eba394589e992b33eb6c969083a8a4ff7fc8ce52059cab3b71289d085d381f07
-DIST bash43-030 63206 BLAKE2B c551721c4f6e245dd59b61ed5185767baf5d6840123c4a0b0c4d676c540247952b0a7ad764672be7d778954f8403013e5deb19abf044933ed0efac3fbe5a7d25 SHA512 ae41a9a5326ceb8e7105e359be097e14876160f6357bfa7c5cd3c4a495a629be762c3db671754c2cffc6abb34998aad91dde4a449ba16a0c6da844bac53feca4
-DIST bash43-031 3689 BLAKE2B 8598e2e35e5c4dc6e358267a84b4720396d55fa2bd723d2192f0a172e3d1ec087bbc8e4b48321d26655d4f84b7fc425b1d9ae352dc4b0faf4fdd02513ecd582b SHA512 3178b4ab48860ed284bb64ac9b36b6d4d1681c0d4bc37ceeb93e73c9dd140bd0a71e86a86ae595aab43babedae79d75a4b11c57e6ad6800f43ab5f7647f6c4c9
-DIST bash43-032 1734 BLAKE2B 4f6d37a0758d2cbd84e3a4a5bc380abac226ca70c2567dae07f4fc297e49c14664a1c11b4a482acce695831ebd642e2bd3463047b251db9e5c138ab5c359cc1c SHA512 47afc6308bd4bed20661a87761330854508a745a1c2a7f2d661fbe0d95b00d2d5707cc04f510fcd027b3fdb065d9414697715bff33c707a56955e27341d1bfd0
-DIST bash43-033 7038 BLAKE2B 53791ea4aaa3b65d0b0da0227de8e694e24d8f83050bccf51011dea5334cf1028752444df8224ed0cdcb4341035a76063e752c433a8fadda6259eb329c3b1334 SHA512 3eed328960d77317e1742a9b53ccf40b304657cd535d7f283bdc24219c65ebdcb7aca3019fc8fd9e7152f42dc411625acb1b529f80e4a6c5b750b8f7cbd2e4d0
-DIST bash43-034 2392 BLAKE2B f6779ef5a6df8ec18313a8e95ced08cd07a37b328145e38806ccfba5176676a0dd3260a4065b1fe72285faa1bf65aefe993f03b7a57a1801c950fa3a8ebdcb29 SHA512 95d09b843287dc18845b75ac6657a2bd7bd71c31a62f922e7177368678ddf13c0f20498bc17bdf4cd5c1c34d40838174791d1e464ceca168957c68e789e34d06
-DIST bash43-035 1800 BLAKE2B d99d907ffaf97916a6b68061b0a5fbebc4bd53361a3b7f3b32d0da21228eca43894692779ce7e54712ca02dac5088cb930d38a9d459e8130206c2cb84c7587f2 SHA512 1ea68e7ffb15356fdcf5eed08dd7fe0e16aea2928a4510fcfafe79e926d7ac25f013641bf547bfff0401bbb7e1476a802208e4f1ccb8b02ed20c094f99e450d2
-DIST bash43-036 1539 BLAKE2B b28fe78f05ed2742ec060df16a8fe28b6dfccd48f9c060f7b2a136475fe47424a3ff7f9d3a8e595a119564792bcac7e474257184a920fabea8ed440c5e0da41f SHA512 089a05879b8b65c9f11c55127364a3281b651e71cbedfad6221e31dc88eca15d813986f999a22921726873db9590b7b50afcd6162027fe516c2a94e8734e3ee7
-DIST bash43-037 1284 BLAKE2B aa7f11383b94da283484dd92d1caf5de9cbbcf36023624cd9498c81c12d8bfa8957163749f2dfb13b02189f6fbc53ed2643f47294d170ce548855b92876c8079 SHA512 7977c0fb9142cdea259b06322092aab3231b9773cc397519bedb6f731aea02a46441c67615b31fd19c886678eb1985687d07357d15fc7f08e946404efc564966
-DIST bash43-038 2354 BLAKE2B 991da235fecd4e9a0d28baff0af76de721eb521d5351944341a78b34e40690757100033b571f80217656938fb63e8dbb5861f829e78c01af5725ff6360e2635a SHA512 2ef2557b17867b5820a9e5619daa1cddb3fadcff7470504c148828a3007217767da4bf540dc835cf263f9c943b2c1aa909c845f8410f69e2d04c8b3d659efee3
-DIST bash43-039 1531 BLAKE2B 6d2c4630f18f7d6d90051720caca30573c5f068cc390e7e0a486530d0e2495dbfd764a9ae19c088679b8a51a21ed69684c9f0b30e922042f42ed0a6caf98e0d7 SHA512 f9745a05bfbbe39f8e5af3865de3a32391d7ff291289977e23340c79a3783b4fad15bdcf8ce62478916b43fe18501c4d7c65cd54d3c20e8bb889919df48a9a19
-DIST bash43-040 1532 BLAKE2B a41175fd9d44d622905c0344b2a255a8c268d73fe029eaffa0dc5127f471c42b683e23ec27cbacbe033717bfc369422822d3a6ba1b4dba032d5fb42692782b64 SHA512 25a0696f1f0e78cb971afa404e0b7fe634b70d49d6a5a9d6ff5506c42063968e8ede83ad80bd0b79601363676fe3abfedc3b76984f6f9ad2e7798790682e21d0
-DIST bash43-041 2362 BLAKE2B 4bef094a1da2fb2ed7d47a3a99179ab1639ad3eab292a9758ce572ae8e88268e7de49efe1f8705cd3510ad4321f8bd1da432261a68aca773e66f49dd5eaa0378 SHA512 d75cdd6a1fb8aeb1a4e88f046cfea3ec493b994b96f60f27d5577b59408422bb7c51cc4525cadab821fd8c57f44fb07f811b087d077359242caff3b54cfc6819
-DIST bash43-042 1535 BLAKE2B 627751b309954235c25c20b5535b9e2bad531445849cda46176311118b4121c4bc7e02d8325b2a711e1db2b1a172d7a3a0241189dcee7892537d659e6074a238 SHA512 01a6601029c0a55c9bf1a4ace3f387f9d094a9b9ee3511e2113c000123d85b1d5813c369e62d5a6dd329f515ef0d67d11394a6c0e4516956387556c13d13009a
-DIST bash43-043 1942 BLAKE2B 6a41f518ba89c538b22caa9fc030ee8c662addd003de991088ced9767ab7962caa7e90a69b390392ad37a860598e6a33170795280c442a4a9c1c391050aadab1 SHA512 eb05e537fac08587d0755ad59218bb5a51685aefc1476d6e3feaf72acd1e08cbda512988d8c157425e7939863b313d1e36f51b32f8a8497655c6b0710a24b738
-DIST bash43-044 1658 BLAKE2B 91579fe95617923aaa62a1d2c62b1d772dd1a3f725795b434e321ae44ccceb2f5802494175fb61c36b04890efd466687b8cf66abdee7cfd942def08521900909 SHA512 2937ef80c99e93094e4aaa6a93d077efc3e433a4712c17e30590a0abeb5488293365cb8aa19e37d25b7d5c38d3ad26cdea12b904e5ffb2cdb16f18ab12f422fd
-DIST bash43-045 1312 BLAKE2B a34b02287066e74a5afefc3ce6868a3deca0eaa475e578f683a1a22885912c0967cc1ca546f6e72ec213b4a9b78159b3007a767787be18361a94035eb0e19ca0 SHA512 7b79dacff44e5358da736334d2277a2879ca1389e22e9dac50e139f30dab623bc89a56930d89e74efc468a00d051f6747ccaffcd1a30d7c737d49780b9830e3d
-DIST bash43-046 1494 BLAKE2B ee4b87d81ac97ed53728051f154da7d4ac575c589a1194d16fe90614cc90c1e2d136d5b91978dd6c1c8357a28d5213ab14510dc8175dca1968543c309c76bddb SHA512 c036b659fa681f8129110356bec33fad00fb8e469f3b4bcefd0b7ddf5e20030977716adf5c65f58f3ff68cd7af0bdd42392ee077100bc7f45ee123749d082f7d
-DIST bash43-047 4437 BLAKE2B 449204b8b9e0937cb65ef286db2fa5cad9999dd822fd55369cfc469e6e6c086a97aea7b50625e756d349341a53907d69d8a631371846c0e373efcdbb6d3cb0e0 SHA512 9332d680ac226491cf8e5986a3261eb76b53ef4b0b2a43405564b088afc0e8658077812c9177bdab7900e05394e69f3047d82ddb59553fc01ef721acfa9d5553
-DIST bash43-048 1612 BLAKE2B 6014935977b2ae1628dc6e9221786a2fb923590ff17b9660d1c238da251f9a0152bd4ceec0c66ea42e34dd592653c244a8df2beb02f20dc7d214b64681541ad2 SHA512 7c3963bfbc730b4592668460e86c166e727e9897c1a9235a6860a01bc90d365ef0707f0fac7ed62780dcc84e80dbe8484ec59e9e948def22f44ae03e8a169780
-DIST bash44-001 1896 BLAKE2B 1ff23656f2904385f34aa94c48bec2a8cd145223c74c4138bb857a6ef79ec6e5985521661170c46c5bd603ea4fb7c1d8058770b4da0165366aab7b2bbaf4709b SHA512 fa7a1b277eb3bad6ae7d2c7a2887cbf2c0eb75b7fee8ed03ec1e9d45879a2fb4b8c7cb16d6b029987493b01a461214bd9a24454a6837e7cfe180b1bc56f61caa
-DIST bash44-002 1946 BLAKE2B 2b7798375a629ba957c139ded809e53a43ab03258557669304441c04433693069d1fc1af03fe5516140097e5c71c07870bf8cda2309a8fd7ade4b169a8256739 SHA512 526f986057810f89080e283ff95b3a8fd24d37e4ad2f18c39f36d3a2d57956a6441d16220082157735e3c5ccf770d5016e761aa5f309129898e39277d576e6b5
-DIST bash44-003 1593 BLAKE2B f47eeb4d32108d6e889436ad72920c1749e13fb17439dffb8df72f334f570fcccc7956bd616ef1beec5c07c1479d9113047f8aaa21c19af3e4db21f00783dcbd SHA512 e61db89bdd1a7ae15013fe258046a343c9ea41e5a1c6d2c810947500a617fce7536b8d51194e14bb42499fe0de6d70cc9b2c81da0afdcb5a2278459f4f76d748
-DIST bash44-004 2350 BLAKE2B 245c88f4f7f7e0a4a571956c1a6363b8ba86b883897bd8c92297605811e418748709f9ffaa148173c9669b4dc8b71482fce9eb3b177920fd8d34b260465c72fd SHA512 7570cf15518f79230cfe91b3e58c795c16c7fb6ba6418d967355b36fb7982e7919a9eaaef9177fb605c7fb7d7efb8a8335e725c1bacffff69a098433f5adc9c7
-DIST bash44-005 1439 BLAKE2B 4d563b1a0b2d858a904b98fb52b38c8c806942b6c879b3a02480774b0806468f51a91ef0a26a4a9c5bc8f2a3242cd206afe786d0754449cb11adeed4ae97a90d SHA512 7546a6c90c8e8508567dde713722291477ca87c1116905b46432514a4fc632840a855b84f102591914cd4c44d5bf2eb7400866e26366fc94525fb401ea844a8f
-DIST bash44-006 1805 BLAKE2B aa187e52bc12dc5c34e52d6b487a0f260e3c54970ebb022c54293f409903baeb239417d671d85b16d30b327c6353ffa666dc7adb5c872ec500266339d8a9de0e SHA512 5edcd76cf97bfe289f71924ba279ff48a1167eb3cc36f811cbcc23732746f5c821d1d39d4b137b7d99d57809a4b7270a54f4a41176fcfde0708bf92ddc68b77f
-DIST bash44-007 4640 BLAKE2B 3b803e553ac117129db686818835ce6deb7574b38171f4c9262448e01e097933645311de003593ef3949a7ba5925172577a758b2edd281c4446f3bca62beadb8 SHA512 386c019debee414697abc648d9a77894e842bb0b7a2a71709e8b3398582f25065e68963405fa22fb77439c6b431ee94a2ecbb16734c2436af3dfb4d1b5f06fcf
-DIST bash44-008 2223 BLAKE2B 09c01c2821404ca8a89d9644cd7d55d2994ba4cdc15b928c1156e2a91c083b528340c27909bdd312a78f677cc94ded5888ec4eaff0d0070d575fbdde3bb326a0 SHA512 d9a8924f1c9263deab89153bb688a87f211913ebd72c8077e607db6fdddc7e5af05042dd22a9a2df593e518ea74b54ca79d20afc796e47d871827a2556e233d0
-DIST bash44-009 3117 BLAKE2B 1921a30e1f7c6d37cac048772f89322e2cfe6e77f3ec48d4a6bb3d7e82452b7471bef2e1fa31094a62d9a29589a8438dc875211dbab8ba204939e16810eca13b SHA512 3b01c080cf4a54658679b36c282a69a9ac48b900b19ceb42dbaf084abd395d50e5ff14db90a7fdf0c9856dad150897dca561160686c931634765782447fc076e
-DIST bash44-010 1670 BLAKE2B 6e0cab685ae2393a9ae7eeb91767f8ce3086e3921f2d69614e729e9bc26603b363a69083c57a43aa53669491deba663bd8c9de91571833312cc23efb05c43222 SHA512 54ff556b62fd88381e7a495db50957b016474973b3a566661c65b649a40960f2d3355221b3a71fb292128aad92a45d73d9816d63833bc416b4d15acdef391b98
-DIST bash44-011 1603 BLAKE2B 6bd978408140620c2d63277757c15bfe55d6b0ff5706b7b884b234308efb6cfa771888306840ce5cfd4ece5912924dbb6a321d823fa106c99ba573f47dbbb9ae SHA512 6b5b068b74978fc691749ccff5e094c768047f702430e97114f5bf342f078696f7d7616d0642d4061b062e9112dfe00a1c2309c65de4147e0e98fb52c593d844
-DIST bash44-012 5768 BLAKE2B 63c6f5ff2cf52a35e1bd7f0028d7cce5c2c87e65ca600d8d85bf9b197ac8dee16bed5dc1dba6b354ef560309022cfd427a08180b76effe4107b9dda2ed99b20e SHA512 4661c4c132f2ea7c9a70368301041c482d5820d8389334a7e3ae44c36fc16c171b20db2f194b7663c84d6c3dcef81aa90f050a48e205218fc7bd3395d09c6a51
-DIST bash44-013 1255 BLAKE2B f19be55c986bc60c395d24044c7edc67cd180d86047af59d173c1507de32534b2eed546f16164d799283d66c0d0460ff4771da6bc327bc87ebc4f01cb284f9eb SHA512 eac0a9abf59b65a59a0028d2f3c0a7dc8a0b3c04e2d2db642b69aa7c13a2dfa190f3c63f7d8a7c9400f01701e9ef84212ce668c4c44d0ccfd02cd1f8e723d831
-DIST bash44-014 2834 BLAKE2B 3a211d9916e16a996d709034523dc0f3775520736f481bdff8c737e1969da1719602bf0379befc685822e4931586482a30bbec69be4233da4f912c5b6333886e SHA512 11e16896aa66a1eafb12cdcea00515132789690e914c8894caefd8c80ed98c8e732428348ddbfb53495164ce4044596f5cdbc03e146dce364fc497f362a1859b
-DIST bash44-015 1233 BLAKE2B 5504d4a64f938ccfbb12f43455c11c6dc6a38397e5692da874a1b5de1865d19677c6f683073dbf9843869df67f96a87a6a60d2381338294d6750f2aba1580c55 SHA512 94d6fed30d4a376c29f8986d15f1b3fd65a04ee0f3d1844d010f3e51a2f9f875cd294a68fb6f0e1ffa481fb09f02055b21f2f298ebd9d88eb2f76d6c1f15de34
-DIST bash44-016 2069 BLAKE2B 5ac613c450d018edff4f82740655ed0e460e49b57ce1a817f0b7b0a101b9f1ab095c48904fc17789203d6bdcc1beb01dde23b4a097f36441eda5e11ab638e9bd SHA512 5acc704df3fe63b5b8055ba7bc14ae70cc23d15aefee8db6991e6c11cc8b0e10fcc67d516bc2d2fde84be26ed5c88dbf266fa164756218b60eccc2bfb4eed7d9
-DIST bash44-017 1143 BLAKE2B 64da515637109cd87b95e5f55857f25c2758b4a5c2620cd21250287e00767d5ca7a14fe331603cdef1ba02f622d97ee120bc0bfba463bccb113f16ebee56159f SHA512 c1d50aee953427ba0b95e48c10d2324e7413f3354ff65b9c3c1dfd14eedec55e619fcd12353e7b99b6e280f510e04d1c971b309c1a4efb97d48ddb30d69f14ac
-DIST bash44-018 1319 BLAKE2B abfd87f2cb5e9aeb0352bb0efbfd3ad95cbb26445e09edaa762cf1ea1fa01a00ab57c96d912ae5eaf653b66169bc54bba39fdf1d62ad45301c6599d21979ff14 SHA512 008ff44dbf916414d691c29cee29e7f636bbe79170463d76ef16ca63ecdc24a84ff4476078c28fb8788d9b1fb0572612a7e8cb30fceb55ad650f293db8361ad1
-DIST bash44-019 1671 BLAKE2B 3d917b1c2618b92d7a79d64a8282cda84098d7d83b8ab3e62c49ab259d6976ef953ab1bde98b9d2cd925cfbdff94b5fd5910876e8de85d40466cf5f3ceb377c4 SHA512 59984e221a7a6dbf72bf893b1b7c4a63fea34d6af1208a19f0e9e6cd59a09e4cf51890cb2d31c1502e2a2f644f584417bb59cf02c308d3250d2a98d41b63e893
-DIST bash44-020 5156 BLAKE2B 6f2bba1fe03eb49401af3925420ff5c090d0e7d83010c34e086f5da48fc2078ef649d775b45e3368e73fc1ebdd6f1860b33bf7021898cae158d478aa1dd18bca SHA512 e200fddd717fa33d2c56eb6713031d34891e5ebcd489a65a43ccfebf9728c1609b758ca3dffb1eed4abd3c62c6d7163ce88d8a1bb73b6d07bee99e0409365978
-DIST bash44-021 1810 BLAKE2B ce3f98e31aaa7db402cf2a2e571a72b9b91fad4571b35a5e8f59678485a631acf3885a19ee09ebdc6f79b39dbdafe72cc2cd91bf3c3b31ad7d3a65b5bc4bd9b3 SHA512 43a82d06a17bc30c2579a0944cb68f60bd9e3cddb9fff4a760fbf1f2f5104a99bb69c400cf63231b242c03a4684701455e603d96c9b588f2c69da02570042fec
-DIST bash44-022 1818 BLAKE2B 66c6e5fd33f0649ff886d1fd944cb10a06de06f0724c0cb7343c3afd50034821f1a4eeccbe9bc5c6815ce9bcdfacf5e6a83098fbd3712efc15e870928b3aa80e SHA512 385a0d1bbdff0dffec2a08021a84a5ac3695e44e1a90b0080b82737fc4a9ea924ee59b47fd5e288b69a540f4c976bf9da0db08ee2d20e170c868f802f75785fb
-DIST bash44-023 1557 BLAKE2B 95a21ade7e4be68d66f3862f26b574c5897055822471c8d2801b8e1f866d1d11ddd4000e967b567c3ef7949af8a88ca918ea066d52a67fc5fd4b266135f0dbbb SHA512 442efa78d365a728555ade77cc2f8501aed09f37ae10e1ac647d35299829b63caefbc5c30436d622bfef9300e9d929d7f4fafe85a59df15089881bc987fa12fd
diff --git a/app-shells/bash/bash-4.3_p48-r1.ebuild b/app-shells/bash/bash-4.3_p48-r1.ebuild
deleted file mode 100644
index 6d5d03b742..0000000000
--- a/app-shells/bash/bash-4.3_p48-r1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="6.3"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0=
- readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
- !<sys-apps/portage-2.1.6.7_p1
- !<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
- "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
- "${FILESDIR}"/${PN}-4.3-protos.patch
- "${FILESDIR}"/${PN}-4.4-popd-offset-overflow.patch #600174
- "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
- "${FILESDIR}"/${PN}-4.3_p39-cygwin-r2.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if is-flag -malign-double ; then #7332
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
- if use bashlogger ; then
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
- ewarn "This will log ALL output you enter into the shell, you have been warned."
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
- # Clean out local libs so we know we use system ones w/releases.
- if [[ ${PV} != *_rc* ]] ; then
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
- fi
-
- # Prefixify hardcoded path names. No-op for non-prefix.
- hprefixify pathnames.h.in
-
- # Avoid regenerating docs after patches #407985
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/*
-
- epatch "${PATCHES[@]}"
-
- # Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
- # sh while bootstrapping for the first time, This works around bug 309825
- sed -i -e '1s:sh:bash:' support/bashbug.sh || die
-
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- -DUSE_MKTEMP -DUSE_MKSTEMP \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
- [[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
-
- if [[ ${CHOST} == *-aix* ]] || [[ ${CHOST} == *-hpux* ]] ; then
- # Avoid finding tgetent() in anything else but ncurses library,
- # as <termcap.h> is provided by ncurses, even during bootstrap
- # on AIX and HP-UX, and we would get undefined symbols like
- # BC, PC, UP if linking against something else.
- # The bash-bug is that it doesn't check for <termcap.h> provider,
- # and unfortunately {,n}curses is checked last.
- # Even if ncurses provides libcurses.so->libncurses.so symlink,
- # it feels more clean to link against libncurses.so directly.
- # (all configure-variables for tgetent() are shown here)
- export ac_cv_func_tgetent=no
- export ac_cv_lib_termcap_tgetent=no # found on HP-UX
- export ac_cv_lib_tinfo_tgetent=no
- export ac_cv_lib_curses_tgetent=no # found on AIX
- #export ac_cv_lib_ncurses_tgetent=no
-
- # Without /dev/fd/*, bash uses named pipes instead, but the
- # pipe names are not unique enough for portage's multijob.
- append-cppflags -DUSE_MKTEMP
- fi
-
- # Don't even think about building this statically without
- # reading Bug 7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=${READLINE_VER}
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
-
- if [[ ${PV} != *_rc* ]] ; then
- # Use system readline only with released versions.
- myconf+=( --with-installed-readline=. )
- fi
-
- if use plugins; then
- case ${CHOST} in
- *-linux-gnu | *-solaris* | *-freebsd* )
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
- ;;
- # Darwin doesn't need an rpath here (in fact doesn't grok the argument)
- esac
- else
- # Disable the plugins logic by hand since bash doesn't
- # provide a way of doing it.
- export ac_cv_func_dl{close,open,sym}=no \
- ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
- sed -i \
- -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
- configure || die
- fi
- tc-export AR #444070
- econf \
- --docdir='$(datarootdir)'/doc/${PF} \
- --htmldir='$(docdir)/html' \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use plugins ; then
- emake -C examples/loadables all others
- fi
-}
-
-src_install() {
- local d f
-
- default
-
- dodir /bin
- mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
- dosym bash /bin/rbash
-
- insinto /etc/bash
- doins "${FILESDIR}"/bash_logout
- doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
- keepdir /etc/bash/bashrc.d
- insinto /etc/skel
- for f in bash{_logout,_profile,rc} ; do
- newins "${FILESDIR}"/dot-${f} .${f}
- done
-
- local sed_args=(
- -e "s:#${USERLAND}#@::"
- -e '/#@/d'
- )
- if ! use readline ; then
- sed_args+=( #432338
- -e '/^shopt -s histappend/s:^:#:'
- -e 's:use_color=true:use_color=false:'
- )
- fi
- sed -i \
- "${sed_args[@]}" \
- "${ED}"/etc/skel/.bashrc \
- "${ED}"/etc/bash/bashrc || die
-
- if use plugins ; then
- exeinto /usr/$(get_libdir)/bash
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
- insinto /usr/include/bash-plugins
- doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
- fi
-
- if use examples ; then
- for d in examples/{functions,misc,scripts,startup-files} ; do
- exeinto /usr/share/doc/${PF}/${d}
- insinto /usr/share/doc/${PF}/${d}
- for f in ${d}/* ; do
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
- doexe ${f}
- else
- doins ${f}
- fi
- done
- done
- fi
-
- doman doc/*.1
- newdoc CWRU/changelog ChangeLog
- dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
- mkdir -p "${EROOT}"/etc/bash
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
- fi
-
- if [[ -L ${EROOT}/bin/sh ]] ; then
- # rewrite the symlink to ensure that its mtime changes. having /bin/sh
- # missing even temporarily causes a fatal error with paludis.
- local target=$(readlink "${EROOT}"/bin/sh)
- local tmp=$(emktemp "${EROOT}"/bin)
- ln -sf "${target}" "${tmp}"
- mv -f "${tmp}" "${EROOT}"/bin/sh
- fi
-}
-
-pkg_postinst() {
- # If /bin/sh does not exist, provide it
- if [[ ! -e ${EROOT}/bin/sh ]] ; then
- ln -sf bash "${EROOT}"/bin/sh
- fi
-}
diff --git a/app-shells/bash/bash-4.3_p48.ebuild b/app-shells/bash/bash-4.3_p48.ebuild
deleted file mode 100644
index 2e1a2b9aba..0000000000
--- a/app-shells/bash/bash-4.3_p48.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="6.3"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0=
- readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
- !<sys-apps/portage-2.1.6.7_p1
- !<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
- "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
- "${FILESDIR}"/${PN}-4.3-protos.patch
- "${FILESDIR}"/${PN}-4.0-bashintl-in-siglist.patch
- "${FILESDIR}"/${PN}-4.3_p39-cygwin-r2.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if is-flag -malign-double ; then #7332
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
- if use bashlogger ; then
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
- ewarn "This will log ALL output you enter into the shell, you have been warned."
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
- # Clean out local libs so we know we use system ones w/releases.
- if [[ ${PV} != *_rc* ]] ; then
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
- fi
-
- # Prefixify hardcoded path names. No-op for non-prefix.
- hprefixify pathnames.h.in
-
- # Avoid regenerating docs after patches #407985
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/*
-
- epatch "${PATCHES[@]}"
-
- # Nasty trick to set bashbug's shebang to bash instead of sh. We don't have
- # sh while bootstrapping for the first time, This works around bug 309825
- sed -i -e '1s:sh:bash:' support/bashbug.sh || die
-
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- -DUSE_MKTEMP -DUSE_MKSTEMP \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
- [[ ${CHOST} == mips-sgi-irix* ]] && replace-flags -O? -O1
-
- if [[ ${CHOST} == *-aix* ]] || [[ ${CHOST} == *-hpux* ]] ; then
- # Avoid finding tgetent() in anything else but ncurses library,
- # as <termcap.h> is provided by ncurses, even during bootstrap
- # on AIX and HP-UX, and we would get undefined symbols like
- # BC, PC, UP if linking against something else.
- # The bash-bug is that it doesn't check for <termcap.h> provider,
- # and unfortunately {,n}curses is checked last.
- # Even if ncurses provides libcurses.so->libncurses.so symlink,
- # it feels more clean to link against libncurses.so directly.
- # (all configure-variables for tgetent() are shown here)
- export ac_cv_func_tgetent=no
- export ac_cv_lib_termcap_tgetent=no # found on HP-UX
- export ac_cv_lib_tinfo_tgetent=no
- export ac_cv_lib_curses_tgetent=no # found on AIX
- #export ac_cv_lib_ncurses_tgetent=no
-
- # Without /dev/fd/*, bash uses named pipes instead, but the
- # pipe names are not unique enough for portage's multijob.
- append-cppflags -DUSE_MKTEMP
- fi
-
- # Don't even think about building this statically without
- # reading Bug 7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=${READLINE_VER}
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
-
- if [[ ${PV} != *_rc* ]] ; then
- # Use system readline only with released versions.
- myconf+=( --with-installed-readline=. )
- fi
-
- if use plugins; then
- case ${CHOST} in
- *-linux-gnu | *-solaris* | *-freebsd* )
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
- ;;
- # Darwin doesn't need an rpath here (in fact doesn't grok the argument)
- esac
- else
- # Disable the plugins logic by hand since bash doesn't
- # provide a way of doing it.
- export ac_cv_func_dl{close,open,sym}=no \
- ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
- sed -i \
- -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
- configure || die
- fi
- tc-export AR #444070
- econf \
- --docdir='$(datarootdir)'/doc/${PF} \
- --htmldir='$(docdir)/html' \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use plugins ; then
- emake -C examples/loadables all others
- fi
-}
-
-src_install() {
- local d f
-
- default
-
- dodir /bin
- mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
- dosym bash /bin/rbash
-
- insinto /etc/bash
- doins "${FILESDIR}"/bash_logout
- doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
- keepdir /etc/bash/bashrc.d
- insinto /etc/skel
- for f in bash{_logout,_profile,rc} ; do
- newins "${FILESDIR}"/dot-${f} .${f}
- done
-
- local sed_args=(
- -e "s:#${USERLAND}#@::"
- -e '/#@/d'
- )
- if ! use readline ; then
- sed_args+=( #432338
- -e '/^shopt -s histappend/s:^:#:'
- -e 's:use_color=true:use_color=false:'
- )
- fi
- sed -i \
- "${sed_args[@]}" \
- "${ED}"/etc/skel/.bashrc \
- "${ED}"/etc/bash/bashrc || die
-
- if use plugins ; then
- exeinto /usr/$(get_libdir)/bash
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
- insinto /usr/include/bash-plugins
- doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
- fi
-
- if use examples ; then
- for d in examples/{functions,misc,scripts,startup-files} ; do
- exeinto /usr/share/doc/${PF}/${d}
- insinto /usr/share/doc/${PF}/${d}
- for f in ${d}/* ; do
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
- doexe ${f}
- else
- doins ${f}
- fi
- done
- done
- fi
-
- doman doc/*.1
- newdoc CWRU/changelog ChangeLog
- dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
- mkdir -p "${EROOT}"/etc/bash
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
- fi
-
- if [[ -L ${EROOT}/bin/sh ]] ; then
- # rewrite the symlink to ensure that its mtime changes. having /bin/sh
- # missing even temporarily causes a fatal error with paludis.
- local target=$(readlink "${EROOT}"/bin/sh)
- local tmp=$(emktemp "${EROOT}"/bin)
- ln -sf "${target}" "${tmp}"
- mv -f "${tmp}" "${EROOT}"/bin/sh
- fi
-}
-
-pkg_postinst() {
- # If /bin/sh does not exist, provide it
- if [[ ! -e ${EROOT}/bin/sh ]] ; then
- ln -sf bash "${EROOT}"/bin/sh
- fi
-}
diff --git a/app-shells/bash/bash-4.4_p23.ebuild b/app-shells/bash/bash-4.4_p23.ebuild
deleted file mode 100644
index 437e8154ca..0000000000
--- a/app-shells/bash/bash-4.4_p23.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-is_release() {
- case ${PV} in
- *_alpha*|*_beta*|*_rc*) return 1 ;;
- *) return 0 ;;
- esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="7.0"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-if is_release ; then
- SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-else
- SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
- >=sys-libs/ncurses-5.2-r2:0=
- readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
- nls? ( virtual/libintl )
-"
-RDEPEND="
- ${DEPEND}
- !<sys-apps/portage-2.1.6.7_p1
-"
-# we only need yacc when the .y files get patched (bash42-005)
-#DEPEND+=" virtual/yacc"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if is-flag -malign-double ; then #7332
- eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
- eerror "as it breaks LFS (struct stat64) on x86."
- die "remove -malign-double from your CFLAGS mr ricer"
- fi
- if use bashlogger ; then
- ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
- ewarn "This will log ALL output you enter into the shell, you have been warned."
- fi
-}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- # Include official patches
- [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-
- eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720
-
- # Clean out local libs so we know we use system ones w/releases.
- if is_release ; then
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
- sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
- fi
-
- # Prefixify hardcoded path names. No-op for non-prefix.
- hprefixify pathnames.h.in
-
- # Avoid regenerating docs after patches #407985
- sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/*
-
- eapply_user
-}
-
-src_configure() {
- local myconf=(
- --disable-profiling
- --docdir='$(datarootdir)'/doc/${PF}
- --htmldir='$(docdir)/html'
- --with-curses
- $(use_enable mem-scramble)
- $(use_enable net net-redirections)
- $(use_enable readline)
- $(use_enable readline bang-history)
- $(use_enable readline history)
- $(use_with afs)
- $(use_with mem-scramble bash-malloc)
- )
-
- # For descriptions of these, see config-top.h
- # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
- append-cppflags \
- -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
- -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
- -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
- -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
- -DNON_INTERACTIVE_LOGIN_SHELLS \
- -DSSH_SOURCE_BASHRC \
- $(use bashlogger && echo -DSYSLOG_HISTORY)
-
- # Don't even think about building this statically without
- # reading Bug 7714 first. If you still build it statically,
- # don't come crying to us with bugs ;).
- #use static && export LDFLAGS="${LDFLAGS} -static"
- use nls || myconf+=( --disable-nls )
-
- # Historically, we always used the builtin readline, but since
- # our handling of SONAME upgrades has gotten much more stable
- # in the PM (and the readline ebuild itself preserves the old
- # libs during upgrades), linking against the system copy should
- # be safe.
- # Exact cached version here doesn't really matter as long as it
- # is at least what's in the DEPEND up above.
- export ac_cv_rl_version=${READLINE_VER%%_*}
-
- # Force linking with system curses ... the bundled termcap lib
- # sucks bad compared to ncurses. For the most part, ncurses
- # is here because readline needs it. But bash itself calls
- # ncurses in one or two small places :(.
-
- if is_release ; then
- # Use system readline only with released versions.
- myconf+=( --with-installed-readline=. )
- fi
-
- if use plugins; then
- append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
- else
- # Disable the plugins logic by hand since bash doesn't
- # provide a way of doing it.
- export ac_cv_func_dl{close,open,sym}=no \
- ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
- sed -i \
- -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
- configure || die
- fi
- tc-export AR #444070
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use plugins ; then
- emake -C examples/loadables all others
- fi
-}
-
-src_install() {
- local d f
-
- default
-
- dodir /bin
- mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
- dosym bash /bin/rbash
-
- insinto /etc/bash
- doins "${FILESDIR}"/bash_logout
- doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
- keepdir /etc/bash/bashrc.d
- insinto /etc/skel
- for f in bash{_logout,_profile,rc} ; do
- newins "${FILESDIR}"/dot-${f} .${f}
- done
-
- local sed_args=(
- -e "s:#${USERLAND}#@::"
- -e '/#@/d'
- )
- if ! use readline ; then
- sed_args+=( #432338
- -e '/^shopt -s histappend/s:^:#:'
- -e 's:use_color=true:use_color=false:'
- )
- fi
- sed -i \
- "${sed_args[@]}" \
- "${ED%/}"/etc/skel/.bashrc \
- "${ED%/}"/etc/bash/bashrc || die
-
- if use plugins ; then
- exeinto /usr/$(get_libdir)/bash
- doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
- insinto /usr/include/bash-plugins
- doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
- fi
-
- if use examples ; then
- for d in examples/{functions,misc,scripts,startup-files} ; do
- exeinto /usr/share/doc/${PF}/${d}
- insinto /usr/share/doc/${PF}/${d}
- for f in ${d}/* ; do
- if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
- doexe ${f}
- else
- doins ${f}
- fi
- done
- done
- fi
-
- doman doc/*.1
- newdoc CWRU/changelog ChangeLog
- dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
- if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
- mkdir -p "${EROOT}"/etc/bash
- mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
- fi
-
- if [[ -L ${EROOT}/bin/sh ]] ; then
- # rewrite the symlink to ensure that its mtime changes. having /bin/sh
- # missing even temporarily causes a fatal error with paludis.
- local target=$(readlink "${EROOT}"/bin/sh)
- local tmp=$(emktemp "${EROOT}"/bin)
- ln -sf "${target}" "${tmp}"
- mv -f "${tmp}" "${EROOT}"/bin/sh
- fi
-}
-
-pkg_postinst() {
- # If /bin/sh does not exist, provide it
- if [[ ! -e ${EROOT}/bin/sh ]] ; then
- ln -sf bash "${EROOT}"/bin/sh
- fi
-}
diff --git a/app-shells/bash/files/autoconf-mktime-2.59.patch b/app-shells/bash/files/autoconf-mktime-2.59.patch
deleted file mode 100644
index 3ac3ad1da8..0000000000
--- a/app-shells/bash/files/autoconf-mktime-2.59.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-http://bugs.gentoo.org/220040
---- configure
-+++ configure
-@@ -5299,26 +6059,25 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- /* Test program from Paul Eggert and Tony Leneis. */
--#if TIME_WITH_SYS_TIME
-+#ifdef TIME_WITH_SYS_TIME
- # include <sys/time.h>
- # include <time.h>
- #else
--# if HAVE_SYS_TIME_H
-+# ifdef HAVE_SYS_TIME_H
- # include <sys/time.h>
- # else
- # include <time.h>
- # endif
- #endif
-
--#if HAVE_STDLIB_H
--# include <stdlib.h>
--#endif
-+#include <limits.h>
-+#include <stdlib.h>
-
--#if HAVE_UNISTD_H
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
-
--#if !HAVE_ALARM
-+#ifndef HAVE_ALARM
- # define alarm(X) /* empty */
- #endif
-
-@@ -5335,9 +6094,9 @@
- };
- #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
-
--/* Fail if mktime fails to convert a date in the spring-forward gap.
-+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
- Based on a problem report from Andreas Jaeger. */
--static void
-+static int
- spring_forward_gap ()
- {
- /* glibc (up to about 1998-10-07) failed this test. */
-@@ -5356,29 +6115,27 @@
- tm.tm_min = 0;
- tm.tm_sec = 0;
- tm.tm_isdst = -1;
-- if (mktime (&tm) == (time_t)-1)
-- exit (1);
-+ return mktime (&tm) != (time_t) -1;
- }
-
--static void
-+static int
- mktime_test1 (now)
- time_t now;
- {
- struct tm *lt;
-- if ((lt = localtime (&now)) && mktime (lt) != now)
-- exit (1);
-+ return ! (lt = localtime (&now)) || mktime (lt) == now;
- }
-
--static void
-+static int
- mktime_test (now)
- time_t now;
- {
-- mktime_test1 (now);
-- mktime_test1 ((time_t) (time_t_max - now));
-- mktime_test1 ((time_t) (time_t_min + now));
-+ return (mktime_test1 (now)
-+ && mktime_test1 ((time_t) (time_t_max - now))
-+ && mktime_test1 ((time_t) (time_t_min + now)));
- }
-
--static void
-+static int
- irix_6_4_bug ()
- {
- /* Based on code from Ariel Faigon. */
-@@ -5391,11 +6148,10 @@
- tm.tm_sec = 0;
- tm.tm_isdst = -1;
- mktime (&tm);
-- if (tm.tm_mon != 2 || tm.tm_mday != 31)
-- exit (1);
-+ return tm.tm_mon == 2 && tm.tm_mday == 31;
- }
-
--static void
-+static int
- bigtime_test (j)
- int j;
- {
-@@ -5417,8 +6173,39 @@
- && lt->tm_wday == tm.tm_wday
- && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
- == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
-- exit (1);
-+ return 0;
- }
-+ return 1;
-+}
-+
-+static int
-+year_2050_test ()
-+{
-+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
-+ ignoring leap seconds. */
-+ unsigned long int answer = 2527315200UL;
-+
-+ struct tm tm;
-+ time_t t;
-+ tm.tm_year = 2050 - 1900;
-+ tm.tm_mon = 2 - 1;
-+ tm.tm_mday = 1;
-+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-+ tm.tm_isdst = -1;
-+
-+ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
-+ instead of "TZ=America/Vancouver" in order to detect the bug even
-+ on systems that don't support the Olson extension, or don't have the
-+ full zoneinfo tables installed. */
-+ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
-+
-+ t = mktime (&tm);
-+
-+ /* Check that the result is either a failure, or close enough
-+ to the correct answer that we can assume the discrepancy is
-+ due to leap seconds. */
-+ return (t == (time_t) -1
-+ || (0 < t && answer - 120 <= t && t <= answer + 120));
- }
-
- int
-@@ -5432,12 +6219,15 @@
- isn't worth using anyway. */
- alarm (60);
-
-- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
-- continue;
-- time_t_max--;
-- if ((time_t) -1 < 0)
-- for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
-- continue;
-+ for (;;)
-+ {
-+ t = (time_t_max << 1) + 1;
-+ if (t <= time_t_max)
-+ break;
-+ time_t_max = t;
-+ }
-+ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
-+
- delta = time_t_max / 997; /* a suitable prime number */
- for (i = 0; i < N_STRINGS; i++)
- {
-@@ -5445,18 +6235,22 @@
- putenv (tz_strings[i]);
-
- for (t = 0; t <= time_t_max - delta; t += delta)
-- mktime_test (t);
-- mktime_test ((time_t) 1);
-- mktime_test ((time_t) (60 * 60));
-- mktime_test ((time_t) (60 * 60 * 24));
--
-- for (j = 1; 0 < j; j *= 2)
-- bigtime_test (j);
-- bigtime_test (j - 1);
-+ if (! mktime_test (t))
-+ return 1;
-+ if (! (mktime_test ((time_t) 1)
-+ && mktime_test ((time_t) (60 * 60))
-+ && mktime_test ((time_t) (60 * 60 * 24))))
-+ return 1;
-+
-+ for (j = 1; ; j <<= 1)
-+ if (! bigtime_test (j))
-+ return 1;
-+ else if (INT_MAX / 2 < j)
-+ break;
-+ if (! bigtime_test (INT_MAX))
-+ return 1;
- }
-- irix_6_4_bug ();
-- spring_forward_gap ();
-- exit (0);
-+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
- }
- _ACEOF
- rm -f conftest$ac_exeext
diff --git a/app-shells/bash/files/bash-2.05b-parallel-build.patch b/app-shells/bash/files/bash-2.05b-parallel-build.patch
deleted file mode 100644
index 382ffd6dfd..0000000000
--- a/app-shells/bash/files/bash-2.05b-parallel-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix parallel make
-
-http://bugs.gentoo.org/41002
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -604,7 +604,7 @@
-
- config.h: stamp-h
-
--stamp-h: config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
-+stamp-h: version.h config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
- CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status
-
- config.status: $(srcdir)/configure
diff --git a/app-shells/bash/files/bash-3.0-configs-prefix.patch b/app-shells/bash/files/bash-3.0-configs-prefix.patch
deleted file mode 100644
index 394b00b83e..0000000000
--- a/app-shells/bash/files/bash-3.0-configs-prefix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- bash-3.0/config-top.h
-+++ bash-3.0/config-top.h
-@@ -52,14 +52,14 @@
- /* The default value of the PATH variable. */
- #ifndef DEFAULT_PATH_VALUE
- #define DEFAULT_PATH_VALUE \
-- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-+ "@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
- #endif
-
- /* The value for PATH when invoking `command -p'. This is only used when
- the Posix.2 confstr () function, or CS_PATH define are not present. */
- #ifndef STANDARD_UTILS_PATH
- #define STANDARD_UTILS_PATH \
-- "/bin:/usr/bin:/sbin:/usr/sbin"
-+ "@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:/bin:/usr/bin:/sbin:/usr/sbin"
- #endif
-
- /* Default primary and secondary prompt strings. */
-@@ -74,11 +74,11 @@
-
- /* System-wide .bashrc file for interactive shells. */
- /* #define SYS_BASHRC "/etc/bash.bashrc" */
--#define SYS_BASHRC "/etc/bash/bashrc" /* #26952 */
-+#define SYS_BASHRC "@GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc" /* #26952 */
-
- /* System-wide .bash_logout for login shells. */
- /* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
--#define SYS_BASH_LOGOUT "/etc/bash/bash_logout" /* #90488 */
-+#define SYS_BASH_LOGOUT "@GENTOO_PORTAGE_EPREFIX@/etc/bash/bash_logout" /* #90488 */
-
- /* Define this to make non-interactive shells begun with argv[0][0] == '-'
- run the startup files when not in posix mode. */
---- bash-3.0/pathnames.h.in
-+++ bash-3.0/pathnames.h.in
-@@ -22,10 +22,10 @@
- #define _PATHNAMES_H_
-
- /* The default file for hostname completion. */
--#define DEFAULT_HOSTS_FILE "/etc/hosts"
-+#define DEFAULT_HOSTS_FILE "@GENTOO_PORTAGE_EPREFIX@/etc/hosts"
-
- /* The default login shell startup file. */
--#define SYS_PROFILE "/etc/profile"
-+#define SYS_PROFILE "@GENTOO_PORTAGE_EPREFIX@/etc/profile"
-
- /* The default location of the bash debugger initialization/startup file. */
- #define DEBUGGER_START_FILE "@DEBUGGER_START_FILE@"
diff --git a/app-shells/bash/files/bash-3.0-configs.patch b/app-shells/bash/files/bash-3.0-configs.patch
deleted file mode 100644
index 84e96242d8..0000000000
--- a/app-shells/bash/files/bash-3.0-configs.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- bash-3.0/config.h.in
-+++ bash-3.0/config.h.in
-@@ -197,7 +197,7 @@
-
- /* System paths */
-
--#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
-+#define DEFAULT_MAIL_DIRECTORY "/var/spool/mail"
-
- /* Characteristics of the system's header files and libraries that affect
- the compilation environment. */
---- bash-3.0/config-bot.h
-+++ bash-3.0/config-bot.h
-@@ -178,4 +178,18 @@
- /******************************************************************/
-
- /* If you don't want bash to provide a default mail file to check. */
--/* #undef DEFAULT_MAIL_DIRECTORY */
-+/* DP: - don't define a default DEFAULT_MAIL_DIRECTORY, because it
-+ * DP: can cause a timeout on NFS mounts.
-+ */
-+#undef DEFAULT_MAIL_DIRECTORY
-+
-+/* Force pgrp synchronization
-+ * (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653)
-+ *
-+ * The session will hang cases where you 'su' (not 'su -') and
-+ * then run a piped command in emacs.
-+ * This problem seem to happen due to scheduler changes kernel
-+ * side - although reproduceble with later 2.4 kernels, it is
-+ * especially easy with 2.6 kernels.
-+ */
-+#define PGRP_PIPE 1
---- bash-3.0/config-top.h
-+++ bash-3.0/config-top.h
-@@ -52,14 +52,14 @@
- /* The default value of the PATH variable. */
- #ifndef DEFAULT_PATH_VALUE
- #define DEFAULT_PATH_VALUE \
-- "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
-+ "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
- #endif
-
- /* The value for PATH when invoking `command -p'. This is only used when
- the Posix.2 confstr () function, or CS_PATH define are not present. */
- #ifndef STANDARD_UTILS_PATH
- #define STANDARD_UTILS_PATH \
-- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
-+ "/bin:/usr/bin:/sbin:/usr/sbin"
- #endif
-
- /* Default primary and secondary prompt strings. */
-@@ -74,14 +74,16 @@
-
- /* System-wide .bashrc file for interactive shells. */
- /* #define SYS_BASHRC "/etc/bash.bashrc" */
-+#define SYS_BASHRC "/etc/bash/bashrc" /* #26952 */
-
- /* System-wide .bash_logout for login shells. */
- /* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
-+#define SYS_BASH_LOGOUT "/etc/bash/bash_logout" /* #90488 */
-
- /* Define this to make non-interactive shells begun with argv[0][0] == '-'
- run the startup files when not in posix mode. */
--/* #define NON_INTERACTIVE_LOGIN_SHELLS */
-+#define NON_INTERACTIVE_LOGIN_SHELLS
-
- /* Define this if you want bash to try to check whether it's being run by
- sshd and source the .bashrc if so (like the rshd behavior). */
--/* #define SSH_SOURCE_BASHRC */
-+#define SSH_SOURCE_BASHRC /* #24762 */
diff --git a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch b/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
deleted file mode 100644
index cde18326ed..0000000000
--- a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't barf on handled signals inside of scripts. Makes for nicer output.
-
-patch by Martin Schlemmer <azarah@gentoo.org>
-
---- jobs.c
-+++ jobs.c
-@@ -2893,11 +2893,11 @@
- }
- else if (IS_FOREGROUND (job))
- {
--#if !defined (DONT_REPORT_SIGPIPE)
-- if (termsig && WIFSIGNALED (s) && termsig != SIGINT)
--#else
-- if (termsig && WIFSIGNALED (s) && termsig != SIGINT && termsig != SIGPIPE)
--#endif
-+ if (termsig && WIFSIGNALED (s) && termsig != SIGINT &&
-+#if defined (DONT_REPORT_SIGPIPE)
-+ termsig != SIGPIPE &&
-+#endif
-+ signal_is_trapped (termsig) == 0)
- {
- fprintf (stderr, "%s", j_strsignal (termsig));
-
diff --git a/app-shells/bash/files/bash-3.1-bash-logger.patch b/app-shells/bash/files/bash-3.1-bash-logger.patch
deleted file mode 100644
index 4f6df31c45..0000000000
--- a/app-shells/bash/files/bash-3.1-bash-logger.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Add support for logging bash commands via syslog().
-Useful for deploying in honeypot environments.
-
-http://bugs.gentoo.org/91327
-http://www.nardware.co.uk/Security/html/bashlogger.htm
-
---- bashhist.c
-+++ bashhist.c
-@@ -705,7 +705,7 @@
- {
- hist_last_line_added = 1;
- hist_last_line_pushed = 0;
-- add_history (line);
-+ add_history (line, 1);
- history_lines_this_session++;
- }
-
---- lib/readline/histexpand.c
-+++ lib/readline/histexpand.c
-@@ -1222,9 +1222,7 @@
-
- if (only_printing)
- {
--#if 0
-- add_history (result);
--#endif
-+ add_history (result, 1);
- return (2);
- }
-
---- lib/readline/histfile.c
-+++ lib/readline/histfile.c
-@@ -262,7 +262,7 @@
- {
- if (HIST_TIMESTAMP_START(line_start) == 0)
- {
-- add_history (line_start);
-+ add_history (line_start, 0);
- if (last_ts)
- {
- add_history_time (last_ts);
---- lib/readline/history.c
-+++ lib/readline/history.c
-@@ -31,6 +31,8 @@
-
- #include <stdio.h>
-
-+#include <syslog.h>
-+
- #if defined (HAVE_STDLIB_H)
- # include <stdlib.h>
- #else
-@@ -246,10 +250,23 @@
- /* Place STRING at the end of the history list. The data field
- is set to NULL. */
- void
--add_history (string)
-- const char *string;
-+add_history (string, logme)
-+ const char *string;
-+ int logme; /* 0 means no sending history to syslog */
- {
- HIST_ENTRY *temp;
-+ if (logme) {
-+ char trunc[600]; /* arbitrary max size of 600 bytes */
-+ if (strlen(string) < sizeof(trunc)) {
-+ syslog(LOG_LOCAL5 | LOG_INFO, "HISTORY: PID=%d UID=%d %s",
-+ getpid(), getuid(), string);
-+ } else {
-+ memcpy(trunc, string, sizeof(trunc));
-+ trunc[sizeof(trunc) - 1] = '\0';
-+ syslog(LOG_LOCAL5 | LOG_INFO, "HISTORY: PID=%d UID=%d %s(++TRUNC)",
-+ getpid(), getuid(), trunc);
-+ }
-+ }
-
- if (history_stifled && (history_length == history_max_entries))
- {
---- lib/readline/history.h
-+++ lib/readline/history.h
-@@ -80,7 +80,7 @@
-
- /* Place STRING at the end of the history list.
- The associated data field (if any) is set to NULL. */
--extern void add_history PARAMS((const char *));
-+extern void add_history PARAMS((const char *, int ));
-
- /* Change the timestamp associated with the most recent history entry to
- STRING. */
diff --git a/app-shells/bash/files/bash-3.1-gentoo.patch b/app-shells/bash/files/bash-3.1-gentoo.patch
deleted file mode 100644
index a3a62d108c..0000000000
--- a/app-shells/bash/files/bash-3.1-gentoo.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Collection of fixes from mandrake
-
---- bash-3.1/doc/builtins.1
-+++ bash-3.1/doc/builtins.1
-@@ -8,8 +8,5 @@
- let, local, logout, popd, printf, pushd, pwd, read, readonly, return, set,
- shift, shopt, source, suspend, test, times, trap, type, typeset,
- ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
--.SH BASH BUILTIN COMMANDS
--.nr zZ 1
--.so bash.1
- .SH SEE ALSO
- bash(1), sh(1)
---- bash-3.1/Makefile.in
-+++ bash-3.1/Makefile.in
-@@ -658,7 +658,7 @@
-
- config.h: stamp-h
-
--stamp-h: config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
-+stamp-h: version.h config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h
- CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status
-
- config.status: $(srcdir)/configure
-@@ -666,7 +666,7 @@
-
- # comment out for distribution
- $(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
-- cd $(srcdir) && autoconf
-+ cd $(srcdir)
-
- # for chet
- reconfig: force
---- bash-3.1/parse.y
-+++ bash-3.1/parse.y
-@@ -389,7 +389,9 @@
- }
- ;
-
--word_list: WORD
-+word_list:
-+ { $$ = (WORD_LIST *)NULL; }
-+ | WORD
- { $$ = make_word_list ($1, (WORD_LIST *)NULL); }
- | word_list WORD
- { $$ = make_word_list ($2, $1); }
-@@ -1186,7 +1186,7 @@
-
- #if defined (READLINE)
- char *current_readline_prompt = (char *)NULL;
--char *current_readline_line = (char *)NULL;
-+unsigned char *current_readline_line = (unsigned char *)NULL;
- int current_readline_line_index = 0;
-
- static int
diff --git a/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch b/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch
deleted file mode 100644
index 8aca776716..0000000000
--- a/app-shells/bash/files/bash-3.2-dev-fd-test-as-user.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur bash-3.2.orig/aclocal.m4 bash-3.2/aclocal.m4
---- bash-3.2.orig/aclocal.m4 2006-12-30 20:00:31 +0000
-+++ bash-3.2/aclocal.m4 2006-12-30 20:02:02 +0000
-@@ -1544,7 +1544,8 @@
- if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then
- # check for systems like FreeBSD 5 that only provide /dev/fd/[012]
- exec 3</dev/null
-- if test -r /dev/fd/3; then
-+ # bash test builtin always works here, so we use the test binary
-+ if `which test || echo test` -e /dev/fd/3; then
- bash_cv_dev_fd=standard
- else
- bash_cv_dev_fd=absent
-diff -ur bash-3.2.orig/configure bash-3.2/configure
---- bash-3.2.orig/configure 2006-12-30 20:03:24 +0000
-+++ bash-3.2/configure 2006-12-30 20:01:50 +0000
-@@ -27179,7 +27179,8 @@
- if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then
- # check for systems like FreeBSD 5 that only provide /dev/fd/[012]
- exec 3</dev/null
-- if test -r /dev/fd/3; then
-+ # bash test builtin always works here, so we use the test binary
-+ if `which test || echo test` -e /dev/fd/3; then
- bash_cv_dev_fd=standard
- else
- bash_cv_dev_fd=absent
diff --git a/app-shells/bash/files/bash-3.2-getcwd-interix.patch b/app-shells/bash/files/bash-3.2-getcwd-interix.patch
deleted file mode 100644
index 5290ab21ca..0000000000
--- a/app-shells/bash/files/bash-3.2-getcwd-interix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-reported upstream on 23 Apr 2009:
-http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00142.html
-
-diff -ru bash-3.2.orig/config-bot.h bash-3.2/config-bot.h
---- bash-3.2.orig/config-bot.h 2008-02-13 15:55:26 +0100
-+++ bash-3.2/config-bot.h 2008-02-13 15:58:05 +0100
-@@ -78,6 +78,12 @@
- # undef HAVE_GETCWD
- #endif
-
-+/* on interix the getcwd we ship, just allocs a buffer
-+ * and calls the real getcwd. */
-+#if defined (__INTERIX)
-+# define getcwd xgetcwd
-+#endif
-+
- #if !defined (HAVE_DEV_FD) && defined (NAMED_PIPES_MISSING)
- # undef PROCESS_SUBSTITUTION
- #endif
-diff -ru bash-3.2.orig/lib/sh/getcwd.c bash-3.2/lib/sh/getcwd.c
---- bash-3.2.orig/lib/sh/getcwd.c 2008-02-13 15:55:27 +0100
-+++ bash-3.2/lib/sh/getcwd.c 2008-02-13 16:09:41 +0100
-@@ -93,6 +93,7 @@
- size_t size;
- #endif /* !__STDC__ */
- {
-+#if !defined(__INTERIX)
- static const char dots[]
- = "../../../../../../../../../../../../../../../../../../../../../../../\
- ../../../../../../../../../../../../../../../../../../../../../../../../../../\
-@@ -290,6 +291,20 @@
- errno = e;
- }
- return ((char *)NULL);
-+#else /* defined(__INTERIX) */
-+ /* use the real getcwd. */
-+ #undef getcwd
-+
-+ char * buffer = buf;
-+
-+ if(!size)
-+ size = PATH_MAX * 2; // some safety zone. windows will refuse paths before they get longer!
-+
-+ if(!buffer)
-+ buffer = malloc(sizeof(char) * size);
-+
-+ return getcwd(buffer, size);
-+#endif
- }
-
- #if defined (TEST)
diff --git a/app-shells/bash/files/bash-3.2-interix-stdint.patch b/app-shells/bash/files/bash-3.2-interix-stdint.patch
deleted file mode 100644
index 3d27b5595b..0000000000
--- a/app-shells/bash/files/bash-3.2-interix-stdint.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-intmax_t and uintmax_t should be looked for in stdint.h on interix
-
-reported upstream on 23 Apr 2009:
-http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00142.html
-
-diff -ru bash-3.2.orig/configure.in bash-3.2/configure.in
---- bash-3.2.orig/configure.in Fri Jan 18 16:50:36 2008
-+++ bash-3.2/configure.in Fri Jan 18 16:53:09 2008
-@@ -869,8 +869,8 @@
- BASH_CHECK_TYPE(clock_t, [#include <sys/times.h>], long)
- BASH_CHECK_TYPE(sigset_t, [#include <signal.h>], int)
- BASH_CHECK_TYPE(quad_t, , long, HAVE_QUAD_T)
--BASH_CHECK_TYPE(intmax_t, , $bash_cv_type_long_long)
--BASH_CHECK_TYPE(uintmax_t, , $bash_cv_type_unsigned_long_long)
-+BASH_CHECK_TYPE(intmax_t, [#include <stdint.h>], $bash_cv_type_long_long)
-+BASH_CHECK_TYPE(uintmax_t, [#include <stdint.h>], $bash_cv_type_unsigned_long_long)
- if test "$ac_cv_header_sys_socket_h" = "yes"; then
- BASH_CHECK_TYPE(socklen_t, [#include <sys/socket.h>], int, HAVE_SOCKLEN_T)
- fi
-diff -ru -x config* bash-3.2.orig/bashtypes.h bash-3.2/bashtypes.h
---- bash-3.2.orig/bashtypes.h Fri Jan 18 17:12:07 2008
-+++ bash-3.2/bashtypes.h Fri Jan 18 17:12:38 2008
-@@ -35,4 +35,8 @@
- # include <inttypes.h>
- #endif
-
-+#if defined (HAVE_STDINT_H)
-+# include <stdint.h>
-+#endif
-+
- #endif /* _BASHTYPES_H_ */
-diff -ru -x config* bash-3.2.orig/lib/sh/strtoimax.c bash-3.2/lib/sh/strtoimax.c
---- bash-3.2.orig/lib/sh/strtoimax.c Fri Jan 18 17:12:06 2008
-+++ bash-3.2/lib/sh/strtoimax.c Fri Jan 18 17:17:45 2008
-@@ -25,6 +25,10 @@
- # include <inttypes.h>
- #endif
-
-+#if HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+
- #if HAVE_STDLIB_H
- # include <stdlib.h>
- #endif
-diff -ru -x config* bash-3.2.orig/lib/sh/strtoumax.c bash-3.2/lib/sh/strtoumax.c
---- bash-3.2.orig/lib/sh/strtoumax.c Fri Jan 18 17:12:06 2008
-+++ bash-3.2/lib/sh/strtoumax.c Fri Jan 18 17:24:20 2008
-@@ -25,6 +25,10 @@
- # include <inttypes.h>
- #endif
-
-+#if HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+
- #if HAVE_STDLIB_H
- # include <stdlib.h>
- #endif
diff --git a/app-shells/bash/files/bash-3.2-ldflags-for-build.patch b/app-shells/bash/files/bash-3.2-ldflags-for-build.patch
deleted file mode 100644
index 2dc1dd6ef7..0000000000
--- a/app-shells/bash/files/bash-3.2-ldflags-for-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://bugs.gentoo.org/211947
-
-fix from Takashi YOSHII: dont use target ldflags for build apps
-
---- bash/builtins/Makefile.in
-+++ bash/builtins/Makefile.in
-@@ -63,7 +63,7 @@
-
- LIBS = @LIBS@
- LDFLAGS = @LDFLAGS@ $(LOCAL_LDFLAGS) $(CFLAGS)
--LDFLAGS_FOR_BUILD = $(LDFLAGS)
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
- LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
- #LIBS_FOR_BUILD = @LIBS_FOR_BUILD@
- LIBS_FOR_BUILD = $(LIBS)
---- bash/support/Makefile.in
-+++ bash/support/Makefile.in
-@@ -58,7 +58,7 @@
-
- LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
- LDFLAGS = @LDFLAGS@ $(LOCAL_LDFLAGS) $(CFLAGS)
--LDFLAGS_FOR_BUILD = $(LDFLAGS)
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
-
- INCLUDES = -I${BUILD_DIR} -I${topdir}
-
---- bash/Makefile.in
-+++ bash/Makefile.in
-@@ -143,7 +143,7 @@
- CCFLAGS_FOR_BUILD = $(BASE_CCFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
-
- LDFLAGS = @LDFLAGS@ $(STATIC_LD) $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS)
--LDFLAGS_FOR_BUILD = $(LDFLAGS)
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
-
- INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(BASHINCDIR) -I$(LIBSRC) $(INTL_INC)
-
diff --git a/app-shells/bash/files/bash-3.2-loadables.patch b/app-shells/bash/files/bash-3.2-loadables.patch
deleted file mode 100644
index cd0e1e1a8e..0000000000
--- a/app-shells/bash/files/bash-3.2-loadables.patch
+++ /dev/null
@@ -1,239 +0,0 @@
---- bash-3.2/examples/loadables/basename.c
-+++ bash-3.2/examples/loadables/basename.c
-@@ -11,6 +11,7 @@
- #include <stdio.h>
- #include "builtins.h"
- #include "shell.h"
-+#include "common.h"
-
- basename_builtin (list)
- WORD_LIST *list;
---- bash-3.2/examples/loadables/cut.c
-+++ bash-3.2/examples/loadables/cut.c
-@@ -63,6 +63,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
-
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/dirname.c
-+++ bash-3.2/examples/loadables/dirname.c
-@@ -11,6 +11,7 @@
- #include <stdio.h>
- #include "builtins.h"
- #include "shell.h"
-+#include "common.h"
-
- dirname_builtin (list)
- WORD_LIST *list;
---- bash-3.2/examples/loadables/finfo.c
-+++ bash-3.2/examples/loadables/finfo.c
-@@ -12,6 +12,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <errno.h>
-+#include <time.h>
-
- #include "bashansi.h"
- #include "shell.h"
---- bash-3.2/examples/loadables/head.c
-+++ bash-3.2/examples/loadables/head.c
-@@ -21,6 +21,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
-
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/ln.c
-+++ bash-3.2/examples/loadables/ln.c
-@@ -18,6 +18,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
-
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/logname.c
-+++ bash-3.2/examples/loadables/logname.c
-@@ -11,6 +11,7 @@
-
- #include "builtins.h"
- #include "shell.h"
-+#include "common.h"
-
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/mkdir.c
-+++ bash-3.2/examples/loadables/mkdir.c
-@@ -16,6 +16,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
-
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/pathchk.c
-+++ bash-3.2/examples/loadables/pathchk.c
-@@ -45,6 +45,7 @@
- #include "stdc.h"
- #include "bashgetopt.h"
- #include "maxpath.h"
-+#include "common.h"
-
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/print.c
-+++ bash-3.2/examples/loadables/print.c
-@@ -17,6 +17,8 @@
- #include "builtins.h"
- #include "stdc.h"
- #include "bashgetopt.h"
-+#include "builtext.h"
-+#include "common.h"
-
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/printenv.c
-+++ bash-3.2/examples/loadables/printenv.c
-@@ -11,6 +11,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
-
- extern char **export_env;
-
---- bash-3.2/examples/loadables/push.c
-+++ bash-3.2/examples/loadables/push.c
-@@ -11,6 +11,7 @@
- #include "shell.h"
- #include "jobs.h"
- #include "bashgetopt.h"
-+#include "common.h"
-
- #ifndef errno
- extern int errno;
---- bash-3.2/examples/loadables/realpath.c
-+++ bash-3.2/examples/loadables/realpath.c
-@@ -34,6 +34,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
-
- #ifndef errno
- extern int errno;
-@@ -67,14 +68,14 @@
- vflag = 1;
- break;
- default:
-- usage();
-+ builtin_usage();
- }
- }
-
- list = loptend;
-
- if (list == 0)
-- usage();
-+ builtin_usage();
-
- for (es = EXECUTION_SUCCESS; list; list = list->next) {
- p = list->word->word;
---- bash-3.2/examples/loadables/rmdir.c
-+++ bash-3.2/examples/loadables/rmdir.c
-@@ -8,6 +8,7 @@
- #include <errno.h>
- #include "builtins.h"
- #include "shell.h"
-+#include "common.h"
-
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/sleep.c
-+++ bash-3.2/examples/loadables/sleep.c
-@@ -27,6 +27,7 @@
-
- #include "shell.h"
- #include "builtins.h"
-+#include "common.h"
-
- #define RETURN(x) \
- do { \
---- bash-3.2/examples/loadables/tee.c
-+++ bash-3.2/examples/loadables/tee.c
-@@ -22,6 +22,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
-
- #if !defined (errno)
- extern int errno;
---- bash-3.2/examples/loadables/truefalse.c
-+++ bash-3.2/examples/loadables/truefalse.c
-@@ -1,5 +1,7 @@
- /* true and false builtins */
-
-+#include <config.h>
-+
- #include "bashtypes.h"
- #include "shell.h"
- #include "builtins.h"
---- bash-3.2/examples/loadables/tty.c
-+++ bash-3.2/examples/loadables/tty.c
-@@ -8,6 +8,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
-
- extern char *ttyname ();
-
---- bash-3.2/examples/loadables/uname.c
-+++ bash-3.2/examples/loadables/uname.c
-@@ -27,6 +27,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
-
- #define FLAG_SYSNAME 0x01 /* -s */
- #define FLAG_NODENAME 0x02 /* -n */
---- bash-3.2/examples/loadables/unlink.c
-+++ bash-3.2/examples/loadables/unlink.c
-@@ -14,6 +14,7 @@
-
- #include "builtins.h"
- #include "shell.h"
-+#include "common.h"
-
- #ifndef errno
- extern int errno;
---- bash-3.2/examples/loadables/whoami.c
-+++ bash-3.2/examples/loadables/whoami.c
-@@ -8,6 +8,7 @@
- #include "builtins.h"
- #include "shell.h"
- #include "bashgetopt.h"
-+#include "common.h"
-
- whoami_builtin (list)
- WORD_LIST *list;
---- bash-3.2/examples/loadables/Makefile.in
-+++ bash-3.2/examples/loadables/Makefile.in
-@@ -68,7 +68,7 @@
- SHOBJ_CC = @SHOBJ_CC@
- SHOBJ_CFLAGS = @SHOBJ_CFLAGS@
- SHOBJ_LD = @SHOBJ_LD@
--SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@
-+SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@ @LDFLAGS@
- SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@
- SHOBJ_LIBS = @SHOBJ_LIBS@
- SHOBJ_STATUS = @SHOBJ_STATUS@
diff --git a/app-shells/bash/files/bash-3.2-parallel-build.patch b/app-shells/bash/files/bash-3.2-parallel-build.patch
deleted file mode 100644
index 0ee0491062..0000000000
--- a/app-shells/bash/files/bash-3.2-parallel-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/189671
-http://lists.gnu.org/archive/html/bug-bash/2007-08/msg00081.html
-
---- bash-3.2/Makefile.in
-+++ bash-3.2/Makefile.in
-@@ -584,7 +584,9 @@
- @( { test "${RL_LIBDIR}" = "${libdir}" && exit 0; } || \
- cd ${RL_LIBDIR} && $(MAKE) $(MFLAGS) libreadline.a) || exit 1
-
--$(HISTORY_LIBRARY): config.h $(HISTORY_SOURCE)
-+# prevent parallel build race conditions in the lib/readline/ subdir
-+# by depending on libreadline.a when applicable
-+$(HISTORY_LIBRARY): config.h $(HISTORY_SOURCE) $(READLINE_DEP)
- @echo making $@ in ${HIST_LIBDIR}
- @( { test "${HIST_LIBDIR}" = "${libdir}" && exit 0; } || \
- cd ${HIST_LIBDIR} && $(MAKE) $(MFLAGS) libhistory.a) || exit 1
diff --git a/app-shells/bash/files/bash-3.2-process-subst.patch b/app-shells/bash/files/bash-3.2-process-subst.patch
deleted file mode 100644
index bd0b3f4e17..0000000000
--- a/app-shells/bash/files/bash-3.2-process-subst.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix process substitution on BSD
-
---- execute_cmd.c
-+++ execute_cmd.c
-@@ -2672,6 +2672,7 @@
-
- do_piping (pipe_in, pipe_out);
-
-+ subshell_environment = 0;
- if (async)
- subshell_environment |= SUBSHELL_ASYNC;
- if (pipe_in != NO_PIPE || pipe_out != NO_PIPE)
diff --git a/app-shells/bash/files/bash-3.2-protos.patch b/app-shells/bash/files/bash-3.2-protos.patch
deleted file mode 100644
index 0a9ea74adf..0000000000
--- a/app-shells/bash/files/bash-3.2-protos.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-move prototypes around so they show up when needed
-
---- a/jobs.h
-+++ b/jobs.h
-@@ -182,6 +182,7 @@
-
- extern int count_all_jobs __P((void));
-
-+extern void close_pgrp_pipe __P((void));
- extern void terminate_current_pipeline __P((void));
- extern void terminate_stopped_jobs __P((void));
- extern void hangup_all_jobs __P((void));
---- a/lib/glob/strmatch.c
-+++ b/lib/glob/strmatch.c
-@@ -25,9 +25,6 @@
- #include "strmatch.h"
-
- extern int xstrmatch __P((char *, char *, int));
--#if defined (HAVE_MULTIBYTE)
--extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
--#endif
-
- int
- strmatch (pattern, string, flags)
---- a/lib/glob/strmatch.h
-+++ b/lib/glob/strmatch.h
-@@ -57,6 +57,7 @@
-
- #if HANDLE_MULTIBYTE
- extern int wcsmatch __P((wchar_t *, wchar_t *, int));
-+extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
- #endif
-
- #endif /* _STRMATCH_H */
---- a/quit.h
-+++ b/quit.h
-@@ -21,6 +21,8 @@
- #if !defined (_QUIT_H_)
- #define _QUIT_H_
-
-+#include "sig.h"
-+
- /* Non-zero means SIGINT has already ocurred. */
- extern volatile int interrupt_state;
- extern volatile int terminating_signal;
---- a/support/bashversion.c
-+++ b/support/bashversion.c
-@@ -47,6 +47,9 @@
- extern char *dist_version;
- extern int patch_level;
-
-+extern char *shell_version_string __P((void));
-+extern void show_shell_version __P((int));
-+
- char *shell_name = "bash";
- char *progname;
-
diff --git a/app-shells/bash/files/bash-3.2-session-leader.patch b/app-shells/bash/files/bash-3.2-session-leader.patch
deleted file mode 100644
index 82f7d98063..0000000000
--- a/app-shells/bash/files/bash-3.2-session-leader.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-http://bugs.gentoo.org/231775
-http://lists.gnu.org/archive/html/bug-bash/2008-07/msg00010.html
-
-A parent bash shell sometimes will set the session leader tty (using tcsetpgrp)
-back to itself, taking control away from a child bash shell, due to a race
-condition. A result is that the child can then not then execute some commands
-(like stty) from its init script (e.g. .bashrc). The result I (and others)
-have seen is that the bash shell will hang while reading the init script.
-
-*** jobs.c.20080704 2008-07-10 15:14:13.000000000 -0400
---- jobs.c 2008-07-10 15:17:59.000000000 -0400
-***************
-*** 266,269 ****
---- 266,270 ----
- static void set_job_running __P((int));
- static void setjstatus __P((int));
-+ static int maybe_give_terminal_to __P((pid_t, pid_t, int));
- static void mark_all_jobs_as_dead __P((void));
- static void mark_dead_jobs_as_notified __P((int));
-***************
-*** 637,641 ****
- */
- if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0)
-! give_terminal_to (newjob->pgrp, 0);
- }
- }
---- 638,642 ----
- */
- if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0)
-! maybe_give_terminal_to (shell_pgrp, newjob->pgrp, 0);
- }
- }
-***************
-*** 3833,3836 ****
---- 3834,3863 ----
- }
-
-+ /* Give terminal to NPGRP iff it's currently owned by OPGRP. FLAGS are the
-+ flags to pass to give_terminal_to(). */
-+ static int
-+ maybe_give_terminal_to (opgrp, npgrp, flags)
-+ pid_t opgrp, npgrp;
-+ int flags;
-+ {
-+ int tpgrp;
-+
-+ tpgrp = tcgetpgrp (shell_tty);
-+ if (tpgrp == npgrp)
-+ {
-+ terminal_pgrp = npgrp;
-+ return 0;
-+ }
-+ else if (tpgrp != opgrp)
-+ {
-+ #if defined (DEBUG)
-+ internal_warning ("maybe_give_terminal_to: terminal pgrp == %d shell pgrp = %d", tpgrp, opgrp);
-+ #endif
-+ return -1;
-+ }
-+ else
-+ return (give_terminal_to (npgrp, flags));
-+ }
-+
- /* Clear out any jobs in the job array. This is intended to be used by
- children of the shell, who should not have any job structures as baggage
diff --git a/app-shells/bash/files/bash-3.2-ulimit.patch b/app-shells/bash/files/bash-3.2-ulimit.patch
deleted file mode 100644
index a0975cb6e9..0000000000
--- a/app-shells/bash/files/bash-3.2-ulimit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-add missing docs for -e and -r options
-
---- builtins/ulimit.def
-+++ builtins/ulimit.def
-@@ -24,7 +24,7 @@
- $BUILTIN ulimit
- $FUNCTION ulimit_builtin
- $DEPENDS_ON !_MINIX
--$SHORT_DOC ulimit [-SHacdfilmnpqstuvx] [limit]
-+$SHORT_DOC ulimit [-SHacdefilmnpqrstuvx] [limit]
- Ulimit provides control over the resources available to processes
- started by the shell, on systems that allow such control. If an
- option is given, it is interpreted as follows:
diff --git a/app-shells/bash/files/bash-4.0-bashintl-in-siglist.patch b/app-shells/bash/files/bash-4.0-bashintl-in-siglist.patch
deleted file mode 100644
index 14b0662019..0000000000
--- a/app-shells/bash/files/bash-4.0-bashintl-in-siglist.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2009-06/msg00016.html
-
---- siglist.c.orig 2009-06-22 17:40:04.000000000 +0200
-+++ siglist.c 2009-06-22 17:42:21.000000000 +0200
-@@ -33,6 +33,7 @@
- #endif
-
- #include "xmalloc.h"
-+#include "bashintl.h"
-
- char *sys_siglist[NSIG];
-
diff --git a/app-shells/bash/files/bash-4.0-cflags_for_build.patch b/app-shells/bash/files/bash-4.0-cflags_for_build.patch
deleted file mode 100644
index 954a4a93d4..0000000000
--- a/app-shells/bash/files/bash-4.0-cflags_for_build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-In non-cross-builds, LDFLAGS_FOR_BUILD contain CFLAGS via LDFLAGS.
-So CFLAGS_FOR_BUILD also have to contain CFLAGS, to allow 32bit
-builds on x86_64 multilib hosts using CFLAGS=-m32.
---- configure.in.orig 2009-09-23 09:38:11.925846236 +0200
-+++ configure.in 2009-09-23 09:39:02.346543283 +0200
-@@ -466,6 +466,7 @@
-
- if test "X$cross_compiling" = "Xno"; then
- CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-"$CPPFLAGS"}
-+ CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-'$(CFLAGS)'}
- LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-'$(LDFLAGS)'}
- else
- CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-""}
---- configure.orig 2009-02-09 14:33:13.000000000 +0100
-+++ configure 2009-09-23 09:40:00.816540401 +0200
-@@ -5103,6 +5103,7 @@
-
- if test "X$cross_compiling" = "Xno"; then
- CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-"$CPPFLAGS"}
-+ CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-'$(CFLAGS)'}
- LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-'$(LDFLAGS)'}
- else
- CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-""}
diff --git a/app-shells/bash/files/bash-4.0-childmax-pids.patch b/app-shells/bash/files/bash-4.0-childmax-pids.patch
deleted file mode 100644
index 87f875a9ca..0000000000
--- a/app-shells/bash/files/bash-4.0-childmax-pids.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-Initial report:
-http://lists.gnu.org/archive/html/bug-bash/2012-07/msg00054.html
-Small testcase breaking on AIX, requires maxuproc > 128
- $ /usr/sbin/lsattr -E -l sys0 | grep maxuproc
-http://lists.gnu.org/archive/html/bug-bash/2012-07/msg00080.html
-
- 7/24
- ----
-configure.in
- - interix: define RECYCLES_PIDS. Based on a report from Michael
- Haubenwallner <michael.haubenwallner@salomon.at>
-
- 7/26
- ----
-jobs.c
- - make_child: call bgp_delete on the newly-created pid unconditionally.
- Some systems reuse pids before cycling through an entire set of
- CHILD_MAX/_SC_CHILD_MAX unique pids. This is no longer dependent
- on RECYCLES_PIDS. Based on a report from Michael Haubenwallner
- <michael.haubenwallner@salomon.at>
-
- 7/28
- ----
-subst.c
- - command_substitute: make sure last_made_pid gets reset if make_child
- fails
-
-execute_cmd.c
- - execute_command_internal: case cm_simple: decide whether or not to
- wait_for a child if already_making_children is non-zero, indicates
- that there is an unwaited-for child. More of fix for bug report
- from Michael Haubenwallner <michael.haubenwallner@salomon.at>
-
-jobs.c
- - make_child: call delete_old_job (new_pid) unconditionally, don't
- bother to check whether or not pid wrap occurred. Rest of fix for
- bug report from Michael Haubenwallner
- <michael.haubenwallner@salomon.at>
-
-#diff --git a/configure.in b/configure.in
-#index df91278..646abee 100644
-#--- a/configure.in
-#+++ b/configure.in
-#@@ -1067,7 +1067,7 @@ linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
-# *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
-# powerux*) LOCAL_LIBS="-lgen" ;;
-# cygwin*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
-#-opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG -DBROKEN_DIRENT_D_INO -D_POSIX_SOURCE -D_ALL_SOURCE" ;;
-#+opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG -DBROKEN_DIRENT_D_INO -D_POSIX_SOURCE -D_ALL_SOURCE -DRECYCLES_PIDS" ;;
-# esac
-#
-# dnl Stanza for OS/compiler pair-specific flags
-diff --git a/configure b/configure
-index 0e62d6f..d913772 100755
---- a/configure
-+++ b/configure
-@@ -15760,7 +15760,7 @@ linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
- *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
- powerux*) LOCAL_LIBS="-lgen" ;;
- cygwin*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
--opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG -DBROKEN_DIRENT_D_INO -D_POSIX_SOURCE -D_ALL_SOURCE" ;;
-+opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG -DBROKEN_DIRENT_D_INO -D_POSIX_SOURCE -D_ALL_SOURCE -DRECYCLES_PIDS" ;;
- esac
-
- case "${host_os}-${CC}" in
-diff --git a/execute_cmd.c b/execute_cmd.c
-index 5beddef..8615b0b 100644
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -775,9 +782,11 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
- the child. */
-
- /* XXX - this is something to watch out for if there are problems
-- when the shell is compiled without job control. */
-- if (already_making_children && pipe_out == NO_PIPE &&
-- last_made_pid != last_pid)
-+ when the shell is compiled without job control. Don't worry about
-+ whether or not last_made_pid == last_pid; already_making_children
-+ tells us whether or not there are unwaited-for children to wait
-+ for and reap. */
-+ if (already_making_children && pipe_out == NO_PIPE)
- {
- stop_pipeline (asynchronous, (COMMAND *)NULL);
-
-diff --git a/jobs.c b/jobs.c
-index 18b189d..d190e82 100644
---- a/jobs.c
-+++ b/jobs.c
-@@ -1898,15 +1898,13 @@ make_child (command, async_p)
- last_asynchronous_pid = 1;
- #endif
-
-- if (pid_wrap > 0)
-- delete_old_job (pid);
-+ /* Delete the saved status for any job containing this PID in case it's
-+ been reused. */
-+ delete_old_job (pid);
-
--#if !defined (RECYCLES_PIDS)
-- /* Only check for saved status if we've saved more than CHILD_MAX
-- statuses, unless the system recycles pids. */
-- if ((js.c_reaped + bgpids.npid) >= js.c_childmax)
--#endif
-- bgp_delete (pid); /* new process, discard any saved status */
-+ /* Perform the check for pid reuse unconditionally. Some systems reuse
-+ PIDs before giving a process CHILD_MAX/_SC_CHILD_MAX unique ones. */
-+ bgp_delete (pid); /* new process, discard any saved status */
-
- last_made_pid = pid;
-
-diff --git a/subst.c b/subst.c
-index 057c992..e772dd7 100644
---- a/subst.c
-+++ b/subst.c
-@@ -5332,6 +5332,8 @@ command_substitute (string, quoted)
- sys_error (_("cannot make child for command substitution"));
- error_exit:
-
-+ last_made_pid = old_pid;
-+
- FREE (istring);
- close (fildes[0]);
- close (fildes[1]);
diff --git a/app-shells/bash/files/bash-4.0-configs-prefix.patch b/app-shells/bash/files/bash-4.0-configs-prefix.patch
deleted file mode 100644
index c6ada7c7fa..0000000000
--- a/app-shells/bash/files/bash-4.0-configs-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- bash-4.0/pathnames.h.in
-+++ bash-4.0/pathnames.h.in
-@@ -22,10 +22,10 @@
- #define _PATHNAMES_H_
-
- /* The default file for hostname completion. */
--#define DEFAULT_HOSTS_FILE "/etc/hosts"
-+#define DEFAULT_HOSTS_FILE "@GENTOO_PORTAGE_EPREFIX@/etc/hosts"
-
- /* The default login shell startup file. */
--#define SYS_PROFILE "/etc/profile"
-+#define SYS_PROFILE "@GENTOO_PORTAGE_EPREFIX@/etc/profile"
-
- /* The default location of the bash debugger initialization/startup file. */
- #define DEBUGGER_START_FILE "@DEBUGGER_START_FILE@"
diff --git a/app-shells/bash/files/bash-4.0-configure.patch b/app-shells/bash/files/bash-4.0-configure.patch
deleted file mode 100644
index e57cb6b240..0000000000
--- a/app-shells/bash/files/bash-4.0-configure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/304901
-
-newer patches touch configure ... we don't want autotool deps, so update
-the files ourselves
-
---- bash-4.0/configure
-+++ bash-4.0/configure
-@@ -5806,7 +5806,7 @@
- # static version specified as -llibname to override the
- # dynamic version
- case "${host_os}" in
-- darwin[89]*) READLINE_LIB='${READLINE_LIBRARY}' ;;
-+ darwin[89]*|darwin10*) READLINE_LIB='${READLINE_LIBRARY}' ;;
- *) READLINE_LIB=-lreadline ;;
- esac
- fi
-@@ -5847,7 +5847,7 @@
- # static version specified as -llibname to override the
- # dynamic version
- case "${host_os}" in
-- darwin[89]*) HISTORY_LIB='${HISTORY_LIBRARY}' ;;
-+ darwin[89]*|darwin10*) HISTORY_LIB='${HISTORY_LIBRARY}' ;;
- *) HISTORY_LIB=-lhistory ;;
- esac
- fi
diff --git a/app-shells/bash/files/bash-4.0-interix-access-suacomp.patch b/app-shells/bash/files/bash-4.0-interix-access-suacomp.patch
deleted file mode 100644
index f48babf764..0000000000
--- a/app-shells/bash/files/bash-4.0-interix-access-suacomp.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' bash-4.0.orig/lib/readline/complete.c bash-4.0/lib/readline/complete.c
---- bash-4.0.orig/lib/readline/complete.c 2009-08-25 10:57:39 +0200
-+++ bash-4.0/lib/readline/complete.c 2009-08-25 11:35:09 +0200
-@@ -52,6 +52,10 @@
- #include <pwd.h>
- #endif
-
-+/* can't include externs.h here - so directly define this one. this
-+ * is required to fix interix access() which behaves totally stupid */
-+extern int sh_eaccess(char*,int);
-+
- #include "posixdir.h"
- #include "posixstat.h"
-
-@@ -554,7 +558,7 @@
- #endif
- else if (S_ISREG (finfo.st_mode))
- {
-- if (access (filename, X_OK) == 0)
-+ if (sh_eaccess (filename, X_OK) == 0)
- character = '*';
- }
- return (character);
-diff -ru -x '*.Po' -x '*.Plo' bash-4.0.orig/lib/sh/eaccess.c bash-4.0/lib/sh/eaccess.c
---- bash-4.0.orig/lib/sh/eaccess.c 2009-08-25 10:57:40 +0200
-+++ bash-4.0/lib/sh/eaccess.c 2009-08-25 16:34:38 +0200
-@@ -203,7 +203,7 @@
-
- #if defined (HAVE_EACCESS) /* FreeBSD */
- return (eaccess (path, mode));
--#elif defined (EFF_ONLY_OK) /* SVR4(?), SVR4.2 */
-+#elif defined (EFF_ONLY_OK) && !defined(__INTERIX) /* SVR4(?), SVR4.2 */
- return access (path, mode|EFF_ONLY_OK);
- #else
- if (mode == F_OK)
-@@ -214,8 +214,13 @@
- return (sh_euidaccess (path, mode));
- # endif
-
-+/* on interix, use stataccess always, since access on interix behaves bad:
-+ * whenever a process has appropriate priviledges (speaking in windows terms),
-+ * success is reported, even if the bits are not set. */
-+#ifndef __INTERIX
- if (current_user.uid == current_user.euid && current_user.gid == current_user.egid)
- return (access (path, mode));
-+#endif
-
- return (sh_stataccess (path, mode));
- #endif
-
diff --git a/app-shells/bash/files/bash-4.0-interix-access.patch b/app-shells/bash/files/bash-4.0-interix-access.patch
deleted file mode 100644
index a515735234..0000000000
--- a/app-shells/bash/files/bash-4.0-interix-access.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' bash-4.0.orig/findcmd.c bash-4.0/findcmd.c
---- bash-4.0.orig/findcmd.c 2009-08-25 10:57:38 +0200
-+++ bash-4.0/findcmd.c 2009-08-25 11:12:37 +0200
-@@ -111,7 +111,7 @@
-
- /* Root only requires execute permission for any of owner, group or
- others to be able to exec a file, and can read any file. */
-- if (current_user.euid == (uid_t)0)
-+ if (current_user.euid == (uid_t)ROOT_UID)
- {
- r |= FS_READABLE;
- if (finfo.st_mode & S_IXUGO)
-diff -ru -x '*.Po' -x '*.Plo' bash-4.0.orig/lib/readline/complete.c bash-4.0/lib/readline/complete.c
---- bash-4.0.orig/lib/readline/complete.c 2009-08-25 10:57:39 +0200
-+++ bash-4.0/lib/readline/complete.c 2009-08-25 11:35:09 +0200
-@@ -52,6 +52,10 @@
- #include <pwd.h>
- #endif
-
-+/* can't include externs.h here - so directly define this one. this
-+ * is required to fix interix access() which behaves totally stupid */
-+extern int sh_eaccess(char*,int);
-+
- #include "posixdir.h"
- #include "posixstat.h"
-
-@@ -554,7 +558,7 @@
- #endif
- else if (S_ISREG (finfo.st_mode))
- {
-- if (access (filename, X_OK) == 0)
-+ if (sh_eaccess (filename, X_OK) == 0)
- character = '*';
- }
- return (character);
-diff -ru -x '*.Po' -x '*.Plo' bash-4.0.orig/lib/sh/eaccess.c bash-4.0/lib/sh/eaccess.c
---- bash-4.0.orig/lib/sh/eaccess.c 2009-08-25 10:57:40 +0200
-+++ bash-4.0/lib/sh/eaccess.c 2009-08-25 16:34:38 +0200
-@@ -141,7 +141,7 @@
- if (sh_stat (path, &st) < 0)
- return (-1);
-
-- if (current_user.euid == 0)
-+ if (current_user.euid == ROOT_UID)
- {
- /* Root can read or write any file. */
- if ((mode & X_OK) == 0)
-@@ -203,7 +203,7 @@
-
- #if defined (HAVE_EACCESS) /* FreeBSD */
- return (eaccess (path, mode));
--#elif defined (EFF_ONLY_OK) /* SVR4(?), SVR4.2 */
-+#elif defined (EFF_ONLY_OK) && !defined(__INTERIX) /* SVR4(?), SVR4.2 */
- return access (path, mode|EFF_ONLY_OK);
- #else
- if (mode == F_OK)
-@@ -214,8 +214,13 @@
- return (sh_euidaccess (path, mode));
- # endif
-
-+/* on interix, use stataccess always, since access on interix behaves bad:
-+ * whenever a process has appropriate priviledges (speaking in windows terms),
-+ * success is reported, even if the bits are not set. */
-+#ifndef __INTERIX
- if (current_user.uid == current_user.euid && current_user.gid == current_user.egid)
- return (access (path, mode));
-+#endif
-
- return (sh_stataccess (path, mode));
- #endif
-diff -ru -x '*.Po' -x '*.Plo' bash-4.0.orig/parse.y bash-4.0/parse.y
---- bash-4.0.orig/parse.y 2009-08-25 10:57:41 +0200
-+++ bash-4.0/parse.y 2009-08-25 11:27:04 +0200
-@@ -4990,9 +4990,9 @@
-
- case '$':
- t = temp = (char *)xmalloc (3);
-- if ((promptvars || posixly_correct) && (current_user.euid != 0))
-+ if ((promptvars || posixly_correct) && (current_user.euid != ROOT_UID))
- *t++ = '\\';
-- *t++ = current_user.euid == 0 ? '#' : '$';
-+ *t++ = current_user.euid == ROOT_UID ? '#' : '$';
- *t = '\0';
- goto add_string;
-
-diff -ru -x '*.Po' -x '*.Plo' bash-4.0.orig/shell.h bash-4.0/shell.h
---- bash-4.0.orig/shell.h 2009-08-25 10:57:42 +0200
-+++ bash-4.0/shell.h 2009-08-25 11:11:39 +0200
-@@ -41,6 +41,14 @@
- #include "pathnames.h"
- #include "externs.h"
-
-+#ifndef __INTERIX
-+# define ROOT_UID 0
-+# define ROOT_GID 0
-+#else
-+# define ROOT_UID 197108
-+# define ROOT_GID 131616
-+#endif
-+
- extern int EOF_Reached;
-
- #define NO_PIPE -1
diff --git a/app-shells/bash/files/bash-4.0-interix-x64.patch b/app-shells/bash/files/bash-4.0-interix-x64.patch
deleted file mode 100644
index 5e3f900919..0000000000
--- a/app-shells/bash/files/bash-4.0-interix-x64.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ru bash-4.0.orig/shell.c bash-4.0/shell.c
---- bash-4.0.orig/shell.c 2009-10-06 09:39:27 +0200
-+++ bash-4.0/shell.c 2009-10-06 10:17:47 +0200
-@@ -357,6 +357,36 @@
- #ifdef __OPENNT
- char **env;
-
-+#ifdef __INTERIX
-+ /* on x64 interix, microsoft introduced freaky environment names
-+ * like COMMONPROGRAMFILES(X86) - (yes, _with_ those braces) ...
-+ * simply handle them, by transforming all '(' and ')' in the existing
-+ * environment to '_'s ... */
-+#define _ENV_RPL(var, end, srch, rpl) \
-+ while(var) { \
-+ char * _p_fnd = strchr(var, srch); \
-+ \
-+ if(!_p_fnd || _p_fnd >= end) \
-+ break; \
-+ \
-+ *_p_fnd = rpl; \
-+ }
-+
-+ {
-+ char ** _pe = environ;
-+
-+ while(_pe && *_pe) {
-+ char * _p_eq = strchr(*_pe, '=');
-+
-+ if(_p_eq) {
-+ _ENV_RPL(*_pe, _p_eq, '(', '_');
-+ _ENV_RPL(*_pe, _p_eq, ')', '_');
-+ }
-+ ++_pe;
-+ }
-+ }
-+#endif
-+
- env = environ;
- #endif /* __OPENNT */
-
diff --git a/app-shells/bash/files/bash-4.0-interix.patch b/app-shells/bash/files/bash-4.0-interix.patch
deleted file mode 100644
index 1949b12b45..0000000000
--- a/app-shells/bash/files/bash-4.0-interix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru bash-4.0.orig/lib/sh/getcwd.c bash-4.0/lib/sh/getcwd.c
---- bash-4.0.orig/lib/sh/getcwd.c 2009-05-06 11:34:51 +0200
-+++ bash-4.0/lib/sh/getcwd.c 2009-05-06 11:47:01 +0200
-@@ -50,6 +50,10 @@
-
- #include <xmalloc.h>
-
-+/* make sure this agrees with externs.h!
-+ * for some reason we cannot include it... */
-+#define MP_RMDOT 0x04
-+
- #if !defined (errno)
- extern int errno;
- #endif /* !errno */
diff --git a/app-shells/bash/files/bash-4.0-ldflags-for-build.patch b/app-shells/bash/files/bash-4.0-ldflags-for-build.patch
deleted file mode 100644
index 089264f97e..0000000000
--- a/app-shells/bash/files/bash-4.0-ldflags-for-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/211947
-
-fix from Takashi YOSHII: dont use target ldflags for build apps
-
---- bash/Makefile.in
-+++ bash/Makefile.in
-@@ -143,7 +143,7 @@
- CCFLAGS_FOR_BUILD = $(BASE_CCFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
-
- LDFLAGS = @LDFLAGS@ $(STATIC_LD) $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS)
--LDFLAGS_FOR_BUILD = $(LDFLAGS)
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
-
- INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(BASHINCDIR) -I$(LIBSRC) $(INTL_INC)
-
diff --git a/app-shells/bash/files/bash-4.0-negative-return.patch b/app-shells/bash/files/bash-4.0-negative-return.patch
deleted file mode 100644
index 32affa18c1..0000000000
--- a/app-shells/bash/files/bash-4.0-negative-return.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00158.html
-
-make `return` accept negative values again
-
-hack by me (vapier@gentoo.org) ... i'm not familiar with bash source code, so
-i imagine this isn't the best way to do it ...
-
---- bash/builtins/return.def
-+++ bash/builtins/return.def
-@@ -60,9 +60,23 @@
- return_builtin (list)
- WORD_LIST *list;
- {
-+ int neg = 0;
-+ if (list && list->word && list->word->word) {
-+ char *word = list->word->word;
-+ if (*word == '-') {
-+ while (*word++)
-+ if (!isdigit(*word))
-+ break;
-+ if (!*word)
-+ neg = 1;
-+ }
-+ }
-+
-+ if (!neg) {
- if (no_options (list))
- return (EX_USAGE);
- list = loptend; /* skip over possible `--' */
-+ }
-
- return_catch_value = get_exitstat (list);
-
diff --git a/app-shells/bash/files/bash-4.0-parallel-build.patch b/app-shells/bash/files/bash-4.0-parallel-build.patch
deleted file mode 100644
index 8384e2c901..0000000000
--- a/app-shells/bash/files/bash-4.0-parallel-build.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-http://bugs.gentoo.org/267613
-
-add missing dep
-
-patch by Peter Alfredsen
-
---- bash-4.0/Makefile.in
-+++ bash-4.0/Makefile.in
-@@ -1022,10 +1022,11 @@
- subst.o: flags.h jobs.h siglist.h execute_cmd.h ${BASHINCDIR}/filecntl.h trap.h pathexp.h
- subst.o: mailcheck.h input.h $(DEFSRC)/getopt.h $(DEFSRC)/common.h
- subst.o: bashline.h bashhist.h ${GLOB_LIBSRC}/strmatch.h
- subst.o: ${BASHINCDIR}/chartypes.h
- subst.o: ${BASHINCDIR}/shmbutil.h
-+subst.o: ${DEFDIR}/builtext.h
- test.o: bashtypes.h ${BASHINCDIR}/posixstat.h ${BASHINCDIR}/filecntl.h
- test.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
- test.o: general.h xmalloc.h bashtypes.h variables.h arrayfunc.h conftypes.h array.h hashlib.h
- test.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
- test.o: make_cmd.h subst.h sig.h pathnames.h externs.h test.h
-
-http://bugs.gentoo.org/284633
-
-and another ...
-
---- bash-4.0/lib/sh/Makefile.in
-+++ bash-4.0/lib/sh/Makefile.in
-@@ -136,6 +136,9 @@
- ${BUILD_DIR}/version.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile
- -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} version.h )
-
-+${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile
-+ -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h )
-+
- # rules for losing makes, like SunOS
- casemod.o: casemod.c
- clktck.o: clktck.c
-
-http://bugs.gentoo.org/300143
-
-and another ...
-
---- bash-4.0/lib/glob/Makefile.in
-+++ bash-4.0/lib/glob/Makefile.in
-@@ -119,6 +119,11 @@
- mostlyclean: clean
- -( cd doc && $(MAKE) $(MFLAGS) $@ )
-
-+# Dependencies
-+
-+${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile
-+ -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h )
-+
- ######################################################################
- # #
- # Dependencies for the object files which make up this library. #
-@@ -136,7 +141,7 @@
- strmatch.o: $(BUILD_DIR)/config.h
- strmatch.o: $(BASHINCDIR)/stdc.h
-
--glob.o: $(BUILD_DIR)/config.h
-+glob.o: $(BUILD_DIR)/config.h $(topdir)/shell.h $(BUILD_DIR)/pathnames.h
- glob.o: $(topdir)/bashtypes.h $(BASHINCDIR)/ansi_stdlib.h $(topdir)/bashansi.h
- glob.o: $(BASHINCDIR)/posixstat.h $(BASHINCDIR)/memalloc.h
- glob.o: strmatch.h glob.h
diff --git a/app-shells/bash/files/bash-4.1-blocking-namedpipe.patch b/app-shells/bash/files/bash-4.1-blocking-namedpipe.patch
deleted file mode 100644
index 224583dd6d..0000000000
--- a/app-shells/bash/files/bash-4.1-blocking-namedpipe.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Breaks on platforms without /dev/fd/ like AIX, so named pipes are used instead:
-bash -c 'for x in {0..9}; do echo $x; done > >(cnt=0; while read line; do let cnt=cnt+1; done; echo $cnt)'
-
---- subst.c.orig 2013-10-31 15:33:56.243896345 +0100
-+++ subst.c 2013-10-31 15:34:14.285099859 +0100
-@@ -4839,7 +4839,7 @@
-
- #if !defined (HAVE_DEV_FD)
- /* Open the named pipe in the child. */
-- fd = open (pathname, open_for_read_in_child ? O_RDONLY|O_NONBLOCK : O_WRONLY);
-+ fd = open (pathname, open_for_read_in_child ? O_RDONLY : O_WRONLY);
- if (fd < 0)
- {
- /* Two separate strings for ease of translation. */
diff --git a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
deleted file mode 100644
index 576a8a47a6..0000000000
--- a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Bash built-in test fails to correctly report exeuctable status for non-
-executable files when run by root on FreeBSD.
-
-See http://bugs.gentoo.org/303411
-
-Patch from Johan Hattne <johan.hattne@utsuthwestern.edu>
---- lib/sh/eaccess.c.orig
-+++ lib/sh/eaccess.c
-@@ -198,11 +198,19 @@
- char *path;
- int mode;
- {
-+ struct stat s;
-+ int ret;
-+
- if (path_is_devfd (path))
- return (sh_stataccess (path, mode));
-
- #if defined (HAVE_EACCESS) /* FreeBSD */
-- return (eaccess (path, mode));
-+ if (stat (path, &s) != 0)
-+ return (-1);
-+ ret = eaccess (path, mode);
-+ if (mode == X_OK && ret == 0 && !S_ISDIR(s.st_mode) && geteuid() == 0)
-+ return ((s.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) == 0 ? -1 : 0);
-+ return (ret);
- #elif defined (EFF_ONLY_OK) /* SVR4(?), SVR4.2 */
- return access (path, mode|EFF_ONLY_OK);
- #else
diff --git a/app-shells/bash/files/bash-4.1-interix-access-suacomp.patch b/app-shells/bash/files/bash-4.1-interix-access-suacomp.patch
deleted file mode 100644
index bc14b11ee2..0000000000
--- a/app-shells/bash/files/bash-4.1-interix-access-suacomp.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ru bash-4.1.orig/lib/readline/complete.c bash-4.1/lib/readline/complete.c
---- bash-4.1.orig/lib/readline/complete.c 2010-07-26 15:05:13 +0200
-+++ bash-4.1/lib/readline/complete.c 2010-07-26 15:10:34 +0200
-@@ -52,6 +52,10 @@
- #include <pwd.h>
- #endif
-
-+/* can't include externs.h here - so directly define this one. this
-+ * is required to fix interix access() which behaves totally stupid */
-+extern int sh_eaccess(char*,int);
-+
- #include "posixdir.h"
- #include "posixstat.h"
-
-@@ -571,7 +575,7 @@
- #endif
- else if (S_ISREG (finfo.st_mode))
- {
-- if (access (filename, X_OK) == 0)
-+ if (sh_eaccess (filename, X_OK) == 0)
- character = '*';
- }
- return (character);
-diff -ru bash-4.1.orig/lib/sh/eaccess.c bash-4.1/lib/sh/eaccess.c
---- bash-4.1.orig/lib/sh/eaccess.c 2010-07-26 15:05:15 +0200
-+++ bash-4.1/lib/sh/eaccess.c 2010-07-26 15:06:58 +0200
-@@ -222,8 +222,13 @@
- return (sh_euidaccess (path, mode));
- # endif
-
-+/* on interix, use stataccess always, since access on interix behaves bad:
-+ * whenever a process has appropriate priviledges (speaking in windows terms),
-+ * success is reported, even if the bits are not set. */
-+#ifndef __INTERIX
- if (current_user.uid == current_user.euid && current_user.gid == current_user.egid)
- return (access (path, mode));
-+#endif
-
- return (sh_stataccess (path, mode));
- #endif
diff --git a/app-shells/bash/files/bash-4.1-interix-stdint.patch b/app-shells/bash/files/bash-4.1-interix-stdint.patch
deleted file mode 100644
index 6ecb65a428..0000000000
--- a/app-shells/bash/files/bash-4.1-interix-stdint.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-intmax_t and uintmax_t should be looked for in stdint.h on interix
-
-reported upstream on 23 Apr 2009:
-http://lists.gnu.org/archive/html/bug-bash/2009-04/msg00142.html
-
-MODIFIED PATCH, since some of the hunks are upstream now (not all!)
-
-diff -ru bash-3.2.orig/configure.in bash-3.2/configure.in
---- bash-3.2.orig/configure.in Fri Jan 18 16:50:36 2008
-+++ bash-3.2/configure.in Fri Jan 18 16:53:09 2008
-@@ -869,8 +869,8 @@
- BASH_CHECK_TYPE(clock_t, [#include <sys/times.h>], long)
- BASH_CHECK_TYPE(sigset_t, [#include <signal.h>], int)
- BASH_CHECK_TYPE(quad_t, , long, HAVE_QUAD_T)
--BASH_CHECK_TYPE(intmax_t, , $bash_cv_type_long_long)
--BASH_CHECK_TYPE(uintmax_t, , $bash_cv_type_unsigned_long_long)
-+BASH_CHECK_TYPE(intmax_t, [#include <stdint.h>], $bash_cv_type_long_long)
-+BASH_CHECK_TYPE(uintmax_t, [#include <stdint.h>], $bash_cv_type_unsigned_long_long)
- if test "$ac_cv_header_sys_socket_h" = "yes"; then
- BASH_CHECK_TYPE(socklen_t, [#include <sys/socket.h>], int, HAVE_SOCKLEN_T)
- fi
-diff -ru -x config* bash-3.2.orig/bashtypes.h bash-3.2/bashtypes.h
---- bash-3.2.orig/bashtypes.h Fri Jan 18 17:12:07 2008
-+++ bash-3.2/bashtypes.h Fri Jan 18 17:12:38 2008
-@@ -35,4 +35,8 @@
- # include <inttypes.h>
- #endif
-
-+#if defined (HAVE_STDINT_H)
-+# include <stdint.h>
-+#endif
-+
- #endif /* _BASHTYPES_H_ */
-
diff --git a/app-shells/bash/files/bash-4.1-parallel-build.patch b/app-shells/bash/files/bash-4.1-parallel-build.patch
deleted file mode 100644
index ae44bcc0cf..0000000000
--- a/app-shells/bash/files/bash-4.1-parallel-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- bash-4.1/lib/glob/Makefile.in
-+++ bash-4.1/lib/glob/Makefile.in
-@@ -119,6 +119,11 @@
- mostlyclean: clean
- -( cd doc && $(MAKE) $(MFLAGS) $@ )
-
-+# Dependencies
-+
-+${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile
-+ -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h )
-+
- ######################################################################
- # #
- # Dependencies for the object files which make up this library. #
-@@ -136,7 +141,7 @@
- strmatch.o: $(BUILD_DIR)/config.h
- strmatch.o: $(BASHINCDIR)/stdc.h
-
--glob.o: $(BUILD_DIR)/config.h
-+glob.o: $(BUILD_DIR)/config.h $(topdir)/shell.h $(BUILD_DIR)/pathnames.h
- glob.o: $(topdir)/bashtypes.h $(BASHINCDIR)/ansi_stdlib.h $(topdir)/bashansi.h
- glob.o: $(BASHINCDIR)/posixstat.h $(BASHINCDIR)/memalloc.h
- glob.o: strmatch.h glob.h
diff --git a/app-shells/bash/files/bash-4.2-darwin13.patch b/app-shells/bash/files/bash-4.2-darwin13.patch
deleted file mode 100644
index 670e11a3e9..0000000000
--- a/app-shells/bash/files/bash-4.2-darwin13.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2013-07/msg00011.html
-https://github.com/Homebrew/homebrew/commit/5bfaa0553c8318c268cab1a169f0b6d2487e7fee#diff-13b7da79ca811b00c712f3fc37bc8cc3R61
-
-(Fixed in next bash release)
-
-From 481ac7aca4763deb475ee134884a7ab719f7b152 Mon Sep 17 00:00:00 2001
-From: Jeremy Olexa <darkside@gentoo.org>
-Date: Wed, 15 Jan 2014 21:25:24 -0600
-Subject: [PATCH] fix polite_directory_format on osx 10.9
-
----
- parse.y | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/parse.y b/parse.y
-index dc78e7e..88f0417 100644
---- a/parse.y
-+++ b/parse.y
-@@ -5271,9 +5271,18 @@ decode_prompt_string (string)
- #undef ROOT_PATH
- #undef DOUBLE_SLASH_ROOT
- else
-+ {
- /* polite_directory_format is guaranteed to return a string
- no longer than PATH_MAX - 1 characters. */
-- strcpy (t_string, polite_directory_format (t_string));
-+ /* polite_directory_format might simply return the pointer to
-+ t_string strcpy(3) tells dst and src may not overlap, OS X 10.9
-+ asserts this and triggers an abort trap if that's the case */
-+ temp = polite_directory_format (t_string);
-+ if (temp != t_string)
-+ strcpy (t_string, temp);
-+ }
-+
-+
-
- temp = trim_pathname (t_string, PATH_MAX - 1);
- /* If we're going to be expanding the prompt string later,
---
-1.8.3.4 (Apple Git-47)
-
diff --git a/app-shells/bash/files/bash-4.2-execute-job-control.patch b/app-shells/bash/files/bash-4.2-execute-job-control.patch
deleted file mode 100644
index 82b73e5157..0000000000
--- a/app-shells/bash/files/bash-4.2-execute-job-control.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-fix build when job control is disabled
-
-http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html
-http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00057.html
-http://lists.gnu.org/archive/html/bug-bash/2011-09/msg00039.html
-https://bugs.gentoo.org/383237
-
-should be fixed in next release of bash ...
-
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -2202,7 +2202,11 @@
- /* If the `lastpipe' option is set with shopt, and job control is not
- enabled, execute the last element of non-async pipelines in the
- current shell environment. */
-- if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-+ if (lastpipe_opt &&
-+#if defined(JOB_CONTROL)
-+ job_control == 0 &&
-+#endif
-+ asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
- {
- lstdin = move_to_high_fd (0, 0, 255);
- if (lstdin > 0)
diff --git a/app-shells/bash/files/bash-4.2-freebsd-pipe-open-eintr.patch b/app-shells/bash/files/bash-4.2-freebsd-pipe-open-eintr.patch
deleted file mode 100644
index e146b26f49..0000000000
--- a/app-shells/bash/files/bash-4.2-freebsd-pipe-open-eintr.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Work around named-pipe race-condition on FreeBSD
-
-https://bugs.gentoo.org/show_bug.cgi?id=447810
-Patch by Yuta SATOH
-
---- redir.c
-+++ redir.c
-@@ -632,7 +632,9 @@
- }
- else
- {
-- fd = open (filename, flags, mode);
-+ do {
-+ fd = open (filename, flags, mode);
-+ } while ((fd < 0) && (errno == EINTR));
- #if defined (AFS)
- if ((fd < 0) && (errno == EACCES))
- {
diff --git a/app-shells/bash/files/bash-4.2-no-readline.patch b/app-shells/bash/files/bash-4.2-no-readline.patch
deleted file mode 100644
index 14eb6bf421..0000000000
--- a/app-shells/bash/files/bash-4.2-no-readline.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-fix building when readline is disabled
-
---- a/builtins/complete.def
-+++ b/builtins/complete.def
-@@ -49,6 +49,8 @@ $END
-
- #include <config.h>
-
-+#ifdef READLINE
-+
- #include <stdio.h>
-
- #include "../bashtypes.h"
-@@ -867,3 +869,5 @@ compopt_builtin (list)
-
- return (ret);
- }
-+
-+#endif
diff --git a/app-shells/bash/files/bash-4.2-parallel-build.patch b/app-shells/bash/files/bash-4.2-parallel-build.patch
deleted file mode 100644
index ab2de86206..0000000000
--- a/app-shells/bash/files/bash-4.2-parallel-build.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2011-10/msg00036.html
-
-the current yacc rules allow multiple runs to generate the same files. usually
-this doesn't come up as the generated files are shipped in the tarball, but
-when you modify parse.y (applying a patch or developing or whatever), you can
-hit this problem.
-
-simple way of showing this:
- make -j y.tab.{c,h}
-a correct system would not show the yacc parser running twice :)
-
-simple patch is to have the .h file depend on the .c file, and have the .h file
-itself issue a dummy rule (to avoid make thinking things changed).
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -579,16 +579,17 @@
-
- # old rules
- GRAM_H = parser-built
--y.tab.o: y.tab.c ${GRAM_H} command.h ${BASHINCDIR}/stdc.h input.h
-+y.tab.o: y.tab.h y.tab.c ${GRAM_H} command.h ${BASHINCDIR}/stdc.h input.h
- ${GRAM_H}: y.tab.h
- @-if test -f y.tab.h ; then \
- cmp -s $@ y.tab.h 2>/dev/null || cp -p y.tab.h $@; \
- fi
--y.tab.c y.tab.h: parse.y
-+y.tab.c: parse.y
- # -if test -f y.tab.h; then mv -f y.tab.h old-y.tab.h; fi
- $(YACC) -d $(srcdir)/parse.y
- touch parser-built
- # -if cmp -s old-y.tab.h y.tab.h; then mv old-y.tab.h y.tab.h; else cp -p y.tab.h ${GRAM_H}; fi
-+y.tab.h: y.tab.c ; @true
-
- # experimental new rules - work with GNU make but not BSD (or OSF) make
- #y.tab.o: y.tab.c y.tab.h
-
-https://lists.gnu.org/archive/html/bug-bash/2011-10/msg00037.html
-
-the current code generates a bunch of local libraries in subdirs and then
-links bash against that. those subdirs sometimes need version.h. so they
-have a rule to change back up to the parent dir and build version.h (which is
-fine). the trouble is that the top level objects and the subdirs are allowed
-to build in parallel, so it's possible for multiple children to see that
-version.h is not available and that it needs to be created, so they all do.
-
-there is even more trouble is that version.h depends on all the top level
-sources, some of which are compiled (like syntax.c). so these parallel
-children all kick off a job to generate syntax.c which in turn requires the
-mksyntax helper executable. obviously multiple processes rm-ing, compiling,
-and linking the same files quickly falls apart.
-
-so tweak the subdirs to all depend on the .build target which in turn depends
-on all of these top level files being generated. now the subdirs won't try and
-recursively enter the top level.
-
-(noticed by David James)
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -597,6 +598,11 @@
- # $(YACC) -d $(srcdir)/parse.y
- # -if cmp -s old-y.tab.h y.tab.h; then mv old-y.tab.h y.tab.h; fi
-
-+# Subdirs will often times want version.h, so they'll change back up to
-+# the top level and try to create it. This causes parallel build issues
-+# so just force top level sanity before we descend.
-+$(LIBDEP): .build
-+
- $(READLINE_LIBRARY): config.h $(READLINE_SOURCE)
- @echo making $@ in ${RL_LIBDIR}
- @( { test "${RL_LIBDIR}" = "${libdir}" && exit 0; } || \
-
-http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00107.html
-
-the top level Makefile will recurse into the defdir for multiple targets
-(libbuiltins.a, common.o, bashgetopt.o, builtext.h), and since these do
-not have any declared interdependencies, parallel makes will recurse into
-the subdir and build the respective targets.
-
-nothing depends on common.o or bashgetopt.o, so those targets don't get
-used normally. this leaves libbuiltins.a and builtext.h. at a glance,
-this shouldn't be a big deal, but when we look closer, there's a subtle
-failure lurking.
-
-most of the objects in the defdir need to be generated which means they
-need to build+link the local mkbuiltins helper. the builtext.h header
-also needs to be generated by the mkbuiltins helper. so when the top
-level launches a child for libbuiltins.a and a child for builtext.h, we
-can hit a race condition where the two try to generate mkbuiltins, and
-the build randomly fails.
-
-so update libbuiltins.a to depend on builtext.h. this should be fairly
-simple since it's only a single target.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -674,7 +674,7 @@
- $(RM) $@
- ./mksyntax$(EXEEXT) -o $@
-
--$(BUILTINS_LIBRARY): $(BUILTIN_DEFS) $(BUILTIN_C_SRC) config.h ${BASHINCDIR}/memalloc.h version.h
-+$(BUILTINS_LIBRARY): $(BUILTIN_DEFS) $(BUILTIN_C_SRC) config.h ${BASHINCDIR}/memalloc.h ${DEFDIR}/builtext.h version.h
- @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) DEBUG=${DEBUG} libbuiltins.a ) || exit 1
-
- # these require special rules to circumvent make builtin rules
diff --git a/app-shells/bash/files/bash-4.2-read-retry.patch b/app-shells/bash/files/bash-4.2-read-retry.patch
deleted file mode 100644
index 44903c68af..0000000000
--- a/app-shells/bash/files/bash-4.2-read-retry.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/447810
-
-fix from upstream to workaround broken BSD kernels
-
-commit 208fdb509e072977ae7a621e916dfcd32c76047d
-Author: Chet Ramey <chet@caleb.ins.cwru.edu>
-Date: Mon Mar 4 08:09:29 2013 -0500
-
- commit bash-20130201 snapshot
-
-diff --git a/redir.c b/redir.c
-index d7da2f3..aa3d16d 100644
---- a/redir.c
-+++ b/redir.c
-@@ -650,7 +650,7 @@ redir_open (filename, flags, mode, ri)
- int flags, mode;
- enum r_instruction ri;
- {
-- int fd, r;
-+ int fd, r, e;
-
- r = find_string_in_alist (filename, _redir_special_filenames, 1);
- if (r >= 0)
-@@ -666,7 +666,16 @@ redir_open (filename, flags, mode, ri)
- }
- else
- {
-- fd = open (filename, flags, mode);
-+ do
-+ {
-+ fd = open (filename, flags, mode);
-+ e = errno;
-+ if (fd < 0 && e == EINTR)
-+ QUIT;
-+ errno = e;
-+ }
-+ while (fd < 0 && errno == EINTR);
-+
- #if defined (AFS)
- if ((fd < 0) && (errno == EACCES))
- {
diff --git a/app-shells/bash/files/bash-4.2-speed-up-read-N.patch b/app-shells/bash/files/bash-4.2-speed-up-read-N.patch
deleted file mode 100644
index b96ad0c887..0000000000
--- a/app-shells/bash/files/bash-4.2-speed-up-read-N.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2012-11/msg00034.html
-
-From 530d4988afd68ea9d2cf1b0267d4dc821d0d204f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 19 Nov 2012 17:58:51 -0500
-Subject: [PATCH] bash: speed up `read -N`
-
-Rather than using 1 byte reads, use the existing cache read logic.
-This could be sped up more, but this change is not as invasive and
-should (hopefully) be fairly safe.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- builtins/read.def | 21 ++++++++++++++++-----
- externs.h | 1 +
- lib/sh/zread.c | 15 +++++++++++++--
- 3 files changed, 30 insertions(+), 7 deletions(-)
-
-diff --git a/builtins/read.def b/builtins/read.def
-index e32dec7..81a1b3f 100644
---- a/builtins/read.def
-+++ b/builtins/read.def
-@@ -457,7 +457,10 @@ read_builtin (list)
- interrupt_immediately++;
- terminate_immediately++;
-
-- unbuffered_read = (nchars > 0) || (delim != '\n') || input_is_pipe;
-+ if ((nchars > 0) && !input_is_tty && ignore_delim)
-+ unbuffered_read = 2;
-+ else if ((nchars > 0) || (delim != '\n') || input_is_pipe)
-+ unbuffered_read = 1;
-
- if (prompt && edit == 0)
- {
-@@ -505,10 +508,18 @@ read_builtin (list)
- print_ps2 = 0;
- }
-
-- if (unbuffered_read)
-- retval = zread (fd, &c, 1);
-- else
-- retval = zreadc (fd, &c);
-+ switch (unbuffered_read)
-+ {
-+ case 2:
-+ retval = zreadcn (fd, &c, nchars - nr);
-+ break;
-+ case 1:
-+ retval = zread (fd, &c, 1);
-+ break;
-+ default:
-+ retval = zreadc (fd, &c);
-+ break;
-+ }
-
- if (retval <= 0)
- {
-diff --git a/externs.h b/externs.h
-index 09244fa..a5ad645 100644
---- a/externs.h
-+++ b/externs.h
-@@ -479,6 +479,7 @@ extern ssize_t zread __P((int, char *, size_t));
- extern ssize_t zreadretry __P((int, char *, size_t));
- extern ssize_t zreadintr __P((int, char *, size_t));
- extern ssize_t zreadc __P((int, char *));
-+extern ssize_t zreadcn __P((int, char *, int));
- extern ssize_t zreadcintr __P((int, char *));
- extern void zreset __P((void));
- extern void zsyncfd __P((int));
-diff --git a/lib/sh/zread.c b/lib/sh/zread.c
-index 5db21a9..af7d02b 100644
---- a/lib/sh/zread.c
-+++ b/lib/sh/zread.c
-@@ -101,15 +101,18 @@ static char lbuf[128];
- static size_t lind, lused;
-
- ssize_t
--zreadc (fd, cp)
-+zreadcn (fd, cp, len)
- int fd;
- char *cp;
-+ int len;
- {
- ssize_t nr;
-
- if (lind == lused || lused == 0)
- {
-- nr = zread (fd, lbuf, sizeof (lbuf));
-+ if (len > sizeof (lbuf))
-+ len = sizeof (lbuf);
-+ nr = zread (fd, lbuf, len);
- lind = 0;
- if (nr <= 0)
- {
-@@ -123,6 +126,14 @@ zreadc (fd, cp)
- return 1;
- }
-
-+ssize_t
-+zreadc (fd, cp)
-+ int fd;
-+ char *cp;
-+{
-+ return zreadcn (fd, cp, sizeof (lbuf));
-+}
-+
- /* Don't mix calls to zreadc and zreadcintr in the same function, since they
- use the same local buffer. */
- ssize_t
---
-1.7.12.4
-
diff --git a/app-shells/bash/files/bash-4.3-append-process-segfault.patch b/app-shells/bash/files/bash-4.3-append-process-segfault.patch
deleted file mode 100644
index 6c9b2e8306..0000000000
--- a/app-shells/bash/files/bash-4.3-append-process-segfault.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2014-08/msg00048.html
-
-*** ../bash-4.3-patched/execute_cmd.c 2014-07-30 10:26:52.000000000 -0400
---- execute_cmd.c 2014-08-11 16:55:57.000000000 -0400
-***************
-*** 2406,2410 ****
- {
- #if defined (JOB_CONTROL)
-! append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid);
- #endif
- lstdin = wait_for (lastpid);
---- 2433,2438 ----
- {
- #if defined (JOB_CONTROL)
-! if (INVALID_JOB (lastpipe_jid) == 0)
-! append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid);
- #endif
- lstdin = wait_for (lastpid);
diff --git a/app-shells/bash/files/bash-4.3-arrayfunc.patch b/app-shells/bash/files/bash-4.3-arrayfunc.patch
deleted file mode 100644
index f44d184784..0000000000
--- a/app-shells/bash/files/bash-4.3-arrayfunc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00178.html
-
-diff --git a/arrayfunc.c b/arrayfunc.c
-index 804e6da..0f900aa 100644
---- a/arrayfunc.c
-+++ b/arrayfunc.c
-@@ -498,7 +498,7 @@ assign_compound_array_list (var, nlist, flags)
-
- for (list = nlist; list; list = list->next)
- {
-- iflags = flags;
-+ iflags = (flags & ~ASS_APPEND);
- w = list->word->word;
-
- /* We have a word of the form [ind]=value */
diff --git a/app-shells/bash/files/bash-4.3-compat-lvl.patch b/app-shells/bash/files/bash-4.3-compat-lvl.patch
deleted file mode 100644
index 5734687ffe..0000000000
--- a/app-shells/bash/files/bash-4.3-compat-lvl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html
-
---- a/builtins/shopt.def
-+++ b/builtins/shopt.def
-@@ -160,7 +160,7 @@ static struct {
- { "compat32", &shopt_compat32, set_compatibility_level },
- { "compat40", &shopt_compat40, set_compatibility_level },
- { "compat41", &shopt_compat41, set_compatibility_level },
-- { "compat42", &shopt_compat41, set_compatibility_level },
-+ { "compat42", &shopt_compat42, set_compatibility_level },
- #if defined (READLINE)
- { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
- { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
diff --git a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch
deleted file mode 100644
index 20bf340fdb..0000000000
--- a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00097.html
-
---- bash-4.3/builtins/mapfile.def
-+++ bash-4.3/builtins/mapfile.def
-@@ -339,7 +339,7 @@
- else
- array_name = list->word->word;
-
-- if (legal_identifier (array_name) == 0 && valid_array_reference (array_name) == 0)
-+ if (legal_identifier (array_name) == 0)
- {
- sh_invalidid (array_name);
- return (EXECUTION_FAILURE);
diff --git a/app-shells/bash/files/bash-4.3-parse-time-keyword.patch b/app-shells/bash/files/bash-4.3-parse-time-keyword.patch
deleted file mode 100644
index cd516e5c66..0000000000
--- a/app-shells/bash/files/bash-4.3-parse-time-keyword.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00034.html
-
-*** ../bash-4.3-patched/parse.y 2014-04-07 11:56:12.000000000 -0400
---- parse.y 2014-06-11 10:25:53.000000000 -0400
-***************
-*** 2789,2797 ****
- case OR_OR:
- case '&':
- case DO:
- case THEN:
- case ELSE:
- case '{': /* } */
-! case '(': /* ) */
- case BANG: /* ! time pipeline */
- case TIME: /* time time pipeline */
---- 2789,2802 ----
- case OR_OR:
- case '&':
-+ case WHILE:
- case DO:
-+ case UNTIL:
-+ case IF:
- case THEN:
-+ case ELIF:
- case ELSE:
- case '{': /* } */
-! case '(': /* )( */
-! case ')': /* only valid in case statement */
- case BANG: /* ! time pipeline */
- case TIME: /* time time pipeline */
diff --git a/app-shells/bash/files/bash-4.3-protos.patch b/app-shells/bash/files/bash-4.3-protos.patch
deleted file mode 100644
index 7af84ff707..0000000000
--- a/app-shells/bash/files/bash-4.3-protos.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/redir.c
-+++ b/redir.c
-@@ -31,6 +31,7 @@
- #endif
- #include "filecntl.h"
- #include "posixstat.h"
-+#include "trap.h"
-
- #if defined (HAVE_UNISTD_H)
- # include <unistd.h>
diff --git a/app-shells/bash/files/bash-4.3-term-cleanup.patch b/app-shells/bash/files/bash-4.3-term-cleanup.patch
deleted file mode 100644
index be7a5def76..0000000000
--- a/app-shells/bash/files/bash-4.3-term-cleanup.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00031.html
-
-*** ../bash-4.3-patched/bashline.c 2014-05-14 09:22:39.000000000 -0400
---- bashline.c 2014-09-08 11:28:56.000000000 -0400
-***************
-*** 203,206 ****
---- 203,207 ----
- extern int array_needs_making;
- extern int posixly_correct, no_symbolic_links;
-+ extern int sigalrm_seen;
- extern char *current_prompt_string, *ps1_prompt;
- extern STRING_INT_ALIST word_token_alist[];
-***************
-*** 4209,4214 ****
- /* If we're going to longjmp to top_level, make sure we clean up readline.
- check_signals will call QUIT, which will eventually longjmp to top_level,
-! calling run_interrupt_trap along the way. */
-! if (interrupt_state)
- rl_cleanup_after_signal ();
- bashline_reset_event_hook ();
---- 4262,4268 ----
- /* If we're going to longjmp to top_level, make sure we clean up readline.
- check_signals will call QUIT, which will eventually longjmp to top_level,
-! calling run_interrupt_trap along the way. The check for sigalrm_seen is
-! to clean up the read builtin's state. */
-! if (terminating_signal || interrupt_state || sigalrm_seen)
- rl_cleanup_after_signal ();
- bashline_reset_event_hook ();
-*** ../bash-4.3-patched/sig.c 2014-01-10 15:06:06.000000000 -0500
---- sig.c 2014-09-08 11:26:33.000000000 -0400
-***************
-*** 533,538 ****
- /* Set the event hook so readline will call it after the signal handlers
- finish executing, so if this interrupted character input we can get
-! quick response. */
-! if (interactive_shell && interactive && no_line_editing == 0)
- bashline_set_event_hook ();
- #endif
---- 533,540 ----
- /* Set the event hook so readline will call it after the signal handlers
- finish executing, so if this interrupted character input we can get
-! quick response. If readline is active or has modified the terminal we
-! need to set this no matter what the signal is, though the check for
-! RL_STATE_TERMPREPPED is possibly redundant. */
-! if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE (RL_STATE_TERMPREPPED))
- bashline_set_event_hook ();
- #endif
diff --git a/app-shells/bash/files/bash-4.3_p39-cygwin-r2.patch b/app-shells/bash/files/bash-4.3_p39-cygwin-r2.patch
deleted file mode 100644
index 1a0ffc36fa..0000000000
--- a/app-shells/bash/files/bash-4.3_p39-cygwin-r2.patch
+++ /dev/null
@@ -1,690 +0,0 @@
-based on Cygwin bash-4.3.39-2.src package
-
---- origsrc/bash-4.3/bashline.c 2015-06-01 22:41:57.804475900 -0600
-+++ src/bash-4.3/bashline.c 2015-06-02 22:22:59.745114200 -0600
-@@ -264,6 +274,11 @@ int no_empty_command_completion;
- are the only possible matches, even if FIGNORE says to. */
- int force_fignore = 1;
-
-+#if __CYGWIN__
-+/* If set, shorten "foo.exe" to "foo" when they are the same file. */
-+int completion_strip_exe;
-+#endif /* __CYGWIN__ */
-+
- /* Perform spelling correction on directory names during word completion */
- int dircomplete_spelling = 0;
-
-@@ -2109,6 +2127,21 @@ globword:
-
- if (match && executable_completion ((searching_path ? val : cval), searching_path))
- {
-+#if __CYGWIN__
-+ if (completion_strip_exe)
-+ {
-+ size_t val_len = strlen (val);
-+ char *candidate;
-+ if (val_len > 4 && !strcasecmp (&val[val_len - 4], ".exe")
-+ && (candidate = strdup (val)))
-+ {
-+ candidate[val_len - 4] = '\0';
-+ if (same_file (val, candidate, NULL, NULL))
-+ temp[strlen (temp) - 4] = '\0';
-+ free (candidate);
-+ }
-+ }
-+#endif
- if (cval != val)
- free (cval);
- free (val);
-@@ -2844,6 +2877,17 @@ test_for_directory (name)
- int r;
-
- fn = bash_tilde_expand (name, 0);
-+#if __CYGWIN__
-+ /* stat("//server") can only be successful as a directory, but takes
-+ a several-second timeout to fail. It is much faster to assume
-+ that //server is a valid name than it is to wait for the stat,
-+ even though it gives false positives on bad names. */
-+ if (fn[0] == '/' && fn[1] == '/' && ! strchr (&fn[2], '/'))
-+ {
-+ free (fn);
-+ return 1;
-+ }
-+#endif /* __CYGWIN__ */
- r = file_isdir (fn);
- free (fn);
-
---- origsrc/bash-4.3/builtins/set.def 2015-06-01 22:41:57.850941500 -0600
-+++ src/bash-4.3/builtins/set.def 2015-06-02 22:22:59.760951100 -0600
-@@ -56,6 +56,13 @@ extern int dont_save_function_defs;
- #if defined (READLINE)
- extern int no_line_editing;
- #endif /* READLINE */
-+#if __CYGWIN__
-+extern int igncr;
-+static int set_minus_o_option_maybe (int, const char *, int);
-+# define INTERACTIVE_ONLY ,1
-+#else /* ! __CYGWIN__ */
-+# define INTERACTIVE_ONLY
-+#endif
-
- $BUILTIN set
- $FUNCTION set_builtin
-@@ -92,6 +99,9 @@ Options:
- #if defined (HISTORY)
- history enable command history
- #endif
-+#if __CYGWIN__
-+ igncr on cygwin, ignore \r in line endings
-+#endif
- ignoreeof the shell will not exit upon reading EOF
- interactive-comments
- allow comments to appear in interactive commands
-@@ -188,29 +198,41 @@ const struct {
- int *variable;
- setopt_set_func_t *set_func;
- setopt_get_func_t *get_func;
-+#if __CYGWIN__
-+ /* Cygwin users have taken to exporting SHELLOPTS for the
-+ cygwin-specific igncr. As a result, we need to make sure
-+ SHELLOPTS parsing does not turn on interactive options when
-+ exported from an interactive shell, but parsed in a
-+ non-interactive setting, since some interactive options violate
-+ POSIX /bin/sh rules. */
-+ int interactive_only;
-+#endif /* __CYGWIN__ */
- } o_options[] = {
- { "allexport", 'a', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- #if defined (BRACE_EXPANSION)
- { "braceexpand",'B', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- #endif
- #if defined (READLINE)
-- { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode },
-+ { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY},
- #endif
- { "errexit", 'e', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- { "errtrace", 'E', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- { "functrace", 'T', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- { "hashall", 'h', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- #if defined (BANG_HISTORY)
-- { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
-+ { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY},
- #endif /* BANG_HISTORY */
- #if defined (HISTORY)
-- { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL },
-+ { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL INTERACTIVE_ONLY},
-+#endif
-+#if __CYGWIN__
-+ { "igncr", '\0', &igncr, NULL, (setopt_get_func_t *)NULL },
- #endif
- { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL },
- { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- { "keyword", 'k', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- #if defined (JOB_CONTROL)
-- { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
-+ { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY},
- #endif
- { "noclobber", 'C', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- { "noexec", 'n', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
-@@ -229,7 +251,7 @@ const struct {
- { "privileged", 'p', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- { "verbose", 'v', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- #if defined (READLINE)
-- { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode },
-+ { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY},
- #endif
- { "xtrace", 'x', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- {(char *)NULL, 0 , (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
-@@ -416,6 +438,15 @@ int
- set_minus_o_option (on_or_off, option_name)
- int on_or_off;
- char *option_name;
-+#if __CYGWIN__
-+{
-+ /* See cygwin comments above. */
-+ return set_minus_o_option_maybe (on_or_off, option_name, 0);
-+}
-+static int
-+set_minus_o_option_maybe (int on_or_off, const char *option_name,
-+ int avoid_interactive)
-+#endif /* __CYGWIN__ */
- {
- register int i;
-
-@@ -423,6 +454,10 @@ set_minus_o_option (on_or_off, option_na
- {
- if (STREQ (option_name, o_options[i].name))
- {
-+#if __CYGWIN__
-+ if (o_options[i].interactive_only && avoid_interactive)
-+ return EXECUTION_SUCCESS;
-+#endif /* __CYGWIN__ */
- if (o_options[i].letter == 0)
- {
- SET_BINARY_O_OPTION_VALUE (i, on_or_off, option_name);
-@@ -548,7 +583,11 @@ parse_shellopts (value)
- vptr = 0;
- while (vname = extract_colon_unit (value, &vptr))
- {
-+#if __CYGWIN__
-+ set_minus_o_option_maybe (FLAG_ON, vname, !interactive_shell);
-+#else /* !__CYGWIN__ */
- set_minus_o_option (FLAG_ON, vname);
-+#endif
- free (vname);
- }
- }
---- origsrc/bash-4.3/builtins/shopt.def 2013-02-27 07:43:20.000000000 -0700
-+++ src/bash-4.3/builtins/shopt.def 2015-06-02 22:22:59.760951100 -0600
-@@ -91,6 +91,11 @@ extern int glob_star;
- extern int glob_asciirange;
- extern int lastpipe_opt;
-
-+#if __CYGWIN__
-+extern int completion_strip_exe;
-+#endif
-+
-+
- #if defined (EXTENDED_GLOB)
- extern int extended_glob;
- #endif
-@@ -161,6 +166,9 @@ static struct {
- { "compat40", &shopt_compat40, set_compatibility_level },
- { "compat41", &shopt_compat41, set_compatibility_level },
- { "compat42", &shopt_compat42, set_compatibility_level },
-+#if __CYGWIN__
-+ { "completion_strip_exe", &completion_strip_exe, NULL },
-+#endif
- #if defined (READLINE)
- { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
- { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
---- origsrc/bash-4.3/doc/bash.1 2014-02-06 07:03:52.000000000 -0700
-+++ src/bash-4.3/doc/bash.1 2015-06-02 22:22:59.760951100 -0600
-@@ -1658,6 +1658,14 @@ subsequently reset.
- Expands to the effective user ID of the current user, initialized at
- shell startup. This variable is readonly.
- .TP
-+.B EXECIGNORE
-+A colon-separated list of extended glob (see \fBPattern Matching\fP)
-+patterns. Files with full paths matching one of these patterns are
-+not considered executable for the purposes of completion and PATH
-+searching, but the \fB[\fP, \fB[[\fP, and \fBtest\fP builtins are not
-+affected. Use this variable to deal with systems that set the
-+executable bit on files that are not actually executable.
-+.TP
- .B FUNCNAME
- An array variable containing the names of all shell functions
- currently in the execution call stack.
-@@ -3308,6 +3316,10 @@ the character
- .B ``.''
- at the start of a name or immediately following a slash
- must be matched explicitly, unless the shell option
-+.B completion_strip_exe
-+If set, whenever bash sees `foo.exe' during completion, it checks if
-+`foo' is the same file and strips the suffix.
-+.TP 8
- .B dotglob
- is set.
- When matching a pathname, the slash character must always be
---- origsrc/bash-4.3/doc/bashref.texi 2014-02-22 11:20:36.000000000 -0700
-+++ src/bash-4.3/doc/bashref.texi 2015-06-02 22:22:59.776306300 -0600
-@@ -4992,6 +4992,10 @@ filenames.
- This variable is set by default, which is the default Bash behavior in
- versions through 4.2.
-
-+@item completion_strip_exe
-+If set, whenever bash sees `foo.exe' during completion, it checks if
-+`foo' is the same file and strips the suffix.
-+
- @item direxpand
- If set, Bash
- replaces directory names with the results of word expansion when performing
-@@ -5578,6 +5582,14 @@ Similar to @code{BASH_ENV}; used when th
- The numeric effective user id of the current user. This variable
- is readonly.
-
-+@item EXECIGNORE
-+A colon-separated list of extended glob ((@pxref{Pattern Matching})
-+patterns. Files with full paths matching one of these patterns are
-+not considered executable for the purposes of completion and PATH
-+searching, but the @code{[}, @code{[[}, and @code{test} builtins are
-+not affected. Use this variable to deal with systems that set the
-+executable bit on files that are not actually executable.
-+
- @item FCEDIT
- The editor used as a default by the @option{-e} option to the @code{fc}
- builtin command.
---- origsrc/bash-4.3/execute_cmd.c 2015-06-01 22:41:57.242554200 -0600
-+++ src/bash-4.3/execute_cmd.c 2015-06-02 22:22:59.776306300 -0600
-@@ -58,6 +58,7 @@ extern int errno;
- #endif
-
- #define NEED_FPURGE_DECL
-+#define NEED_SH_SETLINEBUF_DECL /* used in externs.h */
-
- #include "bashansi.h"
- #include "bashintl.h"
---- origsrc/bash-4.3/expr.c 2014-01-03 06:55:00.000000000 -0700
-+++ src/bash-4.3/expr.c 2015-06-02 22:22:59.776306300 -0600
-@@ -83,6 +83,7 @@
-
- #include "shell.h"
- #include "typemax.h" /* INTMAX_MAX, INTMAX_MIN */
-+#define exp2 exp2_
-
- /* Because of the $((...)) construct, expressions may include newlines.
- Here is a macro which accepts newlines, tabs and spaces as whitespace. */
---- origsrc/bash-4.3/findcmd.c 2012-10-15 05:45:04.000000000 -0600
-+++ src/bash-4.3/findcmd.c 2015-06-02 22:22:59.776306300 -0600
-@@ -48,6 +48,8 @@
- extern int errno;
- #endif
-
-+#include <glob/strmatch.h>
-+
- extern int posixly_correct;
- extern int last_command_exit_value;
-
-@@ -77,6 +79,38 @@ int check_hashed_filenames;
- containing the file of interest. */
- int dot_found_in_search = 0;
-
-+static struct ignorevar execignore =
-+{
-+ "EXECIGNORE",
-+ (struct ign *)0,
-+ 0,
-+ (char *)0,
-+ (sh_iv_item_func_t *)0,
-+};
-+
-+void
-+setup_exec_ignore (char *varname)
-+{
-+ setup_ignore_patterns (&execignore);
-+}
-+
-+/* Return whether we should never consider file executable
-+ * even if the system tells us it is. */
-+static int
-+is_on_exec_blacklist (char *name)
-+{
-+ struct ign *p;
-+ int flags = FNM_EXTMATCH | FNM_CASEFOLD;
-+
-+ for (p = execignore.ignores; p && p->val; p++)
-+ {
-+ if (strmatch (p->val, (char *)name, flags) != FNM_NOMATCH)
-+ return (1);
-+ }
-+
-+ return (0);
-+}
-+
- /* Return some flags based on information about this file.
- The EXISTS bit is non-zero if the file is found.
- The EXECABLE bit is non-zero the file is executble.
-@@ -104,7 +138,7 @@ file_status (name)
- file access mechanisms into account. eaccess uses the effective
- user and group IDs, not the real ones. We could use sh_eaccess,
- but we don't want any special treatment for /dev/fd. */
-- if (eaccess (name, X_OK) == 0)
-+ if (!is_on_exec_blacklist (name) && eaccess (name, X_OK) == 0)
- r |= FS_EXECABLE;
- if (eaccess (name, R_OK) == 0)
- r |= FS_READABLE;
---- origsrc/bash-4.3/findcmd.h 2012-01-14 16:56:25.000000000 -0700
-+++ src/bash-4.3/findcmd.h 2015-06-02 22:22:59.776306300 -0600
-@@ -31,5 +31,6 @@ extern char *find_user_command __P((cons
- extern char *find_path_file __P((const char *));
- extern char *search_for_command __P((const char *, int));
- extern char *user_command_matches __P((const char *, int, int));
-+extern void setup_exec_ignore __P((char *));
-
- #endif /* _FINDCMD_H_ */
---- origsrc/bash-4.3/general.c 2014-01-30 14:46:15.000000000 -0700
-+++ src/bash-4.3/general.c 2015-06-02 22:22:59.791899800 -0600
-@@ -44,6 +44,10 @@
-
- #include <tilde/tilde.h>
-
-+#ifdef __CYGWIN__
-+# include <sys/cygwin.h>
-+#endif
-+
- #if !defined (errno)
- extern int errno;
- #endif /* !errno */
-@@ -632,7 +636,8 @@ make_absolute (string, dot_path)
- {
- char pathbuf[PATH_MAX + 1];
-
-- cygwin_conv_to_full_posix_path (string, pathbuf);
-+ cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, string, pathbuf,
-+ sizeof pathbuf);
- result = savestring (pathbuf);
- }
- #else
---- origsrc/bash-4.3/include/posixjmp.h 2012-12-23 20:20:50.000000000 -0700
-+++ src/bash-4.3/include/posixjmp.h 2015-06-02 22:22:59.791899800 -0600
-@@ -27,13 +27,15 @@
-
- #if defined (HAVE_POSIX_SIGSETJMP)
- # define procenv_t sigjmp_buf
--# if !defined (__OPENNT)
-+# if !defined (__OPENNT) && !defined __CYGWIN__
- # undef setjmp
- # define setjmp(x) sigsetjmp((x), 1)
--# define setjmp_nosigs(x) sigsetjmp((x), 0)
- # undef longjmp
- # define longjmp(x, n) siglongjmp((x), (n))
--# endif /* !__OPENNT */
-+# endif /* !__OPENNT && !__CYGWIN__ */
-+# if !defined (__OPENNT)
-+# define setjmp_nosigs(x) sigsetjmp((x), 0)
-+# endif /* !__OPENNT */
- #else
- # define procenv_t jmp_buf
- # define setjmp_nosigs setjmp
---- origsrc/bash-4.3/input.c 2014-02-07 07:13:08.000000000 -0700
-+++ src/bash-4.3/input.c 2015-06-02 22:22:59.791899800 -0600
-@@ -44,6 +44,10 @@
- #include "quit.h"
- #include "trap.h"
-
-+#if __CYGWIN__
-+int igncr;
-+#endif
-+
- #if !defined (errno)
- extern int errno;
- #endif /* !errno */
-@@ -561,6 +565,19 @@ buffered_getchar ()
- {
- CHECK_TERMSIG;
-
-+#if __CYGWIN__
-+ /* shopt igncr means to discard carriage returns from input stream.
-+ If cr is the only character in the buffer, then recurse to pick
-+ up the next character; otherwise flatten the buffer. */
-+ if (igncr)
-+ {
-+ int ch;
-+ while ((ch = bufstream_getc (buffers[bash_input.location.buffered_fd]))
-+ == '\r')
-+ ;
-+ return ch;
-+ }
-+#endif /* __CYGWIN__ */
- #if !defined (DJGPP)
- return (bufstream_getc (buffers[bash_input.location.buffered_fd]));
- #else
---- origsrc/bash-4.3/lib/sh/pathphys.c 2013-05-28 13:33:58.000000000 -0600
-+++ src/bash-4.3/lib/sh/pathphys.c 2015-06-02 22:22:59.823097800 -0600
-@@ -35,6 +35,7 @@
- #include <stdio.h>
- #include <chartypes.h>
- #include <errno.h>
-+#include <stdlib.h>
-
- #include "shell.h"
-
-@@ -76,6 +77,10 @@ sh_physpath (path, flags)
- char *path;
- int flags;
- {
-+#if __CYGWIN__
-+ /* realpath does this correctly without all the hassle */
-+ return realpath (path, NULL);
-+#else
- char tbuf[PATH_MAX+1], linkbuf[PATH_MAX+1];
- char *result, *p, *q, *qsave, *qbase, *workpath;
- int double_slash_path, linklen, nlink;
-@@ -214,11 +219,7 @@ error:
- {
- q = result;
- /* Duplicating some code here... */
--#if defined (__CYGWIN__)
-- qbase = (ISALPHA((unsigned char)workpath[0]) && workpath[1] == ':') ? workpath + 3 : workpath + 1;
--#else
- qbase = workpath + 1;
--#endif
- double_slash_path = DOUBLE_SLASH (workpath);
- qbase += double_slash_path;
-
-@@ -249,6 +250,7 @@ error:
- }
-
- return (result);
-+#endif /* ! __CYGWIN__ */
- }
-
- char *
---- origsrc/bash-4.3/lib/sh/tmpfile.c 2013-12-18 15:50:13.000000000 -0700
-+++ src/bash-4.3/lib/sh/tmpfile.c 2015-06-02 22:22:59.823097800 -0600
-@@ -96,7 +96,7 @@ get_tmpdir (flags)
- if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX))
- tdir = 0;
-
-- if (tdir == 0)
-+ if (tdir == 0 || !file_iswdir (tdir))
- tdir = get_sys_tmpdir ();
-
- #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX)
-@@ -118,14 +118,15 @@ sh_mktmpname (nameroot, flags)
- struct stat sb;
- int r, tdlen;
-
-- filename = (char *)xmalloc (PATH_MAX + 1);
-+ filename = NULL;
- tdir = get_tmpdir (flags);
- tdlen = strlen (tdir);
-
- lroot = nameroot ? nameroot : DEFAULT_NAMEROOT;
-
- #ifdef USE_MKTEMP
-- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot);
-+ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0)
-+ return NULL;
- if (mktemp (filename) == 0)
- {
- free (filename);
-@@ -138,7 +139,9 @@ sh_mktmpname (nameroot, flags)
- (unsigned long) time ((time_t *)0) ^
- (unsigned long) dollar_dollar_pid ^
- (unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++);
-- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
-+ free (filename);
-+ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0)
-+ return NULL;
- if (tmpnamelen > 0 && tmpnamelen < 32)
- filename[tdlen + 1 + tmpnamelen] = '\0';
- # ifdef HAVE_LSTAT
-@@ -163,14 +166,19 @@ sh_mktmpfd (nameroot, flags, namep)
- char *filename, *tdir, *lroot;
- int fd, tdlen;
-
-- filename = (char *)xmalloc (PATH_MAX + 1);
-+ filename = NULL;
- tdir = get_tmpdir (flags);
- tdlen = strlen (tdir);
-
- lroot = nameroot ? nameroot : DEFAULT_NAMEROOT;
-
- #ifdef USE_MKSTEMP
-- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot);
-+ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0)
-+ {
-+ if (namep)
-+ *namep = NULL;
-+ return -1;
-+ }
- fd = mkstemp (filename);
- if (fd < 0 || namep == 0)
- {
-@@ -187,7 +195,13 @@ sh_mktmpfd (nameroot, flags, namep)
- (unsigned long) time ((time_t *)0) ^
- (unsigned long) dollar_dollar_pid ^
- (unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++);
-- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
-+ free (filename);
-+ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0)
-+ {
-+ if (namep)
-+ *namep = NULL;
-+ return -1;
-+ }
- if (tmpnamelen > 0 && tmpnamelen < 32)
- filename[tdlen + 1 + tmpnamelen] = '\0';
- fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY), 0600);
---- origsrc/bash-4.3/parse.y 2015-06-01 22:41:58.022560000 -0600
-+++ src/bash-4.3/parse.y 2015-06-02 22:22:59.838697600 -0600
-@@ -1531,14 +1531,20 @@ yy_string_get ()
- string = bash_input.location.string;
-
- /* If the string doesn't exist, or is empty, EOF found. */
-- if (string && *string)
-+ while (string && *string)
- {
- c = *string++;
- bash_input.location.string = string;
-+#if __CYGWIN__
-+ {
-+ extern int igncr;
-+ if (igncr && c == '\r')
-+ continue;
-+ }
-+#endif
- return (c);
- }
-- else
-- return (EOF);
-+ return (EOF);
- }
-
- static int
-@@ -2305,7 +2311,7 @@ shell_getc (remove_quoted_newline)
- if (n <= 2) /* we have to save 1 for the newline added below */
- {
- if (truncating == 0)
-- internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%llu): line truncated", shell_input_line_size, SIZE_MAX);
-+ internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%zu): line truncated", shell_input_line_size, SIZE_MAX);
- shell_input_line[i] = '\0';
- truncating = 1;
- }
-@@ -3587,7 +3593,6 @@ parse_comsub (qc, open, close, lenp, fla
-
- while (count)
- {
--comsub_readchar:
- ch = shell_getc (qc != '\'' && (tflags & (LEX_INCOMMENT|LEX_PASSNEXT)) == 0);
-
- if (ch == EOF)
---- origsrc/bash-4.3/pathexp.h 2009-01-04 12:32:40.000000000 -0700
-+++ src/bash-4.3/pathexp.h 2015-06-02 22:22:59.838697600 -0600
-@@ -86,7 +86,7 @@ struct ign {
- typedef int sh_iv_item_func_t __P((struct ign *));
-
- struct ignorevar {
-- char *varname; /* FIGNORE or GLOBIGNORE */
-+ char *varname; /* FIGNORE or GLOBIGNORE or EXECIGNORE */
- struct ign *ignores; /* Store the ignore strings here */
- int num_ignores; /* How many are there? */
- char *last_ignoreval; /* Last value of variable - cached for speed */
---- origsrc/bash-4.3/subst.c 2015-06-01 22:41:57.367407300 -0600
-+++ src/bash-4.3/subst.c 2015-06-02 22:22:59.838697600 -0600
-@@ -41,6 +41,7 @@
- #include "posixstat.h"
- #include "bashintl.h"
-
-+#define NEED_SH_SETLINEBUF_DECL /* used in externs.h */
- #include "shell.h"
- #include "parser.h"
- #include "flags.h"
-@@ -5268,6 +5269,13 @@ read_comsub (fd, quoted, rflag)
- #endif
- continue;
- }
-+#if __CYGWIN__
-+ {
-+ extern int igncr;
-+ if (igncr && c == '\r')
-+ continue;
-+ }
-+#endif /* __CYGWIN__ */
-
- /* Add the character to ISTRING, possibly after resizing it. */
- RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE);
-@@ -5385,6 +5393,28 @@ command_substitute (string, quoted)
- goto error_exit;
- }
-
-+#if __CYGWIN__
-+ /* Passing a pipe through std fds can cause hangs when talking to a
-+ non-cygwin child. Move it. */
-+ if (fildes[0] < 3)
-+ {
-+ int fd = fcntl (fildes[0], F_DUPFD, 3);
-+ close (fildes[0]);
-+ fildes[0] = fd;
-+ }
-+ if (fildes[1] < 3)
-+ {
-+ int fd = fcntl (fildes[1], F_DUPFD, 3);
-+ close (fildes[1]);
-+ fildes[1] = fd;
-+ }
-+ if (fildes[0] < 0 || fildes[1] < 0)
-+ {
-+ sys_error (_("cannot make pipe for command substitution"));
-+ goto error_exit;
-+ }
-+#endif /* __CYGWIN__ */
-+
- old_pid = last_made_pid;
- #if defined (JOB_CONTROL)
- old_pipeline_pgrp = pipeline_pgrp;
---- origsrc/bash-4.3/variables.c 2015-06-01 22:41:57.928984100 -0600
-+++ src/bash-4.3/variables.c 2015-06-02 22:22:59.854339600 -0600
-@@ -4681,6 +4681,8 @@ static struct name_and_function special_
- { "COMP_WORDBREAKS", sv_comp_wordbreaks },
- #endif
-
-+ { "EXECIGNORE", sv_execignore },
-+
- { "FUNCNEST", sv_funcnest },
-
- { "GLOBIGNORE", sv_globignore },
-@@ -4879,6 +4881,13 @@ sv_globignore (name)
- setup_glob_ignore (name);
- }
-
-+/* What to do when EXECIGNORE changes. */
-+void
-+sv_execignore (char *name)
-+{
-+ setup_exec_ignore (name);
-+}
-+
- #if defined (READLINE)
- void
- sv_comp_wordbreaks (name)
-@@ -4952,7 +4961,7 @@ sv_winsize (name)
- /* Update the value of HOME in the export environment so tilde expansion will
- work on cygwin. */
- #if defined (__CYGWIN__)
--sv_home (name)
-+void sv_home (name)
- char *name;
- {
- array_needs_making = 1;
---- origsrc/bash-4.3/variables.h 2014-01-08 13:33:29.000000000 -0700
-+++ src/bash-4.3/variables.h 2015-06-02 22:22:59.854339600 -0600
-@@ -372,6 +372,7 @@ extern void sv_ifs __P((char *));
- extern void sv_path __P((char *));
- extern void sv_mail __P((char *));
- extern void sv_funcnest __P((char *));
-+extern void sv_execignore __P((char *));
- extern void sv_globignore __P((char *));
- extern void sv_ignoreeof __P((char *));
- extern void sv_strict_posix __P((char *));
diff --git a/app-shells/bash/files/bash-4.4-history-alloclist.patch b/app-shells/bash/files/bash-4.4-history-alloclist.patch
deleted file mode 100644
index 8072bde5e2..0000000000
--- a/app-shells/bash/files/bash-4.4-history-alloclist.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-*** ../bash-4.4/lib/readline/history.c 2015-12-28 13:50:31.000000000 -0500
---- lib/readline/history.c 2016-09-30 14:28:40.000000000 -0400
-***************
-*** 58,61 ****
---- 58,63 ----
- #define DEFAULT_HISTORY_INITIAL_SIZE 502
-
-+ #define MAX_HISTORY_INITIAL_SIZE 8192
-+
- /* The number of slots to increase the_history by. */
- #define DEFAULT_HISTORY_GROW_SIZE 50
-***************
-*** 308,312 ****
- {
- if (history_stifled && history_max_entries > 0)
-! history_size = history_max_entries + 2;
- else
- history_size = DEFAULT_HISTORY_INITIAL_SIZE;
---- 310,316 ----
- {
- if (history_stifled && history_max_entries > 0)
-! history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
-! ? MAX_HISTORY_INITIAL_SIZE
-! : history_max_entries + 2;
- else
- history_size = DEFAULT_HISTORY_INITIAL_SIZE;
diff --git a/app-shells/bash/files/bash-4.4-jobs_overflow.patch b/app-shells/bash/files/bash-4.4-jobs_overflow.patch
deleted file mode 100644
index 8753d62ec6..0000000000
--- a/app-shells/bash/files/bash-4.4-jobs_overflow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://lists.gnu.org/archive/html/bug-bash/2017-12/msg00025.html
-https://bugs.gentoo.org/644720
-
---- bash-4.4/jobs.c
-+++ bash-4.4/jobs.c
-@@ -750,7 +750,7 @@
- else
- nsize = bgpids.nalloc;
-
-- while (nsize < js.c_childmax)
-+ while (nsize < (ps_index_t)js.c_childmax)
- nsize *= 2;
-
- if (bgpids.nalloc < js.c_childmax)
diff --git a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
deleted file mode 100644
index c6ef19d03f..0000000000
--- a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/600174
-https://lists.gnu.org/archive/html/bug-bash/2016-11/msg00099.html
-
-*** ../bash-4.4-patched/builtins/pushd.def 2016-01-25 13:31:49.000000000 -0500
---- builtins/pushd.def 2016-10-28 10:46:49.000000000 -0400
-***************
-*** 366,370 ****
- }
-
-! if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
- {
- pushd_error (directory_list_offset, which_word ? which_word : "");
---- 366,370 ----
- }
-
-! if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
- {
- pushd_error (directory_list_offset, which_word ? which_word : "");
-***************
-*** 388,391 ****
---- 388,396 ----
- of the list into place. */
- i = (direction == '+') ? directory_list_offset - which : which;
-+ if (i < 0 || i > directory_list_offset)
-+ {
-+ pushd_error (directory_list_offset, which_word ? which_word : "");
-+ return (EXECUTION_FAILURE);
-+ }
- free (pushd_directory_list[i]);
- directory_list_offset--;
diff --git a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
deleted file mode 100644
index 698d277a3d..0000000000
--- a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://bugs.gentoo.org/310197
-http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html
-
-fix heredocs handling in `set` output
-
-*** ../bash-4.1-patched/print_cmd.c 2009-09-16 15:32:26.000000000 -0400
---- print_cmd.c 2010-03-22 21:15:30.000000000 -0400
-***************
-*** 114,117 ****
---- 114,123 ----
- #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
-
-+ #define PRINT_DEFERRED_HEREDOCS(x) \
-+ do { \
-+ if (deferred_heredocs) \
-+ print_deferred_heredocs (x); \
-+ } while (0)
-+
- /* Non-zero means the stuff being printed is inside of a function def. */
- static int inside_function_def;
-***************
-*** 561,571 ****
- {
- print_for_command_head (for_command);
--
- cprintf (";");
- newline ("do\n");
- indentation += indentation_amount;
- make_command_string_internal (for_command->action);
- semicolon ();
- indentation -= indentation_amount;
- newline ("done");
- }
---- 566,578 ----
- {
- print_for_command_head (for_command);
- cprintf (";");
- newline ("do\n");
-+
- indentation += indentation_amount;
- make_command_string_internal (for_command->action);
-+ PRINT_DEFERRED_HEREDOCS ("");
- semicolon ();
- indentation -= indentation_amount;
-+
- newline ("done");
- }
diff --git a/app-shells/bash/files/bash-eol-pushback.patch b/app-shells/bash/files/bash-eol-pushback.patch
deleted file mode 100644
index 964b91f51e..0000000000
--- a/app-shells/bash/files/bash-eol-pushback.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ../bash-20140912/parse.y 2014-08-26 15:09:42.000000000 -0400
---- parse.y 2014-09-24 22:47:28.000000000 -0400
-***************
-*** 2959,2962 ****
---- 2959,2964 ----
- word_desc_to_read = (WORD_DESC *)NULL;
-
-+ eol_ungetc_lookahead = 0;
-+
- current_token = '\n'; /* XXX */
- last_read_token = '\n';
diff --git a/app-shells/bash/files/bash_logout b/app-shells/bash/files/bash_logout
deleted file mode 100644
index 50a79331c0..0000000000
--- a/app-shells/bash/files/bash_logout
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/bash/bash_logout
-
-# This file is sourced when a login shell terminates.
-
-# You may wish to clear everyone's screen when they logout.
-#clear
-
-# Or maybe you want to leave a thoughtful note.
-#fortune
diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc
deleted file mode 100644
index 03694691d4..0000000000
--- a/app-shells/bash/files/bashrc
+++ /dev/null
@@ -1,113 +0,0 @@
-# /etc/bash/bashrc
-#
-# This file is sourced by all *interactive* bash shells on startup,
-# including some apparently interactive shells such as scp and rcp
-# that can't tolerate any output. So make sure this doesn't display
-# anything or bad things will happen !
-
-
-# Test for an interactive shell. There is no need to set anything
-# past this point for scp and rcp, and it's important to refrain from
-# outputting anything in those cases.
-if [[ $- != *i* ]] ; then
- # Shell is non-interactive. Be done now!
- return
-fi
-
-# Bash won't get SIGWINCH if another process is in the foreground.
-# Enable checkwinsize so that bash will check the terminal size when
-# it regains control. #65623
-# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
-shopt -s checkwinsize
-
-# Disable completion when the input buffer is empty. i.e. Hitting tab
-# and waiting a long time for bash to expand all of $PATH.
-shopt -s no_empty_cmd_completion
-
-# Enable history appending instead of overwriting when exiting. #139609
-shopt -s histappend
-
-# Save each command to the history file as it's executed. #517342
-# This does mean sessions get interleaved when reading later on, but this
-# way the history is always up to date. History is not synced across live
-# sessions though; that is what `history -n` does.
-# Disabled by default due to concerns related to system recovery when $HOME
-# is under duress, or lives somewhere flaky (like NFS). Constantly syncing
-# the history will halt the shell prompt until it's finished.
-#PROMPT_COMMAND='history -a'
-
-# Change the window title of X terminals
-case ${TERM} in
- [aEkx]term*|rxvt*|gnome*|konsole*|interix)
- PS1='\[\033]0;\u@\h:\w\007\]'
- ;;
- screen*)
- PS1='\[\033k\u@\h:\w\033\\\]'
- ;;
- *)
- unset PS1
- ;;
-esac
-
-# Set colorful PS1 only on colorful terminals.
-# dircolors --print-database uses its own built-in database
-# instead of using /etc/DIR_COLORS. Try to use the external file
-# first to take advantage of user additions.
-# We run dircolors directly due to its changes in file syntax and
-# terminal name patching.
-use_color=false
-if type -P dircolors >/dev/null ; then
- # Enable colors for ls, etc. Prefer ~/.dir_colors #64489
- LS_COLORS=
- if [[ -f ~/.dir_colors ]] ; then
- eval "$(dircolors -b ~/.dir_colors)"
- elif [[ -f /etc/DIR_COLORS ]] ; then
- eval "$(dircolors -b /etc/DIR_COLORS)"
- else
- eval "$(dircolors -b)"
- fi
- # Note: We always evaluate the LS_COLORS setting even when it's the
- # default. If it isn't set, then `ls` will only colorize by default
- # based on file attributes and ignore extensions (even the compiled
- # in defaults of dircolors). #583814
- if [[ -n ${LS_COLORS:+set} ]] ; then
- use_color=true
- else
- # Delete it if it's empty as it's useless in that case.
- unset LS_COLORS
- fi
-else
- # Some systems (e.g. BSD & embedded) don't typically come with
- # dircolors so we need to hardcode some terminals in here.
- case ${TERM} in
- [aEkx]term*|rxvt*|gnome*|konsole*|screen|cons25|*color) use_color=true;;
- esac
-fi
-
-if ${use_color} ; then
- if [[ ${EUID} == 0 ]] ; then
- PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \w \$\[\033[00m\] '
- else
- PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
- fi
-
- #BSD#@export CLICOLOR=1
- #GNU#@alias ls='ls --color=auto'
- alias grep='grep --colour=auto'
- alias egrep='egrep --colour=auto'
- alias fgrep='fgrep --colour=auto'
-else
- if [[ ${EUID} == 0 ]] ; then
- # show root@ when we don't have colors
- PS1+='\u@\h \w \$ '
- else
- PS1+='\u@\h \w \$ '
- fi
-fi
-
-for sh in /etc/bash/bashrc.d/* ; do
- [[ -r ${sh} ]] && source "${sh}"
-done
-
-# Try to keep environment pollution down, EPA loves us.
-unset use_color sh
diff --git a/app-shells/bash/files/bashrc-prefix.patch b/app-shells/bash/files/bashrc-prefix.patch
deleted file mode 100644
index 04ebb10fc5..0000000000
--- a/app-shells/bash/files/bashrc-prefix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- bashrc
-+++ bashrc
-@@ -1,4 +1,4 @@
--# /etc/bash/bashrc
-+# @GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc
- #
- # This file is sourced by all *interactive* bash shells on startup,
- # including some apparently interactive shells such as scp and rcp
-@@ -48,7 +48,7 @@
- safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM
- match_lhs=""
- [[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
--[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
-+[[ -f "@GENTOO_PORTAGE_EPREFIX@"/etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(<"@GENTOO_PORTAGE_EPREFIX@"/etc/DIR_COLORS)"
- [[ -z ${match_lhs} ]] \
- && type -P dircolors >/dev/null \
- && match_lhs=$(dircolors --print-database)
-@@ -56,15 +56,13 @@
-
- if ${use_color} ; then
- # Enable colors for ls, etc. Prefer ~/.dir_colors #64489
-- if type -P dircolors >/dev/null ; then
-- if [[ -f ~/.dir_colors ]] ; then
-- eval $(dircolors -b ~/.dir_colors)
-- elif [[ -f /etc/DIR_COLORS ]] ; then
-- eval $(dircolors -b /etc/DIR_COLORS)
-- fi
-- fi
--
-- if [[ ${EUID} == 0 ]] ; then
-+ if [[ -f ~/.dir_colors ]] ; then
-+ eval $("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/dircolors -b ~/.dir_colors);
-+ elif [[ -f "@GENTOO_PORTAGE_EPREFIX@"/etc/DIR_COLORS ]] ; then
-+ eval $("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/dircolors -b "@GENTOO_PORTAGE_EPREFIX@"/etc/DIR_COLORS)
-+ fi
-+
-+ if [[ ${EUID} == 0 ]] ; then
- PS1='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
- else
- PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
diff --git a/app-shells/bash/files/bashrc-r2 b/app-shells/bash/files/bashrc-r2
deleted file mode 100644
index c9bd88e858..0000000000
--- a/app-shells/bash/files/bashrc-r2
+++ /dev/null
@@ -1,108 +0,0 @@
-# /etc/bash/bashrc
-#
-# This file is sourced by all *interactive* bash shells on startup,
-# including some apparently interactive shells such as scp and rcp
-# that can't tolerate any output. So make sure this doesn't display
-# anything or bad things will happen !
-
-
-# Test for an interactive shell. There is no need to set anything
-# past this point for scp and rcp, and it's important to refrain from
-# outputting anything in those cases.
-if [[ $- != *i* ]] ; then
- # Shell is non-interactive. Be done now!
- return
-fi
-
-# Bash won't get SIGWINCH if another process is in the foreground.
-# Enable checkwinsize so that bash will check the terminal size when
-# it regains control. #65623
-# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
-shopt -s checkwinsize
-
-# Disable completion when the input buffer is empty. i.e. Hitting tab
-# and waiting a long time for bash to expand all of $PATH.
-shopt -s no_empty_cmd_completion
-
-# Enable history appending instead of overwriting when exiting. #139609
-shopt -s histappend
-
-# Save each command to the history file as it's executed. #517342
-# This does mean sessions get interleaved when reading later on, but this
-# way the history is always up to date. History is not synced across live
-# sessions though; that is what `history -n` does.
-# Disabled by default due to concerns related to system recovery when $HOME
-# is under duress, or lives somewhere flaky (like NFS). Constantly syncing
-# the history will halt the shell prompt until it's finished.
-#PROMPT_COMMAND='history -a'
-
-# Change the window title of X terminals
-case ${TERM} in
- xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
- PS1='\[\033]0;\u@\h:\w\007\]'
- ;;
- screen*)
- PS1='\[\033k\u@\h:\w\033\\\]'
- ;;
- *)
- unset PS1
- ;;
-esac
-
-use_color=false
-#BSD#@# BSD doesn't typically come with dircolors so we need
-#BSD#@# to hardcode some terminals in here.
-#BSD#@case ${TERM} in
-#BSD#@ xterm*|rxvt*|Eterm|aterm|kterm|gnome*|screen|cons25) use_color=true;;
-#BSD#@esac
-
-# Set colorful PS1 only on colorful terminals.
-# dircolors --print-database uses its own built-in database
-# instead of using /etc/DIR_COLORS. Try to use the external file
-# first to take advantage of user additions. Use internal bash
-# globbing instead of external grep binary.
-safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM
-match_lhs=""
-[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
-[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
-[[ -z ${match_lhs} ]] \
- && type -P dircolors >/dev/null \
- && match_lhs=$(dircolors --print-database)
-[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
-
-if ${use_color} ; then
- # Enable colors for ls, etc. Prefer ~/.dir_colors #64489
- if type -P dircolors >/dev/null ; then
- if [[ -f ~/.dir_colors ]] ; then
- eval $(dircolors -b ~/.dir_colors)
- elif [[ -f /etc/DIR_COLORS ]] ; then
- eval $(dircolors -b /etc/DIR_COLORS)
- fi
- fi
-
- if [[ ${EUID} == 0 ]] ; then
- PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
- else
- PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
- fi
-
- #BSD#@export CLICOLOR=1
- #GNU#@alias ls='ls --color=auto'
- alias grep='grep --colour=auto'
- alias egrep='egrep --colour=auto'
- alias fgrep='fgrep --colour=auto'
-else
- if [[ ${EUID} == 0 ]] ; then
- # show root@ when we don't have colors
- PS1+='\u@\h \W \$ '
- else
- PS1+='\u@\h \w \$ '
- fi
-fi
-
-for sh in /etc/bash/bashrc.d/* ; do
- [[ -r ${sh} ]] && source "${sh}"
-done
-
-# Try to keep environment pollution down, EPA loves us.
-unset use_color safe_term match_lhs sh
diff --git a/app-shells/bash/files/bashrc-r2-prefix.patch b/app-shells/bash/files/bashrc-r2-prefix.patch
deleted file mode 100644
index b7a39ac965..0000000000
--- a/app-shells/bash/files/bashrc-r2-prefix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- bashrc-r2
-+++ bashrc-r2
-@@ -1,4 +1,4 @@
--# /etc/bash/bashrc
-+# @GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc
- #
- # This file is sourced by all *interactive* bash shells on startup,
- # including some apparently interactive shells such as scp and rcp
-@@ -64,7 +64,7 @@
- safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM
- match_lhs=""
- [[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
--[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
-+[[ -f @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(<@GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS)"
- [[ -z ${match_lhs} ]] \
- && type -P dircolors >/dev/null \
- && match_lhs=$(dircolors --print-database)
-@@ -75,8 +75,8 @@
- if type -P dircolors >/dev/null ; then
- if [[ -f ~/.dir_colors ]] ; then
- eval $(dircolors -b ~/.dir_colors)
-- elif [[ -f /etc/DIR_COLORS ]] ; then
-- eval $(dircolors -b /etc/DIR_COLORS)
-+ elif [[ -f @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS ]] ; then
-+ eval $(dircolors -b @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS)
- fi
- fi
-
-@@ -100,7 +100,7 @@
- fi
- fi
-
--for sh in /etc/bash/bashrc.d/* ; do
-+for sh in @GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc.d/* ; do
- [[ -r ${sh} ]] && source "${sh}"
- done
-
diff --git a/app-shells/bash/files/dot-bash_logout b/app-shells/bash/files/dot-bash_logout
deleted file mode 100644
index 44b6f79ca8..0000000000
--- a/app-shells/bash/files/dot-bash_logout
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/skel/.bash_logout
-
-# This file is sourced when a login shell terminates.
-
-# Clear the screen for security's sake.
-clear
diff --git a/app-shells/bash/files/dot-bash_profile b/app-shells/bash/files/dot-bash_profile
deleted file mode 100644
index 1de05a45e3..0000000000
--- a/app-shells/bash/files/dot-bash_profile
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/skel/.bash_profile
-
-# This file is sourced by bash for login shells. The following line
-# runs your .bashrc and is recommended by the bash info pages.
-if [[ -f ~/.bashrc ]] ; then
- . ~/.bashrc
-fi
diff --git a/app-shells/bash/files/dot-bashrc b/app-shells/bash/files/dot-bashrc
deleted file mode 100644
index 34dbd8c892..0000000000
--- a/app-shells/bash/files/dot-bashrc
+++ /dev/null
@@ -1,18 +0,0 @@
-# /etc/skel/.bashrc
-#
-# This file is sourced by all *interactive* bash shells on startup,
-# including some apparently interactive shells such as scp and rcp
-# that can't tolerate any output. So make sure this doesn't display
-# anything or bad things will happen !
-
-
-# Test for an interactive shell. There is no need to set anything
-# past this point for scp and rcp, and it's important to refrain from
-# outputting anything in those cases.
-if [[ $- != *i* ]] ; then
- # Shell is non-interactive. Be done now!
- return
-fi
-
-
-# Put your fun stuff here.
diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
deleted file mode 100644
index 9b5e498670..0000000000
--- a/app-shells/bash/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="bashlogger">Log ALL commands typed into bash; should ONLY be
- used in restricted environments such as honeypots</flag>
- <flag name="mem-scramble">Build with custom malloc/free overwriting allocated/freed memory</flag>
- <flag name="net">Enable /dev/tcp/host/port redirection</flag>
- <flag name="plugins">Add support for loading builtins at runtime via
- 'enable'</flag>
-</use>
-<upstream>
- <remote-id type="cpe">cpe:/a:gnu:bash</remote-id>
-</upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-28 10:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-13 13:21 [gentoo-commits] repo/proj/prefix:master commit in: app-shells/bash/, app-shells/bash/files/ Michael Haubenwallner
-- strict thread matches above, loose matches on Subject: below --
2016-10-25 8:53 Fabian Groffen
2017-08-22 13:09 Fabian Groffen
2018-12-28 10:26 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox