On Mon, Feb 27, 2017 at 02:53:11PM -0700, Robert Peichaer wrote:
> CVSROOT: /cvs
> Module name: src
> Changes by: r...@cvs.openbsd.org 2017/02/27 14:53:11
>
> Modified files:
> distrib/sets/lists/base: mi
> distrib/sets/lists/man: mi
> etc : Makefile changelist
> usr.sbin/pkg_add: Makefile pkg_add.1 pkg_create.1 pkg_delete.1
> pkg_info.1
> usr.sbin/pkg_add/OpenBSD: State.pm
> Removed files:
> etc/examples : pkg.conf
>
> Log message:
> Remove support for pkg.conf in light of the consolidation towards
> a single configuration file for the OpenBSD repository location.
>
> The pkg_* tools now use installurl(5) to find the package repository.
>
> NOTE:
> /etc/installurl only contains a single URL pointing to a mirror.
> Use the PKG_PATH environment variable to specify more than one
> package repository.
>
> prodded by and OK deraadt@ aja@
>
Hi,
It seems to me the diff is a bit ugly and/or partial and didn't
correspond fully to the commit message.
If I correctly understand the intent, it is to remove "installpath"
variable from pkg.conf(5) configuration file in favor of use of
installurl(5).
It seems to me the diff dropped the whole support of pkg.conf(5),
instead of just the variable "installpath".
pkg.conf(5) is also used for setting other variables:
- fullwidth
- loglevel
- nochecksum
- ntogo
But if the intent is to remove the whole support of pkg.conf (and not
just "installpath" variable), the commit is partial:
- the file pkg.conf in src/usr.sbin/pkg_add/ is still here, even if it
has been disconnected from build (no more in MAN5 variable in
Makefile). so it seems a "cvs rm" has been lost.
- the code needs more cleanup to remove the whole support of pkg.conf:
sub read_file (used to load pkg.conf) isn't required anymore,
neither sub pkgconf (only examples, I think more cleanup could be
need).
Finally, I don't see the need of removing "installpath" variable. I
have no problem with the use of installurl(5) as default value, but the
removing of "installpath" hit my use-case of setting two mirrors in
pkg.conf: a local mirror with only commonly used packages on my site and
an official one for others packages. The purpose was to avoid all hosts
on my side to download same packages without having to do a full mirror
for several archs. But I don't argue against it: I could live with
PKG_PATH environment variable in /etc/profile.
Thanks.
--
Sebastien Marie
