- 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

[pacman-dev] Could makepkg verify .dsc file?
by Bruno Pagani 22 Dec '16

22 Dec '16

Hi there, This is probably some sort of feature request or maybe more general asking. I have a case where sha*sums are provided in a .dsc signed file (bs1770gain, for which *sane* upstream is Debian: https://packages.debian.org/source/sid/bs1770gain) Apparently, makepkg only supports verifying file with detached signature. Is there a specific reason for that (like this use case is really tiny — I have no actual idea about this) or is it just because it was never implemented? Thanks, Bruno

4 19

[pacman-dev] [PATCH] find_fileconflicts: rename tmpfiles -> newfiles
by Andrew Gregory 17 Dec '16

17 Dec '16

The files belong to the new version of a package being installed, they are not temporary in any way. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- This has confused me every single time I have looked at this function. lib/libalpm/conflict.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 092b019a..b9e30870 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -419,7 +419,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, for(current = 0, i = upgrade; i; i = i->next, current++) { alpm_pkg_t *p1 = i->data; alpm_list_t *j; - alpm_list_t *tmpfiles = NULL; + alpm_list_t *newfiles = NULL; alpm_pkg_t *dbpkg; int percent = (current * 100) / numtargs; @@ -483,18 +483,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, * be freed. */ if(dbpkg) { /* older ver of package currently installed */ - tmpfiles = _alpm_filelist_difference(alpm_pkg_get_files(p1), + newfiles = _alpm_filelist_difference(alpm_pkg_get_files(p1), alpm_pkg_get_files(dbpkg)); } else { /* no version of package currently installed */ alpm_filelist_t *fl = alpm_pkg_get_files(p1); size_t filenum; for(filenum = 0; filenum < fl->count; filenum++) { - tmpfiles = alpm_list_add(tmpfiles, fl->files[filenum].name); + newfiles = alpm_list_add(newfiles, fl->files[filenum].name); } } - for(j = tmpfiles; j; j = j->next) { + for(j = newfiles; j; j = j->next) { const char *filestr = j->data; const char *relative_path; alpm_list_t *k; @@ -653,12 +653,12 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_free_inner(conflicts, (alpm_list_fn_free) alpm_conflict_free); alpm_list_free(conflicts); - alpm_list_free(tmpfiles); + alpm_list_free(newfiles); return NULL; } } } - alpm_list_free(tmpfiles); + alpm_list_free(newfiles); } PROGRESS(handle, ALPM_PROGRESS_CONFLICTS_START, "", 100, numtargs, current); -- 2.11.0

1 0

[pacman-dev] [PATCH] dload: s/CURLOPT_WRITEHEADER/CURLOPT_HEADERDATA/
by Dave Reisner 11 Dec '16

11 Dec '16

The former is really old, and should be avoided. --- lib/libalpm/dload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index e889609..b0f81b6 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -267,7 +267,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1L); curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L); curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, dload_parseheader_cb); - curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload); + curl_easy_setopt(curl, CURLOPT_HEADERDATA, (void *)payload); curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); curl_easy_setopt(curl, CURLOPT_TCP_KEEPIDLE, 60L); -- 2.10.2

1 0

[pacman-dev] [PATCH v2] Give a "success!" message on database check
by Patrick Eigensatz 08 Dec '16

08 Dec '16

'pacman -Dk' prints a "success!" message if there were no errors. It is possible to suppress the output using the '-q / --quiet' flag. This implements the feature discussed at https://bugs.archlinux.org/task/50087 Signed-off-by: Patrick Eigensatz <patrick.eigensatz(a)gmail.com> --- doc/pacman.8.txt | 6 +++++- src/pacman/database.c | 4 ++++ src/pacman/pacman.c | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 2bafa41..0522981 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -456,7 +456,7 @@ Database Options (apply to '-D')[[QO]] package installed even when it was initially installed as a dependency of another package. -*-k \--check*:: +*-k, \--check*:: Check the local package database is internally consistent. This will check all required files are present and that installed packages have the required dependencies, do not conflict and that multiple packages @@ -464,6 +464,10 @@ Database Options (apply to '-D')[[QO]] a check on the sync databases to ensure all specified dependencies are available. +*-q, \--quiet*:: + Apply to '-q' or '--quiet' to suppress the message that the + database check was successful and no errors have been found. + File Options (apply to '-F')[[FO]] ---------------------------------- *-y, --refresh*:: diff --git a/src/pacman/database.c b/src/pacman/database.c index 0197903..3990ea2 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -286,6 +286,10 @@ int pacman_database(alpm_list_t *targets) } else { ret = check_db_sync(); } + + if(ret == 0 && !config->quiet) { + printf(_("No database errors have been found!\n")); + } } if(config->flags & (ALPM_TRANS_FLAG_ALLDEPS | ALPM_TRANS_FLAG_ALLEXPLICIT)) { diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index be52d1b..3881829 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -171,6 +171,7 @@ static void usage(int op, const char * const myname) addlist(_(" --asdeps mark packages as non-explicitly installed\n")); addlist(_(" --asexplicit mark packages as explicitly installed\n")); addlist(_(" -k, --check test local database for validity (-kk for sync databases)\n")); + addlist(_(" -q, --quiet Suppress the success message of the validity check\n")); } else if(op == PM_OP_DEPTEST) { printf("%s: %s {-T --deptest} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); @@ -466,6 +467,10 @@ static int parsearg_database(int opt) case 'k': (config->op_q_check)++; break; + case OP_QUIET: + case 'q': + config->quiet = 1; + break; default: return 1; } -- 2.10.0

2 7

[pacman-dev] [PATCH 1/1] make pacman even more candy-aware
by Christian Hesse 08 Dec '16

08 Dec '16

From: Christian Hesse <mail(a)eworm.de> Signed-off-by: Christian Hesse <mail(a)eworm.de> --- src/pacman/callback.c | 15 +++++++++++++-- src/pacman/conf.c | 3 +++ src/pacman/conf.h | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 7f72b84..9cdd9a4 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -112,8 +112,19 @@ static void fill_progress(const int bar_percent, const int disp_percent, if(hashlen > 0) { fputs(" [", stdout); for(i = hashlen; i > 0; --i) { - /* if special progress bar enabled */ - if(config->chomp) { + /* progress bar with pacman in unicode: [ ᗧ••ᗣ••] */ + if(config->chomp_unicode) { + if(i > hashlen - hash) { + putchar(' '); + } else if(i == hashlen - hash) { + fputs("\033[1;33mᗧ\033[m", stdout); + } else if(i % 3 == 0) { + printf("\033[1;%dmᗣ\033[m", i % 5 + 31); + } else { + fputs("\033[0;37m•\033[m", stdout); + } + } /* progress bar with pacman in ascii: [--C o ] */ + else if(config->chomp) { if(i > hashlen - hash) { putchar('-'); } else if(i == hashlen - hash) { diff --git a/src/pacman/conf.c b/src/pacman/conf.c index d8d64fb..430bb81 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -479,6 +479,9 @@ static int _parse_options(const char *key, char *value, if(strcmp(key, "UseSyslog") == 0) { config->usesyslog = 1; pm_printf(ALPM_LOG_DEBUG, "config: usesyslog\n"); + } else if(strcmp(key, "ILoveSweetCandy") == 0) { + config->chomp_unicode = 1; + pm_printf(ALPM_LOG_DEBUG, "config: chomp_unicode\n"); } else if(strcmp(key, "ILoveCandy") == 0) { config->chomp = 1; pm_printf(ALPM_LOG_DEBUG, "config: chomp\n"); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 945de7c..577f236 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -109,6 +109,8 @@ typedef struct __config_t { /* conf file options */ /* I Love Candy! */ unsigned short chomp; + /* I Love Sweet Candy! */ + unsigned short chomp_unicode; /* format target pkg lists as table */ unsigned short verbosepkglists; /* When downloading, display the amount downloaded, rate, ETA, and percent -- 2.10.2

1 1

[pacman-dev] makedepends and checkdepends in .PKGINFO and repo databases
by Mark Weiman 08 Dec '16

08 Dec '16

I am working on a repository manager in PHP that uses a PHP extension that allows use of libalpm from PHP. While designing this though, I've noticed that makedepends and checkdepends are listed in packages created with makepkg in .PKGINFO that libalpm seems to not care about. Then when adding a package to a repository with repo-add, those values get copied over into the desc file for said package. Since there's no effective way to open xz compressed archives in PHP (because most packages in Arch use .tar.xz), it brought up questions of why are these values included in packages and repositories when libalpm seemingly doesn't take note of them and if there is a reason for it, why doesn't libalpm have ways of getting those values back. My suggestion would be either of the following: 1. Remove checkdepends and makedepends from makepkg and repo-add. 2. Add alpm_pkg_get_checkdepends() and alpm_pkg_get_makedepends() to libalpm. Either of the above are something I'm willing to work on if one of these are appropriate to add. Mark Weiman

2 1