From owner-svn-src-all@freebsd.org Thu Mar 9 19:04:50 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54FF3D05121; Thu, 9 Mar 2017 19:04:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 134BA1A43; Thu, 9 Mar 2017 19:04:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 32C714E6E; Thu, 9 Mar 2017 19:04:49 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id DFAB735F62; Thu, 9 Mar 2017 19:04:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id cuTZStsbEStv; Thu, 9 Mar 2017 19:04:27 +0000 (UTC) Subject: Re: svn commit: r314969 - head/usr.bin/localedef DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 4C99E35F59 To: "Pedro F. Giffuni" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201703091806.v29I6mNx080192@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: Date: Thu, 9 Mar 2017 11:04:13 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201703091806.v29I6mNx080192@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="VefH2WBLjkdpxhHV540JrsBDJMcSC4W4u" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2017 19:04:50 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --VefH2WBLjkdpxhHV540JrsBDJMcSC4W4u Content-Type: multipart/mixed; boundary="NJ0plAwijJ0iInFVkPFKr6rlE8I74CfQc"; protected-headers="v1" From: Bryan Drewery To: "Pedro F. Giffuni" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: Subject: Re: svn commit: r314969 - head/usr.bin/localedef References: <201703091806.v29I6mNx080192@repo.freebsd.org> In-Reply-To: <201703091806.v29I6mNx080192@repo.freebsd.org> --NJ0plAwijJ0iInFVkPFKr6rlE8I74CfQc Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 3/9/2017 10:06 AM, Pedro F. Giffuni wrote: > Author: pfg > Date: Thu Mar 9 18:06:48 2017 > New Revision: 314969 > URL: https://svnweb.freebsd.org/changeset/base/314969 >=20 > Log: > localedef(1): Fix mismatch in previous commit. > =20 > delete_category is meant to replace fclose() and unlink(). > This broke world. > =20 > Found by: kib > Pointedhat: pfg >=20 > Modified: > head/usr.bin/localedef/localedef.c >=20 > Modified: head/usr.bin/localedef/localedef.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=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.bin/localedef/localedef.c Thu Mar 9 17:53:37 2017 (r31496= 8) > +++ head/usr.bin/localedef/localedef.c Thu Mar 9 18:06:48 2017 (r31496= 9) > @@ -137,8 +137,6 @@ close_category(FILE *f) > { > if (fchmod(fileno(f), 0644) < 0 || > fclose(f) !=3D 0) { > - (void) fclose(f); > - (void) unlink(category_file()); > errf(strerror(errno)); > delete_category(f); > } >=20 It still seems broken on r314971. The output looks different since it is WITH_META_MODE, but the point is that it rebuilt localedef and still hit the problem. > --- _bootstrap-tools-usr.bin/localedef ---^M > Building /usr/obj/usr/src/tmp/usr/src/usr.bin/localedef/localedef.full^= M =2E.. > /usr/obj/usr/src/share/colldef/af_ZA.ISO8859-1.LC_COLLATE.meta: 26: fil= e '/usr/obj/usr/src/tmp/legacy/usr/bin/localedef' is newer than the targe= t...^M > Building /usr/obj/usr/src/share/colldef/af_ZA.ISO8859-1.LC_COLLATE^M > --- af_ZA.ISO8859-1.LC_COLLATE ---^M > --- all_subdir_tests ---^M > Skipping meta for beforedepend: .PHONY^M > Skipping meta for afterdepend: .PHONY^M > Skipping meta for objwarn: .PHONY^M > Skipping meta for depend: .PHONY^M > --- all_subdir_share ---^M > localedef -D -U -i /usr/src/share/colldef/af_ZA.UTF-8.src -f /usr/src/= tools/tools/locale/etc/final-maps/map.ISO8859-1 /usr/obj/usr/src/share/c= olldef/af_ZA.ISO8859-1^M =2E.. > --- all_subdir_share ---^M > /usr/src/share/colldef/af_ZA.UTF-8.src: 2421: error: Bad file descripto= r^M --=20 Regards, Bryan Drewery --NJ0plAwijJ0iInFVkPFKr6rlE8I74CfQc-- --VefH2WBLjkdpxhHV540JrsBDJMcSC4W4u Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJYwactAAoJEDXXcbtuRpfPHzYH/15aI3XlxyZwWRdq07dasFNQ 8ZeZB2Dt/0kvJzUwYhB4+9jDCJWBpI6Sh7sjDPY0FCBYBg87U6cFZDT01yqjF1h9 nr6oDjJBA7DJYqENUIQeijOvh74bC3a71tAbUD258Gh6jyYrd0dhKtR1NY92vmnB EtLKPtMuNseP211v8iL3WHLbVMGcykGK2AUXdcMZg0oAUkraXB0UpMk5OqEi1gFM jzt6ZjTx35kfajCa1ViZZ4whyt6HOccJFO4aqFyOz3aOP0v3LnV3hgmTmDANnXKo e+ZA2xJeecAefdrzxGoWpliHHb2uaNwzZY5bcDyyRYG8o8ImV+gDY8lJ9gYxAsc= =97fT -----END PGP SIGNATURE----- --VefH2WBLjkdpxhHV540JrsBDJMcSC4W4u--