- Pacman-dev - lists.archlinux.org

[pacman-dev] WIP: makepkg: add BLAKE3 (b3sums) support
by Konstantin Gizdov 03 Sep '21

03 Sep '21

Hi all, This is work in progress, but I did some basic tests and seems to work. Since we have b2sums support in makepkg, I was wondering if we could also add b3sums (https://github.com/BLAKE3-team/BLAKE3) It's been finalised recently and has a working package in [community] repo. It's not in coreutils and probably can't easily handle dependencies for pacman at the moment but the b3sums algo is solid and maybe worth adding if people want to use it in the future. -- Regards, Konstantin

2 1

[pacman-dev] [PATCH] Add optional sandboxing when downloading files
by Remi Gacogne 27 Aug '21

27 Aug '21

Hi all, I would like to get some feedback on a optional sandboxing feature I would like to implement in pacman. The gist of it is to use a separate process for some sensitive operations, like downloading files, and to restrict the privileges of that process to reduce the risk of an exploitable bug turning into a code execution with full root privileges. I'm not too worried about the pacman code itself, but downloading files over the internet involves parsing HTTP payloads, as well as parsing X.509 certificates and doing cryptographic operations when HTTPS is used, which is more error-prone. For what it's worth, Debian's APT has similar options hidden behind the APT::Sandbox::Seccomp and APT::Sandbox::User parameters. The attached patch is clearly not in a finished state, but provides more details about the kind of changes needed to support this new feature. In a nutshell, what it currently does is that if the UseSandbox option is not set nothing changes. Otherwise internal and external downloads trigger the spawning of a new process, via fork(), whose result is communicated to the main process via a pipe, as is already done today for external downloads. Then: - If available, PR_SET_NO_NEW_PRIVS is called to ensure that the downloader will not be able to gain new privileges in the future, for example by executing a set-uid program. - If pacman has been built with libseccomp support and the kernel supports it, a list of system calls that are clearly of no use to a regular process downloading files is denied via a seccomp filter. That list is currently hard-coded but it would make more sense to make it configurable. - If the SandboxUser option is set to a valid user, the downloader process switches to that user via setgid, setgroups and setuid, dropping root privileges. This part requires making the download folder owned by that user. - If pacman has been built with libcap support and the downloader process still has privileged capabilities at this point, these are dropped. - If pacman has been built with landlock support (requires an updated linux-api-headers, >= 5.13) and the kernel supports it, the whole filesystem is set read-only with the exception of /tmp and DBPath. The list of writable paths is currently hard-coded but it would make sense to make it configurable as well. Any feedback will be welcome. Please be aware that I tried to keep the new code in line with the coding style and contributing guidelines but I'm not familiar with pacman's source code so I'm sure I did not do everything the right way, and that this code can be improved. What I would like to know first is whether there is any interest in that feature, then to get feedback about the "big picture" part of the design. If there is indeed interest and my approach is somewhat sane, then I can work on making the code less ugly, write the much needed documentation for the new feature and related options, and improve the logging of errors. Thanks! Remi Signed-off-by: Remi Gacogne <rgacogne(a)archlinux.org> --- lib/libalpm/alpm.h | 10 ++ lib/libalpm/alpm_sandbox.c | 341 +++++++++++++++++++++++++++++++++++++ lib/libalpm/alpm_sandbox.h | 31 ++++ lib/libalpm/dload.c | 83 ++++++++- lib/libalpm/handle.c | 20 +++ lib/libalpm/handle.h | 2 + lib/libalpm/meson.build | 1 + meson.build | 11 +- src/pacman/conf.c | 23 ++- src/pacman/conf.h | 2 + src/pacman/pacman-conf.c | 6 + 11 files changed, 526 insertions(+), 4 deletions(-) create mode 100644 lib/libalpm/alpm_sandbox.c create mode 100644 lib/libalpm/alpm_sandbox.h diff --git lib/libalpm/alpm.h lib/libalpm/alpm.h index a5f4a6ae..f414d811 100644 --- lib/libalpm/alpm.h +++ lib/libalpm/alpm.h @@ -1837,6 +1837,11 @@ int alpm_option_set_gpgdir(alpm_handle_t *handle, const char *gpgdir); /* End of gpdir accessors */ /** @} */ +/** Sets the user to switch to for sensitive operations like downloading a file. + * @param handle the context handle + * @param sandboxuser the user to set + */ +int alpm_option_set_sandboxuser(alpm_handle_t *handle, const char *sandboxuser); /** @name Accessors for use syslog * @@ -1859,6 +1864,11 @@ int alpm_option_set_usesyslog(alpm_handle_t *handle, int usesyslog); /* End of usesyslog accessors */ /** @} */ +/** Sets whether to use sandboxing for sensitive operations like downloading a file (0 is FALSE, TRUE otherwise). + * @param handle the context handle + * @param usesandbox whether to use the sandboxing (0 is FALSE, TRUE otherwise) + */ +int alpm_option_set_usesandbox(alpm_handle_t *handle, int usesandbox); /** @name Accessors to the list of no-upgrade files. * These functions modify the list of files which should diff --git lib/libalpm/alpm_sandbox.c lib/libalpm/alpm_sandbox.c new file mode 100644 index 00000000..29f46d58 --- /dev/null +++ lib/libalpm/alpm_sandbox.c @@ -0,0 +1,341 @@ +/* + * sandbox.c + * + * Copyright (c) 2021 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <errno.h> +#include <fcntl.h> +#include <grp.h> +#include <pwd.h> +#include <sys/capability.h> +#include <sys/syscall.h> +#include <sys/types.h> +#include <unistd.h> + +#ifdef HAVE_LINUX_LANDLOCK_H +# include <linux/landlock.h> +# include <sys/prctl.h> +# include <sys/syscall.h> +#endif /* HAVE_LINUX_LANDLOCK_H */ + +#ifdef HAVE_LIBSECCOMP +# include <seccomp.h> +#endif /* HAVE_LIBSECCOMP */ + +#include "alpm_sandbox.h" + +#ifdef HAVE_LINUX_LANDLOCK_H +#ifndef landlock_create_ruleset +static inline int landlock_create_ruleset(const struct landlock_ruleset_attr *const attr, + const size_t size, const __u32 flags) +{ + return syscall(__NR_landlock_create_ruleset, attr, size, flags); +} +#endif /* landlock_create_ruleset */ + +#ifndef landlock_add_rule +static inline int landlock_add_rule(const int ruleset_fd, + const enum landlock_rule_type rule_type, + const void *const rule_attr, const __u32 flags) +{ + return syscall(__NR_landlock_add_rule, ruleset_fd, rule_type, rule_attr, flags); +} +#endif /* landlock_add_rule */ + +#ifndef landlock_restrict_self +static inline int landlock_restrict_self(const int ruleset_fd, const __u32 flags) +{ + return syscall(__NR_landlock_restrict_self, ruleset_fd, flags); +} +#endif /* landlock_restrict_self */ + +#define _LANDLOCK_ACCESS_FS_WRITE ( \ + LANDLOCK_ACCESS_FS_WRITE_FILE | \ + LANDLOCK_ACCESS_FS_REMOVE_DIR | \ + LANDLOCK_ACCESS_FS_REMOVE_FILE | \ + LANDLOCK_ACCESS_FS_MAKE_CHAR | \ + LANDLOCK_ACCESS_FS_MAKE_DIR | \ + LANDLOCK_ACCESS_FS_MAKE_REG | \ + LANDLOCK_ACCESS_FS_MAKE_SOCK | \ + LANDLOCK_ACCESS_FS_MAKE_FIFO | \ + LANDLOCK_ACCESS_FS_MAKE_BLOCK | \ + LANDLOCK_ACCESS_FS_MAKE_SYM) + +#define _LANDLOCK_ACCESS_FS_READ ( \ + LANDLOCK_ACCESS_FS_READ_FILE | \ + LANDLOCK_ACCESS_FS_READ_DIR) + +static int sandbox_write_only_beneath_cwd(void) +{ + const struct landlock_ruleset_attr ruleset_attr = { + .handled_access_fs = \ + _LANDLOCK_ACCESS_FS_READ | \ + _LANDLOCK_ACCESS_FS_WRITE | \ + LANDLOCK_ACCESS_FS_EXECUTE, + }; + struct landlock_path_beneath_attr path_beneath = { + .allowed_access = _LANDLOCK_ACCESS_FS_WRITE, + }; + int result = 0; + int ruleset_fd; + + ruleset_fd = landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr), 0); + if(ruleset_fd < 0) { + return ruleset_fd; + } + + /* allow / as read-only */ + path_beneath.parent_fd = open("/", O_PATH | O_CLOEXEC | O_DIRECTORY); + path_beneath.allowed_access = _LANDLOCK_ACCESS_FS_READ | LANDLOCK_ACCESS_FS_EXECUTE; + + if(landlock_add_rule(ruleset_fd, LANDLOCK_RULE_PATH_BENEATH, &path_beneath, 0)) { + result = errno; + } + + close(path_beneath.parent_fd); + + if(result == 0) { + /* allow the current working directory as read-write */ + path_beneath.parent_fd = open(".", O_PATH | O_CLOEXEC | O_DIRECTORY); + path_beneath.allowed_access = _LANDLOCK_ACCESS_FS_READ | _LANDLOCK_ACCESS_FS_WRITE | LANDLOCK_ACCESS_FS_EXECUTE; + + if(!landlock_add_rule(ruleset_fd, LANDLOCK_RULE_PATH_BENEATH, &path_beneath, 0)) { + if(landlock_restrict_self(ruleset_fd, 0)) { + result = errno; + } + } else { + result = errno; + } + + close(path_beneath.parent_fd); + + if(result == 0) { + /* allow /tmp as well */ + path_beneath.parent_fd = open("/tmp", O_PATH | O_CLOEXEC | O_DIRECTORY); + path_beneath.allowed_access = _LANDLOCK_ACCESS_FS_READ | _LANDLOCK_ACCESS_FS_WRITE | LANDLOCK_ACCESS_FS_EXECUTE; + + if(!landlock_add_rule(ruleset_fd, LANDLOCK_RULE_PATH_BENEATH, &path_beneath, 0)) { + if(landlock_restrict_self(ruleset_fd, 0)) { + result = errno; + } + } else { + result = errno; + } + + close(path_beneath.parent_fd); + } + } + + close(ruleset_fd); + return result; +} +#endif /* HAVE_LINUX_LANDLOCK_H */ + +#ifdef HAVE_LIBSECCOMP + +static int sandbox_filter_syscalls(void) +{ + int ret = 0; + /* see https://docs.docker.com/engine/security/seccomp/ for inspiration, + as well as systemd's src/shared/seccomp-util.c */ + const char* denied_syscalls[] = { + /* kernel modules */ + "delete_module", + "finit_module", + "init_module", + /* mount */ + "chroot", + "fsconfig", + "fsmount", + "fsopen", + "fspick", + "mount", + "move_mount", + "open_tree", + "pivot_root", + "umount", + "umount2", + /* keyring */ + "add_key", + "keyctl", + "request_key", + /* CPU emulation */ + "modify_ldt", + "subpage_prot", + "switch_endian", + "vm86", + "vm86old", + /* debug */ + "kcmp", + "lookup_dcookie", + "perf_event_open", + "ptrace", + "rtas", + "sys_debug_setcontext", + /* set clock */ + "adjtimex", + "clock_adjtime", + "clock_adjtime64", + "clock_settime", + "clock_settime64", + "settimeofday", + /* raw IO */ + "ioperm", + "iopl", + "pciconfig_iobase", + "pciconfig_read", + "pciconfig_write", + /* kexec */ + "kexec_file_load", + "kexec_load", + /* reboot */ + "reboot", + /* privileged */ + "acct", + "bpf", + "personality", + /* obsolete */ + "_sysctl", + "afs_syscall", + "bdflush", + "break", + "create_module", + "ftime", + "get_kernel_syms", + "getpmsg", + "gtty", + "idle", + "lock", + "mpx", + "prof", + "profil", + "putpmsg", + "query_module", + "security", + "sgetmask", + "ssetmask", + "stime", + "stty", + "sysfs", + "tuxcall", + "ulimit", + "uselib", + "ustat", + "vserver", + /* swap */ + "swapon", + "swapoff", + }; + /* allow all syscalls that are not listed */ + size_t idx; + scmp_filter_ctx ctx = seccomp_init(SCMP_ACT_ALLOW); + if(ctx == NULL) { + return errno; + } + + for(idx = 0; idx < sizeof(denied_syscalls) / sizeof(*denied_syscalls); idx++) { + int syscall = seccomp_syscall_resolve_name(denied_syscalls[idx]); + if(syscall != __NR_SCMP_ERROR) { + if(seccomp_rule_add(ctx, SCMP_ACT_ERRNO(EPERM), syscall, 0) != 0) { + /* Do not fail but log something like: _("Error blocking syscall %s\n"), denied_syscalls[idx]); */ + } + } + } + + if(seccomp_load(ctx) != 0) { + ret = errno; + } + + seccomp_release(ctx); + return ret; +} +#endif /* HAVE_LIBSECCOMP */ + +static int switch_to_user(const char *user) +{ + struct passwd const *pw = NULL; + if(getuid() != 0) { + return 1; + } + pw = getpwnam(user); + if(pw == NULL) { + return errno; + } + if(setgid(pw->pw_gid) != 0) { + return errno; + } + if(setgroups(0, NULL)) { + return errno; + } + if(setuid(pw->pw_uid) != 0) { + return errno; + } + return 0; +} + +/* check exported library symbols with: nm -C -D <lib> */ +#define SYMEXPORT __attribute__((visibility("default"))) + +int SYMEXPORT alpm_sandbox_child(const char* sandboxuser) +{ + int result = 0; +#ifdef HAVE_LINUX_LANDLOCK_H + int ret = 0; +#endif/* HAVE_LINUX_LANDLOCK_H */ + + /* make sure that we cannot gain more privileges later */ + if(prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) != 0) { + result = errno; + } + +#ifdef HAVE_LIBSECCOMP + result = sandbox_filter_syscalls(); +#endif /* HAVE_LIBSECCOMP */ + + if(sandboxuser != NULL) { + result = switch_to_user(sandboxuser); + } + +#ifdef HAVE_LIBCAP + /* we might have some capabilities remaining, + * especially if sandboxuser is not set */ + cap_t caps = cap_get_proc(); + cap_clear(caps); + if(cap_set_mode(CAP_MODE_NOPRIV) != 0) { + cap_free(caps); + if(result == 0) { + result = errno; + } + } + if(cap_set_proc(caps) != 0) { + cap_free(caps); + if(result == 0) { + result = errno; + } + } + cap_free(caps); +#endif /* HAVE_LIBCAP */ + +#ifdef HAVE_LINUX_LANDLOCK_H + ret = sandbox_write_only_beneath_cwd(); + if(result == 0) { + result = ret; + } +#endif /* HAVE_LINUX_LANDLOCK_H */ + + return result; +} diff --git lib/libalpm/alpm_sandbox.h lib/libalpm/alpm_sandbox.h new file mode 100644 index 00000000..47611575 --- /dev/null +++ lib/libalpm/alpm_sandbox.h @@ -0,0 +1,31 @@ +/* + * sandbox.h + * + * Copyright (c) 2021 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef ALPM_SANDBOX_H +#define ALPM_SANDBOX_H + +#ifdef __cplusplus +extern "C" { +#endif + +int alpm_sandbox_child(const char *sandboxuser); + +#ifdef __cplusplus +} +#endif +#endif /* ALPM_SANDBOX_H */ diff --git lib/libalpm/dload.c lib/libalpm/dload.c index ca6be7b6..6bb06b4c 100644 --- lib/libalpm/dload.c +++ lib/libalpm/dload.c @@ -28,6 +28,7 @@ #include <sys/time.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/wait.h> #include <signal.h> #ifdef HAVE_NETINET_IN_H @@ -44,6 +45,7 @@ /* libalpm */ #include "dload.h" #include "alpm_list.h" +#include "alpm_sandbox.h" #include "alpm.h" #include "log.h" #include "util.h" @@ -898,6 +900,81 @@ static int curl_download_internal(alpm_handle_t *handle, #endif +static int curl_download_internal_sandboxed(alpm_handle_t *handle, + alpm_list_t *payloads /* struct dload_payload */, + const char *localpath) +{ + int pid, err = 0, ret = -1, err_fd[2]; + sigset_t oldblock; + struct sigaction sa_ign = { .sa_handler = SIG_IGN }, oldint, oldquit; + + if(pipe(err_fd) != 0) { + return -1; + } + + sigaction(SIGINT, &sa_ign, &oldint); + sigaction(SIGQUIT, &sa_ign, &oldquit); + sigaddset(&sa_ign.sa_mask, SIGCHLD); + sigprocmask(SIG_BLOCK, &sa_ign.sa_mask, &oldblock); + + pid = fork(); + + /* child */ + if(pid == 0) { + close(err_fd[0]); + fcntl(err_fd[1], F_SETFD, FD_CLOEXEC); + + /* restore signal handling for the child to inherit */ + sigaction(SIGINT, &oldint, NULL); + sigaction(SIGQUIT, &oldquit, NULL); + sigprocmask(SIG_SETMASK, &oldblock, NULL); + + /* cwd to the download directory */ + ret = chdir(localpath); + if(ret != 0) { + _alpm_log(handle, ALPM_LOG_WARNING, _("could not chdir to download directory %s\n"), localpath); + ret = -1; + } else { + ret = alpm_sandbox_child(handle->sandboxuser); + if (ret != 0) { + _alpm_log(handle, ALPM_LOG_WARNING, _("sandboxing failed!\n")); + } + + ret = curl_download_internal(handle, payloads, localpath); + } + + /* pass the result back to the parent */ + while(write(err_fd[1], &ret, sizeof(ret)) == -1 && errno == EINTR); + _Exit(ret < 0 ? 1 : 0); + } + + /* parent */ + close(err_fd[1]); + + if(pid != -1) { + int wret; + while((wret = waitpid(pid, &ret, 0)) == -1 && errno == EINTR); + if(wret > 0) { + while(read(err_fd[0], &ret, sizeof(ret)) == -1 && errno == EINTR); + } + } else { + /* fork failed, make sure errno is preserved after cleanup */ + err = errno; + } + + close(err_fd[0]); + + sigaction(SIGINT, &oldint, NULL); + sigaction(SIGQUIT, &oldquit, NULL); + sigprocmask(SIG_SETMASK, &oldblock, NULL); + + if(err) { + errno = err; + ret = -1; + } + return ret; +} + /* Returns -1 if an error happened for a required file * Returns 0 if a payload was actually downloaded * Returns 1 if no files were downloaded and all errors were non-fatal @@ -908,7 +985,11 @@ int _alpm_download(alpm_handle_t *handle, { if(handle->fetchcb == NULL) { #ifdef HAVE_LIBCURL - return curl_download_internal(handle, payloads, localpath); + if(handle->usesandbox) { + return curl_download_internal_sandboxed(handle, payloads, localpath); + } else { + return curl_download_internal(handle, payloads, localpath); + } #else RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); #endif diff --git lib/libalpm/handle.c lib/libalpm/handle.c index e6b683cb..10ae44b2 100644 --- lib/libalpm/handle.c +++ lib/libalpm/handle.c @@ -573,6 +573,19 @@ int SYMEXPORT alpm_option_set_gpgdir(alpm_handle_t *handle, const char *gpgdir) return 0; } +int SYMEXPORT alpm_option_set_sandboxuser(alpm_handle_t *handle, const char *sandboxuser) +{ + CHECK_HANDLE(handle, return -1); + if(handle->sandboxuser) { + FREE(handle->sandboxuser); + } + + STRDUP(handle->sandboxuser, sandboxuser, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + + _alpm_log(handle, ALPM_LOG_DEBUG, "option 'sandboxuser' = %s\n", handle->sandboxuser); + return 0; +} + int SYMEXPORT alpm_option_set_usesyslog(alpm_handle_t *handle, int usesyslog) { CHECK_HANDLE(handle, return -1); @@ -580,6 +593,13 @@ int SYMEXPORT alpm_option_set_usesyslog(alpm_handle_t *handle, int usesyslog) return 0; } +int SYMEXPORT alpm_option_set_usesandbox(alpm_handle_t *handle, int usesandbox) +{ + CHECK_HANDLE(handle, return -1); + handle->usesandbox = usesandbox; + return 0; +} + static int _alpm_option_strlist_add(alpm_handle_t *handle, alpm_list_t **list, const char *str) { char *dup; diff --git lib/libalpm/handle.h lib/libalpm/handle.h index b1526c67..43550833 100644 --- lib/libalpm/handle.h +++ lib/libalpm/handle.h @@ -90,6 +90,7 @@ struct __alpm_handle_t { char *logfile; /* Name of the log file */ char *lockfile; /* Name of the lock file */ char *gpgdir; /* Directory where GnuPG files are stored */ + char *sandboxuser; /* User to switch to for sensitive operations like downloading files */ alpm_list_t *cachedirs; /* Paths to pacman cache directories */ alpm_list_t *hookdirs; /* Paths to hook directories */ alpm_list_t *overwrite_files; /* Paths that may be overwritten */ @@ -104,6 +105,7 @@ struct __alpm_handle_t { /* options */ alpm_list_t *architectures; /* Architectures of packages we should allow */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ + int usesandbox; /* Whether to enable sandboxing for sensitive operations like downloading files */ int checkspace; /* Check disk space before installing */ char *dbext; /* Sync DB extension */ int siglevel; /* Default signature verification level */ diff --git lib/libalpm/meson.build lib/libalpm/meson.build index 607e91a3..c36ae516 100644 --- lib/libalpm/meson.build +++ lib/libalpm/meson.build @@ -2,6 +2,7 @@ libalpm_sources = files(''' add.h add.c alpm.h alpm.c alpm_list.h alpm_list.c + alpm_sandbox.h alpm_sandbox.c backup.h backup.c base64.h base64.c be_local.c diff --git meson.build meson.build index 26c92b8e..88f0e3a1 100644 --- meson.build +++ meson.build @@ -91,6 +91,10 @@ libarchive = dependency('libarchive', version : '>=3.0.0', static : get_option('buildstatic')) +libcap = dependency('libcap', + static : get_option('buildstatic')) +conf.set('HAVE_LIBCAP', libcap.found()) + libcurl = dependency('libcurl', version : '>=7.55.0', required : get_option('curl'), @@ -120,7 +124,12 @@ else error('unhandled crypto value @0@'.format(want_crypto)) endif +libseccomp = dependency('libseccomp', + static : get_option('buildstatic')) +conf.set('HAVE_LIBSECCOMP', libseccomp.found()) + foreach header : [ + 'linux/landlock.h', 'mntent.h', 'sys/mnttab.h', 'sys/mount.h', @@ -305,7 +314,7 @@ libcommon = static_library( gnu_symbol_visibility : 'hidden', install : false) -alpm_deps = [crypto_provider, libarchive, libcurl, libintl, gpgme] +alpm_deps = [crypto_provider, libarchive, libcap, libcurl, libintl, libseccomp, gpgme] libalpm_a = static_library( 'alpm_objlib', diff --git src/pacman/conf.c src/pacman/conf.c index 12fee64c..9480a492 100644 --- src/pacman/conf.c +++ src/pacman/conf.c @@ -33,6 +33,8 @@ #include <unistd.h> #include <signal.h> +#include <alpm_sandbox.h> + /* pacman */ #include "conf.h" #include "ini.h" @@ -215,7 +217,7 @@ static char *get_tempfile(const char *path, const char *filename) * - not thread-safe * - errno may be set by fork(), pipe(), or execvp() */ -static int systemvp(const char *file, char *const argv[]) +static int systemvp(const char *file, char *const argv[], bool sandbox, const char *sandboxuser) { int pid, err = 0, ret = -1, err_fd[2]; sigset_t oldblock; @@ -242,6 +244,13 @@ static int systemvp(const char *file, char *const argv[]) sigaction(SIGQUIT, &oldquit, NULL); sigprocmask(SIG_SETMASK, &oldblock, NULL); + if (sandbox) { + ret = alpm_sandbox_child(sandboxuser); + if (ret != 0) { + pm_printf(ALPM_LOG_WARNING, _("sandboxing failed!\n")); + } + } + execvp(file, argv); /* execvp failed, pass the error back to the parent */ @@ -352,7 +361,7 @@ static int download_with_xfercommand(void *ctx, const char *url, free(cmd); } } - retval = systemvp(argv[0], (char**)argv); + retval = systemvp(argv[0], (char**)argv, config->usesandbox, config->sandboxuser); if(retval == -1) { pm_printf(ALPM_LOG_WARNING, _("running XferCommand: fork failed!\n")); @@ -601,6 +610,9 @@ static int _parse_options(const char *key, char *value, if(strcmp(key, "UseSyslog") == 0) { config->usesyslog = 1; pm_printf(ALPM_LOG_DEBUG, "config: usesyslog\n"); + } else if(strcmp(key, "UseSandbox") == 0) { + config->usesandbox = 1; + pm_printf(ALPM_LOG_DEBUG, "config: usesandbox\n"); } else if(strcmp(key, "ILoveCandy") == 0) { config->chomp = 1; pm_printf(ALPM_LOG_DEBUG, "config: chomp\n"); @@ -668,6 +680,11 @@ static int _parse_options(const char *key, char *value, config->logfile = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: logfile: %s\n", value); } + } else if(strcmp(key, "SandboxUser") == 0) { + if(!config->sandboxuser) { + config->sandboxuser = strdup(value); + pm_printf(ALPM_LOG_DEBUG, "config: sandboxuser: %s\n", value); + } } else if(strcmp(key, "XferCommand") == 0) { char **c; if((config->xfercommand_argv = wordsplit(value)) == NULL) { @@ -904,6 +921,8 @@ static int setup_libalpm(void) alpm_option_set_architectures(handle, config->architectures); alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); + alpm_option_set_usesandbox(handle, config->usesandbox); + alpm_option_set_sandboxuser(handle, config->sandboxuser); alpm_option_set_ignorepkgs(handle, config->ignorepkg); alpm_option_set_ignoregroups(handle, config->ignoregrp); diff --git src/pacman/conf.h src/pacman/conf.h index 04350d39..8fced284 100644 --- src/pacman/conf.h +++ src/pacman/conf.h @@ -55,6 +55,7 @@ typedef struct __config_t { unsigned short print; unsigned short checkspace; unsigned short usesyslog; + unsigned short usesandbox; unsigned short color; unsigned short disable_dl_timeout; char *print_format; @@ -67,6 +68,7 @@ typedef struct __config_t { char *logfile; char *gpgdir; char *sysroot; + char *sandboxuser; alpm_list_t *hookdirs; alpm_list_t *cachedirs; alpm_list_t *architectures; diff --git src/pacman/pacman-conf.c src/pacman/pacman-conf.c index 600f1622..6da27937 100644 --- src/pacman/pacman-conf.c +++ src/pacman/pacman-conf.c @@ -251,6 +251,7 @@ static void dump_config(void) show_list_str("HookDir", config->hookdirs); show_str("GPGDir", config->gpgdir); show_str("LogFile", config->logfile); + show_str("SandboxUser", config->sandboxuser); show_list_str("HoldPkg", config->holdpkg); show_list_str("IgnorePkg", config->ignorepkg); @@ -268,6 +269,7 @@ static void dump_config(void) show_bool("DisableDownloadTimeout", config->disable_dl_timeout); show_bool("ILoveCandy", config->chomp); show_bool("NoProgressBar", config->noprogressbar); + show_bool("UseSandbox", config->usesandbox); show_int("ParallelDownloads", config->parallel_downloads); @@ -349,6 +351,8 @@ static int list_directives(void) show_str("GPGDir", config->gpgdir); } else if(strcasecmp(i->data, "LogFile") == 0) { show_str("LogFile", config->logfile); + } else if(strcasecmp(i->data, "SandboxUser") == 0) { + show_str("SandboxUser", config->sandboxuser); } else if(strcasecmp(i->data, "HoldPkg") == 0) { show_list_str("HoldPkg", config->holdpkg); @@ -369,6 +373,8 @@ static int list_directives(void) } else if(strcasecmp(i->data, "UseSyslog") == 0) { show_bool("UseSyslog", config->usesyslog); + } else if(strcasecmp(i->data, "UseSandbox") == 0) { + show_bool("UseSandbox", config->usesandbox); } else if(strcasecmp(i->data, "Color") == 0) { show_bool("Color", config->color); } else if(strcasecmp(i->data, "CheckSpace") == 0) { -- 2.33.0

1 0

[pacman-dev] [PATCH] pacman-key: Add --quiet to a few more gpg invocations
by Daan De Meyer 26 Aug '21

26 Aug '21

Currently, when running pacman-key --populate, gpg prints the trustdb check output once for each locally signed and revoked key. When bootstrapping a new container image, about 50 keys get signed and revoked which leads to a huge amount of output when running pacman-key which is the following text repeated 50x ``` gpg: checking the trustdb gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 786C63F330D7CB92: no user ID for key signature packet of class 10 gpg: key 1EB2638FF56C0C53: no user ID for key signature packet of class 10 gpg: key 1EB2638FF56C0C53: no user ID for key signature packet of class 10 gpg: marginals needed: 3 completes needed: 1 trust model: pgp gpg: depth: 0 valid: 1 signed: 6 trust: 0-, 0q, 0n, 0m, 0f, 1u gpg: depth: 1 valid: 6 signed: 83 trust: 0-, 0q, 0n, 6m, 0f, 0u gpg: depth: 2 valid: 78 signed: 25 trust: 78-, 0q, 0n, 0m, 0f, 0u gpg: next trustdb check due at 2021-12-01 ``` To avoid overloading the user with gpg output, we add --quiet to the gpg calls generating the trustdb checking output to silence those calls which gets rid of the trustdb check output on the terminal. Signed-off-by: Daan De Meyer <daan.j.demeyer(a)gmail.com> --- scripts/pacman-key.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 50342649..0526532f 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -192,7 +192,7 @@ check_keyids_exist() { } key_is_lsigned() { - secret_key=$("${GPG_PACMAN[@]}" --with-colons --list-secret-key | awk -F : 'NR==1 {print $5}') + secret_key=$("${GPG_PACMAN[@]}" --with-colons --list-secret-key --quiet | awk -F : 'NR==1 {print $5}') while IFS=: read -r type valid _ _ sign_key _; do if [[ $type != "sig" || $valid != "!" ]]; then continue @@ -200,7 +200,7 @@ key_is_lsigned() { if [[ "$sign_key" == "$secret_key" ]]; then return 0 fi - done < <("${GPG_PACMAN[@]}" --with-colons --check-signatures "$1") + done < <("${GPG_PACMAN[@]}" --with-colons --check-signatures --quiet "$1") return 1 } @@ -212,7 +212,7 @@ key_is_revoked() { if [[ $flags == *"D"* ]]; then return 0 fi - done < <("${GPG_PACMAN[@]}" --with-colons --list-key "$1") + done < <("${GPG_PACMAN[@]}" --with-colons --list-key --quiet "$1") return 1 } -- 2.33.0

2 4

[pacman-dev] [PATCH] pacman: improve backup printing
by morganamilo 16 Aug '21

16 Aug '21

The current backup printing does not fit in with the rest of the info at all. Change to be more consistant. Old: Backup Files : MODIFIED /etc/pacman.conf UNMODIFIED /etc/makepkg.conf New: Backup Files : /etc/pacman.conf [modified] /etc/makepkg.conf [unmodified] Signed-off-by: morganamilo <morganamilo(a)archlinux.org> --- src/pacman/package.c | 52 ++++++++++++++++++++++++-------------------- src/pacman/package.h | 2 +- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index eaee3bb0..d4733405 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -348,7 +348,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) /* Print additional package info if info flag passed more than once */ if(from == ALPM_PKG_FROM_LOCALDB && extra) { - dump_pkg_backups(pkg); + dump_pkg_backups(pkg, cols); } /* final newline to separate packages */ @@ -379,21 +379,21 @@ static const char *get_backup_file_status(const char *root, /* if checksums don't match, file has been modified */ if(strcmp(md5sum, backup->hash) != 0) { - ret = "MODIFIED"; + ret = "[modified]"; } else { - ret = "UNMODIFIED"; + ret = "[unmodified]"; } free(md5sum); } else { switch(errno) { case EACCES: - ret = "UNREADABLE"; + ret = "[unreadable]"; break; case ENOENT: - ret = "MISSING"; + ret = "[missing]"; break; default: - ret = "UNKNOWN"; + ret = "[unknown]"; } } return ret; @@ -401,27 +401,33 @@ static const char *get_backup_file_status(const char *root, /* Display list of backup files and their modification states */ -void dump_pkg_backups(alpm_pkg_t *pkg) +void dump_pkg_backups(alpm_pkg_t *pkg, unsigned short cols) { - alpm_list_t *i; + alpm_list_t *i, *text = NULL; const char *root = alpm_option_get_root(config->handle); - printf("%s%s\n%s", config->colstr.title, titles[T_BACKUP_FILES], - config->colstr.nocolor); - if(alpm_pkg_get_backup(pkg)) { - /* package has backup files, so print them */ - for(i = alpm_pkg_get_backup(pkg); i; i = alpm_list_next(i)) { - const alpm_backup_t *backup = i->data; - const char *value; - if(!backup->hash) { - continue; - } - value = get_backup_file_status(root, backup); - printf("%s\t%s%s\n", value, root, backup->name); + /* package has backup files, so print them */ + for(i = alpm_pkg_get_backup(pkg); i; i = alpm_list_next(i)) { + const alpm_backup_t *backup = i->data; + const char *value; + char *line; + size_t needed; + if(!backup->hash) { + continue; } - } else { - /* package had no backup files */ - printf(_("(none)\n")); + value = get_backup_file_status(root, backup); + needed = strlen(root) + strlen(backup->name) + 1 + strlen(value) + 1; + line = malloc(needed); + if(!line) { + goto cleanup; + } + sprintf(line, "%s%s %s", root, backup->name, value); + text = alpm_list_add(text, line); } + + list_display_linebreak(titles[T_BACKUP_FILES], text, cols); + +cleanup: + FREELIST(text); } /* List all files contained in a package diff --git a/src/pacman/package.h b/src/pacman/package.h index c1f3d5b3..809be776 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -24,7 +24,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra); -void dump_pkg_backups(alpm_pkg_t *pkg); +void dump_pkg_backups(alpm_pkg_t *pkg, unsigned short cols); void dump_pkg_files(alpm_pkg_t *pkg, int quiet); void dump_pkg_changelog(alpm_pkg_t *pkg); -- 2.32.0

1 0

[pacman-dev] [PATCH] Order downloads by descending max_size
by Charlie Sale 12 Aug '21

12 Aug '21

When downloading in parallel, sort by package size so that the larger packages are queued first to fully leverage parallelism. Addresses FS#70172 Signed-off-by: Charlie Sale <softwaresale01(a)gmail.com> --- lib/libalpm/dload.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index ca6be7b6..58d2122f 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -825,6 +825,19 @@ cleanup: return ret; } +/* + * Use to sort payloads by max size in decending order (largest -> smallest) + */ +static int compare_dload_payload_sizes(const void *left_ptr, const void *right_ptr) +{ + struct dload_payload *left, *right; + + left = (struct dload_payload *) left_ptr; + right = (struct dload_payload *) right_ptr; + + return right->max_size - left->max_size; +} + /* Returns -1 if an error happened for a required file * Returns 0 if a payload was actually downloaded * Returns 1 if no files were downloaded and all errors were non-fatal @@ -838,6 +851,10 @@ static int curl_download_internal(alpm_handle_t *handle, int max_streams = handle->parallel_downloads; int updated = 0; /* was a file actually updated */ CURLM *curlm = handle->curlm; + size_t payloads_size = alpm_list_count(payloads); + + /* Sort payloads by package size */ + payloads = alpm_list_msort(payloads, payloads_size, &compare_dload_payload_sizes); while(active_downloads_num > 0 || payloads) { CURLMcode mc; -- 2.32.0

3 3

[pacman-dev] Packaging Con 2021
by Wolf Vollprecht 12 Aug '21

12 Aug '21

Hi all, we're organizing a conference about software package management: https://packaging-con.org/ It's the first time that this event happens: we are trying to bring together many different package management communities, compare approaches, share lessons learned, etc. It would be great to see people from the pacman community there – and maybe even a talk?! The call for presentations ends on August 31. Let me know if you have any questions or ideas for the conference! Best, Wolf

1 0

Re: [pacman-dev] Probléme WITH Pacman
by Morgan Adamiec 08 Aug '21

08 Aug '21

On 08/08/2021 02:20, Lahrech Rafik wrote: > Hey > I have a big problém with pacman i cant update anything it show that > there is err like this > I cant find a solution can you help ??? > > "erreur : l’ouverture du fichier /var/lib/pacman/sync/extra.db a > échoué : Unrecognized archive format " > erreur : l’ouverture du fichier /var/lib/pacman/sync/extra.db a échoué : > Unrecognized archive format > erreur : l’ouverture du fichier /var/lib/pacman/sync/community.db a > échoué : Unrecognized archive format > erreur : l’ouverture du fichier /var/lib/pacman/sync/multilib.db a > échoué : Unrecognized archive format " > Merci R-L > error 1 bugs.png > Capture d’écran_2021-08-08_03-13-44.png > This isn't a support form but it's probably it's probably that mirror that went down and now serves html instead of the database.

1 0

[pacman-dev] [PATCH] libmakepkg: reproducibilty for python packages
by Allan McRae 08 Aug '21

08 Aug '21

Arch Linux has been setting PYTHONHASHSEED=0 to create deterministic .pyc files. After a thorough review by the Arch Security Team, setting this variable was determined not to generated vulnerable .pyc files, as when the loader loads the .pyc file and unmarshalls it, the internal runtime will just populate the unordered data structures and use a new runtime hash for them. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Despite effectively being a 1 line patch to add "export PYTHONHASHSEED=0", I decided to add a libmakepkg submodule dedicated to reproducible packages. This way anybody can drop in mdoules to test easily. I'd like to include this for pacman-6.0.1. It is a bit more than I would usually like to include in a point release, but it is an easy win to for the reproducibile builds effort. Any objections to including it? scripts/libmakepkg/meson.build | 1 + scripts/libmakepkg/reproducible.sh.in | 29 ++++++++++++++++++++ scripts/libmakepkg/reproducible/meson.build | 17 ++++++++++++ scripts/libmakepkg/reproducible/python.sh.in | 29 ++++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 scripts/libmakepkg/reproducible.sh.in create mode 100644 scripts/libmakepkg/reproducible/meson.build create mode 100644 scripts/libmakepkg/reproducible/python.sh.in diff --git a/scripts/libmakepkg/meson.build b/scripts/libmakepkg/meson.build index b0697f78..50eb905b 100644 --- a/scripts/libmakepkg/meson.build +++ b/scripts/libmakepkg/meson.build @@ -5,6 +5,7 @@ libmakepkg_modules = [ { 'name' : 'lint_config', 'has_subdir' : true }, { 'name' : 'lint_package', 'has_subdir' : true }, { 'name' : 'lint_pkgbuild', 'has_subdir' : true }, + { 'name' : 'reproducible', 'has_subdir' : true }, { 'name' : 'source', 'has_subdir' : true }, { 'name' : 'srcinfo', }, { 'name' : 'tidy', 'has_subdir' : true }, diff --git a/scripts/libmakepkg/reproducible.sh.in b/scripts/libmakepkg/reproducible.sh.in new file mode 100644 index 00000000..7db2a3cc --- /dev/null +++ b/scripts/libmakepkg/reproducible.sh.in @@ -0,0 +1,29 @@ +#!/bin/bash +# +# reproducible.sh - utilities for improving package reproducibility +# +# Copyright (c) 2021 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_REPRODUCIBLE_SH" ]] && return +LIBMAKEPKG_REPRODUCIBLE_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + + +for lib in "$LIBRARY/reproducible/"*.sh; do + source "$lib" +done diff --git a/scripts/libmakepkg/reproducible/meson.build b/scripts/libmakepkg/reproducible/meson.build new file mode 100644 index 00000000..0738fe9c --- /dev/null +++ b/scripts/libmakepkg/reproducible/meson.build @@ -0,0 +1,17 @@ +libmakepkg_module = 'reproducible' + +sources = [ + 'python.sh.in', +] + +foreach src : sources + output_dir = join_paths(get_option('datadir'), 'makepkg', libmakepkg_module) + + custom_target( + libmakepkg_module + '_' + src.underscorify(), + command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@' ], + input : src, + output : '@BASENAME@', + install : true, + install_dir : output_dir) +endforeach diff --git a/scripts/libmakepkg/reproducible/python.sh.in b/scripts/libmakepkg/reproducible/python.sh.in new file mode 100644 index 00000000..45fd4521 --- /dev/null +++ b/scripts/libmakepkg/reproducible/python.sh.in @@ -0,0 +1,29 @@ +#!/bin/bash +# +# python.sh - creating reproducible python packages +# +# Copyright (c) 2021 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_REPRODUCIBLE_PYTHON_SH" ]] && return +LIBMAKEPKG_REPRODUCIBLE_PYTHON_SH=1 + + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + + +# disable hash randomization when creating .pyc files +export PYTHONHASHSEED=0 -- 2.32.0

1 0

[pacman-dev] [PATCH] Gitlab CI: add bsdtar to Fedora install
by Allan McRae 04 Aug '21

04 Aug '21

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 507e1332..668b97ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,7 +103,7 @@ fedora: - > dnf -y install git findutils patch sed - meson gcc libtool + meson gcc libtool bsdtar gpgme-devel libarchive-devel libcurl-devel openssl-devel gettext-devel asciidoc python3 dash gawk fakeroot fakechroot -- 2.32.0

1 0

[pacman-dev] [PATCH] PKGBUILD.5: Fix typo
by Andre Schröder 04 Aug '21

04 Aug '21

Signed-off-by: André Schröder <andre.schroedr(a)gmail.com> --- doc/PKGBUILD.5.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index d207d92d..dee15f5e 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -361,7 +361,7 @@ function. is skipped. *build() Function*:: - The optional `build()` function is use to compile and/or adjust the source + The optional `build()` function is used to compile and/or adjust the source files in preparation to be installed by the `package()` function. *check() Function*:: -- 2.32.0

2 2

[pacman-dev] [PATCH] makepkg: fix stripping of relocatable binaries with binutils>=2.37
by Allan McRae 04 Aug '21

04 Aug '21

Binutils commit 93df3340fd5ad32f784214fc125de71811da72ff enabled readelf to report "Position-Independent Executable" files. Fix stripping to account for this change. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/tidy/strip.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 5d03b28f..96602538 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -135,6 +135,8 @@ tidy_strip() { case "$(LC_ALL=C readelf -h "$binary" 2>/dev/null)" in *Type:*'DYN (Shared object file)'*) # Libraries (.so) or Relocatable binaries strip_flags="$STRIP_SHARED";; + *Type:*'DYN (Position-Independent Executable file)'*) # Relocatable binaries + strip_flags="$STRIP_SHARED";; *Type:*'EXEC (Executable file)'*) # Binaries strip_flags="$STRIP_BINARIES";; *Type:*'REL (Relocatable file)'*) # Libraries (.a) or objects -- 2.32.0

1 0

[pacman-dev] [PATCH] pacman: correct inconsistent spelling of Packages
by Torsten Schmitz 26 Jul '21

26 Jul '21

When using VerbosePkgLists the header spells Package instead of Packages as it does normally. Signed-off-by: Torsten Schmitz <noreply.torsten(a)gmail.com> --- src/pacman/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 5486e7a5..36ae0bf0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -824,7 +824,7 @@ static alpm_list_t *create_verbose_header(size_t count) alpm_list_t *ret = NULL; char *header; - pm_asprintf(&header, "%s (%zu)", _("Package"), count); + pm_asprintf(&header, "%s (%zu)", _("Packages"), count); add_table_cell(&ret, header, CELL_TITLE | CELL_FREE); add_table_cell(&ret, _("Old Version"), CELL_TITLE); -- 2.32.0

2 2

[pacman-dev] [PATCH] libmakepkg: allow correctly sourcing when $LIBRARY is not set
by Eli Schwartz 04 Jul '21

04 Jul '21

We usually set this up to default to the build time configured install location, but a couple of files crept in without this. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/buildenv.sh.in | 2 ++ scripts/libmakepkg/executable.sh.in | 2 ++ scripts/libmakepkg/util/pkgbuild.sh.in | 2 ++ 3 files changed, 6 insertions(+) diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in index 0f4178a90..07b32ce93 100644 --- a/scripts/libmakepkg/buildenv.sh.in +++ b/scripts/libmakepkg/buildenv.sh.in @@ -22,6 +22,8 @@ [[ -n "$LIBMAKEPKG_BUILDENV_SH" ]] && return LIBMAKEPKG_BUILDENV_SH=1 +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + declare -a buildenv_functions build_options for lib in "$LIBRARY/buildenv/"*.sh; do diff --git a/scripts/libmakepkg/executable.sh.in b/scripts/libmakepkg/executable.sh.in index ea40289ba..dfa8a0bdf 100644 --- a/scripts/libmakepkg/executable.sh.in +++ b/scripts/libmakepkg/executable.sh.in @@ -21,6 +21,8 @@ [[ -n "$LIBMAKEPKG_EXECUTABLE_SH" ]] && return LIBMAKEPKG_EXECUTABLE_SH=1 +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + declare -a executable_functions for lib in "$LIBRARY/executable/"*.sh; do diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index ceda7824f..e3c5b5902 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -21,6 +21,8 @@ [[ -n "$LIBMAKEPKG_UTIL_PKGBUILD_SH" ]] && return LIBMAKEPKG_UTIL_PKGBUILD_SH=1 +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + source "$LIBRARY/util/schema.sh" -- 2.32.0

1 0

[pacman-dev] [Git][pacman/pacman][master] doc: use localdate instead of pacman_date to improve reproducibility
by Allan McRae (＠allan) 01 Jul '21

01 Jul '21

Allan McRae pushed to branch master at Pacman / Pacman Commits: b4383b8d by Jonas Witschel at 2021-07-01T11:19:18+10:00 doc: use localdate instead of pacman_date to improve reproducibility pacman_date is set to the current date during build without respecting SOURCE_DATE_EPOCH. As a result, a build cannot be fully reproduced on a later date because the date embedded into the man pages does not match. In contrast, the built-in asciidoc attribute "localdate" respects SOURCE_DATE_EPOCH and has the desired ISO 8601 format, so simply use that instead of the custom "pacman_date" attribute. Fixes: FS#71154 Signed-off-by: Jonas Witschel <diabonas at archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 2 changed files: - doc/asciidoc.conf - doc/meson.build Changes: ===================================== doc/asciidoc.conf ===================================== @@ -50,7 +50,7 @@ ifdef::backend-docbook[] template::[header-declarations] <refentry> <refentryinfo> -<date>{pacman_date}</date> +<date>{localdate}</date> </refentryinfo> <refmeta> <refentrytitle>{mantitle}</refentrytitle> ===================================== doc/meson.build ===================================== @@ -25,7 +25,6 @@ asciidoc_conf = join_paths(meson.current_source_dir(), 'asciidoc.conf') asciidoc_opts = [ '-f', asciidoc_conf, '-a', 'pacman_version="@0@"'.format(PACKAGE_VERSION), - '-a', 'pacman_date=@0@'.format(run_command('date', '+%Y-%m-%d').stdout().strip()), '-a', 'srcext=@0@'.format(get_option('src-ext')), '-a', 'pkgext=@0@'.format(get_option('pkg-ext')), '-a', 'pkgdatadir=@0@'.format(PKGDATADIR), View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/b4383b8d007e28aa76324f4… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/b4383b8d007e28aa76324f4… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[pacman-dev] Multiple progress bars not compatible with dumb terminals
by miha＠kamnitnik.top 29 Jun '21

29 Jun '21

On less capable terminals, pacman should probably display only one active progress bar simultaneously. An example of such a terminal is Emacs's M-x shell ($TERM == "dumb"). It can't display the additional "total" properly because it doesn't implement cursor movement.

2 2

[pacman-dev] [PATCH] doc: make man pages reproducible
by Allan McRae 25 Jun '21

25 Jun '21

Use asciidoc's localdate which respects SOURCE_DATE_EPOCH. Thanks to Jonas Witschel <diabonas(a)archlinux.org> for investigating this issue. Fixes FS#71154. --- doc/asciidoc.conf | 2 +- doc/meson.build | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index e2e72672..830cc908 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -50,7 +50,7 @@ ifdef::backend-docbook[] template::[header-declarations] <refentry> <refentryinfo> -<date>{pacman_date}</date> +<date>{localdate}</date> </refentryinfo> <refmeta> <refentrytitle>{mantitle}</refentrytitle> diff --git a/doc/meson.build b/doc/meson.build index 4aaac554..5a8eb3a4 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -25,7 +25,6 @@ asciidoc_conf = join_paths(meson.current_source_dir(), 'asciidoc.conf') asciidoc_opts = [ '-f', asciidoc_conf, '-a', 'pacman_version="@0@"'.format(PACKAGE_VERSION), - '-a', 'pacman_date=@0@'.format(run_command('date', '+%Y-%m-%d').stdout().strip()), '-a', 'srcext=@0@'.format(get_option('src-ext')), '-a', 'pkgext=@0@'.format(get_option('pkg-ext')), '-a', 'pkgdatadir=@0@'.format(PKGDATADIR), -- 2.32.0

1 0

[pacman-dev] [PATCH] doc: use localdate instead of pacman_date to improve reproducibility
by Jonas Witschel 25 Jun '21

25 Jun '21

pacman_date is set to the current date during build without respecting SOURCE_DATE_EPOCH. As a result, a build cannot be fully reproduced on a later date because the date embedded into the man pages does not match. In contrast, the built-in asciidoc attribute "localdate" respects SOURCE_DATE_EPOCH and has the desired ISO 8601 format, so simply use that instead of the custom "pacman_date" attribute. Fixes: FS#71154 Signed-off-by: Jonas Witschel <diabonas(a)archlinux.org> --- doc/asciidoc.conf | 2 +- doc/meson.build | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index e2e72672..830cc908 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -50,7 +50,7 @@ ifdef::backend-docbook[] template::[header-declarations] <refentry> <refentryinfo> -<date>{pacman_date}</date> +<date>{localdate}</date> </refentryinfo> <refmeta> <refentrytitle>{mantitle}</refentrytitle> diff --git a/doc/meson.build b/doc/meson.build index 4aaac554..5a8eb3a4 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -25,7 +25,6 @@ asciidoc_conf = join_paths(meson.current_source_dir(), 'asciidoc.conf') asciidoc_opts = [ '-f', asciidoc_conf, '-a', 'pacman_version="@0@"'.format(PACKAGE_VERSION), - '-a', 'pacman_date=@0@'.format(run_command('date', '+%Y-%m-%d').stdout().strip()), '-a', 'srcext=@0@'.format(get_option('src-ext')), '-a', 'pkgext=@0@'.format(get_option('pkg-ext')), '-a', 'pkgdatadir=@0@'.format(PKGDATADIR), -- 2.32.0

1 0

[pacman-dev] [PATCH] libalpm: look for up to date file anywhere in cache
by morganamilo 24 Jun '21

24 Jun '21

Currently when a package is in a secondary cachedir and there is no sig file, the downloader redownloads the whole file into the primary cachedir. So lets check all cachedirs for an up to date file. Fixes FS#71109 --- lib/libalpm/be_sync.c | 2 +- lib/libalpm/dload.c | 61 +++++++++++++++++++++++++++++-------------- lib/libalpm/dload.h | 3 ++- lib/libalpm/sync.c | 2 +- 4 files changed, 45 insertions(+), 23 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index d85f36ee..f5f70a10 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -205,7 +205,7 @@ int SYMEXPORT alpm_db_update(alpm_handle_t *handle, alpm_list_t *dbs, int force) event.type = ALPM_EVENT_DB_RETRIEVE_START; EVENT(handle, &event); - ret = _alpm_download(handle, payloads, syncpath); + ret = _alpm_download(handle, payloads, syncpath, NULL); if(ret < 0) { event.type = ALPM_EVENT_DB_RETRIEVE_FAILED; EVENT(handle, &event); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 2c14841f..d5b52cd2 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -55,7 +55,7 @@ #define HOSTNAME_SIZE 256 static int curl_add_payload(alpm_handle_t *handle, CURLM *curlm, - struct dload_payload *payload, const char *localpath); + struct dload_payload *payload, const char *localpath, alpm_list_t *cachedirs); static int curl_gethost(const char *url, char *buffer, size_t buf_len); /* number of "soft" errors required to blacklist a server, set to 0 to disable @@ -308,7 +308,7 @@ static size_t dload_parseheader_cb(void *ptr, size_t size, size_t nmemb, void *u return realsize; } -static void curl_set_handle_opts(CURL *curl, struct dload_payload *payload) +static void curl_set_handle_opts(CURL *curl, struct dload_payload *payload, alpm_list_t *cachedirs) { alpm_handle_t *handle = payload->handle; const char *useragent = getenv("HTTP_USER_AGENT"); @@ -353,14 +353,33 @@ static void curl_set_handle_opts(CURL *curl, struct dload_payload *payload) curl_easy_setopt(curl, CURLOPT_USERAGENT, useragent); } - if(!payload->force && payload->destfile_name && - stat(payload->destfile_name, &st) == 0) { - /* start from scratch, but only download if our local is out of date. */ - curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); - curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); - _alpm_log(handle, ALPM_LOG_DEBUG, - "%s: using time condition %ld\n", - payload->remote_name, (long)st.st_mtime); + if(!payload->force && payload->destfile_name) { + if(stat(payload->destfile_name, &st) == 0) { + /* start from scratch, but only download if our local is out of date. */ + curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s: using time condition %ld\n", + payload->remote_name, (long)st.st_mtime); + } else { + /* try and find an up to date file anywhere in cache */ + const char *name = get_filename(payload->destfile_name); + for(alpm_list_t *i = cachedirs; i; i = i->next) { + char *cachedir = i->data; + char *filepath = get_fullpath(cachedir, name, ""); + if(stat(filepath, &st) == 0) { + /* start from scratch, but only download if our local is out of date. */ + curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s: using time condition %ld\n", + payload->remote_name, (long)st.st_mtime); + free(filepath); + break; + } + free(filepath); + } + } } else if(stat(payload->tempfile_name, &st) == 0 && payload->allow_resume) { /* a previous partial download exists, resume from end of file. */ payload->tempfile_openmode = "ab"; @@ -469,7 +488,7 @@ static int curl_retry_next_server(CURLM *curlm, CURL *curl, struct dload_payload * Returns -2 if an error happened for an optional file */ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, - const char *localpath, int *active_downloads_num) + const char *localpath, int *active_downloads_num, alpm_list_t *cachedirs) { alpm_handle_t *handle = NULL; struct dload_payload *payload = NULL; @@ -638,7 +657,7 @@ static int curl_check_finished_download(CURLM *curlm, CURLMsg *msg, /* set hard upper limit of 16KiB */ sig->max_size = 16 * 1024; - curl_add_payload(handle, curlm, sig, localpath); + curl_add_payload(handle, curlm, sig, localpath, cachedirs); (*active_downloads_num)++; } @@ -721,7 +740,7 @@ cleanup: * Returns -1 if am error happened while starting a new download */ static int curl_add_payload(alpm_handle_t *handle, CURLM *curlm, - struct dload_payload *payload, const char *localpath) + struct dload_payload *payload, const char *localpath, alpm_list_t *cachedirs) { size_t len; CURL *curl = NULL; @@ -778,7 +797,7 @@ static int curl_add_payload(alpm_handle_t *handle, CURLM *curlm, } } - curl_set_handle_opts(curl, payload); + curl_set_handle_opts(curl, payload, cachedirs); if(payload->max_size == payload->initial_size && payload->max_size != 0) { /* .part file is complete */ @@ -823,7 +842,8 @@ cleanup: */ static int curl_download_internal(alpm_handle_t *handle, alpm_list_t *payloads /* struct dload_payload */, - const char *localpath) + const char *localpath, + alpm_list_t *cachedirs) { int active_downloads_num = 0; int err = 0; @@ -837,7 +857,7 @@ static int curl_download_internal(alpm_handle_t *handle, for(; active_downloads_num < max_streams && payloads; active_downloads_num++) { struct dload_payload *payload = payloads->data; - if(curl_add_payload(handle, curlm, payload, localpath) == 0) { + if(curl_add_payload(handle, curlm, payload, localpath, cachedirs) == 0) { payloads = payloads->next; } else { /* The payload failed to start. Do not start any new downloads. @@ -868,7 +888,7 @@ static int curl_download_internal(alpm_handle_t *handle, } if(msg->msg == CURLMSG_DONE) { int ret = curl_check_finished_download(curlm, msg, - localpath, &active_downloads_num); + localpath, &active_downloads_num, cachedirs); if(ret == -1) { /* if current payload failed to download then stop adding new payloads but wait for the * current ones @@ -896,11 +916,12 @@ static int curl_download_internal(alpm_handle_t *handle, */ int _alpm_download(alpm_handle_t *handle, alpm_list_t *payloads /* struct dload_payload */, - const char *localpath) + const char *localpath, + alpm_list_t *cachedirs) { if(handle->fetchcb == NULL) { #ifdef HAVE_LIBCURL - return curl_download_internal(handle, payloads, localpath); + return curl_download_internal(handle, payloads, localpath, cachedirs); #else RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); #endif @@ -995,7 +1016,7 @@ int SYMEXPORT alpm_fetch_pkgurl(alpm_handle_t *handle, const alpm_list_t *urls, event.type = ALPM_EVENT_PKG_RETRIEVE_START; event.pkg_retrieve.num = alpm_list_count(payloads); EVENT(handle, &event); - if(_alpm_download(handle, payloads, cachedir) == -1) { + if(_alpm_download(handle, payloads, cachedir, handle->cachedirs) == -1) { _alpm_log(handle, ALPM_LOG_WARNING, _("failed to retrieve some files\n")); event.type = ALPM_EVENT_PKG_RETRIEVE_FAILED; EVENT(handle, &event); diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 8f3d17b4..f5dabae1 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -61,6 +61,7 @@ void _alpm_dload_payload_reset(struct dload_payload *payload); int _alpm_download(alpm_handle_t *handle, alpm_list_t *payloads /* struct dload_payload */, - const char *localpath); + const char *localpath, + alpm_list_t *cachedirs); #endif /* ALPM_DLOAD_H */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 36ad6242..a1226a4c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -833,7 +833,7 @@ static int download_files(alpm_handle_t *handle) payloads = alpm_list_add(payloads, payload); } - ret = _alpm_download(handle, payloads, cachedir); + ret = _alpm_download(handle, payloads, cachedir, handle->cachedirs); if(ret == -1) { event.type = ALPM_EVENT_PKG_RETRIEVE_FAILED; EVENT(handle, &event); -- 2.32.0

5 5

[pacman-dev] Move to gitlab.archlinux.org
by Allan McRae 24 Jun '21

24 Jun '21

Hi all, With Arch shutting down our current git hosting in the near future, the main repo for pacman development has moved to: https://gitlab.archlinux.org/pacman/pacman Note that the bug tracker will remain on Flyspray and patches will remain submitted through the mailing list until such time that registration for an Arch Gitlab account is open for the wider community. With the move to gitlab, we now have some CI happening (though only post push at the moment). We currently test a bunch of configurations under Arch, and fairly default things under Fedora and Debian. If any of our BSD friends want to provide an addition to the CI configuration (.gitlab-ci.yml), I am more than happy to include it. I will move some of the development notes (e.g. my wiki page for the rough design of alternatives etc) into the project wiki. I'd also like to use the project wiki as an index for Feature Requests, and keep the bug tracker for only bugs. The idea would be any feature request file gets discussed, and if we deem it a suitable addition it then gets added to the wiki. That way we can have an annotated list of potential future feature that anyone can see without having to sift through a bug tracker. Also, real bugs that need fixed will be easier to spot. I am thinking it best to start on this before we open up the issue tracking on gitlab as it will clear our Flyspray bug list up quite a lot. Cheers, Allan

3 5

[pacman-dev] [PATCH] pacman: don't nuke local repos with -Sc
by morganamilo 24 Jun '21

24 Jun '21

When using a local repo as a cachedir pacman -Scc or pacman -Sc without KeepCurrent will delete the repo database and packages resulting in a lost database and non functional pacman. So special case file:/// repos in cache to not get nuked and foce KeepCurrent on. --- src/pacman/sync.c | 64 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 9 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index b6da1a36..129d3f5c 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -151,34 +151,71 @@ static int sync_cleandb_all(void) return ret; } -static int sync_cleancache(int level) +static int is_local_repo(char *dir) +{ + alpm_list_t *j, *k; + char *sanatized_dir = strdup(dir); + int len = strlen(sanatized_dir); + int ret = 0; + + if(sanatized_dir[len - 1] == '/') { + sanatized_dir[len - 1] = '\0'; + } + + for(j = alpm_get_syncdbs(config->handle); j; j = alpm_list_next(j)) { + alpm_db_t *db = j->data; + + for(k = alpm_db_get_servers(db); k; k = alpm_list_next(k)) { + char *server = k->data; + + if(strncmp(server, "file://", 7) == 0) { + server += 7; + + if(strcmp(server, sanatized_dir) == 0) { + ret = 1; + goto cleanup; + } + } + } + + } + +cleanup: + free(sanatized_dir); + return ret; +} + +static int sync_cleancache(int config_level) { alpm_list_t *i; alpm_list_t *sync_dbs = alpm_get_syncdbs(config->handle); alpm_db_t *db_local = alpm_get_localdb(config->handle); alpm_list_t *cachedirs = alpm_option_get_cachedirs(config->handle); + int config_cleanmethod = config->cleanmethod; int ret = 0; - if(!config->cleanmethod) { + if(config_cleanmethod) { /* default to KeepInstalled if user did not specify */ - config->cleanmethod = PM_CLEAN_KEEPINST; + config_cleanmethod = PM_CLEAN_KEEPINST; } - if(level == 1) { + if(config_level == 1) { printf(_("Packages to keep:\n")); - if(config->cleanmethod & PM_CLEAN_KEEPINST) { + if(config_cleanmethod & PM_CLEAN_KEEPINST) { printf(_(" All locally installed packages\n")); } - if(config->cleanmethod & PM_CLEAN_KEEPCUR) { + if(config_cleanmethod & PM_CLEAN_KEEPCUR) { printf(_(" All current sync database packages\n")); } } printf("\n"); for(i = cachedirs; i; i = alpm_list_next(i)) { - const char *cachedir = i->data; + char *cachedir = i->data; DIR *dir; struct dirent *ent; + int cleanmethod = config_cleanmethod; + int level = config_level; printf(_("Cache directory: %s\n"), (const char *)i->data); @@ -196,6 +233,15 @@ static int sync_cleancache(int level) printf(_("removing all files from cache...\n")); } + if(is_local_repo(cachedir)) { + pm_printf(ALPM_LOG_DEBUG, + _("cachedir '%s' is a local repo, keeping packages\n"), cachedir); + + level = 1; + cleanmethod |= PM_CLEAN_KEEPCUR; + cleanmethod &= ~PM_CLEAN_KEEPINST; + } + dir = opendir(cachedir); if(dir == NULL) { pm_printf(ALPM_LOG_ERROR, @@ -258,7 +304,7 @@ static int sync_cleancache(int level) local_name = alpm_pkg_get_name(localpkg); local_version = alpm_pkg_get_version(localpkg); - if(config->cleanmethod & PM_CLEAN_KEEPINST) { + if(cleanmethod & PM_CLEAN_KEEPINST) { /* check if this package is in the local DB */ pkg = alpm_db_get_pkg(db_local, local_name); if(pkg != NULL && alpm_pkg_vercmp(local_version, @@ -269,7 +315,7 @@ static int sync_cleancache(int level) delete = 0; } } - if(config->cleanmethod & PM_CLEAN_KEEPCUR) { + if(cleanmethod & PM_CLEAN_KEEPCUR) { alpm_list_t *j; /* check if this package is in a sync DB */ for(j = sync_dbs; j && delete; j = alpm_list_next(j)) { -- 2.32.0

4 10

[pacman-dev] [PATCH] PKGBUILD.5: Add fossil to list of supported VCSs
by David Passens 24 Jun '21

24 Jun '21

Since commit 08f4ae70, makepkg supports downloading from fossil. However, the PKGBUILD man page was only partially updated to reflect this change. --- doc/PKGBUILD.5.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index af615040..d207d92d 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -476,9 +476,9 @@ control system (VCS) is enabled by specifying the source in the form: source=('directory::url#fragment?query') -Currently makepkg supports the Bazaar, Git, Subversion, and Mercurial version -control systems. For other version control systems, manual cloning of upstream -repositories must be done in the `prepare()` function. +Currently makepkg supports the Bazaar, Git, Subversion, Fossil and Mercurial +version control systems. For other version control systems, manual cloning of +upstream repositories must be done in the `prepare()` function. The source URL is divided into four components: -- 2.32.0

2 1

[pacman-dev] [PATCH 1/1] conf: replace grey46 with bright black
by Christian Hesse 15 Jun '21

15 Jun '21

From: Christian Hesse <mail(a)eworm.de> This is not handled correctly in some situations. For me (with pacman inside tmux inside xfce4-terminal with TERM=xterm) I do not see version strings but huge gaps between package names. Looks like grey46 is round to just back, which is my background color. Instead use bright black, which is one of the 16 colors and *should* be visible with any configuration. Works for me[tm] and all configurations I tested. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- src/pacman/conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 12fee64c..afbd677f 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -55,6 +55,8 @@ config_t *config = NULL; #define CYAN "\033[0;36m" #define WHITE "\033[0;37m" +#define BRIGHTBLACK "\033[0;30;1m" + #define BOLDBLACK "\033[1;30m" #define BOLDRED "\033[1;31m" #define BOLDGREEN "\033[1;32m" @@ -63,7 +65,6 @@ config_t *config = NULL; #define BOLDMAGENTA "\033[1;35m" #define BOLDCYAN "\033[1;36m" #define BOLDWHITE "\033[1;37m" -#define GREY46 "\033[38;5;243m" void enable_colors(int colors) { @@ -78,7 +79,7 @@ void enable_colors(int colors) colstr->meta = BOLDCYAN; colstr->warn = BOLDYELLOW; colstr->err = BOLDRED; - colstr->faint = GREY46; + colstr->faint = BRIGHTBLACK; colstr->nocolor = NOCOLOR; } else { colstr->colon = ":: ";

3 4

[pacman-dev] Seeking help to report and resolve a pacman bug with parallel downloads
by atn19 12 Jun '21

12 Jun '21

Hi all, Using an up-to-date system, I have an issue since I have been using pacman 6 parallel downloads feature. When retrieving a large number of quite small files with a quite good bandwidth, it interrupts the downloads, fails, and I get the following error message: "failed to commit transaction (download library error)". As a computer science student, I would like to find the root cause of this issue. I guess this is due to some critical race, as the issue disappears when parallel downloads are disabled. As a first try, I have been following some wiki indications, building pacman with debug symbols. However, I was unable to pinpoint the bug with gdb, the log is very short with only creation and exits of the created threads. Then, I have been building pacman-static, hoping to avoid some shared libraries issues. This did not work either. This is likely due to the fact that I am not very experienced with gdb, especially with the use of shared libraries and/or threads. I guess many people on this mailing-list could fix this bug, the only reason I did not report it yet is because I do not have any precise log. In order to report it in a more precise way, I would like to have some indications. Moreover, this could turn out to be quite instructive for me, and perhaps for others as I would like to add some indications to the wiki and/or other places. If you have online resources to recommend, please do. 1. How should I use gdb to get complete traces, including those of the created threads? 2. I am so far not using breakpoints, I would only like to have the complete call graph, including those of the created threads. Is this a reasonable approach when trying to address a not-yet-narrowed-down bug, especially with shared libraries? Do I need some other tools, modifying LD_PRELOAD, etc? 3. What is the recommended way of handling symbols from several symbols tables? 4. Is there already some sanitizer such as TSAN in use for pacman development? If not, is this something planned, or are they reasons against using such tools? 5. Last but not least, many tests used in the PKGBUILD check function unexpectedly fail when I build pacman locally. Is this normal? If not, I can attach the log in another email, even though I guess it should be quite reproducible. Any piece of advice about how to do such things, what is your usual workflow with gdb (and perhaps other debuggers), more generally what is your workflow to find the cause of bugs, would be of great help. Thank you very much for all of the pacman development. Best regards, atn19

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0-5-g542910d6
by Allan McRae 07 Jun '21

07 Jun '21

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 542910d684191eb7f25ddc5d3d8fe3060028a267 (commit) via 238109760d79924811121fe3e8d08365fbb2774b (commit) via 2e83a52205bef32f4f5b18c7178efbed5e9c4006 (commit) via 3401f9e142ac4c701cd98c52618cb13164f2146b (commit) via 6f35ce157092e9de0dfa658157f470530e7814c2 (commit) from 75eb3f4cd348c29f81645624428d02aa04dd3cbc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 542910d684191eb7f25ddc5d3d8fe3060028a267 Author: morganamilo <morganamilo(a)archlinux.org> Date: Thu Jun 3 19:45:22 2021 +0100 libalpm: fix double free when importing key Comit 5151de30 tried to fix leaking memory when importing a key. However key_search_keyserver() writes to the key passed in, making the original uid and fingerprint unreachable, causing the new uid and fingerprint to double free. Fixes FS#71107 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 238109760d79924811121fe3e8d08365fbb2774b Author: morganamilo <morganamilo(a)archlinux.org> Date: Fri May 21 14:21:56 2021 +0100 libalpm: call retry events for sig downlods Around the same time retry events were added, there was a patch to pass sig download events to the frontend. The retry code was not updated to account for this. Signed-off-by: morganamilo <morganamilo(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2e83a52205bef32f4f5b18c7178efbed5e9c4006 Author: morganamilo <morganamilo(a)archlinux.org> Date: Thu May 20 22:21:34 2021 +0100 pactest: add test case for servers returning 404 with body Signed-off-by: morganamilo <morganamilo(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3401f9e142ac4c701cd98c52618cb13164f2146b Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 2 21:48:53 2021 +1000 libalpm: prevent download error pages ending up in package files Some servers respond with error pages (e.g. 404.html) when a package is not present. These were getting written to packages before moving onto the next server. Reset the download progress on 400+ error conditions to avoid this. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6f35ce157092e9de0dfa658157f470530e7814c2 Author: Christian Hesse <mail(a)eworm.de> Date: Thu May 20 21:36:15 2021 +0200 doc/pacman.conf: ParallelDownloads expects a value This can not be specified on its own but requires a value. Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.conf.5.asciidoc | 2 +- lib/libalpm/dload.c | 12 +++++++++++- lib/libalpm/signing.c | 7 ++++--- test/pacman/meson.build | 1 + test/pacman/tests/sync-failover-404-with-body.py | 24 ++++++++++++++++++++++++ 5 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 test/pacman/tests/sync-failover-404-with-body.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libalpm: add iterator interface for syncdb files
by morganamilo 04 Jun '21

04 Jun '21

This commit adds an iterator interface for reading files from the syncdbs. Instead of using alpm_pkg_get_files(), you now get the files from the database using alpm_db_files_open(), you then use alpm_db_files_next() to iterate through the files for each package. If you want to actually load the files from that package you then use alpm_db_files_load(). This means alpm_pkg_get_files() will always return empty for syncdbs, even on .files databases, however these functions still work on the localdb and loaded packages. This aproach is faster when dumping the entire file list but slower when searching for a specific package. The memory usage of pacman is drastically less. See below. build/pacman -Fl 0.55s user 0.01s system 99% cpu 0.556 total build/pacman -Fl pacman 0.46s user 0.01s system 99% cpu 0.472 total build/pacman -Fx pacman 2.88s user 0.09s system 99% cpu 2.965 total pacman -Fl 1.60s user 0.13s system 99% cpu 1.731 total pacman -Fl pacman 0.24s user 0.04s system 99% cpu 0.283 total pacman -Fx pacman 2.45s user 0.14s system 99% cpu 2.593 total Peak Memory build/pacman -Fl 43.52MB build/pacman -Fl pacmam 11.292MB pacman -Fl 677.048MB pacman -Fl pacman 163.288MB --- lib/libalpm/alpm.h | 45 ++++++++- lib/libalpm/be_sync.c | 182 ++++++++++++++++++++++++++++------- lib/libalpm/db.h | 7 ++ lib/libalpm/filelist.c | 14 +++ lib/libalpm/filelist.h | 1 + lib/libalpm/package.c | 1 + src/pacman/files.c | 209 +++++++++++++++++++++++++---------------- 7 files changed, 344 insertions(+), 115 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c4acc062..595bd6ee 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -101,6 +101,11 @@ typedef struct __alpm_handle_t alpm_handle_t; typedef struct __alpm_db_t alpm_db_t; +/** A Database file iterator + * @ingroup libalpm_databases + */ +typedef struct __alpm_db_files_t alpm_db_files_t; + /** A package. * * A package can be loaded from disk via \link alpm_pkg_load \endlink or retrieved from a database. @@ -164,6 +169,9 @@ typedef struct _alpm_backup_t { */ alpm_file_t *alpm_filelist_contains(alpm_filelist_t *filelist, const char *path); +/** Frees a file list */ +void alpm_filelist_free(alpm_filelist_t *files); + /* End of libalpm_files */ /** @} */ @@ -1450,6 +1458,42 @@ int alpm_db_get_usage(alpm_db_t *db, int *usage); /* End of usage accessors */ /** @} */ +/** @name File iterators + * @{ + */ + +/** Opens a handle to the db files iterator. + * @param db the db files to iterate over + * @return handle to the iterator + */ +alpm_db_files_t *alpm_db_files_open(alpm_db_t *db); + +/** Goes to the next package. + * @param files handle to the file iterator + * @param pkgname stores the pkgname of the current package + * @return 0 on success, 1 if end of iterator, -1 on error + */ +int alpm_db_files_next(alpm_db_files_t *files, char** pkgname); + +/** Loads the files for a package into a file list. + * + * This extends the file list as needed, reusing the memory alloced. + * You can reuse the same file list for calls to this function but + * the list should be freed with \link alpm_filelist_free alpm_filelist_free \endlink + * after use. + * @param files handle to the file iterator + * @param filelist the filelist to load files into + * @return 0 on success, -1 on error + */ +int alpm_db_files_load(alpm_db_files_t *files, alpm_filelist_t *filelist); + +/** Close the db file iterator + * @param files handle to the file iterator + */ +void alpm_db_files_close(alpm_db_files_t *files); + +/* End of file iterators */ +/** @} */ /* End of libalpm_databases */ /** @} */ @@ -2684,7 +2728,6 @@ int alpm_pkg_mtree_close(const alpm_pkg_t *pkg, struct archive *archive); /* End of mtree accessors */ /** @} */ - /* End of libalpm_packages */ /** @} */ diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index d85f36ee..9e7f8085 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -566,8 +566,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, return 0; } - if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0 - || strcmp(filename, "files") == 0) { + if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0) { int ret; while((ret = _alpm_archive_fgets(archive, &buf)) == ARCHIVE_OK) { char *line = buf.line; @@ -636,36 +635,6 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, READ_AND_SPLITDEP(pkg->conflicts); } else if(strcmp(line, "%PROVIDES%") == 0) { READ_AND_SPLITDEP(pkg->provides); - } else if(strcmp(line, "%FILES%") == 0) { - /* TODO: this could lazy load if there is future demand */ - size_t files_count = 0, files_size = 0; - alpm_file_t *files = NULL; - - while(1) { - if(_alpm_archive_fgets(archive, &buf) != ARCHIVE_OK) { - goto error; - } - line = buf.line; - if(_alpm_strip_newline(line, buf.real_line_size) == 0) { - break; - } - - if(!_alpm_greedy_grow((void **)&files, &files_size, - (files_count ? (files_count + 1) * sizeof(alpm_file_t) : 8 * sizeof(alpm_file_t)))) { - goto error; - } - STRDUP(files[files_count].name, line, goto error); - files_count++; - } - /* attempt to hand back any memory we don't need */ - if(files_count > 0) { - REALLOC(files, sizeof(alpm_file_t) * files_count, (void)0); - } else { - FREE(files); - } - pkg->files.count = files_count; - pkg->files.files = files; - _alpm_filelist_sort(&pkg->files); } } if(ret != ARCHIVE_EOF) { @@ -716,3 +685,152 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename, handle->dbs_sync = alpm_list_add(handle->dbs_sync, db); return db; } + +static int load_files(struct archive *archive, alpm_filelist_t *filelist) +{ + struct archive_read_buffer buf = {0}; + + /* 512K for a line length seems reasonable */ + buf.max_line_size = 512 * 1024; + + _alpm_filelist_truncate(filelist); + + int ret; + while((ret = _alpm_archive_fgets(archive, &buf)) == ARCHIVE_OK) { + char *line = buf.line; + if(_alpm_strip_newline(line, buf.real_line_size) == 0) { + /* length of stripped line was zero */ + continue; + } + + if(strcmp(line, "%FILES%") == 0) { + size_t files_size = 0; + + while(1) { + if(_alpm_archive_fgets(archive, &buf) != ARCHIVE_OK) { + goto error; + } + line = buf.line; + if(_alpm_strip_newline(line, buf.real_line_size) == 0) { + break; + } + + if(!_alpm_greedy_grow((void **)&filelist->files, &files_size, + (filelist->count ? (filelist->count + 1) * sizeof(alpm_file_t) : 8 * sizeof(alpm_file_t)))) { + goto error; + } + STRDUP(filelist->files[filelist->count].name, line, goto error); + filelist->count++; + } + _alpm_filelist_sort(filelist); + } + } + if(ret != ARCHIVE_EOF) { + goto error; + } + + return 0; + +error: + return -1; +} + +alpm_db_files_t SYMEXPORT *alpm_db_files_open(alpm_db_t *db) +{ + const char *dbpath; + int fd; + struct stat buf; + struct archive *archive; + alpm_db_files_t *files = NULL; + + ASSERT(db != NULL, return NULL); + + dbpath = _alpm_db_path(db); + if(!dbpath) { + /* pm_errno set in _alpm_db_path() */ + return NULL; + } + + if(db->status & DB_STATUS_INVALID || db->status & DB_STATUS_MISSING) { + return NULL; + } + + fd = _alpm_open_archive(db->handle, dbpath, &buf, + &archive, ALPM_ERR_DB_OPEN); + if(fd < 0) { + db->status &= ~DB_STATUS_VALID; + db->status |= DB_STATUS_INVALID; + _alpm_archive_read_free(archive); + return NULL; + } + + MALLOC(files, sizeof(alpm_db_files_t), RET_ERR(db->handle, ALPM_ERR_MEMORY, NULL)); + files->archive = archive; + files->fd = fd; + files->db = db; + return files; +} + +int SYMEXPORT alpm_db_files_next(alpm_db_files_t *files, char** pkgname) +{ + struct archive_entry *entry; + const char *entryname; + int archive_ret; + char *filename; + + ASSERT(files != NULL, return -1); + ASSERT(pkgname != NULL, return -1); + + while((archive_ret = archive_read_next_header(files->archive, &entry)) == ARCHIVE_OK) { + mode_t mode = archive_entry_mode(entry); + if(!S_ISDIR(mode)) { + entryname = archive_entry_pathname(entry); + if(entryname == NULL) { + _alpm_log(files->db->handle, ALPM_LOG_DEBUG, + "invalid archive entry provided to alpm_db_files_next, skipping\n"); + return -1; + } + + if(_alpm_splitname(entryname, pkgname, NULL, NULL) != 0) { + _alpm_log(files->db->handle, ALPM_LOG_ERROR, + _("invalid name for database entry '%s'\n"), entryname); + return -1; + } + + filename = strrchr(entryname, '/'); + filename++; + + /* we only want to read the file list */ + if(filename && strcmp(filename, "files") == 0) { + return 0; + } + } + } + if(archive_ret != ARCHIVE_EOF) { + return -1; + } + return 1; +} + +int SYMEXPORT alpm_db_files_load(alpm_db_files_t *files, alpm_filelist_t *filelist) +{ + ASSERT(files != NULL, return -1); + ASSERT(filelist != NULL, return -1); + + _alpm_filelist_truncate(filelist); + if(load_files(files->archive, filelist) != 0) { + _alpm_log(files->db->handle, ALPM_LOG_ERROR, + _("could not parse package description file '%s' from db '%s'\n"), + "files", files->db->treename); + return -1; + } + return 0; +} + +void SYMEXPORT alpm_db_files_close(alpm_db_files_t *files) +{ + ASSERT(files != NULL, return); + _alpm_archive_read_free(files->archive); + close(files->fd); + free(files); +} diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 92c69ba7..1e7b670a 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -61,6 +61,13 @@ struct db_operations { void (*unregister) (alpm_db_t *); }; +/* Database files iterator */ +struct __alpm_db_files_t { + struct archive *archive; + int fd; + alpm_db_t *db; +}; + /* Database */ struct __alpm_db_t { alpm_handle_t *handle; diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index 07239c35..8dccd4bb 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -145,3 +145,17 @@ void _alpm_filelist_sort(alpm_filelist_t *filelist) } } } + +void _alpm_filelist_truncate(alpm_filelist_t *files) +{ + for(size_t i = 0; i < files->count; i++) { + FREE(files->files[i].name); + } + files->count = 0; +} + +void SYMEXPORT alpm_filelist_free(alpm_filelist_t *files) +{ + _alpm_filelist_truncate(files); + free(files->files); +} diff --git a/lib/libalpm/filelist.h b/lib/libalpm/filelist.h index 928e3c1e..4bb70093 100644 --- a/lib/libalpm/filelist.h +++ b/lib/libalpm/filelist.h @@ -28,5 +28,6 @@ alpm_list_t *_alpm_filelist_intersection(alpm_filelist_t *filesA, alpm_filelist_t *filesB); void _alpm_filelist_sort(alpm_filelist_t *filelist); +void _alpm_filelist_truncate(alpm_filelist_t *filelist); #endif /* ALPM_FILELIST_H */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index f837f84a..4f721797 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -99,6 +99,7 @@ static alpm_list_t *_pkg_get_replaces(alpm_pkg_t *pkg) { return pkg->replaces; static alpm_filelist_t *_pkg_get_files(alpm_pkg_t *pkg) { return &(pkg->files); } static alpm_list_t *_pkg_get_backup(alpm_pkg_t *pkg) { return pkg->backup; } + static void *_pkg_changelog_open(alpm_pkg_t UNUSED *pkg) { return NULL; diff --git a/src/pacman/files.c b/src/pacman/files.c index 3801d735..5d39b074 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -40,9 +40,8 @@ static void print_line_machinereadable(alpm_db_t *db, alpm_pkg_t *pkg, char *fil fputs("\n", stdout); } -static void dump_pkg_machinereadable(alpm_db_t *db, alpm_pkg_t *pkg) +static void dump_pkg_machinereadable(alpm_db_t *db, alpm_pkg_t *pkg, alpm_filelist_t *pkgfiles) { - alpm_filelist_t *pkgfiles = alpm_pkg_get_files(pkg); for(size_t filenum = 0; filenum < pkgfiles->count; filenum++) { const alpm_file_t *file = pkgfiles->files + filenum; print_line_machinereadable(db, pkg, file->name); @@ -108,7 +107,9 @@ static void filetarget_free(struct filetarget *ftarg) { static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { int ret = 0; - alpm_list_t *t, *filetargs = NULL; + alpm_list_t *t, *s, *filetargs = NULL; + alpm_filelist_t filelist = {0}; + char *pkgname = NULL; for(t = targets; t; t = alpm_list_next(t)) { char *targ = t->data; @@ -144,43 +145,58 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { goto cleanup; } - for(t = filetargs; t; t = alpm_list_next(t)) { - struct filetarget *ftarg = t->data; - char *targ = ftarg->targ; - regex_t *reg = &ftarg->reg; - int exact_file = ftarg->exact_file; - alpm_list_t *s; - int found = 0; - - for(s = syncs; s; s = alpm_list_next(s)) { - alpm_list_t *p; - alpm_db_t *repo = s->data; - alpm_list_t *packages = alpm_db_get_pkgcache(repo); - int m; - - for(p = packages; p; p = alpm_list_next(p)) { - alpm_pkg_t *pkg = p->data; - alpm_filelist_t *files = alpm_pkg_get_files(pkg); + for(s = syncs; s; s = alpm_list_next(s)) { + alpm_db_t *repo = s->data; + int m; + + alpm_db_files_t *files = alpm_db_files_open(repo); + + if(!files) { + continue; + } + + while(1) { + int ok = alpm_db_files_next(files, &pkgname); + if(ok == 1) { + break; + } + if(ok != 0) { + continue; + } + + if(alpm_db_files_load(files, &filelist) != 0) { + ret = 1; + continue; + } + + alpm_pkg_t *pkg = alpm_db_get_pkg(repo, pkgname); + + for(t = filetargs; t; t = alpm_list_next(t)) { + struct filetarget *ftarg = t->data; + char *targ = ftarg->targ; + regex_t *reg = &ftarg->reg; + int exact_file = ftarg->exact_file; + int found = 0; alpm_list_t *match = NULL; if(exact_file) { - if (regex) { - for(size_t f = 0; f < files->count; f++) { - char *c = files->files[f].name; + if(regex) { + for(size_t f = 0; f < filelist.count; f++) { + char *c = filelist.files[f].name; if(regexec(reg, c, 0, 0, 0) == 0) { - match = alpm_list_add(match, files->files[f].name); + match = alpm_list_add(match, filelist.files[f].name); found = 1; } } } else { - if(alpm_filelist_contains(files, targ)) { + if(alpm_filelist_contains(&filelist, targ)) { match = alpm_list_add(match, targ); found = 1; } } } else { - for(size_t f = 0; f < files->count; f++) { - char *c = strrchr(files->files[f].name, '/'); + for(size_t f = 0; f < filelist.count; f++) { + char *c = strrchr(filelist.files[f].name, '/'); if(c && *(c + 1)) { if(regex) { m = regexec(reg, (c + 1), 0, 0, 0); @@ -188,7 +204,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { m = strcmp(c + 1, targ); } if(m == 0) { - match = alpm_list_add(match, files->files[f].name); + match = alpm_list_add(match, filelist.files[f].name); found = 1; } } @@ -199,28 +215,33 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { print_match(match, repo, pkg, exact_file); alpm_list_free(match); } + + if(!found) { + ret = 1; + } } } - if(!found) { - ret = 1; - } + alpm_db_files_close(files); } cleanup: alpm_list_free_inner(filetargs, (alpm_list_fn_free) filetarget_free); alpm_list_free(filetargs); + alpm_filelist_free(&filelist); + + if(pkgname) { + free(pkgname); + } return ret; } -static void dump_file_list(alpm_pkg_t *pkg) { +static void dump_file_list(alpm_pkg_t *pkg, alpm_filelist_t *pkgfiles) { const char *pkgname; - alpm_filelist_t *pkgfiles; size_t i; pkgname = alpm_pkg_get_name(pkg); - pkgfiles = alpm_pkg_get_files(pkg); for(i = 0; i < pkgfiles->count; i++) { const alpm_file_t *file = pkgfiles->files + i; @@ -239,73 +260,97 @@ static void dump_file_list(alpm_pkg_t *pkg) { static int files_list(alpm_list_t *syncs, alpm_list_t *targets) { alpm_list_t *i, *j; int ret = 0; + size_t found = 0; + alpm_filelist_t filelist = {0}; + char *pkgname = NULL; - if(targets != NULL) { - for(i = targets; i; i = alpm_list_next(i)) { - int found = 0; - char *targ = i->data; - char *repo = NULL; - char *c = strchr(targ, '/'); - - if(c) { - if(! *(c + 1)) { - pm_printf(ALPM_LOG_ERROR, - _("invalid package: '%s'\n"), targ); - ret += 1; - continue; - } + for(j = syncs; j; j = alpm_list_next(j)) { + alpm_db_t *db = j->data; + alpm_db_files_t *files = alpm_db_files_open(db); + + if(!files) { + continue; + } - repo = strndup(targ, c - targ); - targ = c + 1; + while(1) { + int ok = alpm_db_files_next(files, &pkgname); + if(ok == 1) { + break; + } + if(ok != 0) { + continue; } - for(j = syncs; j; j = alpm_list_next(j)) { - alpm_pkg_t *pkg; - alpm_db_t *db = j->data; + if(targets != NULL) { + int match = 0; + for(i = targets; i; i = alpm_list_next(i)) { + char *targ = i->data; + char *c = strchr(targ, '/'); + char *repo = NULL; + + if(c) { + if(! *(c + 1)) { + pm_printf(ALPM_LOG_ERROR, + _("invalid package: '%s'\n"), targ); + ret = 1; + continue; + } - if(repo) { - if(strcmp(alpm_db_get_name(db), repo) != 0) { - continue; + repo = strndup(targ, c - targ); + targ = c + 1; } - } - if((pkg = alpm_db_get_pkg(db, targ)) != NULL) { - found = 1; - if(config->op_f_machinereadable) { - dump_pkg_machinereadable(db, pkg); - } else { - dump_file_list(pkg); + if(repo) { + if(strcmp(alpm_db_get_name(db), repo) != 0) { + free(repo); + continue; + } + free(repo); } - break; + + if(strcmp(pkgname, targ) == 0) { + match = 1; + found++; + break; + } + } + + if(!match) { + continue; } } - if(!found) { - targ = i->data; - pm_printf(ALPM_LOG_ERROR, - _("package '%s' was not found\n"), targ); - ret += 1; + + + if(alpm_db_files_load(files, &filelist) != 0) { + ret = 1; + continue; } - free(repo); - } - } else { - for(i = syncs; i; i = alpm_list_next(i)) { - alpm_db_t *db = i->data; - for(j = alpm_db_get_pkgcache(db); j; j = alpm_list_next(j)) { - alpm_pkg_t *pkg = j->data; - if(config->op_f_machinereadable) { - dump_pkg_machinereadable(db, pkg); - } else { - dump_file_list(pkg); - } + alpm_pkg_t *pkg = alpm_db_get_pkg(db, pkgname); + + if(config->op_f_machinereadable) { + dump_pkg_machinereadable(db, pkg, &filelist); + } else { + dump_file_list(pkg, &filelist); } + break; } + alpm_db_files_close(files); + } + + alpm_filelist_free(&filelist); + + if(found != alpm_list_count(targets)) { + ret = 1; + } + + if(pkgname) { + free(pkgname); } return ret; } - int pacman_files(alpm_list_t *targets) { alpm_list_t *files_dbs = NULL; -- 2.31.1

1 0