summaryrefslogtreecommitdiff
path: root/debian/patches/bash31-003.dpatch
blob: 0da51108c2d2b2eabf0deba6dc59e5cd5b59d86b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
#! /bin/sh -e

if [ $# -eq 3 -a "$2" = '-d' ]; then
    pdir="-d $3"
elif [ $# -ne 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi
case "$1" in
    -patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0;;
    -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;;
    *)
	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
	exit 1
esac
exit 0

			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-003

Bug-Reported-by: Adam Buraczewski <adamb@nor.pl>
Bug-Reference-ID: <200512210950.jBL9o4C2008608@localhost.localdomain>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00055.html

Bug-Description:

A missing #define guard causes bash to not compile when readline is not
configured in, either as the result of explicit disabling or when the
`--enable-minimal-config' option is given to configure.

Patch:

*** ../bash-3.1/variables.c	Sat Nov 12 21:22:37 2005
--- variables.c	Mon Dec 26 13:34:03 2005
***************
*** 861,867 ****
--- 863,871 ----
    char val[INT_STRLEN_BOUND(int) + 1], *v;
  
+ #if defined (READLINE)
    /* If we are currently assigning to LINES or COLUMNS, don't do anything. */
    if (winsize_assignment)
      return;
+ #endif
  
    v = inttostr (lines, val, sizeof (val));
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 2
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 3
  
  #endif /* _PATCHLEVEL_H_ */