Your message dated Mon, 07 Feb 2011 01:46:09 +0000
with message-id <[email protected]>
and subject line Bug#484539: fixed in patch 2.6.1-1
has caused the Debian Bug report #484539,
regarding patch: Cannot handle diffs with CRLF line endings
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
484539: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=484539
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: patch
Version: 2.5.9-5
Severity: normal
I had some trouble applying a patch that was created using diff between
two files with CRLF line endings. That process is out of my control
and cannot be changed.
As far as I can tell, the created diff has CRLF line endings like the
files; patch however drops the CR first but fails find a matching line
in the file to be patched then as the CR still exists there.
How to repeat:
$ echo -e "foo\r\nbar\r\nbaz\r\n" > rev.1
$ echo -e "foo\r\nbAr\r\nbaz\r\n" > rev.2
$ diff rev.1 rev.2 >diff
$ patch rev.1 diff
(Stripping trailing CRs from patch.)
patching file rev.1
Hunk #1 FAILED at 2.
1 out of 1 hunk FAILED -- saving rejects to file rev.1.rej
$
Workaround: Remove the CR characters from to file to be patched before
running patch (tr -d '\r'), optionally also from the diff.
This cannot be cured easily as far as I can tell from the sources. Could
you please at least document it in the BUGS section so other people can
save the time I spent hunting down the problem?
Thanks,
Christoph
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.25.4 (PREEMPT)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages patch depends on:
ii libc6 2.7-10 GNU C Library: Shared libraries
patch recommends no packages.
-- no debconf information
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
Source: patch
Source-Version: 2.6.1-1
We believe that the bug you reported is fixed in the latest version of
patch, which is due to be installed in the Debian FTP archive:
patch_2.6.1-1.diff.gz
to main/p/patch/patch_2.6.1-1.diff.gz
patch_2.6.1-1.dsc
to main/p/patch/patch_2.6.1-1.dsc
patch_2.6.1-1_i386.deb
to main/p/patch/patch_2.6.1-1_i386.deb
patch_2.6.1.orig.tar.gz
to main/p/patch/patch_2.6.1.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Christoph Berg <[email protected]> (supplier of updated patch package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sun, 06 Feb 2011 20:19:30 +0100
Source: patch
Binary: patch
Architecture: source i386
Version: 2.6.1-1
Distribution: unstable
Urgency: low
Maintainer: Christoph Berg <[email protected]>
Changed-By: Christoph Berg <[email protected]>
Description:
patch - Apply a diff file to an original
Closes: 484539 568248
Changes:
patch (2.6.1-1) unstable; urgency=low
.
* New upstream version.
+ Improved CR stripping heuristics. Closes: #484539
+ Fixes: creates files and directories instead of asking for the file
location. Closes: #568248
* Remove lenny compatibility options -U --unified-reject-files and
--global-reject-file.
Checksums-Sha1:
3cb59d22effd973128f3a5a85bf5bf6c07b64f0d 1693 patch_2.6.1-1.dsc
a50deb8cb6daa5e2997e7a9a36adb78980f95332 303692 patch_2.6.1.orig.tar.gz
2108468368bbb91f109bf47b709747e3edaf19b1 65463 patch_2.6.1-1.diff.gz
2c5d9210e51d2fa84d76dd7298cd08207f24e92f 123600 patch_2.6.1-1_i386.deb
Checksums-Sha256:
98d12761b095d0d33e9503ed36b93dfbf6738a0f5b1185dcefd8cf21375bbdaf 1693
patch_2.6.1-1.dsc
d1563731e9cffed11cc5f011b2b8e074c325e86a383a91889b5c5b80b09781b9 303692
patch_2.6.1.orig.tar.gz
ea93568c9a13044a17e3d2e4c1cf68d567919c8b13490933274e1dfeddac9bab 65463
patch_2.6.1-1.diff.gz
20baef33d076688d3ce1f674d1f5ee3d4919ca69e5584d67006c825d79b31d05 123600
patch_2.6.1-1_i386.deb
Files:
35d9834aad598aa6b5ef4128f2be1dac 1693 vcs standard patch_2.6.1-1.dsc
d758eb96d3f75047efc004a720d33daf 303692 vcs standard patch_2.6.1.orig.tar.gz
4b8d33e570e8117981beb00fca53834d 65463 vcs standard patch_2.6.1-1.diff.gz
63d946110c83a1c0852c3d295abdc098 123600 vcs standard patch_2.6.1-1_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAEBCAAGBQJNTwfgAAoJEExaa6sS0qeuFPcP/iSvVOFFYvHI78/YwCH/uJCh
8L9jycjG0FEN17dL5aX0c8VGkbmBdBxRKHkTHjNvtGqz3OeB8m07gcU1idA8rO4j
dK453O1dirFp8JrsUaacXU6u934LfEvs+vYXB3ZKfFjX/s6FRgVbeDUlsIWF+eUS
uDtdWyWxKdqf4R4/5gZCdSqrPHzLinM9xWRMbo6cWKhrDlGGJTxL0BPIoF++Vl+a
gAAIYwUhAU7D/p3RJXqhzDHg9FWmRYLvBjZHM4RO5Co1hrzhDGJCFz4Zgo+GR5qz
ZpMNkWKza5fYd+Q22DITwJqG8T4gC0Ydx/1/n4nI0UkE4WHvaW8AaXxZn3zxc+Xj
20Xn4LK9Q9s1DsahwKE0nZPBYB4QQbzgr1SegOTRZcrj7qnERn7xXUASsPBD22Fe
cRdU6LOu5LwU4oj8O4hIRr8mod9OmG2g10TbehhFeJVoNsCJZ9WYC7XXFl4nyQMJ
VgdtkAJdEEr2tt2GDn6T5WbfaqYToNYtjuA625f3IUkX9ySixF/GVwgEyryKpWIG
7/ZES1XaZ2GZFVXnLr3UTCzUvyYCA/S4A65e9GOT3+kKnWQ0gEWFsuG7SmP7HI18
3GSv1hFQnAMMFv4aoL0TOeVNvneANC5FoeqoTwK+riAt4vVi2kA9xrqnTq/F5vKc
yNzRF1qmhbOL0kwwqahx
=dZTE
-----END PGP SIGNATURE-----
--- End Message ---
