Skip to content

Pacman 7.1 #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jelly wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pacman 7.1 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f0f9c0
pacutils: pacman 7.1 compatibility
jelly Dec 3, 2025
92ee7ce
Support new DisableSandbox configuration options
jelly Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion lib/pacutils/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ struct _pu_config_setting {
{"ParallelDownloads", PU_CONFIG_OPTION_PARALLELDOWNLOADS},

{"DisableSandbox", PU_CONFIG_OPTION_DISABLESANDBOX},
{"DisableSandboxFilesystem", PU_CONFIG_OPTION_DISABLESANDBOX_FILESYSTEM},
{"DisableSandboxSyscalls", PU_CONFIG_OPTION_DISABLESANDBOX_SYSCALLS},
{"DownloadUser", PU_CONFIG_OPTION_DOWNLOADUSER},

{"SigLevel", PU_CONFIG_OPTION_SIGLEVEL},
Expand Down Expand Up @@ -267,6 +269,8 @@ pu_config_t *pu_config_new(void) {
config->noprogressbar = PU_CONFIG_BOOL_UNSET;
config->disabledownloadtimeout = PU_CONFIG_BOOL_UNSET;
config->disablesandbox = PU_CONFIG_BOOL_UNSET;
config->disablesandbox_filesystem = PU_CONFIG_BOOL_UNSET;
config->disablesandbox_syscalls = PU_CONFIG_BOOL_UNSET;
config->ilovecandy = PU_CONFIG_BOOL_UNSET;
config->usesyslog = PU_CONFIG_BOOL_UNSET;
config->verbosepkglists = PU_CONFIG_BOOL_UNSET;
Expand Down Expand Up @@ -391,7 +395,13 @@ alpm_handle_t *pu_initialize_handle_from_config(pu_config_t *config) {
alpm_option_set_architectures(handle, config->architectures);
alpm_option_set_disable_dl_timeout(handle, config->disabledownloadtimeout);

alpm_option_set_disable_sandbox(handle, config->disablesandbox);
if (config->disablesandbox) {
alpm_option_set_disable_sandbox_filesystem(handle, config->disablesandbox);
alpm_option_set_disable_sandbox_syscalls(handle, config->disablesandbox);
} else {
alpm_option_set_disable_sandbox_filesystem(handle, config->disablesandbox_filesystem);
alpm_option_set_disable_sandbox_syscalls(handle, config->disablesandbox_syscalls);
}
alpm_option_set_sandboxuser(handle, config->downloaduser);

alpm_option_set_default_siglevel(handle, config->siglevel);
Expand Down Expand Up @@ -525,6 +535,8 @@ int pu_config_resolve(pu_config_t *config) {
SETBOOL(config->noprogressbar);
SETBOOL(config->disabledownloadtimeout);
SETBOOL(config->disablesandbox);
SETBOOL(config->disablesandbox_filesystem);
SETBOOL(config->disablesandbox_syscalls);
SETBOOL(config->ilovecandy);
SETBOOL(config->usesyslog);
SETBOOL(config->verbosepkglists);
Expand Down Expand Up @@ -570,6 +582,8 @@ void pu_config_merge(pu_config_t *dest, pu_config_t *src) {
MERGEBOOL(dest->ilovecandy, src->ilovecandy);
MERGEBOOL(dest->disabledownloadtimeout, src->disabledownloadtimeout);
MERGEBOOL(dest->disablesandbox, src->disablesandbox);
MERGEBOOL(dest->disablesandbox_filesystem, src->disablesandbox_filesystem);
MERGEBOOL(dest->disablesandbox_syscalls, src->disablesandbox_syscalls);

MERGEVAL(dest->cleanmethod, src->cleanmethod);
MERGEVAL(dest->paralleldownloads, src->paralleldownloads);
Expand Down Expand Up @@ -903,6 +917,12 @@ int pu_config_reader_next(pu_config_reader_t *reader) {
case PU_CONFIG_OPTION_DISABLESANDBOX:
config->disablesandbox = 1;
break;
case PU_CONFIG_OPTION_DISABLESANDBOX_SYSCALLS:
config->disablesandbox_syscalls = 1;
break;
case PU_CONFIG_OPTION_DISABLESANDBOX_FILESYSTEM:
config->disablesandbox_filesystem = 1;
break;
default:
reader->status = PU_CONFIG_READER_STATUS_UNKNOWN_OPTION;
break;
Expand Down
4 changes: 4 additions & 0 deletions lib/pacutils/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ typedef enum pu_config_option_t {

PU_CONFIG_OPTION_DOWNLOADUSER,
PU_CONFIG_OPTION_DISABLESANDBOX,
PU_CONFIG_OPTION_DISABLESANDBOX_FILESYSTEM,
PU_CONFIG_OPTION_DISABLESANDBOX_SYSCALLS,

PU_CONFIG_OPTION_INCLUDE
} pu_config_option_t;
Expand Down Expand Up @@ -97,6 +99,8 @@ typedef struct pu_config_t {
pu_config_bool_t verbosepkglists;
pu_config_bool_t disabledownloadtimeout;
pu_config_bool_t disablesandbox;
pu_config_bool_t disablesandbox_filesystem;
pu_config_bool_t disablesandbox_syscalls;

int siglevel;
int localfilesiglevel;
Expand Down
6 changes: 6 additions & 0 deletions src/pacconf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,8 @@ void dump_options(void) {
show_str("XferCommand", config->xfercommand);
show_str("DownloadUser", config->downloaduser);
show_bool("DisableSandbox", config->disablesandbox);
show_bool("DisableSandboxFilesystem", config->disablesandbox_filesystem);
show_bool("DisableSandboxSyscalls", config->disablesandbox_syscalls);

show_bool("UseSyslog", config->usesyslog);
show_bool("Color", config->color);
Expand Down Expand Up @@ -436,6 +438,10 @@ int list_directives(alpm_list_t *directives) {
show_bool("DisableDownloadTimeout", config->disabledownloadtimeout);
} else if (strcasecmp(i->data, "DisableSandbox") == 0) {
show_bool("DisableSandbox", config->disablesandbox);
} else if (strcasecmp(i->data, "DisableSandboxFilesystem") == 0) {
show_bool("DisableSandboxFilesystem", config->disablesandbox_filesystem);
} else if (strcasecmp(i->data, "DisableSandboxSyscalls") == 0) {
show_bool("DisableSandboxSyscalls", config->disablesandbox_syscalls);

} else if (strcasecmp(i->data, "CleanMethod") == 0) {
show_cleanmethod("CleanMethod", config->cleanmethod);
Expand Down