From 27b48028df44553049443694b311a2128cefc366 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Thu, 25 Sep 2014 02:58:17 +0200 Subject: [PATCH] bash: Refresh patches Signed-off-by: Marcel Denia --- utils/bash/patches/101-upstream-bash42-001.patch | 2 +- utils/bash/patches/123-upstream-bash42-023.patch | 2 +- utils/bash/patches/{129-no_doc.patch => 900-no_doc.patch} | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) rename utils/bash/patches/{129-no_doc.patch => 900-no_doc.patch} (52%) diff --git a/utils/bash/patches/101-upstream-bash42-001.patch b/utils/bash/patches/101-upstream-bash42-001.patch index 8aca8156b..3ad78f677 100644 --- a/utils/bash/patches/101-upstream-bash42-001.patch +++ b/utils/bash/patches/101-upstream-bash42-001.patch @@ -34,7 +34,7 @@ Patch (apply with `patch -p0'): i = *sindex; while (c = string[i]) -@@ -7176,7 +7178,7 @@ parameter_brace_expand (string, indexp, +@@ -7176,7 +7178,7 @@ parameter_brace_expand (string, indexp, { /* Extract the contents of the ${ ... } expansion according to the Posix.2 rules. */ diff --git a/utils/bash/patches/123-upstream-bash42-023.patch b/utils/bash/patches/123-upstream-bash42-023.patch index 6c6fdb3e5..676d620f6 100644 --- a/utils/bash/patches/123-upstream-bash42-023.patch +++ b/utils/bash/patches/123-upstream-bash42-023.patch @@ -18,7 +18,7 @@ Patch (apply with `patch -p0'): --- a/subst.c +++ b/subst.c -@@ -7274,6 +7274,7 @@ parameter_brace_expand (string, indexp, +@@ -7274,6 +7274,7 @@ parameter_brace_expand (string, indexp, default: case '\0': bad_substitution: diff --git a/utils/bash/patches/129-no_doc.patch b/utils/bash/patches/900-no_doc.patch similarity index 52% rename from utils/bash/patches/129-no_doc.patch rename to utils/bash/patches/900-no_doc.patch index 442cd2291..5dfb367b4 100644 --- a/utils/bash/patches/129-no_doc.patch +++ b/utils/bash/patches/900-no_doc.patch @@ -1,7 +1,6 @@ -diff -urN bash-4.2/Makefile.in bash-4.2.new/Makefile.in ---- bash-4.2/Makefile.in 2010-12-01 01:22:42.000000000 +0100 -+++ bash-4.2.new/Makefile.in 2012-07-30 16:24:01.325057998 +0200 -@@ -724,10 +724,8 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -724,10 +724,8 @@ reconfig: force # $(MAKE) -f $(srcdir)/Makefile $(MFLAGS) srcdir=$(srcdir) doc documentation: force