- Pacman-dev - lists.archlinux.org

[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