From owner-cvs-all@FreeBSD.ORG Fri Oct 31 10:58:59 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 175FB16A4CE; Fri, 31 Oct 2003 10:58:59 -0800 (PST) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4008143FB1; Fri, 31 Oct 2003 10:58:58 -0800 (PST) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (IDENT:brdavis@localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.12.9/8.12.3) with ESMTP id h9VIwtSA001362; Fri, 31 Oct 2003 10:58:55 -0800 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.12.9/8.12.3/Submit) id h9VIwpBQ001356; Fri, 31 Oct 2003 10:58:51 -0800 Date: Fri, 31 Oct 2003 10:58:51 -0800 From: Brooks Davis To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Message-ID: <20031031185851.GC12447@Odin.AC.HMC.Edu> References: <200310311854.h9VIskIh002430@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Clx92ZfkiYIKRjnr" Content-Disposition: inline In-Reply-To: <200310311854.h9VIskIh002430@repoman.freebsd.org> User-Agent: Mutt/1.5.4i X-Virus-Scanned: by amavisd-milter (http://amavis.org/) on odin.ac.hmc.edu Subject: Re: cvs commit: src/sbin Makefile src/usr.sbin Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Oct 2003 18:58:59 -0000 --Clx92ZfkiYIKRjnr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Oct 31, 2003 at 10:54:46AM -0800, Brooks Davis wrote: > brooks 2003/10/31 10:54:46 PST >=20 > FreeBSD src repository >=20 > Modified files: > sbin Makefile=20 > usr.sbin Makefile=20 > Log: > Temporarily disconnect ipfstat, ipnat, and ipftest to unbreak world. The following patch will fix them, but the files are on the vendor branch and I made the mistake of commiting the rest of the change without thinking it through. :-( -- Brooks Index: contrib/ipfilter/ipt.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/ipt.c,v retrieving revision 1.1.1.12 diff -u -p -r1.1.1.12 ipt.c --- contrib/ipfilter/ipt.c 15 Feb 2003 06:27:40 -0000 1.1.1.12 +++ contrib/ipfilter/ipt.c 31 Oct 2003 18:37:17 -0000 @@ -443,7 +443,8 @@ char *getifname(ptr) void *ptr; { #if defined(NetBSD) && (NetBSD >=3D 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + defined(__FreeBSD__) && (__FreeBSD_version >=3D 501113) #else char buf[32], *s; int len; @@ -458,7 +459,8 @@ void *ptr; if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) =3D=3D -1) return "X"; #if defined(NetBSD) && (NetBSD >=3D 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + defined(__FreeBSD__) && (__FreeBSD_version >=3D 501113) return strdup(netif.if_xname); #else if (kmemcpy(buf, (u_long)netif.if_name, sizeof(buf)) =3D=3D -1) Index: contrib/ipfilter/kmem.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/kmem.c,v retrieving revision 1.1.1.10 diff -u -p -r1.1.1.10 kmem.c --- contrib/ipfilter/kmem.c 15 Feb 2003 06:27:40 -0000 1.1.1.10 +++ contrib/ipfilter/kmem.c 31 Oct 2003 18:37:17 -0000 @@ -204,7 +204,8 @@ void *ptr; return ifname; #else # if defined(NetBSD) && (NetBSD >=3D 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + defined(__FreeBSD__) && (__FreeBSD_version >=3D 501113) #else char buf[32]; int len; @@ -219,7 +220,8 @@ void *ptr; if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) =3D=3D -1) return "X"; # if defined(NetBSD) && (NetBSD >=3D 199905) && (NetBSD < 1991011) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || \ + defined(__FreeBSD__) && (__FreeBSD_version >=3D 501113) return strdup(netif.if_xname); # else if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) =3D=3D -1) --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --Clx92ZfkiYIKRjnr Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQE/orDqXY6L6fI4GtQRAkuEAJ4oOVqeUePKdCgzgPsRaNyQc8QuIQCgwWFZ nZVcDHnk1xrAp8zfUFio0rA= =dGWI -----END PGP SIGNATURE----- --Clx92ZfkiYIKRjnr--