From thomas@cuivre.fr.eu.org  Sun Mar 24 15:33:43 2002
Return-Path: <thomas@cuivre.fr.eu.org>
Received: from melchior.cuivre.fr.eu.org (melchior.enst.fr [137.194.161.6])
	by hub.freebsd.org (Postfix) with ESMTP id EA75C37B404
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Mar 2002 15:33:41 -0800 (PST)
Received: from melusine.cuivre.fr.eu.org (melusine.enst.fr [137.194.160.34])
	by melchior.cuivre.fr.eu.org (Postfix) with ESMTP id 8DC03871E
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 25 Mar 2002 00:33:40 +0100 (CET)
Received: by melusine.cuivre.fr.eu.org (Postfix, from userid 1000)
	id 9A4652C3D1; Mon, 25 Mar 2002 00:34:08 +0100 (CET)
Message-Id: <20020324233408.9A4652C3D1@melusine.cuivre.fr.eu.org>
Date: Mon, 25 Mar 2002 00:34:08 +0100 (CET)
From: Thomas Quinot <thomas@cuivre.fr.eu.org>
Reply-To: Thomas Quinot <thomas@cuivre.fr.eu.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] ipmon and ipfstat pick wrong versions of headers
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         36268
>Category:       bin
>Synopsis:       [patch] ipmon and ipfstat pick wrong versions of headers
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    darrenr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 24 15:40:01 PST 2002
>Closed-Date:    Mon Mar 25 04:50:47 PST 2002
>Last-Modified:  Mon Mar 25 05:10:01 PST 2002
>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:
Responsible-Changed-From-To: freebsd-bugs->darrenr 
Responsible-Changed-By: cjc 
Responsible-Changed-When: Mon Mar 25 01:34:15 PST 2002 
Responsible-Changed-Why:  
Over to maintainer/author. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=36268 
State-Changed-From-To: open->closed 
State-Changed-By: darrenr 
State-Changed-When: Mon Mar 25 04:50:30 PST 2002 
State-Changed-Why:  
fied with latest updates post-import 

http://www.freebsd.org/cgi/query-pr.cgi?pr=36268 

From: Thomas Quinot <thomas@cuivre.fr.eu.org>
To: Darren Reed <darrenr@reed.wattle.id.au>
Cc: bug-followup@FreeBSD.org
Subject: Re: bin/36268: [patch] ipmon and ipfstat pick wrong versions of headers
Date: Mon, 25 Mar 2002 14:02:39 +0100

 Le 2002-03-25, Darren Reed crivait :
 
 > The patch in this PR doesn't appear to reflect what is in FreeBSD-current
 > where recent changes to the Makefile's have addressed this issue, I believe.
 
 Indeed the patch is against -STABLE, and essentially consists
 in MFCing sbin/ipfstat/Makefile rev 1.14 and sbin/ipmon/Makefile
 rev. 1.11.
 
 Thomas.
 
 -- 
     Thomas.Quinot@Cuivre.FR.EU.ORG
>Unformatted:
