- Pacman-dev - lists.archlinux.org

[pacman-dev] trustdb locking issues and snippets from the apt changelog
by Dan McGee 29 Apr '11

29 Apr '11

Allan and I today, and Denis in the past, noticed some issues with having a shared public key database and locking that gpg wants to do when reading from it. Here is an interesting bit from the apt changelog: apt (0.6.2) experimental; urgency=low * Provide apt-key with a secret keyring and a trustdb, even though we would never use them, because it blows up if it doesn't have them >From what I gather, they don't use the trustdb for the reasons we are seeing; instead it looks like they have another keyring named "trusted.gpg" and go forth with the assumption that everything in there is to be trusted. -Dan

3 5

[pacman-dev] [PATCH 1/2] pacman(8): change "options" to "operation" when referring to -D
by matt mooney 29 Apr '11

29 Apr '11

-D is an operation not an option. Signed-off-by: matt mooney <mfm(a)muteddisk.com> --- doc/pacman.8.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index d1b8a73..6d321dd 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -35,7 +35,7 @@ read from stdin. Operations ---------- *-D, \--database*:: - Modify the package database. This options allows you to modify certain + Modify the package database. This operation allows you to modify certain attributes of the installed packages in pacman's database. At the moment, you can only change the install reason using '\--asdeps' and '\--asexplicit' options. -- 1.7.4.4

2 3

[pacman-dev] pyalpm docs
by Erick Pérez 28 Apr '11

28 Apr '11

Hi: I've been searching for python bindings for alpm and I found this <http://mailman.archlinux.org/pipermail/pacman-dev/2011-April/012896.html> The problem is that I want to use it and I the functions doesn't seems to work. Also I tried pycman scrit and I got some errors. Note: I installed the pyalpm package from AUR I want to use it, but I just simply doesn't know how. I think this comment will fit too to the developers of libalpm, Ok, I can work with the C headers, but I will need a minimal example of how to interface with the lib. Something really simple, like test app, not the pacman code pls Thxs in advance. PS: The reason, I'm trying to make a pacman front-end, but as pacman is already a front-end of libalpm, then I'm trying to make other libalpm front-end. Erick -- El derecho de expresar nuestros pensamientos tiene algún significado tan sólo si somos capaces de tener pensamientos propios. El miedo a la libertad, Erich Fromm

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-150-g9c55227
by dan＠archlinux.org 27 Apr '11

27 Apr '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 9c552272e83905703ad0cbcfc92883ebd1eff6f9 (commit) via 97be2f0e0a0daad2f9058377c7dbee62cc7a8718 (commit) via b7b3fc23869475d3d1729de802935b98594d1677 (commit) via 1d7ad5d24bd7487d70b98197d4dd3477ff75f513 (commit) via 4d63ebe2fbe932412a7b8340af49bf30c8e17a91 (commit) via 1cf79eb8c8c7894d238cd906613dc1cd5b7ced1a (commit) via 2df1534b787a87b4b7e8e4aaa5a9d5c2e3c6e47a (commit) via 225acbbff176e52a88eb6b8030d331a599a7ef06 (commit) via 31e55b8049ed001a993441f3efc8ffebdf360061 (commit) from a7d33d0c36420462b3de5c7e2f8327ddbda2a129 (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 9c552272e83905703ad0cbcfc92883ebd1eff6f9 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 24 11:42:51 2011 -0500 configure: add output showing what libraries will be used Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 97be2f0e0a0daad2f9058377c7dbee62cc7a8718 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Apr 24 11:40:58 2011 -0500 Allow conditional compilation with GPGME This makes it possible to omit usage of -lgpgme, just as we can do for -lcurl and -lcrypto. Thanks to Rémy Oudompheng for an initial stab at this. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b7b3fc23869475d3d1729de802935b98594d1677 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Apr 23 11:39:51 2011 -0500 signing: add more detail to unexpected signature count error Do a quick loop and count of the returned data so we can show how many signatures were parsed and read. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d7ad5d24bd7487d70b98197d4dd3477ff75f513 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 22 15:55:54 2011 -0500 Enhance GPGME debug output Add some lookup functions for nice names for the various types used by the library, and remove some fields that are of little use to us in the debug output. This should make looking at key loading and verification a bit easier, especially in determining what makes up our good and bad criteria. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4d63ebe2fbe932412a7b8340af49bf30c8e17a91 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 23:39:01 2011 -0500 Perform package verification at package load time Both md5sum verification and PGP verification can and should be done at package load time. This allows verification to happen as early as possible for packages provided by filename and loaded in the frontend, and moves more stuff out of sync_commit that doesn't really belong there. This should also set the stage for simplified parallel loading of packages later down the road. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1cf79eb8c8c7894d238cd906613dc1cd5b7ced1a Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 21:57:08 2011 -0500 sync_commit: refactor out validate_deltas More stuff going on in the pre-committing stage that can be in a static method to make things a bit more clear. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2df1534b787a87b4b7e8e4aaa5a9d5c2e3c6e47a Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 21:40:00 2011 -0500 sync_commit: refactor out file downloads This part is almost completely self-contained, except building the list of delta filenames that we use later to check their md5sums. Refactor it into a static method so we can bring most of the code in sync_commit closer to the method name. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 225acbbff176e52a88eb6b8030d331a599a7ef06 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 19:25:44 2011 -0500 Rein in the complexity of the signature type Given that we offer no transparency into the pmpgpsig_t type, we don't really need to expose it outside of the library, and at this point, we don't need it at all. Don't decode anything except when checking signatures. For packages/files not from a sync database, we now just read the signature file directly anyway. Also push the decoding logic down further into the check method so we don't need this hanging out in a less than ideal place. This will make it easier to conditionally compile things down the road. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 31e55b8049ed001a993441f3efc8ffebdf360061 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 19:01:06 2011 -0500 signing: let GPGME handle loading signatures from files Rather than go through all the hassle of doing this ourselves, just let GPGME handle the work by passing it a file handle. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 28 ++++- lib/libalpm/Makefile.am | 6 +- lib/libalpm/alpm.h | 10 +- lib/libalpm/be_package.c | 40 +++++--- lib/libalpm/be_sync.c | 2 +- lib/libalpm/db.c | 23 ---- lib/libalpm/db.h | 3 - lib/libalpm/package.c | 41 +------- lib/libalpm/package.h | 7 +- lib/libalpm/signing.c | 267 +++++++++++++++++++++++++++++++++------------- lib/libalpm/signing.h | 13 +-- lib/libalpm/sync.c | 197 ++++++++++++++++------------------ src/pacman/query.c | 2 +- src/pacman/sync.c | 3 +- src/pacman/upgrade.c | 3 +- src/util/testpkg.c | 3 +- 16 files changed, 362 insertions(+), 286 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.2-2-ge3268d5
by dan＠archlinux.org 27 Apr '11

27 Apr '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, maint has been updated via e3268d5e88308b1b854f5f256cb5fa40ac16ea5b (commit) from 74994faee7ce1681f24a3fc0a108dc4f9b824ffc (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/sk.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 2/2] repo-add: add option to specify a different key to sign
by Denis A. Altoé Falqueto 25 Apr '11

25 Apr '11

There may be some situations when one needs to specify a different key from user's default. The option -k or --signwithkey accepts a key identifier and uses that in the signing command. Signed-off-by: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> --- There was a different version of this patch sent some time ago. For some reason, just the part for makepkg was merged. So, now I'm sending a little better version for repo-add/remove. scripts/repo-add.sh.in | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index cb545f3..7b9e85f 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -66,7 +66,8 @@ usage() { cmd="$(basename $0)" printf "%s (pacman) %s\n\n" "$cmd" "$myver" if [[ $cmd == "repo-add" ]] ; then - printf "$(gettext "Usage: repo-add [-d] [-f] [-q] [-s] [-v] <path-to-db> <package|delta> ...\n")" + printf "$(gettext "Usage: repo-add [-d] [-f] [-q] [-s [-k|--signwithkey key]]\n")" + printf "$(gettext " [-v] <path-to-db> <package|delta> ...\n")" printf "$(gettext "\ repo-add will update a package database by reading a package file.\n\ Multiple packages to add can be specified on the command line.\n\n")" @@ -74,16 +75,18 @@ Multiple packages to add can be specified on the command line.\n\n")" printf "$(gettext " -d, --delta generate and add delta for package update\n")" printf "$(gettext " -f, --files update database's file list\n")" elif [[ $cmd == "repo-remove" ]] ; then - printf "$(gettext "Usage: repo-remove [-q] [-s] [-v] <path-to-db> <packagename|delta> ...\n\n")" + printf "$(gettext "Usage: repo-remove [-q] [-s [-k|--signwithkey key]]\n")" + printf "$(gettext " [-v] <path-to-db> <packagename|delta> ...\n\n")" printf "$(gettext "\ repo-remove will update a package database by removing the package name\n\ specified on the command line from the given repo database. Multiple\n\ packages to remove can be specified on the command line.\n\n")" printf "$(gettext "Options:\n")" fi - printf "$(gettext " -q, --quiet minimize output\n")" - printf "$(gettext " -s, --sign sign database with GnuPG after update\n")" - printf "$(gettext " -v, --verify verify database's signature before update\n")" + printf "$(gettext " -q, --quiet minimize output\n")" + printf "$(gettext " -s, --sign sign database with GnuPG after update\n")" + printf "$(gettext " -k, --signwithkey <key> use the specified key to sign the repository\n")" + printf "$(gettext " -v, --verify verify database's signature before update\n")" printf "$(gettext "\n\ See %s(8) for more details and descriptions of the available options.\n\n")" $cmd if [[ $cmd == "repo-add" ]] ; then @@ -204,7 +207,13 @@ create_signature() { error "$(gettext "Cannot find the gpg binary! Is gnupg installed?")" exit 1 # $E_MISSING_PROGRAM fi - gpg --detach-sign --use-agent "$dbfile" || ret=$? + + # Check if SIGNKEY is valid. + local SIGNWITHKEY="" + if [[ "${SIGNKEY}" ]]; then + SIGNWITHKEY="-u ${SIGNKEY}" + fi + gpg --detach-sign ${SIGNWITHKEY} "$dbfile" || ret=$? if (( ! ret )); then msg2 "$(gettext "Created signature file %s.")" "$dbfile.sig" else @@ -226,7 +235,7 @@ verify_signature() { warning "$(gettext "No existing signature found, skipping verification.")" return fi - gpg --verify "$dbfile.sig" || ret=$? + gpg --verify "$dbfile.sig" &>/dev/null || ret=$? if (( ! ret )); then msg2 "$(gettext "Database signature file verified.")" else @@ -542,12 +551,22 @@ trap 'trap_exit "$(gettext "An unknown error has occured. Exiting...")"' ERR success=0 # parse arguments -for arg in "$@"; do +while [[ $# > 0 ]]; do + arg="$1" case "$arg" in -q|--quiet) QUIET=1;; -d|--delta) DELTA=1;; -f|--files) WITHFILES=1;; -s|--sign) SIGN=1;; + -k|--signwithkey) + shift + SIGNKEY="$1" + # Check if key exists, to stop as early as possible + if ! gpg --list-key "${SIGNKEY}" &>/dev/null; then + error "$(gettext "The key ${SIGNKEY} doesnn't exist.")" + exit 1 + fi + ;; -v|--verify) VERIFY=1;; *) if [[ -z $REPO_DB_FILE ]]; then @@ -562,6 +581,7 @@ for arg in "$@"; do fi ;; esac + shift done # if at least one operation was a success, re-zip database -- 1.7.4.2

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-141-ga7d33d0
by dan＠archlinux.org 24 Apr '11

24 Apr '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 a7d33d0c36420462b3de5c7e2f8327ddbda2a129 (commit) via 1cb1b0a52c3c815f448af9ca80bd38f550f5b7ca (commit) via 036f98575c1b57782db51c82b521d53ba1da99a1 (commit) via fade60088e158c042e3a3a2c135fa067016998af (commit) via 59da64146d824026a958a139e0d3e0600f9bdcf7 (commit) via 2eab4ab0333df4d5d24637a2e2e32091d78decc6 (commit) via 8b34aa50b9111b5c7e26b9841ad6f0cc5c38887f (commit) via 9579879b1bb1a033e846b750769215b7b4066073 (commit) via 204bbc47149c948b680735a933fa395ce3983f38 (commit) via 934e8c79afcb0df8b750322c5e87d77203d9f1fe (commit) via e3268d5e88308b1b854f5f256cb5fa40ac16ea5b (commit) via 74994faee7ce1681f24a3fc0a108dc4f9b824ffc (commit) from e39c104d13bfb6e2c055c2af3eee41bfa603b13b (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 a7d33d0c36420462b3de5c7e2f8327ddbda2a129 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 24 21:17:03 2011 +1000 repo-add: update copyright message Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1cb1b0a52c3c815f448af9ca80bd38f550f5b7ca Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 24 21:03:21 2011 +1000 repo-add: document -k option Also unify the usage output with that given by repo-add itself. Dan: use 'options', not 'option(s)'. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 036f98575c1b57782db51c82b521d53ba1da99a1 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 24 20:56:59 2011 +1000 repo-add: check for gpg early Check for the presence of gpg as soon as we know we need it. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fade60088e158c042e3a3a2c135fa067016998af Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 24 20:51:53 2011 +1000 repo-add: check for valid key when signing is requested Follow the example of makepkg Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 59da64146d824026a958a139e0d3e0600f9bdcf7 Author: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> Date: Sun Apr 24 20:48:08 2011 +1000 repo-add: add option to specify a different key to sign with Add -k/--key option to specify a non-default key for signing a package database. Original-patch-by: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2eab4ab0333df4d5d24637a2e2e32091d78decc6 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 24 17:36:21 2011 +1000 repo-add: simplify usage message Listing every option on the usage line becomes unweildly as more options get added so simplify it. Also, provide a standard package name in the repo-add example. Dan: just use 'options' as we use elsewhere, not 'option(s)'. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8b34aa50b9111b5c7e26b9841ad6f0cc5c38887f Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 19:51:51 2011 -0500 Make dump_pkg_full a little less insane The various "level" values were a bit crazy to decipher, and we were doing some very interesting comparisons in certain places. Break it out into two parameters instead so we can seperate the type from the extra information display, and do things accordingly. Nothing changes with the display of any of the five types we currently show: -Si, -Sii, -Qi, -Qii, -Qip. Something to note- we should expose the PKG_FROM enum type somehow, this patch leaves the door open to do that quite easily. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9579879b1bb1a033e846b750769215b7b4066073 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 18:31:19 2011 -0500 libalpm/dload: major refactor of signature downloading There's a lot of related moving parts here: * Iteration through mirrors is moved back to the calling functions. This allows removal of _alpm_download_single_file and _alpm_download_files. * The download function gets a few more arguments to influence behavior. This allows several different scenarios to customize behavior: - database - database signature (req'd and optional) - package - package via direct URL - package signature via direct URL (req'd and optional) * For databases, we need signatures from the same mirror, so structure the code accordingly. Some-inspiration-from: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 204bbc47149c948b680735a933fa395ce3983f38 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 17:24:04 2011 -0500 libalpm/dload: add allow_resume and reorder error checks The allow_resume is the start of the fix to the "don't ever resume database downloads" problem, as well as being useful for '.sig' downloads as well. For now, we say "always allow resume", but this will eventually get pushed down as necessary. Error checks are reworked in order to correctly error out when a file is not found on the remote end and reports 0 bytes downloaded. In addition, the two error messages printed are now different as one reports a more specific error message provided via the cURL error buffer. Some example output from an -Sy run with [testing], [community], [community2], [eee], and [nonexistant] defined as repos. [community2] and [nonexistant] are both invalid, one using FTP and one using HTTP. :: Synchronizing package databases... testing is up to date community is up to date error: failed retrieving file 'community2.db' from ftp.archlinux.org : Given file does not exist error: failed to update community2 (FTP: couldn't retrieve (RETR failed) the specified file) eee is up to date error: failed retrieving file 'nonexistant.db' from code.toofishes.net : The requested URL returned error: 404 error: failed to update nonexistant (HTTP response code said error) Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 934e8c79afcb0df8b750322c5e87d77203d9f1fe Merge: e39c104 e3268d5 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 22 17:08:12 2011 -0500 Merge branch 'maint' commit e3268d5e88308b1b854f5f256cb5fa40ac16ea5b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 22 17:07:58 2011 -0500 Small translation update from Transifex Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 14 +++-- doc/repo-add.8.txt | 9 +++- lib/libalpm/alpm.h | 4 +- lib/libalpm/be_sync.c | 88 +++++++++++++------------------- lib/libalpm/dload.c | 131 +++++++++++++++++++----------------------------- lib/libalpm/dload.h | 8 +-- lib/libalpm/sync.c | 25 ++++++++- po/sk.po | 4 +- scripts/repo-add.sh.in | 83 ++++++++++++++++++++---------- src/pacman/package.c | 50 +++++++----------- src/pacman/package.h | 10 +++- src/pacman/query.c | 5 +- src/pacman/sync.c | 7 ++- 13 files changed, 220 insertions(+), 218 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/6] repo-add: complete package signing work
by Allan McRae 24 Apr '11

24 Apr '11

With these patches, I beleive the package signing work for repo-add is feature complete and all documentation provided. Allan McRae (5): repo-add: simplify usage message repo-add: check for valid key when signing is requested repo-add: check for gpg early repo-add: document -k option repo-add: update copyright message Denis A. Altoé Falqueto (1): repo-add: add option to specify a different key to sign with doc/repo-add.8.txt | 9 ++++- scripts/repo-add.sh.in | 83 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 63 insertions(+), 29 deletions(-) -- 1.7.4.4

2 8

[pacman-dev] [PATCH 1/4] be_sync: use _alpm_db_get_sigverify_level()
by Dan McGee 24 Apr '11

24 Apr '11

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_sync.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 11e2807..d484185 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -84,6 +84,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) size_t len; int ret; mode_t oldmask; + pgp_verify_t check_sig; ALPM_LOG_FUNC; @@ -136,8 +137,10 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) goto cleanup; } + check_sig = _alpm_db_get_sigverify_level(db); + /* Download and check the signature of the database if needed */ - if(db->pgp_verify != PM_PGP_VERIFY_NEVER) { + if(check_sig != PM_PGP_VERIFY_NEVER) { char *sigfile, *sigfilepath; int sigret; @@ -155,7 +158,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) sigret = _alpm_download_single_file(sigfile, db->servers, syncpath, 0); free(sigfile); - if(sigret == -1 && db->pgp_verify == PM_PGP_VERIFY_ALWAYS) { + if(sigret == -1 && check_sig == PM_PGP_VERIFY_ALWAYS) { _alpm_log(PM_LOG_ERROR, _("Failed to download signature for db: %s\n"), alpm_strerrorlast()); pm_errno = PM_ERR_SIG_INVALID; @@ -164,8 +167,8 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) } sigret = alpm_db_check_pgp_signature(db); - if((db->pgp_verify == PM_PGP_VERIFY_ALWAYS && sigret != 0) || - (db->pgp_verify == PM_PGP_VERIFY_OPTIONAL && sigret == 1)) { + if((check_sig == PM_PGP_VERIFY_ALWAYS && sigret != 0) || + (check_sig == PM_PGP_VERIFY_OPTIONAL && sigret == 1)) { /* pm_errno was set by the checking code */ /* TODO: should we just leave the unverified database */ ret = -1; -- 1.7.4.4

2 4

[pacman-dev] [PATCH] makepkg: parallelize integrity checks
by Dan McGee 23 Apr '11

23 Apr '11

This enables parallel integrity checks in makepkg within a given family of integrity sums. Subshell jobs for each source file are kicked off and run in parallel, and then we wait for each of them in turn to complete and print the same information as before. Note that programming sense says this loop should be done differently for filesystem access reasons; doing all checks for a given file would make more sense rather than running through the filelist multiple times. However, that would be a very different patch than what this is trying to accomplish. On a completely suited for the task PKGBUILD containing md5sums ans sha256sums of several large data files, as well as a failing integrity check so, this brings execution time way down: $ time makepkg -f 2>/dev/null real 0m7.924s user 0m7.293s sys 0m0.480s $ time ~/projects/pacman/scripts/makepkg -f 2>/dev/null real 0m2.447s user 0m7.470s sys 0m0.537s Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Said PKGBUILD from above: pkgname=integspeed pkgver=1.0 pkgrel=1 arch=('any') source=( eclipse-3.6.1-1-x86_64.pkg.tar.xz eclipse-3.6.2-1-x86_64.pkg.tar.xz nltk-data-2.0-5-any.pkg.tar.xz openoffice-base-3.2.1-5-x86_64.pkg.tar.xz smc-1.9-8-x86_64.pkg.tar.xz texlive-core-2010.20954-2-any.pkg.tar.xz tremulous-data-1.1.0-1-any.pkg.tar.gz ) md5sums=('6ab0488636b4b52957a8d069c4330d3d' 'e889ada205ab8b9b17c64de6c7b62956' '968bebb2a8e77b2cd2ee2bbb3d9122d4' '17d59366ef890dab62bebfe786a0cccb' '129fa6ed2208b355e8e55bdd38ae6677' '36437e05082be8c4e6764fc2bcfe4f4b' '107d367e2e0245b38402f457c1d735f7') sha256sums=('d0fdac48f982f4f7794187c6652fb55ac6c63c439a62476bcf90addad25f9274' 'fc30a73f6313ba202a6fb4fd112de93c88c28b3f7af68dd0789d3317afe89741' 'aec68224fd31713ff0cee49fb3c27cf5be82ada03657b9d592ab029c5df1ad92' '1c9404f87a8b00bd07d226ca93c7254985af3195719a5ddb69be40faa78914c4' 'bbde245ff84a3ec93f76a53b97d2d261193699a55881209ffae9310de00c6ad4' '10a0ba732253d89ef3b6d72486474a356179e4665efc6482ac3c47c891f7f3a2' '53d990b7123d12409290c3a3c8b6be32e2887c88a0650cd338a7f58cc951f4d9') scripts/makepkg.sh.in | 47 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 14 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3d5184a..92b7597 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -627,33 +627,52 @@ check_checksums() { correlation=1 local errors=0 local idx=0 + local -a jobs + local job local file for file in "${source[@]}"; do - local found=1 - file="$(get_filename "$file")" - echo -n " $file ... " >&2 + ( + file="$(get_filename "$file")" - if ! file="$(get_filepath "$file")"; then - echo "$(gettext "NOT FOUND")" >&2 - errors=1 - found=0 - fi + if ! file="$(get_filepath "$file")"; then + exit 2 + fi - if (( $found )) ; then local expectedsum=$(tr '[:upper:]' '[:lower:]' <<< "${integrity_sums[$idx]}") local realsum="$(openssl dgst -${integ} "$file")" realsum="${realsum##* }" if [[ $expectedsum = $realsum ]]; then - echo "$(gettext "Passed")" >&2 - else - echo "$(gettext "FAILED")" >&2 - errors=1 + exit 0 fi - fi + exit 1 + ) & + jobs[$idx]=$! idx=$((idx + 1)) done + idx=0 + while [[ $idx -lt ${#source[@]} ]]; do + file="$(get_filename "${source[$idx]}")" + job=${jobs[$idx]} + status=0 + wait $job || status=$? + echo -n " $file ... " >&2 + if [[ $status -eq 0 ]]; then + echo "$(gettext "Passed")" >&2 + elif [[ $status -eq 1 ]]; then + echo "$(gettext "FAILED")" >&2 + errors=1 + elif [[ $status -eq 2 ]]; then + echo "$(gettext "NOT FOUND")" >&2 + errors=1 + else + echo "$(gettext "ERROR")" >&2 + errors=1 + fi + idx=$((idx + 1)) + done + if (( errors )); then error "$(gettext "One or more files did not pass the validity check!")" exit 1 # TODO: error code -- 1.7.4.4

3 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-129-ge39c104
by dan＠archlinux.org 22 Apr '11

22 Apr '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 e39c104d13bfb6e2c055c2af3eee41bfa603b13b (commit) via 53c749ce0aa55307fff2b419501da509212ae9ba (commit) via 1ff04b980f65769ae63b162f7206579da2f57e1c (commit) from 10b8cd75b36d5a87032780058321fccdc90210c7 (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 e39c104d13bfb6e2c055c2af3eee41bfa603b13b Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 22:09:57 2011 -0500 cleanup: add_pkg() and remove_pkg() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 53c749ce0aa55307fff2b419501da509212ae9ba Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 15:39:31 2011 -0500 libalpm/dload: const and static correctness Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1ff04b980f65769ae63b162f7206579da2f57e1c Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 15:37:32 2011 -0500 be_sync: use _alpm_db_get_sigverify_level() Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 7 +++---- lib/libalpm/be_sync.c | 11 +++++++---- lib/libalpm/dload.c | 11 ++++++----- lib/libalpm/dload.h | 2 +- lib/libalpm/remove.c | 5 +++-- 5 files changed, 20 insertions(+), 16 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/6] signing: let GPGME handle loading signatures from files
by Dan McGee 22 Apr '11

22 Apr '11

Rather than go through all the hassle of doing this ourselves, just let GPGME handle the work by passing it a file handle. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- I applied patches from two years ago that introduced this madness, so it is no wonder I am going back and refactoring and simplifying the old stuff. I see little disadvantage to not manually reading the signature files if we can have the library handle that itself. lib/libalpm/be_package.c | 6 --- lib/libalpm/db.c | 23 ----------- lib/libalpm/db.h | 3 - lib/libalpm/signing.c | 94 +++++++++++++++++----------------------------- lib/libalpm/signing.h | 1 - 5 files changed, 35 insertions(+), 92 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 8a6ed6c..6e65c7d 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -243,18 +243,12 @@ static pmpkg_t *pkg_load(const char *pkgfile, int full) /* attempt to stat the package file, ensure it exists */ if(stat(pkgfile, &st) == 0) { - int sig_ret; - newpkg = _alpm_pkg_new(); if(newpkg == NULL) { RET_ERR(PM_ERR_MEMORY, NULL); } newpkg->filename = strdup(pkgfile); newpkg->size = st.st_size; - - /* TODO: do something with ret value */ - sig_ret = _alpm_load_signature(pkgfile, &(newpkg->pgpsig)); - (void)sig_ret; } else { /* couldn't stat the pkgfile, return an error */ RET_ERR(PM_ERR_PKG_OPEN, NULL); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index f5e7a25..3d593b3 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -314,27 +314,6 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local) return db; } -const pmpgpsig_t *_alpm_db_pgpsig(pmdb_t *db) -{ - ALPM_LOG_FUNC; - - /* Sanity checks */ - ASSERT(db != NULL, return(NULL)); - - if(db->pgpsig.data == NULL) { - const char *dbfile; - int ret; - - dbfile = _alpm_db_path(db); - - /* TODO: do something with ret value */ - ret = _alpm_load_signature(dbfile, &(db->pgpsig)); - (void)ret; - } - - return &(db->pgpsig); -} - void _alpm_db_free(pmdb_t *db) { ALPM_LOG_FUNC; @@ -343,8 +322,6 @@ void _alpm_db_free(pmdb_t *db) _alpm_db_free_pkgcache(db); /* cleanup server list */ FREELIST(db->servers); - /* only need to free data */ - FREE(db->pgpsig.data); FREE(db->_path); FREE(db->treename); FREE(db); diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 204a0be..399e2d5 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -63,8 +63,6 @@ struct __pmdb_t { pmpkghash_t *pkgcache; alpm_list_t *grpcache; alpm_list_t *servers; - /* do not access directly, use _alpm_db_pgpsig(db) for lazy access */ - pmpgpsig_t pgpsig; pgp_verify_t pgp_verify; struct db_operations *ops; @@ -81,7 +79,6 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles); pmdb_t *_alpm_db_register_local(void); pmdb_t *_alpm_db_register_sync(const char *treename); void _alpm_db_unregister(pmdb_t *db); -const pmpgpsig_t *_alpm_db_pgpsig(pmdb_t *db); /* be_*.c, backend specific calls */ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 9d4fd07..28b7ad9 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -92,9 +92,10 @@ error: } /** - * Check the PGP package signature for the given file. + * Check the PGP signature for the given file. * @param path the full path to a file - * @param sig PGP signature data in raw form (already decoded) + * @param sig PGP signature data in raw form (already decoded); if NULL, expect + * a signature file next to 'path' * @return a int value : 0 (valid), 1 (invalid), -1 (an error occured) */ int _alpm_gpgme_checksig(const char *path, const pmpgpsig_t *sig) @@ -105,16 +106,28 @@ int _alpm_gpgme_checksig(const char *path, const pmpgpsig_t *sig) gpgme_data_t filedata, sigdata; gpgme_verify_result_t result; gpgme_signature_t gpgsig; + char *sigpath = NULL; FILE *file = NULL, *sigfile = NULL; ALPM_LOG_FUNC; - if(!sig || !sig->data) { - RET_ERR(PM_ERR_SIG_UNKNOWN, -1); - } if(!path || access(path, R_OK) != 0) { RET_ERR(PM_ERR_NOT_A_FILE, -1); } + + if(!sig) { + size_t len = strlen(path) + 5; + CALLOC(sigpath, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, -1)); + snprintf(sigpath, len, "%s.sig", path); + + if(!access(sigpath, R_OK) == 0) { + FREE(sigpath); + RET_ERR(PM_ERR_SIG_UNKNOWN, -1); + } + } else if(!sig->data) { + RET_ERR(PM_ERR_SIG_UNKNOWN, -1); + } + if(gpgme_init()) { /* pm_errno was set in gpgme_init() */ return -1; @@ -140,7 +153,19 @@ int _alpm_gpgme_checksig(const char *path, const pmpgpsig_t *sig) CHECK_ERR(); /* next create data object for the signature */ - err = gpgme_data_new_from_mem(&sigdata, (char *)sig->data, sig->len, 0); + if(sig) { + /* memory-based, we loaded it from a sync DB */ + err = gpgme_data_new_from_mem(&sigdata, (char *)sig->data, sig->len, 0); + } else { + /* file-based, it is on disk */ + sigfile = fopen(sigpath, "rb"); + if(sigfile == NULL) { + pm_errno = PM_ERR_NOT_A_FILE; + ret = -1; + goto error; + } + err = gpgme_data_new_from_stream(&sigdata, sigfile); + } CHECK_ERR(); /* here's where the magic happens */ @@ -196,6 +221,7 @@ error: if(file) { fclose(file); } + FREE(sigpath); if(err != GPG_ERR_NO_ERROR) { _alpm_log(PM_LOG_ERROR, _("GPGME error: %s\n"), gpgme_strerror(err)); RET_ERR(PM_ERR_GPGME, -1); @@ -204,55 +230,6 @@ error: } /** - * Load the signature from the given path into the provided struct. - * @param sigfile the signature to attempt to load - * @param pgpsig the struct to place the data in - * - * @return 0 on success, 1 on file not found, -1 on error - */ -int _alpm_load_signature(const char *file, pmpgpsig_t *pgpsig) { - struct stat st; - char *sigfile; - int ret = -1; - - /* look around for a PGP signature file; load if available */ - MALLOC(sigfile, strlen(file) + 5, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(sigfile, "%s.sig", file); - - if(access(sigfile, R_OK) == 0 && stat(sigfile, &st) == 0) { - FILE *f; - size_t bytes_read; - - if(st.st_size > 4096 || (f = fopen(sigfile, "rb")) == NULL) { - free(sigfile); - return ret; - } - CALLOC(pgpsig->data, st.st_size, sizeof(unsigned char), - RET_ERR(PM_ERR_MEMORY, -1)); - bytes_read = fread(pgpsig->data, sizeof(char), st.st_size, f); - if(bytes_read == (size_t)st.st_size) { - pgpsig->len = bytes_read; - _alpm_log(PM_LOG_DEBUG, "loaded gpg signature file, location %s\n", - sigfile); - ret = 0; - } else { - _alpm_log(PM_LOG_WARNING, _("Failed reading PGP signature file %s"), - sigfile); - FREE(pgpsig->data); - } - - fclose(f); - } else { - _alpm_log(PM_LOG_DEBUG, "signature file %s not found\n", sigfile); - /* not fatal...we return a different error code here */ - ret = 1; - } - - free(sigfile); - return ret; -} - -/** * Determines the necessity of checking for a valid PGP signature * @param db the sync database to query * @@ -271,7 +248,7 @@ pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db) } /** - * Check the PGP package signature for the given package file. + * Check the PGP signature for the given package file. * @param pkg the package to check * @return a int value : 0 (valid), 1 (invalid), -1 (an error occurred) */ @@ -285,7 +262,7 @@ int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg) } /** - * Check the PGP package signature for the given database. + * Check the PGP signature for the given database. * @param db the database to check * @return a int value : 0 (valid), 1 (invalid), -1 (an error occurred) */ @@ -294,8 +271,7 @@ int SYMEXPORT alpm_db_check_pgp_signature(pmdb_t *db) ALPM_LOG_FUNC; ASSERT(db != NULL, return 0); - return _alpm_gpgme_checksig(_alpm_db_path(db), - _alpm_db_pgpsig(db)); + return _alpm_gpgme_checksig(_alpm_db_path(db), NULL); } /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h index a378fa5..5976cf2 100644 --- a/lib/libalpm/signing.h +++ b/lib/libalpm/signing.h @@ -32,7 +32,6 @@ struct __pmpgpsig_t { }; int _alpm_gpgme_checksig(const char *path, const pmpgpsig_t *sig); -int _alpm_load_signature(const char *sigfile, pmpgpsig_t *pgpsig); pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db); #endif /* _ALPM_SIGNING_H */ -- 1.7.4.4

1 5

[pacman-dev] [PATCH] Make dump_pkg_full a little less insane
by Dan McGee 22 Apr '11

22 Apr '11

The various "level" values were a bit crazy to decipher, and we were doing some very interesting comparisons in certain places. Break it out into two parameters instead so we can seperate the type from the extra information display, and do things accordingly. Nothing changes with the display of any of the five types we currently show: -Si, -Sii, -Qi, -Qii, -Qip. Something to note- we should expose the PKG_FROM enum type somehow, this patch leaves the door open to do that quite easily. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This one seems a bit out of the blue, but it makes more sense if I explain that I was working at getting a "Signature:" sign for -Qip output and didn't feel like adding another blasted level comparison that was hard to digest. The downside here is the enum addition to package.h- I'd be glad to either amend this one or submit a second patch moving those constants from private to public, as well as adding a package method to access that field (but not set it) from the frontend. I was surprised to see we don't have use for "where is this package from" in many other places. lib/libalpm/alpm.h | 4 ++-- src/pacman/package.c | 50 ++++++++++++++++++++------------------------------ src/pacman/package.h | 10 ++++++++-- src/pacman/query.c | 5 ++--- src/pacman/sync.c | 7 ++++--- 5 files changed, 36 insertions(+), 40 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index e095148..6818cb2 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -567,9 +567,9 @@ alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg); */ alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg); -/** Returns the database containing pkg +/** Returns the database containing pkg. * Returns a pointer to the pmdb_t structure the package is - * originating from, or NULL is the package was loaded from a file. + * originating from, or NULL if the package was loaded from a file. * @param pkg a pointer to package * @return a pointer to the DB containing pkg, or NULL. */ diff --git a/src/pacman/package.c b/src/pacman/package.c index 346d312..335b8b6 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -36,16 +36,15 @@ #define CLBUF_SIZE 4096 -/* Display the content of a package - * - * levels: - * <-1 - sync package, extra information (required by) [-Sii] - * -1 - sync package, normal level [-Si] - * =0 - file query [-Qip] - * 1 - localdb query, normal level [-Qi] - * >1 - localdb query, extra information (backup files) [-Qii] +/** + * Display the details of a package. + * Extra information entails 'required by' info for sync packages and backup + * files info for local packages. + * @param pkg package to display information for + * @param from the type of package we are dealing with + * @param extra should we show extra information */ -void dump_pkg_full(pmpkg_t *pkg, int level) +void dump_pkg_full(pmpkg_t *pkg, enum pkg_from from, int extra) { const char *reason; time_t bdate, idate; @@ -87,12 +86,16 @@ void dump_pkg_full(pmpkg_t *pkg, int level) depstrings = alpm_list_add(depstrings, alpm_dep_compute_string(dep)); } - if(level > 0 || level < -1) { + 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); } /* actual output */ + if(from == PKG_FROM_SYNCDB) { + string_display(_("Repository :"), + alpm_db_get_name(alpm_pkg_get_db(pkg))); + } string_display(_("Name :"), alpm_pkg_get_name(pkg)); string_display(_("Version :"), alpm_pkg_get_version(pkg)); string_display(_("URL :"), alpm_pkg_get_url(pkg)); @@ -101,16 +104,16 @@ void dump_pkg_full(pmpkg_t *pkg, int level) list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); list_display(_("Depends On :"), depstrings); list_display_linebreak(_("Optional Deps :"), alpm_pkg_get_optdepends(pkg)); - if(level > 0 || level < -1) { + if(extra || from == PKG_FROM_LOCALDB) { list_display(_("Required By :"), requiredby); } list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); list_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); size = humanize_size(alpm_pkg_get_size(pkg), 'K', 1, &label); - if(level < 0) { + if(from == PKG_FROM_SYNCDB) { printf(_("Download Size : %6.2f %s\n"), size, label); - } else if(level == 0) { + } else if(from == PKG_FROM_FILE) { printf(_("Compressed Size: %6.2f %s\n"), size, label); } @@ -120,23 +123,22 @@ void dump_pkg_full(pmpkg_t *pkg, int level) string_display(_("Packager :"), alpm_pkg_get_packager(pkg)); string_display(_("Architecture :"), alpm_pkg_get_arch(pkg)); string_display(_("Build Date :"), bdatestr); - if(level > 0) { + if(from == PKG_FROM_LOCALDB) { string_display(_("Install Date :"), idatestr); string_display(_("Install Reason :"), reason); } - if(level >= 0) { + if(from == PKG_FROM_FILE || from == PKG_FROM_LOCALDB) { string_display(_("Install Script :"), alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No")); } - /* MD5 Sum for sync package */ - if(level < 0) { + if(from == PKG_FROM_SYNCDB) { string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg)); } string_display(_("Description :"), alpm_pkg_get_desc(pkg)); /* Print additional package info if info flag passed more than once */ - if(level > 1) { + if(from == PKG_FROM_LOCALDB && extra) { dump_pkg_backups(pkg); } @@ -147,18 +149,6 @@ void dump_pkg_full(pmpkg_t *pkg, int level) FREELIST(requiredby); } -/* Display the content of a sync package - */ -void dump_pkg_sync(pmpkg_t *pkg, const char *treename, int level) -{ - if(pkg == NULL) { - return; - } - string_display(_("Repository :"), treename); - /* invert the level since we are a sync package */ - dump_pkg_full(pkg, -level); -} - static const char *get_backup_file_status(const char *root, const char *filename, const char *expected_md5) { diff --git a/src/pacman/package.h b/src/pacman/package.h index 26333c5..7a5e585 100644 --- a/src/pacman/package.h +++ b/src/pacman/package.h @@ -22,8 +22,14 @@ #include <alpm.h> -void dump_pkg_full(pmpkg_t *pkg, int level); -void dump_pkg_sync(pmpkg_t *pkg, const char *treename, int level); +/* TODO it would be nice if we didn't duplicate a backend type */ +enum pkg_from { + PKG_FROM_FILE = 1, + PKG_FROM_LOCALDB, + PKG_FROM_SYNCDB +}; + +void dump_pkg_full(pmpkg_t *pkg, enum pkg_from from, int extra); void dump_pkg_backups(pmpkg_t *pkg); void dump_pkg_files(pmpkg_t *pkg, int quiet); diff --git a/src/pacman/query.c b/src/pacman/query.c index a3546ba..eaf3b9e 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -450,10 +450,9 @@ static int display(pmpkg_t *pkg) if(config->op_q_info) { if(config->op_q_isfile) { - /* omit info that isn't applicable for a file package */ - dump_pkg_full(pkg, 0); + dump_pkg_full(pkg, PKG_FROM_FILE, 0); } else { - dump_pkg_full(pkg, config->op_q_info); + dump_pkg_full(pkg, PKG_FROM_LOCALDB, config->op_q_info > 1); } } if(config->op_q_list) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 64d8cb0..5529288 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -465,7 +465,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) pmpkg_t *pkg = alpm_list_getdata(k); if(strcmp(alpm_pkg_get_name(pkg), pkgstr) == 0) { - dump_pkg_sync(pkg, alpm_db_get_name(db), config->op_s_info); + dump_pkg_full(pkg, PKG_FROM_SYNCDB, config->op_s_info > 1); foundpkg = 1; break; } @@ -486,7 +486,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) pmpkg_t *pkg = alpm_list_getdata(k); if(strcmp(alpm_pkg_get_name(pkg), pkgstr) == 0) { - dump_pkg_sync(pkg, alpm_db_get_name(db), config->op_s_info); + dump_pkg_full(pkg, PKG_FROM_SYNCDB, config->op_s_info > 1); foundpkg = 1; break; } @@ -504,7 +504,8 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets) pmdb_t *db = alpm_list_getdata(i); for(j = alpm_db_get_pkgcache(db); j; j = alpm_list_next(j)) { - dump_pkg_sync(alpm_list_getdata(j), alpm_db_get_name(db), config->op_s_info); + pmpkg_t *pkg = alpm_list_getdata(j); + dump_pkg_full(pkg, PKG_FROM_SYNCDB, config->op_s_info > 1); } } } -- 1.7.4.4

1 0

[pacman-dev] [PATCH 0/4] Add signature check for local packages
by Rémy Oudompheng 22 Apr '11

22 Apr '11

Packages added from local files are not checked currently. These patches also introduce changes in the handling of PM_PGP_VERIFY_UNKNOWN that are not really convincing. We could skip these changes and just apply the other patches, however we should probably give some thoughts about that. Making the check level into an argument of the check function could also be an option. Rémy Oudompheng (4): sync.c: remove duplicated code for integrity check failures handle.c: force sigverify level not to be PM_PGP_VERIFY_UNKNOWN sync.c: remove unnecessary check for PM_PGP_VERIFY_UNKNOWN sync.c: also check signatures for packages loaded from files lib/libalpm/handle.c | 1 + lib/libalpm/sync.c | 58 +++++++++++++++++++++++++------------------------- 2 files changed, 30 insertions(+), 29 deletions(-) -- 1.7.4.4

2 6

[pacman-dev] [PATCH 1/7] makepkg, pacman-key: unify help message with other scripts
by ivan.kanak＠gmail.com 21 Apr '11

21 Apr '11

From: Ivan Kanakarakis <ivan.kanak(a)gmail.com> The help message changed to match the one rankmirrors script has. It's clearer as to what the --help switch does. Signed-off-by: Ivan Kanakarakis <ivan.kanak(a)gmail.com> --- scripts/makepkg.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 70d3cf3..3d5184a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1607,7 +1607,7 @@ usage() { echo "$(gettext " -e, --noextract Do not extract source files (use existing src/ dir)")" echo "$(gettext " -f, --force Overwrite existing package")" echo "$(gettext " -g, --geninteg Generate integrity checks for source files")" - echo "$(gettext " -h, --help This help")" + echo "$(gettext " -h, --help Show this help message and exit")" echo "$(gettext " -i, --install Install package after successful build")" echo "$(gettext " -L, --log Log package build process")" echo "$(gettext " -m, --nocolor Disable colorized output messages")" diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 89e52fc..82268c9 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -63,7 +63,7 @@ usage() { echo "$(gettext " -d, --del <keyid(s)> Remove the specified keyids")" echo "$(gettext " -e, --export <keyid(s)> Export the specified keyids")" echo "$(gettext " -f, --finger [<keyid(s)>] List fingerprint for specified or all keyids")" - echo "$(gettext " -h, --help This help")" + echo "$(gettext " -h, --help Show this help message and exit")" echo "$(gettext " -l, --list List keys")" echo "$(gettext " -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids")" echo "$(gettext " -t, --trust <keyid(s)> Set the trust level of the given keyids")" -- 1.7.4.4

3 15

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-126-g10b8cd7
by dan＠archlinux.org 21 Apr '11

21 Apr '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 10b8cd75b36d5a87032780058321fccdc90210c7 (commit) via dd7b17aa0a4d2b420f880710bde49773919f4e4c (commit) via ada5bc1404098f644048477c8b6265060aaf1c98 (commit) via 908e9f41ed19685a7442acf629220e20b7c003a2 (commit) via fdbcc9847d7e13b96328adb5f34932eea7ca6ba9 (commit) via 6f19a8c9f73e6177fc17e340cd0272714c6c3a5d (commit) via 36737aebb78f170611bf46867de0054347593b79 (commit) via 96ad414d73073a50c6068eca8c208a64238ea868 (commit) via 670b315c4d805f1ee86d51ef1632373b35739461 (commit) from 442e1420f95ecc6fd1967677c1be5dfed6584542 (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 10b8cd75b36d5a87032780058321fccdc90210c7 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Thu Apr 21 08:13:05 2011 +0200 sync.c: remove unnecessary check for PM_PGP_VERIFY_UNKNOWN The value PM_PGP_VERIFY_UNKNOWN is reserved to error cases, now that the signature verification level defaults to the globally set level. The only error case is when handle == NULL, which is false in the context of _alpm_sync_commit(). Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dd7b17aa0a4d2b420f880710bde49773919f4e4c Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Thu Apr 21 08:11:36 2011 +0200 handle.c: force sigverify level not to be PM_PGP_VERIFY_UNKNOWN Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ada5bc1404098f644048477c8b6265060aaf1c98 Merge: 908e9f4 36737ae Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 21 12:12:29 2011 -0500 Merge remote-tracking branch 'remy/doxygen' commit 908e9f41ed19685a7442acf629220e20b7c003a2 Author: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Date: Thu Apr 21 16:59:07 2011 +0300 pacman-key: improved reading of the configuration file This commit replaces the find_config() function with the get_from() function. get_from expects two arguments, the first is the file to read and the second is the key to look for in the given file. get_from returns the first matching value for the given key. The file is expected to be in the format: key = value Each of 'key' 'equal sign' 'value' can be surrounded be random whitespace. Signed-off-by: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fdbcc9847d7e13b96328adb5f34932eea7ca6ba9 Author: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Date: Thu Apr 21 16:59:06 2011 +0300 pacman-key: display the unsupported command to the user If the user provides an unsupported command, inform the user that this switch is unknown, display usage and exit. Signed-off-by: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6f19a8c9f73e6177fc17e340cd0272714c6c3a5d Author: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Date: Thu Apr 21 16:59:05 2011 +0300 makepkg, pacman-key: unify help message with other scripts The help message changed to match the one rankmirrors script has. It's clearer as to what the --help switch does. Signed-off-by: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36737aebb78f170611bf46867de0054347593b79 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Thu Apr 21 07:45:11 2011 +0200 alpm.h: add several missing documentation strings Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> commit 96ad414d73073a50c6068eca8c208a64238ea868 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Thu Apr 21 07:39:16 2011 +0200 alpm.h: rationalize option getters/setters documentation Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> commit 670b315c4d805f1ee86d51ef1632373b35739461 Author: Rémy Oudompheng <remy(a)archlinux.org> Date: Sun Apr 17 09:45:52 2011 +0200 alpm.h: add/improve function documentation Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 5 +-- lib/libalpm/alpm.h | 109 ++++++++++++++++++++++++++++++++++++--------- lib/libalpm/handle.c | 1 + lib/libalpm/sync.c | 11 +---- scripts/makepkg.sh.in | 2 +- scripts/pacman-key.sh.in | 25 ++++++---- 6 files changed, 106 insertions(+), 47 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [ABS] Add --verbose flag to gem in PKGBUILD-rubygem.proto
by talki walki 21 Apr '11

21 Apr '11

Without --verbose the `gem install` outputs way too little information about what is being done. I suggest this patch: --- PKGBUILD-rubygem.proto 2011-04-21 11:47:48.254153621 +0000 +++ PKGBUILD-rubygem.proto 2011-04-21 11:48:17.673994240 +0000 @@ -26,7 +26,7 @@ # makepkg will exit with an error when sourcing the PKGBUILD local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - gem install --ignore-dependencies -i "$pkgdir$_gemdir" GEMNAME-$pkgver.gem + gem install --ignore-dependencies --verbose -i "$pkgdir$_gemdir" -n "$pkgdir"/usr/bin GEMNAME-$pkgver.gem } # vim:set ts=2 sw=2 et: I've already updated the wiki: https://wiki.archlinux.org/index.php/Ruby_Gem_Package_Guidelines#Example_PK…

1 0

[pacman-dev] [PATCH 1/4] pacman-key.sh.in: applied patch by Denis A. Altoé Falqueto
by ivan.kanak＠gmail.com 21 Apr '11

21 Apr '11

From: Ivan Kanakarakis <ivan.kanak(a)gmail.com> Denis' patch applied to master --- scripts/pacman-key.sh.in | 520 ++++++++++++++++++++++++--------------------- 1 files changed, 277 insertions(+), 243 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 89e52fc..0f6e3f5 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -27,223 +27,250 @@ export TEXTDOMAINDIR='@localedir@' myver="@PACKAGE_VERSION@" msg() { - local mesg=$1; shift - printf "==> ${mesg}\n" "$@" >&1 + local mesg=$1; shift + printf "==> ${mesg}\n" "$@" >&1 } msg2() { - (( QUIET )) && return - local mesg=$1; shift - printf " -> ${mesg}\n" "$@" >&1 + (( QUIET )) && return + local mesg=$1; shift + printf " -> ${mesg}\n" "$@" >&1 } warning() { - local mesg=$1; shift - printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 + local mesg=$1; shift + printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 } error() { - local mesg=$1; shift - printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 + local mesg=$1; shift + printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 } usage() { - printf "pacman-key (pacman) %s\n" ${myver} - echo - printf "$(gettext "Usage: %s [options] <command> [arguments]")\n" $(basename $0) - echo - echo "$(gettext "Manage pacman's list of trusted keys")" - echo - echo "$(gettext "Options must be placed before commands. The available options are:")" - printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$CONFIG" - echo "$(gettext " --gpgdir Set an alternate directory for gnupg")" - echo - echo "$(gettext "The available commands are:")" - echo "$(gettext " -a, --add [<file(s)>] Add the specified keys (empty for stdin)")" - echo "$(gettext " -d, --del <keyid(s)> Remove the specified keyids")" - echo "$(gettext " -e, --export <keyid(s)> Export the specified keyids")" - echo "$(gettext " -f, --finger [<keyid(s)>] List fingerprint for specified or all keyids")" - echo "$(gettext " -h, --help This help")" - echo "$(gettext " -l, --list List keys")" - echo "$(gettext " -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids")" - echo "$(gettext " -t, --trust <keyid(s)> Set the trust level of the given keyids")" - echo "$(gettext " -u, --updatedb Update the trustdb of pacman")" - echo "$(gettext " -V, --version Show program version")" - echo "$(gettext " --adv <params> Use pacman's keyring with advanced gpg commands")" - printf "$(gettext " --reload Reload the default keys")" - echo + printf "pacman-key (pacman) %s\n" ${myver} + echo + printf "$(gettext "Usage: %s [options] <command> [arguments]")\n" $(basename $0) + echo + echo "$(gettext "Manage pacman's list of trusted keys")" + echo + echo "$(gettext "Options must be placed before commands. The available options are:")" + printf "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$CONFIG" + echo "$(gettext " --gpgdir Set an alternate directory for gnupg")" + echo + echo "$(gettext "The available commands are:")" + echo "$(gettext " -a, --add [<file(s)>] Add the specified keys (empty for stdin)")" + echo "$(gettext " -d, --del <keyid(s)> Remove the specified keyids")" + echo "$(gettext " -e, --export <keyid(s)> Export the specified keyids")" + echo "$(gettext " -f, --finger [<keyid(s)>] List fingerprint for specified or all keyids")" + echo "$(gettext " -h, --help This help")" + echo "$(gettext " -l, --list List keys")" + echo "$(gettext " -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids")" + echo "$(gettext " -t | --edit-key <keyid> ... - edit trust properties for the given keys")" + echo "$(gettext " -u, --updatedb Update the trustdb of pacman")" + echo "$(gettext " -V, --version Show program version")" + echo "$(gettext " --adv <params> Use pacman's keyring with advanced gpg commands")" + printf "$(gettext " --reload Reload the default keys")" + echo } version() { - printf "pacman-key (pacman) %s\n" "${myver}" - printf "$(gettext "\ + printf "pacman-key (pacman) %s\n" "${myver}" + printf "$(gettext "\ Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(a)archlinux.org>.\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } find_config() { - # Prints on stdin the values of all the options from the configuration file that - # are associated with the first parameter of this function. - # The option names are stripped - grep -e "^[[:blank:]]*$1[[:blank:]]*=.*" "$CONFIG" | cut -d= -f 2- + # Prints on stdin the values of all the options from the configuration file that + # are associated with the first parameter of this function. + # The option names are stripped + grep -e "^[[:blank:]]*$1[[:blank:]]*=.*" "$CONFIG" | cut -d= -f 2- } reload_keyring() { - local PACMAN_SHARE_DIR='@prefix@/share/pacman' - local GPG_NOKEYRING="gpg --batch --quiet --ignore-time-conflict --no-options --no-default-keyring --homedir ${PACMAN_KEYRING_DIR}" - - # Variable used for iterating on keyrings - local key - local key_id - - # Keyring with keys to be added to the keyring - local ADDED_KEYS="${PACMAN_SHARE_DIR}/addedkeys.gpg" - - # Keyring with keys that were deprecated and will eventually be deleted - local DEPRECATED_KEYS="${PACMAN_SHARE_DIR}/deprecatedkeys.gpg" - - # List of keys removed from the keyring. This file is not a keyring, unlike the others. - # It is a textual list of values that gpg recogniezes as identifiers for keys. - local REMOVED_KEYS="${PACMAN_SHARE_DIR}/removedkeys" - - # Verify signatures of related files, if they exist - if [[ -r "${ADDED_KEYS}" ]]; then - msg "$(gettext "Verifying official keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${ADDED_KEYS}.sig" 1>/dev/null; then - error "$(gettext "The signature of file %s is not valid.")" "${ADDED_KEYS}" - exit 1 - fi - fi - - if [[ -r "${DEPRECATED_KEYS}" ]]; then - msg "$(gettext "Verifying deprecated keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${DEPRECATED_KEYS}.sig" 1>/dev/null; then - error "$(gettext "The signature of file %s is not valid.")" "${DEPRECATED_KEYS}" - exit 1 - fi - fi - - if [[ -r "${REMOVED_KEYS}" ]]; then - msg "$(gettext "Verifying deleted keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${REMOVED_KEYS}.sig"; then - error "$(gettext "The signature of file %s is not valid.")" "${REMOVED_KEYS}" - exit 1 - fi - fi - - # Read the key ids to an array. The conversion from whatever is inside the file - # to key ids is important, because key ids are the only guarantee of identification - # for the keys. - local -A removed_ids - if [[ -r "${REMOVED_KEYS}" ]]; then - while read key; do - local key_values name - key_values=$(${GPG_PACMAN} --quiet --with-colons --list-key "${key}" | grep ^pub | cut -d: -f5,10 --output-delimiter=' ') - if [[ -n $key_values ]]; then - # The first word is the key_id - key_id=${key_values%% *} - # the rest if the name of the owner - name=${key_values#* } - if [[ -n ${key_id} ]]; then - # Mark this key to be deleted - removed_ids[$key_id]="$name" - fi - fi - done < "${REMOVED_KEYS}" - fi - - # List of keys that must be kept installed, even if in the list of keys to be removed - local HOLD_KEYS=$(find_config "HoldKeys") - - # Remove the keys that must be kept from the set of keys that should be removed - if [[ -n ${HOLD_KEYS} ]]; then - for key in ${HOLD_KEYS}; do - key_id=$(${GPG_PACMAN} --quiet --with-colons --list-key "${key}" | grep ^pub | cut -d: -f5) - if [[ -n "${removed_ids[$key_id]}" ]]; then - unset removed_ids[$key_id] - fi - done - fi - - # Add keys from the current set of keys from pacman-keyring package. The web of trust will - # be updated automatically. - if [[ -r "${ADDED_KEYS}" ]]; then - msg "$(gettext "Appending official keys...")" - local add_keys=$(${GPG_NOKEYRING} --keyring "${ADDED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5) - for key_id in ${add_keys}; do - # There is no point in adding a key that will be deleted right after - if [[ -z "${removed_ids[$key_id]}" ]]; then - ${GPG_NOKEYRING} --keyring "${ADDED_KEYS}" --export "${key_id}" | ${GPG_PACMAN} --import - fi - done - fi - - if [[ -r "${DEPRECATED_KEYS}" ]]; then - msg "$(gettext "Appending deprecated keys...")" - local add_keys=$(${GPG_NOKEYRING} --keyring "${DEPRECATED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5) - for key_id in ${add_keys}; do - # There is no point in adding a key that will be deleted right after - if [[ -z "${removed_ids[$key_id]}" ]]; then - ${GPG_NOKEYRING} --keyring "${DEPRECATED_KEYS}" --export "${key_id}" | ${GPG_PACMAN} --import - fi - done - fi - - # Remove the keys not marked to keep - if (( ${#removed_ids[@]} > 0 )); then - msg "$(gettext "Removing deleted keys from keyring...")" - for key_id in "${!removed_ids[@]}"; do - echo " removing key $key_id - ${removed_ids[$key_id]}" - ${GPG_PACMAN} --quiet --batch --yes --delete-key "${key_id}" - done - fi - - # Update trustdb, just to be sure - msg "$(gettext "Updating trust database...")" - ${GPG_PACMAN} --batch --check-trustdb + local PACMAN_SHARE_DIR='@prefix@/share/pacman' + local GPG_NOKEYRING="gpg --batch --quiet --ignore-time-conflict --no-options --no-default-keyring --homedir ${PACMAN_KEYRING_DIR}" + + # Variable used for iterating on keyrings + local key + local key_id + + # Keyring with keys to be added to the keyring + local ADDED_KEYS="${PACMAN_SHARE_DIR}/addedkeys.gpg" + + # Keyring with keys that were deprecated and will eventually be deleted + local DEPRECATED_KEYS="${PACMAN_SHARE_DIR}/deprecatedkeys.gpg" + + # List of keys removed from the keyring. This file is not a keyring, unlike the others. + # It is a textual list of values that gpg recogniezes as identifiers for keys. + local REMOVED_KEYS="${PACMAN_SHARE_DIR}/removedkeys" + + # Verify signatures of related files, if they exist + if [[ -r "${ADDED_KEYS}" ]]; then + msg "$(gettext "Verifying official keys file signature...")" + if ! ${GPG_PACMAN} --verify "${ADDED_KEYS}.sig" &>/dev/null; then + error "$(gettext "The signature of file %s is not valid.")" "${ADDED_KEYS}" + exit 1 + fi + fi + + if [[ -r "${DEPRECATED_KEYS}" ]]; then + msg "$(gettext "Verifying deprecated keys file signature...")" + if ! ${GPG_PACMAN} --verify "${DEPRECATED_KEYS}.sig" &>/dev/null; then + error "$(gettext "The signature of file %s is not valid.")" "${DEPRECATED_KEYS}" + exit 1 + fi + fi + + if [[ -r "${REMOVED_KEYS}" ]]; then + msg "$(gettext "Verifying deleted keys file signature...")" + if ! ${GPG_PACMAN} --verify "${REMOVED_KEYS}.sig" &>/dev/null; then + error "$(gettext "The signature of file %s is not valid.")" "${REMOVED_KEYS}" + exit 1 + fi + fi + + # Read the key ids to an array. The conversion from whatever is inside the file + # to key ids is important, because key ids are the only guarantee of identification + # for the keys. + local -A removed_ids + if [[ -r "${REMOVED_KEYS}" ]]; then + while read key; do + local key_values name + key_values=$(${GPG_PACMAN} --quiet --with-colons --list-key "${key}" | grep ^pub | cut -d: -f5,10 --output-delimiter=' ') + if [[ -n $key_values ]]; then + # The first word is the key_id + key_id=${key_values%% *} + # the rest if the name of the owner + name=${key_values#* } + if [[ -n ${key_id} ]]; then + # Mark this key to be deleted + removed_ids[$key_id]="$name" + fi + fi + done < "${REMOVED_KEYS}" + fi + + # List of keys that must be kept installed, even if in the list of keys to be removed + local HOLD_KEYS=$(find_config "HoldKeys") + + # Remove the keys that must be kept from the set of keys that should be removed + if [[ -n ${HOLD_KEYS} ]]; then + for key in ${HOLD_KEYS}; do + key_id=$(${GPG_PACMAN} --quiet --with-colons --list-key "${key}" | grep ^pub | cut -d: -f5) + if [[ -n "${removed_ids[$key_id]}" ]]; then + unset removed_ids[$key_id] + fi + done + fi + + # Add keys from the current set of keys from pacman-keyring package. The web of trust will + # be updated automatically. + if [[ -r "${ADDED_KEYS}" ]]; then + msg "$(gettext "Appending official keys...")" + local add_keys=$(${GPG_NOKEYRING} --keyring "${ADDED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5) + for key_id in ${add_keys}; do + # There is no point in adding a key that will be deleted right after + if [[ -z "${removed_ids[$key_id]}" ]]; then + ${GPG_NOKEYRING} --keyring "${ADDED_KEYS}" --export "${key_id}" | ${GPG_PACMAN} --import + fi + done + fi + + if [[ -r "${DEPRECATED_KEYS}" ]]; then + msg "$(gettext "Appending deprecated keys...")" + local add_keys=$(${GPG_NOKEYRING} --keyring "${DEPRECATED_KEYS}" --with-colons --list-keys | grep ^pub | cut -d: -f5) + for key_id in ${add_keys}; do + # There is no point in adding a key that will be deleted right after + if [[ -z "${removed_ids[$key_id]}" ]]; then + ${GPG_NOKEYRING} --keyring "${DEPRECATED_KEYS}" --export "${key_id}" | ${GPG_PACMAN} --import + fi + done + fi + + # Remove the keys not marked to keep + if (( ${#removed_ids[@]} > 0 )); then + msg "$(gettext "Removing deleted keys from keyring...")" + for key_id in "${!removed_ids[@]}"; do + echo " removing key $key_id - ${removed_ids[$key_id]}" + ${GPG_PACMAN} --quiet --batch --yes --delete-key "${key_id}" + done + fi + + # Update trustdb, just to be sure + msg "$(gettext "Updating trust database...")" + ${GPG_PACMAN} --batch --check-trustdb } # PROGRAM START if ! type gettext &>/dev/null; then - gettext() { - echo "$@" - } + gettext() { + echo "$@" + } fi if [[ $1 != "--version" && $1 != "-V" && $1 != "--help" && $1 != "-h" && $1 != "" ]]; then - if type -p gpg >/dev/null 2>&1 = 1; then - error "$(gettext "gnupg does not seem to be installed.")" - msg2 "$(gettext "pacman-key requires gnupg for most operations.")" - exit 1 - elif (( EUID != 0 )); then - error "$(gettext "pacman-key needs to be run as root.")" - exit 1 - fi + if type -p gpg >/dev/null 2>&1 = 1; then + error "$(gettext "gnupg does not seem to be installed.")" + msg2 "$(gettext "pacman-key requires gnupg for most operations.")" + exit 1 + elif (( EUID != 0 )); then + error "$(gettext "pacman-key needs to be run as root.")" + exit 1 + fi fi -# Parse global options +# Iterate over the parameters to get --config and --gpgdir +# The other parameters will be filtered to another array, +# so --config and --gpgdir don't interfere with other options. CONFIG="@sysconfdir@/pacman.conf" -PACMAN_KEYRING_DIR="@sysconfdir@/pacman.d/gnupg" -while [[ $1 =~ ^--(config|gpgdir)$ ]]; do - case "$1" in - --config) shift; CONFIG="$1" ;; - --gpgdir) shift; PACMAN_KEYRING_DIR="$1" ;; - esac - shift +declare -a PARAMS +GPGDIR="" +isconfig=0 +isgpgdir=0 +for arg in "$@"; do + if (( isconfig )); then + isconfig=0 + CONFIG="$arg" + if [[ ! -f "$CONFIG" ]]; then + error "$(gettext "The configuration file is not a valid file.")" + usage + exit 1 + fi + continue + fi + if (( isgpgdir )); then + isgpgdir=0 + GPGDIR="$arg" + if [[ ! -d "$GPGDIR" ]]; then + error "$(gettext "The home directory for GnuPG is not valid.")" + usage + exit 1 + fi + continue + fi + case "$arg" in + --config) isconfig=1;; + --gpgdir) isgpgdir=1;; +*) PARAMS[${#PARAMS[@]}]="$arg" + esac done if [[ ! -r "${CONFIG}" ]]; then - error "$(gettext "%s not found.")" "$CONFIG" - exit 1 + error "$(gettext "%s not found.")" "$CONFIG" + exit 1 fi # Read GPGDIR from $CONFIG. -# The pattern is: any spaces or tabs, GPGDir, any spaces or tabs, equal sign -# and the rest of the line. The string is splitted after the first occurrence of = -if [[ GPGDIR=$(find_config "GPGDir") == 0 ]]; then - PACMAN_KEYRING_DIR="${GPGDIR}" -fi +# The precedence for GPGDIR is: +# 1st: command line +# 2nd: pacman.conf +# 3rd: default value +[[ -z "$GPGDIR" ]] && GPGDIR=$(find_config "GPGDir") +[[ -z "$GPGDIR" ]] && GPGDIR="@sysconfdir@/pacman.d/gnupg" +PACMAN_KEYRING_DIR="${GPGDIR}" GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning" # Try to create $PACMAN_KEYRING_DIR if non-existent @@ -252,74 +279,81 @@ GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning" [[ -e ${PACMAN_KEYRING_DIR} ]] || mkdir -p -m 755 "${PACMAN_KEYRING_DIR}" # Parse and execute command -command="$1" +command="${PARAMS[0]}" if [[ -z "${command}" ]]; then - usage - exit 1 + usage + exit 1 fi -shift +unset PARAMS[0] case "${command}" in - -a|--add) - # If there is no extra parameter, gpg will read stdin - ${GPG_PACMAN} --quiet --batch --import "$@" - ;; - -d|--del) - if (( $# == 0 )); then - error "$(gettext "You need to specify at least one key identifier")" - exit 1 - fi - ${GPG_PACMAN} --quiet --batch --delete-key --yes "$@" - ;; - -u|--updatedb) - ${GPG_PACMAN} --batch --check-trustdb - ;; - --reload) - reload_keyring - ;; - -l|--list) - ${GPG_PACMAN} --batch --list-sigs "$@" - ;; - -f|--finger) - ${GPG_PACMAN} --batch --fingerprint "$@" - ;; - -e|--export) - ${GPG_PACMAN} --armor --export "$@" - ;; - -r|--receive) - if (( $# < 2 )); then - error "$(gettext "You need to specify the keyserver and at least one key identifier")" - exit 1 - fi - keyserver="$1" - shift - ${GPG_PACMAN} --keyserver "${keyserver}" --recv-keys "$@" - ;; - -t|--trust) - if (( $# == 0 )); then - error "$(gettext "You need to specify at least one key identifier")" - exit 1 - fi - while (( $# > 0 )); do - # Verify if the key exists in pacman's keyring - if ${GPG_PACMAN} --list-keys "$1" > /dev/null 2>&1; then - ${GPG_PACMAN} --edit-key "$1" - else - error "$(gettext "The key identified by %s doesn't exist")" "$1" - exit 1 - fi - shift - done - ;; - --adv) - msg "$(gettext "Executing: %s ")$*" "${GPG_PACMAN}" - ${GPG_PACMAN} "$@" || ret=$? - exit $ret - ;; - -h|--help) - usage; exit 0 ;; - -V|--version) - version; exit 0 ;; - *) - usage; exit 1 ;; + -a|--add) + # If there is no extra parameter, gpg will read stdin + ${GPG_PACMAN} --quiet --batch --import "${PARAMS[@]}" + ;; + -d|--del) + if (( ${#PARAMS[@]} == 0 )); then + error "$(gettext "You need to specify at least one key identifier")" + usage + exit 1 + fi + ;; + -u|--updatedb) + ${GPG_PACMAN} --batch --check-trustdb + ;; + --reload) + reload_keyring + ;; + -l|--list) + ${GPG_PACMAN} --list-sigs "${PARAMS[@]}" + ;; + -f|--finger) + ${GPG_PACMAN} --fingerprint "${PARAMS[@]}" + ;; + -e|--export) + ${GPG_PACMAN} --armor --export "${PARAMS[@]}" + ;; + -r|--receive) + if (( ${#PARAMS[@]} < 2 )); then + error "$(gettext "You need to specify the keyserver and at least one key identifier")" + exit 1 + fi + keyserver="${PARAMS[0]}" + unset PARAMS[0] + ${GPG_PACMAN} --keyserver "${keyserver}" --recv-keys "${PARAMS[@]}" + ;; + -t|--edit-key) + if (( ${#PARAMS[@]} == 0 )); then + error "$(gettext "You need to specify at least one key identifier")" + exit 1 + fi + while (( ${#PARAMS[@]} > 0 )); do + # Verify if the key exists in pacman's keyring + if ${GPG_PACMAN} --list-keys "${PARAMS[0]}" &>/dev/null; then + ${GPG_PACMAN} --edit-key "${PARAMS[0]}" + else + error "$(gettext "The key identified by %s doesn't exist")" "${PARAMS[0]}" + exit 1 + fi + unset PARAMS[0] + done + ;; + --adv) + msg "$(gettext "Executing: %s ")$*" "${GPG_PACMAN}" + ${GPG_PACMAN} "$@" || ret=$? + exit $ret + ;; + -h|--help) + usage; + exit 0 + ;; + -V|--version) + version; + exit 0 + ;; + # Parameters already handled + --config) shift ;; + --gpgdir) shift ;; +*) + usage; exit 1 ;; esac -- 1.7.4.4

4 9

[pacman-dev] [PATCH 0/3] libalpm documentation patches
by Rémy Oudompheng 21 Apr '11

21 Apr '11

These patches add more documentation in alpm.h, still in doxygen style. They were rebased on master branch. Rémy Oudompheng (3): alpm.h: add/improve function documentation alpm.h: rationalize option getters/setters documentation alpm.h: add several missing documentation strings lib/libalpm/add.c | 5 +-- lib/libalpm/alpm.h | 109 +++++++++++++++++++++++++++++++++++++++++---------- lib/libalpm/sync.c | 4 +- 3 files changed, 89 insertions(+), 29 deletions(-) -- 1.7.4.4

1 3

[pacman-dev] [PATCH] alpm.h: add/improve function documentation
by Rémy Oudompheng 21 Apr '11

21 Apr '11

Signed-off-by: Rémy Oudompheng <remy(a)archlinux.org> --- lib/libalpm/add.c | 5 +---- lib/libalpm/alpm.h | 30 +++++++++++++++++++++++++----- lib/libalpm/sync.c | 4 +--- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 0a5cb53..6b2bd7a 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -49,10 +49,7 @@ #include "remove.h" #include "handle.h" -/** Add a package to the transaction. - * @param pkg the package to add - * @return 0 on success, -1 on error (pm_errno is set accordingly) - */ +/** Add a package to the transaction. */ int SYMEXPORT alpm_add_pkg(pmpkg_t *pkg) { const char *pkgname, *pkgver; diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 7259957..12c2729 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -258,7 +258,8 @@ const char *alpm_db_get_name(const pmdb_t *db); */ const char *alpm_db_get_url(const pmdb_t *db); -/** Set the serverlist of a database. +/** Add a new server for a database. + * An empty string or NULL can be passed to empty the current server list. * @param db database pointer * @param url url of the server * @return 0 on success, -1 on error (pm_errno is set accordingly) @@ -293,10 +294,10 @@ pmgrp_t *alpm_db_readgrp(pmdb_t *db, const char *name); */ alpm_list_t *alpm_db_get_grpcache(pmdb_t *db); -/** Searches a database. +/** Searches a database with regular expressions. * @param db pointer to the package database to search in - * @param needles the list of strings to search for - * @return the list of packages on success, NULL on error + * @param needles a list of regular expressions to search for + * @return the list of packages matching all regular expressions on success, NULL on error */ alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles); @@ -318,7 +319,8 @@ int alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason); /** Create a package from a file. * If full is false, the archive is read only until all necessary * metadata is found. If it is true, the entire archive is read, which - * serves as a verfication of integrity and the filelist can be created. + * serves as a verification of integrity and the filelist can be created. + * The allocated structure should be freed using alpm_pkg_free(). * @param filename location of the package tarball * @param full whether to stop the load after metadata is read or continue * through the full archive @@ -799,9 +801,27 @@ int alpm_trans_release(void); /** @name Common Transactions */ /** @{ */ + +/** Search for packages to upgrade and add them to the transaction. + * @param enable_downgrade allow downgrading of packages if the remote version is lower + * @return 0 on success, -1 on error (pm_errno is set accordingly) + */ int alpm_sync_sysupgrade(int enable_downgrade); + +/** Add a package to the transaction. + * If the package was loaded by alpm_pkg_load(), it will be freed upon + * alpm_trans_release() invocation. + * @param pkg the package to add + * @return 0 on success, -1 on error (pm_errno is set accordingly) + */ int alpm_add_pkg(pmpkg_t *pkg); + +/** Add a package removal action to the transaction. + * @param pkg the package to uninstall + * @return 0 on success, -1 on error (pm_errno is set accordingly) + */ int alpm_remove_pkg(pmpkg_t *pkg); + /** @} */ /** @addtogroup alpm_api_depends Dependency Functions diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5428e40..f9158a6 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -83,9 +83,7 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync) return NULL; } -/** Search for packages to upgrade and add them to the transaction. - * @return 0 on success, -1 on error (pm_errno is set accordingly) - */ +/** Search for packages to upgrade and add them to the transaction. */ int SYMEXPORT alpm_sync_sysupgrade(int enable_downgrade) { alpm_list_t *i, *j, *k; -- 1.7.4.4

3 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-117-g442e142
by dan＠archlinux.org 21 Apr '11

21 Apr '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 442e1420f95ecc6fd1967677c1be5dfed6584542 (commit) via 3c5661ec3cd5cdf2f1c3101d90789c83786a6897 (commit) via 791928dc48bcd94ef5cb57b4da36fb5e398e30da (commit) from 4af6c72d790e13fd28abc0d7b2eaaece51fd7862 (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 442e1420f95ecc6fd1967677c1be5dfed6584542 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 15 19:30:11 2011 -0500 Rename gpgsig struct fields for clarity Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3c5661ec3cd5cdf2f1c3101d90789c83786a6897 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Mar 28 12:48:37 2011 -0500 Form the signature file location in one place Since we do this for all cases anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 791928dc48bcd94ef5cb57b4da36fb5e398e30da Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 15 18:53:51 2011 -0500 Header inclusion cleanup This does touch a lot of things, and hopefully doesn't break things on other platforms, but allows us to also clean up a bunch of crud that no longer needs to be there. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 2 -- lib/libalpm/alpm_list.c | 1 - lib/libalpm/be_local.c | 6 ------ lib/libalpm/be_package.c | 9 +-------- lib/libalpm/be_sync.c | 5 ++--- lib/libalpm/db.c | 18 ++++-------------- lib/libalpm/group.c | 1 - lib/libalpm/handle.c | 2 -- lib/libalpm/log.c | 3 --- lib/libalpm/package.c | 31 ++++++++++++++----------------- lib/libalpm/remove.c | 4 +--- lib/libalpm/signing.c | 36 ++++++++++++++++++++---------------- lib/libalpm/signing.h | 6 +++--- lib/libalpm/sync.c | 2 -- lib/libalpm/trans.c | 4 ---- lib/libalpm/util.c | 1 - src/pacman/database.c | 1 - src/pacman/deptest.c | 4 ---- src/pacman/package.c | 1 - src/pacman/pacman.c | 2 -- src/pacman/query.c | 1 - src/pacman/util.c | 1 - test/pacman/pmpkg.py | 4 ++-- 23 files changed, 47 insertions(+), 98 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] VerbosePkgLists, size strings, manpage
by Jakob Gruber 21 Apr '11

21 Apr '11

Hi, these patches add a VerbosePkgLists option to pacman.conf which applies to install, upgrade and remove operations and produces the following example output: Targets (25): Pkg Name New Version Old Version Size asciidoc 8.6.4-1 8.6.3-1 0.15 MB chromium 9.0.597.94-2 9.0.597.94-1 17.80 MB ... wine 1.3.14-1 1.3.13-2 24.67 MB Total Download Size: 158.41 MB Total Installed Size: 693.05 MB While the output is identical to Justin Lampley's patch from March 2008 (posted here: https://bugs.archlinux.org/task/15772) the table_display function in these patches should be simpler to use. I also consolidated size to string conversions (hope I got most of them) and made a few minor adjustments to the pacman manpage.

4 30

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.2-1-g74994fa
by dan＠archlinux.org 21 Apr '11

21 Apr '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, maint has been updated via 74994faee7ce1681f24a3fc0a108dc4f9b824ffc (commit) from 18c73b00027128d535b89b5ccc8894f00669620c (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 74994faee7ce1681f24a3fc0a108dc4f9b824ffc Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Apr 3 10:34:32 2011 +0200 doc/pacman: split -Su description in 3 paragraphs One paragraph for -Suu and one for -Su foo. Fixes FS#23451. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-114-g4af6c72
by dan＠archlinux.org 21 Apr '11

21 Apr '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 4af6c72d790e13fd28abc0d7b2eaaece51fd7862 (commit) via 6760ec2b770e65f2aae9cfd39135cefd49961195 (commit) via 2c8c763723b43ddcb865aab325afc9c76907cb64 (commit) via 91594a1ef895a6e47ece299b762d5476f1bca348 (commit) via fdcfcf28a28006a4239e54a34129d3b099d0df0d (commit) via a6c05458d44afa27d0b8771e86bdb57facf66071 (commit) via 4c31bc6e3f32d954a9a0f81555abe5b91db3a6d3 (commit) via cb35affd1b2ac7bb489c8774685225672c5a3d9f (commit) via e95be3379ab79ea24ad7ae5a4676388df27d0bbb (commit) via 0152266dd3ce0393f5e9519aaa1d7da7e6051694 (commit) from 50de7019c0bbd917b0a1717566ddad41c7c6db9e (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 4af6c72d790e13fd28abc0d7b2eaaece51fd7862 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Apr 20 19:45:16 2011 -0500 syntax: if/while statements should have no trailing space This is the standard, and we have had a few of these introduced lately that should not be here. Done with: find -name '*.c' | xargs sed -i -e 's#if (#if(#g' find -name '*.c' | xargs sed -i -e 's#while (#while(#g' Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6760ec2b770e65f2aae9cfd39135cefd49961195 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 25 21:40:16 2011 -0400 Allow VerifySig to act as a default verification in [options] * add _alpm_db_get_sigverify_level * add alpm_option_{get,set}_default_sigverify And set the default verification level to OPTIONAL if not set otherwise. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2c8c763723b43ddcb865aab325afc9c76907cb64 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Apr 20 19:29:14 2011 -0500 alpm.h: forward-declare shared enumerations Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 91594a1ef895a6e47ece299b762d5476f1bca348 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 25 11:57:20 2011 -0400 style cleanup: cast as (type *) not (type*) Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fdcfcf28a28006a4239e54a34129d3b099d0df0d Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 25 11:58:16 2011 -0400 lib: remove dead code in be_local and be_package Signed-off-by: Dave Reisner <d(a)falconindy.com> commit a6c05458d44afa27d0b8771e86bdb57facf66071 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Apr 20 19:00:59 2011 -0500 Put comments on their own line Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4c31bc6e3f32d954a9a0f81555abe5b91db3a6d3 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 17 22:38:35 2011 +1000 Add configure option to specify package signing key Add the "GPGKEY" option to makepkg.conf for specifying signing packages with the non-default key from the keyring. Is overridded by makepkg's --key option. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cb35affd1b2ac7bb489c8774685225672c5a3d9f Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 17 22:17:24 2011 +1000 Document makepkg package signing options Dan: fix some grammar issues. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e95be3379ab79ea24ad7ae5a4676388df27d0bbb Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sun Feb 20 15:00:26 2011 +0100 New VerbosePkgLists option If enabled, displays package lists for upgrade, sync and remove operations formatted as a table. Falls back to default list display if insufficient terminal columns are available. Example output: :: Starting full system upgrade... :: Replace libjpeg with testing/libjpeg-turbo? [Y/n] resolving dependencies... looking for inter-conflicts... Remove (1): Name Old Version Size libjpeg 8.3.0-1 0.83 MB Total Removed Size: 0.83 MB Targets (5): Name Old Version New Version Size libjpeg-turbo 1.1.0-1 0.20 MB linux-firmware 20110201-1 20110227-1 8.23 MB ncurses 5.7-4 5.8-1 0.92 MB ppl 0.11.1-1 0.11.2-1 2.74 MB v4l-utils 0.8.1-1 0.8.3-1 0.23 MB Total Download Size: 12.32 MB Total Installed Size: 58.82 MB Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0152266dd3ce0393f5e9519aaa1d7da7e6051694 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sat Feb 19 23:23:42 2011 +0100 Table formatted output functions table_display takes a list of lists of strings (representing the table cells) and displays them formatted as a table. The exact format depends on the longest string in each column. Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 12 +++ doc/makepkg.conf.5.txt | 4 + doc/pacman.conf.5.txt | 4 + etc/makepkg.conf.in | 2 + etc/pacman.conf.in | 1 + lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 52 +++++++---- lib/libalpm/alpm_list.c | 26 +++--- lib/libalpm/be_local.c | 9 +-- lib/libalpm/be_package.c | 14 +--- lib/libalpm/db.c | 8 +- lib/libalpm/deps.c | 12 ++-- lib/libalpm/diskspace.c | 6 +- lib/libalpm/dload.c | 4 +- lib/libalpm/handle.c | 55 ++++++++----- lib/libalpm/handle.h | 9 +- lib/libalpm/package.c | 4 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/remove.c | 4 +- lib/libalpm/signing.c | 29 +++++-- lib/libalpm/signing.h | 1 + lib/libalpm/sync.c | 34 +++++-- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 18 ++-- scripts/makepkg.sh.in | 14 ++-- src/pacman/callback.c | 8 +- src/pacman/conf.h | 8 ++- src/pacman/package.c | 4 +- src/pacman/pacman.c | 65 +++++++++------ src/pacman/query.c | 16 ++-- src/pacman/sync.c | 8 +- src/pacman/util.c | 211 +++++++++++++++++++++++++++++++++++++++++++--- src/pacman/util.h | 1 + src/util/pactree.c | 4 +- src/util/testdb.c | 2 +- 35 files changed, 468 insertions(+), 187 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 0/4] addition of API methods and backend work
by Dave Reisner 21 Apr '11

21 Apr '11

I've had the ensuing patches on my tree for a few days. A quick outline of what they accomplish: 1) Replace the old libfetch method of setting useragent (via an environment var) with proper get/set methods. 2) Refactor signature downloading to ensure that the sig file is downloaded from the same mirror as the file itself. 3) Add handling for VerifySig in the [options] section of pacman.conf. This should probably be split into two patches (front end/back end), as it adds another API interface. I'm not sold on the naming convention I've used either. Feedback (and dan's criticism) is welcome. d

3 12