From 28daa4038900674b8cea444d88510cb365a40edf Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 6 Mar 2012 09:54:25 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=113
---
 bash-4.2-patches.tar.bz2 |  4 ++--
 bash.changes             |  6 ++++++
 bash.spec                | 12 +++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bash-4.2-patches.tar.bz2 b/bash-4.2-patches.tar.bz2
index 4ea015e3..5b4cf008 100644
--- a/bash-4.2-patches.tar.bz2
+++ b/bash-4.2-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8901a11f0cea89d82de52b9aef89f31dafb1fb563a65259d3a1007a465047ca7
-size 15223
+oid sha256:cbbe11b6ddda4ec7c439ef7fa9322e20257b3d9be93db1f75a8035e23b0c3306
+size 16070
diff --git a/bash.changes b/bash.changes
index 3b1d574f..9eaa0a7b 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar  6 09:33:30 UTC 2012 - werner@suse.de
+
+- Reenable patch for bnc#725657 with latest change from latest
+  git repository of the patch.
+
 -------------------------------------------------------------------
 Tue Dec 20 20:01:48 UTC 2011 - coolo@suse.com
 
diff --git a/bash.spec b/bash.spec
index eb56a056..8f20d499 100644
--- a/bash.spec
+++ b/bash.spec
@@ -40,6 +40,7 @@ Summary:        The GNU Bourne-Again Shell
 License:        GPL-2.0+
 Group:          System/Shells
 Url:            http://www.gnu.org/software/bash/bash.html
+# Git:          http://git.savannah.gnu.org/cgit/bash.git
 Source0:        ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.gz
 Source1:        ftp://ftp.gnu.org/gnu/readline/readline-%{rl_vers}.tar.gz
 Source2:        bash-%{bash_vers}-patches.tar.bz2
@@ -255,11 +256,12 @@ as well as programming with the interface of the readline library.
 
 %prep
 %setup -q -n bash-%{bash_vers}%{extend} -b1 -b2 -b3
-for p in ../bash-%{bash_vers}-patches/*; do
-    test -e $p || break
-    test "${p##*/}" = "bash-4.2-pwd.patch" && continue
-    echo Patch $p
-    patch -s -p0 < $p
+for patch in ../bash-%{bash_vers}-patches/*; do
+    level=-p1
+    test -e $patch || break
+    [[ $(head -n 1 $patch) =~ From ]] || level=-p0
+    echo Patch $patch
+    patch -s $level < $patch
 done
 unset p
 %patch1  -p0 -b .manual