July 2018 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/3] makepkg: send messages to stdout rather than stderr
by Eli Schwartz 29 Aug '18

29 Aug '18

This behavior is confusing, since it means absolutely everything goes to stderr and makepkg itself is a quiet program that produces no expected output??? The only situation where messages should go to stderr rather than stdout, is with --geninteg which is meant to return the checksums on stdout (but we don't want to totally get rid of status messages when redirecting the results elsewhere, or, worse, redirect status messages to a PKGBUILD). For this specific case, redirect message output to stderr in the --geninteg callers directly. Implements FS#17173 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- It took us 9 years, but we got there... scripts/libmakepkg/integrity/generate_checksum.sh.in | 2 +- scripts/libmakepkg/util/message.sh.in | 6 +++--- scripts/makepkg.sh.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/libmakepkg/integrity/generate_checksum.sh.in b/scripts/libmakepkg/integrity/generate_checksum.sh.in index eb9b74fc..8edc48d3 100644 --- a/scripts/libmakepkg/integrity/generate_checksum.sh.in +++ b/scripts/libmakepkg/integrity/generate_checksum.sh.in @@ -78,7 +78,7 @@ generate_one_checksum() { } generate_checksums() { - msg "$(gettext "Generating checksums for source files...")" + msg "$(gettext "Generating checksums for source files...")" >&2 local integlist if (( $# == 0 )); then diff --git a/scripts/libmakepkg/util/message.sh.in b/scripts/libmakepkg/util/message.sh.in index 0746b677..36790c26 100644 --- a/scripts/libmakepkg/util/message.sh.in +++ b/scripts/libmakepkg/util/message.sh.in @@ -45,17 +45,17 @@ colorize() { plain() { local mesg=$1; shift - printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" } msg() { local mesg=$1; shift - printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" } msg2() { local mesg=$1; shift - printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 + printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" } warning() { diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 32423262..650b8494 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1469,7 +1469,7 @@ if (( GENINTEG )); then mkdir -p "$srcdir" chmod a-s "$srcdir" cd_safe "$srcdir" - download_sources novcs allarch + download_sources novcs allarch >&2 generate_checksums exit $E_OK fi -- 2.18.0

2 6

[pacman-dev] [PATCH] Show install status during file search
by morganamilo 29 Aug '18

29 Aug '18

When doing "pacman -Fs", show the "[installed: version]" message just like "pacman -Ss". Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- src/pacman/files.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index d7fc5446..65e6ad26 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -101,6 +101,7 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) { static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { int ret = 0; + alpm_db_t *db_local = alpm_get_localdb(config->handle); alpm_list_t *t; const colstr_t *colstr = &config->colstr; @@ -157,13 +158,15 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg)); } else { alpm_list_t *ml; - printf("%s%s/%s%s %s%s%s\n", colstr->repo, alpm_db_get_name(repo), + printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(repo), colstr->title, alpm_pkg_get_name(pkg), colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); + print_installed(db_local, pkg); + for(ml = match; ml; ml = alpm_list_next(ml)) { c = ml->data; - printf(" %s\n", c); + printf("\n %s\n", c); } } alpm_list_free(match); -- 2.17.1

2 3

[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] 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