From owner-svn-src-all@freebsd.org Sat Oct 24 14:37:50 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 D697344B04D; Sat, 24 Oct 2020 14:37:50 +0000 (UTC) (envelope-from se@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CJNxB5GWnz4clv; Sat, 24 Oct 2020 14:37:50 +0000 (UTC) (envelope-from se@freebsd.org) Received: from Stefans-MBP-WLAN.fritz.box (p200300cd5f0bbc004c47393913af402f.dip0.t-ipconnect.de [IPv6:2003:cd:5f0b:bc00:4c47:3939:13af:402f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 533D72E4C8; Sat, 24 Oct 2020 14:37:49 +0000 (UTC) (envelope-from se@freebsd.org) To: Alex Kozlov Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202010230922.09N9MNZu040921@repo.freebsd.org> <20201024074840.GA26119@ravenloft.kiev.ua> From: Stefan Esser Subject: Re: svn commit: r366962 - in head: include usr.bin/calendar Message-ID: <38d15142-1cb1-eb1f-215e-cee165743d99@freebsd.org> Date: Sat, 24 Oct 2020 16:37:45 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20201024074840.GA26119@ravenloft.kiev.ua> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="fHaH3cJ3zPPd9xr0lIAiIUSwpkdFLo50F" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 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: Sat, 24 Oct 2020 14:37:50 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --fHaH3cJ3zPPd9xr0lIAiIUSwpkdFLo50F Content-Type: multipart/mixed; boundary="Rw4sLqNGgi2W0fdUSBodEXdolg8Ht94dq"; protected-headers="v1" From: Stefan Esser To: Alex Kozlov Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <38d15142-1cb1-eb1f-215e-cee165743d99@freebsd.org> Subject: Re: svn commit: r366962 - in head: include usr.bin/calendar References: <202010230922.09N9MNZu040921@repo.freebsd.org> <20201024074840.GA26119@ravenloft.kiev.ua> In-Reply-To: <20201024074840.GA26119@ravenloft.kiev.ua> --Rw4sLqNGgi2W0fdUSBodEXdolg8Ht94dq Content-Type: multipart/mixed; boundary="------------CE8C52AFC9DE309FF5D54B66" Content-Language: en-US This is a multi-part message in MIME format. --------------CE8C52AFC9DE309FF5D54B66 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: quoted-printable Am 24.10.20 um 09:48 schrieb Alex Kozlov: > On Fri, Oct 23, 2020 at 09:22:23AM +0000, Stefan E=DFer 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. >> =20 >> Calendar files in LOCALBASE override similarily named ones in the b= ase >> system. This could easily be changed if the base system calendars s= hould >> have precedence, but it could lead to a violation of POLA since the= n the >> port's files were ignored unless those in base have been deleted. >> =20 >> There was no definition of _PATH_LOCALBASE in paths.h, but verbatim= uses >> of /usr/local existed for _PATH_DEFPATH. Use _PATH_LOCALBASE here t= o ease >> a consistent modification of this prefix. > You are hardcoding assumption that LOCALBASE =3D /usr/local. Please mak= e 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. 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. 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. 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. --------------CE8C52AFC9DE309FF5D54B66-- --Rw4sLqNGgi2W0fdUSBodEXdolg8Ht94dq-- --fHaH3cJ3zPPd9xr0lIAiIUSwpkdFLo50F Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAl+UPDkFAwAAAAAACgkQR+u171r99UTM HAf+L4sJ1K0QWrPF6AJpgiO+bstSsffBLUwc+fVP9G/kvlLakKlb9nh+nk6Fd4U+gEZS4r6rksdy 5/hHDstiGZSlIwZLLOfAu1rzvZI/KFkovtcB8njxdgokA5xoZjInurb6x/DtudHOcRUCrisiNDvc ndkRwGoISB58lEtSJBdIQVV72TLuph9tnSK9dTQeh+vSwUwEYd4+mPsM6XxQU40jhXUolJsf2lM6 419kd6E21upbo7QwwS0jnAtHn1RplgRrHk0e0dIgmvbExMS3M8raFe0ywJ0qo/3VhlOx3QfYc0W0 1ApaZbWx/TJMCna4ZP2P7dVtRqn6a8V5m3wmURm2sQ== =jEFn -----END PGP SIGNATURE----- --fHaH3cJ3zPPd9xr0lIAiIUSwpkdFLo50F--