From f10506a19ab1c5707fb1abf225ce7681bdb92ffc8d2e677fa17ad24bfe7b9948 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 5 Apr 2012 11:49:41 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=121 --- bash-4.0-extended_quote.patch | 20 -------------------- bash.changes | 6 ++++++ bash.spec | 3 --- 3 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 bash-4.0-extended_quote.patch diff --git a/bash-4.0-extended_quote.patch b/bash-4.0-extended_quote.patch deleted file mode 100644 index 9821e40..0000000 --- a/bash-4.0-extended_quote.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- parse.y -+++ parse.y 2006-03-27 12:15:25.000000000 +0000 -@@ -3106,7 +3106,7 @@ parse_matched_pair (qc, open, close, len - ttrans = ansiexpand (nestret, 0, nestlen - 1, &ttranslen); - xfree (nestret); - -- if ((rflags & P_DQUOTE) == 0) -+ if (extended_quote || (rflags & P_DQUOTE) == 0) - { - nestret = sh_single_quote (ttrans); - free (ttrans); -@@ -3517,7 +3517,7 @@ eof_error: - ttrans = ansiexpand (nestret, 0, nestlen - 1, &ttranslen); - xfree (nestret); - -- if ((rflags & P_DQUOTE) == 0) -+ if (extended_quote || (rflags & P_DQUOTE) == 0) - { - nestret = sh_single_quote (ttrans); - free (ttrans); diff --git a/bash.changes b/bash.changes index fa07222..8817fce 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 5 11:48:02 UTC 2012 - werner@suse.de + +- Remove not required patch (was a fix for bnc#141394) which now + cause a wrong behaviour if applied (bnc#755453) + ------------------------------------------------------------------- Tue Mar 13 09:34:58 UTC 2012 - werner@suse.de diff --git a/bash.spec b/bash.spec index fd6937e..03235a9 100644 --- a/bash.spec +++ b/bash.spec @@ -16,7 +16,6 @@ # - Name: bash BuildRequires: autoconf BuildRequires: bison @@ -65,7 +64,6 @@ Patch5: bash-3.0-warn-locale.patch Patch6: bash-4.2-endpw.dif Patch7: bash-3.0-decl.patch Patch8: bash-4.0-async-bnc523667.dif -Patch9: bash-4.0-extended_quote.patch Patch10: bash-3.2-printf.patch Patch11: bash-4.0-loadables.dif Patch12: bash-4.1-completion.dif @@ -274,7 +272,6 @@ unset p #%patch6 -p0 -b .endpw %patch7 -p0 -b .decl %patch8 -p0 -b .async -%patch9 -p0 -b .extended_quote %patch10 -p0 -b .printf %patch11 -p0 -b .plugins %patch12 -p0 -b .completion