- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] dload: pass back the effective URL to callers of _alpm_download
by Dave Reisner 29 Jan '13

29 Jan '13

I suspect that eventually we're going to end up returning a pointer to an allocated struct to describe the download result, but that's for another patch when the need arises... Fixes FS#33508. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/be_sync.c | 4 ++-- lib/libalpm/dload.c | 20 ++++++++++++-------- lib/libalpm/dload.h | 2 +- lib/libalpm/sync.c | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index a5a2c10..66e351b 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -218,7 +218,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) payload.force = force; payload.unlink_on_fail = 1; - ret = _alpm_download(&payload, syncpath, NULL); + ret = _alpm_download(&payload, syncpath, NULL, NULL); _alpm_dload_payload_reset(&payload); if(ret == 0 && (level & ALPM_SIG_DATABASE)) { @@ -244,7 +244,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) /* set hard upper limit of 16KiB */ payload.max_size = 16 * 1024; - sig_ret = _alpm_download(&payload, syncpath, NULL); + sig_ret = _alpm_download(&payload, syncpath, NULL, NULL); /* errors_ok suppresses error messages, but not the return code */ sig_ret = payload.errors_ok ? 0 : sig_ret; _alpm_dload_payload_reset(&payload); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 83d2051..927b0f4 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -386,7 +386,7 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat #define HOSTNAME_SIZE 256 static int curl_download_internal(struct dload_payload *payload, - const char *localpath, char **final_file) + const char *localpath, char **final_file, char **final_url) { int ret = -1; FILE *localf = NULL; @@ -523,6 +523,10 @@ static int curl_download_internal(struct dload_payload *payload, curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &timecond); curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url); + if(final_url != NULL) { + *final_url = effective_url; + } + /* time condition was met and we didn't download anything. we need to * clean up the 0 byte .part file that's left behind. */ if(timecond == 1 && DOUBLE_EQ(bytes_dl, 0)) { @@ -613,13 +617,13 @@ cleanup: * @return 0 on success, -1 on error (pm_errno is set accordingly if errors_ok == 0) */ int _alpm_download(struct dload_payload *payload, const char *localpath, - char **final_file) + char **final_file, char **final_url) { alpm_handle_t *handle = payload->handle; if(handle->fetchcb == NULL) { #ifdef HAVE_LIBCURL - return curl_download_internal(payload, localpath, final_file); + return curl_download_internal(payload, localpath, final_file, final_url); #else RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); #endif @@ -653,7 +657,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) { char *filepath; const char *cachedir; - char *final_file = NULL; + char *final_file = NULL, *final_pkg_url = NULL; struct dload_payload payload; int ret = 0; @@ -673,7 +677,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) payload.handle = handle; /* download the file */ - ret = _alpm_download(&payload, cachedir, &final_file); + ret = _alpm_download(&payload, cachedir, &final_file, &final_pkg_url); _alpm_dload_payload_reset(&payload); if(ret == -1) { _alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), url); @@ -688,9 +692,9 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) char *sig_filepath, *sig_final_file = NULL; size_t len; - len = strlen(url) + 5; + len = strlen(final_pkg_url) + 5; MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - snprintf(payload.fileurl, len, "%s.sig", url); + snprintf(payload.fileurl, len, "%s.sig", final_pkg_url); sig_filepath = filecache_find_url(handle, payload.fileurl); if(sig_filepath == NULL) { @@ -701,7 +705,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) /* set hard upper limit of 16KiB */ payload.max_size = 16 * 1024; - ret = _alpm_download(&payload, cachedir, &sig_final_file); + ret = _alpm_download(&payload, cachedir, &sig_final_file, NULL); if(ret == -1 && !payload.errors_ok) { _alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), payload.fileurl); diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 70e3479..95bb91a 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -48,7 +48,7 @@ struct dload_payload { void _alpm_dload_payload_reset(struct dload_payload *payload); int _alpm_download(struct dload_payload *payload, const char *localpath, - char **final_file); + char **final_file, char **final_url); #endif /* _ALPM_DLOAD_H */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index efd5c3f..6a5cab6 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -877,7 +877,7 @@ static int download_single_file(alpm_handle_t *handle, struct dload_payload *pay MALLOC(payload->fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); snprintf(payload->fileurl, len, "%s/%s", server_url, payload->remote_name); - if(_alpm_download(payload, cachedir, NULL) != -1) { + if(_alpm_download(payload, cachedir, NULL, NULL) != -1) { return 0; } -- 1.8.1.1

2 1

[pacman-dev] [PATCH] Add robustness to dload against throtling firewall
by LANGLOIS Olivier PIS -EXT 29 Jan '13

29 Jan '13

Implemented as discussed in this thread: https://mailman.archlinux.org/pipermail/pacman-dev/2013-January/016273.html I have been running this diff without any regression and it does fix my firewall throttling issue Signed-off-by: Olivier Langlois < olivier.pis.langlois(a)transport.alstom.com> --- 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 83d2051..19f629d 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -294,7 +294,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_LOW_SPEED_LIMIT, 1024L); + 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); -- 1.8.1.1 ________________________________ CONFIDENTIALITY : This e-mail and any attachments are confidential and may be privileged. If you are not a named recipient, please notify the sender immediately and do not disclose the contents to another person, use it for any purpose or store or copy the information in any medium.

3 2

[pacman-dev] [PATCH] [FINAL RFC] Add configuration option for Upgrade operation SigLevel
by Allan McRae 29 Jan '13

29 Jan '13

Add LocalFileSigLevel and RemoteFileSigLevel to control the signature checking for "pacman -U <file>" and "pacman -U <url>" operations respectively. The starting value for both these options is SigLevel, if it is specified in the [options] section, or the built-in system default. The specified values override and/or supplement this initial value. Note there is no destintion between setting "Required" and "PackageRequired" as there is not database options for Upgrade operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This patch has been floating around for quite some time now. I would like some final comments before I write the documentation and push. I have this in my pacman.conf: SigLevel = Required DatabaseOptional TrustedOnly LocalFileSigLevel = Optional TrustedOnly #RemoteFileSigLevel = Required so if I "pacman -U /path/to/file", a signature is only checked if it is present, but "pacman -U http://...." always checks the signature. It also means that I do not need have my global SigLevel as Optional and add PackageRequired to every Arch repo. I'd like a comment, even if it is a simple "Ack". lib/libalpm/alpm.h | 9 +++++++++ lib/libalpm/handle.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ lib/libalpm/handle.h | 4 ++++ src/pacman/conf.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/conf.h | 2 ++ src/pacman/upgrade.c | 21 ++++++++++++++++++--- 6 files changed, 131 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index f524c19..b681840 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -115,6 +115,9 @@ typedef enum _alpm_siglevel_t { ALPM_SIG_DATABASE_MARGINAL_OK = (1 << 12), ALPM_SIG_DATABASE_UNKNOWN_OK = (1 << 13), + ALPM_SIG_PACKAGE_SET = (1 << 27), + ALPM_SIG_PACKAGE_TRUST_SET = (1 << 28), + ALPM_SIG_USE_DEFAULT = (1 << 31) } alpm_siglevel_t; @@ -561,6 +564,12 @@ int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); alpm_siglevel_t alpm_option_get_default_siglevel(alpm_handle_t *handle); int alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); +alpm_siglevel_t alpm_option_get_local_file_siglevel(alpm_handle_t *handle); +int alpm_option_set_local_file_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); + +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); + /** @} */ /** @addtogroup alpm_api_databases Database Functions diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 1a840ab..53c86c5 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -594,6 +594,18 @@ int SYMEXPORT alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio) return 0; } +alpm_db_t SYMEXPORT *alpm_get_localdb(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->db_local; +} + +alpm_list_t SYMEXPORT *alpm_get_syncdbs(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->dbs_sync; +} + int SYMEXPORT alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace) { CHECK_HANDLE(handle, return -1); @@ -621,16 +633,44 @@ alpm_siglevel_t SYMEXPORT alpm_option_get_default_siglevel(alpm_handle_t *handle return handle->siglevel; } -alpm_db_t SYMEXPORT *alpm_get_localdb(alpm_handle_t *handle) +int SYMEXPORT alpm_option_set_local_file_siglevel(alpm_handle_t *handle, + alpm_siglevel_t level) { - CHECK_HANDLE(handle, return NULL); - return handle->db_local; + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBGPGME + handle->localfilesiglevel = level; +#else + if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } +#endif + return 0; } -alpm_list_t SYMEXPORT *alpm_get_syncdbs(alpm_handle_t *handle) +alpm_siglevel_t SYMEXPORT alpm_option_get_local_file_siglevel(alpm_handle_t *handle) { - CHECK_HANDLE(handle, return NULL); - return handle->dbs_sync; + CHECK_HANDLE(handle, return -1); + return handle->localfilesiglevel; +} + +int SYMEXPORT alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, + alpm_siglevel_t level) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBGPGME + handle->remotefilesiglevel = level; +#else + if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } +#endif + return 0; +} + +alpm_siglevel_t SYMEXPORT alpm_option_get_remote_file_siglevel(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->remotefilesiglevel; } /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index c24e97a..5e84d58 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -92,6 +92,10 @@ struct __alpm_handle_t { int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ alpm_siglevel_t siglevel; /* Default signature verification level */ + alpm_siglevel_t localfilesiglevel; /* Signature verification level for local file + upgrade operations */ + alpm_siglevel_t remotefilesiglevel; /* Signature verification level for remote file + upgrade operations */ /* error code */ alpm_errno_t pm_errno; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 1bea2b0..95dce35 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -56,6 +56,8 @@ config_t *config_new(void) if(alpm_capabilities() & ALPM_CAPABILITY_SIGNATURES) { newconfig->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL | ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; + newconfig->localfilesiglevel = ALPM_SIG_USE_DEFAULT; + newconfig->remotefilesiglevel = ALPM_SIG_USE_DEFAULT; } return newconfig; @@ -279,6 +281,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, if(strcmp(value, "Never") == 0) { if(package) { level &= ~ALPM_SIG_PACKAGE; + level |= ALPM_SIG_PACKAGE_SET; } if(database) { level &= ~ALPM_SIG_DATABASE; @@ -287,6 +290,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, if(package) { level |= ALPM_SIG_PACKAGE; level |= ALPM_SIG_PACKAGE_OPTIONAL; + level |= ALPM_SIG_PACKAGE_SET; } if(database) { level |= ALPM_SIG_DATABASE; @@ -296,6 +300,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, if(package) { level |= ALPM_SIG_PACKAGE; level &= ~ALPM_SIG_PACKAGE_OPTIONAL; + level |= ALPM_SIG_PACKAGE_SET; } if(database) { level |= ALPM_SIG_DATABASE; @@ -305,6 +310,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, if(package) { level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK; level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK; + level |= ALPM_SIG_PACKAGE_TRUST_SET; } if(database) { level &= ~ALPM_SIG_DATABASE_MARGINAL_OK; @@ -314,6 +320,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, if(package) { level |= ALPM_SIG_PACKAGE_MARGINAL_OK; level |= ALPM_SIG_PACKAGE_UNKNOWN_OK; + level |= ALPM_SIG_PACKAGE_TRUST_SET; } if(database) { level |= ALPM_SIG_DATABASE_MARGINAL_OK; @@ -343,6 +350,30 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, return ret; } +/** + * Merge the package entires of two signature verification levels. + * @param base initial siglevel + * @param over overridden siglevel, derived value is stored here + */ +static void merge_siglevel(alpm_siglevel_t *base, alpm_siglevel_t *over) +{ + alpm_siglevel_t level = *over; + if(level & ALPM_SIG_USE_DEFAULT) { + level = *base; + } else { + if(!(level & ALPM_SIG_PACKAGE_SET)) { + level |= *base & ALPM_SIG_PACKAGE; + level |= *base & ALPM_SIG_PACKAGE_OPTIONAL; + } + if(!(level & ALPM_SIG_PACKAGE_TRUST_SET)) { + level |= *base & ALPM_SIG_PACKAGE_MARGINAL_OK; + level |= *base & ALPM_SIG_PACKAGE_UNKNOWN_OK; + } + } + + *over = level; +} + static int process_cleanmethods(alpm_list_t *values, const char *file, int linenum) { @@ -484,6 +515,22 @@ static int _parse_options(const char *key, char *value, return 1; } FREELIST(values); + } else if(strcmp(key, "LocalFileSigLevel") == 0) { + alpm_list_t *values = NULL; + setrepeatingoption(value, "LocalFileSigLevel", &values); + if(process_siglevel(values, &config->localfilesiglevel, file, linenum)) { + FREELIST(values); + return 1; + } + FREELIST(values); + } else if(strcmp(key, "RemoteFileSigLevel") == 0) { + alpm_list_t *values = NULL; + setrepeatingoption(value, "RemoteFileSigLevel", &values); + if(process_siglevel(values, &config->remotefilesiglevel, file, linenum)) { + FREELIST(values); + return 1; + } + FREELIST(values); } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), @@ -606,6 +653,11 @@ static int setup_libalpm(void) alpm_option_set_default_siglevel(handle, config->siglevel); + merge_siglevel(&config->siglevel, &config->localfilesiglevel); + merge_siglevel(&config->siglevel, &config->remotefilesiglevel); + alpm_option_set_local_file_siglevel(handle, config->localfilesiglevel); + alpm_option_set_remote_file_siglevel(handle, config->remotefilesiglevel); + if(config->xfercommand) { alpm_option_set_fetchcb(handle, download_with_xfercommand); } else if(!(alpm_capabilities() & ALPM_CAPABILITY_DOWNLOADER)) { diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 06d2fd5..ff099fe 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -73,6 +73,8 @@ typedef struct __config_t { unsigned int ask; alpm_transflag_t flags; alpm_siglevel_t siglevel; + alpm_siglevel_t localfilesiglevel; + alpm_siglevel_t remotefilesiglevel; /* conf file options */ /* I Love Candy! */ diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 7f69091..222f7fa 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -40,8 +40,7 @@ int pacman_upgrade(alpm_list_t *targets) { int retval = 0; - alpm_list_t *i; - alpm_siglevel_t level = alpm_option_get_default_siglevel(config->handle); + alpm_list_t *i, *remote = NULL; if(targets == NULL) { pm_printf(ALPM_LOG_ERROR, _("no targets specified (use -h for help)\n")); @@ -51,6 +50,8 @@ int pacman_upgrade(alpm_list_t *targets) /* Check for URL targets and process them */ for(i = targets; i; i = alpm_list_next(i)) { + int *r = malloc(sizeof(int)); + if(strstr(i->data, "://")) { char *str = alpm_fetch_pkgurl(config->handle, i->data); if(str == NULL) { @@ -60,8 +61,13 @@ int pacman_upgrade(alpm_list_t *targets) } else { free(i->data); i->data = str; + *r = 1; } + } else { + *r = 0; } + + remote = alpm_list_add(remote, r); } if(retval) { @@ -75,9 +81,16 @@ int pacman_upgrade(alpm_list_t *targets) printf(_("loading packages...\n")); /* add targets to the created transaction */ - for(i = targets; i; i = alpm_list_next(i)) { + for(i = targets; i; i = alpm_list_next(i), remote = alpm_list_next(remote)) { const char *targ = i->data; alpm_pkg_t *pkg; + alpm_siglevel_t level; + + if(*(int *)remote->data) { + level = alpm_option_get_remote_file_siglevel(config->handle); + } else { + level = alpm_option_get_local_file_siglevel(config->handle); + } if(alpm_pkg_load(config->handle, targ, 1, level, &pkg) != 0) { pm_printf(ALPM_LOG_ERROR, "'%s': %s\n", @@ -95,6 +108,8 @@ int pacman_upgrade(alpm_list_t *targets) config->explicit_adds = alpm_list_add(config->explicit_adds, pkg); } + FREELIST(remote); + if(retval) { trans_release(); return retval; -- 1.8.1.1

2 1

[pacman-dev] [RFC] libalpm: replace deprecated libarchive calls
by Dave Reisner 28 Jan '13

28 Jan '13

This raises our minimum libarchive version to 3.0.0, which is reflected by autoconf. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- There's a soname bump with libarchive 3.1 (which no one in Arch Linux land has been brave enough to touch yet). Maybe this will help us get started. The test suite still passes, though there is a CPIO based failure in libarchive 3.1.1 which should be dealt with separately. I mark this as an RFC since it's a library requirement bump. As an alternative, I propose that we could create a header, perhaps lib/libalpm/libarchive.h which has wrapper methods and preprocessor logic to Do The Right Thing™. Personally, I'd rather not get into this business. configure.ac | 4 ++-- lib/libalpm/add.c | 6 +++--- lib/libalpm/be_local.c | 6 +++--- lib/libalpm/be_package.c | 10 +++++----- lib/libalpm/be_sync.c | 4 ++-- lib/libalpm/util.c | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index a7364ba..08af5a3 100644 --- a/configure.ac +++ b/configure.ac @@ -190,8 +190,8 @@ AC_CHECK_LIB([m], [fabs], , AC_MSG_ERROR([libm is needed to compile pacman!])) # Check for libarchive -PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 2.8.0], , - AC_MSG_ERROR([*** libarchive >= 2.8.0 is needed to compile pacman!])) +PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 3.0.0], , + AC_MSG_ERROR([*** libarchive >= 3.0.0 is needed to compile pacman!])) # Check for OpenSSL have_openssl=no diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 9b67813..7bdb032 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -555,7 +555,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(chdir(handle->root) != 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not change directory to %s (%s)\n"), handle->root, strerror(errno)); - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); ret = -1; goto cleanup; @@ -577,7 +577,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* Using compressed size for calculations here, as newpkg->isize is not * exact when it comes to comparing to the ACTUAL uncompressed size * (missing metadata sizes) */ - int64_t pos = archive_position_compressed(archive); + int64_t pos = archive_filter_bytes(archive, -1); percent = (pos * 100) / newpkg->size; if(percent >= 100) { percent = 100; @@ -597,7 +597,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* extract the next file from the archive */ errors += extract_single_file(handle, archive, entry, newpkg, oldpkg); } - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); /* restore the old cwd if we have it */ diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 0f60b6d..6c58920 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -241,11 +241,11 @@ static struct archive *_cache_mtree_open(alpm_pkg_t *pkg) archive_read_support_filter_gzip(mtree); archive_read_support_format_mtree(mtree); - if((r = archive_read_open_file(mtree, mtfile, ALPM_BUFFER_SIZE))) { + if((r = archive_read_open_filename(mtree, mtfile, ALPM_BUFFER_SIZE))) { _alpm_log(pkg->handle, ALPM_LOG_ERROR, _("error while reading file %s: %s\n"), mtfile, archive_error_string(mtree)); pkg->handle->pm_errno = ALPM_ERR_LIBARCHIVE; - archive_read_finish(mtree); + archive_read_close(mtree); goto error; } @@ -279,7 +279,7 @@ static int _cache_mtree_next(const alpm_pkg_t UNUSED *pkg, static int _cache_mtree_close(const alpm_pkg_t UNUSED *pkg, struct archive *mtree) { - return archive_read_finish(mtree); + return archive_read_close(mtree); } static int _cache_force_load(alpm_pkg_t *pkg) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 18fc14a..d920a76 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -74,7 +74,7 @@ static void *_package_changelog_open(alpm_pkg_t *pkg) changelog = malloc(sizeof(struct package_changelog)); if(!changelog) { pkg->handle->pm_errno = ALPM_ERR_MEMORY; - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); return NULL; } @@ -84,7 +84,7 @@ static void *_package_changelog_open(alpm_pkg_t *pkg) } } /* we didn't find a changelog */ - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); errno = ENOENT; @@ -124,7 +124,7 @@ static int _package_changelog_close(const alpm_pkg_t UNUSED *pkg, void *fp) { int ret; struct package_changelog *changelog = fp; - ret = archive_read_finish(changelog->archive); + ret = archive_read_close(changelog->archive); CLOSE(changelog->fd); free(changelog); return ret; @@ -471,7 +471,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, goto pkg_invalid; } - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); /* internal fields for package struct */ @@ -503,7 +503,7 @@ pkg_invalid: handle->pm_errno = ALPM_ERR_PKG_INVALID; error: _alpm_pkg_free(newpkg); - archive_read_finish(archive); + archive_read_close(archive); if(fd >= 0) { CLOSE(fd); } diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index a5a2c10..77bfc1e 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -383,7 +383,7 @@ static size_t estimate_package_count(struct stat *st, struct archive *archive) { int per_package; - switch(archive_compression(archive)) { + switch(archive_filter_code(archive, 0)) { case ARCHIVE_COMPRESSION_NONE: per_package = 3015; break; @@ -471,7 +471,7 @@ static int sync_db_populate(alpm_db_t *db) count, db->treename); cleanup: - archive_read_finish(archive); + archive_read_close(archive); if(fd >= 0) { CLOSE(fd); } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 5960be6..f2258d6 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -240,7 +240,7 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path, RET_ERR(handle, ALPM_ERR_LIBARCHIVE, -1); } - archive_read_support_compression_all(*archive); + archive_read_support_filter_all(*archive); archive_read_support_format_all(*archive); _alpm_log(handle, ALPM_LOG_DEBUG, "opening archive %s\n", path); @@ -271,7 +271,7 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path, return fd; error: - archive_read_finish(*archive); + archive_read_close(*archive); *archive = NULL; if(fd >= 0) { CLOSE(fd); @@ -392,7 +392,7 @@ int _alpm_unpack(alpm_handle_t *handle, const char *path, const char *prefix, cleanup: umask(oldmask); - archive_read_finish(archive); + archive_read_close(archive); CLOSE(fd); if(cwdfd >= 0) { if(fchdir(cwdfd) != 0) { -- 1.8.1.1

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-524-g8624edd
by allan＠archlinux.org 28 Jan '13

28 Jan '13

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 8624eddb31dc360312b50b5435f6688bec4543c5 (commit) via 24a78fe7315c962dde892ca85ddb0675eae622f7 (commit) via 66a9b5314123b3632cb90a4d37fd422a0f898568 (commit) via 8308c7b320ae230252ff0e79ea18cbfed0d13e81 (commit) via 457642231e36a14c58e52e6077efa077757da2f2 (commit) via 6bbf6e8fa1e6dbb02bd70ab6d1e1283b00a05c8e (commit) via 250aaefb27115e712b8de42cef601238ca22c260 (commit) via a64a713fc2a56cf6182e4e7c7c50533ad0afe32a (commit) via 89ecf8cabebfd13e50473fba7fb98f65a52b02d8 (commit) via e3d8197d67336b6e59ee184762271cf64431aca6 (commit) via 801f7d1033f74644c6d427cff9618270b2878582 (commit) via ad280e1b56b6c6632b2fae5288f6441c343d0185 (commit) from b27886ab5967c30e2e80d46e47968c9f4a95e760 (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 8624eddb31dc360312b50b5435f6688bec4543c5 Author: Maxime Gauduin <alucryd(a)gmail.com> Date: Sun Jan 27 10:16:57 2013 +0100 Make sed follow symlinks on Linux Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 24a78fe7315c962dde892ca85ddb0675eae622f7 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Jan 23 19:28:58 2013 -0500 paclog-pkglist: parse entries with caller info Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 66a9b5314123b3632cb90a4d37fd422a0f898568 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Jan 18 20:42:21 2013 -0500 add caller prefix to alpm_logaction prefix defaults to "UNKOWN" if null or an empty string is provided. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8308c7b320ae230252ff0e79ea18cbfed0d13e81 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jan 23 21:39:12 2013 +1000 Update "missing" file The latest automake release causes complaints about an out of date 'missing' file during configure. Sync with upstream. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 457642231e36a14c58e52e6077efa077757da2f2 Author: William Giokas <1007380(a)gmail.com> Date: Mon Jan 21 03:12:40 2013 -0600 Fix printing of paths Originally printed a leading \ before all path names as the `' would be removed during the make. Using '' should be just as good as using `'. paccache.sh.in: die "cachedir \`%s' does not exist or is not a directory" "$cachedir" paccache die "cachedir \%s does not exist or is not a directory" "$cachedir" Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6bbf6e8fa1e6dbb02bd70ab6d1e1283b00a05c8e Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Jan 19 15:21:36 2013 -0500 add doxygen comments to conflict.c Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 250aaefb27115e712b8de42cef601238ca22c260 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jan 19 11:06:46 2013 -0500 paccache: pass the --file option to pacsort Resolves FS#33455. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a64a713fc2a56cf6182e4e7c7c50533ad0afe32a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jan 19 12:00:20 2013 -0500 pacsort: add -f, --files option for sorting filenames Teach pacsort to understand package filenames and optionally strip away some of the context. alpm_pkg_vercmp() intentionally only understands pure versions, so strings such as '18.0-2-x86_64' and '18.0.1-1-x86_64' will be compared wrongly. Partially addresses FS#33455. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 89ecf8cabebfd13e50473fba7fb98f65a52b02d8 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 20 21:56:57 2013 +1000 Make path to ldconfig configurable The FHS (2.3) says having ldconfig in /sbin is optional and it is usually located in /usr/sbin. So /sbin/ldconfig should not be hard coded in pacman. Instead, provide a configure option --with-ldconfig that defaults to the current path. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e3d8197d67336b6e59ee184762271cf64431aca6 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 20 21:36:20 2013 +1000 Remove leading / for pactest paths The leading / makes the pactest suite look for the file in the users filesystem. This meant the ldconfig tests always passed (even when broken in pacman...). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 801f7d1033f74644c6d427cff9618270b2878582 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 20 16:49:52 2013 +1000 pactest: handle non-default scriptlet shells pacman can be configured to use a different shell than /bin/sh for scriplets. Pass the cnfigured value to the pactest suite and make the necessary "copy" of the shell in the test root. Also update all copyright years in the pactest suite. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ad280e1b56b6c6632b2fae5288f6441c343d0185 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 20 10:32:11 2013 +1000 Revert execvp and related commits This reverts commit 4a8c2852a887d2b1aaa43be3071ab586eb24b9e3. This reverts commit 993700bc6b12cd291544d2a22845f480e8a7925e. This reverts commit bb4d2b72c1d35ab9d65d632be0dcaf00cfa7d600. This reverts commit 60b192e3836a150eb6950ce52241efebbee00f11. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 1 + build-aux/missing | 461 +++++++++++++-------------------------- configure.ac | 18 +- contrib/paccache.sh.in | 12 +- contrib/paclog-pkglist.sh.in | 24 +- lib/libalpm/add.c | 36 +-- lib/libalpm/alpm.h | 3 +- lib/libalpm/conflict.c | 94 ++++++-- lib/libalpm/log.c | 17 +- lib/libalpm/log.h | 2 + lib/libalpm/remove.c | 10 +- lib/libalpm/util.c | 30 ++- lib/libalpm/util.h | 2 +- src/pacman/callback.c | 24 +- src/pacman/pacman.c | 3 +- src/pacman/pacman.h | 2 + src/pacman/sync.c | 6 +- src/util/pacsort.c | 52 ++++- test/pacman/pactest.py | 8 +- test/pacman/pmdb.py | 1 + test/pacman/pmenv.py | 1 + test/pacman/pmfile.py | 1 + test/pacman/pmpkg.py | 1 + test/pacman/pmrule.py | 1 + test/pacman/pmtest.py | 28 +-- test/pacman/tests/ldconfig001.py | 2 +- test/pacman/tests/ldconfig002.py | 2 +- test/pacman/tests/ldconfig003.py | 2 +- test/pacman/tests/sync700.py | 2 +- test/pacman/util.py | 1 + test/util/pacsorttest.sh | 18 ++ 31 files changed, 438 insertions(+), 427 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 4929/4929] Make sed follow symlinks on Linux Signed-off-by: Maxime Gauduin <alucryd@gmail.com>
by Maxime Gauduin 28 Jan '13

28 Jan '13

From: Alucryd <alucryd(a)gmail.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e89d4fc..b1ff040 100644 --- a/configure.ac +++ b/configure.ac @@ -299,7 +299,7 @@ GCC_GNU89_INLINE_CC # Host-dependant definitions INODECMD="stat -c '%i %n'" SIZECMD="stat -c %s" -SEDINPLACE="sed -i" +SEDINPLACE="sed --follow-symlinks -i" DUFLAGS="-sk --apparent-size" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" -- 1.8.1.1

3 5

[pacman-dev] [PATCH] Provide full path names in warning messages
by Richard Pougnet 28 Jan '13

28 Jan '13

Fix bug #31558 by printing filename instead of entryname Signed-off-by: Richard Pougnet <richard(a)pougnet.ca> --- Resubmission to correctly extend the string onto two lines. --- lib/libalpm/add.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 57c9300..b5a537f 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -182,8 +182,8 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, /* if a file is in NoExtract then we never extract it */ if(alpm_list_find(handle->noextract, entryname, _alpm_fnmatch)) { - _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract, skipping extraction\n", - entryname); + _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract, skipping extraction \ + of %s\n", entryname, filename); alpm_logaction(handle, "note: %s is in NoExtract, skipping extraction\n", entryname); archive_read_data_skip(archive); @@ -222,20 +222,20 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, /* if filesystem perms are different than pkg perms, warn user */ mode_t mask = 07777; _alpm_log(handle, ALPM_LOG_WARNING, _("directory permissions differ on %s\n" - "filesystem: %o package: %o\n"), entryname, lsbuf.st_mode & mask, + "filesystem: %o package: %o\n"), filename, lsbuf.st_mode & mask, entrymode & mask); alpm_logaction(handle, "warning: directory permissions differ on %s\n" - "filesystem: %o package: %o\n", entryname, lsbuf.st_mode & mask, + "filesystem: %o package: %o\n", filename, lsbuf.st_mode & mask, entrymode & mask); } _alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n", - entryname); + filename); archive_read_data_skip(archive); return 0; } else { /* case 10/11: trying to overwrite dir with file/symlink, don't allow it */ _alpm_log(handle, ALPM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"), - entryname); + filename); archive_read_data_skip(archive); return 1; } @@ -244,20 +244,20 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, if(S_ISDIR(sbuf.st_mode)) { /* the symlink on FS is to a directory, so we'll use it */ _alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping symlink overwrite of %s\n", - entryname); + filename); archive_read_data_skip(archive); return 0; } else { /* this is BAD. symlink was not to a directory */ _alpm_log(handle, ALPM_LOG_ERROR, _("extract: symlink %s does not point to dir\n"), - entryname); + filename); archive_read_data_skip(archive); return 1; } } else if(S_ISREG(lsbuf.st_mode) && S_ISDIR(entrymode)) { /* case 6: trying to overwrite file with dir */ _alpm_log(handle, ALPM_LOG_DEBUG, "extract: overwriting file with dir %s\n", - entryname); + filename); } else if(S_ISREG(entrymode)) { /* case 4,7: */ /* if file is in NoUpgrade, don't touch it */ -- 1.8.1.1

4 5

[pacman-dev] [PATCH] Fix FS#33318 - Make makepkg check for $pkgdir and $srcdir before manpage compression.
by Richard Pougnet 27 Jan '13

27 Jan '13

Call check_package() before calling tidy_package to check for references to $srcdir and $pkgdir before manpages are compressed. This allows any references inserted into manpages during the build to be retained. --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dcd920d..e28b7fd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2790,9 +2790,9 @@ if (( INFAKEROOT )); then else run_package fi - tidy_install create_package create_debug_package + tidy_install pkgdir="${pkgdir%/*}" else run_split_packaging @@ -2930,9 +2930,9 @@ else warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()" plain "$(gettext "File permissions may not be preserved.")" fi - tidy_install create_package create_debug_package + tidy_install pkgdir="${pkgdir%/*}" else run_split_packaging -- 1.8.1.1

2 1

[pacman-dev] [PATCH] Provide full path names in warning messages
by Richard Pougnet 27 Jan '13

27 Jan '13

Fix bug #31558 by printing filename instead of entryname This is a resubmission based on Allan's feedback in the ML. Signed-off-by: Richard Pougnet <richard(a)pougnet.ca> --- lib/libalpm/add.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 57c9300..38dd17d 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -182,8 +182,8 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, /* if a file is in NoExtract then we never extract it */ if(alpm_list_find(handle->noextract, entryname, _alpm_fnmatch)) { - _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract, skipping extraction\n", - entryname); + _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract, skipping extraction + of %s\n", entryname, filename); alpm_logaction(handle, "note: %s is in NoExtract, skipping extraction\n", entryname); archive_read_data_skip(archive); @@ -222,20 +222,20 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, /* if filesystem perms are different than pkg perms, warn user */ mode_t mask = 07777; _alpm_log(handle, ALPM_LOG_WARNING, _("directory permissions differ on %s\n" - "filesystem: %o package: %o\n"), entryname, lsbuf.st_mode & mask, + "filesystem: %o package: %o\n"), filename, lsbuf.st_mode & mask, entrymode & mask); alpm_logaction(handle, "warning: directory permissions differ on %s\n" - "filesystem: %o package: %o\n", entryname, lsbuf.st_mode & mask, + "filesystem: %o package: %o\n", filename, lsbuf.st_mode & mask, entrymode & mask); } _alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n", - entryname); + filename); archive_read_data_skip(archive); return 0; } else { /* case 10/11: trying to overwrite dir with file/symlink, don't allow it */ _alpm_log(handle, ALPM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"), - entryname); + filename); archive_read_data_skip(archive); return 1; } @@ -244,20 +244,20 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, if(S_ISDIR(sbuf.st_mode)) { /* the symlink on FS is to a directory, so we'll use it */ _alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping symlink overwrite of %s\n", - entryname); + filename); archive_read_data_skip(archive); return 0; } else { /* this is BAD. symlink was not to a directory */ _alpm_log(handle, ALPM_LOG_ERROR, _("extract: symlink %s does not point to dir\n"), - entryname); + filename); archive_read_data_skip(archive); return 1; } } else if(S_ISREG(lsbuf.st_mode) && S_ISDIR(entrymode)) { /* case 6: trying to overwrite file with dir */ _alpm_log(handle, ALPM_LOG_DEBUG, "extract: overwriting file with dir %s\n", - entryname); + filename); } else if(S_ISREG(entrymode)) { /* case 4,7: */ /* if file is in NoUpgrade, don't touch it */ -- 1.8.0.2

2 2

[pacman-dev] [PATCH 3/8 v2] Add function to extract key id from signatures
by Allan McRae 26 Jan '13

26 Jan '13

This does not support all possibilities of RFC4880, but it does cover every key currently used in Arch Linux. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/signing.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/signing.h | 3 ++ 2 files changed, 116 insertions(+) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 9d56aba..6ad0c5e 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -948,4 +948,117 @@ int SYMEXPORT alpm_siglist_cleanup(alpm_siglist_t *siglist) return 0; } +/** + * Extract the Issuer Key ID from a signature + * @param sig PGP signature + * @param len length of signature + * @param keys a pointer to storage for key IDs + * @return 0 on success, -1 on error + */ +int _alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, + const unsigned char *sig, const size_t len, alpm_list_t **keys) +{ + size_t pos, spos, blen, hlen, ulen, slen; + pos = 0; + + while(pos < len) { + if(!(sig[pos] & 0x80)) { + _alpm_log(handle, ALPM_LOG_ERROR, + _("%s: signature format error"), identifier); + return -1; + } + + if(sig[pos] & 0x40) { + /* "new" packet format is not supported */ + _alpm_log(handle, ALPM_LOG_ERROR, + _("%s: unsupported signature format"), identifier); + return -1; + } + + if(((sig[pos] & 0x3f) >> 2) != 2) { + /* signature is not a "Signature Packet" */ + _alpm_log(handle, ALPM_LOG_ERROR, + _("%s: signature format error"), identifier); + return -1; + } + + switch(sig[pos] & 0x03) { + case 0: + blen = sig[pos + 1]; + pos = pos + 2; + break; + + case 1: + blen = (sig[pos + 1] << 8) | sig[pos + 2]; + pos = pos + 3; + break; + + case 2: + blen = (sig[pos + 1] << 24) | (sig[pos + 2] << 16) | (sig[pos + 3] << 8) | sig[pos + 4]; + pos = pos + 5; + break; + + case 3: + /* partial body length not supported */ + _alpm_log(handle, ALPM_LOG_ERROR, + _("%s: unsupported signature format"), identifier); + return -1; + } + + if(sig[pos] != 4) { + /* only support version 4 signature packet format */ + _alpm_log(handle, ALPM_LOG_ERROR, + _("%s: unsupported signature format"), identifier); + return -1; + } + + if(sig[pos + 1] != 0x00) { + /* not a signature of a binary document */ + _alpm_log(handle, ALPM_LOG_ERROR, + _("%s: signature format error"), identifier); + return -1; + } + + pos = pos + 4; + + hlen = (sig[pos] << 8) | sig[pos + 1]; + pos = pos + hlen + 2; + + ulen = (sig[pos] << 8) | sig[pos + 1]; + pos = pos + 2; + + spos = pos; + + while(spos < pos + ulen) { + if(sig[spos] < 192) { + slen = sig[spos]; + spos = spos + 1; + } else if(sig[spos] < 255) { + slen = (sig[spos] << 8) | sig[spos + 1]; + spos = spos + 2; + } else { + slen = (sig[spos + 1] << 24) | (sig[spos + 2] << 16) | (sig[spos + 3] << 8) | sig[spos + 4]; + spos = spos + 5; + } + + if(sig[spos] == 16) { + /* issuer key ID */ + char key[16]; + size_t i; + for (i = 0; i < 8; i++) { + sprintf(&key[i * 2], "%02X", sig[spos + i + 1]); + } + *keys = alpm_list_add(*keys, strdup(key)); + break; + } + + spos = spos + slen; + } + + pos = pos + (blen - hlen - 8); + } + + return 0; +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index a78e4b7..d3e72bc 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -34,6 +34,9 @@ int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier, int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr); int _alpm_key_import(alpm_handle_t *handle, const char *fpr); +int _alpm_extract_keyid(alpm_handle_t *handle, const char *identifier, + const unsigned char *sig, const size_t len, alpm_list_t **keys); + #endif /* _ALPM_SIGNING_H */ /* vim: set ts=2 sw=2 noet: */ -- 1.8.0

1 2