From owner-freebsd-current@FreeBSD.ORG Wed Jun 21 01:04: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 CCBB916A474 for ; Wed, 21 Jun 2006 01:04:15 +0000 (UTC) (envelope-from kabaev@gmail.com) Received: from nz-out-0102.google.com (nz-out-0102.google.com [64.233.162.194]) by mx1.FreeBSD.org (Postfix) with ESMTP id E594843D45 for ; Wed, 21 Jun 2006 01:04:14 +0000 (GMT) (envelope-from kabaev@gmail.com) Received: by nz-out-0102.google.com with SMTP id x3so42444nzd for ; Tue, 20 Jun 2006 18:04:14 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:date:from:to:subject:message-id:x-mailer:mime-version:content-type; b=MvHUvmV5vo9Omulg0Ram/K+FqfnZAjIEC5oqqUiyYZRVnkcsdZCZpNUR/gbhz2VtfRAeT7F1pvei0yjKJPjpvQS1Rb7Yy3EpAzZ8jeLww4x23rJ9U95XjW28ky4AegFEiC3me3BgsVsYs+fpZtU4IBn/JOTtkMsRXk8/GcTlazw= Received: by 10.65.54.5 with SMTP id g5mr77221qbk; Tue, 20 Jun 2006 18:04:14 -0700 (PDT) Received: from kan.dnsalias.net ( [24.63.93.195]) by mx.gmail.com with ESMTP id f13sm45454qba.2006.06.20.18.04.08; Tue, 20 Jun 2006 18:04:09 -0700 (PDT) Date: Tue, 20 Jun 2006 21:04:00 -0400 From: Alexander Kabaev To: current@FreeBSD.org, obrien@FreeBSD.ORG Message-ID: <20060620210400.57956fbd@kan.dnsalias.net> X-Mailer: Sylpheed-Claws 2.2.0 (GTK+ 2.8.17; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_CI19v6.fZ/BfVg+tI5VEHh8"; protocol="application/pgp-signature"; micalg=PGP-SHA1 X-Mailman-Approved-At: Wed, 21 Jun 2006 01:54:21 +0000 Cc: Subject: libmagic build failures (tmp patch) 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, 21 Jun 2006 01:04:15 -0000 --Sig_CI19v6.fZ/BfVg+tI5VEHh8 Content-Type: multipart/mixed; boundary="MP__YPq7PBzhhk_H5kQidj8f/S" --MP__YPq7PBzhhk_H5kQidj8f/S Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline I tried to build a fresh world today and was bitten by build failures in libmagic. Apparently last vendor import has included a bug in vendor code. Attached patch lets the buildworld complete. --=20 Alexander Kabaev --MP__YPq7PBzhhk_H5kQidj8f/S Content-Type: text/x-patch; name=apprentice.c.diff Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=apprentice.c.diff Index: apprentice.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/file/apprentice.c,v retrieving revision 1.1.1.10 diff -u -r1.1.1.10 apprentice.c --- apprentice.c 19 Jun 2006 07:52:12 -0000 1.1.1.10 +++ apprentice.c 21 Jun 2006 00:43:37 -0000 @@ -381,7 +381,7 @@ } =20 maxmagic =3D MAXMAGIS; - if ((marray =3D malloc(maxmagic * sizeof(*marray))) =3D=3D NULL) { + if ((marray =3D calloc(maxmagic, sizeof(*marray))) =3D=3D NULL) { (void)fclose(f); file_oomem(ms); return -1; --MP__YPq7PBzhhk_H5kQidj8f/S-- --Sig_CI19v6.fZ/BfVg+tI5VEHh8 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (FreeBSD) iD8DBQFEmJsHQ6z1jMm+XZYRAm/8AKCVRbEWUqyU+VUhv7Hq4lwIkESpPwCgi48l R70QD6Ns40cM7RGNNX6Lb4U= =bGxB -----END PGP SIGNATURE----- --Sig_CI19v6.fZ/BfVg+tI5VEHh8--