From owner-freebsd-current@FreeBSD.ORG Wed Oct 17 21:57:22 2007 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 172F816A420 for ; Wed, 17 Oct 2007 21:57:22 +0000 (UTC) (envelope-from max@love2party.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.174]) by mx1.freebsd.org (Postfix) with ESMTP id A815F13C468 for ; Wed, 17 Oct 2007 21:57:21 +0000 (UTC) (envelope-from max@love2party.net) Received: from amd64.laiers.local (dslb-088-066-055-120.pools.arcor-ip.net [88.66.55.120]) by mrelayeu.kundenserver.de (node=mrelayeu4) with ESMTP (Nemesis) id 0ML21M-1IiGtD2hlY-00028V; Wed, 17 Oct 2007 23:57:20 +0200 From: Max Laier Organization: FreeBSD To: freebsd-current@freebsd.org Date: Wed, 17 Oct 2007 23:57:10 +0200 User-Agent: KMail/1.9.7 References: <359284519.20071018014832@masm.elcom.ru> In-Reply-To: <359284519.20071018014832@masm.elcom.ru> X-Face: ,,8R(x[kmU]tKN@>gtH1yQE4aslGdu+2]; R]*pL,U>^H?)gW@49@wdJ`H<=?utf-8?q?=25=7D*=5FBD=0A=09U=5For=3D=5CmOZf764=26nYj=3DJYbR1PW0ud?=>|!~,,CPC.1-D$FG@0h3#'5"k{V]a~.<=?utf-8?q?mZ=7D44=23Se=7Em=0A=09Fe=7E=5C=5DX5B=5D=5Fxj?=(ykz9QKMw_l0C2AQ]}Ym8)fU MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1417222.lJKD1DpSHP"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200710172357.18221.max@love2party.net> X-Provags-ID: V01U2FsdGVkX1+5i7VRJh4wTHUYy6RiWnBHqEXvFAWIzT7LRYQ 2RWsgtstTUDsBrOSgs/KhEAnmi2XPLC7q55k8fm+sD0OXX9utq ugGM7sHCoxt5I2HRl3wJN0C11foRs1SgalHe9lTagU= Cc: "Victor M. Blood" Subject: Re: ipfilter cannot be build within because warning's are present X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Oct 2007 21:57:22 -0000 --nextPart1417222.lJKD1DpSHP Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Wednesday 17 October 2007, Victor M. Blood wrote: > Hi, All. > > I try to use options in kernel instead of a module build of the > ipfilter and got error then kernel builds. > > I'm edit files: fil.c, ip_auth.h, ip_auth.h, ip_log.c ip_compat.h and > correct #ifdef statament :) no more warnings... ipf is likely broken anyway. See thread: "7.0 CURRENT, need help with=20 panic: Trying sleep, but thread marked as sleeping prohibited" on this ML=20 a few days back. That this warning went unnoticed tells you something,=20 too. > --- sys/contrib/ipfilter/netinet/ip_log.c.orig 2007-10-18 > 01:28:36.000000000 +0400 +++ sys/contrib/ipfilter/netinet/ip_log.c =20 > 2007-10-18 01:30:47.000000000 +0400 @@ -49,7 +49,7 @@ > # undef _KERNEL > # undef KERNEL > #endif > -#if __FreeBSD_version >=3D 220000 && defined(_KERNEL) > +#if (defined(__FreeBSD_version) && (__FreeBSD_version >=3D 220000)) && > defined(_KERNEL) # include > # include > #else > @@ -58,12 +58,14 @@ > #include > #if defined(_KERNEL) > # include > -# if defined(NetBSD) && (__NetBSD_Version__ >=3D 104000000) > +# if (defined(NetBSD) && (__NetBSD_Version__ >=3D 104000000)) > # include > # endif > #endif /* _KERNEL */ > #if !SOLARIS && !defined(__hpux) && !defined(linux) > -# if (NetBSD > 199609) || (OpenBSD > 199603) || (__FreeBSD_version >=3D > 300000) +# if (defined(NetBSD) && (NetBSD > 199609)) || \ > + (defined(OpenBSD) && (OpenBSD > 199603)) || \ > + (defined(__FreeBSD_version) && (__FreeBSD_version >=3D 300000)) > # include > # else > # include > --- sys/contrib/ipfilter/netinet/fil.c.orig 2007-10-18 > 01:27:16.000000000 +0400 +++ sys/contrib/ipfilter/netinet/fil.c=20 > 2007-10-18 01:30:38.000000000 +0400 @@ -2509,7 +2509,7 @@ > } else > #endif > { > -#if (OpenBSD >=3D 200311) && defined(_KERNEL) > +#if (defined(OpenBSD) && (OpenBSD >=3D 200311)) && defined(_KERNEL) > ip->ip_len =3D ntohs(ip->ip_len); > ip->ip_off =3D ntohs(ip->ip_off); > #endif > @@ -2772,7 +2772,7 @@ > RWLOCK_EXIT(&ipf_global); > > #ifdef _KERNEL > -# if OpenBSD >=3D 200311 > +# if (defined(OpenBSD) && (OpenBSD >=3D 200311)) > if (FR_ISPASS(pass) && (v =3D=3D 4)) { > ip =3D fin->fin_ip; > ip->ip_len =3D ntohs(ip->ip_len); > --- sys/contrib/ipfilter/netinet/ip_auth.c.orig 2007-10-18 > 01:28:03.000000000 +0400 +++ sys/contrib/ipfilter/netinet/ip_auth.c =20 > 2007-10-18 01:30:30.000000000 +0400 @@ -50,7 +50,7 @@ > # include > # include > #endif > -#if (_BSDI_VERSION >=3D 199802) || (__FreeBSD_version >=3D 400000) > +#if (defined(_BSDI_VERSION) && (_BSDI_VERSION >=3D 199802)) || > (defined(__FreeBSD_version) &&(__FreeBSD_version >=3D 400000)) # include > > #endif > #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi) > --- sys/contrib/ipfilter/netinet/ip_compat.h.orig 2007-10-18 > 01:29:24.000000000 +0400 +++ sys/contrib/ipfilter/netinet/ip_compat.h =20 > 2007-10-18 01:30:56.000000000 +0400 @@ -34,7 +34,7 @@ > #ifndef SOLARIS > #define SOLARIS (defined(sun) && (defined(__svr4__) || > defined(__SVR4))) #endif > -#if SOLARIS2 >=3D 8 > +#if (defined(SOLARIS2) && (SOLARIS2 >=3D 8)) > # ifndef USE_INET6 > # define USE_INET6 > # endif =2D-=20 /"\ Best regards, | mlaier@freebsd.org \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | mlaier@EFnet / \ ASCII Ribbon Campaign | Against HTML Mail and News --nextPart1417222.lJKD1DpSHP Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQBHFoU+XyyEoT62BG0RAmHyAJ48POCBRNe+UMHEJBH8CfMQ3WjYSQCeM1h+ zL5YcyLAEhLJJxK/GH4ZvKI= =edGc -----END PGP SIGNATURE----- --nextPart1417222.lJKD1DpSHP--