Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (68fd446d5864af32739a47f94ec5c3252e825d7e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (68fd446d5864af32739a47f94ec5c3252e825d7e)
  • Date: Tue, 8 Jun 2010 20:01:34 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

shell-term-fm/bash/DETAILS | 2
shell-term-fm/bash/HISTORY | 5 ++
shell-term-fm/bash/PRE_BUILD | 3 -
shell-term-fm/bash/patches/bash41-006 | 76
++++++++++++++++++++++++++++++++++
shell-term-fm/bash/patches/bash41-007 | 47 +++++++++++++++++++++
5 files changed, 131 insertions(+), 2 deletions(-)

New commits:
commit 68fd446d5864af32739a47f94ec5c3252e825d7e
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

bash: Added upstream patches. 006 and 007. PATCHLEVEL++

diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index fe46c7e..e2db352 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -15,7 +15,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE4_IGNORE=signature
WEB_SITE=http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
ENTERED=20010922
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE[0]=GPL2
KEYWORDS="console"
SHORT="Bourne Again SHell for the GNU operating system"
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index bc92db4..4d7c947 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,8 @@
+2010-06-08 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Added upstream patches
+ * patches/bash41-006 to 007: Added upstream patches
+
2010-04-24 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: Added upstream patches
diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD
index 6167dfe..b117fa4 100755
--- a/shell-term-fm/bash/PRE_BUILD
+++ b/shell-term-fm/bash/PRE_BUILD
@@ -7,7 +7,8 @@ patch -p0 < $SCRIPT_DIRECTORY/patches/bash41-002 &&
patch -p0 < $SCRIPT_DIRECTORY/patches/bash41-003 &&
patch -p0 < $SCRIPT_DIRECTORY/patches/bash41-004 &&
patch -p0 < $SCRIPT_DIRECTORY/patches/bash41-005 &&
-
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash41-006 &&
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash41-007 &&

if [[ "$BASH_NI_LOGIN" == y ]]; then
message "${MESSAGE_COLOR}Defining
NON_INTERACTIVE_LOGIN_SHELLS.$DEFAULT_COLOR" &&
diff --git a/shell-term-fm/bash/patches/bash41-006
b/shell-term-fm/bash/patches/bash41-006
new file mode 100644
index 0000000..d6553b8
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash41-006
@@ -0,0 +1,76 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.1
+Patch-ID: bash41-006
+
+Bug-Reported-by: Mike Frysinger <vapier AT gentoo.org>
+Bug-Reference-ID: <201003210155.56618.vapier AT gentoo.org>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html
+
+Bug-Description:
+
+Bash did not correctly print/reproduce here documents attached to commands
+inside compound commands such as for and while. This affected the
+execution of such commands inside a shell function when the function
+definition is saved and later restored using `.' or `eval'.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/print_cmd.c 2009-09-16 15:32:26.000000000 -0400
+--- print_cmd.c 2010-03-22 21:15:30.000000000 -0400
+***************
+*** 114,117 ****
+--- 114,123 ----
+ #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
+
++ #define PRINT_DEFERRED_HEREDOCS(x) \
++ do { \
++ if (deferred_heredocs) \
++ print_deferred_heredocs (x); \
++ } while (0)
++
+ /* Non-zero means the stuff being printed is inside of a function def. */
+ static int inside_function_def;
+***************
+*** 561,571 ****
+ {
+ print_for_command_head (for_command);
+-
+ cprintf (";");
+ newline ("do\n");
+ indentation += indentation_amount;
+ make_command_string_internal (for_command->action);
+ semicolon ();
+ indentation -= indentation_amount;
+ newline ("done");
+ }
+--- 566,578 ----
+ {
+ print_for_command_head (for_command);
+ cprintf (";");
+ newline ("do\n");
++
+ indentation += indentation_amount;
+ make_command_string_internal (for_command->action);
++ PRINT_DEFERRED_HEREDOCS ("");
+ semicolon ();
+ indentation -= indentation_amount;
++
+ newline ("done");
+ }
+*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 5
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 6
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash41-007
b/shell-term-fm/bash/patches/bash41-007
new file mode 100644
index 0000000..07b4796
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash41-007
@@ -0,0 +1,47 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.1
+Patch-ID: bash41-007
+
+Bug-Reported-by: Rob Robason <rob AT robason.net>
+Bug-Reference-ID: <1269513145.22336.9.camel AT home.robason.homelinux.net>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00089.html
+
+Bug-Description:
+
+A typo caused bash to not honor a precision specification in a printf
+format.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.1-patched/builtins/printf.def 2010-01-18 10:50:22.000000000
-0500
+--- builtins/printf.def 2010-03-25 09:40:56.000000000 -0400
+***************
+*** 118,122 ****
+ nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth,
func); \
+ else if (have_precision) \
+! nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth,
func); \
+ else \
+ nw = vflag ? vbprintf (f, func) : printf (f, func); \
+--- 118,122 ----
+ nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth,
func); \
+ else if (have_precision) \
+! nw = vflag ? vbprintf (f, precision, func) : printf (f, precision,
func); \
+ else \
+ nw = vflag ? vbprintf (f, func) : printf (f, func); \
+*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400
+--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 6
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 7
+
+ #endif /* _PATCHLEVEL_H_ */



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (68fd446d5864af32739a47f94ec5c3252e825d7e), George Sherwood, 06/08/2010

Archive powered by MHonArc 2.6.24.

Top of Page