- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Don't check for diskspace when using --dbonly
by Dan McGee 20 Feb '12

20 Feb '12

It doesn't make much sense, as we aren't going to be manipulating any package files other than local database entries. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index a946a7d..185878a 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1137,7 +1137,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) } /* check available disk space */ - if(handle->checkspace) { + if(handle->checkspace && !(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { EVENT(handle, ALPM_EVENT_DISKSPACE_START, NULL, NULL); _alpm_log(handle, ALPM_LOG_DEBUG, "checking available disk space\n"); -- 1.7.9.1

2 1

[pacman-dev] [PATCH] Give better error messages on database locking failures
by Dan McGee 20 Feb '12

20 Feb '12

This was noted when trying to perform an operation on a pacman database on a read-only file system. Print the actual underlying errno string, and only show the "you can remove" message if the lock file actually exists. Before: $ pacman -Su error: failed to init transaction (unable to lock database) if you're sure a package manager is not already running, you can remove /e/db.lck After: $ pacman -Su error: failed to init transaction (unable to lock database) error: could not lock database: Read-only file system Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/util.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 0b076d9..f7f8ecf 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -69,9 +69,13 @@ void trans_init_error(void) pm_printf(ALPM_LOG_ERROR, _("failed to init transaction (%s)\n"), alpm_strerror(err)); if(err == ALPM_ERR_HANDLE_LOCK) { - fprintf(stderr, _(" if you're sure a package manager is not already\n" - " running, you can remove %s\n"), - alpm_option_get_lockfile(config->handle)); + const char *lockfile = alpm_option_get_lockfile(config->handle); + pm_printf(ALPM_LOG_ERROR, _("could not lock database: %s\n"), + strerror(errno)); + if(access(lockfile, F_OK) == 0) { + fprintf(stderr, _(" if you're sure a package manager is not already\n" + " running, you can remove %s\n"), lockfile); + } } } -- 1.7.9.1

1 0

[pacman-dev] [PATCH 1/3 v2] Add information on how an installed package was validated
by Allan McRae 20 Feb '12

20 Feb '12

When installing a package, store information on which validation method was used and output this on "pacman -Qi" operations. e.g. Validated By : SHA256 Sum Possible values are Unknown, None, MD5 Sum, SHA256 Sum, Signature. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Changed alpm_pkgvalidation_t to a bitmask lib/libalpm/alpm.h | 15 +++++++++++++++ lib/libalpm/be_local.c | 43 +++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/be_package.c | 17 +++++++++++++++++ lib/libalpm/package.c | 9 +++++++++ lib/libalpm/package.h | 2 ++ lib/libalpm/sync.c | 2 ++ src/pacman/package.c | 25 +++++++++++++++++++++++++ 7 files changed, 113 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1b3f6d7..1d77c97 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -64,6 +64,15 @@ typedef enum _alpm_pkgfrom_t { PKG_FROM_SYNCDB } alpm_pkgfrom_t; +/** Location a package object was loaded from. */ +typedef enum _alpm_pkgvalidation_t { + ALPM_PKG_VALIDATION_UNKNOWN, + ALPM_PKG_VALIDATION_NONE = (1 << 0), + ALPM_PKG_VALIDATION_MD5SUM = (1 << 1), + ALPM_PKG_VALIDATION_SHA256SUM = (1 << 2), + ALPM_PKG_VALIDATION_SIGNATURE = (1 << 3) +} alpm_pkgvalidation_t; + /** Types of version constraints in dependency specs. */ typedef enum _alpm_depmod_t { /** No version constraint */ @@ -888,6 +897,12 @@ alpm_db_t *alpm_pkg_get_db(alpm_pkg_t *pkg); */ const char *alpm_pkg_get_base64_sig(alpm_pkg_t *pkg); +/** Returns the method used to validate a package during install. + * @param pkg a pointer to package + * @return an enum member giving the validation method + */ +alpm_pkgvalidation_t alpm_pkg_get_validation(alpm_pkg_t *pkg); + /* End of alpm_pkg_t accessors */ /* @} */ diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 9a8c0ec..3b34a62 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -102,6 +102,12 @@ static alpm_pkgreason_t _cache_get_reason(alpm_pkg_t *pkg) return pkg->reason; } +static alpm_pkgvalidation_t _cache_get_validation(alpm_pkg_t *pkg) +{ + LAZY_LOAD(INFRQ_DESC, -1); + return pkg->validation; +} + static alpm_list_t *_cache_get_licenses(alpm_pkg_t *pkg) { LAZY_LOAD(INFRQ_DESC, NULL); @@ -223,6 +229,7 @@ static struct pkg_operations local_pkg_ops = { .get_arch = _cache_get_arch, .get_isize = _cache_get_isize, .get_reason = _cache_get_reason, + .get_validation = _cache_get_validation, .has_scriptlet = _cache_has_scriptlet, .get_licenses = _cache_get_licenses, .get_groups = _cache_get_groups, @@ -603,6 +610,26 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) } else if(strcmp(line, "%REASON%") == 0) { READ_NEXT(); info->reason = (alpm_pkgreason_t)atoi(line); + } else if(strcmp(line, "%VALIDATION%") == 0) { + alpm_list_t *i, *v = NULL; + READ_AND_STORE_ALL(v); + for(i = v; i; i = alpm_list_next(i)) + { + if(strcmp(i->data, "none") == 0) { + info->validation |= ALPM_PKG_VALIDATION_NONE; + } else if(strcmp(i->data, "md5") == 0) { + info->validation |= ALPM_PKG_VALIDATION_MD5SUM; + } else if(strcmp(i->data, "sha256") == 0) { + info->validation |= ALPM_PKG_VALIDATION_SHA256SUM; + } else if(strcmp(i->data, "pgp") == 0) { + info->validation |= ALPM_PKG_VALIDATION_SIGNATURE; + } else { + _alpm_log(db->handle, ALPM_LOG_WARNING, + _("unknown validation type for package %s: %s\n"), + info->name, (char *)i->data); + } + } + FREELIST(v); } else if(strcmp(line, "%SIZE%") == 0) { READ_NEXT(); info->isize = _alpm_strtoofft(line); @@ -817,6 +844,22 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq fprintf(fp, "%%REASON%%\n" "%u\n\n", info->reason); } + if(info->validation) { + fputs("%VALIDATION%\n", fp); + if(info->validation & ALPM_PKG_VALIDATION_NONE) { + fputs("none\n", fp); + } + if(info->validation & ALPM_PKG_VALIDATION_MD5SUM) { + fputs("md5\n", fp); + } + if(info->validation & ALPM_PKG_VALIDATION_SHA256SUM) { + fputs("sha256\n", fp); + } + if(info->validation & ALPM_PKG_VALIDATION_SIGNATURE) { + fputs("pgp\n", fp); + } + fprintf(fp, "\n"); + } if(info->depends) { fputs("%DEPENDS%\n", fp); for(lp = info->depends; lp; lp = lp->next) { diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 4b43f21..0a8bbf3 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -341,6 +341,7 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, if(_alpm_test_checksum(pkgfile, syncpkg->md5sum, ALPM_CSUM_MD5) != 0) { RET_ERR(handle, ALPM_ERR_PKG_INVALID_CHECKSUM, -1); } + syncpkg->validation |= ALPM_PKG_VALIDATION_MD5SUM; } if(syncpkg->sha256sum) { @@ -349,6 +350,7 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, if(_alpm_test_checksum(pkgfile, syncpkg->sha256sum, ALPM_CSUM_SHA256) != 0) { RET_ERR(handle, ALPM_ERR_PKG_INVALID_CHECKSUM, -1); } + syncpkg->validation |= ALPM_PKG_VALIDATION_SHA256SUM; } } @@ -362,6 +364,13 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, handle->pm_errno = ALPM_ERR_PKG_INVALID_SIG; return -1; } + if (syncpkg && has_sig) { + syncpkg->validation |= ALPM_PKG_VALIDATION_SIGNATURE; + } + } + + if (syncpkg && !syncpkg->validation) { + syncpkg->validation = ALPM_PKG_VALIDATION_NONE; } return 0; @@ -495,6 +504,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, newpkg->ops = get_file_pkg_ops(); newpkg->handle = handle; newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_SCRIPTLET; + newpkg->validation = ALPM_PKG_VALIDATION_NONE; if(full) { if(files) { @@ -539,6 +549,13 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful return -1; } + char *sigpath = _alpm_sigpath(handle, filename); + if(sigpath && !_alpm_access(handle, NULL, sigpath, R_OK)) { + /* package validation was done with a signature */ + (*pkg)->validation = ALPM_PKG_VALIDATION_SIGNATURE; + } + free(sigpath); + return 0; } diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 68fec16..5abfd72 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -91,6 +91,7 @@ static const char *_pkg_get_packager(alpm_pkg_t *pkg) { return pkg->packager; static const char *_pkg_get_arch(alpm_pkg_t *pkg) { return pkg->arch; } static off_t _pkg_get_isize(alpm_pkg_t *pkg) { return pkg->isize; } static alpm_pkgreason_t _pkg_get_reason(alpm_pkg_t *pkg) { return pkg->reason; } +static alpm_pkgvalidation_t _pkg_get_validation(alpm_pkg_t *pkg) { return pkg->validation; } static int _pkg_has_scriptlet(alpm_pkg_t *pkg) { return pkg->scriptlet; } static alpm_list_t *_pkg_get_licenses(alpm_pkg_t *pkg) { return pkg->licenses; } @@ -134,6 +135,7 @@ struct pkg_operations default_pkg_ops = { .get_arch = _pkg_get_arch, .get_isize = _pkg_get_isize, .get_reason = _pkg_get_reason, + .get_validation = _pkg_get_validation, .has_scriptlet = _pkg_has_scriptlet, .get_licenses = _pkg_get_licenses, @@ -268,6 +270,13 @@ alpm_pkgreason_t SYMEXPORT alpm_pkg_get_reason(alpm_pkg_t *pkg) return pkg->ops->get_reason(pkg); } +alpm_pkgvalidation_t SYMEXPORT alpm_pkg_get_validation(alpm_pkg_t *pkg) +{ + ASSERT(pkg != NULL, return -1); + pkg->handle->pm_errno = 0; + return pkg->ops->get_validation(pkg); +} + alpm_list_t SYMEXPORT *alpm_pkg_get_licenses(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 172d2f3..0c0973e 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -47,6 +47,7 @@ struct pkg_operations { const char *(*get_arch) (alpm_pkg_t *); off_t (*get_isize) (alpm_pkg_t *); alpm_pkgreason_t (*get_reason) (alpm_pkg_t *); + alpm_pkgvalidation_t (*get_validation) (alpm_pkg_t *); int (*has_scriptlet) (alpm_pkg_t *); alpm_list_t *(*get_licenses) (alpm_pkg_t *); @@ -96,6 +97,7 @@ struct __alpm_pkg_t { int scriptlet; alpm_pkgreason_t reason; + alpm_pkgvalidation_t validation; alpm_dbinfrq_t infolevel; alpm_pkgfrom_t origin; /* origin == PKG_FROM_FILE, use pkg->origin_data.file diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 468438f..68630c1 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1083,6 +1083,8 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, free(filepath); /* copy over the install reason */ pkgfile->reason = spkg->reason; + /* copy over validation method */ + pkgfile->validation = spkg->validation; i->data = pkgfile; /* spkg has been removed from the target list, so we can free the * sync-specific fields */ diff --git a/src/pacman/package.c b/src/pacman/package.c index ecf5745..5f824f4 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -63,6 +63,7 @@ static void deplist_display(const char *title, void dump_pkg_full(alpm_pkg_t *pkg, int extra) { const char *reason; + alpm_list_t *validation = NULL; time_t bdate, idate; char bdatestr[50] = "", idatestr[50] = ""; const char *label; @@ -94,6 +95,27 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) break; } + if(from == PKG_FROM_LOCALDB) { + alpm_pkgvalidation_t v = alpm_pkg_get_validation(pkg); + if(v) { + if(v & ALPM_PKG_VALIDATION_NONE) { + validation = alpm_list_add(validation, strdup(_("None"))); + } else { + if(v & ALPM_PKG_VALIDATION_MD5SUM) { + validation = alpm_list_add(validation, strdup(_("MD5 Sum"))); + } + if(v & ALPM_PKG_VALIDATION_SHA256SUM) { + validation = alpm_list_add(validation, strdup(_("SHA256 Sum"))); + } + if(v & ALPM_PKG_VALIDATION_SIGNATURE) { + validation = alpm_list_add(validation, strdup(_("Signature"))); + } + } + } else { + validation = alpm_list_add(validation, strdup(_("Unknown"))); + } + } + if(extra || from == PKG_FROM_LOCALDB) { /* compute this here so we don't get a pause in the middle of output */ requiredby = alpm_pkg_compute_requiredby(pkg); @@ -159,6 +181,9 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } alpm_siglist_cleanup(&siglist); } + if(from == PKG_FROM_LOCALDB) { + list_display(_("Validated By :"), validation); + } string_display(_("Description :"), alpm_pkg_get_desc(pkg)); /* Print additional package info if info flag passed more than once */ -- 1.7.9.1

1 2

[pacman-dev] Strange (critical) bug with checkspace
by Nagy Gabor 20 Feb '12

20 Feb '12

Hi! I've run into the following bug: $ df -h Filesystem Size Used Avail Use% Mounted on rootfs 44G 30G 13G 71% / /dev 501M 0 501M 0% /dev /run 503M 276K 503M 1% /run /dev/sda3 44G 30G 13G 71% / none 503M 0 503M 0% /dev/shm /dev/sda1 30G 29G 1.6G 95% /c /dev/sr0 4.2G 4.2G 0 100% /e [Don't laugh at my mountpoints.] $ sudo pacman -Su ... Total Installed Size: 900.93 MiB Net Upgrade Size: 139.47 MiB ... error: Partition /e is mounted read only error: not enough free disk space error: failed to commit transaction (not enough free disk space) Errors occurred, no packages were upgraded. What?! I think none of our packages wants to write to /e/... I've tried with both pacman 4.0.2-1 and pacman-git, the result is the same. I've also tried with "pacman -S randompkg", that worked fine. I don't want to umount /e, because I am afraid of the fact that I might not be able to reproduce this bug any more... The relevant part of --debug log says nothing: [04:19:41] debug: checking available disk space [04:19:41] debug: mountpoint: /sys [04:19:41] debug: mountpoint: /run [04:19:41] debug: mountpoint: /root/.gvfs [04:19:41] debug: mountpoint: /proc [04:19:41] debug: mountpoint: /e [04:19:41] debug: mountpoint: /dev/shm [04:19:41] debug: mountpoint: /dev/pts [04:19:41] debug: mountpoint: /dev [04:19:41] debug: mountpoint: /c [04:19:41] debug: mountpoint: / [04:19:41] debug: mountpoint: / [04:19:41] error: Partition /e is mounted read only [04:19:41] debug: partition /, needed 3897, cushion 5121, free 3727796 [04:19:41] debug: returning error 7 from _alpm_check_diskspace : not enough free disk space [04:19:41] error: not enough free disk space [04:19:41] error: failed to commit transaction (not enough free disk space) [04:19:41] debug: unregistering database 'local' NG

3 3

[pacman-dev] [PATCH] Add information on how an installed package was validated
by Allan McRae 19 Feb '12

19 Feb '12

When installing a package, store information on which validation method was used and output this on "pacman -Qi" operations. e.g. Validated By : SHA256 Sum Possible values are Unknown, None, MD5 Sum, SHA256 Sum, Signature. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- The only thing I am concerned about is setting the validation level for "pacman -U" operations. During the actual validation step we do not have the package struct yet so there is nowhere to store whether or not a signature is checked. If there is a .sig file present after loading the package (which occurs immediately after signature verification), it is just assumed that the .sig file was checked. lib/libalpm/alpm.h | 15 +++++++++++++++ lib/libalpm/be_local.c | 14 ++++++++++++++ lib/libalpm/be_package.c | 17 +++++++++++++++++ lib/libalpm/package.c | 9 +++++++++ lib/libalpm/package.h | 2 ++ lib/libalpm/sync.c | 2 ++ src/pacman/package.c | 24 ++++++++++++++++++++++++ 7 files changed, 83 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index aeb1bb7..eafe931 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -64,6 +64,15 @@ typedef enum _alpm_pkgfrom_t { PKG_FROM_SYNCDB } alpm_pkgfrom_t; +/** Location a package object was loaded from. */ +typedef enum _alpm_pkgvalidation_t { + ALPM_PKG_VALIDATION_UNKNOWN, + ALPM_PKG_VALIDATION_NONE, + ALPM_PKG_VALIDATION_MD5SUM, + ALPM_PKG_VALIDATION_SHA256SUM, + ALPM_PKG_VALIDATION_SIGNATURE +} alpm_pkgvalidation_t; + /** Types of version constraints in dependency specs. */ typedef enum _alpm_depmod_t { /** No version constraint */ @@ -879,6 +888,12 @@ alpm_db_t *alpm_pkg_get_db(alpm_pkg_t *pkg); */ const char *alpm_pkg_get_base64_sig(alpm_pkg_t *pkg); +/** Returns the method used to validate a package during install. + * @param pkg a pointer to package + * @return an enum member giving the validation method + */ +alpm_pkgvalidation_t alpm_pkg_get_validation(alpm_pkg_t *pkg); + /* End of alpm_pkg_t accessors */ /* @} */ diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 9a8c0ec..40b273d 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -102,6 +102,12 @@ static alpm_pkgreason_t _cache_get_reason(alpm_pkg_t *pkg) return pkg->reason; } +static alpm_pkgvalidation_t _cache_get_validation(alpm_pkg_t *pkg) +{ + LAZY_LOAD(INFRQ_DESC, -1); + return pkg->validation; +} + static alpm_list_t *_cache_get_licenses(alpm_pkg_t *pkg) { LAZY_LOAD(INFRQ_DESC, NULL); @@ -223,6 +229,7 @@ static struct pkg_operations local_pkg_ops = { .get_arch = _cache_get_arch, .get_isize = _cache_get_isize, .get_reason = _cache_get_reason, + .get_validation = _cache_get_validation, .has_scriptlet = _cache_has_scriptlet, .get_licenses = _cache_get_licenses, .get_groups = _cache_get_groups, @@ -603,6 +610,9 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) } else if(strcmp(line, "%REASON%") == 0) { READ_NEXT(); info->reason = (alpm_pkgreason_t)atoi(line); + } else if(strcmp(line, "%VALIDATION%") == 0) { + READ_NEXT(); + info->validation = (alpm_pkgvalidation_t)atoi(line); } else if(strcmp(line, "%SIZE%") == 0) { READ_NEXT(); info->isize = _alpm_strtoofft(line); @@ -817,6 +827,10 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq fprintf(fp, "%%REASON%%\n" "%u\n\n", info->reason); } + if(info->validation) { + fprintf(fp, "%%VALIDATION%%\n" + "%u\n\n", info->validation); + } if(info->depends) { fputs("%DEPENDS%\n", fp); for(lp = info->depends; lp; lp = lp->next) { diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 4b43f21..06b4037 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -320,6 +320,10 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, RET_ERR(handle, ALPM_ERR_PKG_NOT_FOUND, -1); } + if (syncpkg) { + syncpkg->validation = ALPM_PKG_VALIDATION_NONE; + } + /* can we get away with skipping checksums? */ has_sig = 0; if(level & ALPM_SIG_PACKAGE) { @@ -341,6 +345,7 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, if(_alpm_test_checksum(pkgfile, syncpkg->md5sum, ALPM_CSUM_MD5) != 0) { RET_ERR(handle, ALPM_ERR_PKG_INVALID_CHECKSUM, -1); } + syncpkg->validation = ALPM_PKG_VALIDATION_MD5SUM; } if(syncpkg->sha256sum) { @@ -349,6 +354,7 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, if(_alpm_test_checksum(pkgfile, syncpkg->sha256sum, ALPM_CSUM_SHA256) != 0) { RET_ERR(handle, ALPM_ERR_PKG_INVALID_CHECKSUM, -1); } + syncpkg->validation = ALPM_PKG_VALIDATION_SHA256SUM; } } @@ -362,6 +368,9 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, handle->pm_errno = ALPM_ERR_PKG_INVALID_SIG; return -1; } + if (syncpkg) { + syncpkg->validation = ALPM_PKG_VALIDATION_SIGNATURE; + } } return 0; @@ -495,6 +504,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, newpkg->ops = get_file_pkg_ops(); newpkg->handle = handle; newpkg->infolevel = INFRQ_BASE | INFRQ_DESC | INFRQ_SCRIPTLET; + newpkg->validation = ALPM_PKG_VALIDATION_NONE; if(full) { if(files) { @@ -539,6 +549,13 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful return -1; } + char *sigpath = _alpm_sigpath(handle, filename); + if(sigpath && !_alpm_access(handle, NULL, sigpath, R_OK)) { + /* package validation was done with a signature */ + (*pkg)->validation = ALPM_PKG_VALIDATION_SIGNATURE; + } + free(sigpath); + return 0; } diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 68fec16..5abfd72 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -91,6 +91,7 @@ static const char *_pkg_get_packager(alpm_pkg_t *pkg) { return pkg->packager; static const char *_pkg_get_arch(alpm_pkg_t *pkg) { return pkg->arch; } static off_t _pkg_get_isize(alpm_pkg_t *pkg) { return pkg->isize; } static alpm_pkgreason_t _pkg_get_reason(alpm_pkg_t *pkg) { return pkg->reason; } +static alpm_pkgvalidation_t _pkg_get_validation(alpm_pkg_t *pkg) { return pkg->validation; } static int _pkg_has_scriptlet(alpm_pkg_t *pkg) { return pkg->scriptlet; } static alpm_list_t *_pkg_get_licenses(alpm_pkg_t *pkg) { return pkg->licenses; } @@ -134,6 +135,7 @@ struct pkg_operations default_pkg_ops = { .get_arch = _pkg_get_arch, .get_isize = _pkg_get_isize, .get_reason = _pkg_get_reason, + .get_validation = _pkg_get_validation, .has_scriptlet = _pkg_has_scriptlet, .get_licenses = _pkg_get_licenses, @@ -268,6 +270,13 @@ alpm_pkgreason_t SYMEXPORT alpm_pkg_get_reason(alpm_pkg_t *pkg) return pkg->ops->get_reason(pkg); } +alpm_pkgvalidation_t SYMEXPORT alpm_pkg_get_validation(alpm_pkg_t *pkg) +{ + ASSERT(pkg != NULL, return -1); + pkg->handle->pm_errno = 0; + return pkg->ops->get_validation(pkg); +} + alpm_list_t SYMEXPORT *alpm_pkg_get_licenses(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 172d2f3..0c0973e 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -47,6 +47,7 @@ struct pkg_operations { const char *(*get_arch) (alpm_pkg_t *); off_t (*get_isize) (alpm_pkg_t *); alpm_pkgreason_t (*get_reason) (alpm_pkg_t *); + alpm_pkgvalidation_t (*get_validation) (alpm_pkg_t *); int (*has_scriptlet) (alpm_pkg_t *); alpm_list_t *(*get_licenses) (alpm_pkg_t *); @@ -96,6 +97,7 @@ struct __alpm_pkg_t { int scriptlet; alpm_pkgreason_t reason; + alpm_pkgvalidation_t validation; alpm_dbinfrq_t infolevel; alpm_pkgfrom_t origin; /* origin == PKG_FROM_FILE, use pkg->origin_data.file diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 468438f..68630c1 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1083,6 +1083,8 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, free(filepath); /* copy over the install reason */ pkgfile->reason = spkg->reason; + /* copy over validation method */ + pkgfile->validation = spkg->validation; i->data = pkgfile; /* spkg has been removed from the target list, so we can free the * sync-specific fields */ diff --git a/src/pacman/package.c b/src/pacman/package.c index ecf5745..2345d30 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -63,6 +63,7 @@ static void deplist_display(const char *title, void dump_pkg_full(alpm_pkg_t *pkg, int extra) { const char *reason; + const char *validation = NULL; time_t bdate, idate; char bdatestr[50] = "", idatestr[50] = ""; const char *label; @@ -94,6 +95,26 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) break; } + if(from == PKG_FROM_LOCALDB) { + switch(alpm_pkg_get_validation(pkg)) { + case ALPM_PKG_VALIDATION_NONE: + validation = _("None"); + break; + case ALPM_PKG_VALIDATION_MD5SUM: + validation = _("MD5 Sum"); + break; + case ALPM_PKG_VALIDATION_SHA256SUM: + validation = _("SHA256 Sum"); + break; + case ALPM_PKG_VALIDATION_SIGNATURE: + validation = _("Signature"); + break; + default: + validation = _("Unknown"); + break; + } + } + if(extra || from == PKG_FROM_LOCALDB) { /* compute this here so we don't get a pause in the middle of output */ requiredby = alpm_pkg_compute_requiredby(pkg); @@ -159,6 +180,9 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } alpm_siglist_cleanup(&siglist); } + if(from == PKG_FROM_LOCALDB) { + string_display(_("Validated By :"), validation); + } string_display(_("Description :"), alpm_pkg_get_desc(pkg)); /* Print additional package info if info flag passed more than once */ -- 1.7.9.1

2 1

[pacman-dev] [PATCH v2] Add configuration option for Upgrade operation SigLevel
by Allan McRae 18 Feb '12

18 Feb '12

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 fixes all the issues I was concerned about in the previous patch. Thanks to Bluewind for his idea which set me on the path to fixing it (although I did it quite different so any crap implemenation is purely me...). 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 eafe931..223a242 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -111,6 +111,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; @@ -549,6 +552,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 ec4cc56..534a4ed 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -596,6 +596,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); @@ -623,16 +635,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 a090ae4..4d92d11 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 bfa8cad..cbf6f22 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; @@ -276,6 +278,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; @@ -284,6 +287,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; @@ -293,6 +297,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; @@ -302,6 +307,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; @@ -311,6 +317,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; @@ -340,6 +347,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) { @@ -483,6 +514,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"), @@ -605,6 +652,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 481132f..7447e89 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -72,6 +72,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 87f7c39..c60649a 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.7.9.1

1 0

[pacman-dev] [PATCH] [RFC] Add configuration option for Upgrade operation SigLevel
by Allan McRae 17 Feb '12

17 Feb '12

Add LocalFileSigLevel and RemoteFileSigLevel to control the signature checking for "pacman -U <file>" and "pacman -U <url>" operations respectively. Both values take the default of "Optional TrustedOnly". Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I would like to have the default level being what is set for SigLevel and the values in {Local,Remote}FileSigLevel override this, but I can not get that working without requiring these config options come after SigLevel. lib/libalpm/alpm.h | 6 +++++ lib/libalpm/handle.c | 52 ++++++++++++++++++++++++++++++++++++++++++++----- lib/libalpm/handle.h | 4 +++ src/pacman/conf.c | 20 +++++++++++++++++++ src/pacman/conf.h | 2 + src/pacman/upgrade.c | 21 +++++++++++++++++-- 6 files changed, 96 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index aeb1bb7..4afa429 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -540,6 +540,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 ec4cc56..534a4ed 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -596,6 +596,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); @@ -623,16 +635,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 a090ae4..4d92d11 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 bfa8cad..723ee50 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 = newconfig->siglevel; + newconfig->remotefilesiglevel = newconfig->siglevel; } return newconfig; @@ -483,6 +485,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"), @@ -604,6 +622,8 @@ static int setup_libalpm(void) } alpm_option_set_default_siglevel(handle, config->siglevel); + 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); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 481132f..7447e89 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -72,6 +72,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 87f7c39..c60649a 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.7.9.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.2-8-gca41427
by dan＠archlinux.org 16 Feb '12

16 Feb '12

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, maint has been updated via ca4142714137b16feabac09c4cda86b0a75036f8 (commit) via 242006933d31c88b844f8f8d0c2f0806763cc51f (commit) via 85712814cdbfa301e5827fafd6bfb8ac0886079c (commit) via 9a1ff474f1fe03e8bfdaf81ffc9a4881a44baea9 (commit) via edd81f3e8b505be2f7c7a18d3c28956b82264c45 (commit) via 6c78f0d56007ae5bbbaf9f15f6399e6e2967dd76 (commit) via 13a1d5883c9aa81ee10d61cbe4c2f2223dad9a50 (commit) from b4f5a63e7fee5d04949e290bd63e5f0e94bd211e (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 ca4142714137b16feabac09c4cda86b0a75036f8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Feb 15 22:50:51 2012 -0500 parseopts: normalize options into an array Modify parse_options logic to fill an array instead of printing parsed options. Avoid eval like the plague. Because it is the plague. Fixes bugs such as FS#28445. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 242006933d31c88b844f8f8d0c2f0806763cc51f Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Thu Feb 16 00:56:29 2012 -0500 pacsysclean: Fix script description and accept -o option without hyphen Close FS#28434 Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 85712814cdbfa301e5827fafd6bfb8ac0886079c Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 15 15:40:01 2012 -0600 Revert "Add -S --recursive operation" This reverts commit f3fa77bcf1d792971c314f8c0de255866e89f3f3 along with making other necessary changes to fully back this (mis)feature out until we can do it correctly. The quick summary here is this was not implemented correctly; provides are not fully taken into account in this logic, and making that happen exposes a lot of other flaws in this code that are covered up later on in the dependency resolving process by several other pieces of convoluted and conditional logic. Tests have been adjusted accordingly. Some test EXISTS conditions have been removed as we already know the package is installed locally, and we also are checking the VERSION condition anyway. With these two related revert commits, we do have some changes in test pass/fail results: * upgrade078.py: does not pass, this is due to --recursive getting removed for -U/-S operations after this commit. * sync302.py: the version checks have been disabled, so this test continues to pass but has been scaled back in scope. * sync303.py: now passes, was failing before. * sync304.py: still failing, was failing before. * sync305.py: now passes, was failing before. * sync306.py: still passes, was passing before. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9a1ff474f1fe03e8bfdaf81ffc9a4881a44baea9 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 15 15:16:23 2012 -0600 Revert "Enable recursive/needed sync on SyncFirst" This reverts commit 09034520325efcc2e684f05fa7a99c02bad1f5be. Tests affected by this revert have been adjusted; additionally a few EXIST tests have been removed where there is already a VERSION test doing the job for us. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit edd81f3e8b505be2f7c7a18d3c28956b82264c45 Author: Christoph Vigano <mail(a)cvigano.de> Date: Tue Feb 14 21:31:04 2012 +0100 makepkg: fix syntax error in remove_deps This fixes a problem that occurs if you tell makepkg to remove installed dependencies (just to be sure) but there are none. As the $ was missing in front of deplist, the check never happened and 'pacman -Rn' was called which obviously failed. Dan: later reported as FS#28448. Signed-off-by: Christoph Vigano <mail(a)cvigano.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6c78f0d56007ae5bbbaf9f15f6399e6e2967dd76 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 14 12:12:24 2012 -0600 Update SIGPIPE signal handler comment Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 13a1d5883c9aa81ee10d61cbe4c2f2223dad9a50 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 14 10:11:43 2012 -0600 scripts: unset CDPATH if cd is used This wonderful/awful little bash shell variable wrecks havoc on `cd` calls in shell scripts. Unset CDPATH in makepkg where we use `cd` quite heavily. In pacman-optimize, we can move the change directory logic into the bsdtar call so we are left with no usages of `cd` in the script. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/pacsysclean.in | 7 +++++-- doc/pacman.8.txt | 7 ------- lib/libalpm/deps.c | 29 ----------------------------- lib/libalpm/dload.c | 4 ++-- scripts/library/parse_options.sh | 32 +++++++++++--------------------- scripts/makepkg.sh.in | 10 ++++++---- scripts/pacman-key.sh.in | 6 +++--- scripts/pacman-optimize.sh.in | 3 +-- src/pacman/conf.h | 1 - src/pacman/pacman.c | 8 +------- src/pacman/sync.c | 2 -- test/pacman/tests/sync302.py | 8 ++++---- test/pacman/tests/sync303.py | 3 --- test/pacman/tests/sync304.py | 2 -- test/pacman/tests/sync305.py | 3 --- test/pacman/tests/sync306.py | 1 - test/pacman/tests/upgrade078.py | 17 ++++++++--------- 17 files changed, 41 insertions(+), 102 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove SyncFirst option
by Dan McGee 16 Feb '12

16 Feb '12

This has outlived its usefulness and causes more problems than it solves. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This is an RFC first of all, so please feel free to comment. Pros: 1. Removes complexity and a fair amount of code. 2. Removes the hack necesary for download-only and print operations. 3. Closes at least two bug reports. 4. Pacman is now much more resiliant to updates to itself since vercmp is statically linked, etc. so updating it alone isn't always necessary. Cons: 1. If a major underlying change occurs (such as a new compression format), users would need to update pacman explicitly first. 2. ??? doc/pacman.conf.5.txt | 9 ----- etc/pacman.conf.in | 2 - src/pacman/conf.c | 3 +- src/pacman/conf.h | 1 - src/pacman/sync.c | 55 +--------------------------------- test/pacman/README | 1 - test/pacman/tests/sync301.py | 27 ----------------- test/pacman/tests/sync302.py | 49 ------------------------------ test/pacman/tests/sync303.py | 38 ----------------------- test/pacman/tests/sync304.py | 27 ----------------- test/pacman/tests/sync305.py | 67 ------------------------------------------ 11 files changed, 2 insertions(+), 277 deletions(-) delete mode 100644 test/pacman/tests/sync301.py delete mode 100644 test/pacman/tests/sync302.py delete mode 100644 test/pacman/tests/sync303.py delete mode 100644 test/pacman/tests/sync304.py delete mode 100644 test/pacman/tests/sync305.py diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 3913292..a9c5db3 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -93,15 +93,6 @@ Options Instructs pacman to ignore any upgrades for this package when performing a '\--sysupgrade'. Shell-style glob patterns are allowed. -*SyncFirst =* package ...:: - Instructs pacman to check for newer version of these packages before any - sync operation. The user will have the choice to either cancel the current - operation and upgrade these packages first or go on with the current - operation. This option is typically used with the 'pacman' package. - *NOTE*: when a `SyncFirst` transaction takes place, no command line flags - (e.g. '\--force') are honored. If this is not ideal, disabling `SyncFirst` - and performing a manual sync of the involved packages may be required. - *IgnoreGroup =* group ...:: Instructs pacman to ignore any upgrades for all packages in this group when performing a '\--sysupgrade'. Shell-style glob patterns are diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 7f9db1b..4c72724 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -15,8 +15,6 @@ #LogFile = @localstatedir@/log/pacman.log #GPGDir = @sysconfdir@/pacman.d/gnupg/ HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = pacman #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled diff --git a/src/pacman/conf.c b/src/pacman/conf.c index bfa8cad..e03df36 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -71,7 +71,6 @@ int config_free(config_t *oldconfig) alpm_list_free(oldconfig->explicit_removes); FREELIST(oldconfig->holdpkg); - FREELIST(oldconfig->syncfirst); FREELIST(oldconfig->ignorepkg); FREELIST(oldconfig->ignoregrp); FREELIST(oldconfig->noupgrade); @@ -423,7 +422,7 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "HoldPkg") == 0) { setrepeatingoption(value, "HoldPkg", &(config->holdpkg)); } else if(strcmp(key, "SyncFirst") == 0) { - setrepeatingoption(value, "SyncFirst", &(config->syncfirst)); + /* old option, do nothing */ } else if(strcmp(key, "CacheDir") == 0) { setrepeatingoption(value, "CacheDir", &(config->cachedirs)); } else if(strcmp(key, "Architecture") == 0) { diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 481132f..9b6ab20 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -84,7 +84,6 @@ typedef struct __config_t { /* select -Sc behavior */ unsigned short cleanmethod; alpm_list_t *holdpkg; - alpm_list_t *syncfirst; alpm_list_t *ignorepkg; alpm_list_t *ignoregrp; alpm_list_t *noupgrade; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 700bb78..612cd5f 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -549,26 +549,6 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) return 0; } -static alpm_list_t *syncfirst(void) { - alpm_list_t *i, *res = NULL; - alpm_db_t *db_local = alpm_get_localdb(config->handle); - alpm_list_t *syncdbs = alpm_get_syncdbs(config->handle); - - for(i = config->syncfirst; i; i = alpm_list_next(i)) { - const char *pkgname = i->data; - alpm_pkg_t *pkg = alpm_db_get_pkg(db_local, pkgname); - if(pkg == NULL) { - continue; - } - - if(alpm_sync_newversion(pkg, syncdbs)) { - res = alpm_list_add(res, strdup(pkgname)); - } - } - - return res; -} - static alpm_db_t *get_db(const char *dbname) { alpm_list_t *i; @@ -959,40 +939,7 @@ int pacman_sync(alpm_list_t *targets) } } - alpm_list_t *targs = alpm_list_strdup(targets); - if(!config->op_s_downloadonly && !config->print) { - /* check for newer versions of packages to be upgraded first */ - alpm_list_t *packages = syncfirst(); - if(packages) { - /* Do not ask user if all the -S targets are SyncFirst packages, see FS#15810 */ - alpm_list_t *tmp = NULL; - if(config->op_s_upgrade || (tmp = alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) { - alpm_list_free(tmp); - printf(_(":: The following packages should be upgraded first :\n")); - list_display(" ", packages); - if(yesno(_(":: Do you want to cancel the current operation\n" - ":: and upgrade these packages now?"))) { - FREELIST(targs); - targs = packages; - config->flags = 0; - config->flags |= ALPM_TRANS_FLAG_RECURSE; - config->flags |= ALPM_TRANS_FLAG_NEEDED; - config->op_s_upgrade = 0; - } else { - FREELIST(packages); - } - printf("\n"); - } else { - pm_printf(ALPM_LOG_DEBUG, "skipping SyncFirst dialog\n"); - FREELIST(packages); - } - } - } - - int ret = sync_trans(targs); - FREELIST(targs); - - return ret; + return sync_trans(targets); } /* vim: set ts=2 sw=2 noet: */ diff --git a/test/pacman/README b/test/pacman/README index a3c36fc..ae3303a 100644 --- a/test/pacman/README +++ b/test/pacman/README @@ -108,7 +108,6 @@ is not necessarily complete: - HoldPkg - IgnorePkg - IgnoreGroup - - SyncFirst - NoExtract - NoUpgrade - XferCommand diff --git a/test/pacman/tests/sync301.py b/test/pacman/tests/sync301.py deleted file mode 100644 index 96402fc..0000000 --- a/test/pacman/tests/sync301.py +++ /dev/null @@ -1,27 +0,0 @@ -self.description = "Sysupgrade : pacman needs to be upgraded and has new deps" - -sp = pmpkg("pacman", "1.0-2") -sp.depends = ["dep"] -self.addpkg2db("sync", sp) - -spdep = pmpkg("dep") -self.addpkg2db("sync", spdep) - -sp1 = pmpkg("pkg1", "1.0-2") -self.addpkg2db("sync", sp1) - -lp = pmpkg("pacman", "1.0-1") -self.addpkg2db("local", lp) - -lp1 = pmpkg("pkg1", "1.0-1") -self.addpkg2db("local", lp1) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") -self.addrule("PKG_VERSION=pacman|1.0-2") -self.addrule("PKG_VERSION=pkg1|1.0-1") -self.addrule("PKG_EXIST=dep") diff --git a/test/pacman/tests/sync302.py b/test/pacman/tests/sync302.py deleted file mode 100644 index b44aaed..0000000 --- a/test/pacman/tests/sync302.py +++ /dev/null @@ -1,49 +0,0 @@ -self.description = "Sysupgrade : pacman needs to be upgraded and has updated deps" - -sp = pmpkg("pacman", "1.0-2") -sp.depends = ["zlib", "curl", "libarchive"] -self.addpkg2db("sync", sp) - -libcdep = pmpkg("glibc", "2.15-1") -self.addpkg2db("sync", libcdep) - -curldep = pmpkg("curl", "7.22-1") -self.addpkg2db("sync", curldep) - -libadep = pmpkg("libarchive", "2.8.5-1") -self.addpkg2db("sync", libadep) - -zlibdep = pmpkg("zlib", "1.2.5-3") -zlibdep.depends = ["glibc"] -self.addpkg2db("sync", zlibdep) - - -lp = pmpkg("pacman", "1.0-1") -self.addpkg2db("local", lp) - -lp1 = pmpkg("curl", "7.21.7-1") -self.addpkg2db("local", lp1) - -lp2 = pmpkg("glibc", "2.13-1") -self.addpkg2db("local", lp2) - -lp3 = pmpkg("libarchive", "2.8.4-1") -self.addpkg2db("local", lp3) - -lp4 = pmpkg("zlib", "1.2.5-3") -self.addpkg2db("local", lp4) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") -self.addrule("PKG_VERSION=pacman|1.0-2") -self.addrule("PKG_EXIST=glibc") -self.addrule("PKG_VERSION=glibc|2.15-1") -self.addrule("PKG_EXIST=curl") -self.addrule("PKG_VERSION=curl|7.22-1") -self.addrule("PKG_EXIST=libarchive") -self.addrule("PKG_VERSION=libarchive|2.8.5-1") -self.addrule("PKG_EXIST=zlib") diff --git a/test/pacman/tests/sync303.py b/test/pacman/tests/sync303.py deleted file mode 100644 index b717dd2..0000000 --- a/test/pacman/tests/sync303.py +++ /dev/null @@ -1,38 +0,0 @@ -self.description = "Sysupgrade: upgrade pacman with deps as provisions" - -sp = pmpkg("pacman", "1.0-2") -sp.depends = ["zlib"] -self.addpkg2db("sync", sp) - -glibcdep = pmpkg("glibc", "2.13-1") -self.addpkg2db("sync", glibcdep) - -zlibdep = pmpkg("zlib", "1.2.5-3") -zlibdep.depends = ["glibc"] -self.addpkg2db("sync", zlibdep) - - -lp = pmpkg("pacman", "1.0-1") -lp.depends = ["zlib"] -self.addpkg2db("local", lp) - -lp2 = pmpkg("glibc-awesome", "2.13-2") -lp2.provides = ["glibc=2.13"] -lp2.conflicts = ["glibc"] -self.addpkg2db("local", lp2) - -lp3 = pmpkg("zlib", "1.2.5-3") -self.addpkg2db("local", lp3) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") -self.addrule("PKG_VERSION=pacman|1.0-2") -self.addrule("PKG_EXIST=glibc-awesome") -self.addrule("PKG_VERSION=glibc-awesome|2.13-2") -self.addrule("PKG_EXIST=zlib") - -self.expectfailure = True diff --git a/test/pacman/tests/sync304.py b/test/pacman/tests/sync304.py deleted file mode 100644 index 4ac1a01..0000000 --- a/test/pacman/tests/sync304.py +++ /dev/null @@ -1,27 +0,0 @@ -self.description = "Sysupgrade: upgrade pacman being depended on" - -sp = pmpkg("pacman", "4.0.1-1") -self.addpkg2db("sync", sp) - -sp2 = pmpkg("pyalpm", "2-1") -sp2.depends = ["pacman>=4.0", "pacman<4.1"] -self.addpkg2db("sync", sp2) - -lp = pmpkg("pacman", "3.5.4-1") -self.addpkg2db("local", lp) - -lp2 = pmpkg("pyalpm", "1-1") -lp2.depends = ["pacman>=3.5", "pacman<3.6"] -self.addpkg2db("local", lp2) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" - -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") -self.addrule("PKG_VERSION=pacman|4.0.1-1") -self.addrule("PKG_EXIST=pyalpm") -self.addrule("PKG_VERSION=pyalpm|2-1") - -self.expectfailure = True diff --git a/test/pacman/tests/sync305.py b/test/pacman/tests/sync305.py deleted file mode 100644 index 24fcee4..0000000 --- a/test/pacman/tests/sync305.py +++ /dev/null @@ -1,67 +0,0 @@ -self.description = "Sysupgrade: syncfirst with recursive/cascading deps" - -sp = pmpkg("pacman", "4.0.1-2") -sp.depends = ["glibc>=2.15", "curl"] -self.addpkg2db("sync", sp) - -glibcdep = pmpkg("glibc", "2.15-1") -self.addpkg2db("sync", glibcdep) - -gcldep = pmpkg("gcc-libs", "4.6.2-5") -gcldep.depends = ["glibc>=2.14"] -self.addpkg2db("sync", gcldep) - -curldep = pmpkg("curl", "7.23.1-2") -curldep.depends = ["openssl"] -self.addpkg2db("sync", curldep) - -openssldep = pmpkg("openssl", "1.0.0.e-1") -openssldep.depends = ["perl"] -self.addpkg2db("sync", openssldep) - -gccdep = pmpkg("gcc", "4.6.2-5") -gccdep.depends = ["gcc-libs=4.6.2-5"] -self.addpkg2db("sync", gccdep) - -perldep = pmpkg("perl", "5.14.2-5") -perldep.depends = ["db"] -self.addpkg2db("sync", perldep) - -dbdep = pmpkg("db", "5.2.36-2") -dbdep.depends = ["gcc-libs"] -self.addpkg2db("sync", dbdep) - - -lp = pmpkg("pacman", "4.0.1-1") -lp.depends = ["glibc>=2.14", "curl"] -self.addpkg2db("local", lp) - -lp2 = pmpkg("glibc", "2.14-2") -self.addpkg2db("local", lp2) - -lp3 = pmpkg("curl", "7.23.1-2") -self.addpkg2db("local", lp3) - -lp4 = pmpkg("gcc-libs", "4.6.2-3") -self.addpkg2db("local", lp4) - -lp5 = pmpkg("gcc", "4.6.2-3") -lp5.depends = ["gcc-libs=4.6.2-3"] -self.addpkg2db("local", lp5) - -lp6 = pmpkg("perl", "5.14.2-5") -lp6.depends = ["db"] -self.addpkg2db("local", lp6) - -lp7 = pmpkg("db", "5.2.36-2") -lp7.depends = ["gcc-libs"] -self.addpkg2db("local", lp7) - -self.option["SyncFirst"] = ["pacman"] - -self.args = "-Su" -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pacman") -self.addrule("PKG_VERSION=pacman|4.0.1-2") - -self.expectfailure = True -- 1.7.9

7 6

[pacman-dev] SyncFirst
by Allan McRae 16 Feb '12

16 Feb '12

I was thinking about SyncFirst today and decided we need a good summary of what the issues are and why the current and old implementations fail. Why the current (pacman-4.0) implementation fails: When a package in SyncFirst is to be updated, pacman will update that first and pull everything in its dependency tree that needs updated. If a package not being updated has a strict versioned dependency on a package that is being updated, this results in an error. e.g. :: The following packages should be upgraded first : pacman :: Do you want to cancel the current operation :: and upgrade these packages now? [Y/n] resolving dependencies... looking for inter-conflicts... error: failed to prepare transaction (could not satisfy dependencies) :: gcc: requires gcc-libs=4.6.2-6 Here pacman tries to pull the gcc-libs update as a dependency of the SyncFirst package (pacman). gcc requires a specific version of gcc-libs so this update fails. Q. If this does not involve provides, why has this only been reported with multilib? A. multilib users are stupid. Why the old (pacman-3.5) implementation fails: The SyncFirst packages are updated on their own and only the dependencies it explicitly requires. This can cause failures as if an update of a dependency is not pulled and the package in SyncFirst really needs those updates too. e.g. issues that occurred when pacman was updated and glibc was not but pacman required symbols in the newer glibc. This can be partly worked around by using versioned dependencies, but that can lead to the same issue. e.g. if a new pacman release is made just after gcc-4.7 is released and we add a versioned dep on gcc-libs>=4.7, we end in exactly the same situation as current. So how could we fix this? Here is my proposal... It may be impossible to implement: Firstly, do not split then stop the transaction when hitting a SyncFirst package. Instead do all downloads/conflict checks/dependency checks and then in the first instance install the packages that currently are installed in SyncFirst (i.e. the SyncFirst package and all its deps that need updated) ignoring dependency issues and then - without stopping - install the rest of update. Would that be possible? Allan

1 0

[pacman-dev] [PATCH] Fix typo in help message
by Eric Bélanger 16 Feb '12

16 Feb '12

Close FS#28434 Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- contrib/pacsysclean.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/pacsysclean.in b/contrib/pacsysclean.in index 17f7681..28c1493 100755 --- a/contrib/pacsysclean.in +++ b/contrib/pacsysclean.in @@ -13,7 +13,7 @@ usage() { echo "Usage: $myname [options]" echo echo "Options:" - echo " -o <options> Specify custom pacman query options (e.g., dt)" + echo " -o <options> Specify custom pacman query options (e.g., -dt)" echo " -h, --help Show this help message and exit" } -- 1.7.9.1

2 2

[pacman-dev] [PATCH] pacsysclean: Fix script description and accept -o option without hyphen
by Eric Bélanger 16 Feb '12

16 Feb '12

Close FS#28434 Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- contrib/pacsysclean.in | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/pacsysclean.in b/contrib/pacsysclean.in index 17f7681..162530e 100755 --- a/contrib/pacsysclean.in +++ b/contrib/pacsysclean.in @@ -1,6 +1,6 @@ #!/bin/bash -# pacsysclean - Sort installed packages by decreasing installed size. Useful for system clean-up. +# pacsysclean - Sort installed packages by increasing installed size. Useful for system clean-up. declare -r myname='pacsysclean' declare -r myver='@PACKAGE_VERSION@' @@ -8,7 +8,7 @@ declare -r myver='@PACKAGE_VERSION@' PACMAN_OPTS= usage() { - echo "$myname - Sort installed packages by decreasing installed size." + echo "$myname - Sort installed packages by increasing installed size." echo echo "Usage: $myname [options]" echo @@ -35,6 +35,9 @@ fi IFS=$'\n' name="^Name.*: (.*)$" size="^Installed Size.*: (.*) KiB$" + +[[ $PACMAN_OPTS != -* ]] && PACMAN_OPTS="-$PACMAN_OPTS" + for line in $(LANG=C pacman -Qi $PACMAN_OPTS); do if [[ $line =~ $name ]]; then printf "%s\t" ${BASH_REMATCH[1]} -- 1.7.9.1

1 0

[pacman-dev] [PATCH 1/3] makepkg: restrict usage of errexit to user functions
by Dave Reisner 16 Feb '12

16 Feb '12

It's expected that this will lead to unwanted behavior, and needs widespread testing. It's desirable to commit this for a few reasons: - there's no reason we can't do our own error checking for code that we write. - it avoids the need for ||true hacks scattered about in the code. - it makes us immune to upstream changes in exit codes (FS#28248) Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Allan, just making sure we're on the same page -- this _will_ cause breakage, and the next patch in this series addresses one specific case. I figure getting this patch in now gives us "ample time" to uncover and fix all these before the next release. scripts/makepkg.sh.in | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f0a2252..61c95af 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # # makepkg - make packages compatible for use with pacman # @configure_input@ @@ -430,13 +430,10 @@ run_pacman() { check_deps() { (( $# > 0 )) || return 0 - # Disable error trap in pacman subshell call as this breaks bash-3.2 compatibility - # Also, a non-zero return value is not unexpected and we are manually dealing them - set +E local ret=0 local pmout - pmout=$(run_pacman -T "$@") || ret=$? - set -E + pmout=$(run_pacman -T "$@") + ret=$? if (( ret == 127 )); then #unresolved deps echo "$pmout" @@ -469,13 +466,7 @@ handle_deps() { fi # we might need the new system environment - # avoid triggering the ERR trap and exiting - set +e - local restoretrap=$(trap -p ERR) - trap - ERR source /etc/profile &>/dev/null - eval $restoretrap - set -e return $R_DEPS_SATISFIED } @@ -867,6 +858,23 @@ error_function() { exit 2 # $E_BUILD_FAILED } +run_function_safe() { + local restoretrap + + set -e + set -E + + restoretrap=$(trap -p ERR) + trap 'error_function $pkgfunc' ERR + + run_function "$1" + + eval $restoretrap + + set +E + set +e +} + run_function() { if [[ -z $1 ]]; then return 1 @@ -892,7 +900,6 @@ run_function() { local shellopts=$(shopt -p) local ret=0 - local restoretrap if (( LOGGING )); then local fullver=$(get_full_version) local BUILDLOG="${startdir}/${pkgbase}-${fullver}-${CARCH}-$pkgfunc.log" @@ -914,18 +921,12 @@ run_function() { tee "$BUILDLOG" < "$logpipe" & local teepid=$! - restoretrap=$(trap -p ERR) - trap 'error_function $pkgfunc' ERR $pkgfunc &>"$logpipe" - eval $restoretrap wait $teepid rm "$logpipe" else - restoretrap=$(trap -p ERR) - trap 'error_function $pkgfunc' ERR $pkgfunc 2>&1 - eval $restoretrap fi # reset our shell options eval "$shellopts" @@ -943,11 +944,11 @@ run_build() { [[ -d /usr/lib/ccache/bin ]] && export PATH="/usr/lib/ccache/bin:$PATH" fi - run_function "build" + run_function_safe "build" } run_check() { - run_function "check" + run_function_safe "check" } run_package() { @@ -958,7 +959,7 @@ run_package() { pkgfunc="package_$1" fi - run_function "$pkgfunc" + run_function_safe "$pkgfunc" } tidy_install() { @@ -1973,8 +1974,6 @@ for signal in TERM HUP QUIT; do trap "trap_exit \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal" done trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT -trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR -set -E # preserve environment variables and canonicalize path [[ -n ${PKGDEST} ]] && _PKGDEST=$(canonicalize_path ${PKGDEST}) -- 1.7.9

2 7

[pacman-dev] Move package to cache when installed with -U
by jjacky 15 Feb '12

15 Feb '12

Hey, So I would be interested in such a feature, and I found it being rejected as FS#15143, but I have some questions. It seems the main reason it was rejected was this: " My second argument against this is that users sometimes do local rebuild of official packages, and maybe don't want to mix these packages with official ones in the cache (which could cause integrity check failures next time they upgrade their system). " And I don't understand. Why/how would there be an integrity check failure on upgrade ? I thought integrity check meant that the package(s) about to be installed was being checked. So, during an upgrade, there would be no reason to check this already installed package, no? And if there was an update available, it's the integrity of the newly downloaded package that would be checked, and it would have no reason to fail. What am I not understanding/misunderstanding here? Because I do like this idea and, unless there is an inherent problem with it of course, I might be interested into looking to make a patch to add such an option. Thanks, -jacky Ref: https://bugs.archlinux.org/task/15143

2 4

[pacman-dev] [PATCH 1/2] Revert "Enable recursive/needed sync on SyncFirst"
by Dan McGee 15 Feb '12

15 Feb '12

This reverts commit 09034520325efcc2e684f05fa7a99c02bad1f5be. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/sync.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4f10e6b..fcc887a 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -963,8 +963,6 @@ int pacman_sync(alpm_list_t *targets) FREELIST(targs); targs = packages; config->flags = 0; - config->flags |= ALPM_TRANS_FLAG_RECURSE; - config->flags |= ALPM_TRANS_FLAG_NEEDED; config->op_s_upgrade = 0; } else { FREELIST(packages); -- 1.7.9

1 1

[pacman-dev] macros needed when using libalpm
by jjacky 15 Feb '12

15 Feb '12

Hi, Just a quick question, it might be pretty obvious but I'm still relatively new at this, so excuse my "noobness." While working on a little app using libalpm, I wanted to use the download callback. But I had a problem, because the total size would always be zero. I didn't understand why it didn't work, especially since it did for pacman, which seemed to do exactly the same as I did. After investigation, I figured out that this was because I needed to use a macro when compiling, namely: #define _FILE_OFFSET_BITS 64 Apparently one of the things this does is turn off_t (type of both size parameters of the dl callback, among other things) into off64_t. I'm guessing that means one more byte to store the data, and therefore explains why with my "regular" off_t I didn't get the correct values. Thing is, I'm not sure how I was supposed to know that using this macro was required of me in order to get things to work properly, so my questions are: - how was I supposed to know? :) As in, is there any indication or something about this written somewhere that I missed? I did look at the README and such, but couldn't find anything. (and if not, shouldn't there be, maybe?) Or is this just usual/common knowledge or something? - any chance there is/are other such things I need to use for things to work properly? I'm guessing not, but just in case... Thanks, -jacky

2 2

[pacman-dev] [PATCH] scripts: unset CDPATH if cd is used
by Dan McGee 14 Feb '12

14 Feb '12

This wonderful/awful little bash shell variable wrecks havoc on `cd` calls in shell scripts. Unset CDPATH in makepkg where we use `cd` quite heavily. In pacman-optimize, we can move the change directory logic into the bsdtar call so we are left with no usages of `cd` in the script. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 ++ scripts/pacman-optimize.sh.in | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 80bb1c9..5e8687e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -36,6 +36,8 @@ export TEXTDOMAINDIR='@localedir@' # file -i does not work on Mac OSX unless legacy mode is set export COMMAND_MODE='legacy' +# Ensure CDPATH doesn't screw with our cd calls +unset CDPATH myver='@PACKAGE_VERSION@' confdir='@sysconfdir@' diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 47d8814..8a4e722 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -122,8 +122,7 @@ find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old" # step 2: tar it up msg "$(gettext "Tar'ing up %s...")" "$dbroot" -cd "$dbroot" -bsdtar -czf "$workdir/pacman-db.tar.gz" ./ +bsdtar -czf "$workdir/pacman-db.tar.gz" -C "$dbroot" ./ if (( $? )); then rm -rf "$workdir" die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot" -- 1.7.9

2 1

[pacman-dev] [PATCH] makepkg: fix syntax error in remove_deps
by Christoph Vigano 14 Feb '12

14 Feb '12

This fixes a problem that occurs if you tell makepkg to remove installed dependencies (just to be sure) but there are none. As the $ was missing in front of deplist, the check never happened and 'pacman -Rn' was called which obviously failed. Greetings, Christoph Signed-off-by: Christoph Vigano <mail(a)cvigano.de> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f0a2252..e895ec7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -519,7 +519,7 @@ remove_deps() { local deplist deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ <(printf "%s\n" "${current_pkglist[@]}") || true)) - if [[ -z deplist ]]; then + if [[ -z $deplist ]]; then return fi -- 1.7.9

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.2-132-gc7321a7
by dan＠archlinux.org 13 Feb '12

13 Feb '12

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 c7321a7b80aebeacb05ad5ab9d096779403b1758 (commit) via 115c0381c235100d7b05d9751767017a9ee325c4 (commit) via 48d63048f1b6f8e2ce2a3bd3a3fd08997a5562fc (commit) via 991be2867259ee58d43a5005eec466ef2b546af5 (commit) via e530993392dc2ac54e566a45df6c974aa68aaa23 (commit) via 7a3f59cd66a4f70641b863ebaaf52674b921bf3c (commit) via 8741551dc94d506df72b5ae8453bca1e4d50dbab (commit) via 3ba5391839b34823e97574cba2952d732c2729e0 (commit) via 20a16f55b32da071d362c2fa3faf1f55285d13a9 (commit) via b4f5a63e7fee5d04949e290bd63e5f0e94bd211e (commit) via e7bc1e3c9a122e4daeb6dcf23eebdd55711138a5 (commit) via f8ae60bc28644fd46810fbab7d5acf143586dfd4 (commit) via 294f0fdf4df361e0d553eb650e1aacdb83f7bdf5 (commit) via 31432edcbe484a5fca01abff77359061ae813fcc (commit) via 9b1ab3d76713d99a11d8da2204557856d59bd3a5 (commit) via ea32924c626b828b3752c021362a6e0e7f79885c (commit) via 594524146906a2dfe1ea334a90f88aec24d8833a (commit) from f55be4897799c5a6dcb454455ad9edcfc36f8495 (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 c7321a7b80aebeacb05ad5ab9d096779403b1758 Merge: 115c038 b4f5a63 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Feb 13 10:12:39 2012 -0600 Merge branch 'maint' Conflicts: lib/libalpm/sync.c src/util/pactree.c commit 115c0381c235100d7b05d9751767017a9ee325c4 Author: Nathan Phillip Brink <binki(a)gentoo.org> Date: Tue Oct 18 03:42:17 2011 +0000 Use AM_PATH_GPGME macro from gpgme instead of home-built gpgme detection. Fixes compilation on Gentoo, where CPPFLAGS=-I/usr/include/gpgme is necessary. The AC_SYS_LARGEFILE macro call has to be before the GPGME checks, otherwise the GPGME header gives an error about ABI incompatibilities. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 48d63048f1b6f8e2ce2a3bd3a3fd08997a5562fc Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 12 11:59:52 2012 +1000 Add gpgme m4 autoconf macro file Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 991be2867259ee58d43a5005eec466ef2b546af5 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 12 09:50:34 2012 +1000 Do not check for ALPM_ERR_PKG_INVALID_ARCH on remove operation alpm_trans_prepare can not return ALPM_ERR_PKG_INVALID_ARCH on a remove operation so there is no point in checking for it. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e530993392dc2ac54e566a45df6c974aa68aaa23 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 11 16:56:02 2012 +1000 testpkg: set gpgdir Without setting gpgdir, testpkg outputs: warning: Public keyring not found; have you run 'pacman-key --init'? Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7a3f59cd66a4f70641b863ebaaf52674b921bf3c Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 11 16:17:59 2012 +1000 Reset errno before opening archive Set errno to 0 at the start of _alpm_open_archive as it is not set when archive_read_open_fd fails. This can result in _alpm_pkg_load_internal thinking errno == ENOENT and setting the wrong pm_errno. e.g. Before: > testpkg pacman-4.0.1-4-i686.pkg.tar.gz.sig error: could not open file pacman-4.0.1-4-i686.pkg.tar.gz.sig: Unrecognized archive format Cannot find the given file. After: > testpkg pacman-4.0.1-4-i686.pkg.tar.gz.sig error: could not open file pacman-4.0.1-4-i686.pkg.tar.gz.sig: Unrecognized archive format Cannot open the given file. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8741551dc94d506df72b5ae8453bca1e4d50dbab Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 11 15:16:40 2012 +1000 Move ROOTDIR definition into config.h This was the only variable of its kind when a define was done on the compiler command line. Move it into config.h instead. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3ba5391839b34823e97574cba2952d732c2729e0 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Feb 10 16:26:37 2012 +1000 Allow specifying shell for running scriptlets Some distributions insist on using bash specific commands in their install scripts under the assumption that "sh" is a symlink to bash. This can causes issues if (e.g.) their users what to change sh to point at another shell, such as dash, that does not support these features. Add a configure option to explicitly set the shell being used to run install scripts. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20a16f55b32da071d362c2fa3faf1f55285d13a9 Author: Florian Pritz <bluewind(a)xinu.at> Date: Tue Feb 7 18:43:59 2012 +0100 use _alpm_access in a few more places for increased debugging info pacman -U <pkg> returns a bogus "could not find or read package" if the file is on a fuse file system that doesn't allow root access. Debug output isn't very helpful here either so we should log why the access check failed. The other 2 checks already log something when failing so logging a more specific error won't hurt either. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 25 ++++ configure.ac | 65 +++++++-- doc/index.txt | 1 + lib/libalpm/alpm.h | 6 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/po/fr.po | 25 ++-- lib/libalpm/sync.c | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 3 +- m4/gpgme.m4 | 307 +++++++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 13 ++- scripts/po/ca.po | 90 ++++++------- scripts/po/cs.po | 61 ++------ scripts/po/da.po | 35 ++--- scripts/po/de.po | 98 +++++++------- scripts/po/el.po | 89 +++++------- scripts/po/en_GB.po | 7 +- scripts/po/es.po | 71 +++------- scripts/po/fi.po | 217 ++++++++++++++--------------- scripts/po/fr.po | 179 ++++++++++++------------- scripts/po/hu.po | 93 ++++++------- scripts/po/it.po | 90 +++++------- scripts/po/kk.po | 50 ++----- scripts/po/lt.po | 306 ++++++++++++++++++++--------------------- scripts/po/nb.po | 110 +++++++--------- scripts/po/pacman-scripts.pot | 5 +- scripts/po/pl.po | 58 ++------ scripts/po/pt.po | 104 ++++++-------- scripts/po/pt_BR.po | 115 +++++++-------- scripts/po/ro.po | 91 +++++------- scripts/po/ru.po | 57 ++------ scripts/po/sk.po | 96 ++++++------- scripts/po/sr.po | 61 ++------ scripts/po/sr(a)latin.po | 61 ++------ scripts/po/sv.po | 36 ++---- scripts/po/tr.po | 90 +++++------- scripts/po/uk.po | 65 ++------- scripts/po/zh_CN.po | 92 +++++------- scripts/po/zh_TW.po | 7 +- src/pacman/Makefile.am | 1 - src/pacman/pacman.c | 10 +- src/pacman/po/fi.po | 34 +++--- src/pacman/po/fr.po | 61 ++++---- src/pacman/po/hu.po | 6 +- src/pacman/po/it.po | 17 +-- src/pacman/remove.c | 6 - src/pacman/util.c | 2 +- src/util/Makefile.am | 3 +- src/util/pactree.c | 12 +- src/util/testpkg.c | 3 + 51 files changed, 1504 insertions(+), 1538 deletions(-) create mode 100644 m4/gpgme.m4 hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.2-1-gb4f5a63
by dan＠archlinux.org 13 Feb '12

13 Feb '12

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, maint has been updated via b4f5a63e7fee5d04949e290bd63e5f0e94bd211e (commit) from e7bc1e3c9a122e4daeb6dcf23eebdd55711138a5 (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 b4f5a63e7fee5d04949e290bd63e5f0e94bd211e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Feb 13 10:59:26 2012 -0500 lib/sync: use full delta size as max download size The max filesize for a delta download must be the full size of the delta file, not just what's remaining. Fixes FS#28345 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] pacman -R default answer
by Diogo Sousa 13 Feb '12

13 Feb '12

Hello, when removing packages the default answer to "Do you want to remove these packages?" is Yes. Shouldn't we be conservative and provide "no" as the default? Diogo Sousa

4 4

[pacman-dev] [PATCH] fix upgrade first prompt for ignored SyncFirst packages
by Richard Pougnet 13 Feb '12

13 Feb '12

Fix bug 26445: Added a logical AND to line 969 checking to see if the package marked as SyncFirst is also selected to be ignored by the user. modified: src/pacman/sync.c Signed-off-by: Richard Pougnet <richard(a)pougnet.ca> --- src/pacman/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 700bb78..c8902cc 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -966,7 +966,7 @@ int pacman_sync(alpm_list_t *targets) if(packages) { /* Do not ask user if all the -S targets are SyncFirst packages, see FS#15810 */ alpm_list_t *tmp = NULL; - if(config->op_s_upgrade || (tmp = alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) { + if((config->op_s_upgrade || (tmp = alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) && !config->ignorepkg) { alpm_list_free(tmp); printf(_(":: The following packages should be upgraded first :\n")); list_display(" ", packages); -- 1.7.9

1 0

[pacman-dev] [PATCH] lib/sync: use full delta size as max download size
by Dave Reisner 12 Feb '12

12 Feb '12

The max filesize for a delta download must be the full size of the delta file, not just what's remaining. Fixes FS#28345 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 9478829..468438f 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -838,7 +838,7 @@ static int find_dl_candidates(alpm_db_t *repo, alpm_list_t **files, alpm_list_t alpm_delta_t *delta = dlts->data; if(delta->download_size != 0) { struct dload_payload *payload = build_payload( - handle, delta->delta, delta->download_size, repo->servers); + handle, delta->delta, delta->delta_size, repo->servers); ASSERT(payload, return -1); *files = alpm_list_add(*files, payload); } -- 1.7.9

1 0

[pacman-dev] [PATCH] Do not check for ALPM_ERR_PKG_INVALID_ARCH on remove operation
by Allan McRae 11 Feb '12

11 Feb '12

alpm_trans_prepare can not return ALPM_ERR_PKG_INVALID_ARCH on a remove operation so there is no point in checking for it Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/remove.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 96bb537..52d2c7a 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -115,12 +115,6 @@ int pacman_remove(alpm_list_t *targets) pm_printf(ALPM_LOG_ERROR, _("failed to prepare transaction (%s)\n"), alpm_strerror(err)); switch(err) { - case ALPM_ERR_PKG_INVALID_ARCH: - for(i = data; i; i = alpm_list_next(i)) { - const char *pkg = i->data; - printf(_(":: package %s does not have a valid architecture\n"), pkg); - } - break; case ALPM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { alpm_depmissing_t *miss = i->data; -- 1.7.9

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v4.0.2, created. v4.0.2
by dan＠archlinux.org 11 Feb '12

11 Feb '12

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 annotated tag, v4.0.2 has been created at 22217c03bb12a562439f9b7d1a27bea4fe86d079 (tag) tagging e7bc1e3c9a122e4daeb6dcf23eebdd55711138a5 (commit) replaces v4.0.1 tagged by Dan McGee on Sat Feb 11 15:28:37 2012 -0600 - Log ----------------------------------------------------------------- 4.0.2 maint release -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEUEABECAAYFAk823Y0ACgkQXC5GoPU6du29ZgCSAofE43ZJbJbUrGM+lrHjGKRc wACePacvDP1HgEIS8Kv98KN5RxW1Pjw= =0yup -----END PGP SIGNATURE----- Allan McRae (14): Allow comments after repo section header in pacman.conf Prevent rebuild of man pages when using release tarballs makepkg: simplify source archive generation makepkg: fix missing source file detection makepkg: abort on missing download agent Fix missing [removal] output makepkg: fix error on unnecessary -r makepkg: restrict usage of flags passed to pacman makepkg: workaround for zipman issues Fix rare segfault on package removal makepkg: Fix non-writable SRCPKGDEST error message makepkg: deal with mercurial exit codes makepkg: disable extglob when sourcing BUILDSCRIPT pactree: allow comments after repo section header Andrew Gregory (3): makepkg.sh.in - fix remove_deps test for deps to be removed remove.c: make "target not found" error consistent with sync.c makepkg.sh.in - if both -r and -i are provided, only remove makedeps Dan McGee (31): Miscellaneous post-4.0.1 updates Add two new pactests for pacman upgrade behavior _alpm_ldconfig: return value from _alpm_run_chroot Enforce signature download size limit on -U <url> operations repo-add: enforce maximum .sig file size Use correct size in memset Fix bogus string cast in search debug message Search for PGP subkeys in a keyserver-acceptable way Remove useless logger message Update scripts translation catalog Update translations from Transifex Use fileno() in isatty() call doc/vercmp: add note about pkgrel handling Don't remove unknown files in cache cleaning code Remove unused strtoupper() function Use isdigit() rather than character range comparisons repo-add: clean up help messages Update copyright on changed files since beginning of year Add diskspace checking support for Solaris/Illumos contrib/bash_completion: don't print stderr messages Fix sys/mnttab.h header include Make a few more copyright date tweaks Update pot translation catalogs Update translations Add simple integer-only pow() implementation pactest: check return code in some upgrade tests Update translations from Transifex Translation updates from Transifex, mostly scripts Fix a handful of comment typos or misspellings Final pre-release Transifex updates 4.0.2 release updates Dave Reisner (8): makepkg: avoid using comm for diff'ing package lists makepkg.5: fix typo s/tar,bz2/tar.bz2/ contrib/paccache: silence possible output from cd add new pactest for syncfirst with recursive deps fetch_url: look for files in cache before downloading lib/dload: enforce usage of TCP keepalives lib/dload: give uniform naming to curl CB functions scripts: always use printf with embedded gettext Eric Bélanger (1): pacsysclean: Add new contrib script Lukas Fleischer (1): contrib/paclist: Add "--help" command line parameter Mantas Mikulėnas (1): makepkg: add forgotten newline in help output Olivier Brunel (2): Fix broken output when asking question and stdin is piped util.c, rmrf(): only create string when needed Thomas Dziedzic (1): Fix FS#27924: don't display negative zeroes Timothy Redaelli (1): pacman-key: Add missing quotes canyonknight (4): Fix bash completion for *.pkg.tar Fix zsh completion for *.pkg.tar Turn gpg commands into functions in pacman-key Improve exit statuses and error messages in pacman-key ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0