- Pacman-dev - lists.archlinux.org

[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