bash: Refresh patches
authorMarcel Denia <naoir@gmx.net>
Thu, 25 Sep 2014 00:58:17 +0000 (02:58 +0200)
committerMarcel Denia <naoir@gmx.net>
Thu, 25 Sep 2014 00:58:17 +0000 (02:58 +0200)
Signed-off-by: Marcel Denia <naoir@gmx.net>
utils/bash/patches/101-upstream-bash42-001.patch
utils/bash/patches/123-upstream-bash42-023.patch
utils/bash/patches/129-no_doc.patch [deleted file]
utils/bash/patches/900-no_doc.patch [new file with mode: 0644]

index 8aca8156bee115c05efc9e5b2f7b0f8edab5e9a3..3ad78f6773ccc724c05400a840d22f0b679b51d9 100644 (file)
@@ -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. */
index 6c6fdb3e57ebb4a448183cdc8aaaff1a3d5c06c8..676d620f669805e4c168643bd0cb79b7c51540a0 100644 (file)
@@ -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/129-no_doc.patch
deleted file mode 100644 (file)
index 442cd22..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-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 @@
- #     $(MAKE) -f $(srcdir)/Makefile $(MFLAGS) srcdir=$(srcdir)
- doc documentation:  force
--      @(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) )
- info dvi ps: force
--      @(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) CFLAGS='$(CCFLAGS)' $@ )
- force:
diff --git a/utils/bash/patches/900-no_doc.patch b/utils/bash/patches/900-no_doc.patch
new file mode 100644 (file)
index 0000000..5dfb367
--- /dev/null
@@ -0,0 +1,13 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -724,10 +724,8 @@ reconfig: force
+ #     $(MAKE) -f $(srcdir)/Makefile $(MFLAGS) srcdir=$(srcdir)
+ doc documentation:  force
+-      @(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) )
+ info dvi ps: force
+-      @(cd $(DOCDIR) ; $(MAKE) $(MFLAGS) CFLAGS='$(CCFLAGS)' $@ )
+ force: