psss / rpms / bash

Forked from rpms/bash 6 years ago
Clone
Roman Rakus eb063ed
			     BASH PATCH REPORT
Roman Rakus eb063ed
			     =================
Roman Rakus eb063ed
Roman Rakus eb063ed
Bash-Release: 4.0
Roman Rakus eb063ed
Patch-ID: bash40-018
Roman Rakus eb063ed
Roman Rakus eb063ed
Bug-Reported-by: Dan Price <dp@eng.sun.com>
Roman Rakus eb063ed
Bug-Reference-ID: <20090324171502.GA20582@eng.sun.com>
Roman Rakus eb063ed
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00184.html
Roman Rakus eb063ed
Roman Rakus eb063ed
Bug-Description:
Roman Rakus eb063ed
Roman Rakus eb063ed
A missing include file results in an empty function definition and a no-op
Roman Rakus eb063ed
when checking whether or not the window size has changed.
Roman Rakus eb063ed
Roman Rakus eb063ed
Patch:
Roman Rakus eb063ed
Roman Rakus eb063ed
*** ../bash-4.0-patched/lib/sh/winsize.c	2008-08-12 13:53:51.000000000 -0400
Roman Rakus eb063ed
--- lib/sh/winsize.c	2009-04-06 10:44:20.000000000 -0400
Roman Rakus eb063ed
***************
Roman Rakus eb063ed
*** 31,44 ****
Roman Rakus eb063ed
  #include <sys/ioctl.h>
Roman Rakus eb063ed
  
Roman Rakus eb063ed
! #if !defined (STRUCT_WINSIZE_IN_SYS_IOCTL)
Roman Rakus eb063ed
! /* For struct winsize on SCO */
Roman Rakus eb063ed
! /*   sys/ptem.h has winsize but needs mblk_t from sys/stream.h */
Roman Rakus eb063ed
! #  if defined (HAVE_SYS_PTEM_H) && defined (TIOCGWINSZ) && defined (SIGWINCH)
Roman Rakus eb063ed
! #    if defined (HAVE_SYS_STREAM_H)
Roman Rakus eb063ed
! #      include <sys/stream.h>
Roman Rakus eb063ed
! #    endif
Roman Rakus eb063ed
  #    include <sys/ptem.h>
Roman Rakus eb063ed
! #  endif /* HAVE_SYS_PTEM_H && TIOCGWINSZ && SIGWINCH */
Roman Rakus eb063ed
! #endif /* !STRUCT_WINSIZE_IN_SYS_IOCTL */
Roman Rakus eb063ed
  
Roman Rakus eb063ed
  #include <stdio.h>
Roman Rakus eb063ed
--- 31,57 ----
Roman Rakus eb063ed
  #include <sys/ioctl.h>
Roman Rakus eb063ed
  
Roman Rakus eb063ed
! /* Try to find the definitions of `struct winsize' and TIOGCWINSZ */
Roman Rakus eb063ed
! 
Roman Rakus eb063ed
! #if defined (GWINSZ_IN_SYS_IOCTL) && !defined (TIOCGWINSZ)
Roman Rakus eb063ed
! #  include <sys/ioctl.h>
Roman Rakus eb063ed
! #endif /* GWINSZ_IN_SYS_IOCTL && !TIOCGWINSZ */
Roman Rakus eb063ed
! 
Roman Rakus eb063ed
! #if defined (STRUCT_WINSIZE_IN_TERMIOS) && !defined (STRUCT_WINSIZE_IN_SYS_IOCTL)
Roman Rakus eb063ed
! #  include <termios.h>
Roman Rakus eb063ed
! #endif /* STRUCT_WINSIZE_IN_TERMIOS && !STRUCT_WINSIZE_IN_SYS_IOCTL */
Roman Rakus eb063ed
! 
Roman Rakus eb063ed
! /* Not in either of the standard places, look around. */
Roman Rakus eb063ed
! #if !defined (STRUCT_WINSIZE_IN_TERMIOS) && !defined (STRUCT_WINSIZE_IN_SYS_IOCTL)
Roman Rakus eb063ed
! #  if defined (HAVE_SYS_STREAM_H)
Roman Rakus eb063ed
! #    include <sys/stream.h>
Roman Rakus eb063ed
! #  endif /* HAVE_SYS_STREAM_H */
Roman Rakus eb063ed
! #  if defined (HAVE_SYS_PTEM_H) /* SVR4.2, at least, has it here */
Roman Rakus eb063ed
  #    include <sys/ptem.h>
Roman Rakus eb063ed
! #    define _IO_PTEM_H          /* work around SVR4.2 1.1.4 bug */
Roman Rakus eb063ed
! #  endif /* HAVE_SYS_PTEM_H */
Roman Rakus eb063ed
! #  if defined (HAVE_SYS_PTE_H)  /* ??? */
Roman Rakus eb063ed
! #    include <sys/pte.h>
Roman Rakus eb063ed
! #  endif /* HAVE_SYS_PTE_H */
Roman Rakus eb063ed
! #endif /* !STRUCT_WINSIZE_IN_TERMIOS && !STRUCT_WINSIZE_IN_SYS_IOCTL */
Roman Rakus eb063ed
  
Roman Rakus eb063ed
  #include <stdio.h>
Roman Rakus eb063ed
*** ../bash-4.0/patchlevel.h	2009-01-04 14:32:40.000000000 -0500
Roman Rakus eb063ed
--- patchlevel.h	2009-02-22 16:11:31.000000000 -0500
Roman Rakus eb063ed
***************
Roman Rakus eb063ed
*** 26,30 ****
Roman Rakus eb063ed
     looks for to find the patch level (for the sccs version string). */
Roman Rakus eb063ed
  
Roman Rakus eb063ed
! #define PATCHLEVEL 17
Roman Rakus eb063ed
  
Roman Rakus eb063ed
  #endif /* _PATCHLEVEL_H_ */
Roman Rakus eb063ed
--- 26,30 ----
Roman Rakus eb063ed
     looks for to find the patch level (for the sccs version string). */
Roman Rakus eb063ed
  
Roman Rakus eb063ed
! #define PATCHLEVEL 18
Roman Rakus eb063ed
  
Roman Rakus eb063ed
  #endif /* _PATCHLEVEL_H_ */