Date: Sat, 5 May 2007 11:41:57 -0700 (PDT) From: Jim Sifferle <jimsiff@yahoo.com> To: freebsd-ipfw@freebsd.org Subject: Problem applying TOS/DSCP patch in 6.2 RELEASE Message-ID: <339646.2974.qm@web55403.mail.re4.yahoo.com>
next in thread | raw e-mail | index | archive | help
All, I'm having problems compiling ipfw on 6.2-RELEASE after patching with the TOS / DSCP patch referenced here http://www.freebsd.org/cgi/query-pr.cgi?pr=102471. The patch seems to apply okay with the following output: [root@demon /]# patch -p0 < ipfw_tos_dscp_20060824_1.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ru src/sbin/ipfw/ipfw.8 /usr/src/sbin/ipfw/ipfw.8 |--- src/sbin/ipfw/ipfw.8 Sat Jul 29 12:24:12 2006 |+++ /usr/src/sbin/ipfw/ipfw.8 Thu Aug 24 10:42:19 2006 -------------------------- Patching file /usr/src/sbin/ipfw/ipfw.8 using Plan A... Hunk #1 succeeded at 817 (offset -6 lines). Hunk #2 succeeded at 1275 (offset -6 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ru src/sbin/ipfw/ipfw2.c /usr/src/sbin/ipfw/ipfw2.c |--- src/sbin/ipfw/ipfw2.c Mon Aug 7 23:32:57 2006 |+++ /usr/src/sbin/ipfw/ipfw2.c Thu Aug 24 10:14:10 2006 -------------------------- Patching file /usr/src/sbin/ipfw/ipfw2.c using Plan A... Hunk #1 succeeded at 133. Hunk #2 succeeded at 301. Hunk #3 succeeded at 337. Hunk #4 succeeded at 404. Hunk #5 succeeded at 443. Hunk #6 succeeded at 1583. Hunk #7 succeeded at 1894. Hunk #8 succeeded at 2674. Hunk #9 succeeded at 2685. Hunk #10 succeeded at 4008 (offset 5 lines). Hunk #11 succeeded at 4506 (offset 5 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ru src/sys/netinet/ip_fw.h /usr/src/sys/netinet/ip_fw.h |--- src/sys/netinet/ip_fw.h Sat Jul 29 12:24:12 2006 |+++ /usr/src/sys/netinet/ip_fw.h Wed Aug 23 17:22:43 2006 -------------------------- Patching file /usr/src/sys/netinet/ip_fw.h using Plan A... Hunk #1 succeeded at 160. Hunk #2 succeeded at 567. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ru src/sys/netinet/ip_fw2.c /usr/src/sys/netinet/ip_fw2.c |--- src/sys/netinet/ip_fw2.c Sat Jul 29 12:24:12 2006 |+++ /usr/src/sys/netinet/ip_fw2.c Thu Aug 24 10:43:17 2006 -------------------------- Patching file /usr/src/sys/netinet/ip_fw2.c using Plan A... Hunk #1 succeeded at 149 (offset 4 lines). Hunk #2 succeeded at 2470 (offset 28 lines). Hunk #3 succeeded at 2754 (offset 4 lines). Hunk #4 succeeded at 3104 (offset 31 lines). Hunk #5 succeeded at 3702 (offset 4 lines). Hunk #6 succeeded at 3750 (offset 31 lines). Hmm... Ignoring the trailing garbage. done When I run make from /usr/src/sbin/ipfw, I get the following output: [root@demon /usr/src/sbin/ipfw]# make Warning: Object directory not changed from original /usr/src/sbin/ipfw cc -O2 -fno-strict-aliasing -pipe -c ipfw2.c ipfw2.c: In function `show_ipfw': ipfw2.c:1586: error: `O_SET_IPTOS' undeclared (first use in this function) ipfw2.c:1586: error: (Each undeclared identifier is reported only once ipfw2.c:1586: error: for each function it appears in.) ipfw2.c:1589: error: `O_SET_DSCP' undeclared (first use in this function) ipfw2.c:1897: error: `O_IPDSCP' undeclared (first use in this function) ipfw2.c: In function `add': ipfw2.c:4014: error: `O_SET_IPTOS' undeclared (first use in this function) ipfw2.c:4020: error: `O_SET_DSCP' undeclared (first use in this function) ipfw2.c:4514: error: `O_IPDSCP' undeclared (first use in this function) *** Error code 1 Stop in /usr/src/sbin/ipfw. Am I missing some intermediate steps? Thanks for any help... Jim ____________________________________________________________________________________ TV dinner still cooling? Check out "Tonight's Picks" on Yahoo! TV. http://tv.yahoo.com/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?339646.2974.qm>