Browse Source

apply more fixes for GNU Bash 3.0

Ralf S. Engelschall 21 years ago
parent
commit
243bb4a060
3 changed files with 65 additions and 1 deletions
  1. 1 0
      openpkg/HISTORY
  2. 63 0
      openpkg/bash.patch
  3. 1 1
      openpkg/openpkg.spec

+ 1 - 0
openpkg/HISTORY

@@ -2,6 +2,7 @@
 2004
 2004
 ====
 ====
 
 
+20040811 apply more fixes for GNU Bash 3.0
 20040810 fix uid/gid determination loops by not being confused by multiple query results
 20040810 fix uid/gid determination loops by not being confused by multiple query results
 20040804 upgrade to BeeCrypt 4.0.0 and GNU Bash 3.0
 20040804 upgrade to BeeCrypt 4.0.0 and GNU Bash 3.0
 20040725 fix a few typos in rc(8) manual page 
 20040725 fix a few typos in rc(8) manual page 

+ 63 - 0
openpkg/bash.patch

@@ -171,3 +171,66 @@ Index: lib/readline/display.c
        return (prompt_prefix_length);
        return (prompt_prefix_length);
      }
      }
 
 
+-----------------------------------------------------------------------------
+
+Fix timezone handling for HPUX
+
+Index: lib/sh/strftime.c
+--- lib/sh/strftime.c.orig	2004-03-04 04:13:23 +0100
++++ lib/sh/strftime.c	2004-08-06 12:40:06 +0200
+@@ -97,6 +97,8 @@
+ extern int daylight;
+ #if defined(SOLARIS) || defined(mips) || defined (M_UNIX)
+ extern long int timezone, altzone;
++#elif defined(HPUX)
++extern long int timezone;
+ #else
+ extern int timezone, altzone;
+ #endif
+@@ -480,7 +482,11 @@
+ 			 * Systems with tzname[] probably have timezone as
+ 			 * secs west of GMT.  Convert to mins east of GMT.
+ 			 */
++#if defined(HPUX)
++			off = -(timezone / 60);
++#else
+ 			off = -(daylight ? timezone : altzone) / 60;
++#endif /* HPUX */
+ #else /* !HAVE_TZNAME */
+ 			off = -zone.tz_minuteswest;
+ #endif /* !HAVE_TZNAME */
+
+-----------------------------------------------------------------------------
+
+Fix segfault when accessing an unset array.
+http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00026.html
+
+Index: arrayfunc.c
+--- arrayfunc.c.orig	2003-12-19 06:03:09 +0100
++++ arrayfunc.c	2004-08-11 15:17:03 +0200
+@@ -611,7 +611,7 @@
+   var = find_variable (t);
+ 
+   free (t);
+-  return var;
++  return (var == 0 || invisible_p (var)) ? (SHELL_VAR *)0 : var;
+ }
+ 
+ /* Return a string containing the elements in the array and subscript
+
+-----------------------------------------------------------------------------
+
+Fix nested brace vs. variable expansion.
+http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00056.html
+
+Index: braces.c
+--- braces.c.orig	2003-12-04 17:09:52 +0100
++++ braces.c	2004-08-11 15:18:14 +0200
+@@ -402,6 +402,7 @@
+ 	{
+ 	  pass_next = 1;
+ 	  i++;
++	  level++;
+ 	  continue;
+ 	}
+ #endif

+ 1 - 1
openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 #   o any cc(1)
 
 
 #   the package version/release
 #   the package version/release
-%define       V_openpkg  20040810
+%define       V_openpkg  20040811
 
 
 #   the used software versions
 #   the used software versions
 %define       V_rpm      4.2.1
 %define       V_rpm      4.2.1