- updated for 3.0

Changed files:
    bash-autoconf.patch -> 1.5
    bash-info.patch -> 1.3
    bash-paths.patch -> 1.2
    bash-requires.patch -> 1.7
    bash-rlimit_locks.patch -> 1.4

diff --git a/bash-autoconf.patch b/bash-autoconf.patch
index f712d02827ac6d66667830174b64ebe2367153be..210a29c25d96b085981fcc09c9c16f5e5e6bb8c7 100644 (file)
--- a/bash-autoconf.patch
+++ b/bash-autoconf.patch
@@ -1,16 +1,20 @@
---- bash-2.05b-new/aclocal.m4  Fri Feb  8 00:20:35 2002
-+++ bash-2.05b/aclocal.m4      Thu Feb  7 22:38:32 2002
-@@ -921,8 +921,8 @@
- _bash_needmsg=
+--- bash-3.0/aclocal.m4.orig   2004-05-13 19:37:25.000000000 +0200
++++ bash-3.0/aclocal.m4        2004-08-06 08:39:20.961425816 +0200
+@@ -943,10 +943,10 @@
  fi
  AC_CACHE_VAL(bash_cv_termcap_lib,
--[AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
+ [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
+-  [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
 -    [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-+[AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-+    [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
-         [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
-           [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
-               bash_cv_termcap_lib=gnutermcap)])])])])
+-        [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
+-          [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
++  [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
++      [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
++      [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
++          [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
+               bash_cv_termcap_lib=gnutermcap)])])])])])
+ if test "X$_bash_needmsg" = "Xyes"; then
+ AC_MSG_CHECKING(which library has the termcap functions)
 --- bash-2.05a-new/Makefile.in Fri Feb  8 00:20:46 2002
 +++ bash-2.05a/Makefile.in     Thu Feb  7 22:38:32 2002
 @@ -592,8 +592,8 @@

diff --git a/bash-info.patch b/bash-info.patch
index a5c77ff2f91dd07529a808dca2aa29469d7a87b3..1459898751d1f1d10a74ce079630b33237d16a36 100644 (file)
--- a/bash-info.patch
+++ b/bash-info.patch
@@ -1,15 +1,14 @@
-diff -Nru bash-2.03/doc/bashref.texi bash-2.03.new/doc/bashref.texi
---- bash-2.03/doc/bashref.texi Wed Jan 20 22:47:01 1999
-+++ bash-2.03.new/doc/bashref.texi     Mon May  3 19:19:23 1999
-@@ -23,9 +23,9 @@
+--- bash-3.0/doc/bashref.texi.orig     2004-06-26 20:26:07.000000000 +0200
++++ bash-3.0/doc/bashref.texi  2004-08-06 08:41:25.597478256 +0200
+@@ -40,9 +40,9 @@
+ @defcodeindex rw
  @set BashFeatures
  
- @ifinfo
--@dircategory Utilities
+-@dircategory Basics
 +@dircategory Miscellaneous:
  @direntry
--     * Bash: (bash).                     The GNU Bourne-Again SHell.
+-* Bash: (bash).                     The GNU Bourne-Again SHell.
 +* Bash: (bash).                               The GNU Bourne-Again SHell
  @end direntry
  
- @format
+ @finalout

diff --git a/bash-paths.patch b/bash-paths.patch
index f222a214a1ac6a83884760f53bb07a618436b238..55cc08c242a23d53298ba9823ca272a8308a1ec1 100644 (file)
--- a/bash-paths.patch
+++ b/bash-paths.patch
@@ -10,14 +10,13 @@ diff -uNr bash-2.02-orig/config.h.in bash-2.02/config.h.in
  
  /* Define if you have the bcopy function.  */
  #undef HAVE_BCOPY
-diff -uNr bash-2.03-orig/config-top.h bash-2.03/config-top.h
---- bash-2.03-orig/config-top.h        Thu Mar  6 17:38:39 1997
-+++ bash-2.03/config-top.h     Sun Apr 19 16:56:20 1998
-@@ -34,14 +34,14 @@
+--- bash-3.0/config-top.h.orig 2003-08-05 16:36:12.000000000 +0200
++++ bash-3.0/config-top.h      2004-08-06 08:36:33.117941904 +0200
+@@ -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:/usr/ucb:/bin:/usr/bin:."
+-  "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
 +  "/usr/local/bin:/bin:/usr/bin"
  #endif
  
@@ -25,8 +24,8 @@ diff -uNr bash-2.03-orig/config-top.h bash-2.03/config-top.h
     the Posix.2 confstr () function, or CS_PATH define are not present. */
  #ifndef STANDARD_UTILS_PATH
  #define STANDARD_UTILS_PATH \
--  "/bin:/usr/bin:/usr/ucb:/sbin:/usr/sbin:/etc:/usr/etc"
-+  "/bin:/usr/bin:/usr/sbin:/sbin"
+-  "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
++  "/bin:/usr/bin:/sbin:/usr/sbin"
  #endif
  
  /* Default primary and secondary prompt strings. */

diff --git a/bash-requires.patch b/bash-requires.patch
index e3661a8128fac47e1c504bc1f060064fbefaa8e3..28163674515fd7769100a5f81e27fdc761f304c8 100644 (file)
--- a/bash-requires.patch
+++ b/bash-requires.patch
@@ -190,7 +190,7 @@
 +        output_requirement(cmd1);
 +      }
 +      } else {
-+      if (!assignment(cmd0)) {
++      if (!assignment(cmd0, 0)) {
 +        output_requirement(cmd0);
 +      } else {
 +

diff --git a/bash-rlimit_locks.patch b/bash-rlimit_locks.patch
index d48a10699426956349835f5d5257d198dd7886c5..7f8f58e82456f155dfebe5bdfce21d3c937f2ebf 100644 (file)
--- a/bash-rlimit_locks.patch
+++ b/bash-rlimit_locks.patch
@@ -39,7 +39,7 @@
    opt = get_limit (limind, &soft_limit, &hard_limit);
    if (opt < 0)
      {
--      builtin_error ("%s: cannot get limit: %s", limits[limind].description,
+-      builtin_error (_("%s: cannot get limit: %s"), limits[limind].description,
 -                                               strerror (errno));
 -      return (EXECUTION_FAILURE);
 +      if (( errno == 22) && (limits[limind].parameter == RLIMIT_LOCKS))
@@ -52,7 +52,7 @@
 +        }
 +      else
 +        {
-+          builtin_error ("%s: cannot get limit: %s", limits[limind].description,
++          builtin_error (_("%s: cannot get limit: %s"), limits[limind].description,
 +                                              strerror (errno));
 +          return (EXECUTION_FAILURE);
 +        }
@@ -66,7 +66,7 @@
 +
 +  if (dont_locks)
 +    {
-+      builtin_error ("cannot set it on the current kernel");
++      builtin_error (_("cannot set it on the current kernel"));
 +      return (EXECUTION_FAILURE);
 +    }