src/usr.sbin/pkg/pkg.c, branch release/13.1.0 FreeBSD source tree pkg: allow multiple add arguments again 2021-08-26T17:28:38+00:00 Kyle Evans kevans@FreeBSD.org 2021-02-18T03:41:53+00:00 48ac2697742ed4e0beed3f074af41b7a9e21b662 While pkg(7) add only handles a single 'add' argument, pkg-add(8) fully handles multiple arguments. Stop rejecting it, just turn off local-bootstrap mode and proceed to remote bootstrap if we need it. While we're here, check if the first argument to pkg add is even a pkg package. If it's not, also do remote bootstrap instead. Future work could improve this altogether by picking out a pkg package out of many and local bootstrap then pass the rest through to the newly installed pkg. (cherry picked from commit 40b9f924b189ce8fa871db600b4abc99b03c6a65) 
While pkg(7) add only handles a single 'add' argument, pkg-add(8) fully
handles multiple arguments.

Stop rejecting it, just turn off local-bootstrap mode and proceed to
remote bootstrap if we need it.

While we're here, check if the first argument to pkg add is even a pkg
package. If it's not, also do remote bootstrap instead. Future work
could improve this altogether by picking out a pkg package out of many
and local bootstrap then pass the rest through to the newly installed
pkg.

(cherry picked from commit 40b9f924b189ce8fa871db600b4abc99b03c6a65)
pkg(7): replace usage of sbuf(9) with open_memstream(3) 2021-05-05T07:50:02+00:00 Baptiste Daroussin bapt@FreeBSD.org 2021-04-27T02:38:55+00:00 63d098d8d8d6bb12e7e2652ebb338e526906d83a open_memstream(3) is a standard way to obtain the same feature we do get by using sbuf(9) (aka dynamic size buffer), switching to using it makes pkg(7) more portable, and reduces its number of dependencies. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D30005 (cherry picked from commit cc9a8a116d19daf224222506441e91a3d329160e) 
open_memstream(3) is a standard way to obtain the same feature we do get
by using sbuf(9) (aka dynamic size buffer), switching to using it makes
pkg(7) more portable, and reduces its number of dependencies.

Reviewed by:	manu
Differential Revision:	https://reviews.freebsd.org/D30005

(cherry picked from commit cc9a8a116d19daf224222506441e91a3d329160e)
pkg(7): when bootstrapping first search for pkg.pkg file then pkg.txz 2021-05-05T07:49:37+00:00 Baptiste Daroussin bapt@FreeBSD.org 2021-03-12T17:36:30+00:00 78ee2a028ec5f5e4fe3336d41967de8d521cfe60 The package extension is going to be changed to .pkg to be among other things resilient to the change of compression format used and reduce the impact of all third party tool of that change. Ensure the bootstrap knows about it Reviewed by: manu Differential revision: https://reviews.freebsd.org/D29232 (cherry picked from commit a2aac2f5e5642740507a3cadb98046f3dd434ce4) (cherry picked from commit c244b1d8a38731041d0f3ff4191192a85dd8608b) 
The package extension is going to be changed to .pkg to be among other
things resilient to the change of compression format used and reduce
the impact of all third party tool of that change.

Ensure the bootstrap knows about it

Reviewed by:	manu
Differential revision:	https://reviews.freebsd.org/D29232

(cherry picked from commit a2aac2f5e5642740507a3cadb98046f3dd434ce4)
(cherry picked from commit c244b1d8a38731041d0f3ff4191192a85dd8608b)
pkg(7): address minor nits (mostly clang-analyze complaints) 2021-02-20T19:29:46+00:00 Kyle Evans kevans@FreeBSD.org 2021-02-12T00:58:27+00:00 9ec09b04df17b3601e6f5ae8664c6ab81e1e4783 - One (1) spurious whitespace. - One (1) occurrence of "random(3) bad, arc4random(3)" good. - Three (3) writes that will never be seen. The latter two points are complaints from clang-analyze. Switching to arc4random(3) is decidedly a good idea because we weren't doing any kind of PRNG seeding anyways. The discarded assignments are arguably good for future-proofing, but it's better to improve the S/N ratio from clang-analyze. (cherry picked from commit b2c4ca8d2872bc4410626f2b1ceafa49de5828ce) 
- One (1) spurious whitespace.
- One (1) occurrence of "random(3) bad, arc4random(3)" good.
- Three (3) writes that will never be seen.

The latter two points are complaints from clang-analyze. Switching to
arc4random(3) is decidedly a good idea because we weren't doing any kind
of PRNG seeding anyways. The discarded assignments are arguably good
for future-proofing, but it's better to improve the S/N ratio from
clang-analyze.

(cherry picked from commit b2c4ca8d2872bc4410626f2b1ceafa49de5828ce)
pkg(7): add an -r reponame option for bootstrap and add 2021-02-20T19:29:30+00:00 Kyle Evans kevans@FreeBSD.org 2021-02-12T00:58:26+00:00 6cf4aaf763ca0fb35d77e00d1daede803038bbf0 This is limited to bootstrap/add because some real pkg(8) commands have -r flags with an incompatible meaning/usage, e.g., pkg-audit. pkg(7) will still commence the search as it has, but it will ignore any repo objects without the given name so that overrides and whatnot still work as expected. The use of it for add is noted in the manpage; notably, that the signature config for that repository will be used over global config if it's specified. i.e., pkg(7) should assume that the given pkg did come from that repository and treat it appropriately. (cherry picked from commit 18418e1936b59c34a9c4a02a1ba5fe0d00dde1b3) 
This is limited to bootstrap/add because some real pkg(8) commands
have -r flags with an incompatible meaning/usage, e.g., pkg-audit.
pkg(7) will still commence the search as it has, but it will ignore any
repo objects without the given name so that overrides and whatnot still
work as expected.

The use of it for add is noted in the manpage; notably, that the
signature config for that repository will be used over global config if
it's specified. i.e., pkg(7) should assume that the given pkg did come
from that repository and treat it appropriately.

(cherry picked from commit 18418e1936b59c34a9c4a02a1ba5fe0d00dde1b3)
pkg(7): rework the arguments handling 2021-01-06T10:47:34+00:00 Baptiste Daroussin bapt@FreeBSD.org 2021-01-06T10:35:22+00:00 ae994fdc5bd2ccc0ac0b8745fd1f1be67ad6e071 Rework the arguments handling around using getopt_long: * add long option support * add -4 and -6 support to enforce ipv4 or ipv6 While here fix a regression which occured between FreeBSD 12.1 and FreeBSD 12.2 where pkg bootstrap -y stopped working PR: 252270 MFC after: 2 weeks Submitted by: evilham <contact@evilham.com> Differential Revision: https://reviews.freebsd.org/D27860 
Rework the arguments handling around using getopt_long:
* add long option support
* add -4 and -6 support to enforce ipv4 or ipv6

While here fix a regression which occured between FreeBSD 12.1 and
FreeBSD 12.2 where pkg bootstrap -y stopped working

PR:		252270
MFC after:	2 weeks
Submitted by:	evilham <contact@evilham.com>
Differential Revision:	https://reviews.freebsd.org/D27860
Make use of the getlocalbase() function for run-time adjustment of the 2020-11-18T20:00:55+00:00 Stefan Eßer se@FreeBSD.org 2020-11-18T20:00:55+00:00 56d11d4a3749408b91751f2b1d7082167ae1814d local software base directory, as committed in SVN rev. 367813. The pkg and mailwrapper programs used the LOCALBASE environment variable for this purpose and this functionality is preserved by getlocalbase(). After this change, the value of the user.localbase sysctl variable is used if present (and not overridden in the environment). The nvmecontrol program gains support of a dynamic path to its plugin directory with this update. Differential Revision: https://reviews.freebsd.org/D27237 
local software base directory, as committed in SVN rev. 367813.

The pkg and mailwrapper programs used the LOCALBASE environment variable
for this purpose and this functionality is preserved by getlocalbase().

After this change, the value of the user.localbase sysctl variable is used
if present (and not overridden in the environment).

The nvmecontrol program gains support of a dynamic path to its plugin
directory with this update.

Differential Revision:	https://reviews.freebsd.org/D27237
Revert the whole getlocalbase() set of changes while a different design is 2020-11-15T20:24:59+00:00 Scott Long scottl@FreeBSD.org 2020-11-15T20:24:59+00:00 8e1031086d40b9bd3fa255d92cc45573e3afed16 hashed out. 
hashed out.
Fix the previous revision, it suffered from an incomplete change to the 2020-11-15T07:50:29+00:00 Scott Long scottl@FreeBSD.org 2020-11-15T07:50:29+00:00 1b249101df13bc8cd455a28d5eeb87730fe2c0ae getlocalbase API. Also don't erroneously subtract the lenth from the buffer a second time. 
getlocalbase API.  Also don't erroneously subtract the lenth from the
buffer a second time.
Replace hardcoded references to _PATH_LOCALBASE with calls to getlocalbase.3 2020-11-14T18:01:14+00:00 Scott Long scottl@FreeBSD.org 2020-11-14T18:01:14+00:00 7ca0d5403ede7308269e39f201fdd08cf5a3fe54 Reviewed by: imp, se 
Reviewed by:	imp, se