From owner-cvs-all  Mon Jun 11 20: 3:54 2001
Delivered-To: cvs-all@freebsd.org
Received: from mailman.zeta.org.au (mailman.zeta.org.au [203.26.10.16])
	by hub.freebsd.org (Postfix) with ESMTP
	id 4421537B403; Mon, 11 Jun 2001 20:03:41 -0700 (PDT)
	(envelope-from bde@zeta.org.au)
Received: from bde.zeta.org.au (bde.zeta.org.au [203.2.228.102])
	by mailman.zeta.org.au (8.9.3/8.8.7) with ESMTP id NAA06671;
	Tue, 12 Jun 2001 13:03:36 +1000
Date: Tue, 12 Jun 2001 13:01:23 +1000 (EST)
From: Bruce Evans <bde@zeta.org.au>
X-Sender: bde@besplex.bde.org
To: Ruslan Ermilov <ru@FreeBSD.org>
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sbin/ipf Makefile src/sbin/ipfstat Makefile   
      src/sbin/ipnat Makefile src/usr.sbin/ipftest Makefile        
 src/usr.sbin/ipresend Makefile src/usr.sbin/ipsend Makefile        
 src/usr.sbin/iptest Makefile
In-Reply-To: <200106111741.f5BHfw495372@freefall.freebsd.org>
Message-ID: <Pine.BSF.4.21.0106121240001.56809-100000@besplex.bde.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

On Mon, 11 Jun 2001, Ruslan Ermilov wrote:

> ru          2001/06/11 10:41:58 PDT
> 
>   Modified files:
>     sbin/ipf             Makefile 
>     sbin/ipfstat         Makefile 
>     sbin/ipnat           Makefile 
>     usr.sbin/ipftest     Makefile 
>     usr.sbin/ipresend    Makefile 
>     usr.sbin/ipsend      Makefile 
>     usr.sbin/iptest      Makefile 
>   Log:
>   Backout previous change (removal of -I${.CURDIR}/../../sys/netinet).
>   This is needed to pick up the right headers.  Wrong headers from
>   src/contrib/ipfilter are used otherwise.
>   
>   The right fix would be to fix contrib/ipfilter C sources to pick up
>   headers from <sys/netinet>.
>   
>   Noticed by:	peter

Wrong headers are still used.  There are no ipfiliter headers in
${.CURDIR}/../../sys/netinet any more.  ipfilter headers are now in:

   (1) ${.CURDIR}/../../sys/contrib/ipfilter/netinet (active sources)
   (2) ${.CURDIR}/../../contrib/ipfilter (rotting copy of distribution sources)
   (3) /usr/include/netinet (copy of (1), modulo bugs)
   (4) ${WORLDTMP}/usr/include/netinet (copy of (1), modulo bugs)

and the purpose of some the -I paths is to prefer (1) after breaking the
default of (3) or (4) by putting a -I to (2) in CFLAGS before the -I to (3)
or (4).  Using ${.CURDIR}/../../sys/netinet and/or ${.CURDIR}/../../sys
instead of (1) does not help avoid the main ipfilter headers in (2), but
it might help avoid other garbage.

Bruce


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message