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

[pacman-dev] [PATCH] Add option MaxDlSpeed to limit download speed
by Olivier Brunel 20 May '17

20 May '17

Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- doc/pacman.8.txt | 5 +++++ doc/pacman.conf.5.txt | 6 ++++++ lib/libalpm/alpm.h | 3 +++ lib/libalpm/dload.c | 1 + lib/libalpm/handle.c | 26 ++++++++++++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 11 +++++++++++ src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 11 +++++++++++ src/pacman/util.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ src/pacman/util.h | 2 ++ 11 files changed, 114 insertions(+), 1 deletion(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 231e0bc..1890cd9 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -266,6 +266,11 @@ Upgrade Options (apply to '-S' and '-U')[[UO]] *\--needed*:: Do not reinstall the targets that are already up-to-date. +*\--maxdlspeed* <speed>:: + Sets the maximum download speed to the specified speed in bytes/s, unless a + suffix is appended. Suffix 'k' or 'K' will count as KiB/s, 'm' or 'M' as + MiB/s, and 'g' or 'G' as GiB/s. + Query Options (apply to '-Q')[[QO]] ----------------------------------- diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index c665870..49ce63b 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -201,6 +201,12 @@ Options bar is still based solely on the current file download. This option won't work if XferCommand is used. +*MaxDlSpeed*:: + Sets the maximum download speed to the specified speed in bytes/s, unless a + suffix is appended. Suffix 'k' or 'K' will count as KiB/s, 'm' or 'M' as + MiB/s, and 'g' or 'G' as GiB/s. + This option won't work if XferCommand is used. + *CheckSpace*:: Performs an approximate check for adequate available disk space before installing packages. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 168d71b..7e4e9da 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -925,6 +925,9 @@ int alpm_option_set_local_file_siglevel(alpm_handle_t *handle, alpm_siglevel_t l alpm_siglevel_t alpm_option_get_remote_file_siglevel(alpm_handle_t *handle); int alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); +off_t alpm_option_get_maxdlspeed(alpm_handle_t *handle); +int alpm_option_set_maxdlspeed(alpm_handle_t *handle, off_t speed); + /** @} */ /** @addtogroup alpm_api_databases Database Functions diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 31ae82c..8c6d6af 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -295,6 +295,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, dload_progress_cb); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *)payload); + curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, handle->maxdlspeed); 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); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index e9439a0..9cab5da 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -844,4 +844,30 @@ alpm_siglevel_t SYMEXPORT alpm_option_get_remote_file_siglevel(alpm_handle_t *ha } } +off_t SYMEXPORT alpm_option_get_maxdlspeed(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBCURL + return (off_t) handle->maxdlspeed; +#else + return 0; +#endif +} + +int SYMEXPORT alpm_option_set_maxdlspeed(alpm_handle_t *handle, off_t speed) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBCURL + if(speed >= 0) { + handle->maxdlspeed = (curl_off_t) speed; + return 0; + } else +#else + if(speed == 0) + return 0; + else +#endif + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); +} + /* vim: set noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index a1d0f9a..f55b6ed 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -60,6 +60,7 @@ struct __alpm_handle_t { #ifdef HAVE_LIBCURL /* libcurl handle */ CURL *curl; /* reusable curl_easy handle */ + curl_off_t maxdlspeed; /* maximum download speed (B/s) */ #endif #ifdef HAVE_LIBGPGME diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 25de7af..39cc15c 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -544,6 +544,16 @@ static int _parse_options(const char *key, char *value, } config->deltaratio = ratio; pm_printf(ALPM_LOG_DEBUG, "config: usedelta = %f\n", ratio); + } else if(strcmp(key, "MaxDlSpeed") == 0) { + off_t speed = parsesize(value); + if(speed < 0) { + pm_printf(ALPM_LOG_ERROR, + _("config file %s, line %d: invalid value for '%s' : '%s'\n"), + file, linenum, "MaxDlSpeed", value); + return 1; + } + config->maxdlspeed = speed; + pm_printf(ALPM_LOG_DEBUG, "config: maxdlspeed = %jd\n", (intmax_t) speed); } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { @@ -810,6 +820,7 @@ static int setup_libalpm(void) alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); alpm_option_set_deltaratio(handle, config->deltaratio); + alpm_option_set_maxdlspeed(handle, config->maxdlspeed); alpm_option_set_ignorepkgs(handle, config->ignorepkg); alpm_option_set_ignoregroups(handle, config->ignoregrp); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 2aba8bf..77353a2 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -56,6 +56,7 @@ typedef struct __config_t { unsigned short usesyslog; unsigned short color; double deltaratio; + off_t maxdlspeed; char *arch; char *print_format; /* unfortunately, we have to keep track of paths both here and in the library @@ -201,7 +202,8 @@ enum { OP_VERBOSE, OP_DOWNLOADONLY, OP_REFRESH, - OP_ASSUMEINSTALLED + OP_ASSUMEINSTALLED, + OP_MAXDLSPEED }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index be52d1b..91f8500 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -194,6 +194,8 @@ static void usage(int op, const char * const myname) addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); addlist(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); + addlist(_(" --maxdlspeed <speed>\n" + " set the maximum download speed\n")); /* pass through */ case PM_OP_REMOVE: addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); @@ -713,6 +715,14 @@ static int parsearg_upgrade(int opt) case OP_IGNOREGROUP: parsearg_util_addlist(&(config->ignoregrp)); break; + case OP_MAXDLSPEED: + { + off_t speed = parsesize(optarg); + if(speed < 0) + return 1; + config->maxdlspeed = speed; + break; + } default: return 1; } return 0; @@ -929,6 +939,7 @@ static int parseargs(int argc, char *argv[]) {"ignoregroup", required_argument, 0, OP_IGNOREGROUP}, {"needed", no_argument, 0, OP_NEEDED}, {"asexplicit", no_argument, 0, OP_ASEXPLICIT}, + {"maxdlspeed", required_argument, 0, OP_MAXDLSPEED}, {"arch", required_argument, 0, OP_ARCH}, {"print-format", required_argument, 0, OP_PRINTFORMAT}, {"gpgdir", required_argument, 0, OP_GPGDIR}, diff --git a/src/pacman/util.c b/src/pacman/util.c index 81780f7..35b4f23 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1763,4 +1763,49 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list return ret; } +off_t parsesize(const char *str) +{ + long size; + char *endptr; + + size = strtol(str, &endptr, 10); + if((size == LONG_MIN || size == LONG_MAX) && errno == ERANGE) { + return -1; + } + if(*endptr != '\0') { + if(endptr[1] != '\0') { + return -1; + } + switch(*endptr) { + case 'g': + case 'G': + if(size > LONG_MAX / 1024) { + return -1; + } + size *= 1024; + /* fallthrough */ + case 'm': + case 'M': + if(size > LONG_MAX / 1024) { + return -1; + } + size *= 1024; + /* fallthrough */ + case 'k': + case 'K': + if(size > LONG_MAX / 1024) { + return -1; + } + size *= 1024; + break; + default: + return -1; + } + } + if(size < 0) { + return -1; + } + return (off_t) size; +} + /* vim: set noet: */ diff --git a/src/pacman/util.h b/src/pacman/util.h index f5e37c8..7d0a897 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -82,6 +82,8 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list int pm_sprintf(char **string, alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,3,4))); int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); +off_t parsesize(const char *str); + #endif /* _PM_UTIL_H */ /* vim: set noet: */ -- 2.9.3

3 2

[pacman-dev] [PATCH 1/5] makepkg: remove build date from .PKGINFO header
by Levente Polyak 17 May '17

17 May '17

From: Allan McRae <allan(a)archlinux.org> This information is duplicated (in less friendly format) in the "builddate" entry and removing it improves reproducible packaging. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> --- scripts/makepkg.sh.in | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0218e13b..86abb177 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -635,7 +635,6 @@ write_pkginfo() { msg2 "$(gettext "Generating %s file...")" ".PKGINFO" printf "# Generated by makepkg %s\n" "$makepkg_version" printf "# using %s\n" "$(fakeroot -v)" - printf "# %s\n" "$(LC_ALL=C date -u)" write_kv_pair "pkgname" "$pkgname" if (( SPLITPKG )) || [[ "$pkgbase" != "$pkgname" ]]; then -- 2.12.2

4 8

[pacman-dev] [PATCH 5/5] remove unused byte from user agent buffer
by Andrew Gregory 10 May '17

10 May '17

snprintf prints at most n bytes including the terminating '\0'. The extra reserved byte was never being used. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 11b7e6f0..8c7f715e 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -269,7 +269,7 @@ static void localize(void) */ static void setuseragent(void) { - char agent[101]; + char agent[100]; struct utsname un; int len; -- 2.12.2

1 0

[pacman-dev] [PATCH 4/5] check for overflow when setting HTTP_USER_AGENT
by Andrew Gregory 10 May '17

10 May '17

gcc7 issues a warning about a potential overflow if left unchecked. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 605aec3e..11b7e6f0 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -271,10 +271,15 @@ static void setuseragent(void) { char agent[101]; struct utsname un; + int len; uname(&un); - snprintf(agent, 100, "pacman/%s (%s %s) libalpm/%s", + len = snprintf(agent, 100, "pacman/%s (%s %s) libalpm/%s", PACKAGE_VERSION, un.sysname, un.machine, alpm_version()); + if(len >= 100) { + pm_printf(ALPM_LOG_WARNING, _("HTTP_USER_AGENT truncated\n")); + } + setenv("HTTP_USER_AGENT", agent, 0); } -- 2.12.2

1 0

[pacman-dev] [PATCH 3/5] alpm_list: abort on memory allocation failure
by Andrew Gregory 10 May '17

10 May '17

This makes it possible to detect a failure in several alpm_list functions. Previously these functions would continue after a failure, returning partial results and potentially leaking memory. Unfortunately, NULL is a valid return value for the affected functions if the input list is empty, so they still do not have a dedicated error value. Callers can at least detect an error by checking if the input list was empty. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- There are more functions that fail silently, but they can't be fixed without breaking API. lib/libalpm/alpm_list.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 0f1b819c..334f67ba 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -461,7 +461,10 @@ alpm_list_t SYMEXPORT *alpm_list_remove_dupes(const alpm_list_t *list) alpm_list_t *newlist = NULL; while(lp) { if(!alpm_list_find_ptr(newlist, lp->data)) { - newlist = alpm_list_add(newlist, lp->data); + if(alpm_list_append(&newlist, lp->data) == NULL) { + alpm_list_free(newlist); + return NULL; + } } lp = lp->next; } @@ -480,7 +483,10 @@ alpm_list_t SYMEXPORT *alpm_list_strdup(const alpm_list_t *list) const alpm_list_t *lp = list; alpm_list_t *newlist = NULL; while(lp) { - newlist = alpm_list_add(newlist, strdup(lp->data)); + if(alpm_list_append_strdup(&newlist, lp->data) == NULL) { + FREELIST(newlist); + return NULL; + } lp = lp->next; } return newlist; @@ -498,7 +504,10 @@ alpm_list_t SYMEXPORT *alpm_list_copy(const alpm_list_t *list) const alpm_list_t *lp = list; alpm_list_t *newlist = NULL; while(lp) { - newlist = alpm_list_add(newlist, lp->data); + if(alpm_list_append(&newlist, lp->data) == NULL) { + alpm_list_free(newlist); + return NULL; + } lp = lp->next; } return newlist; @@ -523,8 +532,15 @@ alpm_list_t SYMEXPORT *alpm_list_copy_data(const alpm_list_t *list, void *newdata = malloc(size); if(newdata) { memcpy(newdata, lp->data, size); - newlist = alpm_list_add(newlist, newdata); + if(alpm_list_append(&newlist, newdata) == NULL) { + free(newdata); + FREELIST(newlist); + return NULL; + } lp = lp->next; + } else { + FREELIST(newlist); + return NULL; } } return newlist; @@ -552,7 +568,10 @@ alpm_list_t SYMEXPORT *alpm_list_reverse(alpm_list_t *list) list->prev = NULL; while(lp) { - newlist = alpm_list_add(newlist, lp->data); + if(alpm_list_append(&newlist, lp->data) == NULL) { + alpm_list_free(newlist); + return NULL; + } lp = lp->prev; } list->prev = backup; /* restore tail pointer */ -- 2.12.2

1 0

[pacman-dev] [PATCH 2/5] query_fileowner: avoid buffer overflow
by Andrew Gregory 10 May '17

10 May '17

Copying a string into a buffer that has just been determined to not be able to hold it is obviously incorrect. The actual error handling appears to have been unintentionally removed in 47762ab687959e48acc2de8592fcf3ba3cfa502b. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pacman/query.c b/src/pacman/query.c index 119764bc..247423fa 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -205,6 +205,7 @@ static int query_fileowner(alpm_list_t *targets) size_t rlen = strlen(rpath); if(rlen + 2 >= PATH_MAX) { pm_printf(ALPM_LOG_ERROR, _("path too long: %s/\n"), rpath); + goto targcleanup; } strcat(rpath + rlen, "/"); } -- 2.12.2

1 0

[pacman-dev] [PATCH 1/5] alpm_unlock: check handle before dereferencing
by Andrew Gregory 10 May '17

10 May '17

Prevents SIGSEGV if we catch SIGINT or SIGHUP before initializing alpm. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/handle.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 502a5d9e..08625e3a 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -135,6 +135,7 @@ int _alpm_handle_lock(alpm_handle_t *handle) */ int SYMEXPORT alpm_unlock(alpm_handle_t *handle) { + ASSERT(handle != NULL, return -1); ASSERT(handle->lockfile != NULL, return 0); ASSERT(handle->lockfd >= 0, return 0); -- 2.12.2

1 0

[pacman-dev] [PATCH] Handle empty string passed to query_owner
by Allan McRae 10 May '17

10 May '17

Passing an empty string to pacman -Qo results in: error: No package owns <first directory in $PATH> Treat an empty string being passed the same as recieving a NULL value and exit searching for an owner. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Running 'pacman -Qo ""' will now just exit pacman. I'm not sure if we need an error/warning message for this case. src/pacman/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index a8417570..119764bc 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -161,7 +161,8 @@ static int query_fileowner(alpm_list_t *targets) size_t len, is_dir; unsigned int found = 0; - if((filename = strdup(t->data)) == NULL) { + filename = strdup(t->data); + if(filename == NULL || strcmp(filename, "") == 0) { goto targcleanup; } -- 2.12.2

2 1

[pacman-dev] [PATCH] Do not continuously try to open an invalid database
by Allan McRae 10 May '17

10 May '17

If you manage to download a bad database (e.g. an html file when behind a proxy or with a badly configured webserver), pacman makes sure you know about it. Here is some example output: error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format error: could not open file /var/lib/pacman/sync/extra.db: Unrecognized archive format I don't know how many times that gets printed because it goes beyond my scrollback buffer. Flag a database that we can "open" and "fstat" but not read from as invalid to avoid this. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_sync.c | 3 +++ lib/libalpm/util.c | 1 + 2 files changed, 4 insertions(+) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 06f509a6..46959298 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -486,6 +486,9 @@ static int sync_db_populate(alpm_db_t *db) fd = _alpm_open_archive(db->handle, dbpath, &buf, &archive, ALPM_ERR_DB_OPEN); if(fd < 0) { + if(db->handle->pm_errno == ALPM_ERR_DB_INVALID) { + db->status &= DB_STATUS_INVALID; + } return -1; } est_count = estimate_package_count(&buf, archive); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 35fc7f41..0fb9bb6d 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -268,6 +268,7 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path, if(archive_read_open_fd(*archive, fd, bufsize) != ARCHIVE_OK) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not open file %s: %s\n"), path, archive_error_string(*archive)); + error = ALPM_ERR_DB_INVALID; goto error; } -- 2.12.2

2 1

[pacman-dev] bug in 'who owns' feature?
by Adesh Kumar 07 May '17

07 May '17

Tried using Pacman v5.0.1 - libalpm v10.0.1 --($:~)-- pacman -Qo "" error: No package owns /usr/local/sbin/ --($:~)-- pacman -Qo /usr/local/sbin/ /usr/local/sbin/ is owned by filesystem 2016.12-2

1 0