November 2021 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/3] alpm: add ALPM_TRANS_FLAG_NOKEEP
by morganamilo 25 Jun '22

25 Jun '22

this flag prevents backup files from being kept on package installation. This is useful for resetting a package's config files back to their original state. Implements FS#59908 although with it's own flag name instead of reusing nosave. This allows nokeep to optionally create a pacnew that you can then choose to disable by also setting nosave. --- I actually very dislike NOKEEP but it was the best I could come up with I would have prefered overwrite or nosave but they are taken. Better names are welcome. --- lib/libalpm/alpm.h | 3 ++- lib/libalpm/remove.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 8d8fe243..c6048b63 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -2704,7 +2704,8 @@ int alpm_pkg_mtree_close(const alpm_pkg_t *pkg, struct archive *archive); typedef enum _alpm_transflag_t { /** Ignore dependency checks. */ ALPM_TRANS_FLAG_NODEPS = 1, - /* (1 << 1) flag can go here */ + /** Don't keep backup files when installing packages. */ + ALPM_TRANS_FLAG_NOKEEP = (1 << 1), /** Delete files even if they are tagged as backup. */ ALPM_TRANS_FLAG_NOSAVE = (1 << 2), /** Ignore version numbers when checking dependencies. */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index de39724a..233fff0c 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -575,7 +575,9 @@ static int should_skip_file(alpm_handle_t *handle, { return _alpm_fnmatch_patterns(handle->noupgrade, path) == 0 || alpm_list_find_str(handle->trans->skip_remove, path) - || (newpkg && _alpm_needbackup(path, newpkg) + || (!(handle->trans->flags & ALPM_TRANS_FLAG_NOKEEP) + && newpkg + && _alpm_needbackup(path, newpkg) && alpm_filelist_contains(alpm_pkg_get_files(newpkg), path)); } -- 2.33.0

2 3

[pacman-dev] [PATCH] Print the package arch using the %a format specifier.
by Jonathan Sköld 02 Jan '22

02 Jan '22

Adds the %a format specifier to allow printing of the package arch when using --print-format. Signed-off-by: Jonathan Sköld <arch(a)skold.dev> --- src/pacman/util.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pacman/util.c b/src/pacman/util.c index 5486e7a5..bb57e950 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1146,6 +1146,12 @@ void print_packages(const alpm_list_t *packages) alpm_pkg_t *pkg = i->data; char *string = strdup(config->print_format); char *temp = string; + /* %a : pkgarch */ + if(strstr(temp, "%a")) { + string = strreplace(temp, "%a", alpm_pkg_get_arch(pkg)); + free(temp); + temp = string; + } /* %n : pkgname */ if(strstr(temp, "%n")) { string = strreplace(temp, "%n", alpm_pkg_get_name(pkg)); -- 2.33.0

2 2

[PATCH 1/2] pacman: support multiple chomps at the same time
by Sefa Eyeoglu 02 Jan '22

02 Jan '22

When two progressbars are present, one of them always had c while the other always had C as the mouth --- src/pacman/callback.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 2579b98a..cb8f4302 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -156,12 +156,11 @@ static void fill_progress(const int bar_percent, const int disp_percent, /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ const int hashlen = proglen > 8 ? proglen - 8 : 0; const int hash = bar_percent * hashlen / 100; - static int lasthash = 0, mouth = 0; + static int lasthash = 0; int i; if(bar_percent == 0) { lasthash = 0; - mouth = 0; } if(hashlen > 0) { @@ -173,15 +172,14 @@ static void fill_progress(const int bar_percent, const int disp_percent, putchar('-'); } else if(i == hashlen - hash) { if(lasthash == hash) { - if(mouth) { + if(i % 2 == 0) { fputs("\033[1;33mC\033[m", stdout); } else { fputs("\033[1;33mc\033[m", stdout); } } else { lasthash = hash; - mouth = mouth == 1 ? 0 : 1; - if(mouth) { + if(i % 2 == 0) { fputs("\033[1;33mC\033[m", stdout); } else { fputs("\033[1;33mc\033[m", stdout); @@ -252,7 +250,7 @@ void cb_event(void *ctx, alpm_event_t *event) alpm_event_hook_run_t *e = &event->hook_run; int digits = number_length(e->total); printf("(%*zu/%*zu) %s\n", digits, e->position, - digits, e->total, + digits, e->total, e->desc ? e->desc : e->name); } break; -- 2.33.1

2 3

[PATCH] fix: release transaction lock before unregistering syncdbs
by Kevin Morris 22 Nov '21

22 Nov '21

Signed-off-by: Kevin Morris <kevr(a)0cost.org> --- `alpm_unregister_all_syncdbs` errors out when a transaction is held. Since this function closes transactions as-is, moving this call below the transaction unlock step solves issues that `pyalpm` sees when it cleans up the handle. lib/libalpm/alpm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 6708e202..1c38feb8 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -107,10 +107,6 @@ int SYMEXPORT alpm_release(alpm_handle_t *myhandle) myhandle->db_local = NULL; } - if(alpm_unregister_all_syncdbs(myhandle) == -1) { - ret = -1; - } - #ifdef HAVE_LIBCURL curl_multi_cleanup(myhandle->curlm); curl_global_cleanup(); @@ -118,6 +114,11 @@ int SYMEXPORT alpm_release(alpm_handle_t *myhandle) #endif _alpm_handle_unlock(myhandle); + + if(alpm_unregister_all_syncdbs(myhandle) == -1) { + ret = -1; + } + _alpm_handle_free(myhandle); return ret; -- 2.34.0

3 3

[Git][pacman/pacman][master] 8 commits: remove YouCompleteMe config
by Andrew Gregory (＠andrew) 22 Nov '21

22 Nov '21

Andrew Gregory pushed to branch master at Pacman / Pacman Commits: 529e208f by Andrew Gregory at 2021-11-20T12:22:06-08:00 remove YouCompleteMe config Added, seemingly by accident, with meson in 51db84750ece4de58923d4ce43cb0638ef150f5f Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> - - - - - b242f5f2 by Vladimir Panteleev at 2021-11-20T12:36:29-08:00 libalpm: Log URLs when retrying Allow finding which mirror was used to fetch a file. This makes it a bit easier to debug situations in which mirrors serve bad files with HTTP 200. Signed-off-by: Vladimir Panteleev <archlinux(a)cy.md> - - - - - 806ccd90 by Carlo Teubner at 2021-11-20T12:36:59-08:00 "pacman -Q --changelog": fix writing uninit'd mem Previously, when printing a package changelog to stdout, we would write chunks of data that were not necessarily nul-terminated to stdout using a function (fputs) which requires the input string to be nul-terminated. On my system, this would result in occasional garbage characters showing up in the "pacman -Qc" output. Fix this by never nul-terminating the chunk, and using the fwrite() function which takes an explicit input size and does not require a nul-terminated string. Signed-off-by: Carlo Teubner <carlo(a)cteubner.net> - - - - - b0a2fd75 by morganamilo at 2021-11-20T12:38:25-08:00 Update mailing list url change pacman-dev(a)archlinux.org to pacmandev(a)lists.archlinux.org Most of this is copyright notices but this also fixes FS#72129 by updating the address in docs/index.asciidoc. - - - - - fed52277 by Evangelos Foutras at 2021-11-20T12:38:57-08:00 makepkg.conf: Pass -q as the first option to curl As per curl(1), the -q (--disable) option must be first on the command line to disable reading the curlrc config file. Without being first it does not appear to have any effect. Signed-off-by: Evangelos Foutras <evangelos(a)foutrelis.com> - - - - - 5287cc72 by morganamilo at 2021-11-20T12:39:22-08:00 alpm: fix wrong access() being used When removing files we check _alpm_access() to see if we can write (delete) the file. If not, we check if the file exists because if the file does not exist then we don't actually need to remove it so there's no issue. However the second call uses acess() instead of _alpm_access() which does not the rootdir into account. - - - - - 53523670 by Allan McRae at 2021-11-20T12:39:42-08:00 Prevent translation of curl Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - d21fb58d by Allan McRae at 2021-11-21T09:54:56-08:00 Gitlab CI: add --werror to debug build Catch build warnings in the CI. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 30 changed files: - .gitlab-ci.yml - − .ycm_extra_conf.py - doc/index.asciidoc - doc/translation-help.asciidoc - etc/makepkg.conf.in - lib/libalpm/add.c - lib/libalpm/add.h - lib/libalpm/alpm.c - lib/libalpm/alpm.h - lib/libalpm/alpm_list.c - lib/libalpm/alpm_list.h - lib/libalpm/backup.c - lib/libalpm/backup.h - lib/libalpm/be_local.c - lib/libalpm/be_package.c - lib/libalpm/be_sync.c - lib/libalpm/conflict.c - lib/libalpm/conflict.h - lib/libalpm/db.c - lib/libalpm/db.h - lib/libalpm/deps.c - lib/libalpm/deps.h - lib/libalpm/diskspace.c - lib/libalpm/diskspace.h - lib/libalpm/dload.c - lib/libalpm/dload.h - lib/libalpm/error.c - lib/libalpm/filelist.c - lib/libalpm/filelist.h - lib/libalpm/graph.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/39c3cbdf56a2180dfc3102… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/39c3cbdf56a2180dfc3102… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] Permit `--search=…` in `-Q` and `-S` to allow for e.g. `--search=-doc`
by Fredrick Brennan 22 Nov '21

22 Nov '21

Greetings pacman-dev: Currently, pacman does not allow one to run `pacman -S --search=-doc`, because despite documentation saying `--search` takes `<regexp>`, actually it is implemented as using the targets to determine what to search for. It is quite difficult to figure out how to carry out this search query, and needlessly so, though `--search '\\-doc'` does work. The cumulative effect of the two attached patches fixes it, allowing an easier way to search for arbitrary strings which may conflict with command line options. -- Best, Fred Brennan [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] GnuPG: 6F12 EC72 A82A BCA3 5235 063A 10DD C983 901A A183 Twitter: @fr_brennan Personal website <https://dba.gg/>

2 1

Install scriptlets source root users .bashrc when pacman is run through sudo
by brainpower 15 Nov '21

15 Nov '21

Hi, recently I had very weird behavior when running pacman from an unprivileged user account using sudo compared to running `sudo -i` and then running pacman from the root user on one of my Arch Linux systems. In the first case, post_upgrade, post_install or similar where NOT run, in the second case they ran fine. I was very confused by that, spent quite some time staring at pacman.conf, /etc/sudoers and /etc/sudo.conf comparing those to machines where this weird behavior did not happen and not spotting any differences... I then had the idea to `strace -f` both cases, and found the following: When running `sudo pacman ...` the bash process spawned by pacman to execute the install script reads and executes "/root/.bashrc" and I had some old leftover code in there which basicly did `exit 0` (my default shell is zsh, so that went unnoticed) thus exiting bash before it could execute the packages install script. When executing pacman from a root shell (even when gained by `sudo -i` for example) the spawned bash does not source "/root/.bashrc". (Which is the behavior I'd expect, since it should be a non-interactive bash process, right?) I've added a simple testcase below that shows both behaviors. So, I guess in the first case bash considers itself to be interactive somehow even if it should not? I've got no idea how it could come to that conclusion... IIRC, one usually checks if stdin is a tty, pty or something like that and bash does indeed something like that if I read this correctly: https://git.savannah.gnu.org/cgit/bash.git/tree/shell.c#n523 Though having '-c' should even short-cuircuit that "if" to not even try to check for ttys. But maybe it does something weird later... Also in _alpm_run_chroot() I see that stdin, stdout and stderr get closed and then connected to pipes, before execv() so they couldn't even be a tty or pty... or can they? But then they would have to be even when pacman is not run through sudo... I'd guess. So I'm kind of stuck at figuring out why that happens. Anyone of you seeing something I'm missing here? I did of course remove that old code from that .bashrc which caused the initial problem, so package install scripts run fine now. But pacman should maybe try to disable/remove such side effects if it can? root@pc # cat /root/.bashrc echo "This is /root/.bashrc !" user@pc % sudo pacman -U installtest-1-1-x86_64.pkg.tar.zst loading packages... warning: installtest-1-1 is up to date -- reinstalling resolving dependencies... looking for conflicting packages... Package (1) Old Version New Version Net Change installtest 1-1 1-1 0.00 MiB :: Proceed with installation? [Y/n] (1/1) checking keys in keyring [######################] 100% (1/1) checking package integrity [######################] 100% (1/1) loading package files [######################] 100% (1/1) checking for file conflicts [######################] 100% (1/1) checking available disk space [######################] 100% :: Processing package changes... (1/1) reinstalling installtest [######################] 100% This is /root/.bashrc ! post_upgrade 1-1 1-1 :: Running post-transaction hooks... (1/1) Update pacman-ps data user@pc % sudo -i root@pc # pacman -U installtest-1-1-x86_64.pkg.tar.zst loading packages... warning: installtest-1-1 is up to date -- reinstalling resolving dependencies... looking for conflicting packages... Package (1) Old Version New Version Net Change installtest 1-1 1-1 0.00 MiB :: Proceed with installation? [Y/n] (1/1) checking keys in keyring [######################] 100% (1/1) checking package integrity [######################] 100% (1/1) loading package files [######################] 100% (1/1) checking for file conflicts [######################] 100% (1/1) checking available disk space [######################] 100% :: Processing package changes... (1/1) reinstalling installtest [######################] 100% post_upgrade 1-1 1-1 :: Running post-transaction hooks... (1/1) Update pacman-ps data user@pc % cat PKGBUILD pkgname=installtest pkgver=1 pkgrel=1 arch=(x86_64) install=installtest.install package() { true } user@pc % cat installtest.install post_upgrade() { echo "post_upgrade" "$@" } post_install() { echo "post_install" "$@" } post_remove() { echo "post_remove" "$@" } -- regards, brainpower

2 5

[PATCH] remove YouCompleteMe config
by Andrew Gregory 15 Nov '21

15 Nov '21

Added, seemingly by accident, with meson in 51db84750ece4de58923d4ce43cb0638ef150f5f Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- .ycm_extra_conf.py | 250 --------------------------------------------- 1 file changed, 250 deletions(-) delete mode 100644 .ycm_extra_conf.py diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py deleted file mode 100644 index f297deef..00000000 --- a/.ycm_extra_conf.py +++ /dev/null @@ -1,250 +0,0 @@ -#!/usr/bin/env python - -# SPDX-License-Identifier: Unlicense -# -# Based on the template file provided by the 'YCM-Generator' project authored by -# Reuben D'Netto. -# Jiahui Xie has re-reformatted and expanded the original script in accordance -# to the requirements of the PEP 8 style guide and 'systemd' project, -# respectively. -# -# The original license is preserved as it is. -# -# -# This is free and unencumbered software released into the public domain. -# -# Anyone is free to copy, modify, publish, use, compile, sell, or -# distribute this software, either in source code form or as a compiled -# binary, for any purpose, commercial or non-commercial, and by any -# means. -# -# In jurisdictions that recognize copyright laws, the author or authors -# of this software dedicate any and all copyright interest in the -# software to the public domain. We make this dedication for the benefit -# of the public at large and to the detriment of our heirs and -# successors. We intend this dedication to be an overt act of -# relinquishment in perpetuity of all present and future rights to this -# software under copyright law. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -# For more information, please refer to <http://unlicense.org/> - -""" -YouCompleteMe configuration file tailored to support the 'meson' build system -used by the 'systemd' project. -""" - -import glob -import os -import ycm_core - - -SOURCE_EXTENSIONS = (".C", ".cpp", ".cxx", ".cc", ".c", ".m", ".mm") -HEADER_EXTENSIONS = (".H", ".h", ".hxx", ".hpp", ".hh") - - -def DirectoryOfThisScript(): - """ - Return the absolute path of the parent directory containing this - script. - """ - return os.path.dirname(os.path.abspath(__file__)) - - -def GuessBuildDirectory(): - """ - Guess the build directory using the following heuristics: - - 1. Returns the current directory of this script plus 'build' - subdirectory in absolute path if this subdirectory exists. - - 2. Otherwise, probes whether there exists any directory - containing '.ninja_log' file two levels above the current directory; - returns this single directory only if there is one candidate. - """ - result = os.path.join(DirectoryOfThisScript(), "build") - - if os.path.exists(result): - return result - - result = glob.glob(os.path.join(DirectoryOfThisScript(), - "..", "..", "*", ".ninja_log")) - - if not result: - return "" - - if 1 != len(result): - return "" - - return os.path.split(result[0])[0] - - -def TraverseByDepth(root, include_extensions): - """ - Return a set of child directories of the 'root' containing file - extensions specified in 'include_extensions'. - - NOTE: - 1. The 'root' directory itself is excluded from the result set. - 2. No subdirectories would be excluded if 'include_extensions' is left - to 'None'. - 3. Each entry in 'include_extensions' must begin with string '.'. - """ - is_root = True - result = set() - # Perform a depth first top down traverse of the given directory tree. - for root_dir, subdirs, file_list in os.walk(root): - if not is_root: - # print("Relative Root: ", root_dir) - # print(subdirs) - if include_extensions: - get_ext = os.path.splitext - subdir_extensions = { - get_ext(f)[-1] for f in file_list if get_ext(f)[-1] - } - if subdir_extensions & include_extensions: - result.add(root_dir) - else: - result.add(root_dir) - else: - is_root = False - - return result - - -_project_src_dir = os.path.join(DirectoryOfThisScript(), "src") -_include_dirs_set = TraverseByDepth(_project_src_dir, frozenset({".h"})) -flags = [ - "-x", - "c" - # The following flags are partially redundant due to the existence of - # 'compile_commands.json'. - # '-Wall', - # '-Wextra', - # '-Wfloat-equal', - # '-Wpointer-arith', - # '-Wshadow', - # '-std=gnu99', -] - -for include_dir in _include_dirs_set: - flags.append("-I" + include_dir) - -# Set this to the absolute path to the folder (NOT the file!) containing the -# compile_commands.json file to use that instead of 'flags'. See here for -# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html -# -# You can get CMake to generate this file for you by adding: -# set( CMAKE_EXPORT_COMPILE_COMMANDS 1 ) -# to your CMakeLists.txt file. -# -# Most projects will NOT need to set this to anything; you can just change the -# 'flags' list of compilation flags. Notice that YCM itself uses that approach. -compilation_database_folder = GuessBuildDirectory() - -if os.path.exists(compilation_database_folder): - database = ycm_core.CompilationDatabase(compilation_database_folder) -else: - database = None - - -def MakeRelativePathsInFlagsAbsolute(flags, working_directory): - """ - Iterate through 'flags' and replace the relative paths prefixed by - '-isystem', '-I', '-iquote', '--sysroot=' with absolute paths - start with 'working_directory'. - """ - if not working_directory: - return list(flags) - new_flags = [] - make_next_absolute = False - path_flags = ["-isystem", "-I", "-iquote", "--sysroot="] - for flag in flags: - new_flag = flag - - if make_next_absolute: - make_next_absolute = False - if not flag.startswith("/"): - new_flag = os.path.join(working_directory, flag) - - for path_flag in path_flags: - if flag == path_flag: - make_next_absolute = True - break - - if flag.startswith(path_flag): - path = flag[len(path_flag):] - new_flag = path_flag + os.path.join(working_directory, path) - break - - if new_flag: - new_flags.append(new_flag) - return new_flags - - -def IsHeaderFile(filename): - """ - Check whether 'filename' is considered as a header file. - """ - extension = os.path.splitext(filename)[1] - return extension in HEADER_EXTENSIONS - - -def GetCompilationInfoForFile(filename): - """ - Helper function to look up compilation info of 'filename' in the 'database'. - """ - # The compilation_commands.json file generated by CMake does not have - # entries for header files. So we do our best by asking the db for flags for - # a corresponding source file, if any. If one exists, the flags for that - # file should be good enough. - if not database: - return None - - if IsHeaderFile(filename): - basename = os.path.splitext(filename)[0] - for extension in SOURCE_EXTENSIONS: - replacement_file = basename + extension - if os.path.exists(replacement_file): - compilation_info = \ - database.GetCompilationInfoForFile(replacement_file) - if compilation_info.compiler_flags_: - return compilation_info - return None - return database.GetCompilationInfoForFile(filename) - - -def FlagsForFile(filename, **kwargs): - """ - Callback function to be invoked by YouCompleteMe in order to get the - information necessary to compile 'filename'. - - It returns a dictionary with a single element 'flags'. This element is a - list of compiler flags to pass to libclang for the file 'filename'. - """ - if database: - # Bear in mind that compilation_info.compiler_flags_ does NOT return a - # python list, but a "list-like" StringVec object - compilation_info = GetCompilationInfoForFile(filename) - if not compilation_info: - return None - - final_flags = MakeRelativePathsInFlagsAbsolute( - compilation_info.compiler_flags_, - compilation_info.compiler_working_dir_) - - else: - relative_to = DirectoryOfThisScript() - final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to) - - return { - "flags": final_flags, - "do_cache": True - } -- 2.33.1

1 0

Setting ld option in meson so that "--no-undefined" option can be toggled
by Budi 11 Nov '21

11 Nov '21

How are ww setting ld option in meson so that "--no-undefined" option can be omitted or toggled off and it'll link without this command option

2 1

Seting ld option in meson so that "--no-undefined" option can be off
by Budi 06 Nov '21

06 Nov '21

How do we set ld option in meson so that "--no-undefined" option can be toggled which in this case it is to omitted (toggled off)

2 1