From owner-cvs-src@FreeBSD.ORG Tue Apr 26 15:05:51 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A43F16A4CE; Tue, 26 Apr 2005 15:05:51 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5C6C43D1D; Tue, 26 Apr 2005 15:05:50 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j3QF9fb2056229; Tue, 26 Apr 2005 18:09:41 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 81487-09; Tue, 26 Apr 2005 18:05:48 +0300 (EEST) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id j3QF9e2Y056226 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 26 Apr 2005 18:09:40 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.3/8.13.3) id j3QF5unX095084; Tue, 26 Apr 2005 18:05:56 +0300 (EEST) (envelope-from ru) Date: Tue, 26 Apr 2005 18:05:56 +0300 From: Ruslan Ermilov To: Darren Reed Message-ID: <20050426150556.GD94543@ip.net.ua> References: <200504261459.j3QExRtc012256@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="pQhZXvAqiZgbeUkD" Content-Disposition: inline In-Reply-To: <200504261459.j3QExRtc012256@repoman.freebsd.org> User-Agent: Mutt/1.5.9i X-Virus-Scanned: by amavisd-new at ip.net.ua cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/ipfilter - Imported sources X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 15:05:51 -0000 --pQhZXvAqiZgbeUkD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 26, 2005 at 02:59:27PM +0000, Darren Reed wrote: > darrenr 2005-04-26 14:59:27 UTC >=20 > FreeBSD src repository >=20 > src/contrib/ipfilter - Imported sources > Update of /home/ncvs/src/contrib/ipfilter > In directory repoman.freebsd.org:/tmp/cvs-serv12244 > =20 > Log Message: > Missing file from vendor branch import. > =20 > Status: > =20 > Vendor Tag: DARRENR > Release Tags: v4-1-8 > =09 > C src/contrib/ipfilter/ip_fil.c > =20 > 1 conflicts created by this import. > Use the following command to help the merge: > =20 > cvs checkout -jDARRENR:yesterday -jDARRENR src/contrib/ipfilter > =20 Here's some more changes that are needed in contrib/ipfilter: %%% Index: tools/ipfs.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/contrib/ipfilter/tools/ipfs.c,v retrieving revision 1.2 diff -u -r1.2 ipfs.c --- tools/ipfs.c 25 Apr 2005 18:20:15 -0000 1.2 +++ tools/ipfs.c 26 Apr 2005 14:56:11 -0000 @@ -41,7 +41,7 @@ #include #include #include "ipf.h" -#include "ipl.h" +#include "netinet/ipl.h" =20 #if !defined(lint) static const char rcsid[] =3D "@(#)Id: ipfs.c,v 1.12 2003/12/01 01:56:53 d= arrenr Exp"; Index: tools/ipnat.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/contrib/ipfilter/tools/ipnat.c,v retrieving revision 1.2 diff -u -r1.2 ipnat.c --- tools/ipnat.c 25 Apr 2005 18:20:15 -0000 1.2 +++ tools/ipnat.c 26 Apr 2005 15:00:49 -0000 @@ -51,7 +51,7 @@ # include #endif #include "ipf.h" -#include "ipl.h" +#include "netinet/ipl.h" #include "kmem.h" =20 #ifdef __hpux %%% I've temporarily disconnected (locally) ipftest from build, but I hope the above commit (after merging changes) will fix it. I'm now working on fixing the rescue build, by making a libipf a true library with a namespace in bsd.libnames.mk (though I must admit the location choosen for the library is far from the best, and will require some magic). Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --pQhZXvAqiZgbeUkD Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iD8DBQFCbljUqRfpzJluFF4RAkegAJsE1k77ToA04vWupeIe/B3zfPVViACcCFRJ xYWcniyuD7o4sqNnU69b1pI= =BuKs -----END PGP SIGNATURE----- --pQhZXvAqiZgbeUkD--