004_pf.patch path not correct for 4.2
I see that there is some problem trying to apply patch 004 (the pf patch) under 4.2. Looks like there was some discussion late in Mov 07 about fixing the patch to correct for wrong path / missing directory tree in the patch. I've updated the index line (changed it from sys to src, but I still can't apply the patch. What other trick do i need to do to get this patch applied? TIA, Jay
Re: 004_pf.patch path not correct for 4.2
On 24/02/2008, at 10:44 AM, Jay Hart wrote: I see that there is some problem trying to apply patch 004 (the pf patch) under 4.2. Looks like there was some discussion late in Mov 07 about fixing the patch to correct for wrong path / missing directory tree in the patch. I've updated the index line (changed it from sys to src, but I still can't apply the patch. What other trick do i need to do to get this patch applied? TIA, Jay Source from CD or FTP? If FTP, did you get both files?
Re: 004_pf.patch path not correct for 4.2
On 24/02/2008, at 10:44 AM, Jay Hart wrote: I see that there is some problem trying to apply patch 004 (the pf patch) under 4.2. Looks like there was some discussion late in Mov 07 about fixing the patch to correct for wrong path / missing directory tree in the patch. I've updated the index line (changed it from sys to src, but I still can't apply the patch. What other trick do i need to do to get this patch applied? TIA, Jay Source from CD or FTP? If FTP, did you get both files? I got it from the 4.2 release errata patch list link on the OpenBSD site, and all I downloaded was 004_pf.patch. Looking in the ftp patches directory, I don't see any file other then this one. Jay
Re: 004_pf.patch path not correct for 4.2
On 2008-02-23, Jay Hart [EMAIL PROTECTED] wrote: I see that there is some problem trying to apply patch 004 (the pf patch) under 4.2. Looks like there was some discussion late in Mov 07 about fixing the patch to correct for wrong path / missing directory tree in the patch. I just checked-out OPENBSD_4_2_BASE and followed the instructions, the patch applies fine. In general if there's a broken patch and there's been some discussion about it, especially 3 months ago, you can expect it to have been fixed.. If you do this: $ ident /usr/src/sys/net/pf.c and see this: net/pf.c: $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ then you have OPENBSD_4_2 which is 4.2-stable and already has this patch applied. If that doesn't help, paste in exactly what you type and see.
Re: 004_pf.patch path not correct for 4.2
On 24/02/2008, at 11:15 AM, Jay Hart wrote: On 24/02/2008, at 10:44 AM, Jay Hart wrote: I see that there is some problem trying to apply patch 004 (the pf patch) under 4.2. Looks like there was some discussion late in Mov 07 about fixing the patch to correct for wrong path / missing directory tree in the patch. I've updated the index line (changed it from sys to src, but I still can't apply the patch. What other trick do i need to do to get this patch applied? TIA, Jay Source from CD or FTP? If FTP, did you get both files? I got it from the 4.2 release errata patch list link on the OpenBSD site, and all I downloaded was 004_pf.patch. Looking in the ftp patches directory, I don't see any file other then this one. Jay Sorry, I'm trying to say are you sure you've got /usr/src populated correctly? Just eliminating the obvious. But trying to type with the 11-month old clinging to one leg and the seven-year old whinging about Sylvanian Families, so not very focussed. I applied the patch to a number of 4.2 boxes with no issues, so it is going to be something obvious. Off to rescue some books from the Dark Destroyer 11-month old --- and mashing apple into the keyboard won't help!
Re: 004_pf.patch path not correct for 4.2
On 24/02/2008, at 11:15 AM, Jay Hart wrote: On 24/02/2008, at 10:44 AM, Jay Hart wrote: I see that there is some problem trying to apply patch 004 (the pf patch) under 4.2. Looks like there was some discussion late in Mov 07 about fixing the patch to correct for wrong path / missing directory tree in the patch. I've updated the index line (changed it from sys to src, but I still can't apply the patch. What other trick do i need to do to get this patch applied? TIA, Jay Source from CD or FTP? If FTP, did you get both files? snip I think maybe my problem might be that I didn't think I needed the sys.tar.gz file, so I didn't grab that and untar it. Could this be my whole problem? If so, I looked for the description of sys.tar.gz, to see if I needed to install it, but didn't see anything to say yea or nay. Jay
Re: 004_pf.patch path not correct for 4.2 RESOLVED
On 24/02/2008, at 11:15 AM, Jay Hart wrote: On 24/02/2008, at 10:44 AM, Jay Hart wrote: I see that there is some problem trying to apply patch 004 (the pf patch) under 4.2. Looks like there was some discussion late in Mov 07 about fixing the patch to correct for wrong path / missing directory tree in the patch. I've updated the index line (changed it from sys to src, but I still can't apply the patch. What other trick do i need to do to get this patch applied? TIA, Jay Source from CD or FTP? If FTP, did you get both files? snip I think maybe my problem might be that I didn't think I needed the sys.tar.gz file, so I didn't grab that and untar it. Could this be my whole problem? If so, I looked for the description of sys.tar.gz, to see if I needed to install it, but didn't see anything to say yea or nay. Jay Yupe, that all I needed to do. That and modify the index line.
Re: 004_pf.patch path not correct for 4.2
On 2008-02-23, Jay Hart [EMAIL PROTECTED] wrote: I see that there is some problem trying to apply patch 004 (the pf patch) under 4.2. Looks like there was some discussion late in Mov 07 about fixing the patch to correct for wrong path / missing directory tree in the patch. I just checked-out OPENBSD_4_2_BASE and followed the instructions, the patch applies fine. In general if there's a broken patch and there's been some discussion about it, especially 3 months ago, you can expect it to have been fixed.. If you do this: $ ident /usr/src/sys/net/pf.c and see this: net/pf.c: $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ then you have OPENBSD_4_2 which is 4.2-stable and already has this patch applied. If that doesn't help, paste in exactly what you type and see. I roughly see that. I was able to apply the patch after I installed the sys.tar.gz file, which I think caused my problem, but I also modified the index line from sys to src. I've now moved on and am patching the last of the files now. BTW, since I don't have X installed (other than xbase42.tgz), I think I can safely skip the 006_xorg patch. Do you agree? Thanks for your time, Jay
