- Pacman-dev - lists.archlinux.org

[pacman-dev] Checking whether a package was signed
by kachelaqa 22 Jan '12

22 Jan '12

I'm still trying to get to grips with package signing, so this question may not make complete sense, but: Is there a way to check whether the signature was verified when a package was installed?

3 6

[pacman-dev] [PATCH] makepkg: retrist usage of flags passed to pacman
by Allan McRae 20 Jan '12

20 Jan '12

With pacman-4.0, using --noconfirm or --noprogressbar with -Q or -T results in pacman reporting an "invalid option" error. Restrict the passing of these options to pacman. Fixes FS#28012. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4792c5c..4f95b73 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -412,7 +412,11 @@ download_file() { run_pacman() { local cmd - printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@" + if [[ ! $1 = -@(T|Qq) ]]; then + printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@" + else + printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@" + fi if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then if type -p sudo >/dev/null; then cmd="sudo $cmd" -- 1.7.8.4

2 3

[pacman-dev] [PATCH 1/2] Add diskspace checking support for Solaris/Illumos
by Dan McGee 19 Jan '12

19 Jan '12

Was able to get my hands on one of these boxes today, so add yet another new way of doing this. I'm glad these calls are so standardized. This was compile tested on Linux and Illumos and seems to still be working in both places. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 3 +- lib/libalpm/diskspace.c | 54 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 0de908a..a8b142e 100644 --- a/configure.ac +++ b/configure.ac @@ -173,7 +173,8 @@ AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$with_gpgme" = "xyes"]) # Checks for header files. AC_CHECK_HEADERS([fcntl.h float.h glob.h libintl.h limits.h locale.h \ - mntent.h stddef.h string.h sys/ioctl.h sys/mount.h \ + mntent.h stddef.h string.h sys/ioctl.h \ + sys/mnttab.h sys/mount.h \ sys/param.h sys/statvfs.h sys/time.h sys/types.h \ sys/ucred.h syslog.h termios.h wchar.h]) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index fe2036d..4127153 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -1,7 +1,7 @@ /* * diskspace.c * - * Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2012 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,10 +19,15 @@ #include "config.h" +#include <stdio.h> #include <errno.h> + #if defined(HAVE_MNTENT_H) #include <mntent.h> #endif +#if defined(HAVE_MNTTAB_H) +#include <mnttab.h> +#endif #if defined(HAVE_SYS_STATVFS_H) #include <sys/statvfs.h> #endif @@ -60,10 +65,10 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) alpm_list_t *mount_points = NULL, *ptr; alpm_mountpoint_t *mp; -#if defined HAVE_GETMNTENT +#if defined(HAVE_GETMNTENT) && defined(HAVE_MNTENT_H) + /* Linux */ struct mntent *mnt; FILE *fp; - struct statvfs fsp; fp = setmntent(MOUNTED, "r"); @@ -72,8 +77,10 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) } while((mnt = getmntent(fp))) { + struct statvfs fsp; if(!mnt) { - _alpm_log(handle, ALPM_LOG_WARNING, _("could not get filesystem information\n")); + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get filesystem information\n")); continue; } if(statvfs(mnt->mnt_dir, &fsp) != 0) { @@ -93,7 +100,44 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) } endmntent(fp); -#elif defined HAVE_GETMNTINFO +#elif defined(HAVE_GETMNTENT) && defined(HAVE_MNTTAB_H) + /* Solaris, Illumos */ + struct mnttab mnt; + FILE *fp; + int ret; + + fp = fopen("/etc/mnttab", "r"); + + if(fp == NULL) { + return NULL; + } + + while((ret = getmntent(fp, &mnt)) == 0) { + struct statvfs fsp; + if(statvfs(mnt->mnt_mountp, &fsp) != 0) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get filesystem information for %s: %s\n"), + mnt->mnt_mountp, strerror(errno)); + continue; + } + + CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); + mp->mount_dir = strdup(mnt->mnt_mountp); + mp->mount_dir_len = strlen(mp->mount_dir); + memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs)); + mp->read_only = fsp.f_flag & ST_RDONLY; + + mount_points = alpm_list_add(mount_points, mp); + } + /* -1 == EOF */ + if(ret != -1) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get filesystem information\n")); + } + + fclose(fp); +#elif defined(HAVE_GETMNTINFO) + /* FreeBSD (statfs), NetBSD (statvfs), OpenBSD (statfs), OS X (statfs) */ int entries; FSSTATSTYPE *fsp; -- 1.7.8.3

1 1

[pacman-dev] [PATCH] Fix missing [removal] output
by Allan McRae 19 Jan '12

19 Jan '12

Currently, a transaction is considered to be purely package removal until the first package install is found. This resulted in the removed packages at the start of a combined upgrade/removal transaction not getting the "[removal]" output. Fixes FS#27981. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 40690e8..2eac429 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -898,8 +898,12 @@ static void _display_targets(alpm_list_t *targets, int verbose) /* add up size of all removed packages */ rsize += alpm_pkg_get_isize(target->remove); } + } + + /* form data for both verbose and non-verbose display */ + for(i = targets; i; i = alpm_list_next(i)) { + pm_target_t *target = i->data; - /* form data for both verbose and non-verbose display */ rows = alpm_list_add(rows, create_verbose_row(target, show_dl_size)); if(target->install) { pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), -- 1.7.8.3

1 0

[pacman-dev] Rationale for the patch for case insensitive configuration values
by Alexander Rødseth 18 Jan '12

18 Jan '12

Hi, I understand that case sensitivity can, perhaps, bring clarity for configuration values like ILoveCandy, but IMO, both "Never" and "never" should be allowed, as the uppercase letters bring no more clarity, but add an additional requirement for the users to conform to. That is the reason for the patch. Also, in the name of consistency, I changed all the checks in conf.c, not just the check for the word "Never". This is about simplicity and removing a constraint that users shouldn't have to relate to when editing pacman.conf. I tested both compilation and execution of the resulting pacman binary and it works fine here. -- Sincerely, Alexander Rødseth Arch Linux Trusted User (xyproto on IRC, trontonic on AUR)

3 4

[pacman-dev] XfreCommand curl option in pacman.conf and makepkg.conf
by Keshav P R 18 Jan '12

18 Jan '12

Hi, Using XferCommand = /usr/bin/curl -C - -f -o %o %u XferCommand = /usr/bin/curl -C - -f %u > %o enables curl to resume downloads to %o , if it is supported. Using file redirection "> %o" makes curl restart the (partial) downloads from first. The same goes for makepkg.conf . Please change it. Regards. Keshav

2 1

[pacman-dev] [PATCH] Case insensitive configuration values (to allow both SigLevel = Never and SigLevel = never)
by Alexander Rødseth 17 Jan '12

17 Jan '12

--- src/pacman/conf.c | 66 ++++++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 7ba2791..f114339 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -225,7 +225,7 @@ cleanup: int config_set_arch(const char *arch) { - if(strcmp(arch, "auto") == 0) { + if(strcasecmp(arch, "auto") == 0) { struct utsname un; uname(&un); config->arch = strdup(un.machine); @@ -272,14 +272,14 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, } /* now parse out and store actual flag if it is valid */ - if(strcmp(value, "Never") == 0) { + if(strcasecmp(value, "Never") == 0) { if(package) { level &= ~ALPM_SIG_PACKAGE; } if(database) { level &= ~ALPM_SIG_DATABASE; } - } else if(strcmp(value, "Optional") == 0) { + } else if(strcasecmp(value, "Optional") == 0) { if(package) { level |= ALPM_SIG_PACKAGE; level |= ALPM_SIG_PACKAGE_OPTIONAL; @@ -288,7 +288,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, level |= ALPM_SIG_DATABASE; level |= ALPM_SIG_DATABASE_OPTIONAL; } - } else if(strcmp(value, "Required") == 0) { + } else if(strcasecmp(value, "Required") == 0) { if(package) { level |= ALPM_SIG_PACKAGE; level &= ~ALPM_SIG_PACKAGE_OPTIONAL; @@ -297,7 +297,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, level |= ALPM_SIG_DATABASE; level &= ~ALPM_SIG_DATABASE_OPTIONAL; } - } else if(strcmp(value, "TrustedOnly") == 0) { + } else if(strcasecmp(value, "TrustedOnly") == 0) { if(package) { level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK; level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK; @@ -306,7 +306,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, level &= ~ALPM_SIG_DATABASE_MARGINAL_OK; level &= ~ALPM_SIG_DATABASE_UNKNOWN_OK; } - } else if(strcmp(value, "TrustAll") == 0) { + } else if(strcasecmp(value, "TrustAll") == 0) { if(package) { level |= ALPM_SIG_PACKAGE_MARGINAL_OK; level |= ALPM_SIG_PACKAGE_UNKNOWN_OK; @@ -345,9 +345,9 @@ static int process_cleanmethods(alpm_list_t *values, alpm_list_t *i; for(i = values; i; i = alpm_list_next(i)) { const char *value = i->data; - if(strcmp(value, "KeepInstalled") == 0) { + if(strcasecmp(value, "KeepInstalled") == 0) { config->cleanmethod |= PM_CLEAN_KEEPINST; - } else if(strcmp(value, "KeepCurrent") == 0) { + } else if(strcasecmp(value, "KeepCurrent") == 0) { config->cleanmethod |= PM_CLEAN_KEEPCUR; } else { pm_printf(ALPM_LOG_ERROR, @@ -387,22 +387,22 @@ static int _parse_options(const char *key, char *value, { if(value == NULL) { /* options without settings */ - if(strcmp(key, "UseSyslog") == 0) { + if(strcasecmp(key, "UseSyslog") == 0) { config->usesyslog = 1; pm_printf(ALPM_LOG_DEBUG, "config: usesyslog\n"); - } else if(strcmp(key, "ILoveCandy") == 0) { + } else if(strcasecmp(key, "ILoveCandy") == 0) { config->chomp = 1; pm_printf(ALPM_LOG_DEBUG, "config: chomp\n"); - } else if(strcmp(key, "VerbosePkgLists") == 0) { + } else if(strcasecmp(key, "VerbosePkgLists") == 0) { config->verbosepkglists = 1; pm_printf(ALPM_LOG_DEBUG, "config: verbosepkglists\n"); - } else if(strcmp(key, "UseDelta") == 0) { + } else if(strcasecmp(key, "UseDelta") == 0) { config->usedelta = 1; pm_printf(ALPM_LOG_DEBUG, "config: usedelta\n"); - } else if(strcmp(key, "TotalDownload") == 0) { + } else if(strcasecmp(key, "TotalDownload") == 0) { config->totaldownload = 1; pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n"); - } else if(strcmp(key, "CheckSpace") == 0) { + } else if(strcasecmp(key, "CheckSpace") == 0) { config->checkspace = 1; } else { pm_printf(ALPM_LOG_WARNING, @@ -411,50 +411,50 @@ static int _parse_options(const char *key, char *value, } } else { /* options with settings */ - if(strcmp(key, "NoUpgrade") == 0) { + if(strcasecmp(key, "NoUpgrade") == 0) { setrepeatingoption(value, "NoUpgrade", &(config->noupgrade)); - } else if(strcmp(key, "NoExtract") == 0) { + } else if(strcasecmp(key, "NoExtract") == 0) { setrepeatingoption(value, "NoExtract", &(config->noextract)); - } else if(strcmp(key, "IgnorePkg") == 0) { + } else if(strcasecmp(key, "IgnorePkg") == 0) { setrepeatingoption(value, "IgnorePkg", &(config->ignorepkg)); - } else if(strcmp(key, "IgnoreGroup") == 0) { + } else if(strcasecmp(key, "IgnoreGroup") == 0) { setrepeatingoption(value, "IgnoreGroup", &(config->ignoregrp)); - } else if(strcmp(key, "HoldPkg") == 0) { + } else if(strcasecmp(key, "HoldPkg") == 0) { setrepeatingoption(value, "HoldPkg", &(config->holdpkg)); - } else if(strcmp(key, "SyncFirst") == 0) { + } else if(strcasecmp(key, "SyncFirst") == 0) { setrepeatingoption(value, "SyncFirst", &(config->syncfirst)); - } else if(strcmp(key, "CacheDir") == 0) { + } else if(strcasecmp(key, "CacheDir") == 0) { setrepeatingoption(value, "CacheDir", &(config->cachedirs)); - } else if(strcmp(key, "Architecture") == 0) { + } else if(strcasecmp(key, "Architecture") == 0) { if(!config->arch) { config_set_arch(value); } - } else if(strcmp(key, "DBPath") == 0) { + } else if(strcasecmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { config->dbpath = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: dbpath: %s\n", value); } - } else if(strcmp(key, "RootDir") == 0) { + } else if(strcasecmp(key, "RootDir") == 0) { /* don't overwrite a path specified on the command line */ if(!config->rootdir) { config->rootdir = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: rootdir: %s\n", value); } - } else if(strcmp(key, "GPGDir") == 0) { + } else if(strcasecmp(key, "GPGDir") == 0) { if(!config->gpgdir) { config->gpgdir = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: gpgdir: %s\n", value); } - } else if(strcmp(key, "LogFile") == 0) { + } else if(strcasecmp(key, "LogFile") == 0) { if(!config->logfile) { config->logfile = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: logfile: %s\n", value); } - } else if(strcmp(key, "XferCommand") == 0) { + } else if(strcasecmp(key, "XferCommand") == 0) { config->xfercommand = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: xfercommand: %s\n", value); - } else if(strcmp(key, "CleanMethod") == 0) { + } else if(strcasecmp(key, "CleanMethod") == 0) { alpm_list_t *methods = NULL; setrepeatingoption(value, "CleanMethod", &methods); if(process_cleanmethods(methods, file, linenum)) { @@ -462,7 +462,7 @@ static int _parse_options(const char *key, char *value, return 1; } FREELIST(methods); - } else if(strcmp(key, "SigLevel") == 0) { + } else if(strcasecmp(key, "SigLevel") == 0) { alpm_list_t *values = NULL; setrepeatingoption(value, "SigLevel", &values); if(process_siglevel(values, &config->siglevel, file, linenum)) { @@ -751,7 +751,7 @@ static int _parseconfig(const char *file, struct section_t *section, } pm_printf(ALPM_LOG_DEBUG, "config: new section '%s'\n", name); section->name = name; - section->is_options = (strcmp(name, "options") == 0); + section->is_options = (strcasecmp(name, "options") == 0); continue; } @@ -777,7 +777,7 @@ static int _parseconfig(const char *file, struct section_t *section, goto cleanup; } /* Include is allowed in both options and repo sections */ - if(strcmp(key, "Include") == 0) { + if(strcasecmp(key, "Include") == 0) { glob_t globbuf; int globret; size_t gindex; @@ -824,7 +824,7 @@ static int _parseconfig(const char *file, struct section_t *section, } } else if(!parse_options && !section->is_options) { /* ... or in a repo section */ - if(strcmp(key, "Server") == 0) { + if(strcasecmp(key, "Server") == 0) { if(value == NULL) { pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"), file, linenum, key); @@ -832,7 +832,7 @@ static int _parseconfig(const char *file, struct section_t *section, goto cleanup; } section->servers = alpm_list_add(section->servers, strdup(value)); - } else if(strcmp(key, "SigLevel") == 0) { + } else if(strcasecmp(key, "SigLevel") == 0) { alpm_list_t *values = NULL; setrepeatingoption(value, "SigLevel", &values); if(values) { -- 1.7.8.3

1 0

[pacman-dev] [PATCH] fetch_url: look for files in cache before downloading
by Dave Reisner 14 Jan '12

14 Jan '12

We lost this logic somewhere between the libfetch and libcurl transition, as it existed in the internal downloader, but was pulled back only into the sync workflow. Add a helper function that will let us check for existance in the filecache prior to calling the downloader. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Ugly patch, for not a whole lot of noise. Pointed out by Ioni that we don't look in the cachedirs anymore for files downloaded via -U. lib/libalpm/dload.c | 92 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 60 insertions(+), 32 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a3980d6..0092838 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -558,6 +558,22 @@ int _alpm_download(struct dload_payload *payload, const char *localpath, } } +static char *filecache_find_url(alpm_handle_t *handle, const char *url) +{ + const char *basename = strrchr(url, '/'); + + if(basename == NULL) { + return 0; + } + + basename++; + if(basename == '\0') { + return 0; + } + + return _alpm_filecache_find(handle, basename); +} + /** Fetch a remote pkg. */ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) { @@ -565,7 +581,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) const char *cachedir; char *final_file = NULL; struct dload_payload payload; - int ret; + int ret = 0; CHECK_HANDLE(handle, return NULL); ASSERT(url, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL)); @@ -574,51 +590,63 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) cachedir = _alpm_filecache_setup(handle); memset(&payload, 0, sizeof(struct dload_payload)); - payload.handle = handle; - STRDUP(payload.fileurl, url, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - payload.allow_resume = 1; - - /* download the file */ - ret = _alpm_download(&payload, cachedir, &final_file); - _alpm_dload_payload_reset(&payload); - if(ret == -1) { - _alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), url); - free(final_file); - return NULL; + + /* attempt to find the file in our pkgcache */ + filepath = filecache_find_url(handle, url); + if(filepath == NULL) { + STRDUP(payload.fileurl, url, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); + payload.allow_resume = 1; + payload.handle = handle; + + /* download the file */ + ret = _alpm_download(&payload, cachedir, &final_file); + _alpm_dload_payload_reset(&payload); + if(ret == -1) { + _alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), url); + free(final_file); + return NULL; + } + _alpm_log(handle, ALPM_LOG_DEBUG, "successfully downloaded %s\n", url); } - _alpm_log(handle, ALPM_LOG_DEBUG, "successfully downloaded %s\n", url); /* attempt to download the signature */ if(ret == 0 && (handle->siglevel & ALPM_SIG_PACKAGE)) { - char *sig_final_file = NULL; + char *sig_filepath, *sig_final_file = NULL; size_t len; len = strlen(url) + 5; MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); snprintf(payload.fileurl, len, "%s.sig", url); - payload.handle = handle; - payload.force = 1; - payload.errors_ok = (handle->siglevel & ALPM_SIG_PACKAGE_OPTIONAL); - - /* set hard upper limit of 16KiB */ - payload.max_size = 16 * 1024; - - ret = _alpm_download(&payload, cachedir, &sig_final_file); - if(ret == -1 && !payload.errors_ok) { - _alpm_log(handle, ALPM_LOG_WARNING, - _("failed to download %s\n"), payload.fileurl); - /* Warn now, but don't return NULL. We will fail later during package - * load time. */ - } else if(ret == 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "successfully downloaded %s\n", payload.fileurl); + + sig_filepath = filecache_find_url(handle, payload.fileurl); + if(sig_filepath == NULL) { + payload.handle = handle; + payload.force = 1; + payload.errors_ok = (handle->siglevel & ALPM_SIG_PACKAGE_OPTIONAL); + + /* set hard upper limit of 16KiB */ + payload.max_size = 16 * 1024; + + ret = _alpm_download(&payload, cachedir, &sig_final_file); + if(ret == -1 && !payload.errors_ok) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("failed to download %s\n"), payload.fileurl); + /* Warn now, but don't return NULL. We will fail later during package + * load time. */ + } else if(ret == 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "successfully downloaded %s\n", payload.fileurl); + } + FREE(sig_final_file); } - FREE(sig_final_file); + free(sig_filepath); _alpm_dload_payload_reset(&payload); } /* we should be able to find the file the second time around */ - filepath = _alpm_filecache_find(handle, final_file); + if(filepath == NULL) { + filepath = _alpm_filecache_find(handle, final_file); + } free(final_file); return filepath; -- 1.7.8.3

1 0

[pacman-dev] [PATCH] [RFC] Add UpgradeSigLevel configuration option
by Allan McRae 13 Jan '12

13 Jan '12

Use to override the global SigLevel value for upgrade operations. e.g. when installing a package without a signature: Fails to install: SigLevel = Optional UpgradeSigLevel = Required Fails to install: SigLevel = Required Installs: SigLevel = Required UpgradeSigLevel = Optional Installs: SigLevel = Optional Signed-off-by: Allan McRae <allan(a)archlinux.org> --- The main issue I see here is that UpgradeSigLevel must come after the global SigLevel value. Otherwise the only way I see to use the value of SigLevel as a default for UpgradeSigLevel requires much code duplication. lib/libalpm/alpm.h | 3 +++ lib/libalpm/handle.c | 21 +++++++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 10 ++++++++++ src/pacman/conf.h | 1 + src/pacman/upgrade.c | 2 +- 6 files changed, 37 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1751c81..d201748 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -544,6 +544,9 @@ 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_upgrade_siglevel(alpm_handle_t *handle); +int alpm_option_set_upgrade_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 6518b7d..e574551 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -628,4 +628,25 @@ alpm_siglevel_t SYMEXPORT alpm_option_get_default_siglevel(alpm_handle_t *handle return handle->siglevel; } +int SYMEXPORT alpm_option_set_upgrade_siglevel(alpm_handle_t *handle, + alpm_siglevel_t level) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBGPGME + handle->upgradesiglevel = 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_upgrade_siglevel(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->upgradesiglevel; +} + + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 1f147d6..8535c2b 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -91,6 +91,7 @@ struct __alpm_handle_t { int usedelta; /* Download deltas if possible */ int checkspace; /* Check disk space before installing */ alpm_siglevel_t siglevel; /* Default signature verification level */ + alpm_siglevel_t upgradesiglevel; /* Signature verification level for upgrade operations */ /* error code */ alpm_errno_t pm_errno; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 117aecd4..abcc4fd 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -469,6 +469,15 @@ static int _parse_options(const char *key, char *value, FREELIST(values); return 1; } + config->upgradesiglevel = config->siglevel; + FREELIST(values); + } else if(strcmp(key, "UpgradeSigLevel") == 0) { + alpm_list_t *values = NULL; + setrepeatingoption(value, "UpgradeSigLevel", &values); + if(process_siglevel(values, &config->upgradesiglevel, file, linenum)) { + FREELIST(values); + return 1; + } FREELIST(values); } else { pm_printf(ALPM_LOG_WARNING, @@ -591,6 +600,7 @@ static int setup_libalpm(void) } alpm_option_set_default_siglevel(handle, config->siglevel); + alpm_option_set_upgrade_siglevel(handle, config->upgradesiglevel); if(config->xfercommand) { alpm_option_set_fetchcb(handle, download_with_xfercommand); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 325fbb6..9c8d944 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -72,6 +72,7 @@ typedef struct __config_t { unsigned int ask; alpm_transflag_t flags; alpm_siglevel_t siglevel; + alpm_siglevel_t upgradesiglevel; /* conf file options */ /* I Love Candy! */ diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 87f7c39..12bd421 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -41,7 +41,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_siglevel_t level = alpm_option_get_upgrade_siglevel(config->handle); if(targets == NULL) { pm_printf(ALPM_LOG_ERROR, _("no targets specified (use -h for help)\n")); -- 1.7.8.1

4 5

[pacman-dev] [PATCH] doc/vercmp: add note about pkgrel handling
by Dan McGee 12 Jan '12

12 Jan '12

This comes from the Doxygen function documentation. Also, fix two rather silly misspellings. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/vercmp.8.txt | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/vercmp.8.txt b/doc/vercmp.8.txt index 4b0490f..6b94f3e 100644 --- a/doc/vercmp.8.txt +++ b/doc/vercmp.8.txt @@ -6,7 +6,7 @@ vercmp(8) Name ---- -vercmp - version comparsion utility +vercmp - version comparison utility Synopsis @@ -23,7 +23,7 @@ numbers. It outputs values as follows: * = 0 : if ver1 == ver2 * > 0 : if ver1 > ver2 -Version comparsion operates as follows: +Version comparison operates as follows: Alphanumeric: 1.0a < 1.0b < 1.0beta < 1.0p < 1.0pre < 1.0rc < 1.0 < 1.0.a < 1.0.1 @@ -35,6 +35,11 @@ overrule any version comparison (unless the epoch values are equal). This is specified in an `epoch:version-rel` format. For example, `2:1.0-1` is always greater than `1:3.6-1`. +Keep in mind that the 'pkgrel' is only compared if it is available on both +versions given to this tool. For example, comparing `1.5-1` and `1.5` will +yield 0; comparing `1.5-1` and `1.5-2` will yield < 0 as expected. This is +mainly for supporting versioned dependencies that do not include the 'pkgrel'. + Options ------- -- 1.7.8.3

1 0