Date: Mon, 25 Mar 2002 00:34:08 +0100 (CET) From: Thomas Quinot <thomas@cuivre.fr.eu.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: bin/36268: [patch] ipmon and ipfstat pick wrong versions of headers Message-ID: <20020324233408.9A4652C3D1@melusine.cuivre.fr.eu.org>
next in thread | raw e-mail | index | archive | help
>Number: 36268
>Category: bin
>Synopsis: [patch] ipmon and ipfstat pick wrong versions of headers
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 24 15:40:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Thomas Quinot
>Release: FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD melusine.cuivre.fr.eu.org 4.5-STABLE FreeBSD 4.5-STABLE #23: Sun Mar 24 22:06:56 CET 2002 thomas@melusine.cuivre.fr.eu.org:/usr2/obj/usr2/src/sys/MELUSINE i386
>Description:
When compiled in their own subdirectories, ipmon and ipfstat
will pick IPFilter include files such as netinet/ip_fil.h
from /usr/include instead of /usr/src.
See also PR 29384 (a fix for ipfstat has been committed
on -CURRENT last september, but was never MFC'd on
RELENG_4), and sbin/ipfstat/Makefile revs 1.12 and 1.14.
>How-To-Repeat:
mv /usr/include/netinet/ip_fil.h /usr/include/netinet/ip_fil.h-
cd /usr/src/sbin/ipmon; make
cd /usr/src/sbin/ipfstat; make
Neither make command will succeed, although ip_fil.h is present
in /usr/src/sys/contrib/ipfilter/netinet/ip_fil.h.
>Fix:
--- src/sbin/ipmon/Makefile.dist Thu Dec 6 23:46:50 2001
+++ src/sbin/ipmon/Makefile Sun Mar 24 19:52:40 2002
@@ -6,7 +6,7 @@
MAN= ipl.4 ipmon.8
SRCS= ipmon.c
-CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter -I${.CURDIR}/../../sys/contrib/ipfilter
MAINTAINER= guido@freebsd.org
--- src/sbin/ipfstat/Makefile.dist Sun Mar 24 19:55:11 2002
+++ src/sbin/ipfstat/Makefile Sun Mar 24 19:55:17 2002
@@ -7,6 +7,7 @@
SRCS= fils.c parse.c opt.c kmem.c facpri.c common.c
CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DSTATETOP
CFLAGS+=-I- -I${.CURDIR}/../../sys/contrib/ipfilter/netinet
+CFLAGS+=-I- -I${.CURDIR}/../../sys/contrib/ipfilter
CFLAGS+=-I${.CURDIR}/../../sys
CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020324233408.9A4652C3D1>