Date: Wed, 24 Jan 2001 19:03:28 -0500 (EST) From: robdefriesse@mail.com (Rob deFriesse) To: freebsd-questions@freebsd.org Subject: Can't apply patch for FreeBSD Security Advisory: FreeBSD-SA-01:08.ipfw Message-ID: <200101250003.f0P03SK09199@chmls06.mediaone.net>
next in thread | raw e-mail | index | archive | help
I am attempting to install this patch: # fetch ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/patches/SA-01:08/ipfw-3.x.patch on FreeBSD 3.1. (I would have liked to upgrade to 4.2, but I am unable to get 4.2 to work with my ethernet cards [3C509B]) I am following these instructions distributed with the advisory: > Execute the following commands as root: > > # cd /usr/src > # patch -p < /path/to/patch > # cp /usr/src/sys/netinet/tcp.h /usr/src/sys/netinet/ip_fw.h /usr/include/netinet/ > # cd /usr/src/sbin/ipfw > # make depend && make all install > # cd /usr/src/sys/modules/ipfw > # make depend && make all install When I run patch, the patch command stops with a prompt "File to patch:". I've attached the full transcript from the patch command. I don't really have the skill or time to teach myself about the kernel source and try to diagnose this problem. Therefore, I'm hoping someone can offer me a simple solution to the problem. Can this patch be applied to a 3.1 kernel? If not, is there a patch for this version of the kernel? Thank you, Rob. baker# patch -p < /fd/ipfw-3.x.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/netinet/ip_fw.c |=================================================================== |RCS file: /usr/home/ncvs/src/sys/netinet/ip_fw.c,v |retrieving revision 1.103.2.12 |retrieving revision 1.103.2.13 |diff -u -r1.103.2.12 -r1.103.2.13 |--- sys/netinet/ip_fw.c 2000/05/12 07:22:57 1.103.2.12 |+++ sys/netinet/ip_fw.c 2001/01/13 02:44:21 1.103.2.13 -------------------------- Patching file sys/netinet/ip_fw.c using Plan A... Hunk #1 succeeded at 146 (offset -100 lines). Hunk #2 succeeded at 757 with fuzz 2 (offset -420 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/netinet/ip_fw.h |=================================================================== |RCS file: /usr/home/ncvs/src/sys/netinet/ip_fw.h,v |retrieving revision 1.36.2.5 |retrieving revision 1.36.2.6 |diff -u -r1.36.2.5 -r1.36.2.6 |--- sys/netinet/ip_fw.h 2000/02/13 12:18:36 1.36.2.5 |+++ sys/netinet/ip_fw.h 2001/01/13 02:44:21 1.36.2.6 -------------------------- Patching file sys/netinet/ip_fw.h using Plan A... Hunk #1 succeeded at 63. Hunk #2 succeeded at 148 with fuzz 1 (offset -60 lines). Hunk #3 succeeded at 184 (offset -60 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/netinet/tcp.h |=================================================================== |RCS file: /usr/home/ncvs/src/sys/netinet/tcp.h,v |retrieving revision 1.10.2.1 |retrieving revision 1.10.2.2 |diff -u -r1.10.2.1 -r1.10.2.2 |--- sys/netinet/tcp.h 1999/08/29 16:29:52 1.10.2.1 |+++ sys/netinet/tcp.h 2001/01/13 02:44:21 1.10.2.2 -------------------------- Patching file sys/netinet/tcp.h using Plan A... Hunk #1 succeeded at 64. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sbin/ipfw/ipfw.c |=================================================================== |RCS file: /usr/home/ncvs/src/sbin/ipfw/ipfw.c,v |retrieving revision 1.64.2.12 |retrieving revision 1.64.2.13 |diff -u -r1.64.2.12 -r1.64.2.13 |--- sbin/ipfw/ipfw.c 2000/02/13 12:19:54 1.64.2.12 |+++ sbin/ipfw/ipfw.c 2001/01/13 02:44:21 1.64.2.13 -------------------------- File to patch: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101250003.f0P03SK09199>