← Back to branch summary

~ubuntu-branches/ubuntu/precise/bash/precise

« back to all changes in this revision

Viewing changes to debian/patches/bash32-042.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2009-03-01 10:20:52 UTC
  • mto: (2.1.5 squeeze)
  • mto: This revision was merged to the branch mainline in revision 38.
  • Revision ID: james.westby@ubuntu.com-20090301102052-m2dnf334rdighg4r
Tags: 3.2-5
Apply upstream fixes 040 - 048.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/bash32-042.dpatch
 
1
#! /bin/sh -e
 
2
 
 
3
if [ $# -eq 3 -a "$2" = '-d' ]; then
 
4
    pdir="-d $3"
 
5
elif [ $# -ne 1 ]; then
 
6
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
7
    exit 1
 
8
fi
 
9
case "$1" in
 
10
    -patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0;;
 
11
    -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;;
 
12
    *)
 
13
        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
14
        exit 1
 
15
esac
 
16
exit 0
 
17
 
 
18
# DP: bash-3.2 upstream patch bash32-042
 
19
 
 
20
                             BASH PATCH REPORT
 
21
                             =================
 
22
 
 
23
Bash-Release: 3.2
 
24
Patch-ID: bash32-042
 
25
 
 
26
Bug-Reported-by:        Archimerged Ark Submedes <archimerged@gmail.com>
 
27
Bug-Reference-ID:       <5ba4bef00804182116g65ff71e0qdffcf672f205e708@mail.gmail.com>
 
28
Bug-Reference-URL:      http://lists.gnu.org/archive/html/bug-bash/2008-04/msg00041.html
 
29
 
 
30
Bug-Description:
 
31
 
 
32
An operator precedence error prevented the bash arithmetic evaluator from
 
33
parsing conditional commands correctly.
 
34
 
 
35
Patch:
 
36
 
 
37
*** ../bash-3.2-patched/expr.c  2007-12-13 22:30:43.000000000 -0500
 
38
--- expr.c      2008-08-17 13:09:59.000000000 -0400
 
39
***************
 
40
*** 521,525 ****
 
41
          noeval++;
 
42
        }
 
43
!       val2 = explor ();
 
44
        if (set_noeval)
 
45
        noeval--;
 
46
--- 521,526 ----
 
47
          noeval++;
 
48
        }
 
49
! 
 
50
!       val2 = expcond ();
 
51
        if (set_noeval)
 
52
        noeval--;
 
53
*** ../bash-3.2/patchlevel.h    Thu Apr 13 08:31:04 2006
 
54
--- patchlevel.h        Mon Oct 16 14:22:54 2006
 
55
***************
 
56
*** 26,30 ****
 
57
     looks for to find the patch level (for the sccs version string). */
 
58
  
 
59
! #define PATCHLEVEL 41
 
60
  
 
61
  #endif /* _PATCHLEVEL_H_ */
 
62
--- 26,30 ----
 
63
     looks for to find the patch level (for the sccs version string). */
 
64
  
 
65
! #define PATCHLEVEL 42
 
66
  
 
67
  #endif /* _PATCHLEVEL_H_ */