- Pacman-dev - lists.archlinux.org

Working on SandboxUser patch
by Allan McRae 12 Feb '23

12 Feb '23

Just to avoid any potential overlap - I am working on the SandboxUser patch that Remi submitted a long while ago... https://lists.archlinux.org/archives/list/pacman-dev@lists.archlinux.org/th… The patch is far too big for me to confidently review in one go, so I am splitting it into smaller sections as I go. Progress can be seen here: https://gitlab.archlinux.org/pacman/pacman/-/commits/allan/privsep Allan

7 21

[PATCH] repo-add: do not recreate the database if nothing was changed
by Ivan Shapovalov 08 Feb '23

08 Feb '23

Signed-off-by: Ivan Shapovalov <intelfx(a)intelfx.name> --- When `repo-add` is used to add a package that already exists in the database, it will recompress the database unconditionally, even if `--new` is passed. Avoid doing that. scripts/repo-add.sh.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 221abdc0..78195de1 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -44,6 +44,8 @@ USE_COLOR='y' PREVENT_DOWNGRADE=0 INCLUDE_SIGS=0 +ENTRIES_CHANGED=0 + # Import libmakepkg source "$LIBRARY"/util/compress.sh source "$LIBRARY"/util/message.sh @@ -343,6 +345,8 @@ db_write_entry() { rm -f ${oldfile} ${oldfile}.sig fi + (( ++ENTRIES_CHANGED )) + return 0 } # end db_write_entry @@ -365,6 +369,9 @@ db_remove_entry() { pkgentry=$(find_pkgentry "$pkgname") done + if [[ $notfound == 0 ]]; then + (( ++ENTRIES_CHANGED )) + fi return $notfound } # end db_remove_entry @@ -684,13 +691,13 @@ for arg in "${args[@]:1}"; do done # if the whole operation was a success, re-zip and rotate databases -if (( !fail )); then +if (( !fail )) && (( ENTRIES_CHANGED > 0 )); then msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE" create_db rotate_db else msg "$(gettext "No packages modified, nothing to do.")" - exit 1 + exit $(( fail != 0 )) fi exit 0 -- 2.38.0

3 6

RFC: Automatically fallback to Arch Linux Archive if all mirrors returned 404
by Yuuta Liang 05 Feb '23

05 Feb '23

Hi, I am using Arch Linux on lots of my personal servers, and most of them are not updated regularly. This causes trouble when I need to install a package on these servers because the requested package versions are already gone from mirrors. Upgrading these machines requires some effort because I need to wait and also manually fix pacnews, so it is not very ad-hoc. This is also an annoying issue on old (well, not the latest I'd say) Arch ISOs. I sometimes use Arch ISO to debug offline Linux systems, and I need to quickly install some debug tools, but my old Arch ISOs usually need to get a full update to install these packages, which is really annoying. Although Arch Linux is currently providing an archive service, it still requires manually typing the URL, which is not very convenient. I would like to work on a patch that automatically falls back to downloading `https://archive.archlinux.org/packages/.all/package_name-version-arch.pkg.tar.xxx` if all mirrors returned 404. The administrator may configure the archive URL prefix in pacman.conf(5). How does that sound? This is only a handy helper for users and will not likely to break any Arch systems except those very old ones, which need to be upgraded to get things working. If it sounds good, I would like to submit the patch as soon as possible, or are there any suggestions? Thank you very much. Best regards, Yuuta Liang

2 1

[Important] Gitlab migation plan for Pacman
by Morten Linderud 03 Jan '23

03 Jan '23

Hi, Some time ago it was decided to migrate the pacman development from the Mailing List to the Gitlab instance hosted by Arch Linux. The pacman source has been hosted there for a while but the development has strictly been conducted on the Mailing List and this is about to change. https://gitlab.archlinux.org/pacman/pacman/ The plan is as follows: 1. Open the patch submission via Gitlab and close the mailing list submission 2. Open the Gitlab issue tracker and close down the flyspry issue tracker 3. Manually migrate bugs from flyspry to Gitlab and close the others. Currently the issue tracker is open on Gitlab, and merge requests have also been enabled for some time. No EOL dates has been set on on patch submission nor flyspry, but I'd encourage any new development to using gitlab instead of the mailing list and flyspry from this point on. I propose we close down Flyspry and patch submission 1st of January 2023. This change also implies decommisioning the Patchwork instance. For this to be done we need to keep track of any unmerged/unreviewed patches from the mailing list. This list has been made and if anything is missing please do reach out. https://gitlab.archlinux.org/pacman/pacman/-/issues/1 There is also some documentation work that needs to be done to direct users from the Mailing List to Gitlab. Any help updating this documentation is very much appreciated. Cheers, Morten Linderud

3 6

[Git][pacman/pacman][master] pacman-key: Fix shell syntax
by Allan McRae (＠allan) 02 Jan '23

02 Jan '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: d35728f9 by Stefan Weil at 2023-01-01T15:54:48+01:00 pacman-key: Fix shell syntax Fixes: 3f8029af92752c04 ("pacman-key: Use ngettext for plurals") Signed-off-by: Stefan Weil <sw(a)weilnetz.de> - - - - - 1 changed file: - scripts/pacman-key.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/d35728f92421eb9e0980fb7… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/d35728f92421eb9e0980fb7… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[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) 19 Dec '22

19 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