From 6b416554f27c667a68c7e40f105efd307f4b9b33 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 12 Mar 2011 15:26:45 +0000 Subject: Update to 4.2. 1. New Features in Bash a. `exec -a foo' now sets $0 to `foo' in an executable shell script without a leading #!. b. Subshells begun to execute command substitutions or run shell functions or builtins in subshells do not reset trap strings until a new trap is specified. This allows $(trap) to display the caller's traps and the trap strings to persist until a new trap is set. c. `trap -p' will now show signals ignored at shell startup, though their disposition still cannot be modified. d. $'...', echo, and printf understand \uXXXX and \UXXXXXXXX escape sequences. e. declare/typeset has a new `-g' option, which creates variables in the global scope even when run in a shell function. f. test/[/[[ have a new -v variable unary operator, which returns success if `variable' has been set. g. Posix parsing changes to allow `! time command' and multiple consecutive instances of `!' (which toggle) and `time' (which have no cumulative effect). h. Posix change to allow `time' as a command by itself to print the elapsed user, system, and real times for the shell and its children. j. $((...)) is always parsed as an arithmetic expansion first, instead of as a potential nested command substitution, as Posix requires. k. A new FUNCNEST variable to allow the user to control the maximum shell function nesting (recursive execution) level. l. The mapfile builtin now supplies a third argument to the callback command: the line about to be assigned to the supplied array index. m. The printf builtin has a new %(fmt)T specifier, which allows time values to use strftime-like formatting. n. There is a new `compat41' shell option. o. The cd builtin has a new Posix-mandated `-e' option. p. Negative subscripts to indexed arrays, previously errors, now are treated as offsets from the maximum assigned index + 1. q. Negative length specifications in the ${var:offset:length} expansion, previously errors, are now treated as offsets from the end of the variable. r. Parsing change to allow `time -p --'. s. Posix-mode parsing change to not recognize `time' as a keyword if the following token begins with a `-'. This means no more Posix-mode `time -p'. Posix interpretation 267. t. There is a new `lastpipe' shell option that runs the last command of a pipeline in the current shell context. The lastpipe option has no effect if job control is enabled. u. History expansion no longer expands the `$!' variable expansion. v. Posix mode shells no longer exit if a variable assignment error occurs with an assignment preceding a command that is not a special builtin. w. Non-interactive mode shells exit if -u is enabled and an attempt is made to use an unset variable with the % or # expansions, the `//', `^', or `,' expansions, or the parameter length expansion. x. Posix-mode shells use the argument passed to `.' as-is if a $PATH search fails, effectively searching the current directory. Posix-2008 change. 2. New Features in Readline a. The history library does not try to write the history filename in the current directory if $HOME is unset. This closes a potential security problem if the application does not specify a history filename. b. New bindable variable `completion-display-width' to set the number of columns used when displaying completions. c. New bindable variable `completion-case-map' to cause case-insensitive completion to treat `-' and `_' as identical. d. There are new bindable vi-mode command names to avoid readline's case- insensitive matching not allowing them to be bound separately. e. New bindable variable `menu-complete-display-prefix' causes the menu completion code to display the common prefix of the possible completions before cycling through the list, instead of after. --- shells/bash/Makefile | 5 ++--- shells/bash/distinfo | 12 ++++++------ shells/bash/patches/patch-aa | 18 +++++++++--------- shells/bash/patches/patch-af | 21 ++++++--------------- 4 files changed, 23 insertions(+), 33 deletions(-) (limited to 'shells') diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 66743035edc..430df81bf5e 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.50 2010/05/07 12:02:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.51 2011/03/12 15:26:45 wiz Exp $ -BASH_VERSION= 4.1 +BASH_VERSION= 4.2 DISTNAME= bash-${BASH_VERSION} #PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL} -PKGREVISION= 1 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \ ftp://ftp.cwru.edu/pub/bash/ diff --git a/shells/bash/distinfo b/shells/bash/distinfo index 0d4cc968f25..0d4304024ce 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.22 2011/02/20 14:22:15 wiz Exp $ +$NetBSD: distinfo,v 1.23 2011/03/12 15:26:45 wiz Exp $ -SHA1 (bash-4.1.tar.gz) = 3bd1ec9c66f3689f6b3495bdaaf9077b2e5dc150 -RMD160 (bash-4.1.tar.gz) = 554c7ecb4a63da431768caed1f958c06b8fa7207 -Size (bash-4.1.tar.gz) = 6598300 bytes -SHA1 (patch-aa) = 24fefdd101926d89b4b9faea1ca74a34bdd5b99f -SHA1 (patch-af) = 769ca529b3a755faa70f517988722276088859b7 +SHA1 (bash-4.2.tar.gz) = 487840ab7134eb7901fbb2e49b0ee3d22de15cb8 +RMD160 (bash-4.2.tar.gz) = df7ae51783f039a1234d3b720ffcf4bfa5d09673 +Size (bash-4.2.tar.gz) = 7009201 bytes +SHA1 (patch-aa) = 907a2429a94591a354130b9e6fb3ded73897362f +SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48 SHA1 (patch-ai) = 26825922898567841bed0bf62a8dee3bcc50cd75 SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e diff --git a/shells/bash/patches/patch-aa b/shells/bash/patches/patch-aa index 21c03b277f3..19319813e0b 100644 --- a/shells/bash/patches/patch-aa +++ b/shells/bash/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2010/02/09 12:31:19 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2011/03/12 15:26:45 wiz Exp $ ---- lib/sh/fpurge.c.orig 2009-04-20 01:12:23.000000000 +0000 +--- lib/sh/fpurge.c.orig 2010-12-22 14:32:58.000000000 +0000 +++ lib/sh/fpurge.c -@@ -53,7 +53,7 @@ fpurge (FILE *fp) +@@ -137,7 +137,7 @@ fpurge (FILE *fp) extern int fpurge (FILE *); # endif int result = fpurge (fp); @@ -11,17 +11,17 @@ $NetBSD: patch-aa,v 1.5 2010/02/09 12:31:19 wiz Exp $ if (result == 0) /* Correct the invariants that fpurge broke. on BSD systems says: -@@ -63,6 +63,9 @@ fpurge (FILE *fp) +@@ -147,6 +147,9 @@ fpurge (FILE *fp) into the buffer, although they shouldn't be allowed to. */ - if ((fp->_flags & __SRD) != 0) - fp->_w = 0; + if ((fp_->_flags & __SRD) != 0) + fp_->_w = 0; +#elif defined __DragonFly__ -+ if ((((struct __FILE_public *) fp)->_flags & __SRD) != 0) -+ ((struct __FILE_public *) fp)->_w = 0; ++ if ((((struct __FILE_public *) fp_)->_flags & __SRD) != 0) ++ ((struct __FILE_public *) fp_)->_w = 0; # endif return result; -@@ -81,7 +84,7 @@ fpurge (FILE *fp) +@@ -165,7 +168,7 @@ fpurge (FILE *fp) fp->_IO_save_base = NULL; } return 0; diff --git a/shells/bash/patches/patch-af b/shells/bash/patches/patch-af index 4249a880b5d..e4a07a1b5e8 100644 --- a/shells/bash/patches/patch-af +++ b/shells/bash/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.5 2010/04/15 12:49:41 joerg Exp $ +$NetBSD: patch-af,v 1.6 2011/03/12 15:26:45 wiz Exp $ ---- builtins/printf.def.orig 2009-11-20 20:31:23.000000000 +0000 +--- builtins/printf.def.orig 2010-11-23 15:02:55.000000000 +0000 +++ builtins/printf.def -@@ -85,6 +85,11 @@ $END +@@ -90,6 +90,11 @@ $END # undef PRIdMAX #endif @@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.5 2010/04/15 12:49:41 joerg Exp $ #if !defined (PRIdMAX) # if HAVE_LONG_LONG # define PRIdMAX "lld" -@@ -92,6 +97,13 @@ $END +@@ -97,6 +102,13 @@ $END # define PRIdMAX "ld" # endif #endif @@ -28,16 +28,7 @@ $NetBSD: patch-af,v 1.5 2010/04/15 12:49:41 joerg Exp $ #if !defined (errno) extern int errno; -@@ -172,7 +184,7 @@ extern int asprintf __P((char **, const - #endif - - #if !HAVE_VSNPRINTF --extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); -+extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0))); - #endif - - static void printf_erange __P((char *)); -@@ -487,7 +499,11 @@ printf_builtin (list) +@@ -571,7 +583,11 @@ printf_builtin (list) p = pp = getintmax (); if (p != pp) { @@ -49,7 +40,7 @@ $NetBSD: patch-af,v 1.5 2010/04/15 12:49:41 joerg Exp $ PF (f, pp); } else -@@ -514,7 +530,11 @@ printf_builtin (list) +@@ -598,7 +614,11 @@ printf_builtin (list) p = pp = getuintmax (); if (p != pp) { -- cgit v1.2.3