From owner-svn-src-stable-10@freebsd.org Sun Dec 17 06:00:51 2017 Return-Path: Delivered-To: svn-src-stable-10@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 81F97EA422D; Sun, 17 Dec 2017 06:00:51 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 58F0A64383; Sun, 17 Dec 2017 06:00:51 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBH60oGh015484; Sun, 17 Dec 2017 06:00:50 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBH60ojt015481; Sun, 17 Dec 2017 06:00:50 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201712170600.vBH60ojt015481@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sun, 17 Dec 2017 06:00:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r326918 - in stable: 10 10/usr.sbin/fdformat 11 11/usr.sbin/fdformat X-SVN-Group: stable-10 X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in stable: 10 10/usr.sbin/fdformat 11 11/usr.sbin/fdformat X-SVN-Commit-Revision: 326918 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Dec 2017 06:00:51 -0000 Author: cy Date: Sun Dec 17 06:00:49 2017 New Revision: 326918 URL: https://svnweb.freebsd.org/changeset/base/326918 Log: MFC r326558, r326566: fdformat is a sysadmin command and thus its man page should be in volume 8 instead of volume 1. Reviewed by: imp Added: stable/10/usr.sbin/fdformat/fdformat.8 - copied unchanged from r326558, head/usr.sbin/fdformat/fdformat.8 Deleted: stable/10/usr.sbin/fdformat/fdformat.1 Modified: stable/10/ObsoleteFiles.inc stable/10/usr.sbin/fdformat/Makefile Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Added: stable/11/usr.sbin/fdformat/fdformat.8 - copied unchanged from r326558, head/usr.sbin/fdformat/fdformat.8 Deleted: stable/11/usr.sbin/fdformat/fdformat.1 Modified: stable/11/ObsoleteFiles.inc stable/11/usr.sbin/fdformat/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/10/ObsoleteFiles.inc ============================================================================== --- stable/10/ObsoleteFiles.inc Sun Dec 17 04:19:19 2017 (r326917) +++ stable/10/ObsoleteFiles.inc Sun Dec 17 06:00:49 2017 (r326918) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20171204: Move fdformat man page from volume 1 to volume 8. +OLD_FILES+=usr/share/man/man1/fdformat.1.gz # 20170620: remove stale manpage OLD_FILES+=usr/share/man/man2/cap_rights_get.2.gz # 20170610: chown-f_test replaced by chown_test Modified: stable/10/usr.sbin/fdformat/Makefile ============================================================================== --- stable/10/usr.sbin/fdformat/Makefile Sun Dec 17 04:19:19 2017 (r326917) +++ stable/10/usr.sbin/fdformat/Makefile Sun Dec 17 06:00:49 2017 (r326918) @@ -3,6 +3,7 @@ .PATH: ${.CURDIR}/../fdread PROG= fdformat +MAN= fdformat.8 SRCS= fdformat.c fdutil.c CFLAGS+= -I${.CURDIR}/../fdread Copied: stable/10/usr.sbin/fdformat/fdformat.8 (from r326558, head/usr.sbin/fdformat/fdformat.8) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/usr.sbin/fdformat/fdformat.8 Sun Dec 17 06:00:49 2017 (r326918, copy of r326558, head/usr.sbin/fdformat/fdformat.8) @@ -0,0 +1,180 @@ +.\" Copyright (C) 1993, 1994, 1995, 2001 by Joerg Wunsch, Dresden +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS +.\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, +.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd December 4, 2017 +.Dt FDFORMAT 8 +.Os +.Sh NAME +.Nm fdformat +.Nd format floppy disks +.Sh SYNOPSIS +.Nm +.Op Fl F Ar fill +.Op Fl f Ar fmt +.Op Fl s Ar fmtstr +.Op Fl nqvy +.Ar device +.Sh DESCRIPTION +The +.Nm +utility formats a floppy disk at +.Ar device , +where +.Ar device +may either be given as a full path +name of a device node for a floppy disk drive +(e.g.\& +.Pa /dev/fd0 ) , +or using an abbreviated name that will be looked up +under +.Pa /dev +(e.g.\& +.Dq Li fd0 ) . +.Pp +The options are as follows: +.Bl -tag -width ".Fl s Ar fmtstr" +.It Fl F Ar fill +Use +.Ar fill +as the fill byte for newly formatted sectors. +The +.Ar fill +argument +must be a number in the range 0 through 255 using common C +language notation. +The default value is +.Dq Li 0xf6 . +.It Fl f Ar fmt +Specify the density settings for a +.Ar fmt +kilobyte format, as described in +.Xr fdcontrol 8 . +.It Fl s Ar fmtstr +Specify the density settings using explicit parameters, as +described in +.Xr fdcontrol 8 . +.It Fl n +Do not verify floppy after formatting. +.It Fl q +Suppress any normal output from the command, and do not ask the +user for a confirmation whether to format the floppy disk at +.Ar device . +.It Fl v +Do not format, verify only. +.It Fl y +Do not ask for confirmation whether to format the floppy disk but +still report formatting status. +.El +.Pp +For non-autoselecting subdevices, neither +.Fl f Ar fmt +nor +.Fl s Ar fmtstr +may be specified, since the preconfigured media density settings +from the kernel driver will always be used. +However, if +.Ar device +is a device with automatic media density selection (see +.Xr fdc 4 ) , +both methods can be used to override the density settings for the +newly formatted medium (without permanently changing the density +settings of +.Ar device ) . +.Pp +If the +.Fl q +flag has not been specified, the user is asked for a confirmation +of the intended formatting process. +In order to continue, an answer +of +.Ql y +must be given. +.Pp +Note that +.Nm +does only perform low-level formatting. +In order to create +a file system on the medium, see the commands +.Xr newfs 8 +for a +.Tn UFS +file system, or +.Xr newfs_msdos 8 +for an +.Tn MS-DOS +(FAT) +file system. +.Sh EXIT STATUS +An exit status of 0 is returned upon successful operation. +Exit status +1 is returned on any errors during floppy formatting, and an exit status +of 2 reflects invalid arguments given to the program (along with an +appropriate information written to diagnostic output). +.Sh DIAGNOSTICS +Unless +.Fl q +has been specified, a single letter is printed to standard output +to inform the user about the progress of work. +First, an +.Ql F +is printed when the track is being formatted, then a +.Ql V +while it is being verified, and if an error has been detected, it +will finally change to +.Ql E . +Detailed status information (cylinder, head and sector number, and the +exact cause of the error) will be printed for up to 10 errors after the +entire formatting process has completed. +.Sh SEE ALSO +.Xr fdc 4 , +.Xr fdcontrol 8 , +.Xr newfs 8 , +.Xr newfs_msdos 8 +.Sh HISTORY +The +.Nm +utility +has been developed for +.Bx 386 0.1 +and upgraded to the new +.Xr fdc 4 +floppy disk driver. +It later became part of the +.Fx 1.1 +system. +Starting with +.Fx 5.0 , +it uses the unified density specifications as described in +.Xr fdcontrol 8 . +.Sh AUTHORS +.An -nosplit +The program has been contributed by +.An J\(:org Wunsch , +Dresden, with changes by +.An Serge Vakulenko +and +.An Andrey A. Chernov , +Moscow. From owner-svn-src-stable-10@freebsd.org Sun Dec 17 22:12:59 2017 Return-Path: Delivered-To: svn-src-stable-10@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 41401E97EB5; Sun, 17 Dec 2017 22:12:59 +0000 (UTC) (envelope-from grog@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A96380BED; Sun, 17 Dec 2017 22:12:58 +0000 (UTC) (envelope-from grog@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBHMCwVG026524; Sun, 17 Dec 2017 22:12:58 GMT (envelope-from grog@FreeBSD.org) Received: (from grog@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBHMCwYH026523; Sun, 17 Dec 2017 22:12:58 GMT (envelope-from grog@FreeBSD.org) Message-Id: <201712172212.vBHMCwYH026523@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grog set sender to grog@FreeBSD.org using -f From: Greg Lehey Date: Sun, 17 Dec 2017 22:12:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r326923 - stable/10/usr.bin/calendar/calendars X-SVN-Group: stable-10 X-SVN-Commit-Author: grog X-SVN-Commit-Paths: stable/10/usr.bin/calendar/calendars X-SVN-Commit-Revision: 326923 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Dec 2017 22:12:59 -0000 Author: grog Date: Sun Dec 17 22:12:57 2017 New Revision: 326923 URL: https://svnweb.freebsd.org/changeset/base/326923 Log: Correct character set. Modified: stable/10/usr.bin/calendar/calendars/calendar.birthday Modified: stable/10/usr.bin/calendar/calendars/calendar.birthday ============================================================================== --- stable/10/usr.bin/calendar/calendars/calendar.birthday Sun Dec 17 19:58:48 2017 (r326922) +++ stable/10/usr.bin/calendar/calendars/calendar.birthday Sun Dec 17 22:12:57 2017 (r326923) @@ -292,7 +292,7 @@ 12/12 E.G. Robinson born, 1893 12/14 George Washington dies, 1799 12/17 William Safire (Safir) born, 1929 -12/18 Konrad Zuse died in Hünfeld, 1995 +12/18 Konrad Zuse died in Hünfeld, 1995 12/20 Carl Sagan died, 1996 12/21 Benjamin Disraeli born, 1804 12/22 Giacomo Puccini born, 1858 From owner-svn-src-stable-10@freebsd.org Mon Dec 18 13:47:46 2017 Return-Path: Delivered-To: svn-src-stable-10@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 ED3FAE8B575; Mon, 18 Dec 2017 13:47:46 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BBC037B082; Mon, 18 Dec 2017 13:47:46 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id vBIDliwO016198; Mon, 18 Dec 2017 05:47:44 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id vBIDli45016197; Mon, 18 Dec 2017 05:47:44 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201712181347.vBIDli45016197@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r326923 - stable/10/usr.bin/calendar/calendars In-Reply-To: <201712172212.vBHMCwYH026523@repo.freebsd.org> To: Greg Lehey Date: Mon, 18 Dec 2017 05:47:44 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2017 13:47:47 -0000 > Author: grog > Date: Sun Dec 17 22:12:57 2017 > New Revision: 326923 > URL: https://svnweb.freebsd.org/changeset/base/326923 > > Log: > Correct character set. > > Modified: > stable/10/usr.bin/calendar/calendars/calendar.birthday This appears to be a direct commit to 10, without noting it as such, or why this was needed as a direct commit. > Modified: stable/10/usr.bin/calendar/calendars/calendar.birthday > ============================================================================== > --- stable/10/usr.bin/calendar/calendars/calendar.birthday Sun Dec 17 19:58:48 2017 (r326922) > +++ stable/10/usr.bin/calendar/calendars/calendar.birthday Sun Dec 17 22:12:57 2017 (r326923) > @@ -292,7 +292,7 @@ > 12/12 E.G. Robinson born, 1893 > 12/14 George Washington dies, 1799 > 12/17 William Safire (Safir) born, 1929 > -12/18 Konrad Zuse died in H?nfeld, 1995 > +12/18 Konrad Zuse died in H> 12/20 Carl Sagan died, 1996 This looks to have joined 2 lines? deleting part of one? Or is my mail program doing really strange things with this? > 12/21 Benjamin Disraeli born, 1804 > 12/22 Giacomo Puccini born, 1858 -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-stable-10@freebsd.org Mon Dec 18 14:23:07 2017 Return-Path: Delivered-To: svn-src-stable-10@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 DCAB9E8E5DB; Mon, 18 Dec 2017 14:23:07 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 BAC1A7CAED; Mon, 18 Dec 2017 14:23:07 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by freefall.freebsd.org (Postfix, from userid 1235) id 0DFF0AACB; Mon, 18 Dec 2017 14:23:07 +0000 (UTC) Date: Mon, 18 Dec 2017 15:23:06 +0100 From: Baptiste Daroussin To: Greg Lehey Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r326923 - stable/10/usr.bin/calendar/calendars Message-ID: <20171218142306.zy46plfrctwhrcwg@ivaldir.net> References: <201712172212.vBHMCwYH026523@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="dmpzdem3sjiyxwak" Content-Disposition: inline In-Reply-To: <201712172212.vBHMCwYH026523@repo.freebsd.org> User-Agent: NeoMutt/20171208 X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2017 14:23:08 -0000 --dmpzdem3sjiyxwak Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Dec 17, 2017 at 10:12:58PM +0000, Greg Lehey wrote: > Author: grog > Date: Sun Dec 17 22:12:57 2017 > New Revision: 326923 > URL: https://svnweb.freebsd.org/changeset/base/326923 >=20 > Log: > Correct character set. You are "correcting" a UTF-8 character into a ISO-8859 character directly in branch 10. This looks wrong in multiple way: 1. everything was converted into UTF-8 in 2011 on purpose 2. why directly to the 10 branch and no in head? Am I missing something? Best regards, Bapt --dmpzdem3sjiyxwak Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAlo3z0QACgkQY4mL3PG3 Plon7BAAl8mtEaUaCC8elE9nODzev4Avx1v7Rg3nujJDVqIQjJqSysfePSFprL7S 3860yTnyLOCxNwxdxdmz2ZANhj3BvOeYHiY2etHMDOL1m9qZfTwpOXvKz0HLAnq5 a2mBiFDVX9xbUPF7RH3cF6IIAcVCISa12A228X2dW1RX8NModUXhrAO/skNhohYw L3zrnohORGUrJn0te50zMr+zbT+OIngY0ceq7QjNRT/g/n7Bn/3YW2WSl95v7SA7 ruA/oxSVQ4222vQHfaDLTk6+eNWEhvdsT0mywyBZ4SA6BhW4hdQch3B9ecalLxK3 0pqqWMx84gH4SqV5uh/GYpAYt19Fa1iXvBD8PQhN12D7S9KSICcFoVaTqQQeuPQo psPf79bnKytmWKH7tEKuRrzn/qnMURDBBvzOVpgG9SP9z3sMM+RVdZNkxEGLUKMh U5+BSm0ntSsCqeJs1su/aVp7ziOach6NvdCpaOni7TFT12GH2nRjNqRo67rLW1PD aF8y0JY0tZ9Ge+4yGrtP3PYr9Kws1Ty2HAaTdw3dcH5VyKKISLOnBnnWl4ybSSgz efJaErVzT85AVKQ6uiKIbgNEYvUEabeOtPkfysb6kZ7keLLja0F41nyUIhkH1ZXe LNW2odcppw0ev2IiLS/55GyfXfQDFFxYMuYdLWqAnZ7hM6KgD+4= =F12q -----END PGP SIGNATURE----- --dmpzdem3sjiyxwak-- From owner-svn-src-stable-10@freebsd.org Mon Dec 18 23:04:24 2017 Return-Path: Delivered-To: svn-src-stable-10@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 CB786E905D8; Mon, 18 Dec 2017 23:04:24 +0000 (UTC) (envelope-from grog@lemis.com) Received: from www.lemis.com (www.lemis.com [208.86.226.86]) by mx1.freebsd.org (Postfix) with ESMTP id 5AD5B75BFE; Mon, 18 Dec 2017 23:04:24 +0000 (UTC) (envelope-from grog@lemis.com) Received: from eureka.lemis.com (lemis.com [192.109.197.81]) by www.lemis.com (Postfix) with ESMTP id 75DEB1B72806; Mon, 18 Dec 2017 23:04:22 +0000 (UTC) Received: by eureka.lemis.com (Postfix, from userid 1004) id 2907F4494B1; Tue, 19 Dec 2017 10:04:21 +1100 (AEDT) Date: Tue, 19 Dec 2017 10:04:21 +1100 From: Greg 'groggy' Lehey To: Baptiste Daroussin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r326923 - stable/10/usr.bin/calendar/calendars Message-ID: <20171218230421.GE4376@eureka.lemis.com> References: <201712172212.vBHMCwYH026523@repo.freebsd.org> <20171218142306.zy46plfrctwhrcwg@ivaldir.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Ns7jmDPpOpCD+GE/" Content-Disposition: inline In-Reply-To: <20171218142306.zy46plfrctwhrcwg@ivaldir.net> Organization: The FreeBSD Project Phone: +61-3-5346-1370, +61-3-5309-0418 Mobile: 0401 265 606. Use only as instructed. WWW-Home-Page: http://www.FreeBSD.org/ X-PGP-Fingerprint: 9A1B 8202 BCCE B846 F92F 09AC 22E6 F290 507A 4223 User-Agent: Mutt/1.6.1 (2016-04-27) X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2017 23:04:24 -0000 --Ns7jmDPpOpCD+GE/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Monday, 18 December 2017 at 15:23:06 +0100, Baptiste Daroussin wrote: > On Sun, Dec 17, 2017 at 10:12:58PM +0000, Greg Lehey wrote: >> Author: grog >> Date: Sun Dec 17 22:12:57 2017 >> New Revision: 326923 >> URL: https://svnweb.freebsd.org/changeset/base/326923 >> >> Log: >> Correct character set. > > You are "correcting" a UTF-8 character into a ISO-8859 character directly in > branch 10. > > This looks wrong in multiple way: > 1. everything was converted into UTF-8 in 2011 on purpose For small values of "everything", maybe. I've checked three files: calendar.history, fr_FR.ISO8859-1/calendar.fetes and de_DE.ISO8859-1/calendar.geschichte. Only the first was in UTF-8. It sounds like a good idea to convert the files to UTF-8, but it has to be done to all of them. And how about adding some information about the preferred character set? We could kill two birds with one stone and add this to the top of each file: /* -*- coding: utf-8 -*- That would clarify things and also tell Emacs the character encoding automatically. Even for non-Emacs users it would be an advantage. > 2. why directly to the 10 branch and no in head? Finger trouble. Mea culpa. I'll back it out when we come to an agreement on how to do the rest. Greg -- Sent from my desktop computer. Finger grog@FreeBSD.org for PGP public key. See complete headers for address and phone numbers. This message is digitally signed. If your Microsoft mail program reports problems, please read http://lemis.com/broken-MUA --Ns7jmDPpOpCD+GE/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAlo4SXUACgkQIubykFB6QiPs3gCgkKWTTZPNknnSn1rQPTunXGgs kfYAnRgr7YnEhSIjyJMTgUa/YoHgdcc+ =PchE -----END PGP SIGNATURE----- --Ns7jmDPpOpCD+GE/-- From owner-svn-src-stable-10@freebsd.org Mon Dec 18 23:48:39 2017 Return-Path: Delivered-To: svn-src-stable-10@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 96151E92E65; Mon, 18 Dec 2017 23:48:39 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io0-x234.google.com (mail-io0-x234.google.com [IPv6:2607:f8b0:4001:c06::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5C8FC772A2; Mon, 18 Dec 2017 23:48:39 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io0-x234.google.com with SMTP id t196so11665922iof.0; Mon, 18 Dec 2017 15:48:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=tBXhLXx571EtlDIZ2/7S4R25bUrhs+i690U3mvk8H8k=; b=aeMhJinG3LI096Sxs5Q8sxv1xBKQtu1O/EG+5LfwyTTuXxxSB3VxulF4+i8rhp/xot YS6TBc1FKtTk0psJnqHpSA7PgDAyxcD3c703fxzIhdj8jNhZG7HlJ+5FxcEkIroJIG1p 00NKP/Wiuj5jQGU6cFNhudEgVcH6aefRiO4VY7jTH/CRYoftZXeO9bT9uH2fNE4e1D+P UfJy6mva1kPyLPI/enqFYAR6CGR/qD2PEHKSt4JCrvVtPF7gSI2azpBSLf9xSqsZ9IbQ wkeQjBv0RnA1oUIoG9SesHk73mk34wfivKoPOt5UVE2nniTVzfiQvSvD/P0w1ffp9hjR +rJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=tBXhLXx571EtlDIZ2/7S4R25bUrhs+i690U3mvk8H8k=; b=jk24S6bZlO3A8fGogbGJNwOYz9T2cAM+e1j51hqqudoGvFS9LyhDMabt6AHnKMJXzx MtrEp2wgC9uVY3eJzIP4v0pR8cvokwcX0dgkpfVmbHrptI/57Nkt1SkGFHF6Eu1TPLlX yqJUVUzB86sulfAD4X20iULGoGF3wkfQH4vF22DWhhl+36WnhS6jgczFSrH9JT1TxKlO cTJVY5thILjhbPofSA+aAXj/vvi9qQZKx+w14KTjrafYXghTwRFz5OsZCdoP2XhRoW3N SjCU5Ywp3LIDsa0ycq8whoy6FVwXKYKiekyLCjKuAtrugF/CepHH7I/q2X574YGM/5sz LKAQ== X-Gm-Message-State: AKGB3mJOLEf1IO8X24LWm/mcE3kxBr/wvhchD0fDnBQJwrcN+6a3f6oQ 12SWLln3VLLHraFhkiMkw6ZVfEaKsYAXW5MkUhU9Nw== X-Google-Smtp-Source: ACJfBos+fiZfE3zwUB69ebCUYpSvXOXFs8J/6f7FnHVFse1GTjaxlw+WEg0nlzO00M2C88tLLcy7me3MGdFNLMmx4Cw= X-Received: by 10.107.134.139 with SMTP id q11mr1784600ioi.257.1513640918602; Mon, 18 Dec 2017 15:48:38 -0800 (PST) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.131.163 with HTTP; Mon, 18 Dec 2017 15:48:17 -0800 (PST) In-Reply-To: <20171218230421.GE4376@eureka.lemis.com> References: <201712172212.vBHMCwYH026523@repo.freebsd.org> <20171218142306.zy46plfrctwhrcwg@ivaldir.net> <20171218230421.GE4376@eureka.lemis.com> From: Ed Maste Date: Mon, 18 Dec 2017 18:48:17 -0500 X-Google-Sender-Auth: ABJNba2uGKuAD5O4NC7hyYrYekU Message-ID: Subject: Re: svn commit: r326923 - stable/10/usr.bin/calendar/calendars To: "Greg 'groggy' Lehey" Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2017 23:48:39 -0000 On 18 December 2017 at 18:04, Greg 'groggy' Lehey wrote: > > Finger trouble. Mea culpa. I'll back it out when we come to an > agreement on how to do the rest. No, this was a regression that was incorrectly committed to a stable branch. Please back it out and propose or request a suitable change for HEAD. From owner-svn-src-stable-10@freebsd.org Mon Dec 18 23:58:07 2017 Return-Path: Delivered-To: svn-src-stable-10@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 3BC8FE939C5 for ; Mon, 18 Dec 2017 23:58:07 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x235.google.com (mail-it0-x235.google.com [IPv6:2607:f8b0:4001:c0b::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E986F77A8B for ; Mon, 18 Dec 2017 23:58:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x235.google.com with SMTP id d16so759352itj.1 for ; Mon, 18 Dec 2017 15:58:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=P2pDuV7DXOKxD6+pshkcX7zQ/WMWq9iUol20BuSEj9g=; b=NMsicN+zSjiJKhXaOb/eKYYZzRx2tYwyIm3mCVrHwm/m+clV5vB1IyDcX0E0/mvuAT 0M/dXeJ4jNE5jamj5bfbDUJVyhlLr6bHqcWFCjgGRyIWNhTs9MyYz7GNgcSR7Y+4S6b3 +ccLHVCggMUQFO6OaJfFocZSqR6rNapHFdsslhdSXvEJ5xX9cKU++trZYOyOljNC54aC Q4ih1ncDTwDNb3X7O9T2UrAm1frrFJTubjJLS3BDfaTBcIeJuf6iQYDKGqdVVvsh3pQH moV1fgYMLblO+cGE6V13OQwfQ8vFC6OYOZCOB27T49pVa6uno0S6j8NYLXSMeIIYYApp mDsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=P2pDuV7DXOKxD6+pshkcX7zQ/WMWq9iUol20BuSEj9g=; b=MjBjrBqaLupPD7wk67sMEG65gDYmdskMdba/W/2wLYnsohThq1rEAgArTOOgl8rjg9 JszkUdldR64ZzGMq25m39B0nCUhGtZLfW/vyNI8xj/wOXOiQ7oDuwFeXyfyhcL0h0X4Y dCN2e6izHcFiCeOKhGq9HL8Hk4dofOUGuvy3kuaYfpI1irNE4ubkWAf9vKRyWbkxGmal KxHDYabf0zANDSXquQm7obL0jHlIkAG5lxUXrM3w9Xd3QG3XMwvhOUpwoq1iWe9hjywA osA764ir8ivUTs4e4O45GPC5xj6km/Hcwce5ORN+ER8cl/TUCG1pNzLHfIhWGEQbGlZz faog== X-Gm-Message-State: AKGB3mKrqDSohUEFmz7eCcST8/bgwNu6x7bZrBgnZWOV4WIKan4W11jv vjLgI75uVbG7zAU5pgEOwYjNUYLz2JVbGEu4n5JBUw== X-Google-Smtp-Source: ACJfBovEBFRqKzQuua9QtJB2awCkllepYJ859dtmHFLjhKf5SJWN63dVfxOuV23qUIGDrXGmxzHdPaBBSxMgqWv+5fM= X-Received: by 10.36.131.200 with SMTP id d191mr1050092ite.97.1513641485915; Mon, 18 Dec 2017 15:58:05 -0800 (PST) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.108.204 with HTTP; Mon, 18 Dec 2017 15:58:05 -0800 (PST) X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d] In-Reply-To: <20171218230421.GE4376@eureka.lemis.com> References: <201712172212.vBHMCwYH026523@repo.freebsd.org> <20171218142306.zy46plfrctwhrcwg@ivaldir.net> <20171218230421.GE4376@eureka.lemis.com> From: Warner Losh Date: Mon, 18 Dec 2017 16:58:05 -0700 X-Google-Sender-Auth: Ignvsq70WEM0LwgBjnE905p4KpU Message-ID: Subject: Re: svn commit: r326923 - stable/10/usr.bin/calendar/calendars To: "Greg 'groggy' Lehey" Cc: Baptiste Daroussin , src-committers , "svn-src-all@freebsd.org" , svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2017 23:58:07 -0000 On Mon, Dec 18, 2017 at 4:04 PM, Greg 'groggy' Lehey wrote: > > > 2. why directly to the 10 branch and no in head? > > Finger trouble. Mea culpa. I'll back it out when we come to an > agreement on how to do the rest. > Sorry, you can't use your screwup to issue an ultimatum about what we should or shouldn't do. Back it out. Now. Unconditionally. Without further complaint. Or else it will be backed out for you. You're also welcome to document the proposed change and get buy in via the normal channels which can then be implemented using normal processes... Warner From owner-svn-src-stable-10@freebsd.org Tue Dec 19 01:02:59 2017 Return-Path: Delivered-To: svn-src-stable-10@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 AA40EE98183; Tue, 19 Dec 2017 01:02:59 +0000 (UTC) (envelope-from grog@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 759847A366; Tue, 19 Dec 2017 01:02:59 +0000 (UTC) (envelope-from grog@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBJ12wkW010599; Tue, 19 Dec 2017 01:02:58 GMT (envelope-from grog@FreeBSD.org) Received: (from grog@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBJ12w2P010597; Tue, 19 Dec 2017 01:02:58 GMT (envelope-from grog@FreeBSD.org) Message-Id: <201712190102.vBJ12w2P010597@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grog set sender to grog@FreeBSD.org using -f From: Greg Lehey Date: Tue, 19 Dec 2017 01:02:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r326955 - stable/10/usr.bin/calendar/calendars X-SVN-Group: stable-10 X-SVN-Commit-Author: grog X-SVN-Commit-Paths: stable/10/usr.bin/calendar/calendars X-SVN-Commit-Revision: 326955 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2017 01:02:59 -0000 Author: grog Date: Tue Dec 19 01:02:58 2017 New Revision: 326955 URL: https://svnweb.freebsd.org/changeset/base/326955 Log: Revert revision 326923 Demanded unconditionally by: imp@ Modified: stable/10/usr.bin/calendar/calendars/calendar.birthday stable/10/usr.bin/calendar/calendars/calendar.holiday Modified: stable/10/usr.bin/calendar/calendars/calendar.birthday ============================================================================== --- stable/10/usr.bin/calendar/calendars/calendar.birthday Tue Dec 19 00:18:17 2017 (r326954) +++ stable/10/usr.bin/calendar/calendars/calendar.birthday Tue Dec 19 01:02:58 2017 (r326955) @@ -292,7 +292,7 @@ 12/12 E.G. Robinson born, 1893 12/14 George Washington dies, 1799 12/17 William Safire (Safir) born, 1929 -12/18 Konrad Zuse died in Hünfeld, 1995 +12/18 Konrad Zuse died in Hünfeld, 1995 12/20 Carl Sagan died, 1996 12/21 Benjamin Disraeli born, 1804 12/22 Giacomo Puccini born, 1858 Modified: stable/10/usr.bin/calendar/calendars/calendar.holiday ============================================================================== --- stable/10/usr.bin/calendar/calendars/calendar.holiday Tue Dec 19 00:18:17 2017 (r326954) +++ stable/10/usr.bin/calendar/calendars/calendar.holiday Tue Dec 19 01:02:58 2017 (r326955) @@ -356,7 +356,7 @@ 08/30 Victory Day in Turkey 08/31 Independence Day (Merdeka) in Malaysia 08/31 Independence Day in Trinidad and Tobago -08/31 Pashtoonian Day in Afghanistan +08/31 Pashtunistan Day in Afghanistan 08/FriThird Admission Day in Hawaii, 1959 (3rd Friday) 09/01 Army Day in Chile 09/03 Independence Day in Qatar From owner-svn-src-stable-10@freebsd.org Tue Dec 19 01:09:41 2017 Return-Path: Delivered-To: svn-src-stable-10@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 04302E988C4; Tue, 19 Dec 2017 01:09:41 +0000 (UTC) (envelope-from grog@lemis.com) Received: from www.lemis.com (www.lemis.com [208.86.226.86]) by mx1.freebsd.org (Postfix) with ESMTP id 7FD9D7A677; Tue, 19 Dec 2017 01:09:40 +0000 (UTC) (envelope-from grog@lemis.com) Received: from eureka.lemis.com (lemis.com [192.109.197.81]) by www.lemis.com (Postfix) with ESMTP id C61A41B72806; Tue, 19 Dec 2017 01:09:38 +0000 (UTC) Received: by eureka.lemis.com (Postfix, from userid 1004) id 7E8394494B1; Tue, 19 Dec 2017 12:09:37 +1100 (AEDT) Date: Tue, 19 Dec 2017 12:09:37 +1100 From: Greg 'groggy' Lehey To: Warner Losh Cc: Baptiste Daroussin , src-committers , "svn-src-all@freebsd.org" , svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r326923 - stable/10/usr.bin/calendar/calendars Message-ID: <20171219010937.GF4376@eureka.lemis.com> References: <201712172212.vBHMCwYH026523@repo.freebsd.org> <20171218142306.zy46plfrctwhrcwg@ivaldir.net> <20171218230421.GE4376@eureka.lemis.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="xkXJwpr35CY/Lc3I" Content-Disposition: inline In-Reply-To: Organization: The FreeBSD Project Phone: +61-3-5346-1370, +61-3-5309-0418 Mobile: 0401 265 606. Use only as instructed. WWW-Home-Page: http://www.FreeBSD.org/ X-PGP-Fingerprint: 9A1B 8202 BCCE B846 F92F 09AC 22E6 F290 507A 4223 User-Agent: Mutt/1.6.1 (2016-04-27) X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2017 01:09:41 -0000 --xkXJwpr35CY/Lc3I Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Monday, 18 December 2017 at 16:58:05 -0700, Warner Losh wrote: > On Mon, Dec 18, 2017 at 4:04 PM, Greg 'groggy' Lehey > wrote: >> >>> 2. why directly to the 10 branch and no in head? >> >> Finger trouble. Mea culpa. I'll back it out when we come to an >> agreement on how to do the rest. > > Sorry, you can't use your screwup to issue an ultimatum about what we > should or shouldn't do. Ultimatum? Have you read the thread? What do you interpret as an ultimatum? I was just trying to avoid unnecessary repo churn. > Back it out. Now. Unconditionally. Done. > Without further complaint. Or else it will be backed out for you. It's difficult not to complain about such a high-handed approach. What hat are you wearing that allows you such behaviour? > You're also welcome to document the proposed change I did. Your comments (apart from removing it from your reply)? Since you seem so concerned about the matter, I'd suggest that you: - Go through all the files, check for UTF-8 conformity, and fix all non-compliant files. - Find a way, either the one I suggested or another, to ensure that nobody makes this mistake again (i.e. make it clear that these files are in UTF-8). - Learn to express yourself more politely. Greg -- Sent from my desktop computer. Finger grog@FreeBSD.org for PGP public key. See complete headers for address and phone numbers. This message is digitally signed. If your Microsoft mail program reports problems, please read http://lemis.com/broken-MUA --xkXJwpr35CY/Lc3I Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAlo4ZtEACgkQIubykFB6QiNhOQCfR7zHJKDDtxCYhKxVcVuem1Zx xzAAnjrDtRM55Iz+g6Yhy1+4a4IJ5lUn =ey0T -----END PGP SIGNATURE----- --xkXJwpr35CY/Lc3I-- From owner-svn-src-stable-10@freebsd.org Tue Dec 19 02:26:58 2017 Return-Path: Delivered-To: svn-src-stable-10@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 D6D7CEA131A; Tue, 19 Dec 2017 02:26:58 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io0-x241.google.com (mail-io0-x241.google.com [IPv6:2607:f8b0:4001:c06::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9B63F7E76C; Tue, 19 Dec 2017 02:26:58 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io0-x241.google.com with SMTP id k202so3697111ioe.10; Mon, 18 Dec 2017 18:26:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=SiDEh7F0venKaF0PIYT6BtZnlpPUz8pPCJjD0Ez75xc=; b=PzU45beveHR0IZBfv4cp2Lmbfs9k6dlODvXsNulbav/qIK8PFr5f1b10Yw7bpFqGDC UjcfrFQ2UXsCcyzlmtKQrdKDCsjrbcM5QaHrkz+mCx/5tqBF9rSmVctVzWMceeP+0R0f BE8izNFjPjFGyw1GYk7eRyOEEwtCOzAsSiGl7lal+/n6y84CO1lPKIscK90c5RN51GpK nLFP+66fBsauyxwPwtbAG3v64yGAh40ZQNvVrLfTYHbL5WDjrOAr5HLc7C9mM4/nV//6 IgEhHq8V0LTXxwVST7LW8cisFOJgHFezzz5XM/tidCCQFN8+Qs2rh3FTLkZSaAC1DKbS yQtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=SiDEh7F0venKaF0PIYT6BtZnlpPUz8pPCJjD0Ez75xc=; b=aB8fCKVjJpkezmASRi1O2pPNmaT2yK7pIOR6G4ZpCcmJDR90hqdY2LrnpiTGEoIAhD YU06yq+D9jiEwJsV8rmC4Asz8Ogfs0Fm3DS9jks++fMbTklmeoyAxFkw5adruCyiri5U dpcTFotRINd4mddOnO4FXJ3mopcjiCCyY6zJ8mbtRlo0n6SopBUtXe7YgrhmUoke9JdJ BZQfiXE8oe1dPW+ED23oxTu8JLZ5KUsim3fME8h4B2rWKQu2k41mQPqkP6VHIerRUfaP XJU8Jq3XODctAg/NeVIFcS5hdULRTFbCLcs4mrROkG1wKkAsSKHe/8f2w6KZl5IMwxPK HdKg== X-Gm-Message-State: AKGB3mJKCnCMYsD9QEFW/mh2rnWXCvbRh2APCLQVJeCPcFJzqBvG4Pzs klkWSSAqM+xhvsAzUQzVgcjdihp5snc5WI5OJxZlWCeo X-Google-Smtp-Source: ACJfBotabIuuEm4L8FFLh+1dtEWNVinM4L0oI0WuVX9MnMsOViOHCuZJvXPOZT1pcOGa9HLjWgWMtQ7lfE+NJ/l94/0= X-Received: by 10.107.201.1 with SMTP id z1mr2156926iof.83.1513650417816; Mon, 18 Dec 2017 18:26:57 -0800 (PST) MIME-Version: 1.0 Sender: carpeddiem@gmail.com Received: by 10.107.131.163 with HTTP; Mon, 18 Dec 2017 18:26:37 -0800 (PST) In-Reply-To: <201712190102.vBJ12w2P010597@repo.freebsd.org> References: <201712190102.vBJ12w2P010597@repo.freebsd.org> From: Ed Maste Date: Mon, 18 Dec 2017 21:26:37 -0500 X-Google-Sender-Auth: fhDX8pNCG0JN0aNOg8A1-nIEopI Message-ID: Subject: Re: svn commit: r326955 - stable/10/usr.bin/calendar/calendars To: Greg Lehey Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2017 02:26:59 -0000 On 18 December 2017 at 20:02, Greg Lehey wrote: > Author: grog > Date: Tue Dec 19 01:02:58 2017 > New Revision: 326955 > URL: https://svnweb.freebsd.org/changeset/base/326955 > ... > Modified: stable/10/usr.bin/calendar/calendars/calendar.holiday > ============================================================================== > --- stable/10/usr.bin/calendar/calendars/calendar.holiday Tue Dec 19 00:18:17 2017 (r326954) > +++ stable/10/usr.bin/calendar/calendars/calendar.holiday Tue Dec 19 01:02:58 2017 (r326955) > @@ -356,7 +356,7 @@ > 08/30 Victory Day in Turkey > 08/31 Independence Day (Merdeka) in Malaysia > 08/31 Independence Day in Trinidad and Tobago > -08/31 Pashtoonian Day in Afghanistan > +08/31 Pashtunistan Day in Afghanistan > 08/FriThird Admission Day in Hawaii, 1959 (3rd Friday) > 09/01 Army Day in Chile > 09/03 Independence Day in Qatar This appears to be a MFC of r323042 accidentally included in the revert and without mergeinfo? From owner-svn-src-stable-10@freebsd.org Tue Dec 19 02:52:36 2017 Return-Path: Delivered-To: svn-src-stable-10@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 107F3EA36B2; Tue, 19 Dec 2017 02:52:36 +0000 (UTC) (envelope-from grog@lemis.com) Received: from www.lemis.com (www.lemis.com [208.86.226.86]) by mx1.freebsd.org (Postfix) with ESMTP id D8A637FAA4; Tue, 19 Dec 2017 02:52:35 +0000 (UTC) (envelope-from grog@lemis.com) Received: from eureka.lemis.com (lemis.com [192.109.197.81]) by www.lemis.com (Postfix) with ESMTP id 5D5F71B72806; Tue, 19 Dec 2017 02:52:34 +0000 (UTC) Received: by eureka.lemis.com (Postfix, from userid 1004) id 553D64494B1; Tue, 19 Dec 2017 13:52:33 +1100 (AEDT) Date: Tue, 19 Dec 2017 13:52:33 +1100 From: Greg 'groggy' Lehey To: Ed Maste Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r326955 - stable/10/usr.bin/calendar/calendars Message-ID: <20171219025233.GG4376@eureka.lemis.com> References: <201712190102.vBJ12w2P010597@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="RMedoP2+Pr6Rq0N2" Content-Disposition: inline In-Reply-To: Organization: The FreeBSD Project Phone: +61-3-5346-1370, +61-3-5309-0418 Mobile: 0401 265 606. Use only as instructed. WWW-Home-Page: http://www.FreeBSD.org/ X-PGP-Fingerprint: 9A1B 8202 BCCE B846 F92F 09AC 22E6 F290 507A 4223 User-Agent: Mutt/1.6.1 (2016-04-27) X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2017 02:52:36 -0000 --RMedoP2+Pr6Rq0N2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Monday, 18 December 2017 at 21:26:37 -0500, Ed Maste wrote: > On 18 December 2017 at 20:02, Greg Lehey wrote: >> Author: grog >> Date: Tue Dec 19 01:02:58 2017 >> New Revision: 326955 >> URL: https://svnweb.freebsd.org/changeset/base/326955 >> > ... >> Modified: stable/10/usr.bin/calendar/calendars/calendar.holiday >> ============================================================================== >> --- stable/10/usr.bin/calendar/calendars/calendar.holiday Tue Dec 19 00:18:17 2017 (r326954) >> +++ stable/10/usr.bin/calendar/calendars/calendar.holiday Tue Dec 19 01:02:58 2017 (r326955) >> @@ -356,7 +356,7 @@ >> 08/30 Victory Day in Turkey >> 08/31 Independence Day (Merdeka) in Malaysia >> 08/31 Independence Day in Trinidad and Tobago >> -08/31 Pashtoonian Day in Afghanistan >> +08/31 Pashtunistan Day in Afghanistan >> 08/FriThird Admission Day in Hawaii, 1959 (3rd Friday) >> 09/01 Army Day in Chile >> 09/03 Independence Day in Qatar > > This appears to be a MFC of r323042 accidentally included in the > revert and without mergeinfo? Yes, I don't know how that happened. I followed the instructions in the committer's guide exactly. Presumably I should have specified the file explicitly (not in the guide), but I wasn't expecting any side effects. How would you like to handle it? Greg -- Sent from my desktop computer. Finger grog@FreeBSD.org for PGP public key. See complete headers for address and phone numbers. This message is digitally signed. If your Microsoft mail program reports problems, please read http://lemis.com/broken-MUA --RMedoP2+Pr6Rq0N2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAlo4fvEACgkQIubykFB6QiMwzQCgiD77YZSrbauf5wLoyvd/3mFj 62MAnRRPSCysSDRS1ug/P0mz7nH2Nxfr =2ozc -----END PGP SIGNATURE----- --RMedoP2+Pr6Rq0N2-- From owner-svn-src-stable-10@freebsd.org Tue Dec 19 09:00:12 2017 Return-Path: Delivered-To: svn-src-stable-10@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 B1FA0E97BEF; Tue, 19 Dec 2017 09:00:12 +0000 (UTC) (envelope-from bapt@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 8E4C16DFA9; Tue, 19 Dec 2017 09:00:12 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by freefall.freebsd.org (Postfix, from userid 1235) id ACCA81F7E4; Tue, 19 Dec 2017 09:00:11 +0000 (UTC) Date: Tue, 19 Dec 2017 10:00:11 +0100 From: Baptiste Daroussin To: Greg 'groggy' Lehey Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r326923 - stable/10/usr.bin/calendar/calendars Message-ID: <20171219090011.rikgg7xlckyuxr3l@ivaldir.net> References: <201712172212.vBHMCwYH026523@repo.freebsd.org> <20171218142306.zy46plfrctwhrcwg@ivaldir.net> <20171218230421.GE4376@eureka.lemis.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="2fjw3fn7uqt2aa6k" Content-Disposition: inline In-Reply-To: <20171218230421.GE4376@eureka.lemis.com> User-Agent: NeoMutt/20171208 X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2017 09:00:12 -0000 --2fjw3fn7uqt2aa6k Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 19, 2017 at 10:04:21AM +1100, Greg 'groggy' Lehey wrote: > On Monday, 18 December 2017 at 15:23:06 +0100, Baptiste Daroussin wrote: > > On Sun, Dec 17, 2017 at 10:12:58PM +0000, Greg Lehey wrote: > >> Author: grog > >> Date: Sun Dec 17 22:12:57 2017 > >> New Revision: 326923 > >> URL: https://svnweb.freebsd.org/changeset/base/326923 > >> > >> Log: > >> Correct character set. > > > > You are "correcting" a UTF-8 character into a ISO-8859 character direct= ly in > > branch 10. > > > > This looks wrong in multiple way: > > 1. everything was converted into UTF-8 in 2011 on purpose >=20 > For small values of "everything", maybe. I've checked three files: > calendar.history, fr_FR.ISO8859-1/calendar.fetes and > de_DE.ISO8859-1/calendar.geschichte. Only the first was in UTF-8. >=20 > It sounds like a good idea to convert the files to UTF-8, but it has to b= e done > to all of them. And how about adding some information about the > preferred character set? We could kill two birds with one stone and > add this to the top of each file: Sorry I wasn't clear everything in that directory has been changed into UTF= -8: r228991 For subdirectories it is less a problem as LANG is defined in each files to state the locale and then calendar(1) will itself switch to the defined loc= ales. That said nowaday, most of the users of non ASCII countries are using UTF-8 only so if it was me I would rename all the ISO8859* calendars into UTF-8 o= nes and convert the locale to UTF-8. but hey :) BApt --2fjw3fn7uqt2aa6k Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAlo41RgACgkQY4mL3PG3 PlqohhAA5k0cUWccd4WJ1ZmgznlC3O7V6Wm/GfpaJHm04/IrQ7UejKtXibHLDtGS zQbd0xwqJUtuYf7OMl29PNQqY0lTvFfhlwHPcSb0lKtDd8L8YbCCW2oALltSw6yE fZLGSyL5OE7LDDLl4kIahsb91bIj7f05h2UdUbSHOMpcs/BdbBhiKepczr5Drf3+ VrpI0YyW0uea2bUzDGQlF7KOuLIrTiZM/1hLikz8Zs7qNF9Vf6o4J5TiiaEELKF0 aJp1uBR+wRAcyRT++6ENdiNWaOLhq06mh+T+1LXs2KtqSLAkmEkGrRlVnqdoYPrl ZDB19GFRWEdeox5T3qfNKq515RyHU0uQ3D/PLWJEGbAtAcqUPoKRkdg3KZ8j3quP 3/YLnW7X0dvnX//l9DB5TmLiwvqdDu+rzKa5cEUxC6VmthvoOxj/rMFFdEsGPiIL DrcP0aYFdgAXywrv8gNmkUpYTQSSqZ3lKbxwVhJz8idVv34I2v19ErRTLUrsbtBr 36nUrjEAxMCOkPqUWg8V0dNO4VUKGSjEh9zPcN7CHWRHtbDsghYkgSFsNydIZiIY QaHpOHl67qwxpwLpn88i8tQhQvSgEFsrJEPZHPAVhsDXnU7zfafGzxH+0Xfk+87S yTVxFHoHg/CYTXmdQB81BhLOHm/nHzstTv5Xtu3N0+8wDdL0v6M= =weCF -----END PGP SIGNATURE----- --2fjw3fn7uqt2aa6k-- From owner-svn-src-stable-10@freebsd.org Tue Dec 19 11:44:25 2017 Return-Path: Delivered-To: svn-src-stable-10@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 B484DEA22A8; Tue, 19 Dec 2017 11:44:25 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8C6AF74608; Tue, 19 Dec 2017 11:44:25 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBJBiOHR079365; Tue, 19 Dec 2017 11:44:24 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBJBiO7k079364; Tue, 19 Dec 2017 11:44:24 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201712191144.vBJBiO7k079364@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 19 Dec 2017 11:44:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r326976 - in stable: 10/contrib/llvm/tools/clang/lib/Sema 11/contrib/llvm/tools/clang/lib/Sema 9/contrib/llvm/tools/clang/lib/Sema X-SVN-Group: stable-10 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable: 10/contrib/llvm/tools/clang/lib/Sema 11/contrib/llvm/tools/clang/lib/Sema 9/contrib/llvm/tools/clang/lib/Sema X-SVN-Commit-Revision: 326976 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2017 11:44:25 -0000 Author: dim Date: Tue Dec 19 11:44:24 2017 New Revision: 326976 URL: https://svnweb.freebsd.org/changeset/base/326976 Log: MFC r326880: Pull in r320755 from upstream clang trunk (by me): Don't trigger -Wuser-defined-literals for system headers Summary: In D41064, I proposed adding `#pragma clang diagnostic ignored "-Wuser-defined-literals"` to some of libc++'s headers, since these warnings are now triggered by clang's new `-std=gnu++14` default: $ cat test.cpp #include $ clang -std=c++14 -Wsystem-headers -Wall -Wextra -c test.cpp In file included from test.cpp:1: In file included from /usr/include/c++/v1/string:470: /usr/include/c++/v1/string_view:763:29: warning: user-defined literal suffixes not starting with '_' are reserved [-Wuser-defined-literals] basic_string_view operator "" sv(const char *__str, size_t __len) ^ /usr/include/c++/v1/string_view:769:32: warning: user-defined literal suffixes not starting with '_' are reserved [-Wuser-defined-literals] basic_string_view operator "" sv(const wchar_t *__str, size_t __len) ^ /usr/include/c++/v1/string_view:775:33: warning: user-defined literal suffixes not starting with '_' are reserved [-Wuser-defined-literals] basic_string_view operator "" sv(const char16_t *__str, size_t __len) ^ /usr/include/c++/v1/string_view:781:33: warning: user-defined literal suffixes not starting with '_' are reserved [-Wuser-defined-literals] basic_string_view operator "" sv(const char32_t *__str, size_t __len) ^ In file included from test.cpp:1: /usr/include/c++/v1/string:4012:24: warning: user-defined literal suffixes not starting with '_' are reserved [-Wuser-defined-literals] basic_string operator "" s( const char *__str, size_t __len ) ^ /usr/include/c++/v1/string:4018:27: warning: user-defined literal suffixes not starting with '_' are reserved [-Wuser-defined-literals] basic_string operator "" s( const wchar_t *__str, size_t __len ) ^ /usr/include/c++/v1/string:4024:28: warning: user-defined literal suffixes not starting with '_' are reserved [-Wuser-defined-literals] basic_string operator "" s( const char16_t *__str, size_t __len ) ^ /usr/include/c++/v1/string:4030:28: warning: user-defined literal suffixes not starting with '_' are reserved [-Wuser-defined-literals] basic_string operator "" s( const char32_t *__str, size_t __len ) ^ 8 warnings generated. Both @aaron.ballman and @mclow.lists felt that adding this workaround to the libc++ headers was the wrong way, and it should be fixed in clang instead. Here is a proposal to do just that. I verified that this suppresses the warning, even when -Wsystem-headers is used, and that the warning is still emitted for a declaration outside of system headers. Reviewers: aaron.ballman, mclow.lists, rsmith Reviewed By: aaron.ballman Subscribers: mclow.lists, aaron.ballman, andrew, emaste, cfe-commits Differential Revision: https://reviews.llvm.org/D41080 This will allow to compile some of the libc++ headers in C++14 mode (which is the default for gcc 6 and higher, and will be the default for clang 6.0.0 and higher), with -Wsystem-headers and -Werror enabled. Reported by: andrew Modified: stable/10/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp stable/9/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp Directory Properties: stable/11/ (props changed) stable/9/ (props changed) stable/9/contrib/ (props changed) stable/9/contrib/llvm/ (props changed) stable/9/contrib/llvm/tools/clang/ (props changed) Modified: stable/10/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp ============================================================================== --- stable/10/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp Tue Dec 19 11:39:05 2017 (r326975) +++ stable/10/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp Tue Dec 19 11:44:24 2017 (r326976) @@ -10952,7 +10952,8 @@ FinishedParams: StringRef LiteralName = FnDecl->getDeclName().getCXXLiteralIdentifier()->getName(); - if (LiteralName[0] != '_') { + if (LiteralName[0] != '_' && + !getSourceManager().isInSystemHeader(FnDecl->getLocation())) { // C++11 [usrlit.suffix]p1: // Literal suffix identifiers that do not start with an underscore // are reserved for future standardization. From owner-svn-src-stable-10@freebsd.org Tue Dec 19 23:00:09 2017 Return-Path: Delivered-To: svn-src-stable-10@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 64B54E80F86; Tue, 19 Dec 2017 23:00:09 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3ECE7701AB; Tue, 19 Dec 2017 23:00:09 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBJN08rG071952; Tue, 19 Dec 2017 23:00:08 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBJN08oS071951; Tue, 19 Dec 2017 23:00:08 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201712192300.vBJN08oS071951@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Tue, 19 Dec 2017 23:00:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r327008 - stable/10/sys/fs/nfsserver X-SVN-Group: stable-10 X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: stable/10/sys/fs/nfsserver X-SVN-Commit-Revision: 327008 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2017 23:00:09 -0000 Author: rmacklem Date: Tue Dec 19 23:00:08 2017 New Revision: 327008 URL: https://svnweb.freebsd.org/changeset/base/327008 Log: MFC: r326544 Avoid the overhead of acquiring a lock in nfsrv_checkgetattr() when there are no write delegations issued. manu@ reported on the freebsd-current@ mailing list that there was a significant performance hit in nfsrv_checkgetattr() caused by the acquisition/release of a state lock, even when there were no write delegations issued. This patch add a count of outstanding issued write delegations to the NFSv4 server. This count allows nfsrv_checkgetattr() to return without acquiring any lock when the count is 0, avoiding the performance hit for the case where no write delegations are issued. Modified: stable/10/sys/fs/nfsserver/nfs_nfsdstate.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- stable/10/sys/fs/nfsserver/nfs_nfsdstate.c Tue Dec 19 22:43:39 2017 (r327007) +++ stable/10/sys/fs/nfsserver/nfs_nfsdstate.c Tue Dec 19 23:00:08 2017 (r327008) @@ -98,6 +98,7 @@ static time_t nfsrvboottime; static int nfsrv_returnoldstateid = 0, nfsrv_clients = 0; static int nfsrv_clienthighwater = NFSRV_CLIENTHIGHWATER; static int nfsrv_nogsscallback = 0; +static volatile int nfsrv_writedelegcnt = 0; /* local functions */ static void nfsrv_dumpaclient(struct nfsclient *clp, @@ -1266,6 +1267,8 @@ nfsrv_freedeleg(struct nfsstate *stp) LIST_REMOVE(stp, ls_hash); LIST_REMOVE(stp, ls_list); LIST_REMOVE(stp, ls_file); + if ((stp->ls_flags & NFSLCK_DELEGWRITE) != 0) + nfsrv_writedelegcnt--; lfp = stp->ls_lfp; if (LIST_EMPTY(&lfp->lf_open) && LIST_EMPTY(&lfp->lf_lock) && LIST_EMPTY(&lfp->lf_deleg) && @@ -2902,6 +2905,7 @@ tryagain: new_deleg->ls_flags = (NFSLCK_DELEGWRITE | NFSLCK_READACCESS | NFSLCK_WRITEACCESS); *rflagsp |= NFSV4OPEN_WRITEDELEGATE; + nfsrv_writedelegcnt++; } else { new_deleg->ls_flags = (NFSLCK_DELEGREAD | NFSLCK_READACCESS); @@ -3032,6 +3036,7 @@ tryagain: new_deleg->ls_clp = clp; new_deleg->ls_filerev = filerev; new_deleg->ls_compref = nd->nd_compref; + nfsrv_writedelegcnt++; LIST_INSERT_HEAD(&lfp->lf_deleg, new_deleg, ls_file); LIST_INSERT_HEAD(NFSSTATEHASH(clp, new_deleg->ls_stateid), new_deleg, ls_hash); @@ -3089,6 +3094,7 @@ tryagain: new_deleg->ls_flags = (NFSLCK_DELEGWRITE | NFSLCK_READACCESS | NFSLCK_WRITEACCESS); *rflagsp |= NFSV4OPEN_WRITEDELEGATE; + nfsrv_writedelegcnt++; } else { new_deleg->ls_flags = (NFSLCK_DELEGREAD | NFSLCK_READACCESS); @@ -3165,6 +3171,7 @@ tryagain: NFSLCK_READACCESS | NFSLCK_WRITEACCESS); *rflagsp |= NFSV4OPEN_WRITEDELEGATE; + nfsrv_writedelegcnt++; } else { new_deleg->ls_flags = (NFSLCK_DELEGREAD | @@ -5289,6 +5296,8 @@ nfsrv_checkgetattr(struct nfsrv_descript *nd, vnode_t NFSCBGETATTR_ATTRBIT(attrbitp, &cbbits); if (!NFSNONZERO_ATTRBIT(&cbbits)) + goto out; + if (nfsrv_writedelegcnt == 0) goto out; /* From owner-svn-src-stable-10@freebsd.org Wed Dec 20 07:18:08 2017 Return-Path: Delivered-To: svn-src-stable-10@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 86EB3E9B2EC; Wed, 20 Dec 2017 07:18:08 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 52D69126E; Wed, 20 Dec 2017 07:18:08 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBK7I73E079237; Wed, 20 Dec 2017 07:18:07 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBK7I71A079236; Wed, 20 Dec 2017 07:18:07 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201712200718.vBK7I71A079236@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 20 Dec 2017 07:18:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r327019 - stable/10/libexec/ftpd X-SVN-Group: stable-10 X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: stable/10/libexec/ftpd X-SVN-Commit-Revision: 327019 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Dec 2017 07:18:08 -0000 Author: delphij Date: Wed Dec 20 07:18:07 2017 New Revision: 327019 URL: https://svnweb.freebsd.org/changeset/base/327019 Log: MFC r326562: Use strlcpy(). Modified: stable/10/libexec/ftpd/ftpd.c Directory Properties: stable/10/ (props changed) Modified: stable/10/libexec/ftpd/ftpd.c ============================================================================== --- stable/10/libexec/ftpd/ftpd.c Wed Dec 20 07:16:41 2017 (r327018) +++ stable/10/libexec/ftpd/ftpd.c Wed Dec 20 07:18:07 2017 (r327019) @@ -1064,7 +1064,7 @@ user(char *name) } } if (logging) - strncpy(curname, name, sizeof(curname)-1); + strlcpy(curname, name, sizeof(curname)); pwok = 0; #ifdef USE_PAM From owner-svn-src-stable-10@freebsd.org Thu Dec 21 13:32:50 2017 Return-Path: Delivered-To: svn-src-stable-10@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 E8960E973A2; Thu, 21 Dec 2017 13:32:50 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3DA666965; Thu, 21 Dec 2017 13:32:50 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBLDWnqV051200; Thu, 21 Dec 2017 13:32:49 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBLDWn5U051199; Thu, 21 Dec 2017 13:32:49 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201712211332.vBLDWn5U051199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Thu, 21 Dec 2017 13:32:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r327060 - stable/10/sys/fs/devfs X-SVN-Group: stable-10 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/10/sys/fs/devfs X-SVN-Commit-Revision: 327060 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Dec 2017 13:32:51 -0000 Author: kib Date: Thu Dec 21 13:32:49 2017 New Revision: 327060 URL: https://svnweb.freebsd.org/changeset/base/327060 Log: MFC r326851: In devfs_lookupx() dotdot lookup case, avoid dereferencing dvp->v_mount after dvp is unlocked. Modified: stable/10/sys/fs/devfs/devfs_vnops.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/devfs/devfs_vnops.c ============================================================================== --- stable/10/sys/fs/devfs/devfs_vnops.c Thu Dec 21 13:30:56 2017 (r327059) +++ stable/10/sys/fs/devfs/devfs_vnops.c Thu Dec 21 13:32:49 2017 (r327060) @@ -869,6 +869,7 @@ devfs_lookupx(struct vop_lookup_args *ap, int *dm_unlo struct devfs_dirent *de, *dd; struct devfs_dirent **dde; struct devfs_mount *dmp; + struct mount *mp; struct cdev *cdev; int error, flags, nameiop, dvplocked; char specname[SPECNAMELEN + 1], *pname; @@ -880,7 +881,8 @@ devfs_lookupx(struct vop_lookup_args *ap, int *dm_unlo td = cnp->cn_thread; flags = cnp->cn_flags; nameiop = cnp->cn_nameiop; - dmp = VFSTODEVFS(dvp->v_mount); + mp = dvp->v_mount; + dmp = VFSTODEVFS(mp); dd = dvp->v_data; *vpp = NULLVP; @@ -913,8 +915,8 @@ devfs_lookupx(struct vop_lookup_args *ap, int *dm_unlo return (ENOENT); dvplocked = VOP_ISLOCKED(dvp); VOP_UNLOCK(dvp, 0); - error = devfs_allocv(de, dvp->v_mount, - cnp->cn_lkflags & LK_TYPE_MASK, vpp); + error = devfs_allocv(de, mp, cnp->cn_lkflags & LK_TYPE_MASK, + vpp); *dm_unlock = 0; vn_lock(dvp, dvplocked | LK_RETRY); return (error); @@ -999,8 +1001,7 @@ devfs_lookupx(struct vop_lookup_args *ap, int *dm_unlo return (0); } } - error = devfs_allocv(de, dvp->v_mount, cnp->cn_lkflags & LK_TYPE_MASK, - vpp); + error = devfs_allocv(de, mp, cnp->cn_lkflags & LK_TYPE_MASK, vpp); *dm_unlock = 0; return (error); } From owner-svn-src-stable-10@freebsd.org Fri Dec 22 18:15:35 2017 Return-Path: Delivered-To: svn-src-stable-10@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 6BAA7E8129D; Fri, 22 Dec 2017 18:15:35 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3556F1DAA; Fri, 22 Dec 2017 18:15:35 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBMIFYAv071871; Fri, 22 Dec 2017 18:15:34 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBMIFYkY071870; Fri, 22 Dec 2017 18:15:34 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201712221815.vBMIFYkY071870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Fri, 22 Dec 2017 18:15:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r327091 - stable/10/usr.sbin/pw X-SVN-Group: stable-10 X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: stable/10/usr.sbin/pw X-SVN-Commit-Revision: 327091 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Dec 2017 18:15:35 -0000 Author: eugen Date: Fri Dec 22 18:15:34 2017 New Revision: 327091 URL: https://svnweb.freebsd.org/changeset/base/327091 Log: MFC r326872: fix expiration arithmetic after r326738 and MFC. Approved by: mav (mentor) Modified: stable/10/usr.sbin/pw/pw_user.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/pw/pw_user.c ============================================================================== --- stable/10/usr.sbin/pw/pw_user.c Fri Dec 22 18:14:55 2017 (r327090) +++ stable/10/usr.sbin/pw/pw_user.c Fri Dec 22 18:15:34 2017 (r327091) @@ -1385,11 +1385,12 @@ pw_user_add(int argc, char **argv, char *arg1) pwd->pw_uid = pw_uidpolicy(cmdcnf, id); pwd->pw_gid = pw_gidpolicy(cnf, grname, pwd->pw_name, (gid_t) pwd->pw_uid, dryrun); - + + /* cmdcnf->password_days and cmdcnf->expire_days hold unixtime here */ if (cmdcnf->password_days > 0) - pwd->pw_change = now + cmdcnf->password_days * 86400L; + pwd->pw_change = cmdcnf->password_days; if (cmdcnf->expire_days > 0) - pwd->pw_expire = now + cmdcnf->expire_days * 86400L; + pwd->pw_expire = cmdcnf->expire_days; pwd->pw_dir = pw_homepolicy(cmdcnf, homedir, pwd->pw_name); pwd->pw_shell = pw_shellpolicy(cmdcnf); @@ -1523,9 +1524,9 @@ pw_user_mod(int argc, char **argv, char *arg1) bool quiet, createhome, pretty, dryrun, nis, edited; bool precrypted; mode_t homemode = 0; - time_t expire_days, password_days, now; + time_t expire_time, password_time, now; - expire_days = password_days = -1; + expire_time = password_time = -1; gecos = homedir = grname = name = newname = skel = shell =NULL; passwd = NULL; class = nispasswd = NULL; @@ -1561,10 +1562,10 @@ pw_user_mod(int argc, char **argv, char *arg1) homedir = optarg; break; case 'e': - expire_days = parse_date(now, optarg); + expire_time = parse_date(now, optarg); break; case 'p': - password_days = parse_date(now, optarg); + password_time = parse_date(now, optarg); break; case 'g': group_from_name_or_id(optarg); @@ -1699,13 +1700,13 @@ pw_user_mod(int argc, char **argv, char *arg1) } - if (password_days >= 0) { - pwd->pw_change = now + password_days * 86400L; + if (password_time >= 0 && pwd->pw_change != password_time) { + pwd->pw_change = password_time; edited = true; } - if (expire_days >= 0) { - pwd->pw_expire = now + expire_days * 86400L; + if (expire_time >= 0 && pwd->pw_expire != expire_time) { + pwd->pw_expire = expire_time; edited = true; }