January 2017 - Pacman-dev - lists.archlinux.org

[pacman-dev] Potential bug in alpm-hooks; fix provided
by Stefan Klinger 03 Jan '17

03 Jan '17

Hi, I'm providing a fix [1] for the following issue. I've noticed that exactly one `Exec` directive is allowed in alpm-hooks(5). This is not explicitly stated in the manual (the word "required" does not usually imply "non-repeatable", as seems to be intended by the manual), nor does it rise an error. Instead, multiple occurrences are silently ignored. Use case: # When installed as a pacman hook [1], this will call the # `my-update-pacman-mirrorlist` script every time the file # `/etc/pacman.d/mirrorlist` should be updated. [Trigger] Operation = Upgrade Operation = Install Type = File Target = etc/pacman.d/mirrorlist [Action] When = PostTransaction Exec = /usr/bin/my-update-pacman-mirrorlist Exec = /usr/bin/rm -f /etc/pacman.d/mirrorlist.pacnew Only the last `Exec` is used. I think it is semantically correct since the syntax looks like an assignment that overwrites the previous one. But it is inconsistent with the use of `Operation` in the `Trigger` section. I would expect the commands to be evaluated in order, or to see an error due to reusing `Exec`. I think raising an error would be best, otherwise pacman would have to provide means to decide how to handle individually failing commands, a situation that is more flexibly handled by an external script, which should be called instead of using multiple `Exec`s. I have implemented this in [1] and added a test. If you like that, I would update the documentation, and also look for other values that are silently overwritten when parsing a hook. Also, I'd like to make `Operation` accept things like Operation = Upgrade Install and in future versions deprecate the current use of multiple assignments which I consider rather unfortunate. Cheers, Stefan ____________________ [1] https://github.com/s5k6/pacman/tree/fix-hook-exec -- http://stefan-klinger.de o/X Send plain text messages only, not exceeding 32kB. /\/ \

5 7

[pacman-dev] [PATCH] ini: only recognize comments at beginning of line
by Andrew Gregory 03 Jan '17

03 Jan '17

Allows the hash sign to be used in values in config files and hooks. Fixes #48702 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/common/ini.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/common/ini.c b/src/common/ini.c index 1ac24b5..fc834e2 100644 --- a/src/common/ini.c +++ b/src/common/ini.c @@ -61,19 +61,14 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data) } while(safe_fgets(line, PATH_MAX, fp)) { - char *key, *value, *ptr; + char *key, *value; size_t line_len; linenum++; - /* ignore whole line and end of line comments */ - if((ptr = strchr(line, '#'))) { - *ptr = '\0'; - } - line_len = strtrim(line); - if(line_len == 0) { + if(line_len == 0 || line[0] == '#') { continue; } -- 2.10.2

2 1

[pacman-dev] [PATCH 1/2] configure.ac: Use POSIX compatible equality checks
by Dave Reisner 03 Jan '17

03 Jan '17

--- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 63f87d1..10e4415 100644 --- a/configure.ac +++ b/configure.ac @@ -222,13 +222,13 @@ PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 2.8.0], , # Check for OpenSSL have_openssl=no have_nettle=no -if test "x$with_crypto" == "xnettle"; then +if test "x$with_crypto" = "xnettle"; then PKG_CHECK_MODULES(NETTLE, [nettle], [AC_DEFINE(HAVE_LIBNETTLE, 1, [Define whether to use nettle]) have_nettle=yes], have_nettle=no) if test "x$have_nettle" = xno -a "x$with_crypto" = xnettle; then AC_MSG_ERROR([*** nettle support requested but libraries not found]) fi -else if test "x$with_crypto" == "xopenssl"; then +else if test "x$with_crypto" = "xopenssl"; then PKG_CHECK_MODULES(LIBSSL, [libcrypto], [AC_DEFINE(HAVE_LIBSSL, 1, [Define if libcrypto is available]) have_openssl=yes], have_openssl=no) if test "x$have_openssl" = xno; then -- 2.10.2

2 3

[pacman-dev] [PATCH] Update copyright years
by Allan McRae 01 Jan '17

01 Jan '17

1 0