- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] libalpm: ignore .hook suffix when sorting hooks
by Jouke Witteveen 03 Aug '18

03 Aug '18

It is desirable to have 'a-post.hook' ordered after 'a.hook'. For this, it is needed to ignore the suffix when sorting. --- Two years ago, I suggested this patch in https://bugs.archlinux.org/task/49653. Today, I do so again :-). Thanks to Jelle van der Waa for pointing me to the correct list. Regards, - Jouke lib/libalpm/hook.c | 16 ++++++++++++---- lib/libalpm/hook.h | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index 0805e661..d90ed2da 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -551,7 +551,16 @@ static int _alpm_hook_triggered(alpm_handle_t *handle, struct _alpm_hook_t *hook static int _alpm_hook_cmp(struct _alpm_hook_t *h1, struct _alpm_hook_t *h2) { - return strcmp(h1->name, h2->name); + size_t suflen = strlen(ALPM_HOOK_SUFFIX), l1, l2; + int ret; + l1 = strlen(h1->name) - suflen; + l2 = strlen(h2->name) - suflen; + /* exclude the suffixes from comparison */ + ret = strncmp(h1->name, h2->name, l1 <= l2 ? l1 : l2); + if(ret == 0 && l1 != l2) { + return l1 < l2 ? -1 : 1; + } + return ret; } static alpm_list_t *find_hook(alpm_list_t *haystack, const void *needle) @@ -634,8 +643,7 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) alpm_event_hook_t event = { .when = when }; alpm_event_hook_run_t hook_event; alpm_list_t *i, *hooks = NULL, *hooks_triggered = NULL; - const char *suffix = ".hook"; - size_t suflen = strlen(suffix), triggered = 0; + size_t suflen = strlen(ALPM_HOOK_SUFFIX), triggered = 0; int ret = 0; for(i = alpm_list_last(handle->hookdirs); i; i = alpm_list_previous(i)) { @@ -681,7 +689,7 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) memcpy(path + dirlen, entry->d_name, name_len + 1); if(name_len < suflen - || strcmp(entry->d_name + name_len - suflen, suffix) != 0) { + || strcmp(entry->d_name + name_len - suflen, ALPM_HOOK_SUFFIX) != 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "skipping non-hook file %s\n", path); continue; } diff --git a/lib/libalpm/hook.h b/lib/libalpm/hook.h index 364d22d7..30d565df 100644 --- a/lib/libalpm/hook.h +++ b/lib/libalpm/hook.h @@ -22,6 +22,8 @@ #include "alpm.h" +#define ALPM_HOOK_SUFFIX ".hook" + int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when); #endif /* ALPM_HOOK_H */ -- 2.17.1

3 6

[pacman-dev] [PATCH] makechrootpkg: handle errors when copying packages into chroot
by juergen＠hoetzel.info 01 Aug '18

01 Aug '18

From: Juergen Hoetzel <juergen(a)archlinux.org> Prevents consequential build errors. Signed-off-by: Juergen Hoetzel <juergen(a)archlinux.org> --- makechrootpkg.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index d81be84..419e495 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -145,8 +145,10 @@ install_packages() { local ret pkgnames=("${install_pkgs[@]##*/}") - - cp -- "${install_pkgs[@]}" "$copydir/root/" + if ! cp -- "${install_pkgs[@]}" "$copydir/root/"; then + error "Cannot copy packages" + return 1 + fi arch-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \ pacman -U --noconfirm -- "${pkgnames[@]/#//root/}" ret=$? -- 2.18.0

2 1

[pacman-dev] [PATCH] doc: Remove double spaces
by Rikard Falkeborn 29 Jul '18

29 Jul '18

Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> --- doc/pacman.conf.5.asciidoc | 2 +- doc/submitting-patches.asciidoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index 5f9def5b..9810fc7f 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -176,7 +176,7 @@ Options operation on a local file. Uses the value from SigLevel as the default. *RemoteFileSigLevel =* ...:: - Set the signature verification level for installing packages using the "-U" + Set the signature verification level for installing packages using the "-U" operation on a remote file URL. Uses the value from SigLevel as the default. *UseSyslog*:: diff --git a/doc/submitting-patches.asciidoc b/doc/submitting-patches.asciidoc index 73c7487d..9cf8dc64 100644 --- a/doc/submitting-patches.asciidoc +++ b/doc/submitting-patches.asciidoc @@ -39,7 +39,7 @@ address if you're afraid of spam. * Describe your patch. -It helps if you describe the overview and goals of the patch in the git commit +It helps if you describe the overview and goals of the patch in the git commit log. This allows others to see what you intended so as to compare it to what was actually done, and allows better feedback. -- 2.18.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, release/5.1.x, updated. v5.1.1
by Allan McRae 27 Jul '18

27 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, release/5.1.x has been updated via 7e081d2adf8321f25165255fd21fab61d4055a53 (commit) via 1a5f308d52f3a81990e9992400d1de7d449ef951 (commit) via 2d8a751943abfe6c32fdc6957d61848d5eb0e4ca (commit) via 13fb2430e8e2c5f266e43da85d9adbe5284f0080 (commit) via 0827aff85ee3ac9a02031cbeeb49cae2ae088529 (commit) via 316b031b7c1c8b9a6f4194b1378c58106b2a34dd (commit) via 757e85b21df62bf6c8e7d8c0642c1e93735aabce (commit) via 41cbea29b404616bbd2b6f22eb269bbc83ac9fb4 (commit) via 0adb36346c18ab316f86f2ba52729257ac63284d (commit) via acef70c1036e3234fe07f2dd1d105f0f59480baa (commit) via 8b4be66a3006abe209f6f6a8ef13991cfa57fe34 (commit) via 9a8c7154b1b5842a08db27bd3c3a1607fa0c8f0f (commit) via 4fe9adf418467505884dcc6e9a6ae9239c06c5f8 (commit) via 0d6e82d3748653a2b61ea34b940011ef97350768 (commit) via d750c854bcfa2461742a4d5dff7b4747db5c1f53 (commit) via 72263e22bdf2f33b2038f902612ac6a98954d254 (commit) via a92a36070ad520afe45cb6dacf1de2f0caac612d (commit) via 5cf6f614eb418a9e89c0cbfa5fbfac0d502ff668 (commit) via 793202344b47914d06a2c48bacbb6b232f7c5387 (commit) via e6dbe82c0c52011b4abb46283ba606eb75577ce7 (commit) via 05a3641c76ba1c07dbec6fa1d9e9d3fcf6dec20c (commit) via ab1e92860bdc5388621e8314b8e1652590fa2b05 (commit) via b37a6063d0d37eb16465693439e3dfb92409e44a (commit) via f78914cc6e3d431ec585c29e469a91121d90a5cf (commit) via de8c5e78bbaec3aea16523d1a7c5cc6801154c80 (commit) via 737596f038590878d9ac73e6e8de01ad22b2b340 (commit) via 870d4c8fdd5e53c24c2a13cf1010b2536460fd8f (commit) via c37a06fe1d1fbd2be73adc725323e8a4665eeb09 (commit) via 9eb3695a3ff850b9dff66d667a4b27be1a233f42 (commit) via 3a66b93be00b7a6b01a295bc203f91e663a133db (commit) via 930d50194754e9c75bc0d6d7ccc41ae8f4b4e5c4 (commit) via 716d776936a7c0559ef09a3b456fa52d2339a4aa (commit) from be4c491ceb34f04c3352ddd1d3c4672560e7ea8c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: NEWS | 19 ++ configure.ac | 4 +- doc/PKGBUILD.5.asciidoc | 19 +- doc/alpm-hooks.5.asciidoc | 8 +- doc/index.asciidoc | 3 +- doc/makepkg.conf.5.asciidoc | 2 +- doc/pacman.8.asciidoc | 10 + doc/pacman.conf.5.asciidoc | 3 + etc/makepkg.conf.in | 2 +- etc/pacman.conf.in | 2 +- lib/libalpm/conflict.c | 9 +- lib/libalpm/dload.c | 2 +- lib/libalpm/po/da.po | 69 ++--- lib/libalpm/po/de.po | 1 + lib/libalpm/po/es.po | 53 ++-- lib/libalpm/po/fr.po | 8 +- lib/libalpm/po/nb.po | 69 ++--- lib/libalpm/po/ru.po | 31 ++- lib/libalpm/po/zh_CN.po | 2 +- .../libmakepkg/integrity/generate_signature.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/3 | 0 scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 3 +- scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 18 +- scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 3 +- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 3 +- scripts/libmakepkg/tidy/strip.sh.in | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 13 +- scripts/libmakepkg/util/util.sh.in | 10 +- scripts/makepkg.sh.in | 56 ++-- scripts/po/bg.po | 265 +++++++++--------- scripts/po/br.po | 260 +++++++++-------- scripts/po/ca.po | 265 +++++++++--------- scripts/po/cs.po | 265 +++++++++--------- scripts/po/da.po | 267 +++++++++--------- scripts/po/de.po | 263 +++++++++--------- scripts/po/el.po | 261 +++++++++-------- scripts/po/en_GB.po | 266 +++++++++--------- scripts/po/eo.po | 260 +++++++++-------- scripts/po/es.po | 271 +++++++++--------- scripts/po/es_419.po | 262 +++++++++-------- scripts/po/eu.po | 261 +++++++++-------- scripts/po/eu_ES.po | 259 +++++++++-------- scripts/po/fi.po | 260 +++++++++-------- scripts/po/fr.po | 270 +++++++++--------- scripts/po/gl.po | 260 +++++++++-------- scripts/po/hu.po | 260 +++++++++-------- scripts/po/id.po | 261 +++++++++-------- scripts/po/it.po | 261 +++++++++-------- scripts/po/ja.po | 264 +++++++++--------- scripts/po/ko.po | 265 +++++++++--------- scripts/po/lt.po | 264 +++++++++--------- scripts/po/nb.po | 300 ++++++++++---------- scripts/po/nl.po | 264 +++++++++--------- scripts/po/pacman-scripts.pot | 255 +++++++++-------- scripts/po/pl.po | 294 +++++++++++--------- scripts/po/pt.po | 260 +++++++++-------- scripts/po/pt_BR.po | 265 +++++++++--------- scripts/po/ro.po | 260 +++++++++-------- scripts/po/ru.po | 309 +++++++++++---------- scripts/po/sk.po | 260 +++++++++-------- scripts/po/sr.po | 265 +++++++++--------- scripts/po/sr(a)latin.po | 265 +++++++++--------- scripts/po/sv.po | 259 +++++++++-------- scripts/po/tr.po | 264 +++++++++--------- scripts/po/uk.po | 265 +++++++++--------- scripts/po/zh_CN.po | 279 ++++++++++--------- scripts/po/zh_TW.po | 263 +++++++++--------- src/pacman/pacman-conf.c | 4 +- src/pacman/pacman.c | 3 +- src/pacman/po/ar.po | 72 ++--- src/pacman/po/ast.po | 72 ++--- src/pacman/po/bg.po | 72 ++--- src/pacman/po/br.po | 72 ++--- src/pacman/po/ca.po | 71 ++--- src/pacman/po/cs.po | 72 ++--- src/pacman/po/da.po | 118 ++++---- src/pacman/po/de.po | 76 ++--- src/pacman/po/el.po | 72 ++--- src/pacman/po/en_GB.po | 72 ++--- src/pacman/po/eo.po | 72 ++--- src/pacman/po/es.po | 97 +++---- src/pacman/po/es_419.po | 75 ++--- src/pacman/po/eu.po | 72 ++--- src/pacman/po/eu_ES.po | 72 ++--- src/pacman/po/fi.po | 72 ++--- src/pacman/po/fr.po | 78 +++--- src/pacman/po/gl.po | 73 ++--- src/pacman/po/hr.po | 72 ++--- src/pacman/po/hu.po | 73 ++--- src/pacman/po/id.po | 72 ++--- src/pacman/po/it.po | 71 ++--- src/pacman/po/ja.po | 71 +++-- src/pacman/po/kk.po | 70 ++--- src/pacman/po/ko.po | 71 +++-- src/pacman/po/lt.po | 73 ++--- src/pacman/po/nb.po | 167 +++++------ src/pacman/po/nl.po | 72 ++--- src/pacman/po/pacman.pot | 68 ++--- src/pacman/po/pl.po | 80 +++--- src/pacman/po/pt.po | 74 ++--- src/pacman/po/pt_BR.po | 73 ++--- src/pacman/po/ro.po | 72 ++--- src/pacman/po/ru.po | 106 +++---- src/pacman/po/sk.po | 72 ++--- src/pacman/po/sl.po | 72 ++--- src/pacman/po/sr.po | 70 ++--- src/pacman/po/sr(a)latin.po | 70 ++--- src/pacman/po/sv.po | 72 ++--- src/pacman/po/tr.po | 72 ++--- src/pacman/po/uk.po | 75 ++--- src/pacman/po/zh_CN.po | 85 +++--- src/pacman/po/zh_TW.po | 117 ++++---- 112 files changed, 7016 insertions(+), 6904 deletions(-) delete mode 100644 scripts/libmakepkg/lint_pkgbuild/3 hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v5.1.1, created. v5.1.1
by Allan McRae 27 Jul '18

27 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The annotated tag, v5.1.1 has been created at b2a8f00a9a9bc7d0bbacc4933d1142a91dbe5089 (tag) tagging 7e081d2adf8321f25165255fd21fab61d4055a53 (commit) replaces v5.1.0 tagged by Allan McRae on Fri Jul 27 13:07:10 2018 +1000 - Log ----------------------------------------------------------------- elibrokeit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEZkWwqMcAXnjbHXhk+Z/+D+rpmb0FAltajF4ACgkQ+Z/+D+rp mb0uGAgAuZr1vJXSfXYADoVuO7dLOAj2H2OKNoyLNYkjjOLkJuoVElvabEUfItRI k+S4Oy9Du2AqP8hvvJF/SPOonUg633mbHNuKqiImCRSnN/G6rOFOsfgt6UuJ2XNp EA5SDl+bwsdMwecvZMStCQx+6JBA23XLAjoYCjSqhHObaENcA6BQFSwVWqj67x/P yYdGAXB3obYVDRAbLIhAp97zAPdhRgBfVwvXypJuYdpJlzYYy3apwYyWmDKX+7Wh 2kEdG9Q0f3mg1kagWV8mcyj0PeL4VNLIj9UlVgobCQyw/GHKtsNLqxrt3GoRUxsU hx3izF138UcOiYR6pH/ABGyvT0gSZw== =7p/R -----END PGP SIGNATURE----- Allan McRae (11): Apparently we live in the future! pacman-conf: fix detection of repo usage PKGBUILD.5: document restriction on pkgrel Fix signing of debug packages PKGBUILD(5): Remove reference to ChangeLog prototype inclusion Revert "makepkg: use the `declare` builtin when backing up variables to eval" libmakepkg: remove accidentally added file Revert "Deprecate --root in favour of --sysroot" Handle root prefix in overwrite operations Pull updated translations from Transifex Release v5.1.1 Dave Reisner (1): makepkg: fix initialization when extracting arrays Eli Schwartz (13): makepkg: update help text to describe --packagelist's new behavior makepkg: remove unused variable forgotten when moving to parseopts libmakepkg: when checking for write permissions, handle pre-existing dirs libmakepkg/lint_pkgbuild: permit versioned optdepends makepkg: do not chmod $BUILDDIR itself after checking for its existence libmakepkg/lint_pkgbuild: squelch syntax error when a pkgname is empty makepkg: fix the --nocolor option being broken when passed to pacman -U makepkg: fix erroneous $BUILDDIR when $startdir is not an absolute path makepkg: don't print per-pkgname debug packages libmakepkg/tidy: fix debug sources not being properly detected sometimes doc: declare what type of comments we support in pacman.conf makepkg: reduce strictness of pkgver in depends linting makepkg: optimize and fix BUILDINFO generation's use of awk Jan Steffens (2): makepkg: Clear ERR trap before trying to restore it makepkg: Don't use parameterless return Jouke Witteveen (1): alpm-hooks.5: include more information on hook files Luke Shumaker (1): pacman.conf: Fixup the XferCommand example for curl Michael Straube (2): libalpm/dload.c: fix filename in license header makepkg.conf: add missing sha224 sums morganamilo (1): Add missing sha224 sums in man page and linting ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.0-32-g7e081d2a
by Allan McRae 27 Jul '18

27 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 7e081d2adf8321f25165255fd21fab61d4055a53 (commit) via 1a5f308d52f3a81990e9992400d1de7d449ef951 (commit) via 2d8a751943abfe6c32fdc6957d61848d5eb0e4ca (commit) from 13fb2430e8e2c5f266e43da85d9adbe5284f0080 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7e081d2adf8321f25165255fd21fab61d4055a53 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 27 11:05:51 2018 +1000 Release v5.1.1 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1a5f308d52f3a81990e9992400d1de7d449ef951 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Jun 13 10:34:32 2018 -0400 makepkg: optimize and fix BUILDINFO generation's use of awk The biggest issue is directly supplying the data within the format string which can result in misinterpreting formatter sequences if a printed variable contains an "%" in it. This character is currently permitted in the pkgver field, though not in the pkgname. Also pacman/libalpm itself has much looser limitations and this can appear anywhere at all if a package was created by some other program. For the package "iambroke-1%s-1-any.pkg.tar.xz", installed in the build environment, the result is: -> Generating .BUILDINFO file... awk: cmd. line:3: (FILENAME=- FNR=1085) fatal: not enough arguments to satisfy format string `-1%s-1' ^ ran out for this one Followed by a .BUILDINFO which contains an LC_ALL=C sorted list of $pkgname-${epoch:+$epoch:}$pkgver-$pkgrel-$arch ending in: installed = iambroke Which is cut short, then fails to list the succeeding packages. The package itself successfully builds. It's also unnecessary to save the output of pacman -Qq in order to get the information for pacman -Qi, since the latter will, just like the former, return information for all installed packages if not given a package name(s). While I am at it, pipe this directly to awk rather than keeping a copy in an unnecessary local variable. This is slightly more efficient in addition to preventing the <<< herestring from re-interpreting the content of "$pkginfos" in ways that don't really matter for our usage. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2d8a751943abfe6c32fdc6957d61848d5eb0e4ca Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Jul 25 18:53:03 2018 +0200 alpm-hooks.5: include more information on hook files Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 19 +++++++++++++++++++ configure.ac | 4 ++-- doc/alpm-hooks.5.asciidoc | 8 ++++++-- doc/index.asciidoc | 1 + scripts/makepkg.sh.in | 10 ++++------ 5 files changed, 32 insertions(+), 10 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.0-29-g13fb2430
by Allan McRae 27 Jul '18

27 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 13fb2430e8e2c5f266e43da85d9adbe5284f0080 (commit) via 0827aff85ee3ac9a02031cbeeb49cae2ae088529 (commit) via 316b031b7c1c8b9a6f4194b1378c58106b2a34dd (commit) via 757e85b21df62bf6c8e7d8c0642c1e93735aabce (commit) via 41cbea29b404616bbd2b6f22eb269bbc83ac9fb4 (commit) via 0adb36346c18ab316f86f2ba52729257ac63284d (commit) from acef70c1036e3234fe07f2dd1d105f0f59480baa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 13fb2430e8e2c5f266e43da85d9adbe5284f0080 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jul 19 14:12:04 2018 +1000 Pull updated translations from Transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0827aff85ee3ac9a02031cbeeb49cae2ae088529 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jul 19 13:54:54 2018 +1000 Handle root prefix in overwrite operations The pacman --overwrite operation currently expects a path without the root prefix specified. This is unexpected, particularly given our conflict error message reports the path with the root prefix included. This patch allows libalpm to overwrite files with the root prefix specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 316b031b7c1c8b9a6f4194b1378c58106b2a34dd Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jul 19 02:12:48 2018 -0400 makepkg: reduce strictness of pkgver in depends linting This change was introduced to prevent entries like depends=('foo>'). However, it had the unintended side effect of causing a number of working PKGBUILDs to fail to build. This happened when a PKGBUILD defined one variable through calling a "complex" statement within the PKGBUILD's package function (e.g. a function or evaluating in a subshell), then used it to define the package metadata variable. extract_function_variable() cannot execute the package function in order to retrieve this information, so it performs a simple grep + eval instead and in the process misses the contextual awareness of running within the package function. While not catching these "issues" can result in incorrect SRCINFO, the resulting packages are fine. Stop aborting on the common case where the pkgver of a dependency is dynamically set during the package function until the large number of broken PKGBUILDs are fixed, and the restrictions of the PKGBUILD format are documented. "Fixes" FS#58776 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 757e85b21df62bf6c8e7d8c0642c1e93735aabce Author: Michael Straube <michael.straube(a)posteo.de> Date: Mon Jul 2 00:11:51 2018 +0200 makepkg.conf: add missing sha224 sums Add missing sha224 sums to makepkg.conf and it's man page. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 41cbea29b404616bbd2b6f22eb269bbc83ac9fb4 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Jul 18 23:01:36 2018 -0400 doc: declare what type of comments we support in pacman.conf Ini-style configuration formats are all over the place. So are we, for that matter, as we switched how we treated middle-of-line comments in commit 8a19c4a78251c5e34ecf508a65d943ca2dc833c7 -- namely, they're not comments anymore. This is surprising to users, who report bugs because it used to work, but what's more surprising is that the only "documentation" for the type of comments users can be expected to use, is by guessing from our example pacman.conf and maybe discovering unreliable easter eggs. Fixes FS#58809 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0adb36346c18ab316f86f2ba52729257ac63284d Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jul 19 12:51:07 2018 +1000 Revert "Deprecate --root in favour of --sysroot" The use of --sysroot in the real world has flagged some issues that need addressing. Undeprecate --root for now. This reverts commit a278356f75866f89232e3e6230bbf9fb2dc1893c. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.asciidoc | 2 +- doc/pacman.8.asciidoc | 10 + doc/pacman.conf.5.asciidoc | 3 + etc/makepkg.conf.in | 2 +- lib/libalpm/conflict.c | 9 +- lib/libalpm/po/da.po | 69 +++--- lib/libalpm/po/de.po | 1 + lib/libalpm/po/es.po | 53 +++-- lib/libalpm/po/fr.po | 8 +- lib/libalpm/po/nb.po | 69 +++--- lib/libalpm/po/ru.po | 31 +-- lib/libalpm/po/zh_CN.po | 2 +- scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 3 +- scripts/po/bg.po | 265 +++++++++++---------- scripts/po/br.po | 260 +++++++++++---------- scripts/po/ca.po | 265 +++++++++++---------- scripts/po/cs.po | 265 +++++++++++---------- scripts/po/da.po | 267 +++++++++++---------- scripts/po/de.po | 263 +++++++++++---------- scripts/po/el.po | 261 +++++++++++---------- scripts/po/en_GB.po | 266 +++++++++++---------- scripts/po/eo.po | 260 +++++++++++---------- scripts/po/es.po | 271 +++++++++++----------- scripts/po/es_419.po | 262 +++++++++++---------- scripts/po/eu.po | 261 +++++++++++---------- scripts/po/eu_ES.po | 259 ++++++++++----------- scripts/po/fi.po | 260 +++++++++++---------- scripts/po/fr.po | 270 +++++++++++---------- scripts/po/gl.po | 260 +++++++++++---------- scripts/po/hu.po | 260 +++++++++++---------- scripts/po/id.po | 261 +++++++++++---------- scripts/po/it.po | 261 +++++++++++---------- scripts/po/ja.po | 264 +++++++++++---------- scripts/po/ko.po | 265 +++++++++++---------- scripts/po/lt.po | 264 +++++++++++---------- scripts/po/nb.po | 300 +++++++++++++----------- scripts/po/nl.po | 264 +++++++++++---------- scripts/po/pacman-scripts.pot | 255 ++++++++++---------- scripts/po/pl.po | 294 ++++++++++++----------- scripts/po/pt.po | 260 +++++++++++---------- scripts/po/pt_BR.po | 265 +++++++++++---------- scripts/po/ro.po | 260 +++++++++++---------- scripts/po/ru.po | 309 +++++++++++++------------ scripts/po/sk.po | 260 +++++++++++---------- scripts/po/sr.po | 265 +++++++++++---------- scripts/po/sr(a)latin.po | 265 +++++++++++---------- scripts/po/sv.po | 259 +++++++++++---------- scripts/po/tr.po | 264 +++++++++++---------- scripts/po/uk.po | 265 +++++++++++---------- scripts/po/zh_CN.po | 279 +++++++++++----------- scripts/po/zh_TW.po | 263 +++++++++++---------- src/pacman/pacman.c | 3 +- src/pacman/po/ar.po | 72 +++--- src/pacman/po/ast.po | 72 +++--- src/pacman/po/bg.po | 72 +++--- src/pacman/po/br.po | 72 +++--- src/pacman/po/ca.po | 71 +++--- src/pacman/po/cs.po | 72 +++--- src/pacman/po/da.po | 118 +++++----- src/pacman/po/de.po | 76 +++--- src/pacman/po/el.po | 72 +++--- src/pacman/po/en_GB.po | 72 +++--- src/pacman/po/eo.po | 72 +++--- src/pacman/po/es.po | 97 ++++---- src/pacman/po/es_419.po | 75 +++--- src/pacman/po/eu.po | 72 +++--- src/pacman/po/eu_ES.po | 72 +++--- src/pacman/po/fi.po | 72 +++--- src/pacman/po/fr.po | 78 +++---- src/pacman/po/gl.po | 73 +++--- src/pacman/po/hr.po | 72 +++--- src/pacman/po/hu.po | 73 +++--- src/pacman/po/id.po | 72 +++--- src/pacman/po/it.po | 71 +++--- src/pacman/po/ja.po | 71 +++--- src/pacman/po/kk.po | 70 +++--- src/pacman/po/ko.po | 71 +++--- src/pacman/po/lt.po | 73 +++--- src/pacman/po/nb.po | 167 ++++++------- src/pacman/po/nl.po | 72 +++--- src/pacman/po/pacman.pot | 68 +++--- src/pacman/po/pl.po | 80 +++---- src/pacman/po/pt.po | 74 +++--- src/pacman/po/pt_BR.po | 73 +++--- src/pacman/po/ro.po | 72 +++--- src/pacman/po/ru.po | 106 +++++---- src/pacman/po/sk.po | 72 +++--- src/pacman/po/sl.po | 72 +++--- src/pacman/po/sr.po | 70 +++--- src/pacman/po/sr(a)latin.po | 70 +++--- src/pacman/po/sv.po | 72 +++--- src/pacman/po/tr.po | 72 +++--- src/pacman/po/uk.po | 75 +++--- src/pacman/po/zh_CN.po | 85 +++---- src/pacman/po/zh_TW.po | 117 +++++----- 95 files changed, 6907 insertions(+), 6845 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v3] Handle root prefix in overwrite operations
by Allan McRae 27 Jul '18

27 Jul '18

The pacman --overwrite operation currently expects a path without the root prefix specified. This is unexpected, particularly given our conflict error message reports the path with the root prefix included. This patch allows libalpm to overwrite files with the root prefix specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v3 - Don't recalculate root prefixed path lib/libalpm/conflict.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 35946de5..716d0088 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -399,10 +399,11 @@ static alpm_pkg_t *_alpm_find_file_owner(alpm_handle_t *handle, const char *path return NULL; } -static int _alpm_can_overwrite_file(alpm_handle_t *handle, const char *path) +static int _alpm_can_overwrite_file(alpm_handle_t *handle, const char *path, const char *rootedpath) { return handle->trans->flags & ALPM_TRANS_FLAG_FORCE - || _alpm_fnmatch_patterns(handle->overwrite_files, path) == 0; + || _alpm_fnmatch_patterns(handle->overwrite_files, path) == 0 + || _alpm_fnmatch_patterns(handle->overwrite_files, rootedpath) == 0; } /** @@ -468,7 +469,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, /* can skip file-file conflicts when forced * * checking presence in p2_files detects dir-file or file-dir * conflicts as the path from p1 is returned */ - if(_alpm_can_overwrite_file(handle, filename) + if(_alpm_can_overwrite_file(handle, filename, path) && alpm_filelist_contains(p2_files, filename)) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s exists in both '%s' and '%s'\n", filename, @@ -675,7 +676,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, /* skip file-file conflicts when being forced */ if(!S_ISDIR(lsbuf.st_mode) - && _alpm_can_overwrite_file(handle, filestr)) { + && _alpm_can_overwrite_file(handle, filestr, path)) { _alpm_log(handle, ALPM_LOG_DEBUG, "conflict with file on filesystem being forced\n"); resolved_conflict = 1; -- 2.18.0

1 0

[pacman-dev] [PATCH v3] alpm-hooks.5: include more information on hook files
by Jouke Witteveen 25 Jul '18

25 Jul '18

--- This is a follow-up to my hook sorting patch. It incorporates the suggestions by Eli Schwartz for less awkward wording. The phrase 'the default is' is common in pacman(8) and pacman.conf(5). doc/alpm-hooks.5.asciidoc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/alpm-hooks.5.asciidoc b/doc/alpm-hooks.5.asciidoc index 1d19f96e..e6b0129d 100644 --- a/doc/alpm-hooks.5.asciidoc +++ b/doc/alpm-hooks.5.asciidoc @@ -30,9 +30,13 @@ DESCRIPTION libalpm provides the ability to specify hooks to run before or after transactions based on the packages and/or files being modified. Hooks consist of a single '[Action]' section describing the action to be run and one or more -'[Trigger]' section describing which transactions it should be run for. Hook +'[Trigger]' section describing which transactions it should be run for. + +Hooks are read from files located in the system hook directory ++{datarootdir}/libalpm/hooks+, and additional custom directories specified in +linkman:pacman.conf[5] (the default is +{sysconfdir}/pacman.d/hooks+). The file names are required to have the suffix ".hook". Hooks are run in -alphabetical order of their file name. +alphabetical order of their file name, where the ordering ignores the suffix. TRIGGERS -------- -- 2.18.0

1 0

[pacman-dev] [PATCH] makepkg: reduce strictness of pkgver in depends linting
by Eli Schwartz 19 Jul '18

19 Jul '18

This change was introduced to prevent entries like depends=('foo>'). However, it had the unintended side effect of causing a number of working PKGBUILDs to fail to build. This happened when a PKGBUILD defined one variable through calling a "complex" statement within the PKGBUILD's package function (e.g. a function or evaluating in a subshell), then used it to define the package metadata variable. extract_function_variable() cannot execute the package function in order to retrieve this information, so it performs a simple grep + eval instead and in the process misses the contextual awareness of running within the package function. While not catching these "issues" can result in incorrect SRCINFO, the resulting packages are fine. Stop aborting on the common case where the pkgver of a dependency is dynamically set during the package function until the large number of broken PKGBUILDs are fixed, and the restrictions of the PKGBUILD format are documented. "Fixes" FS#58776 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Less extreme alternative to https://lists.archlinux.org/pipermail/pacman-dev/2018-July/022717.html I would like to at least check for and correctly reject the case where the depends contains a non-empty pkgver without utilizing indirection, but is incorrect. scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in index 40cdc65a..e363a039 100644 --- a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in @@ -46,7 +46,8 @@ lint_depends() { # remove optional epoch in version specifier ver=${depend##$name@(<|>|=|>=|<=)?(+([0-9]):)} lint_one_pkgname depends "$name" || ret=1 - if [[ $ver != $depend ]]; then + # Don't validate empty version because of https://bugs.archlinux.org/task/58776 + if [[ $ver != $depend && -n $ver ]]; then # remove optional pkgrel in version specifier check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" depends || ret=1 fi -- 2.18.0

1 0

[pacman-dev] [PATCH v2] alpm-hooks.5: include more information on hook files
by Jouke Witteveen 19 Jul '18

19 Jul '18

--- I'm sorry for sending a revision of such a minor patch, but I could not stand having messed up the line lengths. This is a follow-up to my hook sorting patch. The information added is also available in pacman.conf(5), and in pacman(8), but this looks like a good place to repeat it. Regards, - Jouke doc/alpm-hooks.5.asciidoc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/alpm-hooks.5.asciidoc b/doc/alpm-hooks.5.asciidoc index 1d19f96e..e6f1f8e3 100644 --- a/doc/alpm-hooks.5.asciidoc +++ b/doc/alpm-hooks.5.asciidoc @@ -30,9 +30,14 @@ DESCRIPTION libalpm provides the ability to specify hooks to run before or after transactions based on the packages and/or files being modified. Hooks consist of a single '[Action]' section describing the action to be run and one or more -'[Trigger]' section describing which transactions it should be run for. Hook -file names are required to have the suffix ".hook". Hooks are run in -alphabetical order of their file name. +'[Trigger]' section describing which transactions it should be run for. + +Hooks are read from files located in the system hook directory ++{datarootdir}/libalpm/hooks+, and additional custom directories. Additional +directories are specified linkman:pacman.conf[5]. The default additional +directory is +{sysconfdir}/pacman.d/hooks+. Hook file names are required to +have the suffix ".hook". Hooks are run in alphabetical order of their file +name, where the ordering ignores the suffix. TRIGGERS -------- -- 2.18.0

2 1

[pacman-dev] [PATCH] Handle root prefix in overwrite operations
by Allan McRae 19 Jul '18

19 Jul '18

The pacman --overwrite operation currently expects a path without the root prefix specified. This is unexpected, particularly given our conflict error message reports the path with the root prefix included. This patch allows libalpm to overwrite files with the root prefix specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/conflict.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 35946de5..2e87cfa1 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -401,8 +401,12 @@ static alpm_pkg_t *_alpm_find_file_owner(alpm_handle_t *handle, const char *path static int _alpm_can_overwrite_file(alpm_handle_t *handle, const char *path) { + char rootedpath[PATH_MAX]; + snprintf(rootedpath, PATH_MAX, "%s%s", handle->root, path); + return handle->trans->flags & ALPM_TRANS_FLAG_FORCE - || _alpm_fnmatch_patterns(handle->overwrite_files, path) == 0; + || _alpm_fnmatch_patterns(handle->overwrite_files, path) == 0 + || _alpm_fnmatch_patterns(handle->overwrite_files, rootedpath) == 0; } /** -- 2.18.0

1 0

[pacman-dev] [PATCH] Revert "Deprecate --root in favour of --sysroot"
by Allan McRae 19 Jul '18

19 Jul '18

The use of --sysroot in the real world has flagged some issues that need addressing. Undeprecate --root for now. This reverts commit a278356f75866f89232e3e6230bbf9fb2dc1893c. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman.8.asciidoc | 10 ++++++++++ src/pacman/pacman.c | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index b6f4dd76..66483bcb 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -130,6 +130,16 @@ Options *NOTE*: If specified, this is an absolute path, and the root path is not automatically prepended. +*-r, \--root* <path>:: + Specify an alternative installation root (default is `/`). This should + not be used as a way to install software into `/usr/local` instead of + `/usr`. + *NOTE*: If database path or log file are not specified on either the + command line or in linkman:pacman.conf[5], their default location will + be inside this root path. + *NOTE*: This option is not suitable for performing operations on a mounted + guest system. See '\--sysroot' instead. + *-v, \--verbose*:: Output paths such as as the Root, Conf File, DB Path, Cache Dirs, etc. diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fe54793e..e0178da8 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -211,6 +211,7 @@ static void usage(int op, const char * const myname) } addlist(_(" -b, --dbpath <path> set an alternate database location\n")); + addlist(_(" -r, --root <path> set an alternate installation root\n")); addlist(_(" -v, --verbose be verbose\n")); addlist(_(" --arch <arch> set an alternate architecture\n")); addlist(_(" --sysroot operate on a mounted guest system (root-only)\n")); @@ -449,8 +450,6 @@ static int parsearg_global(int opt) break; case OP_ROOT: case 'r': - pm_printf(ALPM_LOG_WARNING, - _("option --root is deprecated; use --sysroot instead\n")); free(config->rootdir); config->rootdir = strdup(optarg); break; -- 2.18.0

1 0

[pacman-dev] [PATCH] doc: declare what type of comments we support in pacman.conf
by Eli Schwartz 19 Jul '18

19 Jul '18

Ini-style configuration formats are all over the place. So are we, for that matter, as we switched how we treated middle-of-line comments in commit 8a19c4a78251c5e34ecf508a65d943ca2dc833c7 -- namely, they're not comments anymore. This is surprising to users, who report bugs because it used to work, but what's more surprising is that the only "documentation" for the type of comments users can be expected to use, is by guessing from our example pacman.conf and maybe discovering unreliable easter eggs. Fixes FS#58809 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/pacman.conf.5.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index e5fffecf..157e00ee 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -19,6 +19,8 @@ Each section defines a package repository that pacman can use when searching for packages in '\--sync' mode. The exception to this is the options section, which defines global options. +Comments are supported, only by beginning a line with the hash (#) symbol. + Example ------- -- 2.17.1

2 2

[pacman-dev] [PATCH] Remove checking of pkgver in depends entries
by Allan McRae 19 Jul '18

19 Jul '18

This change was introduced to prevent entries like depends=('foo>'). However, it had the unintended side effect of causing a number of working PKGBUILDs to fail to build. This happened when a PKGBUILD defined a variable through calling a "complex" statement within the PKGBUILD (e.g. a function or evaluating in a subshell). While not catching these "issues" can result in incorrect SRCINFO, the resulting packages are fine. Stop aborting on these issues until the large number of broken PKGBUILDs are fix, and the restrictions of the PKGBUILD format are documented. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in index 40cdc65a..6d25a317 100644 --- a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in @@ -46,10 +46,10 @@ lint_depends() { # remove optional epoch in version specifier ver=${depend##$name@(<|>|=|>=|<=)?(+([0-9]):)} lint_one_pkgname depends "$name" || ret=1 - if [[ $ver != $depend ]]; then - # remove optional pkgrel in version specifier - check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" depends || ret=1 - fi +# if [[ $ver != $depend ]]; then +# # remove optional pkgrel in version specifier +# check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" depends || ret=1 +# fi done eval "$shellopts" -- 2.18.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.0-23-gacef70c1
by Allan McRae 19 Jul '18

19 Jul '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via acef70c1036e3234fe07f2dd1d105f0f59480baa (commit) via 8b4be66a3006abe209f6f6a8ef13991cfa57fe34 (commit) via 9a8c7154b1b5842a08db27bd3c3a1607fa0c8f0f (commit) via 4fe9adf418467505884dcc6e9a6ae9239c06c5f8 (commit) from 0d6e82d3748653a2b61ea34b940011ef97350768 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit acef70c1036e3234fe07f2dd1d105f0f59480baa Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jun 21 15:36:05 2018 +1000 libmakepkg: remove accidentally added file A blank file slipped into libmakepkg in commit 2c94118d. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8b4be66a3006abe209f6f6a8ef13991cfa57fe34 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Jun 12 21:17:18 2018 -0400 libmakepkg/tidy: fix debug sources not being properly detected sometimes DW_AT_comp_dir is meant to contain the directory in which the compiler was run DW_AT_name contains the source file the compiler was told to use. In the event that DW_AT_name is an absolute path, it is (obviously) not meant to be computed relative to DW_AT_comp_dir. However, we did not handle this correctly, and as a result tried to copy source files using doubled-up filepaths. The correct approach should be to use DW_AT_name on its own, in the event that it is an absolute path. See http://wiki.dwarfstd.org/index.php?title=Best_Practices. This fixes debug package generation for many packages that use absolute paths in their build systems... like CMake. Reported-by: Jagannathan Tiruvallur Eachambadi <jagannathante(a)gmail.com> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9a8c7154b1b5842a08db27bd3c3a1607fa0c8f0f Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 19 21:08:28 2018 +1000 Revert "makepkg: use the `declare` builtin when backing up variables to eval" This reverts commit 9e52a36794552b77ecf26f7f34b226d096978f1e. The change to use declare for the split package metadata backup/restore resulted in variables being declared at a local scope. When these variables were unset (mostly noticed with debug packaging) this left the variable at global scope defined. Revert back to the known good state. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4fe9adf418467505884dcc6e9a6ae9239c06c5f8 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 19 20:44:14 2018 +1000 PKGBUILD(5): Remove reference to ChangeLog prototype inclusion We do not distribute a ChangeLog prototype, so should not reference it in the man page. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.asciidoc | 6 +++--- scripts/libmakepkg/lint_pkgbuild/3 | 0 scripts/libmakepkg/tidy/strip.sh.in | 2 +- scripts/makepkg.sh.in | 20 ++++++++++++++++---- 4 files changed, 20 insertions(+), 8 deletions(-) delete mode 100644 scripts/libmakepkg/lint_pkgbuild/3 hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [RFC PATCH] makepkg: extend the .BUILDINFO for enhanced reproducible support
by Eli Schwartz 18 Jul '18

18 Jul '18

Encode information about the compiler and strip flags used, as these will impact the resulting generated binaries. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- See https://kanboard.archlinux.org/public/task/40/7359bddc6311e0c07c31e421b6b49… for details. I've left out MAKEFLAGS as I'm unsure how this would actually affect the build. Also the various COMPRESS* options I simply don't know what to do with since we periodically add new ones and this results in updating them all over the place. Plus this isn't typically modified anyway and e.g. multithreaded compression tends to not be reproducible between two identical runs regardless, so I'm not sure we should be solving it... scripts/makepkg.sh.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 548feb91..3d6277d1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -680,7 +680,7 @@ write_pkginfo() { write_buildinfo() { msg2 "$(gettext "Generating %s file...")" ".BUILDINFO" - write_kv_pair "format" "1" + write_kv_pair "format" "2" write_kv_pair "pkgname" "$pkgname" write_kv_pair "pkgbase" "$pkgbase" @@ -699,6 +699,13 @@ write_buildinfo() { write_kv_pair "builddir" "${BUILDDIR}" write_kv_pair "buildenv" "${BUILDENV[@]}" write_kv_pair "options" "${OPTIONS[@]}" + write_kv_pair "cppflags" "$CPPFLAGS" + write_kv_pair "cflags" "$CFLAGS" + write_kv_pair "cxxflags" "$CXXFLAGS" + write_kv_pair "ldflags" "$LDFLAGS" + write_kv_pair "strip_binaries" "$STRIP_BINARIES" + write_kv_pair "strip_shared" "$STRIP_SHARED" + write_kv_pair "strip_static" "$STRIP_STATIC" local pkglist=($(run_pacman -Qq)) local pkginfos="$(LC_ALL=C run_pacman -Qi ${pkglist[@]})" -- 2.18.0

3 5

[pacman-dev] [PATCH v2 1/3] configure: bump the minimum version of bash to 4.4
by Eli Schwartz 12 Jul '18

12 Jul '18

This is required in order to use declare -g and ${var@a} Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index fb9d18e1..6ba9d737 100644 --- a/configure.ac +++ b/configure.ac @@ -193,18 +193,18 @@ AC_DEFUN([AX_PROG_PERL_VERSION], AX_PROG_PERL_VERSION([5.10.1], [], [AC_MSG_ERROR([perl is too old])]) AS_IF([test "x$BASH_SHELL" = "xfalse"], - AC_MSG_WARN([*** bash >= 4.1.0 is required for pacman scripts]), + AC_MSG_WARN([*** bash >= 4.4.0 is required for pacman scripts]), [bash_version_major=`$BASH_SHELL -c 'echo "${BASH_VERSINFO[[0]]}"'` bash_version_minor=`$BASH_SHELL -c 'echo "${BASH_VERSINFO[[1]]}"'` ok=yes if test "$bash_version_major" -lt 4; then ok=no fi - if test "$bash_version_major" -eq 4 && test "$bash_version_minor" -lt 1; then + if test "$bash_version_major" -eq 4 && test "$bash_version_minor" -lt 4; then ok=no fi if test "$ok" = "no"; then - AC_MSG_ERROR([*** bash >= 4.1.0 is required for pacman scripts]) + AC_MSG_ERROR([*** bash >= 4.4.0 is required for pacman scripts]) fi unset bash_version_major bash_version_minor ok]) -- 2.17.1

3 6

[pacman-dev] Add --nolist option for transactions
by me＠dk0.us 09 Jul '18

09 Jul '18

From: Dmitry Kudriavtsev <me(a)dk0.us> Adds a --nolist option for package transactions. This option removes the list display of packages to be installed or removed. Signed-off-by: Dmitry Kudriavtsev <me(a)dk0.us> --- src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 5 +++++ src/pacman/remove.c | 7 +++++-- src/pacman/sync.c | 6 ++++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/pacman/conf.h b/src/pacman/conf.h index ababf2e0..1615d974 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -50,6 +50,7 @@ typedef struct __config_t { unsigned short help; unsigned short noconfirm; unsigned short noprogressbar; + unsigned short nolist; unsigned short logmask; unsigned short print; unsigned short checkspace; @@ -209,7 +210,8 @@ enum { OP_DOWNLOADONLY, OP_REFRESH, OP_ASSUMEINSTALLED, - OP_DISABLEDLTIMEOUT + OP_DISABLEDLTIMEOUT, + OP_NOLIST }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fe54793e..18505bf6 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -204,6 +204,7 @@ static void usage(int op, const char * const myname) addlist(_(" --dbonly only modify database entries, not package files\n")); addlist(_(" --noprogressbar do not show a progress bar when downloading files\n")); addlist(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); + addlist(_(" --nolist do not list packages before performing operation\n")); addlist(_(" -p, --print print the targets instead of performing the operation\n")); addlist(_(" --print-format <string>\n" " specify how the targets should be printed\n")); @@ -652,6 +653,9 @@ static int parsearg_trans(int opt) case OP_ASSUMEINSTALLED: parsearg_util_addlist(&(config->assumeinstalled)); break; + case OP_NOLIST: + config->nolist = 1; + break; default: return 1; } @@ -964,6 +968,7 @@ static int parseargs(int argc, char *argv[]) {"dbonly", no_argument, 0, OP_DBONLY}, {"color", required_argument, 0, OP_COLOR}, {"disable-download-timeout", no_argument, 0, OP_DISABLEDLTIMEOUT}, + {"nolist", no_argument, 0, OP_NOLIST}, {0, 0, 0, 0} }; diff --git a/src/pacman/remove.c b/src/pacman/remove.c index a2269ed8..5df45c69 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -164,8 +164,11 @@ int pacman_remove(alpm_list_t *targets) } /* print targets and ask user confirmation */ - display_targets(); - printf("\n"); + if(!config->nolist) { + display_targets(); + printf("\n"); + } + if(yesno(_("Do you want to remove these packages?")) == 0) { retval = 1; goto cleanup; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 3c6be89d..1e0c6c91 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -793,8 +793,10 @@ int sync_prepare_execute(void) goto cleanup; } - display_targets(); - printf("\n"); + if(!config->nolist) { + display_targets(); + printf("\n"); + } int confirm; if(config->op_s_downloadonly) { -- 2.18.0

5 7

[pacman-dev] interest in using meson over autotools?
by Andreas Baumann 08 Jul '18

08 Jul '18

Hi, Sorry, if this message is a little bit out of order, I only just subscribed to the pacman-dev group. I want to raise the issue of bootstrapping: - automake, autoconf, libtool and friends need m4 and perl and bash - meson needs python Bootstrapping m4 and perl is comparatively easy to bootstrapping python. Porting to other architectures is easier if there are not too many dependencies. See also my experiments here: https://git.archlinux32.org/archlinux32/bootstrap32 and some porting work from oaken-source (Parabola): https://github.com/oaken-source/parabola-riscv64-bootstrap Cheers Andreas -- Andreas Baumann Trottenstrasse 20 CH-8037 Zuerich Telefon: +41(0)76/373 01 29 E-mail: mail(a)andreasbaumann.cc Homepage: www.andreasbaumann.cc

3 3

[pacman-dev] interest in using meson over autotools?
by Dave Reisner 08 Jul '18

08 Jul '18

Hi, I'm probably not the first to suggest that Autotools is slow and terrible, but here it is: Autotools is slow and terrible. Concretely, a few things I find highly annoying about our current use of Autotools: * We have to carry hacks to the build system itself just to ensure that our binaries aren't overlinked. * Data is duplicated across Makefiles -- derived path configurations such as LOCALEDIR or CONFFILE. * Code is duplicated across directories (symlinked to src/common). As a result, we have poor isolation and rebuild the code multiple times. * './configure && make -C src/pacman pacman' fails. It seems absurd that the user at the command line should have to know to build libalpm first. Isn't that the whole point of a dependency-tracking build system? Subjectively, the configuration itself is archaic and verbose. Does anyone *really* want to spend time understanding the quoting semantics of m4, or figure out where things like $ac_cv_sys_file_offset_bits come from? Yes, some of this could be resolved by fixing/rewriting the autotools madness to not use recursive make, but I'd suggest we just drop autotools and adopt meson. Meson can easily fix all of the above. Why meson? * It's fast. I wrote the initial meson.build files to compile libalpm.so and pacman (this took me under an hour). The resulting build takes 1/3 of the time of the equivalent autotools build. The ./configure equivalent in meson will be faster too, but I can't compare that yet because my meson-equivalent is incomplete. Trust me, it'll be faster. * It's modular. You can still constrain lots of subdirectory specifics in subdirectory meson.build files. * It's easy to read. The config is python-ish, and it's very concise. The documentation is comprehensive and has plenty of examples. * There's lots of upstream support, and the community is growing. In Arch Linux, 175 packages are built using meson (largely because gnome has decided to adopt meson). We would not be an early adopter of meson. * It's portable. meson supports all the targets where we currently have actual users. Would there be interest in accepting patches to make these changes? I propose we would carry both build systems in parallel for a major release before eventually dropping autotools. Feedback wanted, dR

5 5

[pacman-dev] [PATCH] makepkg.conf: add missing sha224 sums
by Michael Straube 01 Jul '18

01 Jul '18

Add missing sha224 sums to makepkg.conf and it's man page. Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- doc/makepkg.conf.5.asciidoc | 2 +- etc/makepkg.conf.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc index 3b596a91..ec543db8 100644 --- a/doc/makepkg.conf.5.asciidoc +++ b/doc/makepkg.conf.5.asciidoc @@ -183,7 +183,7 @@ Options **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this affects both generation and checking. The current valid options are: - `md5`, `sha1`, `sha256`, `sha384`, and `sha512`. + `md5`, `sha1`, `sha224`, `sha256`, `sha384`, and `sha512`. **STRIP_BINARIES=**"--strip-all":: Options to be used when stripping binaries. See linkman:strip[1] diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 1cf79664..e2f9b5fd 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -87,7 +87,7 @@ BUILDENV=(!distcc color !ccache check !sign) # OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !debug) -#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 +#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) #-- Options to be used when stripping binaries. See `man strip' for details. STRIP_BINARIES="@STRIP_BINARIES@" -- 2.18.0

1 0

[pacman-dev] Regarding pacman's "No database errors have been found!"-message.
by Peter Krauß 25 Jun '18

25 Jun '18

Hello! I suggest to remove pacman's "No database errors have been found!" message and instead have it replaced by an actual error message in case an error has been found. The expected behavior of pacman is that there are no database errors and thus it's less confusing for users to show the message only in cases of something unexpected happening. Any opinions on this? Cheers, Peter

2 1

[pacman-dev] [PATCH] makepkg: reject PKGBUILDs with both split and non-split package functions
by Eli Schwartz 21 Jun '18

21 Jun '18

We accept package_foo() in non-split packages, because it's easier to switch to/from a split package just by removing a pkgname element. But it makes no sense to have both in one PKGBUILD. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/package_function.sh.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in b/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in index e52f1325..457b8f67 100644 --- a/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in @@ -34,11 +34,18 @@ lint_package_function() { local i ret=0 if (( ${#pkgname[@]} == 1 )); then - if have_function 'build' && ! { have_function 'package' || have_function "package_$pkgname"; }; then + if have_function 'package' && have_function "package_$pkgname"; then + error "$(gettext "Duplicate %s and %s functions in %s")" "package()" "package_$pkgname()" "$BUILDFILE" + ret=1 + elif have_function 'build' && ! { have_function 'package' || have_function "package_$pkgname"; }; then error "$(gettext "Missing %s function in %s")" "package()" "$BUILDFILE" ret=1 fi else + if have_function "package"; then + error "$(gettext "Extra %s function for split package '%s'")" "package()" "$pkgbase" + ret=1 + fi for i in "${pkgname[@]}"; do if ! have_function "package_$i"; then error "$(gettext "Missing %s function for split package '%s'")" "package_$i()" "$i" -- 2.17.1

2 2

[pacman-dev] pacman 5.1.1 and the "final" makepkg bug
by Allan McRae 21 Jun '18

21 Jun '18

Hi all, I think we are near the point for a pacman-5.1.1 release. My intention is for it to be basically what on master current + the couple of patches in my patchqueue branch. The final thing that needs addressing is: https://bugs.archlinux.org/task/58776 The gist of this bug is makepkg --printsrcinfo was giving entries like "depends = perl>=". We caught these entries because they could be a genuine mistake. It turns out this also happens when the version used requires some bash that calls a function or variable that is not at a global scope. While this is fairly easily worked around, it breaks all perl PKGBUILDs that use the makepkg-template in Arch Linux, and removes the "anything correct bash is OK" mantra of PKGBUILDs. I see some choices here: 1) back out the change 2) partially back out the change 3) "hide" the change 4) document the change For 2), I could see changing the error to a warning, documenting the change and including it for next release. For 3), we could print a warning, then strip these empty "<=" at the end. Note libprovides and libdepends have dynamcially generated versions that are not in --sourceinfo so this would align with them. We should document that limitation. Opinions? (I'm leaning towards #3) Allan

2 2