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

[pacman-dev] [PATCH 1/2] Add a few more sizes to humanize_sizes()
by Dan McGee 25 Aug '11

25 Aug '11

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> --- src/pacman/util.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 585f402..995b275 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -917,8 +917,10 @@ static char *pkg_get_location(alpm_pkg_t *pkg) double humanize_size(off_t bytes, const char target_unit, int long_labels, const char **label) { - static const char *shortlabels[] = {"B", "K", "M", "G", "T", "P"}; - static const char *longlabels[] = {"B", "KiB", "MiB", "GiB", "TiB", "PiB"}; + static const char *shortlabels[] = {"B", "K", "M", "G", + "T", "P", "E", "Z", "Y"}; + static const char *longlabels[] = {"B", "KiB", "MiB", "GiB", + "TiB", "PiB", "EiB", "ZiB", "YiB"}; static const int unitcount = sizeof(shortlabels) / sizeof(shortlabels[0]); const char **labels = long_labels ? longlabels : shortlabels; -- 1.7.6

1 1

[pacman-dev] [PATCH 1/2] Use long rather than double where possible
by Dan McGee 25 Aug '11

25 Aug '11

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> --- lib/libalpm/dload.c | 16 ++++++++-------- lib/libalpm/dload.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 8387ae6..bd5ccce 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -43,7 +43,7 @@ #include "handle.h" #ifdef HAVE_LIBCURL -static double prevprogress; /* last download amount */ +static long prevprogress; /* last download amount */ static const char *get_filename(const char *url) { @@ -76,7 +76,7 @@ static int curl_progress(void *file, double dltotal, double dlnow, double UNUSED ultotal, double UNUSED ulnow) { struct dload_payload *payload = (struct dload_payload *)file; - double current_size, total_size; + long current_size, total_size; /* SIGINT sent, abort by alerting curl */ if(dload_interrupted) { @@ -88,20 +88,20 @@ static int curl_progress(void *file, double dltotal, double dlnow, return 0; } - current_size = payload->initial_size + dlnow; - total_size = payload->initial_size + dltotal; + current_size = payload->initial_size + (long)dlnow; + total_size = payload->initial_size + (long)dltotal; - if(DOUBLE_EQ(dltotal, 0) || DOUBLE_EQ(prevprogress, total_size)) { + if(DOUBLE_EQ(dltotal, 0.0) || prevprogress == total_size) { return 0; } /* initialize the progress bar here to avoid displaying it when * a repo is up to date and nothing gets downloaded */ - if(DOUBLE_EQ(prevprogress, 0)) { + if(prevprogress == 0) { payload->handle->dlcb(payload->remote_name, 0, (long)dltotal); } - payload->handle->dlcb(payload->remote_name, (long)current_size, (long)total_size); + payload->handle->dlcb(payload->remote_name, current_size, total_size); prevprogress = current_size; @@ -216,7 +216,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, payload->tempfile_openmode = "ab"; curl_easy_setopt(handle->curl, CURLOPT_RESUME_FROM, (long)st.st_size); _alpm_log(handle, ALPM_LOG_DEBUG, "tempfile found, attempting continuation\n"); - payload->initial_size = (double)st.st_size; + payload->initial_size = st.st_size; } } diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 13034f7..f973f2d 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -33,7 +33,7 @@ struct dload_payload { char *destfile_name; char *content_disp_name; char *fileurl; - double initial_size; + long initial_size; long max_size; int force; int allow_resume; -- 1.7.6

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-89-g268d0bb
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 268d0bbcbed29b684af7478467bab4bdc2785636 (commit) via 30d978a966c1d2a619acc49f204e4da1e0010c83 (commit) via cc03d6366a12cd1926e46265c63fba98f41faaae (commit) via a8a4395098b4ddced5204b386e476565e68508b5 (commit) via 6731d0a9407e00f755d237e889c2e3f5db9cd276 (commit) via dddd6a46a01167f4cfdae1133da34a6d245c9bde (commit) from 762cbf574b66ccbe6d4931e426b6d9e95b191bd5 (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 268d0bbcbed29b684af7478467bab4bdc2785636 Author: Diogo Sousa <diogogsousa(a)gmail.com> Date: Wed Aug 24 17:01:11 2011 +0100 Improved alpm_list_mmerge() performance (fixed coding style) Improved alpm_list_mmerge() performance by removing an extra pass to obtain the tail node. This was actually suggested by a TODO comment. Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 30d978a966c1d2a619acc49f204e4da1e0010c83 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 23 01:49:29 2011 -0500 vercmp: ensure 2.0a and 2.0.a do not compare equal We had this interesting set of facts conundrum, according to vercmp return values: 2.0a < 2.0 2.0 < 2.0.a 2.0a == 2.0.a This introduces a code change that ensures '2.0a < 2.0.a' as would be expected by the first two comparisons. Unfortunately this stays us a bit further from upstream RPM code, but those are the breaks (in RPM, the versions involving 'a' do in fact compare the same, but they are both greater than the bare '2.0'). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cc03d6366a12cd1926e46265c63fba98f41faaae Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 23 01:47:45 2011 -0500 Style-match rpmvercmp code with upstream Not sure how or why some of this differed, but it is easy enough to set it back to how it was so it is easier to diff. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a8a4395098b4ddced5204b386e476565e68508b5 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 23 01:05:02 2011 -0500 Retrieve default SigLevel value from backend after initial setting This ensures we grab and use the library default once we have processed the global SigLevel setting, but before processing the repo-specific settings. This means the following two configs will now evaluate the same, as the backend currently defaults to 'Optional': Config 1: [options] # nothing here [repo] SigLevel = TrustAll Config 2: [options] SigLevel = Optional [repo] SigLevel = TrustAll Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6731d0a9407e00f755d237e889c2e3f5db9cd276 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Aug 22 19:07:35 2011 -0400 sync: halt file discovery if repo has no servers This avoids error spam when no servers are configured for a repo and a sync operation is performed: Proceed with installation? [Y/n] y :: Retrieving packages from testing... warning: failed to retrieve some files from testing warning: failed to retrieve some files from testing warning: failed to retrieve some files from testing warning: failed to retrieve some files from testing warning: failed to retrieve some files from testing warning: failed to retrieve some files from testing warning: failed to retrieve some files from testing warning: failed to retrieve some files from testing warning: failed to retrieve some files from testing warning: failed to retrieve some files from testing Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dddd6a46a01167f4cfdae1133da34a6d245c9bde Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sat Aug 20 09:28:07 2011 +0200 Fix formatting in pacman-key manpage Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman-key.8.txt | 4 ++-- doc/pacman.8.txt | 2 +- doc/vercmp.8.txt | 2 +- lib/libalpm/alpm_list.c | 25 +++++++++++++++---------- lib/libalpm/sync.c | 8 ++++++++ lib/libalpm/version.c | 27 ++++++++++++++++----------- src/pacman/conf.c | 3 +++ test/util/vercmptest.sh | 6 ++++++ 8 files changed, 52 insertions(+), 25 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Improved alpm_list_mmerge() performance (fixed coding style)
by Diogo Sousa 24 Aug '11

24 Aug '11

Improved alpm_list_mmerge() performance by removing an extra pass to obtain the tail node. This was actually suggested by a TODO comment. I hope the coding style is ok this time :) Thanks Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> --- lib/libalpm/alpm_list.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 83b9824..0ab9356 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -206,12 +206,18 @@ alpm_list_t SYMEXPORT *alpm_list_join(alpm_list_t *first, alpm_list_t *second) */ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn) { - alpm_list_t *newlist, *lp; + alpm_list_t *newlist, *lp, *tail_ptr, *left_tail_ptr, *right_tail_ptr; - if(left == NULL) + if(left == NULL) { return right; - if(right == NULL) + } + if(right == NULL) { return left; + } + + /* Save tail node pointers for future use */ + left_tail_ptr = left->prev; + right_tail_ptr = right->prev; if(fn(left->data, right->data) <= 0) { newlist = left; @@ -242,19 +248,18 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, a if(left != NULL) { lp->next = left; left->prev = lp; + tail_ptr = left_tail_ptr; } else if(right != NULL) { lp->next = right; right->prev = lp; + tail_ptr = right_tail_ptr; } - - /* Find our tail pointer - * TODO maintain this in the algorithm itself */ - lp = newlist; - while(lp && lp->next) { - lp = lp->next; + else { + tail_ptr = lp; } - newlist->prev = lp; + + newlist->prev = tail_ptr; return newlist; } -- 1.7.6

2 1

[pacman-dev] [PATCH] Improved alpm_list_mmerge() performance
by Diogo Sousa 24 Aug '11

24 Aug '11

Improved alpm_list_mmerge() performance by removing an extra final linear search of the tail node. This was actually suggested by a TODO comment. Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> --- lib/libalpm/alpm_list.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 83b9824..d50dce1 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -206,13 +206,17 @@ alpm_list_t SYMEXPORT *alpm_list_join(alpm_list_t *first, alpm_list_t *second) */ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp fn) { - alpm_list_t *newlist, *lp; + alpm_list_t *newlist, *lp, *tail_ptr, *left_tail_ptr, *right_tail_ptr; if(left == NULL) return right; if(right == NULL) return left; + /* Save tail node pointers for future use */ + left_tail_ptr=left->prev; + right_tail_ptr=right->prev; + if(fn(left->data, right->data) <= 0) { newlist = left; left = left->next; @@ -242,19 +246,17 @@ alpm_list_t SYMEXPORT *alpm_list_mmerge(alpm_list_t *left, alpm_list_t *right, a if(left != NULL) { lp->next = left; left->prev = lp; + tail_ptr=left_tail_ptr; } else if(right != NULL) { lp->next = right; right->prev = lp; + tail_ptr=right_tail_ptr; } + else + tail_ptr=lp; - /* Find our tail pointer - * TODO maintain this in the algorithm itself */ - lp = newlist; - while(lp && lp->next) { - lp = lp->next; - } - newlist->prev = lp; + newlist->prev = tail_ptr; return newlist; } -- 1.7.6

3 2

[pacman-dev] [PATCH 1/2] lib/version: versions must be same length to be equal
by Dave Reisner 23 Aug '11

23 Aug '11

vercmp exhibited some odd behavior here, declaring versions such as '23.3a' and '23.3.a' as equivalent. Add an extra check before we return equality that the versions have the same length. Adds a pair of test cases to the vercmp test suite as well. Reported-by: Eric Belanger <eric(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/version.c | 13 ++++++++++++- test/util/vercmptest.sh | 4 ++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c index 9f3a9b7..bab9f92 100644 --- a/lib/libalpm/version.c +++ b/lib/libalpm/version.c @@ -88,6 +88,7 @@ static int rpmvercmp(const char *a, const char *b) char *str1, *str2; char *ptr1, *ptr2; char *one, *two; + size_t one_len, two_len; int rc; int isnum; int ret = 0; @@ -101,6 +102,9 @@ static int rpmvercmp(const char *a, const char *b) one = str1; two = str2; + one_len = strlen(one); + two_len = strlen(two); + /* loop through each version segment of str1 and str2 and compare them */ while(*one && *two) { while(*one && !isalnum((int)*one)) one++; @@ -187,9 +191,16 @@ static int rpmvercmp(const char *a, const char *b) /* this catches the case where all numeric and alpha segments have */ /* compared identically but the segment separating characters were */ - /* different */ + /* different. versions must also be the same length to be equivalent, */ + /* otherwise, the shorter version is declared newer. */ if ((!*one) && (!*two)) { + int diff = two_len - one_len; ret = 0; + if(diff > 0) { + ret = 1; + } else if (diff < 0) { + ret = -1; + } goto cleanup; } diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh index 54ede04..ff498ba 100755 --- a/test/util/vercmptest.sh +++ b/test/util/vercmptest.sh @@ -137,6 +137,10 @@ runtest 1:1.0 1.0 1 runtest 1:1.0 1.1 1 runtest 1:1.1 1.1 1 +# same alnum content, different length +runtest 1a 1.a 1 +runtest 23.3.a 23.3a -1 + #END TESTS echo -- 1.7.6

3 5

[pacman-dev] [PATCH 1/5] pacman-key: rework importing distro/repo provided keyrings
by Allan McRae 23 Aug '11

23 Aug '11

The current --reload option, apart from being non-clear in its naming, is very limited in that only one keyring can be provided. A distribution may want to provide multiple keyrings for various subsets of its organisation or custom repo providers may also want to provide a keyring. This patch adds a --populate option that reads keyrings from (by default) /usr/share/pacman/keyrings. A keyring is named foo.gpg, with optional foo-revoked file providing a list of revoked key ids. These files are required to be signed (detached) by a key trusted by pacman-key, in practice probably by the key that signed the package providing these files. The --populate flag either updates the pacman keyring using all keyrings in the directory or individual keyrings can be specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/pacman-key.8.txt | 8 ++- scripts/Makefile.am | 1 + scripts/pacman-key.sh.in | 150 +++++++++++++++++++++++----------------------- 3 files changed, 83 insertions(+), 76 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 9dc175c..f61c2ec 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -80,8 +80,12 @@ Options *-r, \--receive* <keyserver> <keyid(s)>:: Fetch the specified keyids from the specified key server URL. -*\--reload*:: - Reloads the keys from the keyring package. +*\--populate* [<keyring(s)>]:: + Reload the default keys from the (optionally provided) keyrings in + +{pkgdatadir}/keyrings+. Each keyring is provided in a file foo.gpg that + contains the keys for the foo keyring. Optionally the file foo-revoked + contains a list of revoked key IDs for that keyring. These files are + required to be signed (detached) by a trusted PGP key. *-u, \--updatedb*:: Equivalent to \--check-trustdb in GnuPG. diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 802b8f4..52a784a 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -44,6 +44,7 @@ edit = sed \ -e 's|@localedir[@]|$(localedir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ -e '1s|!/bin/bash|!$(BASH_SHELL)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 74ecfcf..8580100 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -37,8 +37,8 @@ IMPORT_TRUSTDB=0 INIT=0 LISTKEYS=0 LISTSIGS=0 +POPULATE=0 RECEIVE=0 -RELOAD=0 UPDATEDB=0 VERIFY=0 @@ -73,7 +73,8 @@ usage() { echo "$(gettext " --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")" echo "$(gettext " --init Ensure the keyring is properly initialized")" echo "$(gettext " --list-sigs [<keyid(s)>] List keys and their signatures")" - echo "$(gettext " --reload Reload the default keys")" + printf "$(gettext " --populate [<keyring(s)] Reload the default keys from the (given) keyrings\n\ + in '%s'")\n" "@pkgdatadir@/keyrings" } version() { @@ -139,75 +140,88 @@ check_keyring() { verify_keyring_input() { local ret=0; + local KEYRING_IMPORT_DIR='@pkgdatadir@/keyrings' - # 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 + # Verify signatures of keyring files and association revocation files if they exist + msg "$(gettext "Verifying keyring file signatures...")" + local keyring + for keyring in ${KEYRINGIDS[@]}; do + if ! "${GPG_PACMAN[@]}" --verify "${KEYRING_IMPORT_DIR}/${keyring}.gpg.sig" &>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${ADDED_KEYS}" ret=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}" - ret=1 + if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then + if ! "${GPG_PACMAN[@]}" --verify "${KEYRING_IMPORT_DIR}/${keyring}-revoked.sig" &>/dev/null; then + error "$(gettext "The signature of file %s is not valid.")" "${KEYRING_IMPORT_DIR}/${keyring}-revoked" + ret=1 + fi fi - fi + done - 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}" + return $ret +} + +populate_keyring() { + local KEYRING_IMPORT_DIR='@pkgdatadir@/keyrings' + local GPG_NOKEYRING=(gpg --batch --quiet --ignore-time-conflict --no-options --no-default-keyring --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) + + local keyring + local ret=0 + if [[ -z ${KEYRINGIDS[@]} ]]; then + # get list of all available keyrings + shopt -s nullglob + KEYRINGIDS=("$KEYRING_IMPORT_DIR"/*.gpg) + shopt -u nullglob + KEYRINGIDS=("${KEYRINGIDS[@]##*/}") + KEYRINGIDS=("${KEYRINGIDS[(a)]%.gpg}") + if [[ -z ${KEYRINGIDS[@]} ]]; then + error "$(gettext "No keyring files exist in %s.")" "$KEYRING_IMPORT_DIR" ret=1 fi + else + # verify listed keyrings exist + for keyring in ${KEYRINGIDS[@]}; do + if [[ ! -f "$KEYRING_IMPORT_DIR/$keyring.gpg" ]]; then + error "$(gettext "The keyring file %s does not exist.")" "$KEYRING_IMPORT_DIR/$keyring.gpg" + ret=1 + fi + done fi - return $ret -} + if (( ret )); then + exit 1 + fi -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}) + verify_keyring_input || exit 1 # 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_keyring_input || exit 1 - # 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" + for keyring in ${KEYRINGIDS[@]}; do + if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then + while read key; do + local key_values name + # extract key ID (field 5) and the name of owner (field 10) + key_values="$("${GPG_PACMAN[@]}" --quiet --with-colons --list-key "${key}" 2>/dev/null | 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 is 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 - fi - done < "${REMOVED_KEYS}" - fi + done < "${KEYRING_IMPORT_DIR}/${keyring}-revoked" + fi + done # List of keys that must be kept installed, even if in the list of keys to be removed local HOLD_KEYS="$(get_from "$CONFIG" "HoldKeys")" @@ -222,33 +236,21 @@ reload_keyring() { 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)" + # 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 "${DEPRECATED_KEYS}" --export "${key_id}" | "${GPG_PACMAN[@]}" --import + "${GPG_NOKEYRING[@]}" --keyring "${KEYRING_IMPORT_DIR}/${keyring}.gpg" --export "${key_id}" | "${GPG_PACMAN[@]}" --import fi done - fi + done # Remove the keys not marked to keep if (( ${#removed_ids[@]} > 0 )); then - msg "$(gettext "Removing deleted keys from keyring...")" + msg "$(gettext "Removing revoked 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}" @@ -321,8 +323,8 @@ fi OPT_SHORT="a::d:e:f::hl::r:uv:V" OPT_LONG="add::,config:,delete:,edit-key:,export::,finger::,gpgdir:" -OPT_LONG+=",help,import:,import-trustdb:,init,list-keys::,list-sigs::,,receive:" -OPT_LONG+=",reload,updatedb,verify:,version" +OPT_LONG+=",help,import:,import-trustdb:,init,list-keys::,list-sigs::" +OPT_LONG+=",populate::,receive:,updatedb,verify:,version" if ! OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@")"; then echo; usage; exit 1 # E_INVALID_OPTION; fi @@ -348,8 +350,8 @@ while true; do --init) INIT=1 ;; -l|--list-keys) LISTKEYS=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; --list-sigs) LISTSIGS=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYIDS=($1) ;; + --populate) POPULATE=1; [[ -n $2 && ${2:0:1} != "-" ]] && shift && KEYRINGIDS=($1) ;; -r|--receive) RECEIVE=1; shift; TMP=($1); KEYSERVER=${TMP[0]}; KEYIDS=(${TMP[@]:1}); unset TMP;; - --reload) RELOAD=1 ;; -u|--updatedb) UPDATEDB=1 ;; -v|--verify) VERIFY=1; shift; SIGNATURE=$1 ;; @@ -368,7 +370,7 @@ if ! type -p gpg >/dev/null; then exit 1 fi -if (( (ADD || DELETE || EDITKEY || IMPORT || IMPORT_TRUSTDB || INIT || RECEIVE || RELOAD || UPDATEDB) && EUID != 0 )); then +if (( (ADD || DELETE || EDITKEY || IMPORT || IMPORT_TRUSTDB || INIT || POPULATE || RECEIVE || UPDATEDB) && EUID != 0 )); then error "$(gettext "%s needs to be run as root for this operation.")" "pacman-key" exit 1 fi @@ -387,7 +389,7 @@ GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) # check only a single operation has been given numopt=$(( ADD + DELETE + EDITKEY + EXPORT + FINGER + IMPORT + IMPORT_TRUSTDB + - INIT + LISTKEYS + LISTSIGS + RECEIVE + RELOAD + UPDATEDB + VERIFY )) + INIT + LISTKEYS + LISTSIGS + POPULATE + RECEIVE + UPDATEDB + VERIFY )) case $numopt in 0) @@ -413,8 +415,8 @@ esac (( INIT )) && initialize (( LISTKEYS )) && "${GPG_PACMAN[@]}" --batch --list-keys "${KEYIDS[@]}" (( LISTSIGS )) && "${GPG_PACMAN[@]}" --batch --list-sigs "${KEYIDS[@]}" +(( POPULATE )) && populate_keyring (( RECEIVE )) && receive_keys -(( RELOAD )) && reload_keyring (( UPDATEDB )) && "${GPG_PACMAN[@]}" --batch --check-trustdb (( VERIFY )) && "${GPG_PACMAN[@]}" --verify $SIGNATURE -- 1.7.6

1 0

[pacman-dev] [PATCH] Retrieve default SigLevel value from backend after initial setting
by Dan McGee 23 Aug '11

23 Aug '11

This ensures we grab and use the library default once we have processed the global SigLevel setting, but before processing the repo-specific settings. This means the following two configs will now evaluate the same, as the backend currently defaults to 'Optional': Config 1: [options] # nothing here [repo] SigLevel = TrustAll Config 2: [options] SigLevel = Optional [repo] SigLevel = TrustAll Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/conf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 29e835c..fe85849 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -563,6 +563,9 @@ static int setup_libalpm(void) if(config->siglevel != ALPM_SIG_USE_DEFAULT) { alpm_option_set_default_siglevel(handle, config->siglevel); } + /* retrieve the set or default siglevel from the backend at this point; + * this way all future DB settings base their setting off this value */ + config->siglevel = alpm_option_get_default_siglevel(handle); if(config->xfercommand) { alpm_option_set_fetchcb(handle, download_with_xfercommand); -- 1.7.6

1 0

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

22 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 762cbf574b66ccbe6d4931e426b6d9e95b191bd5 (commit) via f3e285862143c09bc846fd62992cddd24aefd37e (commit) via c65cea0dcbc2777bd72b13d5a69f89d99fa0b0d5 (commit) via 10cbfc956c69db0cc2826e5a9c6b5b5df2a46326 (commit) via d64c409913720ed3fbf3713de621bbef4ea3bb49 (commit) via 592ed13bce83afeeb8deff5a81dc782fdc32ac11 (commit) via 329a7b7e242e0e4594eec9f70db4bd82d116c1c2 (commit) from c4350d90f137ff3177e68cb0bab82d14edaac54e (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 762cbf574b66ccbe6d4931e426b6d9e95b191bd5 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 22 09:27:13 2011 -0500 dload: prevent need to copy struct in mask_signal() Since we store this directly in the download function, just rework mask_signal() to take a pointer to a location to store the original. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f3e285862143c09bc846fd62992cddd24aefd37e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 14:22:14 2011 -0400 dload: extract tempfile creation to its own function Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c65cea0dcbc2777bd72b13d5a69f89d99fa0b0d5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 13:51:47 2011 -0400 dload: move (un)masking of signals to separate functions Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 10cbfc956c69db0cc2826e5a9c6b5b5df2a46326 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 13:46:37 2011 -0400 dload: move curl option setting to static function Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d64c409913720ed3fbf3713de621bbef4ea3bb49 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 13:42:53 2011 -0400 dload: add open_mode to payload struct This is a precursor to a following patch which will move the setting of options to a separate function. With the open mode as part of the struct, we can avoid modifying stack allocated variables. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 592ed13bce83afeeb8deff5a81dc782fdc32ac11 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 11:58:45 2011 -0400 dload: rename cd_filename to content_disp_name This is more in line with the menagerie of file name members that we now have on the payload struct. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 329a7b7e242e0e4594eec9f70db4bd82d116c1c2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 11:56:37 2011 -0400 dload: move tempfile and destfile to payload struct These are private to the download operation already, so glob them onto the struct. This is an ugly rename patch, with the only logical change being that destfile and tempfile are now freed by the payload_free function. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 221 ++++++++++++++++++++++++++++---------------------- lib/libalpm/dload.h | 5 +- 2 files changed, 128 insertions(+), 98 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

22 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 c4350d90f137ff3177e68cb0bab82d14edaac54e (commit) via b6914d16cc7ee97f538b569b760c3ced18ee1fa9 (commit) via a98babbfef725147748fc1be149a57b1beaac615 (commit) via 343ea8171815debe3fc5a55ad0eeaf6c35f90bb9 (commit) via ffdfc825234987b9f974d7a8a152babb10cb8663 (commit) via e9b8a7693dce4d7be959c6a9f4112014884e647c (commit) via d9e5dab6aceeb4d32cfa52d5500f0d22cabb487b (commit) via d307ed5eb9d6684911c55f661e2d58e0fd6e4ceb (commit) via 82fc816d790ac8b2bfaa81575bf85067769ece10 (commit) via 43940f591ed77f984c49fe8a3629d66dbf78bfb0 (commit) via eae363c96fb5ffce8e88cb63c780769b1410a1f9 (commit) via d3f135af8f499fbab24b3ad9e76751a29bc4d3f5 (commit) via e07547ee4ed4fd812a7f50b998589fa27c12de4c (commit) via 6d544984f2418ea34caab4c433580487b760362a (commit) from 9934b3bd345011eef6a96249d8d90de594c04cd0 (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 c4350d90f137ff3177e68cb0bab82d14edaac54e Author: Dave Reisner <d(a)falconindy.com> Date: Sat Aug 20 13:19:19 2011 -0400 pacman/util: use string_length to calculate line length This is measuring strings that are potentially localized, so we need a multibyte aware function to count characters instead of bytes. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b6914d16cc7ee97f538b569b760c3ced18ee1fa9 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jul 14 00:05:30 2011 +1000 Print callback messages to stderr Fixes FS#25099. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a98babbfef725147748fc1be149a57b1beaac615 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Aug 20 12:07:15 2011 -0500 Print debug timestamps to same stream as rest of output We used fprintf() elsewhere in this function, but we didn't use it on the debug timestamp printing. Use fprintf() instead of printf() to fix this. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 343ea8171815debe3fc5a55ad0eeaf6c35f90bb9 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Mon Aug 22 13:00:34 2011 +0800 pacsort: correct list freeing Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ffdfc825234987b9f974d7a8a152babb10cb8663 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 22 08:50:43 2011 -0500 pacsort: ensure list is freed if size is 0 Found using: `valgrind ./src/util/.libs/lt-pacsort /dev/null` Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e9b8a7693dce4d7be959c6a9f4112014884e647c Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Mon Aug 22 13:00:33 2011 +0800 pacsort: correct pointer type in list_new Pointer sizes are the same but this makes intention clearer. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d9e5dab6aceeb4d32cfa52d5500f0d22cabb487b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 19 19:12:21 2011 -0500 Remove alpm_option_get_* usage from backend These are all available directly on the handle without indirection. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d307ed5eb9d6684911c55f661e2d58e0fd6e4ceb Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 14:03:32 2011 -0400 dload: remove unused macro This was a vestige leftover from the libfetch days of yore. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 82fc816d790ac8b2bfaa81575bf85067769ece10 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 14:07:29 2011 -0400 dload: delete zero length downloads on curl error In the case of a non-operation (e.g. DNS resolver error), delete the leftover 0 byte .part file. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 43940f591ed77f984c49fe8a3629d66dbf78bfb0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 11:43:27 2011 -0400 dload: rename payload->filename to payload->remote_name This is a far more accurate description of what this is, since it's more than likely not really a filename at all, but the name after a final slash on a URL. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eae363c96fb5ffce8e88cb63c780769b1410a1f9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 14:25:09 2011 -0400 dload: remove code duplication Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d3f135af8f499fbab24b3ad9e76751a29bc4d3f5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 19 16:48:09 2011 -0400 bash_completion: add dbonly to sync options Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e07547ee4ed4fd812a7f50b998589fa27c12de4c Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 19 13:10:17 2011 -0500 Rework finding a writable cache directory This is a refactor and refresh of the code used to find where we should download packages. * Incorporate suggestions from FS#25435 to use TMPDIR from the environment if set, otherwise fall back to /tmp as before. * Make the writability tests a bit more in depth. We now do a three part check consisting of: - S_ISDIR(): is this even a directory - access(W_OK): is this directory writable by the current user. Unfortunately for root, this almost always returns that it is, but in the case of a RO mount or NFS share inaccessible to root, this check will exclude the directory. - mode & (any write bit): is there a writable bit set on this directory. This makes it possible to enforce a read-only cache directory by setting permissions to 0555, for example. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6d544984f2418ea34caab4c433580487b760362a Author: Dan McGee <dan(a)archlinux.org> Date: Fri Aug 19 11:06:55 2011 -0500 Be more robust when copying package data This changes the signature of _alpm_pkg_dup() to return an integer error code and provide the new package in a passed pointer argument. All callers are now more robust with checking the return value of this function to ensure a fatal error did not occur. We allow load failures to proceed as otherwise we have a chicken and egg problem- if a 'desc' local database entry is missing, the best way of restoring said file is `pacman -Sf --dbonly packagename`. This patch fixes a segfault that was occurring in this case. Fixes the segfault reported in FS#25667. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 2 +- lib/libalpm/add.c | 11 +++++++---- lib/libalpm/be_local.c | 3 +-- lib/libalpm/be_sync.c | 7 +++---- lib/libalpm/db.c | 7 +++---- lib/libalpm/deps.c | 12 +++++++++--- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/dload.c | 39 +++++++++++++++++++++------------------ lib/libalpm/dload.h | 2 +- lib/libalpm/package.c | 28 ++++++++++++++++++++++++---- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 35 ++++++++++++++++++++++++++--------- lib/libalpm/signing.c | 2 +- lib/libalpm/sync.c | 14 +++++++++----- lib/libalpm/trans.c | 6 +++--- lib/libalpm/util.c | 44 +++++++++++++++++++++++++++++--------------- src/pacman/callback.c | 2 +- src/pacman/util.c | 4 ++-- src/util/pacsort.c | 8 ++++---- 20 files changed, 148 insertions(+), 84 deletions(-) hooks/post-receive -- The official pacman repository

1 0