March 2020 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Inline dload_payload->curlerr field into a local variable
by Anatol Pomozov 25 Mar '20

25 Mar '20

dload_payload->curlerr is a field that is used inside curl_download_internal() function only. It can be converted to a local variable. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/dload.c | 9 +++++---- lib/libalpm/dload.h | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1f28c7c2..3570e234 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -366,6 +366,7 @@ static int curl_download_internal(struct dload_payload *payload, long timecond, remote_time = -1; double remote_size, bytes_dl; struct sigaction orig_sig_pipe, orig_sig_int; + CURLcode curlerr; /* shortcut to our handle within the payload */ alpm_handle_t *handle = payload->handle; CURL *curl = curl_easy_init(); @@ -437,9 +438,9 @@ static int curl_download_internal(struct dload_payload *payload, mask_signal(SIGINT, &inthandler, &orig_sig_int); /* perform transfer */ - payload->curlerr = curl_easy_perform(curl); + curlerr = curl_easy_perform(curl); _alpm_log(handle, ALPM_LOG_DEBUG, "curl returned error %d from transfer\n", - payload->curlerr); + curlerr); /* disconnect relationships from the curl handle for things that might go out * of scope, but could still be touched on connection teardown. This really @@ -448,7 +449,7 @@ static int curl_download_internal(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)NULL); /* was it a success? */ - switch(payload->curlerr) { + switch(curlerr) { case CURLE_OK: /* get http/ftp response code */ _alpm_log(handle, ALPM_LOG_DEBUG, "response code: %ld\n", payload->respcode); @@ -469,7 +470,7 @@ static int curl_download_internal(struct dload_payload *payload, case CURLE_ABORTED_BY_CALLBACK: /* handle the interrupt accordingly */ if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { - payload->curlerr = CURLE_FILESIZE_EXCEEDED; + curlerr = CURLE_FILESIZE_EXCEEDED; payload->unlink_on_fail = 1; handle->pm_errno = ALPM_ERR_LIBCURL; _alpm_log(handle, ALPM_LOG_ERROR, diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 65fcdadb..e87b6a93 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -45,7 +45,6 @@ struct dload_payload { int cb_initialized; #ifdef HAVE_LIBCURL CURL *curl; - CURLcode curlerr; /* last error produced by curl */ #endif }; -- 2.25.1

2 1

[pacman-dev] Translation issues
by Luca Weiss 17 Mar '20

17 Mar '20

Hello, I've noticed that in the Esperanto the following message is printed in makepkg: ==> Ekante $s()... (In English e.g. "Starting package()") It looks like the translation uses $s instead of %s. A similar issue is also present in the Danish translation for a different string. Someone with access to these languages on Transifex should fix that. Here are the changes that should be done: diff --git a/scripts/po/da.po b/scripts/po/da.po index 799c7b5c..ba2695ac 100644 --- a/scripts/po/da.po +++ b/scripts/po/da.po @@ -1615,7 +1615,7 @@ msgstr "%s-fil (%s) findes ikke eller er ikke en regulær fil." #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:61 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:92 msgid "%s_%s should be an array" -msgstr "$s_%s burde være et matrix" +msgstr "%s_%s burde være et matrix" #: scripts/libmakepkg/source.sh.in:40 msgid "Retrieving sources..." diff --git a/scripts/po/eo.po b/scripts/po/eo.po index 08c72c03..f20c894f 100644 --- a/scripts/po/eo.po +++ b/scripts/po/eo.po @@ -108,7 +108,7 @@ msgstr "Malsukcesis fonti %s" #: scripts/makepkg.sh.in:446 msgid "Starting %s()..." -msgstr "Ekante $s()..." +msgstr "Ekante %s()..." #: scripts/makepkg.sh.in:559 msgid "Library listed in %s is not required by any files: %s" Regards Luca

3 3

[pacman-dev] [PATCH] Add multi_curl handle to ALPM global context
by Anatol Pomozov 17 Mar '20

17 Mar '20

To be able to run multiple download in parallel efficiently we need to use curl_multi interface [1]. It introduces a set of APIs over new type of handler 'CURLM'. Create CURLM object at the application start and set it to global ALPM context. The 'single-download' CURL handle moves to payload struct. A new CURL handle is created for each payload with intention to be processed by CURLM. Note that curl_download_internal() is not ported to CURLM interface due to the fact that the function will go away soon. [1] https://curl.haxx.se/libcurl/c/libcurl-multi.html --- lib/libalpm/alpm.c | 12 +++++++++--- lib/libalpm/dload.c | 17 ++++++----------- lib/libalpm/dload.h | 1 + lib/libalpm/handle.c | 5 ----- lib/libalpm/handle.h | 2 +- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index d1265214..34c5b4b2 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -70,6 +70,11 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, goto cleanup; } +#ifdef HAVE_LIBCURL + curl_global_init(CURL_GLOBAL_ALL); + myhandle->curlm = curl_multi_init(); +#endif + #ifdef ENABLE_NLS bindtextdomain("libalpm", LOCALEDIR); #endif @@ -104,13 +109,14 @@ int SYMEXPORT alpm_release(alpm_handle_t *myhandle) ret = -1; } - _alpm_handle_unlock(myhandle); - _alpm_handle_free(myhandle); - #ifdef HAVE_LIBCURL + curl_multi_cleanup(myhandle->curlm); curl_global_cleanup(); #endif + _alpm_handle_unlock(myhandle); + _alpm_handle_free(myhandle); + return ret; } diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index bec3ff5e..1f28c7c2 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -72,15 +72,6 @@ static char *get_fullpath(const char *path, const char *filename, return filepath; } -static CURL *get_libcurl_handle(alpm_handle_t *handle) -{ - if(!handle->curl) { - curl_global_init(CURL_GLOBAL_SSL); - handle->curl = curl_easy_init(); - } - return handle->curl; -} - enum { ABORT_SIGINT = 1, ABORT_OVER_MAXFILESIZE @@ -241,7 +232,7 @@ static size_t dload_parseheader_cb(void *ptr, size_t size, size_t nmemb, void *u } } - curl_easy_getinfo(payload->handle->curl, CURLINFO_RESPONSE_CODE, &respcode); + curl_easy_getinfo(payload->curl, CURLINFO_RESPONSE_CODE, &respcode); if(payload->respcode != respcode) { payload->respcode = respcode; } @@ -377,8 +368,9 @@ static int curl_download_internal(struct dload_payload *payload, struct sigaction orig_sig_pipe, orig_sig_int; /* shortcut to our handle within the payload */ alpm_handle_t *handle = payload->handle; - CURL *curl = get_libcurl_handle(handle); + CURL *curl = curl_easy_init(); handle->pm_errno = ALPM_ERR_OK; + payload->curl = curl; /* make sure these are NULL */ FREE(payload->tempfile_name); @@ -594,6 +586,9 @@ cleanup: unlink(payload->tempfile_name); } + curl_easy_cleanup(curl); + payload->curl = NULL; + /* restore the old signal handlers */ unmask_signal(SIGINT, &orig_sig_int); unmask_signal(SIGPIPE, &orig_sig_pipe); diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 3eb7fbe1..65fcdadb 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -44,6 +44,7 @@ struct dload_payload { int trust_remote_name; int cb_initialized; #ifdef HAVE_LIBCURL + CURL *curl; CURLcode curlerr; /* last error produced by curl */ #endif }; diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 8ae08d11..0d4797bf 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -64,11 +64,6 @@ void _alpm_handle_free(alpm_handle_t *handle) closelog(); } -#ifdef HAVE_LIBCURL - /* release curl handle */ - curl_easy_cleanup(handle->curl); -#endif - #ifdef HAVE_LIBGPGME FREELIST(handle->known_keys); #endif diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index cd7104f9..9fef0fbf 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -59,7 +59,7 @@ struct __alpm_handle_t { #ifdef HAVE_LIBCURL /* libcurl handle */ - CURL *curl; /* reusable curl_easy handle */ + CURLM *curlm; unsigned short disable_dl_timeout; unsigned int parallel_downloads; /* number of download streams */ #endif -- 2.25.1

2 1

[pacman-dev] [PATCH] makepkg: drop duplicate reporting of missing dependencies
by Dave Reisner 17 Mar '20

17 Mar '20

When pacman fails to satisfy deps, we might see output like the following: ==> Making package: spiderfoot 3.0-1 (Thu 06 Feb 2020 12:45:10 PM CET) ==> Checking runtime dependencies... ==> Installing missing dependencies... error: target not found: python-pygexf ==> ERROR: 'pacman' failed to install missing dependencies. ==> Missing dependencies: -> python-dnspython -> python-exifread -> python-cherrypy -> python-beautifulsoup4 -> python-netaddr -> python-pysocks -> python-ipwhois -> python-ipaddress -> python-phonenumbers -> python-pypdf2 -> python-stem -> python-whois -> python-future -> python-pyopenssl -> python-docx -> python-pptx -> python-networkx -> python-cryptography -> python-secure -> python-pygexf -> python-adblockparser ==> Checking buildtime dependencies... ==> ERROR: Could not resolve all dependencies. This is misleading -- the only truly missing package is python-pygexf, but we fail to remove sync-able deps from our deplist and report everything as if it were missing. Simply drop this extra reporting because pacman already tells us exactly what couldn't be resolved. --- I thought about trying to make this accurate and diff the lists -- something like: mapfile -t deplist < <(printf '%s\n' "${deplist}" | grep -vxFf <(run_pacman -Ssq)) but I'm not convinced this is really the right thing to do... scripts/makepkg.sh.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7fa791e1..bfbf165b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -316,12 +316,6 @@ resolve_deps() { [[ -z $deplist ]] && return $R_DEPS_SATISFIED fi - msg "$(gettext "Missing dependencies:")" - local dep - for dep in ${deplist[@]}; do - msg2 "$dep" - done - return $R_DEPS_MISSING } -- 2.25.0

3 3

Re: [pacman-dev] [PATCH v2] Dull version colour numbers in summary
by Carson Black 17 Mar '20

17 Mar '20

As mentioned on IRC, formatting was mangled. Fixed formatting issues.

2 2

[pacman-dev] [PATCH] Implement _alpm_multi_download
by Anatol Pomozov 17 Mar '20

17 Mar '20

It is equivalent of _alpm_download but accepts list of payloads. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/dload.c | 50 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 7cd3e3a4..bec3ff5e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -604,6 +604,16 @@ cleanup: return ret; } + +static int curl_multi_download_internal(alpm_handle_t *handle, + alpm_list_t *payloads /* struct dload_payload */, + const char *localpath) +{ + (void)handle; + (void)payloads; + (void)localpath; + return 0; +} #endif /** Download a file given by a URL to a local directory. @@ -640,10 +650,42 @@ int _alpm_multi_download(alpm_handle_t *handle, alpm_list_t *payloads /* struct dload_payload */, const char *localpath) { - (void)handle; - (void)payloads; - (void)localpath; - return 0; + if(handle->fetchcb == NULL) { +#ifdef HAVE_LIBCURL + return curl_multi_download_internal(handle, payloads, localpath); +#else + RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); +#endif + } else { + alpm_list_t *p; + for(p = payloads; p; p = p->next) { + struct dload_payload *payload = p->data; + alpm_list_t *s; + int success = 0; + + for(s = payload->servers; s; s = s->next) { + const char *server = s->data; + char *fileurl; + int ret; + + size_t len = strlen(server) + strlen(payload->filepath) + 2; + MALLOC(fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(fileurl, len, "%s/%s", server, payload->filepath); + + ret = handle->fetchcb(fileurl, localpath, payload->force); + free(fileurl); + + if (ret != -1) { + success = 1; + break; + } + } + if(!success && !payload->errors_ok) { + RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); + } + } + return 0; + } } static char *filecache_find_url(alpm_handle_t *handle, const char *url) -- 2.25.1

2 3

[pacman-dev] [PATCH] Dull version colour numbers in summary
by Carson Black 15 Mar '20

15 Mar '20

Version colour numbers are dulled in the non-verbose transaction summary when colours are enabled. To prevent a regression, this patch also adds handling of strings with ANSI codes to string_length as to not break the transaction summary's output functions when colour codes are in the package name strings. Signed-off-by: Carson Black <uhhadd(a)gmail.com> --- src/pacman/conf.c | 40 +++++++++++++++------------- src/pacman/conf.h | 1 + src/pacman/util.c | 68 +++++++++++++++++++++++++++++++++-------------- 3 files changed, 71 insertions(+), 38 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f9de386f..142dffcb 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -63,30 +63,34 @@ config_t *config = NULL; #define BOLDCYAN "\033[1;36m" #define BOLDWHITE "\033[1;37m" +#define FAINTBLACK "\033[0;90m" + void enable_colors(int colors) { colstr_t *colstr = &config->colstr; if(colors == PM_COLOR_ON) { - colstr->colon = BOLDBLUE "::" BOLD " "; - colstr->title = BOLD; - colstr->repo = BOLDMAGENTA; - colstr->version = BOLDGREEN; - colstr->groups = BOLDBLUE; - colstr->meta = BOLDCYAN; - colstr->warn = BOLDYELLOW; - colstr->err = BOLDRED; - colstr->nocolor = NOCOLOR; + colstr->colon = BOLDBLUE "::" BOLD " "; + colstr->title = BOLD; + colstr->repo = BOLDMAGENTA; + colstr->version = BOLDGREEN; + colstr->groups = BOLDBLUE; + colstr->meta = BOLDCYAN; + colstr->warn = BOLDYELLOW; + colstr->err = BOLDRED; + colstr->subtitle = FAINTBLACK; + colstr->nocolor = NOCOLOR; } else { - colstr->colon = ":: "; - colstr->title = ""; - colstr->repo = ""; - colstr->version = ""; - colstr->groups = ""; - colstr->meta = ""; - colstr->warn = ""; - colstr->err = ""; - colstr->nocolor = ""; + colstr->colon = ":: "; + colstr->title = ""; + colstr->repo = ""; + colstr->version = ""; + colstr->groups = ""; + colstr->meta = ""; + colstr->warn = ""; + colstr->err = ""; + colstr->subtitle = ""; + colstr->nocolor = ""; } } diff --git a/src/pacman/conf.h b/src/pacman/conf.h index d954e637..41154c80 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -31,6 +31,7 @@ typedef struct __colstr_t { const char *meta; const char *warn; const char *err; + const char *subtitle; const char *nocolor; } colstr_t; diff --git a/src/pacman/util.c b/src/pacman/util.c index a3a85bb9..42e35360 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -409,20 +409,48 @@ char *strreplace(const char *str, const char *needle, const char *replace) static size_t string_length(const char *s) { - int len; - wchar_t *wcstr; - - if(!s || s[0] == '\0') { - return 0; - } - /* len goes from # bytes -> # chars -> # cols */ - len = strlen(s) + 1; - wcstr = calloc(len, sizeof(wchar_t)); - len = mbstowcs(wcstr, s, len); - len = wcswidth(wcstr, len); - free(wcstr); - - return len; + int len; + wchar_t *wcstr; + + if(!s || s[0] == '\0') { + return 0; + } + if (strstr(s, "\033")) { + char* source = s; + char* replaced = malloc(sizeof(char)*strlen(s)); + int mode = 0; + int iter = 0; + for (char character = *source; character != '\0'; character = *++source) { + if (mode == 0) { + if (character == '\033') { + mode = 1; + } else { + replaced[iter] = character; + iter++; + } + } else if (mode == 1) { + if (character == 'm') { + mode = 0; + } + } + } + replaced[++iter] = '\0'; + len = iter+1; + wcstr = calloc(len, sizeof(wchar_t)); + len = mbstowcs(wcstr, replaced, len); + len = wcswidth(wcstr, len); + free(wcstr); + free(replaced); + } else { + /* len goes from # bytes -> # chars -> # cols */ + len = strlen(s) + 1; + wcstr = calloc(len, sizeof(wchar_t)); + len = mbstowcs(wcstr, s, len); + len = wcswidth(wcstr, len); + free(wcstr); + } + + return len; } static void add_table_cell(alpm_list_t **row, char *label, int mode) @@ -905,14 +933,14 @@ static void _display_targets(alpm_list_t *targets, int verbose) } if(target->install) { - pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), - alpm_pkg_get_version(target->install)); + pm_asprintf(&str, "%s%s-%s%s", alpm_pkg_get_name(target->install), config->colstr.subtitle, + alpm_pkg_get_version(target->install), config->colstr.nocolor); } else if(isize == 0) { - pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->remove), - alpm_pkg_get_version(target->remove)); + pm_asprintf(&str, "%s%s-%s%s", alpm_pkg_get_name(target->remove), config->colstr.subtitle, + alpm_pkg_get_version(target->remove), config->colstr.nocolor); } else { - pm_asprintf(&str, "%s-%s [%s]", alpm_pkg_get_name(target->remove), - alpm_pkg_get_version(target->remove), _("removal")); + pm_asprintf(&str, "%s%s-%s %s[%s]%s", alpm_pkg_get_name(target->remove), config->colstr.subtitle, + alpm_pkg_get_version(target->remove), config->colstr.nocolor, _("removal"), config->colstr.nocolor); } names = alpm_list_add(names, str); } -- 2.25.1

1 0

[pacman-dev] [PATCH] Improved transaction summary appearance
by Carson Black 14 Mar '20

14 Mar '20

As for whether you can say the same about the code and developers... ¯\_(ツ)_/¯ Dealing with C really isn't my forte, but this: - hasn't segfaulted - seems to deal with memory safely I'm sure y'all will find something wrong with the code.

1 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.1-53-g87b74fcd
by Allan McRae 13 Mar '20

13 Mar '20

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 87b74fcd8257e3c2fbf2f2949f0561df7517ce71 (commit) via ddd5b0a462e7beb0e086bb51184934868ded3525 (commit) via 80ae80149a956adec75df159f66a9cb88e91f5cc (commit) via 0deff63efa6310ab0a00365b876eb8632abd6ab4 (commit) from e578903b60081bb8a7ddd094ed67946d5e48b719 (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 87b74fcd8257e3c2fbf2f2949f0561df7517ce71 Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Mon Mar 9 11:54:17 2020 -0700 Hide cursor while pacman is running Use ASCII control codes to hide cursor at the pacman start and then show the cursor when pacman finishes. It helps to avoid annoying blinking when progress bars are re-drawn. Cursor is reenabled if pacman expects user's input. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ddd5b0a462e7beb0e086bb51184934868ded3525 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Mar 9 12:57:45 2020 +1000 Add file and line number to RET_ERR{,_VOID} Following the example of the recently added GOTO_ERR, adding the file and line number in addition to the function name in our debug messages is potentially useful. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 80ae80149a956adec75df159f66a9cb88e91f5cc Author: Anatol Pomozov <anatol.pomozov(a)gmail.com> Date: Fri Mar 6 12:00:15 2020 -0800 Add GOTO_ERR() macro to set error and then goto a label This is a macro similar to RET_ERR but useful in the case when we need to record an error and then jump to some cleanup section. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0deff63efa6310ab0a00365b876eb8632abd6ab4 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 8 14:23:42 2020 +1000 Remove unneeded goto cleanup Since commit 2ee7a8d8, there is no cleanup needed in this function. Just return instead of jumping to the cleanup label. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 16 +++++----------- lib/libalpm/util.h | 9 +++++++-- src/pacman/pacman.c | 2 ++ src/pacman/sighandler.c | 4 ++++ src/pacman/util.c | 31 ++++++++++++++++++++++++++----- src/pacman/util.h | 6 ++++++ 6 files changed, 50 insertions(+), 18 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Introduce alpm_dbs_update() function for parallel db updates
by Anatol Pomozov 13 Mar '20

13 Mar '20

This is an equivalent of alpm_db_update but for multiplexed (parallel) download. The difference is that this function accepts list of databases to update. And then ALPM internals download it in parallel if possible. Add a stub for _alpm_multi_download the function that will do parallel payloads downloads in the future. Introduce dload_payload->filepath field that contains url path to the file we download. It is like fileurl field but does not contain protocol/server part. The rationale for having this field is that with the curl multidownload the server retry logic is going to move to a curl callback. And the callback needs to be able to reconstruct the 'next' fileurl. One will be able to do it by getting the next server url from 'servers' list and then concat with filepath. Once the 'parallel download' refactoring is over 'fileurl' field will go away. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- lib/libalpm/alpm.h | 2 + lib/libalpm/be_sync.c | 132 ++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/dload.c | 12 ++++ lib/libalpm/dload.h | 5 ++ 4 files changed, 151 insertions(+) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 93b97f44..eb0490eb 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1045,6 +1045,8 @@ int alpm_db_remove_server(alpm_db_t *db, const char *url); */ int alpm_db_update(int force, alpm_db_t *db); +int alpm_dbs_update(alpm_handle_t *handle, alpm_list_t *dbs, int force, int failfast); + /** Get a package entry from a package database. * @param db pointer to the package database to get the package from * @param name of the package diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index aafed15d..cdb46bd9 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -301,6 +301,138 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) return ret; } +/** Update list of databases. This function may run updates in parallel. + * + * @param dbs a list of alpm_db_t to update. + */ +int SYMEXPORT alpm_dbs_update(alpm_handle_t *handle, alpm_list_t *dbs, int force, UNUSED int failfast) { + char *syncpath; + const char *dbext = handle->dbext; + alpm_list_t *i; + int ret = -1; + mode_t oldmask; + alpm_list_t *payloads = NULL; + + /* Sanity checks */ + ASSERT(dbs != NULL, return -1); + handle->pm_errno = ALPM_ERR_OK; + + syncpath = get_sync_dir(handle); + ASSERT(syncpath != NULL, return -1); + + /* make sure we have a sane umask */ + oldmask = umask(0022); + + for(i = dbs; i; i = i->next) { + alpm_db_t *db = i->data; + int dbforce = force; + struct dload_payload *payload = NULL; + size_t len; + int siglevel; + + if(!(db->usage & ALPM_DB_USAGE_SYNC)) { + continue; + } + + ASSERT(db != handle->db_local, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); + ASSERT(db->servers != NULL, RET_ERR(handle, ALPM_ERR_SERVER_NONE, -1)); + + /* force update of invalid databases to fix potential mismatched database/signature */ + if(db->status & DB_STATUS_INVALID) { + dbforce = 1; + } + + CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + + /* set hard upper limit of 128MiB */ + payload->max_size = 128 * 1024 * 1024; + ASSERT(db->servers != NULL, RET_ERR(handle, ALPM_ERR_SERVER_NONE, -1)); + payload->servers = db->servers; + + /* print server + filename into a buffer */ + len = strlen(db->treename) + strlen(dbext) + 1; + MALLOC(payload->filepath, len, GOTO_ERR(handle, ALPM_ERR_MEMORY, cleanup)); + snprintf(payload->filepath, len, "%s%s", db->treename, dbext); + payload->handle = handle; + payload->force = dbforce; + payload->unlink_on_fail = 1; + + payloads = alpm_list_add(payloads, payload); + + siglevel = alpm_db_get_siglevel(db); + if(siglevel & ALPM_SIG_DATABASE) { + struct dload_payload *sig_payload; + CALLOC(sig_payload, 1, sizeof(*sig_payload), GOTO_ERR(handle, ALPM_ERR_MEMORY, cleanup)); + + /* print filename into a buffer (leave space for separator and .sig) */ + len = strlen(db->treename) + strlen(dbext) + 5; + MALLOC(sig_payload->filepath, len, goto cleanup); + snprintf(sig_payload->filepath, len, "%s%s.sig", db->treename, dbext); + + sig_payload->handle = handle; + sig_payload->force = dbforce; + sig_payload->errors_ok = (siglevel & ALPM_SIG_DATABASE_OPTIONAL); + + /* set hard upper limit of 16KiB */ + sig_payload->max_size = 16 * 1024; + sig_payload->servers = db->servers; + + payloads = alpm_list_add(payloads, sig_payload); + } + } + + /* attempt to grab a lock */ + if(_alpm_handle_lock(handle)) { + GOTO_ERR(handle, ALPM_ERR_HANDLE_LOCK, cleanup); + } + + ret = _alpm_multi_download(handle, payloads, syncpath); + if(ret < 0) { + goto cleanup; + } + + for(i = dbs; i; i = i->next) { + alpm_db_t *db = i->data; + if(!(db->usage & ALPM_DB_USAGE_SYNC)) { + continue; + } + + /* Cache needs to be rebuilt */ + _alpm_db_free_pkgcache(db); + + /* clear all status flags regarding validity/existence */ + db->status &= ~DB_STATUS_VALID; + db->status &= ~DB_STATUS_INVALID; + db->status &= ~DB_STATUS_EXISTS; + db->status &= ~DB_STATUS_MISSING; + + /* if the download failed skip validation to preserve the download error */ + if(sync_db_validate(db) != 0) { + /* pm_errno should be set */ + ret = -1; + } + } + +cleanup: + _alpm_handle_unlock(handle); + + if(ret == -1) { + /* pm_errno was set by the download code */ + _alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync dbs: %s\n", + alpm_strerror(handle->pm_errno)); + } else { + handle->pm_errno = ALPM_ERR_OK; + } + + if(payloads) { + alpm_list_free_inner(payloads, (alpm_list_fn_free)_alpm_dload_payload_reset); + FREELIST(payloads); + } + free(syncpath); + umask(oldmask); + return ret; +} + /* Forward decl so I don't reorganize the whole file right now */ static int sync_db_read(alpm_db_t *db, struct archive *archive, struct archive_entry *entry, alpm_pkg_t **likely_pkg); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 670da03d..7cd3e3a4 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -636,6 +636,16 @@ int _alpm_download(struct dload_payload *payload, const char *localpath, } } +int _alpm_multi_download(alpm_handle_t *handle, + alpm_list_t *payloads /* struct dload_payload */, + const char *localpath) +{ + (void)handle; + (void)payloads; + (void)localpath; + return 0; +} + static char *filecache_find_url(alpm_handle_t *handle, const char *url) { const char *filebase = strrchr(url, '/'); @@ -738,6 +748,7 @@ void _alpm_dload_payload_reset(struct dload_payload *payload) FREE(payload->destfile_name); FREE(payload->content_disp_name); FREE(payload->fileurl); + FREE(payload->filepath); *payload = (struct dload_payload){0}; } @@ -746,6 +757,7 @@ void _alpm_dload_payload_reset_for_retry(struct dload_payload *payload) ASSERT(payload, return); FREE(payload->fileurl); + FREE(payload->filepath); payload->initial_size += payload->prevprogress; payload->prevprogress = 0; payload->unlink_on_fail = 0; diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 1e8f75f3..3eb7fbe1 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -31,6 +31,7 @@ struct dload_payload { char *destfile_name; char *content_disp_name; char *fileurl; + char *filepath; /* download URL path */ alpm_list_t *servers; long respcode; off_t initial_size; @@ -53,4 +54,8 @@ void _alpm_dload_payload_reset_for_retry(struct dload_payload *payload); int _alpm_download(struct dload_payload *payload, const char *localpath, char **final_file, const char **final_url); +int _alpm_multi_download(alpm_handle_t *handle, + alpm_list_t *payloads /* struct dload_payload */, + const char *localpath); + #endif /* ALPM_DLOAD_H */ -- 2.25.1

3 10