August 2011 - Pacman-dev - lists.archlinux.org

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

29 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 2cfcc874b9332ad207398b9e20dc8880d93e8ae4 (commit) via dc3336c27728fc16d2f9e68cb818648e7ca88467 (commit) via c7e4005e5ced965db49d73067fe40c516b6c34df (commit) via de43d00db071a04653cff592607647bb9c01d025 (commit) via 12387ca4e5c16994bacad52c142ef94868ba545a (commit) via 0dad2f6e6223e2aa00c43b59f49bf83082a0d6bb (commit) via a12a4ea3960c98817aa60df5a8879d118a16e2a7 (commit) via 455ca55f4efecf48bf86904e4a67a4b124cf1838 (commit) via a2002b8f690e12a7e8c75a3a9184570d27709c71 (commit) via 87fb8f5d5795be9b2bcb025eac26c94d7bb1e7b3 (commit) via 84d6de806bd18f4a6c0940de5ee60904f650539c (commit) via 5a07b75b225cbc731fbfb915a9c9edf0c300ccc4 (commit) via be72e100159e6cd50ac64e3639f8e4f98218ccae (commit) via c5982a3eb5287afdec6c9b859f81795c773da8fe (commit) from e1dce078b247142f7db80bf2d338e431df34691e (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 2cfcc874b9332ad207398b9e20dc8880d93e8ae4 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 18:29:00 2011 -0500 Better error handling out of package load method There are many other ways to fail a package load other than "file not found". We should also use the correct error code in this case. Clean it up a bit in the various callers. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dc3336c27728fc16d2f9e68cb818648e7ca88467 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 16:40:39 2011 -0500 Refactor some args out of pkg_load_internal Just pass the entire sync package in if we have it; that way we can do any necessary operations involving it rather than have a parameter list growing endlessly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c7e4005e5ced965db49d73067fe40c516b6c34df Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 10:29:02 2011 -0500 Add more info to debug key display Signed-off-by: Dan McGee <dan(a)archlinux.org> commit de43d00db071a04653cff592607647bb9c01d025 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 24 13:24:42 2011 -0500 Refactor signature result return format I was trying to take a shortcut and not introduce a wrapper struct for the signature results, so packed it all into alpm_sigresult_t in the first iteration. However, this is painful when one wants to add new fields or only return information regarding a single signature. Refactor the type into a few components which are exposed to the end user, and will allow a lot more future flexibility. This also exposes more information regarding the key to the frontend than was previously available. The "private" void *data pointer is used by the library to store the actual key object returned by gpgme; it is typed this way so the frontend has no expectations of what is there, and so we don't have any hard gpgme requirement in our public API. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 12387ca4e5c16994bacad52c142ef94868ba545a Author: Diogo Sousa <diogogsousa(a)gmail.com> Date: Sat Aug 27 22:03:45 2011 +0100 lib/libalpm/signing.c: Fix memory leak in decode_signature() in case of error. Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0dad2f6e6223e2aa00c43b59f49bf83082a0d6bb Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Fri Aug 26 13:10:38 2011 +0200 lib/libalpm/util.c: Fix two memory leaks Free "md5sum" if md5_file() fails in alpm_compute_md5sum(). Free "sha256sum" if sha2_file() fails in alpm_compute_sha256sum(). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a12a4ea3960c98817aa60df5a8879d118a16e2a7 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 28 19:46:09 2011 -0500 Check local database status flag in db_write sanity check block Do all the checks at once; this also avoids the 'return' call after we have allocated memory for "pkgpath" as well as tweaked the umask. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 455ca55f4efecf48bf86904e4a67a4b124cf1838 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Fri Aug 26 13:10:37 2011 +0200 be_sync.c: Fix memory leak in alpm_db_update() Free "syncpath" and restore umask if we fail to grab a lock. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a2002b8f690e12a7e8c75a3a9184570d27709c71 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Fri Aug 26 13:10:35 2011 +0200 pacman.c: Remove redundant strdup() in parsearg_global() config_set_arch() already calls strdup(). Remove strdup() from the config_set_arch() invocation to avoid a memory leak. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 87fb8f5d5795be9b2bcb025eac26c94d7bb1e7b3 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 18:37:23 2011 -0500 Make sync error message smarter on unfound targets We had two issues here. One is a file with an absolute path passed to -S results in a cryptic error message due to the database name being '\0'. The second is not realizing you should be doing -U instead of -S. Fix both of these to transform this: $ sudo pacman -S /tmp/binutils-2.21.1-2-i686.pkg.tar.xz error: database not found: to this: $ sudo pacman -S /tmp/binutils-2.21.1-2-i686.pkg.tar.xz error: target not found: /tmp/binutils-2.21.1-2-i686.pkg.tar.xz warning: '/tmp/binutils-2.21.1-2-i686.pkg.tar.xz' is a file, did you mean -U/--upgrade instead of -S/--sync? Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 84d6de806bd18f4a6c0940de5ee60904f650539c Author: Dan McGee <dan(a)archlinux.org> Date: Sat Aug 27 08:45:39 2011 -0500 Fix possible mismatched type with several curl arguments After commit 2e7d0023150664, we use off_t rather than long variables. Use the _LARGE variants of the methods to indicate we are passing off_t sized variables, and cast using (curl_off_t) accordingly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5a07b75b225cbc731fbfb915a9c9edf0c300ccc4 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 17:41:47 2011 -0500 Always process validity value returned by gpgme Don't force 'never'; you should be checking both the status and validity anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit be72e100159e6cd50ac64e3639f8e4f98218ccae Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 17:41:27 2011 -0500 Fix small memory leak in sig check code Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5982a3eb5287afdec6c9b859f81795c773da8fe Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 17:14:19 2011 -0500 strtrim: don't move empty string There were many cases where the string coming in was a blank line, e.g. "\n\0", length 1. The trim routine starts by trimming leading spaces, thus trimming everything. We would then proceed to do a memmove of the NULL byte, which is completely worthless as we can just assign it instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 28 +++++++--- lib/libalpm/be_local.c | 6 +-- lib/libalpm/be_package.c | 68 ++++++++++++----------- lib/libalpm/be_sync.c | 2 + lib/libalpm/dload.c | 6 ++- lib/libalpm/package.h | 3 +- lib/libalpm/signing.c | 133 ++++++++++++++++++++++----------------------- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 3 +- lib/libalpm/util.c | 9 +++- src/pacman/package.c | 8 ++-- src/pacman/pacman.c | 2 +- src/pacman/query.c | 14 ++++- src/pacman/sync.c | 9 ++- src/pacman/util.c | 22 +++++--- src/pacman/util.h | 2 +- src/util/pactree.c | 7 ++- src/util/testpkg.c | 3 + valgrind.supp | 1 - 19 files changed, 186 insertions(+), 142 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/4] pacman.c: Remove redundant strdup() in parsearg_global()
by Lukas Fleischer 29 Aug '11

29 Aug '11

config_set_arch() already calls strdup(). Remove strdup() from the config_set_arch() invocation to avoid a memory leak. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- src/pacman/pacman.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 71413bd..d285a05 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -385,7 +385,7 @@ static int parsearg_global(int opt) switch(opt) { case OP_ARCH: check_optarg(); - config_set_arch(strdup(optarg)); + config_set_arch(optarg); break; case OP_ASK: check_optarg(); -- 1.7.6.1

2 7

[pacman-dev] Inconsistent output when db.lck present
by Allan McRae 28 Aug '11

28 Aug '11

For example: allan@mugen ~ > sudo touch /var/lib/pacman/db.lck Password: allan@mugen ~ > pacman -Syu :: Synchronizing package databases... error: failed to update allanbrokeit (unable to lock database) error: failed to update kernel64 (unable to lock database) error: failed to update testing (unable to lock database) error: failed to update core (unable to lock database) error: failed to update extra (unable to lock database) error: failed to update community-testing (unable to lock database) error: failed to update community (unable to lock database) error: failed to synchronize any databases allan@mugen ~ > pacman -U /var/abs/local/pacman-git/pacman-git-20110828-1-i686.pkg.tar.xz error: failed to init transaction (unable to lock database) if you're sure a package manager is not already running, you can remove /var/lib/pacman/db.lck Allan

3 2

[pacman-dev] [PATCH] Fix possible mismatched type with several curl arguments
by Dan McGee 27 Aug '11

27 Aug '11

After commit 2e7d0023150664, we use off_t rather than long variables. Use the _LARGE variants of the methods to indicate we are passing off_t sized variables, and cast using (curl_off_t) accordingly. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/dload.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 6ae6917..8cdb075 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -205,7 +205,8 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(handle->curl, CURLOPT_WRITEHEADER, (void *)payload); if(payload->max_size) { - curl_easy_setopt(handle->curl, CURLOPT_MAXFILESIZE, payload->max_size); + curl_easy_setopt(handle->curl, CURLOPT_MAXFILESIZE_LARGE, + (curl_off_t)payload->max_size); } if(useragent != NULL) { @@ -220,7 +221,8 @@ static void curl_set_handle_opts(struct dload_payload *payload, } else if(stat(payload->tempfile_name, &st) == 0 && payload->allow_resume) { /* a previous partial download exists, resume from end of file. */ payload->tempfile_openmode = "ab"; - curl_easy_setopt(handle->curl, CURLOPT_RESUME_FROM, (long)st.st_size); + curl_easy_setopt(handle->curl, CURLOPT_RESUME_FROM_LARGE, + (curl_off_t)st.st_size); _alpm_log(handle, ALPM_LOG_DEBUG, "tempfile found, attempting continuation\n"); payload->initial_size = st.st_size; } -- 1.7.6

2 1

[pacman-dev] [PATCH 1/5] Remove trans is NULL check in QUESTION/EVENT/PROGRESS macros
by Dan McGee 26 Aug '11

26 Aug '11

trans cannot (and better not) be NULL at any point when these are being called. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/trans.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index 9a60e71..6d5c08d 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -49,19 +49,19 @@ struct __alpm_trans_t { #define EVENT(t, e, d1, d2) \ do { \ - if((t) && (t)->cb_event) { \ + if((t)->cb_event) { \ (t)->cb_event(e, d1, d2); \ } \ } while(0) #define QUESTION(t, q, d1, d2, d3, r) \ do { \ - if((t) && (t)->cb_conv) { \ + if((t)->cb_conv) { \ (t)->cb_conv(q, d1, d2, d3, r); \ } \ } while(0) #define PROGRESS(t, e, p, per, h, r) \ do { \ - if((t) && (t)->cb_progress) { \ + if((t)->cb_progress) { \ (t)->cb_progress(e, p, per, h, r); \ } \ } while(0) -- 1.7.6

4 7

[pacman-dev] [PATCH 1/2] pacman-key: refine permission and locking checks
by Dan McGee 26 Aug '11

26 Aug '11

* secring.gpg can be 600, readable by root user only * ensure grep for lock-never option in check_keyring doesn't catch comments Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/pacman-key.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 819ec69..5b4320d 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -108,7 +108,8 @@ initialize() { [[ -f ${PACMAN_KEYRING_DIR}/pubring.gpg ]] || touch ${PACMAN_KEYRING_DIR}/pubring.gpg [[ -f ${PACMAN_KEYRING_DIR}/secring.gpg ]] || touch ${PACMAN_KEYRING_DIR}/secring.gpg [[ -f ${PACMAN_KEYRING_DIR}/trustdb.gpg ]] || "${GPG_PACMAN[@]}" --update-trustdb - chmod 644 ${PACMAN_KEYRING_DIR}/{{pub,sec}ring,trustdb}.gpg + chmod 644 ${PACMAN_KEYRING_DIR}/{pubring,trustdb}.gpg + chmod 600 ${PACMAN_KEYRING_DIR}/secring.gpg # gpg.conf [[ -f ${PACMAN_KEYRING_DIR}/gpg.conf ]] || touch ${PACMAN_KEYRING_DIR}/gpg.conf @@ -120,7 +121,6 @@ initialize() { check_keyring() { if [[ ! -r ${PACMAN_KEYRING_DIR}/pubring.gpg || \ - ! -r ${PACMAN_KEYRING_DIR}/secring.gpg || \ ! -r ${PACMAN_KEYRING_DIR}/trustdb.gpg ]]; then error "$(gettext "You do not have sufficient permissions to read the %s keyring...")" "pacman" msg "$(gettext "Use '%s' to correct the keyring permissions.")" "pacman-key --init" @@ -128,7 +128,7 @@ check_keyring() { fi if (( (EXPORT || FINGER || LIST || VERIFY) && EUID != 0 )); then - if ! grep -w -q "lock-never" ${PACMAN_KEYRING_DIR}/gpg.conf &>/dev/null; then + if ! grep -q "^[[:space:]]*lock-never[[:space:]]*$" ${PACMAN_KEYRING_DIR}/gpg.conf &>/dev/null; then error "$(gettext "You do not have sufficient permissions to run this command...")" msg "$(gettext "Use '%s' to correct the keyring permissions.")" "pacman-key --init" exit 1 -- 1.7.6.1

2 3

[pacman-dev] [PATCH 2/5] pacman-key: import everything then revoke on --populate
by Allan McRae 26 Aug '11

26 Aug '11

The optimization of only importing keys that were not to be later revoked was a not smart enough. For example, if a key was in both a repos keyring and its revoke list, alternate runs of pacman-key --populate would add then remove the key from the pacman keyring. This problem is made worse when considering the possibility of multiple keyrings being imported. Instead, import all keys followed by the revoking of all keys. This may result in a key being added then revoked, but that is not much of an issue given that is a very fast operation. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/pacman-key.sh.in | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 8580100..3e31abb 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -199,7 +199,16 @@ populate_keyring() { local key local key_id - # Read the key ids to an array. The conversion from whatever is inside the file + # Add keys from requested keyrings + for keyring in ${KEYRINGIDS[@]}; do + msg "$(gettext "Appending keys from %s.gpg...")" "$keyring" + local add_keys="$("${GPG_NOKEYRING[@]}" --keyring "${KEYRING_IMPORT_DIR}/${keyring}.gpg" --with-colons --list-keys | grep ^pub | cut -d: -f5)" + for key_id in ${add_keys}; do + "${GPG_NOKEYRING[@]}" --keyring "${KEYRING_IMPORT_DIR}/${keyring}.gpg" --export "${key_id}" | "${GPG_PACMAN[@]}" --import + done + done + + # Read the revoked 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 @@ -236,18 +245,6 @@ populate_keyring() { done fi - # Add keys from requested keyrings - for keyring in ${KEYRINGIDS[@]}; do - msg "$(gettext "Appending keys from %s.gpg...")" "$keyring" - local add_keys="$("${GPG_NOKEYRING[@]}" --keyring "${KEYRING_IMPORT_DIR}/${keyring}.gpg" --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 "${KEYRING_IMPORT_DIR}/${keyring}.gpg" --export "${key_id}" | "${GPG_PACMAN[@]}" --import - fi - done - done - # Remove the keys not marked to keep if (( ${#removed_ids[@]} > 0 )); then msg "$(gettext "Removing revoked keys from keyring...")" -- 1.7.6

3 6

[pacman-dev] [PATCH] Make sync error message smarter on unfound targets
by Dan McGee 25 Aug '11

25 Aug '11

We had two issues here. One is a file with an absolute path passed to -S results in a cryptic error message due to the database name being '\0'. The second is not realizing you should be doing -U instead of -S. Fix both of these to transform this: $ sudo pacman -S /tmp/binutils-2.21.1-2-i686.pkg.tar.xz error: database not found: to this: $ sudo pacman -S /tmp/binutils-2.21.1-2-i686.pkg.tar.xz error: target not found: /tmp/binutils-2.21.1-2-i686.pkg.tar.xz warning: '/tmp/binutils-2.21.1-2-i686.pkg.tar.xz' is a file, did you mean -U/--upgrade instead of -S/--sync? Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/sync.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index ea32a26..a7fe5be 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -672,8 +672,6 @@ static int process_targname(alpm_list_t *dblist, const char *targname) /* #FS#23342 - skip ignored packages when user says no */ if(alpm_errno(config->handle) == ALPM_ERR_PKG_IGNORED) { pm_printf(ALPM_LOG_WARNING, _("skipping target: %s\n"), targname); - /* TODO how to do this, we shouldn't be fucking with it from the frontend */ - /* pm_errno = 0; */ return 0; } @@ -693,7 +691,7 @@ static int process_target(const char *target) int ret = 0; alpm_list_t *dblist = NULL; - if(targname) { + if(targname && targname != targstring) { alpm_db_t *db = NULL; *targname = '\0'; @@ -716,6 +714,11 @@ static int process_target(const char *target) } cleanup: free(targstring); + if(ret && access(target, R_OK) == 0) { + pm_fprintf(stderr, ALPM_LOG_WARNING, + _("'%s' is a file, did you mean %s instead of %s?"), + target, "-U/--upgrade", "-S/--sync"); + } return ret; } -- 1.7.6

1 0

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

25 Aug '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via e1dce078b247142f7db80bf2d338e431df34691e (commit) via 6aa9fdce5ac59f4137567c17043fdd9e73b03518 (commit) via 0ee3ce70a88a42387d19f0d58901fda21b0161b7 (commit) via 73fcf17041cf00e0b6c3082bd354b8eaab412dab (commit) via 30cad47fb91dec0748551cb7d8607871b95785e5 (commit) via f7a3c4c8df95ad99e05dfd29c61d6877b13b09da (commit) via 2e7d002315066400ccb1e62dacb3500fa3aa6015 (commit) via f0357e415c10c10e691c1ed881b1c1ebe32e3084 (commit) via 5c48ca3239f56dfdae1d82ce03140bc310a6213e (commit) from 268d0bbcbed29b684af7478467bab4bdc2785636 (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 e1dce078b247142f7db80bf2d338e431df34691e Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 24 23:19:06 2011 -0500 Remove argument from check_pgp_helper This one wasn't all that necessary as we only used it in one place in the function, which can be checked easily enough at the call site. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6aa9fdce5ac59f4137567c17043fdd9e73b03518 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 00:07:03 2011 -0500 Remove trans is NULL check in QUESTION/EVENT/PROGRESS macros trans cannot (and better not) be NULL at any point when these are being called. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0ee3ce70a88a42387d19f0d58901fda21b0161b7 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 24 22:13:26 2011 -0500 Remove short/long label distinction We only used short labels in one place, and the short label is always the first character of the long label anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 73fcf17041cf00e0b6c3082bd354b8eaab412dab Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 24 21:55:56 2011 -0500 Slight refresh of the download progress callback This cleans up some of the mess we have here. * switch to long units for the download size * omit the .0 decimal part from the download rate * omit the almost always zero HH: from estimated time if eta_h == 0 * Display --:-- if eta_h > 99; formatting was screwed up before The net result of this is we usually have 1 more character to use for filename display. Before: extra 500.9K 1242.4K/s 00:00:00 [######################] 100% community-testing 947.0B 28.2M/s 00:00:00 [######################] 100% multilib 26.5K 405.1K/s 00:00:00 [######################] 100% community 450.6K 1238.3K/s 00:00:00 [######################] 100% After: extra 500.9 KiB 1118K/s 00:00 [######################] 100% community-testing 947.0 B 23M/s 00:00 [######################] 100% multilib 26.5 KiB 255K/s 00:00 [######################] 100% community 450.6 KiB 1211K/s 00:00 [######################] 100% Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 30cad47fb91dec0748551cb7d8607871b95785e5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 24 21:52:32 2011 -0500 Add a few more sizes to humanize_sizes() Because why the hell not? Exbibyte, zebibyte, and yobibyte are going in, even though nothing bigger than the 2^60 exbibyte can be represented using an off_t variable anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f7a3c4c8df95ad99e05dfd29c61d6877b13b09da Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 24 19:58:14 2011 -0500 Finish large file download attack prevention This handles the no Content-Length header problem as stated in the comments of FS#23413. We add a quick check to the callback that will force an abort if the downloaded data exceeds the payload size, and then check for this error in the post-download cleanup code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2e7d002315066400ccb1e62dacb3500fa3aa6015 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 24 19:48:03 2011 -0500 Use off_t rather than double where possible Beautiful of libcurl to use floating point types for what are never fractional values. We can do better, and we usually want these values in their integer form anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f0357e415c10c10e691c1ed881b1c1ebe32e3084 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 16:04:09 2011 -0500 Add new 'lt' and 'zh_TW' translations from transifex Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5c48ca3239f56dfdae1d82ce03140bc310a6213e Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 15:53:25 2011 -0500 Update existing translations from Transifex Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_package.c | 3 +- lib/libalpm/be_sync.c | 3 +- lib/libalpm/dload.c | 39 +- lib/libalpm/dload.h | 4 +- lib/libalpm/po/LINGUAS | 2 + lib/libalpm/po/{sr(a)latin.po => lt.po} | 297 ++++++------ lib/libalpm/po/sv.po | 11 +- lib/libalpm/po/uk.po | 186 ++++---- lib/libalpm/po/{zh_CN.po => zh_TW.po} | 290 ++++++------ lib/libalpm/signing.c | 7 +- lib/libalpm/signing.h | 3 +- lib/libalpm/trans.h | 6 +- scripts/po/LINGUAS | 2 + scripts/po/ca.po | 10 +- scripts/po/cs.po | 10 +- scripts/po/da.po | 10 +- scripts/po/de.po | 91 +++- scripts/po/el.po | 10 +- scripts/po/en_GB.po | 10 +- scripts/po/es.po | 10 +- scripts/po/fi.po | 10 +- scripts/po/fr.po | 10 +- scripts/po/hu.po | 10 +- scripts/po/it.po | 10 +- scripts/po/kk.po | 10 +- scripts/po/{it.po => lt.po} | 728 ++++++++++++++------------- scripts/po/nb.po | 10 +- scripts/po/pl.po | 10 +- scripts/po/pt.po | 10 +- scripts/po/pt_BR.po | 10 +- scripts/po/ro.po | 10 +- scripts/po/ru.po | 10 +- scripts/po/sk.po | 10 +- scripts/po/sr.po | 10 +- scripts/po/sr(a)latin.po | 10 +- scripts/po/sv.po | 25 +- scripts/po/tr.po | 10 +- scripts/po/uk.po | 10 +- scripts/po/zh_CN.po | 10 +- scripts/po/{pacman-scripts.pot => zh_TW.po} | 14 +- src/pacman/callback.c | 32 +- src/pacman/package.c | 4 +- src/pacman/po/LINGUAS | 2 + src/pacman/po/ca.po | 36 +- src/pacman/po/cs.po | 36 +- src/pacman/po/da.po | 40 +- src/pacman/po/de.po | 43 +- src/pacman/po/el.po | 42 +- src/pacman/po/en_GB.po | 42 +- src/pacman/po/es.po | 36 +- src/pacman/po/fi.po | 36 +- src/pacman/po/fr.po | 42 +- src/pacman/po/hu.po | 36 +- src/pacman/po/it.po | 42 +- src/pacman/po/kk.po | 36 +- src/pacman/po/{pacman.pot => lt.po} | 547 +++++++++++--------- src/pacman/po/nb.po | 36 +- src/pacman/po/pl.po | 36 +- src/pacman/po/pt.po | 36 +- src/pacman/po/pt_BR.po | 36 +- src/pacman/po/ro.po | 42 +- src/pacman/po/ru.po | 36 +- src/pacman/po/sk.po | 42 +- src/pacman/po/sr.po | 36 +- src/pacman/po/sr(a)latin.po | 36 +- src/pacman/po/sv.po | 166 ++++--- src/pacman/po/tr.po | 36 +- src/pacman/po/uk.po | 351 +++++++------ src/pacman/po/zh_CN.po | 36 +- src/pacman/po/{zh_CN.po => zh_TW.po} | 530 ++++++++++---------- src/pacman/util.c | 22 +- src/pacman/util.h | 2 +- 72 files changed, 2466 insertions(+), 2006 deletions(-) copy lib/libalpm/po/{sr(a)latin.po => lt.po} (54%) copy lib/libalpm/po/{zh_CN.po => zh_TW.po} (57%) copy scripts/po/{it.po => lt.po} (50%) copy scripts/po/{pacman-scripts.pot => zh_TW.po} (98%) copy src/pacman/po/{pacman.pot => lt.po} (54%) copy src/pacman/po/{zh_CN.po => zh_TW.po} (58%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove short/long label distinction
by Dan McGee 25 Aug '11

25 Aug '11

We only used short labels in one place, and the short label is always the first character of the long label anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/callback.c | 8 ++++---- src/pacman/package.c | 4 ++-- src/pacman/util.c | 22 +++++++++------------- src/pacman/util.h | 2 +- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 63f7b55..04b3a52 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -663,12 +663,12 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) } - rate_human = humanize_size((off_t)rate, '\0', 0, &rate_label); - xfered_human = humanize_size(xfered, '\0', 1, &xfered_label); + rate_human = humanize_size((off_t)rate, '\0', &rate_label); + xfered_human = humanize_size(xfered, '\0', &xfered_label); printf(" %ls%-*s ", wcfname, padwid, ""); - printf("%6.1f %3s %4.f%s/s ", - xfered_human, xfered_label, rate_human, rate_label); + printf("%6.1f %3s %4.f%c/s ", + xfered_human, xfered_label, rate_human, rate_label[0]); if(eta_h == 0) { printf("%02u:%02u", eta_m, eta_s); } else if(eta_h < 100) { diff --git a/src/pacman/package.c b/src/pacman/package.c index 47b6623..a8c15eb 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -120,14 +120,14 @@ void dump_pkg_full(alpm_pkg_t *pkg, enum pkg_from from, int extra) deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); deplist_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); - size = humanize_size(alpm_pkg_get_size(pkg), 'K', 1, &label); + size = humanize_size(alpm_pkg_get_size(pkg), 'K', &label); if(from == PKG_FROM_SYNCDB) { printf(_("Download Size : %6.2f %s\n"), size, label); } else if(from == PKG_FROM_FILE) { printf(_("Compressed Size: %6.2f %s\n"), size, label); } - size = humanize_size(alpm_pkg_get_isize(pkg), 'K', 1, &label); + size = humanize_size(alpm_pkg_get_isize(pkg), 'K', &label); printf(_("Installed Size : %6.2f %s\n"), size, label); string_display(_("Packager :"), alpm_pkg_get_packager(pkg)); diff --git a/src/pacman/util.c b/src/pacman/util.c index 995b275..f2afbb3 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -776,7 +776,7 @@ static alpm_list_t *create_verbose_row(alpm_pkg_t *pkg, int install) ret = alpm_list_add(ret, str); /* and size */ - size = humanize_size(alpm_pkg_get_size(pkg), 'M', 1, &label); + size = humanize_size(alpm_pkg_get_size(pkg), 'M', &label); pm_asprintf(&str, "%.2f %s", size, label); ret = alpm_list_add(ret, str); @@ -839,19 +839,19 @@ void display_targets(const alpm_list_t *pkgs, int install) printf("\n"); if(install) { - size = humanize_size(dlsize, 'M', 1, &label); + size = humanize_size(dlsize, 'M', &label); printf(_("Total Download Size: %.2f %s\n"), size, label); if(!(config->flags & ALPM_TRANS_FLAG_DOWNLOADONLY)) { - size = humanize_size(isize, 'M', 1, &label); + size = humanize_size(isize, 'M', &label); printf(_("Total Installed Size: %.2f %s\n"), size, label); /* only show this net value if different from raw installed size */ if(rsize > 0) { - size = humanize_size(isize - rsize, 'M', 1, &label); + size = humanize_size(isize - rsize, 'M', &label); printf(_("Net Upgrade Size: %.2f %s\n"), size, label); } } } else { - size = humanize_size(isize, 'M', 1, &label); + size = humanize_size(isize, 'M', &label); printf(_("Total Removed Size: %.2f %s\n"), size, label); } @@ -914,21 +914,17 @@ static char *pkg_get_location(alpm_pkg_t *pkg) * * @return the size in the appropriate unit */ -double humanize_size(off_t bytes, const char target_unit, int long_labels, - const char **label) +double humanize_size(off_t bytes, const char target_unit, const char **label) { - static const char *shortlabels[] = {"B", "K", "M", "G", - "T", "P", "E", "Z", "Y"}; - static const char *longlabels[] = {"B", "KiB", "MiB", "GiB", + static const char *labels[] = {"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"}; - static const int unitcount = sizeof(shortlabels) / sizeof(shortlabels[0]); + static const int unitcount = sizeof(labels) / sizeof(labels[0]); - const char **labels = long_labels ? longlabels : shortlabels; double val = (double)bytes; int index; for(index = 0; index < unitcount - 1; index++) { - if(target_unit != '\0' && shortlabels[index][0] == target_unit) { + if(target_unit != '\0' && labels[index][0] == target_unit) { break; } else if(target_unit == '\0' && val <= 2048.0 && val >= -2048.0) { break; diff --git a/src/pacman/util.h b/src/pacman/util.h index 2411e65..6669847 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -53,7 +53,7 @@ char *strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); alpm_list_t *strsplit(const char *str, const char splitchar); void string_display(const char *title, const char *string); -double humanize_size(off_t bytes, const char target_unit, int long_labels, const char **label); +double humanize_size(off_t bytes, const char target_unit, const char **label); int table_display(const char *title, const alpm_list_t *header, const alpm_list_t *rows); void list_display(const char *title, const alpm_list_t *list); void list_display_linebreak(const char *title, const alpm_list_t *list); -- 1.7.6

1 0