From owner-svn-src-all@freebsd.org Sun Oct 25 05:56:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 87DC6443ED1; Sun, 25 Oct 2020 05:56:36 +0000 (UTC) (envelope-from kozlov@ravenloft.kiev.ua) Received: from ravenloft.kiev.ua (ravenloft.kiev.ua [94.244.131.95]) (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 4CJnKH6FPxz4cfL; Sun, 25 Oct 2020 05:56:35 +0000 (UTC) (envelope-from kozlov@ravenloft.kiev.ua) Date: Sun, 25 Oct 2020 06:56:33 +0100 From: Alex Kozlov To: Stefan Esser Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r366962 - in head: include usr.bin/calendar Message-ID: <20201025055633.GA52119@ravenloft.kiev.ua> References: <202010230922.09N9MNZu040921@repo.freebsd.org> <20201024074840.GA26119@ravenloft.kiev.ua> <38d15142-1cb1-eb1f-215e-cee165743d99@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <38d15142-1cb1-eb1f-215e-cee165743d99@freebsd.org> X-Rspamd-Queue-Id: 4CJnKH6FPxz4cfL X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:34743, ipnet:94.244.128.0/18, country:UA] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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: Sun, 25 Oct 2020 05:56:36 -0000 On Sat, Oct 24, 2020 at 04:37:45PM +0200, Stefan Esser wrote: > Am 24.10.20 um 09:48 schrieb Alex Kozlov: > > On Fri, Oct 23, 2020 at 09:22:23AM +0000, Stefan Eßer wrote: > > > Author: se > > > Date: Fri Oct 23 09:22:23 2020 > > > New Revision: 366962 > > > URL: https://svnweb.freebsd.org/changeset/base/366962 > > > > > > Log: > > > Add search of LOCALBASE/share/calendar for calendars supplied by a port. > > > Calendar files in LOCALBASE override similarily named ones in the base > > > system. This could easily be changed if the base system calendars should > > > have precedence, but it could lead to a violation of POLA since then the > > > port's files were ignored unless those in base have been deleted. > > > There was no definition of _PATH_LOCALBASE in paths.h, but verbatim uses > > > of /usr/local existed for _PATH_DEFPATH. Use _PATH_LOCALBASE here to ease > > > a consistent modification of this prefix. > > You are hardcoding assumption that LOCALBASE = /usr/local. Please make it > > overridable with LOCALBASE environment variable. > This was a trivial change to get us going with calendars provided by > a port (which has not been committed, yet - therefore there are no > port-provided calendars, neither under /usr/local nor under any other > PREFIX, as of now). > I understand what you are asking for, but in such a case I'd rather > think you want to rebuild FreeBSD with _PATH_LOCALBASE modified in > paths.h. The PREFIX != LOCALBASE and both != /usr/local configurations are supported in the ports tree and the base for a long time, please see https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/porting-prefix.html If after this commit you need to rebuild base to use non-default LOCALBASE/PREFIX it is pretty big regression and POLA. > And I have made this a single instance that needs to be changed. > Before my change there were 2 instances of /usr/local hard-coded > in _PATH_DEFPATH - now you have to only change the definition of > _PATH_LOCALBASE to adjust all 3 locations that use it. I think you made situation worse, there were two stray hardcoded string and now there is official LOCALBASE define which likely will be used by other people in the future. > If you can show me precedence of a LOCALBASE environment variable > being used in the way you suggest, I'd be willing to make calendar > use it. Just an analogy from LOCALBASE make variable, perhaps CALENDAR_HOME is a better name. > But then I think a CALENDAR_HOME variable would be even more useful, > since it would allow to search an additional user selected directory > (and not just share/calendar within what you provide as LOCALBASE). > > Regards, STefan > > PS: If you are a source committer, you might even commit such a > change yourself. But I'd think it should be reviewed, and it > might be a good idea to wait until other changes (e.g. the > switch-over to port-supplied calendar files) have been worked > out. -- Alex