Re: Patch 004 does not apply properly on 4.2
* Uwe Dippel [EMAIL PROTECTED] [2007-11-28 03:57]: What am I overlooking here ? - I have been doing like this for the last years, no problem. Today there is: # patch -p0 004_pf.patch |--- pf.c 18 Nov 2007 21:53:47 - 1.564 |+++ pf.c 22 Nov 2007 02:01:46 - 1.565 I screwed up the pathes again, sorry for that. I was diffing in /usr/src/sys/net/ A fixed patch should appear shortly. -- Henning Brauer, [EMAIL PROTECTED], [EMAIL PROTECTED] BS Web Services, http://bsws.de Full-Service ISP - Secure Hosting, Mail and DNS Services Dedicated Servers, Rootservers, Application Hosting - Hamburg Amsterdam
Re: Patch 004 does not apply properly on 4.2
On Wed, 28 Nov 2007 18:27:21 +0700, Henning Brauer [EMAIL PROTECTED] wrote: * Uwe Dippel [EMAIL PROTECTED] [2007-11-28 03:57]: What am I overlooking here ? - I have been doing like this for the last years, no problem. Today there is: # patch -p0 004_pf.patch |--- pf.c 18 Nov 2007 21:53:47 - 1.564 |+++ pf.c 22 Nov 2007 02:01:46 - 1.565 I screwed up the pathes again, sorry for that. I was diffing in /usr/src/sys/net/ A fixed patch should appear shortly. Just takin' the privileged to edit the index source, and it's works :D.. It's eazy, edit he part Index: sys/net/pf.c to Index:src/net/pf.c Thanks, Insan
Patch 004 does not apply properly on 4.2
What am I overlooking here ? - I have been doing like this for the last years, no problem. Today there is: # cd /usr/src # ls -l 004_pf.patch -rw-r--r-- 1 root wsrc 1303 Nov 27 17:32 004_pf.patch # patch -p0 004_pf.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -- |Apply by doing: | cd /usr/src | patch -p0 004_pf.patch | |And then build, install and boot a new kernel: | cd /usr/src/sys/arch/`arch -s`/conf | config GENERIC | cd ../compile/GENERIC | make depend make sudo make install | |If you are using the multiprocessor kernel, replace GENERIC by |GENERIC.MP above. | |Index: sys/net/pf.c |=== |RCS file: /cvs/src/sys/net/pf.c,v |retrieving revision 1.564 |retrieving revision 1.565 |diff -u -p -r1.564 -r1.565 |--- pf.c 18 Nov 2007 21:53:47 - 1.564 |+++ pf.c 22 Nov 2007 02:01:46 - 1.565 -- File to patch: No file found--skip this patch? [n] y Skipping patch... Hunk #1 ignored at 816. Hunk #2 ignored at 960. 2 out of 2 hunks ignored--saving rejects to Oops.rej done And, yes, I have unzipped the respective tar: # pwd /usr/src # ls 001_dhcpd.patch Oops.rejgnu sbin 002_openssl.patch Oops.rej.orig include share 004_pf.patchbin kerberosV sys CVS distrib lib usr.bin Makefileetc libexec usr.sbin Makefile.cross games regress xenocara And I have that file: # ls -l sys/net/pf.c -rw-r--r-- 1 root wsrc 155860 Aug 22 02:44 sys/net/pf.c So where is my mistake, please ? Uwe
Re: Patch 004 does not apply properly on 4.2
On Nov 27, 2007 5:34 PM, Uwe Dippel [EMAIL PROTECTED] wrote: So where is my mistake, please ? One way you can solve this is by moving the patch to /usr/src/sys/net before applying it, the patch lists pf.c with no directories leading up to the filename (probably unlike the other patches you are used to applying), so when you go to apply it in /usr/src it fails, unable to find pf.c in /usr/src. Gordon
Re: Patch 004 does not apply properly on 4.2
Gordon Stratton wrote: One way you can solve this is by moving the patch to /usr/src/sys/net before applying it, the patch lists pf.c with no directories leading up to the filename Yes, and you have to cd into it. Otherwise it still won't work. Someone might want to change the instructions in the header, or better apply diff in the right location. Thanks, Uwe
