]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/bash/bash32-026
Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into kernel...
[people/teissler/ipfire-2.x.git] / src / patches / bash / bash32-026
1 BASH PATCH REPORT
2 =================
3
4 Bash-Release: 3.2
5 Patch-ID: bash32-026
6
7 Bug-Reported-by: Chet Ramey <chet.ramey@case.edu>
8 Bug-Reference-ID:
9 Bug-Reference-URL:
10
11 Bug-Description:
12
13 This keeps the Apple linker from attempting to link bash against Apple's
14 readline library "replacement" rather than the one shipped with bash. It
15 extends the configure workaround to Mac OS X Leopard (10.5).
16
17 As a side effect, the patch updates the copyright date displayed in the
18 version string.
19
20 You must re-run configure after applying the patch, and before rebuilding
21 bash.
22
23 Patch:
24
25 *** ../bash-3.2-patched/configure.in 2007-03-06 11:07:38.000000000 -0500
26 --- configure.in 2007-11-23 15:37:41.000000000 -0500
27 ***************
28 *** 519,523 ****
29 # dynamic version
30 case "${host_os}" in
31 ! darwin8*) READLINE_LIB='${READLINE_LIBRARY}' ;;
32 *) READLINE_LIB=-lreadline ;;
33 esac
34 --- 519,523 ----
35 # dynamic version
36 case "${host_os}" in
37 ! darwin[[89]]*) READLINE_LIB='${READLINE_LIBRARY}' ;;
38 *) READLINE_LIB=-lreadline ;;
39 esac
40 *** ../bash-3.2-patched/configure 2007-03-24 14:51:22.000000000 -0400
41 --- configure 2007-11-23 15:46:15.000000000 -0500
42 ***************
43 *** 4872,4876 ****
44 # dynamic version
45 case "${host_os}" in
46 ! darwin8*) READLINE_LIB='${READLINE_LIBRARY}' ;;
47 *) READLINE_LIB=-lreadline ;;
48 esac
49 --- 4872,4876 ----
50 # dynamic version
51 case "${host_os}" in
52 ! darwin[89]*) READLINE_LIB='${READLINE_LIBRARY}' ;;
53 *) READLINE_LIB=-lreadline ;;
54 esac
55 *** ../bash-3.2-patched/version.c 2005-05-16 11:58:34.000000000 -0400
56 --- version.c 2007-11-23 16:03:40.000000000 -0500
57 ***************
58 *** 80,83 ****
59 printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE);
60 if (extended)
61 ! printf (_("Copyright (C) 2005 Free Software Foundation, Inc.\n"));
62 }
63 --- 80,83 ----
64 printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE);
65 if (extended)
66 ! printf (_("Copyright (C) 2007 Free Software Foundation, Inc.\n"));
67 }
68 *** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
69 --- patchlevel.h Mon Oct 16 14:22:54 2006
70 ***************
71 *** 26,30 ****
72 looks for to find the patch level (for the sccs version string). */
73
74 ! #define PATCHLEVEL 25
75
76 #endif /* _PATCHLEVEL_H_ */
77 --- 26,30 ----
78 looks for to find the patch level (for the sccs version string). */
79
80 ! #define PATCHLEVEL 26
81
82 #endif /* _PATCHLEVEL_H_ */