From owner-svn-src-all@freebsd.org Sat Nov 10 16:23:49 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C532E1103195; Sat, 10 Nov 2018 16:23:48 +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 38B0D71A7F; Sat, 10 Nov 2018 16:23:48 +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 wAAGNkT8016455; Sat, 10 Nov 2018 08:23:46 -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 wAAGNkp3016454; Sat, 10 Nov 2018 08:23:46 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201811101623.wAAGNkp3016454@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340318 - head/usr.sbin/newsyslog In-Reply-To: <201811101046.wAAAkdPs041621@repo.freebsd.org> To: Ben Woods Date: Sat, 10 Nov 2018 08:23:46 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@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-Rspamd-Queue-Id: 38B0D71A7F X-Spamd-Result: default: False [1.71 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.43)[0.428,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.02)[country: US(-0.09)]; NEURAL_SPAM_SHORT(0.38)[0.377,0]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_SPAM_LONG(0.03)[0.035,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 10 Nov 2018 16:23:49 -0000 > Author: woodsb02 (ports committer) > Date: Sat Nov 10 10:46:38 2018 > New Revision: 340318 > URL: https://svnweb.freebsd.org/changeset/base/340318 > > Log: > newsyslog.conf: Restrict included files in default config to [!.]*.conf > > The new default config will only include files from the following > directories which end with '.conf' and do not beginning with a '.' > character: > - /etc/newsyslog.conf.d/ > - /usr/local/etc/newsyslog.conf.d/ > > This matches the syslog.conf(5) functionality, and also prevents '.sample' or > '.pkgnew' files being included. This is important for ports which install files > in /usr/local/etc/newsyslog.conf.d/ and also for pkgbase. > > Approved by: eadler > Approved by: bapt > Relnotes: yes > Differential Revision: https://reviews.freebsd.org/D17086 This is going to cause people who are doing binary updates to 12.0 silent breakage in that any file not named by these rules well suddenly and silently be ignored when they update. My normal mode to disable files in directories of this nature is to create a off/ directory and mv the files to there rather than rename the file in place and depend on special rules like this to deal with it. If we need a palce for examples I would support a examples/ subdirectory for them, which would de-clutter the working directory in actual use at the same time. > > Modified: > head/usr.sbin/newsyslog/newsyslog.8 > head/usr.sbin/newsyslog/newsyslog.conf > > Modified: head/usr.sbin/newsyslog/newsyslog.8 > ============================================================================== > --- head/usr.sbin/newsyslog/newsyslog.8 Sat Nov 10 10:32:55 2018 (r340317) > +++ head/usr.sbin/newsyslog/newsyslog.8 Sat Nov 10 10:46:38 2018 (r340318) > @@ -17,7 +17,7 @@ > .\" the suitability of this software for any purpose. It is > .\" provided "as is" without express or implied warranty. > .\" > -.Dd July 19, 2018 > +.Dd November 10, 2018 > .Dt NEWSYSLOG 8 > .Os > .Sh NAME > @@ -268,10 +268,12 @@ will examine all files listed in the configuration fil > .Nm > configuration file > .It Pa /etc/newsyslog.conf.d > -Each file in this directory will be included by the default > +By default each file in this directory ending in '.conf' and not beginning with > +a '.' will be included by the default > .Pa newsyslog.conf . > .It Pa /usr/local/etc/newsyslog.conf.d > -Each file in this directory will be included by the default > +By default each file in this directory ending in '.conf' and not beginning with > +a '.' will be included by the default > .Pa newsyslog.conf . > .El > .Sh COMPATIBILITY > > Modified: head/usr.sbin/newsyslog/newsyslog.conf > ============================================================================== > --- head/usr.sbin/newsyslog/newsyslog.conf Sat Nov 10 10:32:55 2018 (r340317) > +++ head/usr.sbin/newsyslog/newsyslog.conf Sat Nov 10 10:46:38 2018 (r340318) > @@ -31,5 +31,5 @@ > /var/log/utx.log 644 3 * @01T05 B > /var/log/weekly.log 640 5 * $W6D0 JN > > - /etc/newsyslog.conf.d/* > - /usr/local/etc/newsyslog.conf.d/* > + /etc/newsyslog.conf.d/[!.]*.conf > + /usr/local/etc/newsyslog.conf.d/[!.]*.conf > > -- Rod Grimes rgrimes@freebsd.org