- Pacman-dev - lists.archlinux.org

[pacman-dev] Translation of man pages
by Mario Blättermann 19 Sep '21

19 Sep '21

Hello, the translation help page [1] says: --- There are currently no efforts underway to include translated manual pages in the pacman codebase. However, this is not to say translations are unwelcome. If someone has experience with i18n man pages and how to best include them with our source, please contact the pacman-dev mailing list at pacman-dev(a)archlinux.org. --- OK, then let me introduce my approach. Although the man page translations are already maintained in the manpages-l10n project [2] for some years, I think it is it better to use Pacman's upstream tree instead. The external maintenance has some disadvantages: We download distribution packages, create the templates, translate them and release the translated man pages some months later. Besides this delay, we don't know how many users know about the existence of the translated versions. Having the translations in the upstream project (translated using Transifex) would be better, and the localized versions would be released with Pacman itself and always in sync with the English ones. See the attached patch and config file. The patch manpage-markup.diff fixes the Asciidoc markup to get Po4a [3] properly working. After applying the patch, put po4a.cfg in doc/po/. I've imported German, Brazilian Portuguese and French translations from manpages-l10n, but even compressed they are too big for the list. The .po files will follow in separate mails.To test the creation of the translated Asciidoc files, just run 'po4a po4a.cfg'. This command creates a translation template and a subdirectory for each language and saves the resulting files there. Once you have the Asciidoc files, they can be processed further like those in doc/. Unfortunately, I don't have neither Autotools nor Meson knowledge, maybe someone else can help with integration into the build systems? [1] https://archlinux.org/pacman/translation-help.html#_translating_manpages [2] https://salsa.debian.org/manpages-l10n-team/manpages-l10n [3] https://po4a.org/index.php.en Best Regards, Mario

2 5

[pacman-dev] [PATCH] makepkg.conf: Pass -q as the first option to curl
by Evangelos Foutras 15 Sep '21

15 Sep '21

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> --- A team member noticed this when curl 7.79.0 complained about: curl: --continue-at and --remote-header-name cannot be combined Turns out they had specified --remote-header-name in ~/.curlrc. etc/makepkg.conf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index fff5b8eb..5ad3d490 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -9,10 +9,10 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' - 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' - 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' +DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' + 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' 'rsync::/usr/bin/rsync --no-motd -z %u %o' 'scp::/usr/bin/scp -C %u %o')

1 0

[pacman-dev] [PATCH 0/1] makepkg: add support for parallel jobs during compilation
by David Cohen 06 Sep '21

06 Sep '21

Hi, I'm new to Arch community, so I don't know if there's a reason for not having this implemented yet. Whenever I'm trying to compile my own kernel or any other bigger package, makepkg command ends up taking much more time than it should because it doesn't compile with multiple parallel jobs. I implemented this simple patch that adds the -jN option to makepkg and then propagates two variables JOBS and JOBS_ARG to PKGBUILD. With this, the build scripts may support parallel jobs during compilation. E.g. to compile kernel, PKGBUILD could use 'make $JOBS_ARG all' instead of 'make all'. Comments are welcome. Thanks, David --- David Cohen (1): makepkg: add support for parallel jobs during compilation doc/makepkg.8.asciidoc | 7 +++++++ scripts/makepkg.sh.in | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) -- 2.33.0

2 2

[pacman-dev] [Git][pacman/pacman] Pushed new branch morganamilo/vec
by Morgan Adamiec (＠morganamilo) 05 Sep '21

05 Sep '21

Morgan Adamiec pushed new branch morganamilo/vec at Pacman / Pacman -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/tree/morganamilo/vec You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[pacman-dev] [PATCH] Gitlab CI: add --werror to debug build
by Allan McRae 05 Sep '21

05 Sep '21

Catch build warnings in the CI. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- It turns out what I though was a CI failure due to a build warning was really due to configurations being play with by devops... .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 668b97ba..186ad3dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ arch: arch-debug: extends: .arch-test script: - - meson --buildtype=debug build + - meson --buildtype=debug --werror build - ninja -C build - fakechroot meson test -C build -- 2.33.0

1 0

[pacman-dev] [Git][pacman/pacman][master] _alpm_key_import: Initialise fetch_key
by Allan McRae (＠allan) 05 Sep '21

05 Sep '21

Allan McRae pushed to branch master at Pacman / Pacman Commits: 39c3cbdf by Allan McRae at 2021-09-05T09:58:18+10:00 _alpm_key_import: Initialise fetch_key Prevents build warning. Signed-off-by: Allan McRae <allan@archlinux.org> - - - - - 1 changed file: - lib/libalpm/signing.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/39c3cbdf56a2180dfc3102d… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/39c3cbdf56a2180dfc3102d… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[pacman-dev] [PATCH] _alpm_key_import: Initialise fetch_key
by Allan McRae 05 Sep '21

05 Sep '21

Prevents build warning. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Missed this in my testing as I was building in release mode. Luckily our gitlab CI noticed! lib/libalpm/signing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 443682b5..d5cfcfe1 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -495,7 +495,7 @@ static int email_from_uid(const char *uid, char **email) int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr) { int ret = -1; - alpm_pgpkey_t fetch_key; + alpm_pgpkey_t fetch_key = {0}; char *email; if(_alpm_access(handle, handle->gpgdir, "pubring.gpg", W_OK)) { -- 2.33.0

1 0

[pacman-dev] [Git][pacman/pacman][master] 7 commits: repo-add: add --include-sigs option
by Allan McRae (＠allan) 04 Sep '21

04 Sep '21

Allan McRae pushed to branch master at Pacman / Pacman Commits: fbb29b50 by Allan McRae at 2021-09-04T19:52:23+10:00 repo-add: add --include-sigs option Pacman now downloads the signature files for all packages when present in a repository. That makes distributing signatures within repository databases redundant and costly. Do not distribute the package signature files within the repo databases by default and add an --include-sigs to revert to the old behaviour. Signed-off-by: Allan McRae <allan@archlinux.org> - - - - - 2109de61 by morganamilo at 2021-09-04T19:52:23+10:00 libalpm: take alpm_trans_t out of the public API this type is only used internally by alpm Signed-off-by: Allan McRae <allan@archlinux.org> - - - - - c5c6633d by morganamilo at 2021-09-04T19:52:23+10:00 libalpm: rename __foo tyes to _foo __foo is reserved in c and should not be used. Signed-off-by: Allan McRae <allan@archlinux.org> - - - - - e187aa9b by morganamilo at 2021-09-04T19:52:23+10:00 libalpm: use else when setting fingerprint The docs [1] say keyid will always be there, so no need to check if it exists. [1] https://www.gnupg.org/documentation/manuals/gpgme/Key-objects.html Signed-off-by: Allan McRae <allan@archlinux.org> - - - - - 625f3d64 by morganamilo at 2021-09-04T20:43:16+10:00 libalpm: don't use alpm_pgpkey_t in import question When constructing an import question we never really used a proper gpg key. We just zero initialize the key, set the uid and fingerprint, and sent that to the front end. Instead lets just give the import question a uid and fingerprint field. Signed-off-by: Allan McRae <allan@archlinux.org> - - - - - be76f8bf by morganamilo at 2021-09-04T20:46:47+10:00 libalpm: add ALPM_TRANS_FLAG_NOHOOKS Signed-off-by: Allan McRae <allan@archlinux.org> - - - - - 165e4924 by morganamilo at 2021-09-04T20:46:57+10:00 pacman: don't run hooks when using --dbonly --dbonly is meant to only touch the database and not the actual system. However hooks still run which can leave files in place or run commands you may not want. The hooks being run also means `fakeroot pacman -S --dbpath test/ foo --dbonly` fails because alpm tries to chroot for hooks which requires real root. Signed-off-by: Allan McRae <allan@archlinux.org> - - - - - 15 changed files: - doc/repo-add.8.asciidoc - lib/libalpm/alpm.h - lib/libalpm/alpm_list.h - lib/libalpm/db.h - lib/libalpm/diskspace.h - lib/libalpm/graph.h - lib/libalpm/handle.h - lib/libalpm/package.h - lib/libalpm/pkghash.h - lib/libalpm/signing.c - lib/libalpm/trans.c - lib/libalpm/trans.h - scripts/repo-add.sh.in - src/pacman/callback.c - src/pacman/pacman.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/0a6fecd07271a54d9009ea… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/0a6fecd07271a54d9009ea… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[pacman-dev] [PATCH 1/2] libalpm: add ALPM_TRANS_FLAG_NOHOOKS
by morganamilo 04 Sep '21

04 Sep '21

--- lib/libalpm/alpm.h | 3 ++- lib/libalpm/trans.c | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c4acc062..8dab8c62 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -2721,7 +2721,8 @@ typedef enum _alpm_transflag_t { ALPM_TRANS_FLAG_RECURSE = (1 << 5), /** Modify database but do not commit changes to the filesystem. */ ALPM_TRANS_FLAG_DBONLY = (1 << 6), - /* (1 << 7) flag can go here */ + /** Do not run hooks during a transaction */ + ALPM_TRANS_FLAG_NOHOOKS = (1 << 7), /** Use ALPM_PKG_REASON_DEPEND when installing packages. */ ALPM_TRANS_FLAG_ALLDEPS = (1 << 8), /** Only download packages and do not actually install. */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index f22f9bf9..ae5c72ae 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -198,7 +198,8 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) } } - if(_alpm_hook_run(handle, ALPM_HOOK_PRE_TRANSACTION) != 0) { + if(!(trans->flags & ALPM_TRANS_FLAG_NOHOOKS) && + _alpm_hook_run(handle, ALPM_HOOK_PRE_TRANSACTION) != 0) { RET_ERR(handle, ALPM_ERR_TRANS_HOOK_FAILED, -1); } @@ -232,7 +233,10 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) event.type = ALPM_EVENT_TRANSACTION_DONE; EVENT(handle, (void *)&event); alpm_logaction(handle, ALPM_CALLER_PREFIX, "transaction completed\n"); - _alpm_hook_run(handle, ALPM_HOOK_POST_TRANSACTION); + + if(!(trans->flags & ALPM_TRANS_FLAG_NOHOOKS)) { + _alpm_hook_run(handle, ALPM_HOOK_POST_TRANSACTION); + } } trans->state = STATE_COMMITED; -- 2.32.0

2 3

[pacman-dev] [PATCH 1/2] libalpm: don't use alpm_pgpkey_t in import question
by morganamilo 04 Sep '21

04 Sep '21

When constructing an import question we never really used a proper gpg key. We just zero initialize the key, set the uid and fingerprint, and sent that to the front end. Instead lets just give the import question a uid and fingerprint field. --- lib/libalpm/alpm.h | 6 ++++-- lib/libalpm/signing.c | 10 +++------- src/pacman/callback.c | 6 +++--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c4acc062..07833346 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1082,8 +1082,10 @@ typedef struct _alpm_question_import_key_t { alpm_question_type_t type; /** Answer: whether or not to import key */ int import; - /** The key to import */ - alpm_pgpkey_t *key; + /** UID of the key to import */ + const char *uid; + /** Fingerprint the key to import */ + const char *fingerprint; } alpm_question_import_key_t; /** diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index a7be3a1a..bba4e991 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -495,7 +495,7 @@ static int email_from_uid(const char *uid, char **email) int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr) { int ret = -1; - alpm_pgpkey_t fetch_key = {0}; + alpm_pgpkey_t fetch_key; char *email; if(_alpm_access(handle, handle->gpgdir, "pubring.gpg", W_OK)) { @@ -504,19 +504,15 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr) return -1; } - STRDUP(fetch_key.uid, uid, return -1); - STRDUP(fetch_key.fingerprint, fpr, free(fetch_key.uid); return -1); alpm_question_import_key_t question = { .type = ALPM_QUESTION_IMPORT_KEY, .import = 0, - .key = &fetch_key + .uid = uid, + .fingerprint = fpr }; QUESTION(handle, &question); - free(fetch_key.uid); - free(fetch_key.fingerprint); - if(question.import) { /* Try to import the key from a WKD first */ if(email_from_uid(uid, &email) == 0) { diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 99ad716e..c9fe4b2e 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -541,12 +541,12 @@ void cb_question(void *ctx, alpm_question_t *question) { alpm_question_import_key_t *q = &question->import_key; /* the uid is unknown with db signatures */ - if (q->key->uid == NULL) { + if (q->uid == NULL) { q->import = yesno(_("Import PGP key %s?"), - q->key->fingerprint); + q->fingerprint); } else { q->import = yesno(_("Import PGP key %s, \"%s\"?"), - q->key->fingerprint, q->key->uid); + q->fingerprint, q->uid); } } break; -- 2.31.1

2 1