Bugzilla Bug 83632

Attempting to patch DOS linefeed files with a DOS linefeed .diff in patch
2.5.9-r1 fails.  This does not occur with plain 'ol patch 2.5.9.  

Specifically, attempting to patch the official MAME source from
http://www.mame.net and applying a "u" diff patch from
http://haze.mameworld.info when using the patch 2.5.9-r1 package fails, whereas
it does not with 2.5.9.  This is on amd64 (sorry, couldn't test on x86).  I'd
be happy to provide additional information.

Reproducible: Always
Steps to Reproduce:
1. Download mame093s.zip from http://www.mame.net
2. Download 093u1_diff.zip from http://haze.mameworld.info
3. emerge patch-2.5.9-r1.ebuild
4. Unzip mame093s.zip into a directory called mame093
5. Unzip 093u1_diff.zip
6. patch -p0 < 093u1.diff
7. Failure (Hunks failing, stripping trailing CRs from patch, etc)
8. emerge patch-2.5.9.ebuild
9. patch -p0 < 093u1.diff
10. Success




milhouse scratch # emerge info
Portage 2.0.51-r15 (default-linux/amd64/2004.3, gcc-3.3.4,
glibc-2.3.4.20041102-r0, 2.6.10 x86_64)
=================================================================
System uname: 2.6.10 x86_64 AMD Athlon(tm) 64 Processor 3000+
Gentoo Base System version 1.4.16
Python:              dev-lang/python-2.2.3-r5,dev-lang/python-2.3.4-r1 [2.3.4
(#2, Feb  7 2005, 03:41:43)]
dev-lang/python:     2.2.3-r5, 2.3.4-r1
sys-devel/autoconf:  2.59-r6, 2.13
sys-devel/automake:  1.7.9-r1, 1.8.5-r3, 1.5, 1.4_p6, 1.6.3, 1.9.4
sys-devel/binutils:  2.15.92.0.2-r1
sys-devel/libtool:   1.5.10-r4
virtual/os-headers:  2.6.8.1-r2
ACCEPT_KEYWORDS="amd64"
AUTOCLEAN="yes"
CFLAGS="-march=k8 -O2 -pipe -fno-merge-constants"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.1/share/config
/usr/kde/3.3/env /usr/kde/3.3/share/config /usr/kde/3.3/shutdown
/usr/kde/3/share/config /usr/lib/X11/xkb /usr/lib/mozilla/defaults/pref
/usr/share/config /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-march=k8 -O2 -pipe -fno-merge-constants"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs autoconfig ccache distlocks sandbox"
GENTOO_MIRRORS="http://gentoo.ccccom.com http://gentoo.seren.com/gentoo
http://open-systems.ufl.edu/mirrors/gentoo
ftp://gentoo.netnitco.net/pub/mirrors/gentoo/source/"MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="amd64 X acpi acpi4linux alsa artswrappersuid bitmap-fonts cdr cjk crypt
cups curl dga dvd dvdr esd f77 fam fbcon flac font-server fortran freetype gd
gdbm gif gnome gpm gstreamer gtk gtk2 imagemagick imlib ipv6 java joystick jp2
jpeg kde ldap lzw lzw-tiff mad mbox mikmod motif mozilla moznocompose moznoirc
moznomail multilib mysql ncurses nls nptl nvidia oggvorbis opengl oss pam perl
png python qt readline samba sdl slang ssl tcltk tcpd tiff truetype
truetype-fonts type1-fonts usb userlocales xcompmgr xml xml2 xmms xpm xrandr xv
zlib"
Unset:  ASFLAGS, CBUILD, CTARGET, LANG, LC_ALL, LDFLAGS

2.5.9-r1 fixes handling with certain kinds of dos-formatted files, see Bug
49823

really, the lesson to be learned here is 'dont use stupid linefeeds' ;)

if you could dig up/create a patch which covers both test cases, that'd be neat

Do you have any good test cases for me to try out?  That version of mysql++ is
long gone from my tree.  Taking out the last added line of the patch fixes my
problem, but I suppose that doesn't help you much. :)  Suggestions?

Created an attachment (id=52372) [details]
"Fixed" patch

Fixes problem with DOS linefeeds, dunno if it breaks what it was originally
supposed to fix or not

(From update of attachment 52372 [details])
Oops, nevermind.  After trying it again I had to take out the first
p_strip_trailing_cr (which is really the whole point of the patch).  I'll mess
around with it later.

mailed upstream ... in the meantime, this discrepancy is a feature, not a bug
;)