d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make pkg(7) use environment variables specified in pkg.conf

Browse Source 
Modify /usr/sbin/pkg to use environment variables specified in pkg.conf.
This allows control over underlying libraries like fetch(3), which can
be configured by setting HTTP_PROXY.

MFC after:		1 week
Differential Revision:	https://reviews.freebsd.org/D29820
This commit is contained in:
Moritz Schmitt 2021-04-27 03:59:12 +02:00 committed by Baptiste Daroussin
parent 689724cb23
commit e869d3c601
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
usr.sbin/pkg/config.c
View File

@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include <paths.h>
#include <stdbool.h>
#include <unistd.h>
#include <ctype.h>
#include "config.h"
@ -134,6 +135,15 @@ static struct config_entry c[] = {
NULL,
false,
false
},
[PKG_ENV] = {
PKG_CONFIG_OBJECT,
"PKG_ENV",
NULL,
NULL,
NULL,
false,
false,
}
};
@ -205,11 +215,11 @@ static void
config_parse(const ucl_object_t *obj, pkg_conf_file_t conftype)
{
struct sbuf *buf = sbuf_new_auto();
const ucl_object_t *cur, *seq;
ucl_object_iter_t it = NULL, itseq = NULL;
const ucl_object_t *cur, *seq, *tmp;
ucl_object_iter_t it = NULL, itseq = NULL, it_obj = NULL;
struct config_entry *temp_config;
struct config_value *cv;
const char *key;
const char *key, *evkey;
int i;
size_t j;
@ -224,7 +234,7 @@ config_parse(const ucl_object_t *obj, pkg_conf_file_t conftype)
if (conftype == CONFFILE_PKG) {
for (j = 0; j < strlen(key); ++j)
sbuf_putc(buf, key[j]);
sbuf_putc(buf, toupper(key[j]));
sbuf_finish(buf);
} else if (conftype == CONFFILE_REPO) {
if (strcasecmp(key, "url") == 0)
@ -285,6 +295,17 @@ config_parse(const ucl_object_t *obj, pkg_conf_file_t conftype)
temp_config[i].value =
strdup(ucl_object_toboolean(cur) ? "yes" : "no");
break;
case PKG_CONFIG_OBJECT:
if (strcmp(c[i].key, "PKG_ENV") == 0) {
while ((tmp =
ucl_iterate_object(cur, &it_obj, true))) {
evkey = ucl_object_key(tmp);
if (evkey != NULL && *evkey != '\0') {
setenv(evkey, ucl_object_tostring_forced(tmp), 1);
}
}
}
break;
default:
/* Normal string value. */
temp_config[i].value = strdup(ucl_object_tostring(cur));

2
usr.sbin/pkg/config.h
View File

@ -44,6 +44,7 @@ typedef enum {
FINGERPRINTS,
REPOS_DIR,
PUBKEY,
PKG_ENV,
CONFIG_SIZE
} pkg_config_key;
@ -51,6 +52,7 @@ typedef enum {
PKG_CONFIG_STRING=0,
PKG_CONFIG_BOOL,
PKG_CONFIG_LIST,
PKG_CONFIG_OBJECT
} pkg_config_t;
typedef enum {