Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner AT cygwin DOT com Mail-Followup-To: cygwin AT cygwin DOT com Delivered-To: mailing list cygwin AT cygwin DOT com Message-ID: <3F5A49F3.1090702@scytek.de> Date: Sat, 06 Sep 2003 22:56:19 +0200 From: Volker Quetschke User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax) X-Accept-Language: en-us, en, de-de MIME-Version: 1.0 To: cygwin AT cygwin DOT com Subject: Re: Problem with patch 2.5.8-7 References: <3F59F7DB DOT 6070403 AT scytek DOT de> <20030906201216 DOT GT1859 AT cygbert DOT vinschen DOT de> In-Reply-To: <20030906201216.GT1859@cygbert.vinschen.de> X-Enigmail-Version: 0.76.1.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigCB01645A8683FA7EA6BEB838" --------------enigCB01645A8683FA7EA6BEB838 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hi! >>I'm experiencing problems with the current patch program, version >>2.5.8-7. (System W2k, all binary mounts, Cygwin updated two hours ago.) >> >>With the attached two files the following command worked with >>previous versions of patch (still works if I go back to >>patch 2.5.8-3 (my last version)) >> >>But now: >>$ patch -i dos_lineends.patch -b -p2 >>fails. >>vc_common.mak is in: ./STLport-4.0/src/vc_common.mak > > So it fails. Interesting. I wonder *how* it fails though. > http://cygwin.com/problems.html Ok, I stepped into the usual trap. If it fails for me, it has to fail for you also :-( Details follow: $ ll total 4 drwxrwxr-x+ 3 q none 0 Sep 6 22:42 STLport-4.0/ -rwxrwxr-x 1 admins none 3737 Sep 6 22:41 dos_lineends.patch* [q AT lisi]/tmp/patchtest:{517}: $ patch -i dos_lineends.patch -b -p2 patching file STLport-4.0/src/vc_common.mak Hunk #1 FAILED at 42. Hunk #2 FAILED at 53. Hunk #3 FAILED at 63. 3 out of 3 hunks FAILED -- saving rejects to file STLport-4.0/src/vc_common.mak.rej This time I attached the output of cygcheck -s -v -r. As a data point, if I do a $ dos2unix.exe STLport-4.0/src/vc_common.mak first, the patch applies cleanly, but this is wrong, both patch and file are DOS style files with 0D0A lineendings. > P.S.: I tried it and it works for me. It works if I use patch 2.5.8-3 Volker -- PGP/GPG key (ID: 0x9F8A785D) available from wwwkeys.de.pgp.net key-fingerprint 550D F17E B082 A3E9 F913 9E53 3D35 C9BA 9F8A 785D --------------enigCB01645A8683FA7EA6BEB838 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (MingW32) Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org iD8DBQE/WknzPTXJup+KeF0RAtgCAKCoQ0UQ9tPtXlUsAYQBKlMVyt17ogCffXO5 XlqoPw+KKDGxyykxJbnSxpM= =xelp -----END PGP SIGNATURE----- --------------enigCB01645A8683FA7EA6BEB838--