- Pacman-dev - lists.archlinux.org

[Git][pacman/pacman][master] Update copyright years
by Allan McRae (＠allan) 02 Jan '22

02 Jan '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 90df85e9 by Allan McRae at 2022-01-02T13:34:52+10:00 Update copyright years ./build-aux/update-copyright 2021 2022 Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 30 changed files: - doc/index.asciidoc - 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 - lib/libalpm/graph.h - lib/libalpm/group.c - lib/libalpm/group.h - lib/libalpm/handle.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/90df85e9cf2fef38442345e… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/90df85e9cf2fef38442345e… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] makepkg: Handle invalid files in strip
by Morten Linderud 02 Jan '22

02 Jan '22

From: Morten Linderud <morten(a)linderud.pw> makepkg does a fairly naive pass on the DWARF files to generate source files. If this is done on things like Golang it will give strip a list of files that are truncated paths or completely invalid virtual paths for the runtime to interpret. We also explicitly only allow source files that contains the given debug source directory. We depend on this for file lookup and it would produce invalid packages with weird paths if they are not present. Signed-off-by: Morten Linderud <morten(a)linderud.pw> --- scripts/libmakepkg/tidy/strip.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 92a6fb15..d9eb8a95 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -60,11 +60,11 @@ strip_file() { while IFS= read -r t; do file=${t/${dbgsrcdir}/"$srcdir"} dest="${dbgsrc/"$dbgsrcdir"/}$t" - if ! [[ -f $dest ]]; then + if [[ -f "$file" ]] && ! [[ -f $dest ]]; then mkdir -p "${dest%/*}" cp -- "$file" "$dest" fi - done < <(source_files "$binary") + done < <(source_files "$binary" | grep "$dbgsrcdir") # copy debug symbols to debug directory mkdir -p "$dbgdir/${binary%/*}" -- 2.34.1

2 2

[Git][pacman/pacman][master] 9 commits: Fix file permissions
by Allan McRae (＠allan) 29 Dec '21

29 Dec '21

Allan McRae pushed to branch master at Pacman / Pacman Commits: 37109600 by Allan McRae at 2021-12-12T14:34:53+10:00 Fix file permissions - - - - - 26ee6ff6 by Allan McRae at 2021-12-24T17:59:32+10:00 LTO: Add -flto to LDFLAGS for clang GCC automatically detects when it is linking LTO objects, but clang does not. Add -flto to LDFLAGS to make this work for clang too. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 354a300c by Allan McRae at 2021-12-29T15:20:05+10:00 makepkg: remove libdepends and libprovides This will be replaced by a better system Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 060ab4a2 by Allan McRae at 2021-12-29T15:20:05+10:00 libmakepkg: add framework for autodeps Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - b2342800 by Allan McRae at 2021-12-29T15:20:05+10:00 libmakepkg: automatically add library sonames to provides When the option "autodeps" is enabled, makepkg will add provides entries for libraries found in the directories specified in LIB_DIRS in makepkg.conf. The entries LIB_DIRS array have the format "prefix:directory". For example, the entry "lib:usr/lib" will search $pkgdir/usr/lib for library sonames and add "lib:libfoo.so.1" to the provides array. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 9b766bad by Allan McRae at 2021-12-29T15:20:05+10:00 libmakepkg: automatically add library dependencies Add linked libraries to a packages dependency list. This is the partner to automatically generated library provides, and thus depends take the same format. To help with bootstrapping, library dependencies are only added if the relevant provide exists. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 3a112668 by morganamilo at 2021-12-29T15:49:35+10:00 pacman: improve backup printing 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 58c81fa2 by morganamilo at 2021-12-29T16:16:18+10:00 alpm: return -1 for error in find_dl_candidates This is the error value generally used and the calling function explicitly checks for -1, later causing the error to be missed and the transaction to continue. > pacman -S xterm warning: xterm-369-1 is up to date -- reinstalling resolving dependencies... looking for conflicting packages... Package (1) Old Version New Version Net Change Download Size extra/xterm 369-1 369-1 0.00 MiB 0.42 MiB Total Download Size: 0.42 MiB Total Installed Size: 1.05 MiB Net Upgrade Size: 0.00 MiB :: Proceed with installation? [Y/n] error: no servers configured for repository: extra (1/1) checking keys in keyring [--------------------------------------------------------] 100% (1/1) checking package integrity [--------------------------------------------------------] 100% error: failed to commit transaction (wrong or NULL argument passed) Errors occurred, no packages were upgraded. - - - - - 9f236547 by Oskar Roesler (bionade24) via pacman-dev at 2021-12-29T17:53:51+10:00 pacman: print additional error information to stderr Prints extra information provided by file conflict or corrupt package messages to stderr instead of stdout Signed-off-by: Oskar Roesler (bionade24) <o.roesler(a)oscloud.info> Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 15 changed files: - doc/PKGBUILD.5.asciidoc - doc/makepkg.conf.5.asciidoc - etc/makepkg.conf.in - lib/libalpm/sync.c - + scripts/libmakepkg/autodep.sh.in - + scripts/libmakepkg/autodep/library_depends.sh.in - + scripts/libmakepkg/autodep/library_provides.sh.in - + scripts/libmakepkg/autodep/meson.build - scripts/libmakepkg/buildenv/lto.sh.in - scripts/libmakepkg/lint_config.sh.in - scripts/libmakepkg/meson.build - scripts/makepkg.sh.in - src/pacman/package.c - src/pacman/package.h - src/pacman/sync.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/d21fb58da30a2bed405f96… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/d21fb58da30a2bed405f96… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

Interest in other signature libs/tools?
by Jeremy Huntwork 27 Dec '21

27 Dec '21

Hello, I've been using pacman for a little while in Mere Linux (https://github.com/jhuntwork/merelinux) In trying to keep things simple, I sidestepped support for digital signatures for a while, but I'm now at a point where I'd like to include it. However, I'd prefer not to use gpgme and friends. I'd rather use a more modern and simpler library. I've been looking at things like minisign and signify. Recently I found https://github.com/vstakhov/asignify which snapped into pacman pretty easily and is pretty much exactly what I'm looking for. At the moment I only have a pretty hacky patch to make it work, so nothing that is ready to share here. But I wanted to gauge if there is any interest in supporting different libraries/tools, or if I would need to maintain my own patch downstream. Thanks much for your good work and any feedback you may have. JH

3 7

[PATCH] LTO: Add -flto to LDFLAGS for clang
by Allan McRae 24 Dec '21

24 Dec '21

GCC automatically detects when it is linking LTO objects, but clang does not. Add -flto to LDFLAGS to make this work for clang too. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/buildenv/lto.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in index 1f1ca53f..c3bd0fa4 100644 --- a/scripts/libmakepkg/buildenv/lto.sh.in +++ b/scripts/libmakepkg/buildenv/lto.sh.in @@ -33,5 +33,6 @@ buildenv_lto() { if check_option "lto" "y"; then CFLAGS+=" -flto" CXXFLAGS+=" -flto" + LDFLAGS+=" -flto" fi } -- 2.34.1

1 0

[PATCH] Replace libdepends/libprovides
by Allan McRae 14 Dec '21

14 Dec '21

This patch series replaces the old libdepends/libprovides system into something akin to that used by APK. In short, makepkg.conf will have a variable like: LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32') At the end of package building, makepkg will look in the library directories and add a provide. E.g. for pacman: provide = lib:libalpm.so.13 Note the prefix matches the prefix given to the relevant directory in LIB_DIRS. Similarly, makepkg can add dependencies on libraries. E.g. pacman may have: depends = lib:libgpgme.so.11 Note, to help with bootstrapping this system, or if packages just do not want to add libprovides, the depends entries are only added if a package actually provides them. This is different to the APK system for libraries which uses "so" as the prefix and is not configurable. But Alpine used musl, which has no concept of multilib, so we need to be a bit more flexible. The dependency/provides addotions can all be disabled in pacman.conf with the '!autodeps' option. Note that APK has similar things for binaries and pkg-config files. e.g. provides = cmd:pacman provides = pc:libalpm These can readily be added as dropins to libmakepkg. Allan McRae (4): makepkg: remove libdepends and libprovides libmakepkg: add framework for autodeps libmakepkg: automatically add library sonames to provides libmakepkg: automatically add library dependencies doc/PKGBUILD.5.asciidoc | 9 -- doc/makepkg.conf.5.asciidoc | 11 ++ etc/makepkg.conf.in | 8 +- scripts/libmakepkg/autodep.sh.in | 38 ++++++ .../libmakepkg/autodep/library_depends.sh.in | 75 +++++++++++ .../libmakepkg/autodep/library_provides.sh.in | 56 +++++++++ scripts/libmakepkg/autodep/meson.build | 18 +++ scripts/libmakepkg/meson.build | 1 + scripts/makepkg.sh.in | 119 +----------------- 9 files changed, 206 insertions(+), 129 deletions(-) create mode 100644 scripts/libmakepkg/autodep.sh.in create mode 100644 scripts/libmakepkg/autodep/library_depends.sh.in create mode 100644 scripts/libmakepkg/autodep/library_provides.sh.in create mode 100644 scripts/libmakepkg/autodep/meson.build -- 2.34.1

4 13

[PATCH] Make unlocking error messages uniform
by Ashok Gautham Jadatharan 02 Dec '21

02 Dec '21

Upon failing to unlock the database, pacman -Su provides a useful tip related to unlocking it by deleting /var/lib/pacman/db.lck if it already exists. This fixes pacman -Syu to provide the same tip upon failing to lock. Signed-off-by: Ashok Gautham Jadatharan <ScriptDevil(a)zoho.com> --- src/pacman/util.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 0f50ae0b..d3422739 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -152,12 +152,25 @@ int sync_syncdbs(int level, alpm_list_t *syncs) { int ret; int force = (level < 2 ? 0 : 1); + alpm_errno_t err; multibar_move_completed_up(false); ret = alpm_db_update(config->handle, syncs, force); + if(ret < 0) { + err = alpm_errno(config->handle); pm_printf(ALPM_LOG_ERROR, _("failed to synchronize all databases (%s)\n"), - alpm_strerror(alpm_errno(config->handle))); + alpm_strerror(err)); + + if(err == ALPM_ERR_HANDLE_LOCK) { + const char *lockfile = alpm_option_get_lockfile(config->handle); + pm_printf(ALPM_LOG_ERROR, _("could not lock database: %s\n"), + strerror(errno)); + if(access(lockfile, F_OK) == 0) { + fprintf(stderr, _(" if you're sure a package manager is not already\n" + " running, you can remove %s\n"), lockfile); + } + } } return (ret >= 0); -- 2.34.1

1 0

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

21 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) 21 Nov '21

21 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 21 Nov '21

21 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