diff options
author | Gabor Kovesdan <gabor@FreeBSD.org> | 2007-06-04 15:01:37 +0000 |
---|---|---|
committer | Gabor Kovesdan <gabor@FreeBSD.org> | 2007-06-04 15:01:37 +0000 |
commit | a5a79ff2eb02a4d87fb1bf524f7336eab2f9fbff (patch) | |
tree | a13a57b4e26d656ceb1da7cde0dfe17b5628920c /shells/bash2/files | |
parent | Update to 0.5.23. (diff) |
Remove expired ports:
2007-04-27 security/op: no longer available from any mastersite
2007-05-15 shells/bash2: Old, unmaintained version, use shells/bash instead
2007-05-19 sysutils/xperfmon: irrelevant for supported FreeBSD releases
Diffstat (limited to 'shells/bash2/files')
-rw-r--r-- | shells/bash2/files/patch-ac | 30 | ||||
-rw-r--r-- | shells/bash2/files/patch-af | 14 | ||||
-rw-r--r-- | shells/bash2/files/patch-bashline.c | 118 | ||||
-rw-r--r-- | shells/bash2/files/patch-builtins_shopt.def | 22 | ||||
-rw-r--r-- | shells/bash2/files/patch-config.guess | 10 | ||||
-rw-r--r-- | shells/bash2/files/patch-config.sub | 15 | ||||
-rw-r--r-- | shells/bash2/files/patch-doc_bash.1 | 16 | ||||
-rw-r--r-- | shells/bash2/files/patch-doc_bashref.texi | 37 | ||||
-rw-r--r-- | shells/bash2/files/patch-redir.c | 11 | ||||
-rw-r--r-- | shells/bash2/files/patch-subst.c | 27 | ||||
-rw-r--r-- | shells/bash2/files/patch-terminal.c | 14 | ||||
-rw-r--r-- | shells/bash2/files/patch-tests_shopt.right | 35 | ||||
-rw-r--r-- | shells/bash2/files/patch-tests_shopt.tests | 25 |
13 files changed, 0 insertions, 374 deletions
diff --git a/shells/bash2/files/patch-ac b/shells/bash2/files/patch-ac deleted file mode 100644 index 56117d592f64..000000000000 --- a/shells/bash2/files/patch-ac +++ /dev/null @@ -1,30 +0,0 @@ - -$FreeBSD$ - ---- configure.orig Tue Jul 16 22:31:47 2002 -+++ configure Wed Jul 24 23:54:26 2002 -@@ -1132,7 +1132,7 @@ - mips-irix6*) opt_bash_malloc=no ;; # needs 8-byte alignment - m68k-sysv) opt_bash_malloc=no ;; # fixes file descriptor leak in closedir - sparc-linux*) opt_bash_malloc=no ;; # sparc running linux; requires ELF --#*-freebsd*) opt_bash_malloc=no ;; # they claim it's better; I disagree -+*-freebsd*) opt_bash_malloc=no ;; # they claim it's better; I disagree - *-openbsd*) opt_bash_malloc=no ;; # they claim it needs eight-bit alignment - *-aix*) opt_bash_malloc=no ;; # AIX machines - *-nextstep*) opt_bash_malloc=no ;; # NeXT machines running NeXTstep -@@ -15218,7 +15218,14 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -d /dev/fd && test -r /dev/fd/0; then -- bash_cv_dev_fd=standard -+ # FreeBSD's devfs only provides /dev/fd/[0-2] -+ exec 3<&0 -+ if test -r /dev/fd/3; then -+ bash_cv_dev_fd=standard -+ else -+ bash_cv_dev_fd=absent -+ fi -+ exec 3<&- - elif test -d /proc/self/fd && test -r /proc/self/fd/0; then - bash_cv_dev_fd=whacky - else diff --git a/shells/bash2/files/patch-af b/shells/bash2/files/patch-af deleted file mode 100644 index 73c7e7972ed3..000000000000 --- a/shells/bash2/files/patch-af +++ /dev/null @@ -1,14 +0,0 @@ ---- error.c.old Wed May 24 12:04:50 2000 -+++ error.c Wed May 24 12:05:21 2000 -@@ -465,9 +465,9 @@ - terminal. */ - void - #if defined (PREFER_STDARG) --trace (const char *format, ...) -+bash_trace (const char *format, ...) - #else --trace (format, va_alist) -+bash_trace (format, va_alist) - const char *format; - va_dcl - #endif diff --git a/shells/bash2/files/patch-bashline.c b/shells/bash2/files/patch-bashline.c deleted file mode 100644 index 24b74307d966..000000000000 --- a/shells/bash2/files/patch-bashline.c +++ /dev/null @@ -1,118 +0,0 @@ ---- bashline.c.deo Tue May 7 12:52:42 2002 -+++ bashline.c Sun Sep 8 18:17:30 2002 -@@ -1873,10 +1874,6 @@ - } - } - --/* Define NO_FORCE_FIGNORE if you want to match filenames that would -- otherwise be ignored if they are the only possible matches. */ --/* #define NO_FORCE_FIGNORE */ -- - /* If FIGNORE is set, then don't match files with the given suffixes when - completing filenames. If only one of the possibilities has an acceptable - suffix, delete the others, else just return and let the completer -@@ -1901,10 +1898,15 @@ - { - char **newnames; - int idx, nidx; --#ifdef NO_FORCE_FIGNORE - char **oldnames; - int oidx; --#endif -+ char *no_force_fignore; -+ -+ -+/* Set NO_FORCE_FIGNORE if you want to match filenames that would -+ otherwise be ignored if they are the only possible matches. */ -+ no_force_fignore = get_string_value ("NO_FORCE_FIGNORE"); -+//fprintf(stderr, ">NO_FORCE_FIGNORE< is [%s]\n", no_force_fignore); - - /* If there is only one completion, see if it is acceptable. If it is - not, free it up. In any case, short-circuit and return. This is a -@@ -1912,13 +1914,12 @@ - if there is only one completion; it is the completion itself. */ - if (names[1] == (char *)0) - { --#ifndef NO_FORCE_FIGNORE -- if ((*name_func) (names[0]) == 0) -- { -- free (names[0]); -- names[0] = (char *)NULL; -- } --#endif -+ if (!no_force_fignore) -+ if ((*name_func) (names[0]) == 0) -+ { -+ free (names[0]); -+ names[0] = (char *)NULL; -+ } - return; - } - -@@ -1927,10 +1928,11 @@ - for (nidx = 1; names[nidx]; nidx++) - ; - newnames = strvec_create (nidx + 1); --#ifdef NO_FORCE_FIGNORE -- oldnames = strvec_create (nidx - 1); -- oidx = 0; --#endif -+ if (no_force_fignore) -+ { -+ oldnames = strvec_create (nidx - 1); -+ oidx = 0; -+ } - - newnames[0] = names[0]; - for (idx = nidx = 1; names[idx]; idx++) -@@ -1938,11 +1940,10 @@ - if ((*name_func) (names[idx])) - newnames[nidx++] = names[idx]; - else --#ifndef NO_FORCE_FIGNORE -- free (names[idx]); --#else -- oldnames[oidx++] = names[idx]; --#endif -+ if (no_force_fignore) -+ oldnames[oidx++] = names[idx]; -+ else -+ free (names[idx]); - } - - newnames[nidx] = (char *)NULL; -@@ -1950,21 +1951,23 @@ - /* If none are acceptable then let the completer handle it. */ - if (nidx == 1) - { --#ifndef NO_FORCE_FIGNORE -- free (names[0]); -- names[0] = (char *)NULL; --#else -- free (oldnames); --#endif -+ if (no_force_fignore) -+ free (oldnames); -+ else -+ { -+ free (names[0]); -+ names[0] = (char *)NULL; -+ } - free (newnames); - return; - } - --#ifdef NO_FORCE_FIGNORE -- while (oidx) -- free (oldnames[--oidx]); -- free (oldnames); --#endif -+ if (no_force_fignore) -+ { -+ while (oidx) -+ free (oldnames[--oidx]); -+ free (oldnames); -+ } - - /* If only one is acceptable, copy it to names[0] and return. */ - if (nidx == 2) diff --git a/shells/bash2/files/patch-builtins_shopt.def b/shells/bash2/files/patch-builtins_shopt.def deleted file mode 100644 index 4a896b397684..000000000000 --- a/shells/bash2/files/patch-builtins_shopt.def +++ /dev/null @@ -1,22 +0,0 @@ - -$FreeBSD$ - ---- builtins/shopt.def.orig Tue Sep 11 21:55:06 2001 -+++ builtins/shopt.def Tue Nov 20 23:52:45 2001 -@@ -56,7 +56,7 @@ - - #define OPTFMT "%-15s\t%s\n" - --extern int allow_null_glob_expansion, glob_dot_filenames; -+extern int allow_null_glob_expansion, fail_glob_expansion, glob_dot_filenames; - extern int cdable_vars, mail_warning, source_uses_path; - extern int no_exit_on_failed_exec, print_shift_error; - extern int check_hashed_filenames, promptvars, interactive_comments; -@@ -140,6 +140,7 @@ - #endif - { "nocaseglob", &glob_ignore_case, (shopt_set_func_t *)NULL }, - { "nullglob", &allow_null_glob_expansion, (shopt_set_func_t *)NULL }, -+ { "failglob", &fail_glob_expansion, (Function *)NULL }, - #if defined (PROGRAMMABLE_COMPLETION) - { "progcomp", &prog_completion_enabled, (shopt_set_func_t *)NULL }, - #endif diff --git a/shells/bash2/files/patch-config.guess b/shells/bash2/files/patch-config.guess deleted file mode 100644 index a109a5e4f442..000000000000 --- a/shells/bash2/files/patch-config.guess +++ /dev/null @@ -1,10 +0,0 @@ ---- support/config.guess.orig Wed Apr 3 16:47:14 2002 -+++ support/config.guess Fri May 16 19:42:58 2003 -@@ -782,4 +782,7 @@ - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; -+ amd64:FreeBSD:*:*) -+ echo x86_64-unknown-freebsd -+ exit 0 ;; - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` diff --git a/shells/bash2/files/patch-config.sub b/shells/bash2/files/patch-config.sub deleted file mode 100644 index 457c442391da..000000000000 --- a/shells/bash2/files/patch-config.sub +++ /dev/null @@ -1,15 +0,0 @@ ---- support/config.sub.orig Wed Apr 3 16:47:14 2002 -+++ support/config.sub Fri May 16 19:42:58 2003 -@@ -268,5 +268,5 @@ - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -- i*86 | x86_64) -+ i*86 | x86_64 | amd64) - basic_machine=$basic_machine-pc - ;; -@@ -282,4 +282,5 @@ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -+ | amd64-* \ - | arm-* | armbe-* | armle-* | armv*-* \ - | avr-* \ diff --git a/shells/bash2/files/patch-doc_bash.1 b/shells/bash2/files/patch-doc_bash.1 deleted file mode 100644 index fc26ea10be05..000000000000 --- a/shells/bash2/files/patch-doc_bash.1 +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- doc/bash.1.orig Tue Nov 13 18:55:59 2001 -+++ doc/bash.1 Tue Nov 20 23:52:45 2001 -@@ -2473,6 +2473,10 @@ - .B nullglob - option is set, and no matches are found, - the word is removed. -+If the -+.B failglob -+option is set, and no matches are found, an error message is printed -+and the command is not executed. - If the shell option - .B nocaseglob - is enabled, the match is performed without regard to the case diff --git a/shells/bash2/files/patch-doc_bashref.texi b/shells/bash2/files/patch-doc_bashref.texi deleted file mode 100644 index b4fc6acc6e6e..000000000000 --- a/shells/bash2/files/patch-doc_bashref.texi +++ /dev/null @@ -1,37 +0,0 @@ - -$FreeBSD$ - ---- doc/bashref.texi.orig Tue Nov 13 18:55:03 2001 -+++ doc/bashref.texi Tue Nov 20 23:52:45 2001 -@@ -1700,7 +1700,8 @@ - and replaced with an alphabetically sorted list of - file names matching the pattern. If no matching file names are found, - and the shell option @code{nullglob} is disabled, the word is left --unchanged. -+unchanged. If the @code{failglob} option is set, an error message is -+printed and the commandline is not executed. - If the @code{nullglob} option is set, and no matches are found, the word - is removed. - If the shell option @code{nocaseglob} is enabled, the match is performed -@@ -1713,8 +1714,8 @@ - matched explicitly. - In other cases, the @samp{.} character is not treated specially. - --See the description of @code{shopt} in @ref{Bash Builtins}, --for a description of the @code{nocaseglob}, @code{nullglob}, -+See the description of @code{shopt} in @ref{Bash Builtins}, for a -+description of the @code{nocaseglob}, @code{nullglob}, @code{failglob} - and @code{dotglob} options. - - The @env{GLOBIGNORE} -@@ -3372,6 +3373,10 @@ - @item extglob - If set, the extended pattern matching features described above - (@pxref{Pattern Matching}) are enabled. -+ -+@item failglob -+If set, filenames that have globbing characters in them, but don't match -+anything, will cause an error. - - @item histappend - If set, the history list is appended to the file named by the value diff --git a/shells/bash2/files/patch-redir.c b/shells/bash2/files/patch-redir.c deleted file mode 100644 index 259e4b1d87bc..000000000000 --- a/shells/bash2/files/patch-redir.c +++ /dev/null @@ -1,11 +0,0 @@ ---- redir.c.orig Tue Mar 12 12:27:38 2002 -+++ redir.c Thu May 5 07:41:18 2005 -@@ -263,7 +263,7 @@ write_here_string (fd, redirectee) - int herelen, n, e; - - herestr = expand_string_to_string (redirectee->word, 0); -- herelen = strlen (herestr); -+ herelen = (herestr == NULL) ? 0 : strlen (herestr); - - n = write (fd, herestr, herelen); - if (n == herelen) diff --git a/shells/bash2/files/patch-subst.c b/shells/bash2/files/patch-subst.c deleted file mode 100644 index 8ef29a8b5774..000000000000 --- a/shells/bash2/files/patch-subst.c +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- subst.c.orig Mon Nov 5 20:19:49 2001 -+++ subst.c Tue Nov 20 23:52:45 2001 -@@ -121,6 +121,9 @@ - a null file. */ - int allow_null_glob_expansion; - -+/* Non-zero means to signal an error when globbing fails to match. */ -+int fail_glob_expansion; -+ - #if 0 - /* Variables to keep track of which words in an expanded word list (the - output of expand_word_list_internal) are the result of globbing -@@ -6132,6 +6135,11 @@ - { - output_list = (WORD_LIST *)list_append (glob_list, output_list); - PREPEND_LIST (tlist, disposables); -+ } -+ else if (fail_glob_expansion != 0) -+ { -+ report_error ("no match: %s", tlist->word->word); -+ jump_to_top_level (DISCARD); - } - else if (allow_null_glob_expansion == 0) - { diff --git a/shells/bash2/files/patch-terminal.c b/shells/bash2/files/patch-terminal.c deleted file mode 100644 index 6f8b017b0a3a..000000000000 --- a/shells/bash2/files/patch-terminal.c +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/readline/terminal.c.orig Tue Mar 5 02:23:09 2002 -+++ lib/readline/terminal.c Wed Jul 24 05:57:59 2002 -@@ -313,7 +313,11 @@ - { "ei", &_rl_term_ei }, - { "ic", &_rl_term_ic }, - { "im", &_rl_term_im }, -+#ifdef __FreeBSD__ -+ { "@7", &_rl_term_kH }, /* home down ?? */ -+#else - { "kH", &_rl_term_kH }, /* home down ?? */ -+#endif - { "kI", &_rl_term_kI }, /* insert */ - { "kd", &_rl_term_kd }, - { "ke", &_rl_term_ke }, /* end keypad mode */ diff --git a/shells/bash2/files/patch-tests_shopt.right b/shells/bash2/files/patch-tests_shopt.right deleted file mode 100644 index fbbd9a8a27ff..000000000000 --- a/shells/bash2/files/patch-tests_shopt.right +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- tests/shopt.right.orig Wed May 9 19:40:39 2001 -+++ tests/shopt.right Tue Nov 20 23:52:45 2001 -@@ -22,6 +22,7 @@ - shopt -u no_empty_cmd_completion - shopt -u nocaseglob - shopt -u nullglob -+shopt -u failglob - shopt -s progcomp - shopt -s promptvars - shopt -u restricted_shell -@@ -58,6 +59,7 @@ - shopt -u no_empty_cmd_completion - shopt -u nocaseglob - shopt -u nullglob -+shopt -u failglob - shopt -u restricted_shell - shopt -u shift_verbose - shopt -u xpg_echo -@@ -78,6 +80,7 @@ - no_empty_cmd_completion off - nocaseglob off - nullglob off -+failglob off - restricted_shell off - shift_verbose off - xpg_echo off -@@ -205,3 +208,5 @@ - -- - ./shopt.tests: shopt: xyz1: unknown shell option name - ./shopt.tests: shopt: xyz1: unknown option name -+tmp/l1 tmp/l2 tmp/*4 tmp/l3 -+./shopt.tests: no match: tmp/*4 diff --git a/shells/bash2/files/patch-tests_shopt.tests b/shells/bash2/files/patch-tests_shopt.tests deleted file mode 100644 index ad2eac3d811e..000000000000 --- a/shells/bash2/files/patch-tests_shopt.tests +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- tests/shopt.tests.orig Tue Sep 21 17:49:32 1999 -+++ tests/shopt.tests Tue Nov 20 23:52:45 2001 -@@ -21,6 +21,7 @@ - shopt -u mailwarn - shopt -u nocaseglob - shopt -u nullglob -+shopt -u failglob - shopt -s promptvars - shopt -u shift_verbose - shopt -s sourcepath -@@ -92,3 +93,11 @@ - builtin printf -- "--\n" - shopt -p xyz1 - shopt -o -p xyz1 -+ -+mkdir tmp -+touch tmp/l1 tmp/l2 tmp/l3 -+builtin echo tmp/l[12] tmp/*4 tmp/*3 -+shopt -s failglob -+builtin echo tmp/l[12] tmp/*4 tmp/*3 -+rm -r tmp -+shopt -u failglob |