- Pacman-dev - lists.archlinux.org

[Git][pacman/pacman][master] pacman-key: Use ngettext for plurals
by Allan McRae (＠allan) 01 Jan '23

01 Jan '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: 3f8029af by Allan McRae at 2023-01-01T13:41:52+10:00 pacman-key: Use ngettext for plurals There are two strings that may be singular or plural in pacman-key. Use ngettext to handle these strings correctly, and provide a fallback function if it is not available. Fixes FS#70556. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/pacman-key.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/3f8029af92752c04a55c67f… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/3f8029af92752c04a55c67f… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] zsh: make names unique to avoid clashes
by Allan McRae (＠allan) 01 Jan '23

01 Jan '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: 6344aab3 by Allan McRae at 2022-12-24T00:55:30+10:00 zsh: make names unique to avoid clashes The function _keys is a bit generic and can result in clashes. Change other functions starting with _key_ to be _pacman_key_ as well. Fixes FS#74507. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - scripts/completion/zsh_completion.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/6344aab3bd4fcbe5f68b56f… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/6344aab3bd4fcbe5f68b56f… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Fix repo-add
by Allan McRae (＠allan) 19 Dec '22

19 Dec '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 52eb094a by morganamilo at 2022-12-19T10:08:57+10:00 Fix repo-add Commit 4f43ce3e4a7829cf9c7f8b28925ddb5a1013ce19 broke repo-add by switching to parseopts without accounting for the added "--". This caused the dbname to always be read as "--". Accounts for "--" and makes repo-add respect "--" as end of opts. - - - - - 1 changed file: - scripts/repo-add.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/52eb094aa26254c4e659959… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/52eb094aa26254c4e659959… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] makepkg.conf: clarify PKGEXT and SRCEXT
by Allan McRae (＠allan) 18 Dec '22

18 Dec '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: a1941973 by Allan McRae at 2022-12-19T09:56:29+10:00 makepkg.conf: clarify PKGEXT and SRCEXT Mention valid suffixes should start with .pkg or .src Fixes FS#64749. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - doc/makepkg.conf.5.asciidoc View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/a19419736916932f8d0017b… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/a19419736916932f8d0017b… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

Fix issues with libintl and libgpgme during builds
by Ziemowit Laski 14 Dec '22

14 Dec '22

This is pretty simple and hopefully self-explanatory, but please do ask questions if needed. Thanks, --Zem From c4a5adf001d3124854572bab561fbe3a21a885d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ziemowit=20=C5=81=C4=85ski?= <15880281+zlaski(a)users.noreply.github.com> Date: Tue, 6 Dec 2022 19:53:57 -0800 Subject: [PATCH] Fix issues with libintl and libgpgme The `libintl` library was not getting pulled in if `ngettext()` was missing but option `i18n` was not specified. The accepted `libgpgme` version was too old, leading to a missing `GPGME_KEYLIST_MODE_LOCATE` macro. Signed-off-by: Ziemowit Łąski <zlaski(a)ziemas.net> --- meson.build | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index c8ee42fd..a6c92276 100644 --- a/meson.build +++ b/meson.build @@ -77,16 +77,21 @@ conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/')) conf.set_quoted('HOOKDIR', join_paths(SYSCONFDIR, 'pacman.d/hooks/')) conf.set_quoted('ROOTDIR', ROOTDIR) -libintl = dependency('', required: false) -if get_option('i18n') - if not cc.has_function('ngettext') - libintl = cc.find_library('intl', required : false, static: get_option('buildstatic')) - if not libintl.found() - error('ngettext not found but NLS support requested') - endif - endif - conf.set('ENABLE_NLS', 1) +# i18n / ngettext +has_ngettext = cc.has_function('ngettext') +libintl = dependency('libintl', + required: false, + static: get_option('buildstatic')) +if not libintl.found() + libintl = cc.find_library('libintl', + required: false, + static: get_option('buildstatic')) +endif +conf.set('HAVE_LIBINTL', libintl.found()) +if not libintl.found() and (get_option('i18n') or not has_ngettext) + error('libintl not found even though ngettext() not found or NLS support requested') endif +conf.set('ENABLE_NLS', 1) # dependencies libarchive = dependency('libarchive', @@ -104,7 +109,7 @@ libcurl = dependency('libcurl', static : get_option('buildstatic')) conf.set('HAVE_LIBCURL', libcurl.found()) -needed_gpgme_version = '>=1.3.0' +needed_gpgme_version = '>=1.12.0' gpgme = dependency('gpgme', version : needed_gpgme_version, required : get_option('gpgme'), @@ -290,7 +295,7 @@ subdir('src/util') subdir('scripts') # Internationalization -if get_option('i18n') +if conf.get('HAVE_LIBINTL') i18n = import('i18n') subdir('lib/libalpm/po') subdir('src/pacman/po') @@ -350,7 +355,7 @@ pacman_bin = executable( pacman_sources, include_directories : includes, link_with : [libalpm, libcommon], - dependencies : [libarchive], + dependencies : [libarchive, libintl], install : true, ) @@ -359,7 +364,7 @@ executable( pacman_conf_sources, include_directories : includes, link_with : [libalpm, libcommon], - dependencies : [libarchive], + dependencies : [libarchive, libintl], install : true, ) @@ -368,7 +373,7 @@ executable( testpkg_sources, include_directories : includes, link_with : [libalpm], - dependencies : [libarchive], + dependencies : [libarchive, libintl], install : true, ) @@ -420,7 +425,7 @@ foreach path : [ join_paths(DATAROOTDIR, 'makepkg-template/'), join_paths(DATAROOTDIR, 'libalpm/hooks/'), ] - meson.add_install_script('sh', '-c', 'mkdir -p "$DESTDIR/@0@"'.format(path)) + meson.add_install_script('sh', '-c', 'mkdir -p "$DESTDIR@0@"'.format(path)) endforeach TEST_ENV = environment() @@ -464,6 +469,7 @@ message('\n '.join([ ' Build docs : @0@'.format(build_doc), ' debug build : @0@'.format(get_option('buildtype') == 'debug'), ' Use libcurl : @0@'.format(conf.get('HAVE_LIBCURL')), + ' Use libintl : @0@'.format(conf.get('HAVE_LIBINTL')), ' Use GPGME : @0@'.format(conf.get('HAVE_LIBGPGME')), ' Use OpenSSL : @0@'.format(conf.has('HAVE_LIBSSL') and conf.get('HAVE_LIBSSL') == 1), -- 2.38.1.windows.1

2 2

[Git][pacman/pacman][master] Bump required GPGME version to 1.12.0
by Allan McRae (＠allan) 13 Dec '22

13 Dec '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: f4f66fcc by Ziemowit Laski at 2022-12-13T11:46:18+10:00 Bump required GPGME version to 1.12.0 GPGME_KEYLIST_MODE_LOCATE was introduced in 1.12.0 Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 1 changed file: - meson.build View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/f4f66fcca7c371c1a1756ff… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/f4f66fcca7c371c1a1756ff… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

RFC: Simple package diff
by Allan McRae 13 Dec '22

13 Dec '22

The idea of package deltas just won't go away... However, binary diffs really are not ideal with pacman verifying the compressed package - that means we need to reconstruct the package on the users system to verify. Also our old approach using xdelta3 somewhat died when moving packages away from gz (or xz?) compression. Other binary diff approaches really suffered the same issue. In general, I find the approach of reconstructing the full package to be suboptimal. I also don't particulaly want to verify uncompressed packages. I wondered if this was a case of perfect being the enemy of good, so I have investigated a different, very lazy approach. Instead of taking a binary diff, we could just provide the files that have changed between package versions. This is super easy to do as we have checksums for all files in the mtree file. We could then extract this "diff" package directly, and use the mtree file to adjust timestamps/permissions/etc(?) on kept files, and it would be just like the full package had been installed. I ran some numbers to see if this was worth while. The results for the last bunch of updates for bash, coreutils, qt5-base and systemd are given here: https://wiki.archlinux.org/title/User:Allan/Pkgdiff On major version updates, this is approach is a waste of time. But for minor updates bash download would average 25% of the size, coreutils about 36% (though was ~1% for simple rebuilds!), qt5-base about 40% and systemd 60%. Not shown but worth noting note that when Arch changes gcc/binutils versions or updates CFLAGS etc, this can stop any binary diff being as useful. If we implemented using these diffs but only allowed it for updates from the previous package version (i.e. no diffs to package (current - 2) or earlier, or diff chaining), then this would be rather simple to implement (at least from the pacman side...). Any comments before I invest time implementing? Allan

3 4

[Git][pacman/pacman][master] 9 commits: libmakepkg: fix compatibility with bash-5.2 patsub_replacement
by Allan McRae (＠allan) 13 Dec '22

13 Dec '22

Allan McRae pushed to branch master at Pacman / Pacman Commits: 0e938f18 by Allan McRae at 2022-12-12T18:37:59+10:00 libmakepkg: fix compatibility with bash-5.2 patsub_replacement Bash-5.2 introduced the patsub_replacement shell option, which is enabled by default. Apparently is it supposed to handle a sed-like idiom, but what it does achieve is making any substitution involving a "&" requiring special care. For makepkg's DLAGENTS, we replace "%o" and "%u" if present. Any "&" in the replacement fields triggers patsub_replacement unless quoted. This is particularly important for the URL field. Add relevant quotes to avoid issues. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 3436bc6c by Allan McRae at 2022-12-13T10:00:13+10:00 Finish comparing all pairs of filenames for duplicates before erroring This also prevents a use-after-free issue where we free the list we are interating over and the do i->next. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 0fe764a2 by Allan McRae at 2022-12-13T10:00:13+10:00 Fix memory leak when setting up download bars Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - ea83fd39 by Allan McRae at 2022-12-13T10:00:13+10:00 Catch possible error in archive_entry_pathname when extracting files Prevents a null deference on error. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 19a85874 by Allan McRae at 2022-12-13T10:00:13+10:00 _alpm_pkg_load_internal: prevent double closing file descriptor Move closing of the file descriptor until the end of the function, as any following error will lead to a "goto error" that attempts to close it again. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 775d511f by Allan McRae at 2022-12-13T10:00:13+10:00 load_packages: fix memory leak on error The memory assigned in _alpm_pkg_load_internal was not freed on error. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 471a0304 by Allan McRae at 2022-12-13T10:00:13+10:00 Avoid NULL deference in curl_check_finished_download We have not set handle in the function at this stage, so we can not assign an error to it. Pass the handle to the function to avoid waiting until the payload is retrieved. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - fcb1d4f8 by Allan McRae at 2022-12-13T10:00:13+10:00 makepkg: package debug source files with options 'debug' and '!strip' When package software with debug symbols without stripping, we should still process the files with debugedit and include the needed source files in the package. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - bb035eba by Allan McRae at 2022-12-13T10:00:13+10:00 gitlab CI: use "meson setup" everywhere Avoids a warning from meson. Signed-off-by: Allan McRae <allan(a)archlinux.org> - - - - - 8 changed files: - .gitlab-ci.yml - lib/libalpm/be_package.c - lib/libalpm/dload.c - lib/libalpm/sync.c - lib/libalpm/util.c - scripts/libmakepkg/source/file.sh.in - scripts/libmakepkg/tidy/strip.sh.in - src/pacman/callback.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/1327ce7bd840686847b019… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/1327ce7bd840686847b019… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] libmakepkg: fix compatibility with bash-5.2 patsub_replacement
by Allan McRae 12 Dec '22

12 Dec '22

Bash-5.2 introduced the patsub_replacement shell option, which is enabled by default. Apparently is it supposed to handle a sed-like idiom, but what it does achieve is making any substitution involving a "&" requiring special care. For makepkg's DLAGENTS, we replace "%o" and "%u" if present. Any "&" in the replacement fields triggers patsub_replacement unless quoted. This is particularly important for the URL field. Add relevant quotes to avoid issues. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Posting to pacman-dev and not just to our gitlab so that this is flagged for distros to backport when updating bash. scripts/libmakepkg/source/file.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index fa09d446..10e0026e 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -60,11 +60,11 @@ download_file() { # replace %o by the temporary dlfile if it exists if [[ ${cmdline[*]} = *%o* ]]; then dlfile=$filename.part - cmdline=("${cmdline[@]//%o/$dlfile}") + cmdline=("${cmdline[@]//%o/"$dlfile"}") fi # add the URL, either in place of %u or at the end if [[ ${cmdline[*]} = *%u* ]]; then - cmdline=("${cmdline[@]//%u/$url}") + cmdline=("${cmdline[@]//%u/"$url"}") else cmdline+=("$url") fi -- 2.38.1

1 0

persistent hooks (inhibit shutdown)
by Andrew Gregory 05 Dec '22

05 Dec '22

If anybody's interested, I've been playing around with more complex hook setups and wrote a hook/script to track the pacman process during transactions and inhibit shutdown.[0] This technique could be used for hooks with pre and post transaction components that need need tighter coupling than separate hooks allow or to setup post transaction hooks that are guaranteed to run even if the transaction fails, unlike our current implementation of PostTransaction hooks. [0]: https://github.com/andrewgregory/pachooks/blob/a15e08d7321f17aae2431bddc1e9…

2 1