rpms/bash/devel bash-arrays.patch, NONE, 1.1 bash-2.05a-interpreter.patch, 1.3, 1.4 bash-2.05b-xcc.patch, 1.1, 1.2 bash-sighandler.patch, 1.6, 1.7 bash-ulimit.patch, 1.4, 1.5 bash.spec, 1.96, 1.97 sources, 1.10, 1.11 bash-2.05-ia64.patch, 1.2, NONE bash-2.05b-utf8.patch, 1.1, NONE bash-afs.patch, 1.1, NONE bash-crash.patch, 1.1, NONE bash-jobs.patch, 1.2, NONE bash-manpage.patch, 1.1, NONE bash-multibyteifs.patch, 1.4, NONE bash-pwd.patch, 1.1, NONE bash-read-e-segfault.patch, 1.3, NONE bash-sigpipe.patch, 1.1, NONE bash-subshell.patch, 1.1, NONE bash-wrap.patch, 1.1, NONE bash30-001, 1.1, NONE bash30-002, 1.1, NONE bash30-003, 1.1, NONE bash30-004, 1.1, NONE bash30-005, 1.1, NONE bash30-006, 1.1, NONE bash30-007, 1.1, NONE bash30-008, 1.1, NONE bash30-009, 1.1, NONE bash30-010, 1.1, NONE bash30-011, 1.1, NONE bash30-012, 1.1, NONE bash30-013, 1.1, NONE bash30-014, 1.1, NONE bash30-015, 1.1, NONE bash30-016, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 2 11:03:01 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22969
Modified Files:
bash-2.05a-interpreter.patch bash-2.05b-xcc.patch
bash-sighandler.patch bash-ulimit.patch bash.spec sources
Added Files:
bash-arrays.patch
Removed Files:
bash-2.05-ia64.patch bash-2.05b-utf8.patch bash-afs.patch
bash-crash.patch bash-jobs.patch bash-manpage.patch
bash-multibyteifs.patch bash-pwd.patch
bash-read-e-segfault.patch bash-sigpipe.patch
bash-subshell.patch bash-wrap.patch bash30-001 bash30-002
bash30-003 bash30-004 bash30-005 bash30-006 bash30-007
bash30-008 bash30-009 bash30-010 bash30-011 bash30-012
bash30-013 bash30-014 bash30-015 bash30-016
Log Message:
* Mon Jan 2 2006 Tim Waugh <twaugh at redhat.com> 3.1-1
- 3.1.
- No longer need ia64, utf8, multibyteifs, jobs, sigpipe,
read-e-segfault, manpage, crash, pwd, afs, subshell patches.
- Remove wrap patch for now.
- Use upstream patch to fix arrays.
bash-arrays.patch:
subst.c | 2 !!
1 files changed, 2 modifications(!)
--- NEW FILE bash-arrays.patch ---
Mike Frysinger wrote:
> On Thu, Dec 22, 2005 at 09:24:06AM -0500, Chet Ramey wrote:
>> Bash-Release: 3.1
>> Patch-ID: bash31-001
>>
>> Bug-Description:
>>
>> There are parsing problems with compound assignments in several contexts,
>> including as arguments to builtins like `local', `eval', and `let', and
>> as multiple assignments in a single command.
>
> still seems to be a slight regression here with arrays ...
Try this:
*** ../bash-3.1/subst.c Mon Oct 24 09:51:13 2005
--- subst.c Fri Dec 23 15:21:09 2005
***************
*** 2188,2192 ****
{
v = find_variable (name);
! if (v == 0 || array_p (v) == 0)
v = make_local_array_variable (name);
v = assign_array_var_from_string (v, value, flags);
--- 2188,2192 ----
{
v = find_variable (name);
! if (v == 0 || array_p (v) == 0 || v->context != variable_context)
v = make_local_array_variable (name);
v = assign_array_var_from_string (v, value, flags);
--
``The lyf so short, the craft so long to lerne.'' - Chaucer
( ``Discere est Dolere'' -- chet )
Live Strong.
Chet Ramey, ITS, CWRU chet at case.edu http://cnswww.cns.cwru.edu/~chet/
_______________________________________________
Bug-bash mailing list
Bug-bash at gnu.org
http://lists.gnu.org/mailman/listinfo/bug-bash
bash-2.05a-interpreter.patch:
config.h.in | 6 ++
configure.in | 4 -
execute_cmd.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 151 insertions(+), 3 deletions(-)
Index: bash-2.05a-interpreter.patch
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash-2.05a-interpreter.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bash-2.05a-interpreter.patch 9 Sep 2004 03:31:08 -0000 1.3
+++ bash-2.05a-interpreter.patch 2 Jan 2006 11:02:47 -0000 1.4
@@ -1,6 +1,6 @@
---- bash-3.0/config.h.in.interpreter 2004-07-28 09:40:15.259722811 +0100
-+++ bash-3.0/config.h.in 2004-07-28 09:40:15.429690416 +0100
-@@ -601,6 +601,9 @@
+--- bash-3.1/config.h.in.interpreter 2005-12-23 15:53:21.000000000 +0000
++++ bash-3.1/config.h.in 2005-12-23 15:53:21.000000000 +0000
+@@ -622,6 +622,9 @@
/* Define if you have the pathconf function. */
#undef HAVE_PATHCONF
@@ -10,7 +10,7 @@
/* Define if you have the putenv function. */
#undef HAVE_PUTENV
-@@ -756,6 +759,9 @@
+@@ -783,6 +786,9 @@
/* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -20,28 +20,28 @@
/* Define if you have the <grp.h> header file. */
#undef HAVE_GRP_H
---- bash-3.0/configure.in.interpreter 2004-07-21 21:06:54.000000000 +0100
-+++ bash-3.0/configure.in 2004-07-28 09:43:21.657196239 +0100
-@@ -573,7 +573,7 @@
+--- bash-3.1/configure.in.interpreter 2005-12-01 14:36:03.000000000 +0000
++++ bash-3.1/configure.in 2005-12-23 15:55:10.000000000 +0000
+@@ -632,7 +632,7 @@
AC_CHECK_HEADERS(unistd.h stdlib.h stdarg.h varargs.h limits.h string.h \
memory.h locale.h termcap.h termio.h termios.h dlfcn.h \
-- stddef.h stdint.h netdb.h grp.h strings.h regex.h)
-+ stddef.h stdint.h netdb.h grp.h strings.h regex.h elf.h)
- AC_CHECK_HEADERS(sys/ptem.h sys/pte.h sys/stream.h sys/select.h sys/file.h \
+- stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h)
++ stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h elf.h)
+ AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h \
sys/resource.h sys/param.h sys/socket.h sys/stat.h \
sys/time.h sys/times.h sys/types.h sys/wait.h)
-@@ -628,7 +628,7 @@
- AC_CHECK_FUNCS(dup2 select getdtablesize getgroups gethostname \
- setdtablesize getpagesize killpg lstat getpeername sbrk \
- getrlimit getrusage gettimeofday waitpid tcgetpgrp \
-- readlink)
-+ readlink pread)
+@@ -695,7 +695,7 @@
+ AC_CHECK_FUNCS(dup2 fcntl getdtablesize getgroups gethostname getpagesize \
+ getpeername getrlimit getrusage gettimeofday kill killpg \
+ lstat readlink sbrk select setdtablesize tcgetpgrp uname \
+- ulimit waitpid)
++ ulimit waitpid pread)
AC_REPLACE_FUNCS(rename)
dnl checks for c library functions
---- bash-3.0/execute_cmd.c.interpreter 2004-07-28 09:40:15.386698610 +0100
-+++ bash-3.0/execute_cmd.c 2004-07-28 09:40:15.449686605 +0100
+--- bash-3.1/execute_cmd.c.interpreter 2005-12-23 15:53:21.000000000 +0000
++++ bash-3.1/execute_cmd.c 2005-12-23 15:56:44.000000000 +0000
@@ -40,6 +40,10 @@
# include <unistd.h>
#endif
@@ -53,7 +53,7 @@
#include "posixtime.h"
#if defined (HAVE_SYS_RESOURCE_H) && !defined (RLIMTYPE)
-@@ -3842,12 +3846,20 @@
+@@ -3872,13 +3876,21 @@
{
/* The file has the execute bits set, but the kernel refuses to
run it for some reason. See why. */
@@ -70,12 +70,13 @@
if (sample_len > 2 && sample[0] == '#' && sample[1] == '!')
{
char *interp;
+ int ilen;
+ close (fd);
interp = getinterp (sample, sample_len, (int *)NULL);
+ ilen = strlen (interp);
errno = i;
- sys_error (_("%s: %s: bad interpreter"), command, interp ? interp : "");
-@@ -3855,6 +3867,136 @@
+@@ -3894,6 +3906,136 @@
return (EX_NOEXEC);
}
#endif
bash-2.05b-xcc.patch:
Makefile.in | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
Index: bash-2.05b-xcc.patch
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash-2.05b-xcc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-2.05b-xcc.patch 9 Sep 2004 03:27:29 -0000 1.1
+++ bash-2.05b-xcc.patch 2 Jan 2006 11:02:47 -0000 1.2
@@ -1,29 +1,19 @@
---- bash-2.05b/Makefile.in.sopwith 2002-12-05 14:03:50.000000000 -0500
-+++ bash-2.05b/Makefile.in 2002-12-05 14:04:13.000000000 -0500
-@@ -57,6 +57,7 @@
- AR = @AR@
+--- bash-3.1/Makefile.in.xcc 2005-10-25 19:37:52.000000000 +0100
++++ bash-3.1/Makefile.in 2005-12-23 16:11:09.000000000 +0000
+@@ -68,6 +68,7 @@
ARFLAGS = @ARFLAGS@
RANLIB = @RANLIB@
-+STRIP=strip
+ SIZE = @SIZE@
++STRIP = strip
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -471,7 +472,6 @@
- $(RM) $@
- $(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
- ls -l $(Program)
-- size $(Program)
-
- .build: $(SOURCES) config.h Makefile version.h $(VERSPROG)
- @echo
-@@ -491,9 +491,8 @@
+@@ -535,7 +536,7 @@
@chmod a+rx bashbug
strip: $(Program) .made
- strip $(Program)
+ $(STRIP) $(Program)
ls -l $(Program)
-- size $(Program)
+ -$(SIZE) $(Program)
- lint:
- ${MAKE} ${MFLAGS} CFLAGS='${GCC_LINT_FLAGS}' .made
bash-sighandler.patch:
builtins/read.def | 1 +
execute_cmd.c | 1 +
input.c | 2 ++
jobs.c | 2 ++
lib/readline/input.c | 7 +++++++
lib/sh/zread.c | 7 +++++--
sig.c | 11 +++++++++--
sig.h | 11 +++++++++++
8 files changed, 38 insertions(+), 4 deletions(-)
Index: bash-sighandler.patch
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash-sighandler.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bash-sighandler.patch 15 Dec 2005 10:59:56 -0000 1.6
+++ bash-sighandler.patch 2 Jan 2006 11:02:47 -0000 1.7
@@ -1,6 +1,6 @@
---- bash-3.0/builtins/read.def.sighandler 2004-01-24 18:16:36.000000000 +0000
-+++ bash-3.0/builtins/read.def 2005-12-15 10:46:35.000000000 +0000
-@@ -460,6 +460,7 @@
+--- bash-3.1/builtins/read.def.sighandler 2005-08-21 02:46:19.000000000 +0100
++++ bash-3.1/builtins/read.def 2005-12-23 16:16:24.000000000 +0000
+@@ -471,6 +471,7 @@
#if 1
if (retval < 0)
{
@@ -8,8 +8,8 @@
builtin_error (_("read error: %d: %s"), fd, strerror (errno));
return (EXECUTION_FAILURE);
}
---- bash-3.0/lib/readline/input.c.sighandler 2004-07-12 20:33:44.000000000 +0100
-+++ bash-3.0/lib/readline/input.c 2005-12-15 10:46:35.000000000 +0000
+--- bash-3.1/lib/readline/input.c.sighandler 2005-07-05 03:30:24.000000000 +0100
++++ bash-3.1/lib/readline/input.c 2005-12-23 16:16:24.000000000 +0000
@@ -435,6 +435,10 @@
return (c);
}
@@ -21,7 +21,7 @@
int
rl_getc (stream)
FILE *stream;
-@@ -454,6 +458,9 @@
+@@ -458,6 +462,9 @@
if (result == 0)
return (EOF);
@@ -31,8 +31,8 @@
#if defined (__BEOS__)
if (errno == EINTR)
continue;
---- bash-3.0/lib/sh/zread.c.sighandler 2002-04-04 19:33:33.000000000 +0100
-+++ bash-3.0/lib/sh/zread.c 2005-12-15 10:46:35.000000000 +0000
+--- bash-3.1/lib/sh/zread.c.sighandler 2005-03-10 03:17:05.000000000 +0000
++++ bash-3.1/lib/sh/zread.c 2005-12-23 16:16:24.000000000 +0000
@@ -34,6 +34,9 @@
# define SEEK_CUR 1
#endif
@@ -61,8 +61,8 @@
return -1;
continue;
}
---- bash-3.0/sig.c.sighandler 2003-12-19 21:11:35.000000000 +0000
-+++ bash-3.0/sig.c 2005-12-15 10:46:35.000000000 +0000
+--- bash-3.1/sig.c.sighandler 2005-10-22 22:04:03.000000000 +0100
++++ bash-3.1/sig.c 2005-12-23 16:17:16.000000000 +0000
@@ -58,6 +58,8 @@
extern int loop_level, continuing, breaking;
extern int parse_and_execute_level, shell_initialized;
@@ -72,7 +72,7 @@
/* Non-zero after SIGINT. */
int interrupt_state;
-@@ -408,6 +410,13 @@
+@@ -421,6 +423,13 @@
termination_unwind_protect (sig)
int sig;
{
@@ -83,10 +83,10 @@
+void
+do_termination_unwind_protect (int sig)
+{
+ /* I don't believe this condition ever tests true. */
if (sig == SIGINT && signal_is_trapped (SIGINT))
run_interrupt_trap ();
-
-@@ -429,8 +438,6 @@
+@@ -446,8 +455,6 @@
run_exit_trap ();
set_signal_handler (sig, SIG_DFL);
kill (getpid (), sig);
@@ -95,11 +95,11 @@
}
/* What we really do when SIGINT occurs. */
---- bash-3.0/sig.h.sighandler 2005-12-15 10:46:35.000000000 +0000
-+++ bash-3.0/sig.h 2005-12-15 10:46:35.000000000 +0000
-@@ -109,8 +109,12 @@
-
- #endif /* JOB_CONTROL */
+--- bash-3.1/sig.h.sighandler 2005-12-23 16:16:24.000000000 +0000
++++ bash-3.1/sig.h 2005-12-23 16:16:24.000000000 +0000
+@@ -112,8 +112,12 @@
+ /* Extern variables */
+ extern volatile int sigwinch_received;
+/* Global variables from sig.c */
+extern int need_termination_unwind_protect;
@@ -110,7 +110,7 @@
extern sighandler sigint_sighandler __P((int));
extern void initialize_signals __P((int));
extern void initialize_terminating_signals __P((void));
-@@ -123,4 +127,11 @@
+@@ -130,4 +134,11 @@
extern SigHandler *trap_to_sighandler __P((int));
extern sighandler trap_handler __P((int));
@@ -122,8 +122,8 @@
+ } while (0)
+
#endif /* _SIG_H_ */
---- bash-3.0/input.c.sighandler 2003-12-19 05:09:03.000000000 +0000
-+++ bash-3.0/input.c 2005-12-15 10:46:35.000000000 +0000
+--- bash-3.1/input.c.sighandler 2005-07-14 13:29:08.000000000 +0100
++++ bash-3.1/input.c 2005-12-23 16:16:24.000000000 +0000
@@ -41,6 +41,7 @@
#include "input.h"
#include "error.h"
@@ -140,17 +140,17 @@
local_bufused = read (fileno (stream), localbuf, sizeof(localbuf));
if (local_bufused > 0)
break;
---- bash-3.0/jobs.c.sighandler 2005-12-15 10:46:35.000000000 +0000
-+++ bash-3.0/jobs.c 2005-12-15 10:46:35.000000000 +0000
-@@ -2513,6 +2513,7 @@
- retry:
- if (wcontinued_not_supported)
- waitpid_flags &= ~WCONTINUED;
+--- bash-3.1/jobs.c.sighandler 2005-12-23 16:16:24.000000000 +0000
++++ bash-3.1/jobs.c 2005-12-23 16:30:30.000000000 +0000
+@@ -2884,6 +2884,7 @@
+ : 0;
+ if (sigchld || block == 0)
+ waitpid_flags |= WNOHANG;
+ CATCH_SIGNALS ();
pid = WAITPID (-1, &status, waitpid_flags);
- if (pid == -1 && errno == EINVAL)
- {
-@@ -2537,6 +2538,7 @@
+
+ /* WCONTINUED may be rejected by waitpid as invalid even when defined */
+@@ -2910,6 +2911,7 @@
/* If waitpid returns 0, there are running children. If it returns -1,
the only other error POSIX says it can return is EINTR. */
@@ -158,9 +158,9 @@
if (pid <= 0)
continue; /* jumps right to the test */
---- bash-3.0/execute_cmd.c.sighandler 2005-12-15 10:46:35.000000000 +0000
-+++ bash-3.0/execute_cmd.c 2005-12-15 10:46:35.000000000 +0000
-@@ -360,6 +360,7 @@
+--- bash-3.1/execute_cmd.c.sighandler 2005-12-23 16:16:24.000000000 +0000
++++ bash-3.1/execute_cmd.c 2005-12-23 16:16:24.000000000 +0000
+@@ -363,6 +363,7 @@
unlink_fifo_list ();
#endif /* PROCESS_SUBSTITUTION */
bash-ulimit.patch:
builtins/ulimit.def | 11 +++++++++++
doc/bash.1 | 17 ++++++++++++++++-
doc/bashref.texi | 17 ++++++++++++++++-
3 files changed, 43 insertions(+), 2 deletions(-)
Index: bash-ulimit.patch
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash-ulimit.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bash-ulimit.patch 8 Aug 2005 10:33:15 -0000 1.4
+++ bash-ulimit.patch 2 Jan 2006 11:02:47 -0000 1.5
@@ -1,27 +1,22 @@
---- bash-3.0/builtins/ulimit.def.ulimit 2003-12-20 00:07:27.000000000 +0000
-+++ bash-3.0/builtins/ulimit.def 2005-06-23 10:13:46.000000000 +0100
-@@ -34,15 +34,20 @@
+--- bash-3.1/builtins/ulimit.def.ulimit 2005-08-04 13:39:04.000000000 +0100
++++ bash-3.1/builtins/ulimit.def 2005-12-23 16:06:56.000000000 +0000
+@@ -34,6 +34,7 @@
-a all current limits are reported
-c the maximum size of core files created
-d the maximum size of a process's data segment
+ -e the maximum scheduling priority (`nice')
-f the maximum size of files created by the shell
-+ -i the maximum number of pending signals
+ -i the maximum number of pending signals
-l the maximum size a process may lock into memory
- -m the maximum resident set size
+@@ -41,6 +42,7 @@
-n the maximum number of open file descriptors
-p the pipe buffer size
-+ -q the maximum number of bytes in POSIX message queues
+ -q the maximum number of bytes in POSIX message queues
+ -r the maximum rt priority
-s the maximum stack size
-t the maximum amount of cpu time in seconds
-u the maximum number of user processes
- -v the size of virtual memory
-+ -x the maximum number of file locks
-
- If LIMIT is given, it is the new value of the specified resource;
- the special LIMIT values `soft', `hard', and `unlimited' stand for
-@@ -199,7 +204,13 @@
+@@ -202,6 +204,9 @@
#ifdef RLIMIT_DATA
{ 'd', RLIMIT_DATA, 1024, "data seg size", "kbytes" },
#endif
@@ -29,28 +24,21 @@
+ { 'e', RLIMIT_NICE, 1, "max nice", (char *)NULL},
+#endif /* RLIMIT_NICE */
{ 'f', RLIMIT_FILESIZE, 1024, "file size", "blocks" },
-+#ifdef RLIMIT_SIGPENDING
-+ { 'i', RLIMIT_SIGPENDING, 1, "pending signals", (char *)NULL},
-+#endif
- #ifdef RLIMIT_MEMLOCK
- { 'l', RLIMIT_MEMLOCK, 1024, "max locked memory", "kbytes" },
+ #ifdef RLIMIT_SIGPENDING
+ { 'i', RLIMIT_SIGPENDING, 1, "pending signals", (char *)NULL },
+@@ -217,6 +222,9 @@
+ #ifdef RLIMIT_MSGQUEUE
+ { 'q', RLIMIT_MSGQUEUE, 1, "POSIX message queues", "bytes" },
#endif
-@@ -208,6 +219,12 @@
- #endif /* RLIMIT_RSS */
- { 'n', RLIMIT_OPENFILES, 1, "open files", (char *)NULL},
- { 'p', RLIMIT_PIPESIZE, 512, "pipe size", "512 bytes" },
-+#ifdef RLIMIT_MSGQUEUE
-+ { 'q', RLIMIT_MSGQUEUE, 1, "POSIX message queues", "bytes" },
-+#endif
+#ifdef RLIMIT_RTPRIO
+ { 'r', RLIMIT_RTPRIO, 1, "max rt priority", (char *)NULL},
+#endif /* RLIMIT_RTPRIO */
#ifdef RLIMIT_STACK
{ 's', RLIMIT_STACK, 1024, "stack size", "kbytes" },
#endif
-@@ -221,6 +238,9 @@
- #ifdef RLIMIT_SWAP
- { 'w', RLIMIT_SWAP, 1024, "swap size", "kbytes" },
+@@ -233,6 +241,9 @@
+ #ifdef RLIMIT_LOCKS
+ { 'x', RLIMIT_LOCKS, 1, "file locks", (char *)NULL },
#endif
+#ifdef RLIMIT_LOCKS
+ { 'x', RLIMIT_LOCKS, 1, "file locks", (char *)NULL},
@@ -58,33 +46,9 @@
{ -1, -1, -1, (char *)NULL, (char *)NULL }
};
#define NCMDS (sizeof(limits) / sizeof(limits[0]))
-@@ -647,11 +667,11 @@
-
- for (i = 0; limits[i].option > 0; i++)
- {
-- if (get_limit (i, &softlim, &hardlim) < 0)
-+ if (get_limit (i, &softlim, &hardlim) == 0)
-+ printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1);
-+ else if (errno != EINVAL)
- builtin_error ("%s: cannot get limit: %s", limits[i].description,
- strerror (errno));
-- else
-- printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1);
- }
- }
-
-@@ -670,7 +690,7 @@
- else
- sprintf (unitstr, "(-%c) ", limits[limind].option);
-
-- printf ("%-18s %16s", limits[limind].description, unitstr);
-+ printf ("%-20s %16s", limits[limind].description, unitstr);
- }
- if (curlim == RLIM_INFINITY)
- puts ("unlimited");
---- bash-3.0/doc/bashref.texi.ulimit 2005-06-23 10:14:54.000000000 +0100
-+++ bash-3.0/doc/bashref.texi 2005-06-23 11:13:31.000000000 +0100
-@@ -3793,7 +3793,7 @@
+--- bash-3.1/doc/bashref.texi.ulimit 2005-12-23 16:04:31.000000000 +0000
++++ bash-3.1/doc/bashref.texi 2005-12-23 16:04:31.000000000 +0000
+@@ -3833,7 +3833,7 @@
@item ulimit
@btindex ulimit
@example
@@ -93,7 +57,7 @@
@end example
@code{ulimit} provides control over the resources available to processes
started by the shell, on systems that allow such control. If an
-@@ -3814,9 +3814,15 @@
+@@ -3854,9 +3854,15 @@
@item -d
The maximum size of a process's data segment.
@@ -109,7 +73,7 @@
@item -l
The maximum size that may be locked into memory.
-@@ -3829,6 +3835,12 @@
+@@ -3869,6 +3875,12 @@
@item -p
The pipe buffer size.
@@ -122,7 +86,7 @@
@item -s
The maximum stack size.
-@@ -3841,6 +3853,9 @@
+@@ -3881,6 +3893,9 @@
@item -v
The maximum amount of virtual memory available to the process.
@@ -132,9 +96,9 @@
@end table
If @var{limit} is given, it is the new value of the specified resource;
---- bash-3.0/doc/bash.1.ulimit 2005-06-23 11:28:48.000000000 +0100
-+++ bash-3.0/doc/bash.1 2005-06-23 12:45:29.000000000 +0100
-@@ -8362,7 +8362,7 @@
+--- bash-3.1/doc/bash.1.ulimit 2005-12-23 16:04:31.000000000 +0000
++++ bash-3.1/doc/bash.1 2005-12-23 16:04:31.000000000 +0000
+@@ -8490,7 +8490,7 @@
returns true if any of the arguments are found, false if
none are found.
.TP
@@ -143,7 +107,7 @@
Provides control over the resources available to the shell and to
processes started by it, on systems that allow such control.
The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is
-@@ -8398,9 +8398,15 @@
+@@ -8526,9 +8526,15 @@
.B \-d
The maximum size of a process's data segment
.TP
@@ -159,7 +123,7 @@
.B \-l
The maximum size that may be locked into memory
.TP
-@@ -8414,6 +8420,12 @@
+@@ -8542,6 +8548,12 @@
.B \-p
The pipe size in 512-byte blocks (this may not be set)
.TP
@@ -172,7 +136,7 @@
.B \-s
The maximum stack size
.TP
-@@ -8425,6 +8437,9 @@
+@@ -8553,6 +8565,9 @@
.TP
.B \-v
The maximum amount of virtual memory available to the shell
Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- bash.spec 15 Dec 2005 10:59:56 -0000 1.96
+++ bash.spec 2 Jan 2006 11:02:47 -0000 1.97
@@ -1,7 +1,7 @@
-Version: 3.0
+Version: 3.1
Name: bash
Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 41
+Release: 1
Group: System Environment/Shells
License: GPL
Url: http://www.gnu.org/software/bash
@@ -11,52 +11,26 @@
Source4: dot-bash_profile
Source5: dot-bash_logout
# Official upstream patches
-Patch1: bash30-001
-Patch2: bash30-002
-Patch3: bash30-003
-Patch4: bash30-004
-Patch5: bash30-005
-Patch6: bash30-006
-Patch7: bash30-007
-Patch8: bash30-008
-Patch9: bash30-009
-Patch10: bash30-010
-Patch11: bash30-011
-Patch12: bash30-012
-Patch13: bash30-013
-Patch14: bash30-014
-Patch15: bash30-015
-Patch16: bash30-016
+Patch1: bash31-001
+Patch2: bash-arrays.patch
# Other patches
Patch100: bash-2.03-paths.patch
Patch101: bash-2.02-security.patch
Patch102: bash-2.03-profile.patch
Patch103: bash-2.05a-requires.patch
Patch104: bash-2.05a-shellfunc.patch
-Patch105: bash-2.05-ia64.patch
Patch106: bash-2.05a-loadables.patch
Patch107: bash-2.05a-interpreter.patch
Patch108: bash-2.05b-readline-oom.patch
-Patch109: bash-2.05b-utf8.patch
Patch110: bash-2.05b-mbinc.patch
-Patch111: bash-multibyteifs.patch
Patch112: bash-ulimit.patch
-Patch113: bash-jobs.patch
Patch114: bash-2.05b-xcc.patch
Patch115: bash-2.05b-pgrp_sync.patch
Patch116: bash-2.05b-manso.patch
Patch117: bash-2.05b-debuginfo.patch
Patch118: bash-tty-tests.patch
-Patch119: bash-sigpipe.patch
-Patch120: bash-read-e-segfault.patch
-Patch121: bash-manpage.patch
-Patch122: bash-wrap.patch
-Patch123: bash-crash.patch
-Patch124: bash-pwd.patch
-Patch125: bash-afs.patch
Patch126: bash-setlocale.patch
Patch127: bash-sighandler.patch
-Patch128: bash-subshell.patch
Patch129: bash-read-memleak.patch
Prefix: %{_prefix}
Requires: mktemp
@@ -82,21 +56,7 @@
%setup -q -a 2
# Official upstream patches
%patch1 -p0 -b .001
-%patch2 -p0 -b .002
-%patch3 -p0 -b .003
-%patch4 -p0 -b .004
-%patch5 -p0 -b .005
-%patch6 -p0 -b .006
-%patch7 -p0 -b .007
-%patch8 -p0 -b .008
-%patch9 -p0 -b .009
-%patch10 -p0 -b .010
-%patch11 -p0 -b .011
-%patch12 -p0 -b .012
-%patch13 -p0 -b .013
-%patch14 -p0 -b .014
-%patch15 -p0 -b .015
-%patch16 -p0 -b .016
+%patch2 -p0 -b .arrays
# Other patches
%patch100 -p1 -b .paths
@@ -104,30 +64,18 @@
%patch102 -p1 -b .profile
%patch103 -p1 -b .requires
%patch104 -p1 -b .shellfunc
-%patch105 -p1 -b .ia64
%patch106 -p1 -b .loadables
%patch107 -p1 -b .interpreter
%patch108 -p1 -b .readline-oom
-%patch109 -p1 -b .utf8
%patch110 -p1 -b .mbinc
-%patch111 -p1 -b .multibyteifs
%patch112 -p1 -b .ulimit
-%patch113 -p1 -b .jobs
%patch114 -p1 -b .xcc
%patch115 -p1 -b .pgrp_sync
%patch116 -p1 -b .manso
%patch117 -p1 -b .debuginfo
%patch118 -p1 -b .tty-tests
-%patch119 -p1 -b .sigpipe
-%patch120 -p0 -b .read-e-segfault
-%patch121 -p1 -b .manpage
-%patch122 -p1 -b .wrap
-%patch123 -p0 -b .crash
-%patch124 -p1 -b .pwd
-%patch125 -p1 -b .afs
%patch126 -p1 -b .setlocale
%patch127 -p1 -b .sighandler
-%patch128 -p1 -b .subshell
%patch129 -p1 -b .read-memleak
echo %{version} > _distribution
@@ -261,6 +209,13 @@
%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
%changelog
+* Mon Jan 2 2006 Tim Waugh <twaugh at redhat.com> 3.1-1
+- 3.1.
+- No longer need ia64, utf8, multibyteifs, jobs, sigpipe,
+ read-e-segfault, manpage, crash, pwd, afs, subshell patches.
+- Remove wrap patch for now.
+- Use upstream patch to fix arrays.
+
* Thu Dec 15 2005 Tim Waugh <twaugh at redhat.com> 3.0-41
- Missed another loop for improved sighandler patch (bug #169231).
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 9 Sep 2004 03:32:28 -0000 1.10
+++ sources 2 Jan 2006 11:02:48 -0000 1.11
@@ -1,2 +1,3 @@
-26c4d642e29b3533d8d754995bc277b3 bash-3.0.tar.gz
1fd06916fb451a666a38e4689173b60b bash-doc-3.0.tar.gz
+ef5304c4b22aaa5088972c792ed45d72 bash-3.1.tar.gz
+a8c517c6a7b21b8b855190399c5935ae bash-doc-3.1.tar.gz
--- bash-2.05-ia64.patch DELETED ---
--- bash-2.05b-utf8.patch DELETED ---
--- bash-afs.patch DELETED ---
--- bash-crash.patch DELETED ---
--- bash-jobs.patch DELETED ---
--- bash-manpage.patch DELETED ---
--- bash-multibyteifs.patch DELETED ---
--- bash-pwd.patch DELETED ---
--- bash-read-e-segfault.patch DELETED ---
--- bash-sigpipe.patch DELETED ---
--- bash-subshell.patch DELETED ---
--- bash-wrap.patch DELETED ---
--- bash30-001 DELETED ---
--- bash30-002 DELETED ---
--- bash30-003 DELETED ---
--- bash30-004 DELETED ---
--- bash30-005 DELETED ---
--- bash30-006 DELETED ---
--- bash30-007 DELETED ---
--- bash30-008 DELETED ---
--- bash30-009 DELETED ---
--- bash30-010 DELETED ---
--- bash30-011 DELETED ---
--- bash30-012 DELETED ---
--- bash30-013 DELETED ---
--- bash30-014 DELETED ---
--- bash30-015 DELETED ---
--- bash30-016 DELETED ---
More information about the fedora-cvs-commits
mailing list