- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/5] Add warning in PKGBUILD manpage about use of $startdir/{src, pkg}
by Sebastien Luttringer 16 Aug '11

16 Aug '11

Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- doc/PKGBUILD.5.txt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index af3a388..eeea4da 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -273,6 +273,8 @@ variables for use during the build and install process: *startdir*:: This contains the absolute path to the directory where the PKGBUILD is located, which is usually the output of `$(pwd)` when makepkg is started. + `$startdir/src` is not guaranteed to be the same as `$srcdir`, and likewise + for `$pkgdir`. *srcdir*:: This contains the directory where makepkg extracts, or copies, all source -- Sebastien "Seblu" Luttringer

8 19

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-21-gbd5ec9c
by dan＠archlinux.org 16 Aug '11

16 Aug '11

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 bd5ec9cd8e23bba4334a7b3a5a73843c3667c085 (commit) via f37c5016572fecb16cc53d5e3fdd059944e36359 (commit) via fa4aad5b509946f947d9b2553d09f5f35be24915 (commit) via f3f39cef84330b734c36a60e48cf26a3f3e1f76c (commit) via 7de92cb2232b2fc40c8fe749da78e8920afa0f1f (commit) via ebb2e36cc4c40d11689a44a2503df40fa96e8fc1 (commit) via 31f2e0cba3281660a2a3ffc6f902a7019cb4699b (commit) via ff88228abde9c288b3e08f5090a1ff3941fdc018 (commit) via 31a7b150b0a7485b9747e7d72416e4257a30140a (commit) via 20b5cc96be546db4e86b2216de3fccaeb7b2a4b2 (commit) via ea79de21d82369e799fcdc6e71b45d9580a75099 (commit) via 71f854dde88c3a5dd479474770e0534af7576267 (commit) via 05f87e0b09429532b68526eba7e92646974f0f30 (commit) via 8d5018e78003689ca1048f0d18a58605b93e3171 (commit) via ce8f91a71b2e5d50fe60baadc0269e6823e8056f (commit) via 6bf60568f8a956c980accdc6ae86c918eee5a881 (commit) via 83f076d3a81e5a625c07fdaf82a5e598a1c75c71 (commit) via 835365b817285abf136fc8509ae9d1bf97f55dff (commit) via c9cc2332cfe59f69ab28b3b928794aa5d24342bc (commit) via 450bcb5d7bbab1c228f02e8010029fed5f751173 (commit) from fffaba50fb6227462d3312b667f55293aa0b9214 (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 bd5ec9cd8e23bba4334a7b3a5a73843c3667c085 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 20:16:42 2011 -0500 Validate the sha256sum if available Adjust load_internal() to check the sha256sum value if we have it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f37c5016572fecb16cc53d5e3fdd059944e36359 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 15 08:14:02 2011 -0500 Show 'None' in Signatures -Qip/-Si output if none found This is to be as consistent as possible across both types of display. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fa4aad5b509946f947d9b2553d09f5f35be24915 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 14 20:47:08 2011 -0500 decode_signature: guess signature data length for efficiency We may end up allocating 1 or 2 extra bytes this way, but it is worth it to simplify the method and not have to call base64_decode() a second time. Use the hueristic that base64 encoding produces 3 bytes of decoded data for every 4 bytes of encoded data. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f3f39cef84330b734c36a60e48cf26a3f3e1f76c Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 20:08:31 2011 -0500 Remove checksum access indirection These items are never present in anything but sync databases, nor do we even try to load them from the local database. Remvoe the indirection meant to allow the caching layer to work since it will never do anything anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7de92cb2232b2fc40c8fe749da78e8920afa0f1f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 12 15:07:22 2011 -0400 lib/sync: reset flag after rejecting a replace This prevents iteration through the remainder of the current tree, with pacman claiming that they're all replacements to the original replacement candidate. :: Synchronizing package databases... allanbrokeit is up to date testing is up to date core is up to date extra is up to date community-testing is up to date community is up to date :: Starting full system upgrade... :: Replace util-linux-git with core/util-linux? [Y/n] n :: Replace util-linux-git with core/vi? [Y/n] n :: Replace util-linux-git with core/vpnc? [Y/n] n :: Replace util-linux-git with core/wget? [Y/n] n :: Replace util-linux-git with core/which? [Y/n] n :: Replace util-linux-git with core/wireless-regdb? [Y/n] n :: Replace util-linux-git with core/wireless_tools? [Y/n] n :: Replace util-linux-git with core/wpa_actiond? [Y/n] n :: Replace util-linux-git with core/wpa_supplicant? [Y/n] n :: Replace util-linux-git with core/xfsprogs? [Y/n] n :: Replace util-linux-git with core/xinetd? [Y/n] n :: Replace util-linux-git with core/xz? [Y/n] n :: Replace util-linux-git with core/zd1211-firmware? [Y/n] n :: Replace util-linux-git with core/zlib? [Y/n] n there is nothing to do Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ebb2e36cc4c40d11689a44a2503df40fa96e8fc1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 20:15:15 2011 -0500 Load and allow access to sha256sum This adds a field in the package struct for this checksum type as well as allowing access via the API to it. The frontend is now able to display any read value. Note that this does not implement any use or verification of the value internally. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 31f2e0cba3281660a2a3ffc6f902a7019cb4699b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 15:46:18 2011 -0500 Add ALPM sha256sum routines These mirror ones we already have for md5sums. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ff88228abde9c288b3e08f5090a1ff3941fdc018 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 15:33:05 2011 -0500 Add sha2 (sha256) routines from PolarSSL Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 31a7b150b0a7485b9747e7d72416e4257a30140a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Aug 13 21:17:59 2011 +1000 repo-add: indicate whether package signature is found When adding a package to a repo, it is useful to be able to see that repo-add has indeed found the signature file. [Dan: update text to be more in line with other messages] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20b5cc96be546db4e86b2216de3fccaeb7b2a4b2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Aug 13 14:40:41 2011 -0400 pacman/package: show presence of signature in in -Si adds a new API method: alpm_pkg_get_base64_sig [Dan: don't use a new header string in frontend] Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ea79de21d82369e799fcdc6e71b45d9580a75099 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 12 23:38:07 2011 -0400 README: update with 3.5.0 -> 4.0.0 API changes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 71f854dde88c3a5dd479474770e0534af7576267 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 12 23:50:21 2011 -0400 makepkg: don't hardcode path to strip Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 05f87e0b09429532b68526eba7e92646974f0f30 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 12 22:50:37 2011 -0400 alpm.h: fix inconsistency in function prototype Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8d5018e78003689ca1048f0d18a58605b93e3171 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 12 21:31:54 2011 -0400 add pactest for replacing a shared provider This is currently expected to fail. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ce8f91a71b2e5d50fe60baadc0269e6823e8056f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 12 16:45:04 2011 -0400 pactest/sync200: check for curl instead of fetch We can't just check for LIBS as curl won't be listed. Instead, look at the length of the LIBCURL var from the Makefile. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6bf60568f8a956c980accdc6ae86c918eee5a881 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 12 15:03:45 2011 -0400 lib/dload: avoid deleting .part file on too-slow xfer Take this opportunity to refactor the if/then/else logic into a switch/case which is likely going to be needed to fine tune more exceptions in the future. Fixes FS#25531 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 83f076d3a81e5a625c07fdaf82a5e598a1c75c71 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 14 20:39:43 2011 -0500 Update base64 PolarSSL code Also adjust our code using it for the size_t adjustments made by upstream. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 835365b817285abf136fc8509ae9d1bf97f55dff Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 15:28:52 2011 -0500 Update MD5 routines with changes from PolarSSL Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c9cc2332cfe59f69ab28b3b928794aa5d24342bc Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 11 19:26:20 2011 -0500 pacman/query.c: avoid variable redeclaration We were using i as the loop variable in both the inner and outer loop. Use j in the inner loop instead for clarity. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 450bcb5d7bbab1c228f02e8010029fed5f751173 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Fri Aug 12 01:38:56 2011 +0800 pactest: -U --recursive Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 75 ++++++++ lib/libalpm/Makefile.am | 3 +- lib/libalpm/alpm.h | 20 ++- lib/libalpm/base64.c | 12 +- lib/libalpm/base64.h | 14 +- lib/libalpm/be_local.c | 7 - lib/libalpm/be_package.c | 21 ++- lib/libalpm/be_sync.c | 3 +- lib/libalpm/dload.c | 34 +++-- lib/libalpm/md5.c | 61 +++---- lib/libalpm/md5.h | 12 +- lib/libalpm/package.c | 22 ++- lib/libalpm/package.h | 4 +- lib/libalpm/sha2.c | 369 +++++++++++++++++++++++++++++++++++++++ lib/libalpm/{md5.h => sha2.h} | 39 +++-- lib/libalpm/signing.c | 25 +-- lib/libalpm/sync.c | 7 +- lib/libalpm/util.c | 99 ++++++++++- lib/libalpm/util.h | 7 +- scripts/makepkg.sh.in | 6 +- scripts/repo-add.sh.in | 1 + src/pacman/package.c | 7 +- src/pacman/query.c | 6 +- test/pacman/tests/Makefile.am | 2 +- test/pacman/tests/replace103.py | 21 +++ test/pacman/tests/sync200.py.in | 2 +- test/pacman/tests/upgrade078.py | 56 ++++++ 27 files changed, 799 insertions(+), 136 deletions(-) create mode 100644 lib/libalpm/sha2.c copy lib/libalpm/{md5.h => sha2.h} (52%) create mode 100644 test/pacman/tests/replace103.py create mode 100644 test/pacman/tests/upgrade078.py hooks/post-receive -- The official pacman repository

3 2

[pacman-dev] [PATCH] repo-add: fix creation of signature symlink
by Allan McRae 16 Aug '11

16 Aug '11

When creating a repo outside the current directory, the signature symlink was not created. Reported-by: Gaetan Bisson <bisson(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index fd0c814..29b150c 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -661,7 +661,7 @@ if (( success )); then ln -s "$target" "$dblink" 2>/dev/null || \ ln "$target" "$dblink" 2>/dev/null || \ cp "$REPO_DB_FILE" "$dblink" - if [[ -f "$target.sig" ]]; then + if [[ -f "$REPO_DB_FILE.sig" ]]; then ln -s "$target.sig" "$dblink.sig" 2>/dev/null || \ ln "$target.sig" "$dblink.sig" 2>/dev/null || \ cp "$REPO_DB_FILE.sig" "$dblink.sig" -- 1.7.6

1 0

[pacman-dev] [PATCH] Further fixes to replacement iteration
by Dan McGee 15 Aug '11

15 Aug '11

A partial fix for this was in commit 7de92cb22, but this should fix the remaining cases. There are still several issues dealing with "provision as replacement" selection however. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/sync.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3e38707..3d58166 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -145,9 +145,9 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) break; } else { /* 2. search for replacers in sdb */ - int found = 0; alpm_list_t *k, *l; for(k = _alpm_db_get_pkgcache(sdb); k; k = k->next) { + int found = 0; spkg = k->data; for(l = alpm_pkg_get_replaces(spkg); l; l = l->next) { alpm_depend_t *replace = l->data; @@ -160,16 +160,15 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) /* check IgnorePkg/IgnoreGroup */ if(_alpm_pkg_should_ignore(handle, spkg) || _alpm_pkg_should_ignore(handle, lpkg)) { - _alpm_log(handle, ALPM_LOG_WARNING, _("ignoring package replacement (%s-%s => %s-%s)\n"), - lpkg->name, lpkg->version, spkg->name, spkg->version); - found = 0; + _alpm_log(handle, ALPM_LOG_WARNING, + _("ignoring package replacement (%s-%s => %s-%s)\n"), + lpkg->name, lpkg->version, spkg->name, spkg->version); continue; } int doreplace = 0; QUESTION(trans, ALPM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, sdb->treename, &doreplace); if(!doreplace) { - found = 0; continue; } @@ -181,7 +180,6 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) if(tpkg->origin_data.db != sdb) { _alpm_log(handle, ALPM_LOG_WARNING, _("cannot replace %s by %s\n"), lpkg->name, spkg->name); - found = 0; continue; } _alpm_log(handle, ALPM_LOG_DEBUG, "appending %s to the removes list of %s\n", @@ -202,10 +200,6 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) } } } - if(found) { - /* jump to next local package */ - break; - } } } } -- 1.7.6

1 0

[pacman-dev] [PATCH] Add short example signature config to pacman.conf
by Dan McGee 15 Aug '11

15 Aug '11

This is similar to what we do with every other option. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- etc/pacman.conf.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 1d49fd7..b9595ef 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -36,6 +36,9 @@ Architecture = auto #CheckSpace #VerbosePkgLists +# PGP signature checking +#SigLevel = Optional + # # REPOSITORIES # - can be defined here or included from another file @@ -60,6 +63,7 @@ Architecture = auto # servers immediately after the header and they will be used before the # default mirrors. #[core] +#SigLevel = Required #Server = ftp://ftp.example.com/foobar/$repo/os/$arch/ # The file referenced here should contain a list of 'Server = ' lines. #Include = @sysconfdir@/pacman.d/mirrorlist @@ -67,5 +71,6 @@ Architecture = auto # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] +#SigLevel = Optional TrustAll #Server = file:///home/custompkgs -- 1.7.6

1 0

[pacman-dev] [PATCH] Only check necessary signatures and checksums
by Dan McGee 15 Aug '11

15 Aug '11

The precedence goes as follows: signature > sha256sum > md5sum Add some logic and helper methods to check what we have available when loading a package, and then only check what is necessary to verify the package. This should speed up sync database verifies as we no longer will be doing both a checksum and a signature validation. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_package.c | 22 +++++++++++++++++----- lib/libalpm/be_sync.c | 2 +- lib/libalpm/db.c | 14 -------------- lib/libalpm/db.h | 1 - lib/libalpm/signing.c | 34 +++++++++++++++++++++++++++------- lib/libalpm/signing.h | 1 + 6 files changed, 46 insertions(+), 28 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 9762cbc..cbc9b36 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -285,8 +285,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, int full, const char *md5sum, const char *sha256sum, const char *base64_sig, alpm_siglevel_t level) { - int ret; - int config = 0; + int ret, skip_checksums, config = 0; struct archive *archive; struct archive_entry *entry; alpm_pkg_t *newpkg = NULL; @@ -311,9 +310,22 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, RET_ERR(handle, ALPM_ERR_PKG_OPEN, NULL); } - /* first steps- validate the package file */ + /* can we get away with skipping checksums? */ + skip_checksums = 0; + if(level & ALPM_SIG_PACKAGE) { + if(base64_sig) { + skip_checksums = 1; + } else { + char *sigpath = _alpm_sigpath(handle, pkgfile); + if(sigpath && !_alpm_access(handle, NULL, sigpath, R_OK)) { + skip_checksums = 1; + } + free(sigpath); + } + } + _alpm_log(handle, ALPM_LOG_DEBUG, "md5sum: %s\n", md5sum); - if(md5sum) { + if(!skip_checksums && md5sum && !sha256sum) { _alpm_log(handle, ALPM_LOG_DEBUG, "checking md5sum for %s\n", pkgfile); if(_alpm_test_checksum(pkgfile, md5sum, ALPM_CSUM_MD5) != 0) { alpm_pkg_free(newpkg); @@ -322,7 +334,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, } _alpm_log(handle, ALPM_LOG_DEBUG, "sha256sum: %s\n", sha256sum); - if(sha256sum) { + if(!skip_checksums && sha256sum) { _alpm_log(handle, ALPM_LOG_DEBUG, "checking sha256sum for %s\n", pkgfile); if(_alpm_test_checksum(pkgfile, sha256sum, ALPM_CSUM_SHA256) != 0) { alpm_pkg_free(newpkg); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 069e39d..d0cabdf 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -192,7 +192,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) if(ret == 0 && (level & ALPM_SIG_DATABASE)) { /* an existing sig file is no good at this point */ - char *sigpath = _alpm_db_sig_path(db); + char *sigpath = _alpm_sigpath(handle, _alpm_db_path(db)); if(!sigpath) { ret = -1; break; diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 9e8e75b..4dbedb9 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -375,20 +375,6 @@ const char *_alpm_db_path(alpm_db_t *db) return db->_path; } -char *_alpm_db_sig_path(alpm_db_t *db) -{ - char *sigpath; - size_t len; - const char *dbfile = _alpm_db_path(db); - if(!db || !dbfile) { - return NULL; - } - len = strlen(dbfile) + strlen(".sig") + 1; - CALLOC(sigpath, len, sizeof(char), RET_ERR(db->handle, ALPM_ERR_MEMORY, NULL)); - sprintf(sigpath, "%s.sig", dbfile); - return sigpath; -} - int _alpm_db_cmp(const void *d1, const void *d2) { alpm_db_t *db1 = (alpm_db_t *)d1; diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index a09c7e2..2938b54 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -80,7 +80,6 @@ struct __alpm_db_t { alpm_db_t *_alpm_db_new(const char *treename, int is_local); void _alpm_db_free(alpm_db_t *db); const char *_alpm_db_path(alpm_db_t *db); -char *_alpm_db_sig_path(alpm_db_t *db); int _alpm_db_cmp(const void *d1, const void *d2); alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles); alpm_db_t *_alpm_db_register_local(alpm_handle_t *handle); diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 7521e3a..cdbdc31 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -186,6 +186,28 @@ error: return 1; } + +/** + * Form a signature path given a file path. + * Caller must free the result. + * @param handle the context handle + * @param path the full path to a file + * @return the path with '.sig' appended, NULL on errors + */ +char *_alpm_sigpath(alpm_handle_t *handle, const char *path) +{ + char *sigpath; + size_t len; + + if(!path) { + return NULL; + } + len = strlen(path) + 5; + CALLOC(sigpath, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); + sprintf(sigpath, "%s.sig", path); + return sigpath; +} + /** * Check the PGP signature for the given file path. * If base64_sig is provided, it will be used as the signature data after @@ -226,13 +248,9 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, result->count = 0; if(!base64_sig) { - size_t len = strlen(path) + 5; - CALLOC(sigpath, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(sigpath, len, "%s.sig", path); - - if(!_alpm_access(handle, NULL, sigpath, R_OK) == 0) { - /* sigcount is 0 */ - } + sigpath = _alpm_sigpath(handle, path); + /* this will just help debugging */ + _alpm_access(handle, NULL, sigpath, R_OK); } if(init_gpgme(handle)) { @@ -274,6 +292,8 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, /* file-based, it is on disk */ sigfile = fopen(sigpath, "rb"); if(sigfile == NULL) { + _alpm_log(handle, ALPM_LOG_DEBUG, "sig path %s could not be opened\n", + sigpath); handle->pm_errno = ALPM_ERR_SIG_MISSING; goto error; } diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index 22f6357..d07057a 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -21,6 +21,7 @@ #include "alpm.h" +char *_alpm_sigpath(alpm_handle_t *handle, const char *path); int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, const char *base64_sig, alpm_sigresult_t *result); int _alpm_check_pgp_helper(alpm_handle_t *handle, const char *path, -- 1.7.6

1 0

[pacman-dev] [PATCH] repo-add: reorganize output messages for clarity
by Dan McGee 15 Aug '11

15 Aug '11

The use of warning once we had already started adding a package was confusing as it broke the standard indent pattern. It was especially bad if adding multiple packages as it wasn't clear what sub-messages applied to which package being added. This should be an output change only from: ==> Adding package '/tmp/sync/netcfg-2.6.7-1-any.pkg.tar.xz' -> Computing checksums... -> Adding package signature... ==> WARNING: An entry for 'netcfg-2.6.7-1' already existed -> Removing existing entry 'netcfg-2.6.7-1'... -> Creating 'desc' db entry... -> Creating 'depends' db entry... to: ==> Adding package '/tmp/sync/netcfg-2.6.7-1-any.pkg.tar.xz' ==> WARNING: An entry for 'netcfg-2.6.7-1' already existed -> Computing checksums... -> Adding package signature... -> Removing existing entry 'netcfg-2.6.7-1'... -> Creating 'desc' db entry... -> Creating 'depends' db entry... Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 85b938a..fd0c814 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -266,29 +266,13 @@ db_write_entry() { esac done< <(bsdtar -xOqf "$pkgfile" .PKGINFO) - csize=$(@SIZECMD@ "$pkgfile") - - # compute checksums - msg2 "$(gettext "Computing checksums...")" - md5sum="$(openssl dgst -md5 "$pkgfile")" - md5sum="${md5sum##* }" - sha256sum="$(openssl dgst -sha256 "$pkgfile")" - sha256sum="${sha256sum##* }" - - # compute base64'd PGP signature - if [[ -f "$pkgfile.sig" ]]; then - msg2 "$(gettext "Adding package signature...")" - pgpsig=$(openssl base64 -in "$pkgfile.sig" | tr -d '\n') - fi - # ensure $pkgname and $pkgver variables were found if [[ -z $pkgname || -z $pkgver ]]; then error "$(gettext "Invalid package file '%s'.")" "$pkgfile" return 1 fi - pushd "$tmpdir/tree" >/dev/null - if [[ -d $pkgname-$pkgver ]]; then + if [[ -d $tmpdir/tree/$pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" else if (( DELTA )); then @@ -300,10 +284,26 @@ db_write_entry() { fi fi + csize=$(@SIZECMD@ "$pkgfile") + + # compute checksums + msg2 "$(gettext "Computing checksums...")" + md5sum="$(openssl dgst -md5 "$pkgfile")" + md5sum="${md5sum##* }" + sha256sum="$(openssl dgst -sha256 "$pkgfile")" + sha256sum="${sha256sum##* }" + + # compute base64'd PGP signature + if [[ -f "$pkgfile.sig" ]]; then + msg2 "$(gettext "Adding package signature...")" + pgpsig=$(openssl base64 -in "$pkgfile.sig" | tr -d '\n') + fi + # remove an existing entry if it exists, ignore failures db_remove_entry "$pkgname" # create package directory + pushd "$tmpdir/tree" >/dev/null mkdir "$pkgname-$pkgver" pushd "$pkgname-$pkgver" >/dev/null -- 1.7.6

1 0

[pacman-dev] [PATCH] lib/dload: avoid deleting .part file on too-slow xfer
by Dave Reisner 14 Aug '11

14 Aug '11

Take this opportunity to refactor the if/then/else logic into a switch/case which is likely going to be needed to fine tune more exceptions in the future. Fixes FS#25531 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/dload.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 6709084..5a63e48 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -306,19 +306,27 @@ static int curl_download_internal(struct dload_payload *payload, curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 1L); /* was it a success? */ - if(handle->curlerr == CURLE_ABORTED_BY_CALLBACK) { - goto cleanup; - } else if(handle->curlerr != CURLE_OK) { - if(!payload->errors_ok) { - handle->pm_errno = ALPM_ERR_LIBCURL; - _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), - payload->filename, hostname, error_buffer); - } else { - _alpm_log(handle, ALPM_LOG_DEBUG, "failed retrieving file '%s' from %s : %s\n", - payload->filename, hostname, error_buffer); - } - unlink(tempfile); - goto cleanup; + switch(handle->curlerr) { + case CURLE_OK: + break; + case CURLE_ABORTED_BY_CALLBACK: + goto cleanup; + case CURLE_OPERATION_TIMEDOUT: + dload_interrupted = 1; + /* fallthrough */ + default: + if(!payload->errors_ok) { + handle->pm_errno = ALPM_ERR_LIBCURL; + _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), + payload->filename, hostname, error_buffer); + if(!dload_interrupted) { + unlink(tempfile); + } + } else { + _alpm_log(handle, ALPM_LOG_DEBUG, "failed retrieving file '%s' from %s : %s\n", + payload->filename, hostname, error_buffer); + } + goto cleanup; } /* retrieve info about the state of the transfer */ -- 1.7.6

2 8

[pacman-dev] ganlu Is Inviting You to Check Out Vizualize.Me
by ganlu via vizualize.me 13 Aug '11

13 Aug '11

1 0

[pacman-dev] [PATCH] repo-add: indicate whether package signature is found
by Allan McRae 13 Aug '11

13 Aug '11

When adding a package to a repo, it is useful to be able to see that repo-add has indeed found the signature file. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 5e08592..2991d30 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -277,6 +277,7 @@ db_write_entry() { # compute base64'd PGP signature if [[ -f "$pkgfile.sig" ]]; then + msg2 "$(gettext "Found package signature file...")" pgpsig=$(openssl base64 -in "$pkgfile.sig" | tr -d '\n') fi -- 1.7.6

1 0