]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/bash/bash32-011
Merge remote-tracking branch 'origin/next' into thirteen
[people/pmueller/ipfire-2.x.git] / src / patches / bash / bash32-011
1 BASH PATCH REPORT
2 =================
3
4 Bash-Release: 3.2
5 Patch-ID: bash32-011
6
7 Bug-Reported-by: Petr Sumbera <Petr.Sumbera@Sun.COM>
8 Bug-Reference-ID: <45AF5F4B.1020800@sun.com>
9 Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-01/msg00049.html
10
11 Bug-Description:
12
13 Under certain circumstances (loopback mounts), the bash getcwd does not
14 return correct results. This patch allows the use of the Solaris libc
15 getcwd even though it doesn't dynamically allocate memory.
16
17 Run `touch configure' to make sure make doesn't try to run autoconf.
18 Then run configure with whatever options you like.
19
20 Patch:
21
22 *** ../bash-3.2-patched/configure.in Tue Sep 26 11:05:45 2006
23 --- configure.in Wed Jan 31 09:48:00 2007
24 ***************
25 *** 6,10 ****
26 dnl Process this file with autoconf to produce a configure script.
27
28 ! # Copyright (C) 1987-2006 Free Software Foundation, Inc.
29
30 # This program is free software; you can redistribute it and/or modify
31 --- 6,10 ----
32 dnl Process this file with autoconf to produce a configure script.
33
34 ! # Copyright (C) 1987-2007 Free Software Foundation, Inc.
35
36 # This program is free software; you can redistribute it and/or modify
37 ***************
38 *** 992,996 ****
39 sco3.2*) LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
40 sunos4*) LOCAL_CFLAGS=-DSunOS4 ;;
41 ! solaris2.5*) LOCAL_CFLAGS=-DSunOS5 ;;
42 lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
43 linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
44 --- 992,997 ----
45 sco3.2*) LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
46 sunos4*) LOCAL_CFLAGS=-DSunOS4 ;;
47 ! solaris2.5*) LOCAL_CFLAGS="-DSunOS5 -DSOLARIS" ;;
48 ! solaris2*) LOCAL_CFLAGS=-DSOLARIS ;;
49 lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
50 linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
51 *** ../bash-3.2-patched/config-bot.h Tue Sep 12 16:43:04 2006
52 --- config-bot.h Tue Mar 6 10:41:31 2007
53 ***************
54 *** 2,6 ****
55 /* modify settings or make new ones based on what autoconf tells us. */
56
57 ! /* Copyright (C) 1989-2002 Free Software Foundation, Inc.
58
59 This file is part of GNU Bash, the Bourne Again SHell.
60 --- 2,6 ----
61 /* modify settings or make new ones based on what autoconf tells us. */
62
63 ! /* Copyright (C) 1989-2007 Free Software Foundation, Inc.
64
65 This file is part of GNU Bash, the Bourne Again SHell.
66 ***************
67 *** 71,77 ****
68 #endif
69
70 ! /* If we have a getcwd(3), but it calls popen(), #undef HAVE_GETCWD so
71 ! the replacement in getcwd.c will be built. */
72 ! #if defined (HAVE_GETCWD) && defined (GETCWD_BROKEN)
73 # undef HAVE_GETCWD
74 #endif
75 --- 71,79 ----
76 #endif
77
78 ! /* If we have a getcwd(3), but one that does not dynamically allocate memory,
79 ! #undef HAVE_GETCWD so the replacement in getcwd.c will be built. We do
80 ! not do this on Solaris, because their implementation of loopback mounts
81 ! breaks the traditional file system assumptions that getcwd uses. */
82 ! #if defined (HAVE_GETCWD) && defined (GETCWD_BROKEN) && !defined (SOLARIS)
83 # undef HAVE_GETCWD
84 #endif
85 *** ../bash-3.2-patched/builtins/common.c Thu Jul 27 09:39:51 2006
86 --- builtins/common.c Tue Mar 6 10:43:27 2007
87 ***************
88 *** 1,3 ****
89 ! /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
90
91 This file is part of GNU Bash, the Bourne Again SHell.
92 --- 1,3 ----
93 ! /* Copyright (C) 1987-2007 Free Software Foundation, Inc.
94
95 This file is part of GNU Bash, the Bourne Again SHell.
96 ***************
97 *** 476,480 ****
98 --- 476,484 ----
99 if (the_current_working_directory == 0)
100 {
101 + #if defined (GETCWD_BROKEN)
102 + the_current_working_directory = getcwd (0, PATH_MAX);
103 + #else
104 the_current_working_directory = getcwd (0, 0);
105 + #endif
106 if (the_current_working_directory == 0)
107 {
108 *** ../bash-3.2-patched/configure Tue Sep 26 11:06:01 2006
109 --- configure Tue Mar 6 10:59:20 2007
110 ***************
111 *** 27317,27321 ****
112 sco3.2*) LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
113 sunos4*) LOCAL_CFLAGS=-DSunOS4 ;;
114 ! solaris2.5*) LOCAL_CFLAGS=-DSunOS5 ;;
115 lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
116 linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
117 --- 27317,27322 ----
118 sco3.2*) LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
119 sunos4*) LOCAL_CFLAGS=-DSunOS4 ;;
120 ! solaris2.5*) LOCAL_CFLAGS="-DSunOS5 -DSOLARIS" ;;
121 ! solaris2*) LOCAL_CFLAGS=-DSOLARIS ;;
122 lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
123 linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
124 *** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
125 --- patchlevel.h Mon Oct 16 14:22:54 2006
126 ***************
127 *** 26,30 ****
128 looks for to find the patch level (for the sccs version string). */
129
130 ! #define PATCHLEVEL 10
131
132 #endif /* _PATCHLEVEL_H_ */
133 --- 26,30 ----
134 looks for to find the patch level (for the sccs version string). */
135
136 ! #define PATCHLEVEL 11
137
138 #endif /* _PATCHLEVEL_H_ */