From owner-freebsd-current@FreeBSD.ORG Thu Mar 9 08:16:15 2006 Return-Path: X-Original-To: current@freebsd.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 27FFA16A420; Thu, 9 Mar 2006 08:16:15 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 775A943D5A; Thu, 9 Mar 2006 08:16:07 +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 k298Fp64008029; Thu, 9 Mar 2006 10:15:51 +0200 (EET) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ip.net.ua [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 71844-02; Thu, 9 Mar 2006 10:15:35 +0200 (EET) 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 k298FTkv008019 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 9 Mar 2006 10:15:29 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.4/8.13.4) id k298Fi8t045216; Thu, 9 Mar 2006 10:15:44 +0200 (EET) (envelope-from ru) Date: Thu, 9 Mar 2006 10:15:44 +0200 From: Ruslan Ermilov To: Giorgos Keramidas Message-ID: <20060309081544.GD54826@ip.net.ua> References: <20060308085714.L10582@beagle.kn.op.dlr.de> <86bqwh59gn.fsf@xps.des.no> <20060308152413.GA43764@flame.pc> <20060308.115539.98861830.imp@bsdimp.com> <20060308192657.GA54826@ip.net.ua> <20060308200214.GA63755@flame.pc> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="YToU2i3Vx8H2dn7O" Content-Disposition: inline In-Reply-To: <20060308200214.GA63755@flame.pc> User-Agent: Mutt/1.5.11 X-Virus-Scanned: amavisd-new at ip.net.ua Cc: deischen@freebsd.org, des@des.no, Hartmut Brandt , current@freebsd.org, "M. Warner Losh" Subject: Re: When will bsnmp stop breaking -current builds 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: Thu, 09 Mar 2006 08:16:15 -0000 --YToU2i3Vx8H2dn7O Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Mar 08, 2006 at 10:02:14PM +0200, Giorgos Keramidas wrote: [...] > > Please make it a ${_gensnmptree} and define it only for vulnerable > > versions. If __FreeBSD_version wasn't bumped after it's been fixed, > > put the next __FreeBSD_version value so that it stops rebuilding it > > when the version gets bumped. >=20 [...] > This import of bsnmpd falls somewhere between these commits to param.h: >=20 > ---------------------------- > revision 1.263 > date: 2006/02/17 14:14:15; author: andre; state: Exp; lines: +1 -1 > Replace the 4k fixed sized jumbo mbuf clusters with PAGE_SIZE sized > jumbo mbuf clusters. To make the variable size clear they are named > MJUMPAGESIZE. >=20 > Having jumbo clusters with the native PAGE_SIZE is more useful than > a fixed 4k size according the device driver writers using this API. >=20 > The 9k and 16k jumbo mbuf clusters remain unchanged. >=20 > Requested by: glebius, gallatin > Sponsored by: TCP/IP Optimization Fundraise 2005 > MFC after: 3 days > ---------------------------- > revision 1.262 > date: 2006/01/26 18:23:16; author: cognet; state: Exp; lines: +1 -1 > Version bump for pts import. > ---------------------------- > revision 1.261 > date: 2006/01/12 20:27:35; author: brooks; state: Exp; lines: +1 -1 > Belated __FreeBSD_version bump for improvements to the Linux ldconfig > support in etc/rc.d/abi. > ---------------------------- >=20 > So I guess, if I understood what you said correctly Ruslan, the proper > fix would be something like (700014 is the version after the 1.263 bump): >=20 > %%% > Index: Makefile.inc1 > =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 > --- Makefile.inc1 (.../branches/ncvs/src/Makefile.inc1) (revision 42) > +++ Makefile.inc1 (.../trunk/src/Makefile.inc1) (revision 42) > @@ -824,6 +824,10 @@ > _pwd_mkdb=3D usr.sbin/pwd_mkdb > .endif > =20 > +.if ${BOOTSTRAPPING} < 700014 > +_gensnmptree=3D usr.sbin/bsnmpd/gensnmptree > +.endif > + > bootstrap-tools: > .for _tool in \ > ${_strfile} \ > @@ -839,6 +843,7 @@ > usr.bin/rpcgen \ > usr.bin/xinstall \ > usr.sbin/config \ > + ${_gensnmptree} \ > ${_crunchgen} \ > ${_pwd_mkdb} > ${_+_}@${ECHODIR} "=3D=3D=3D> ${_tool} (obj,depend,all,install)"; \ > %%% >=20 Yes, exactly this. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --YToU2i3Vx8H2dn7O Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFED+QwqRfpzJluFF4RAvHIAKCGt0wPQcFQyW7GWj7eLRbz1hBYrwCgmKUL IZAubkUVQonNRo8bvBHMW9o= =/9gA -----END PGP SIGNATURE----- --YToU2i3Vx8H2dn7O--