- Pacman-dev - lists.archlinux.org

[pacman-dev] Bacman patch
by Xyne 17 Sep '13

17 Sep '13

Hi, I have updated bacman with the following changes: * added option "--pacnew" to include unmodified .pacnew BACKUP files in package archive when available (instead of locally modified version) * added warning when modified BACKUP files are included * fixed bug in fakeroot invocation (fakeroot was invoked with shifted argument array, so the --nocolor (and --pacnew) options were lost * removed one unnecessary "cat <file> |" I cloned the pacman git repo to format a patch, but pacman/contrib/bacman.sh.in appears to be outdated (e.g. the shebang is still "#!/bin/bash", even though the current bacman uses "#!/usr/bin/bash"). So, where is the current bacman source? Regards, Xyne

4 11

[pacman-dev] [PATCH] pacman: add option --max-recv-speed
by Sami Kerola 08 Sep '13

08 Sep '13

My dad was watching internet connected television, while I decided to check fixes for Arch. There were new kernel, some libreoffice stuff, and so on making the download to be more than few megabytes. When I downloaded the packages television sound track was affected annoying way. Obviosly my download was affecting a stream that had greater service quality expectancy. This patch will allow an user to polite and throttle down bandwidth usage in benefit for others. Signed-off-by: Sami Kerola <kerolasa(a)iki.fi> --- doc/pacman.8.txt | 5 +++++ lib/libalpm/alpm.h | 5 +++++ lib/libalpm/dload.c | 4 ++++ lib/libalpm/handle.c | 13 +++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 1 + src/pacman/conf.h | 2 ++ src/pacman/pacman.c | 6 ++++++ 8 files changed, 37 insertions(+) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 574995c..da8fa1b 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -362,6 +362,11 @@ Sync Options[[SO]] packages that are no longer installed; use two to remove all files from the cache. In both cases, you will have a yes or no option to remove packages and/or unused downloaded databases. + +*\--max-recv-speed* <bits>:: + Define maximum transfer rate in bits per seconds. This option is + useful when network bandwidth is scarce resource, and other users + of the network has greater service expecations. + If you use a network shared cache, see the 'CleanMethod' option in linkman:pacman.conf[5]. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b049007..bc77641 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -533,6 +533,11 @@ int alpm_option_get_usesyslog(alpm_handle_t *handle); /** Sets whether to use syslog (0 is FALSE, TRUE otherwise). */ int alpm_option_set_usesyslog(alpm_handle_t *handle, int usesyslog); +/** Returns maximum download receive speed. */ +int alpm_option_get_max_recv_speed(alpm_handle_t *handle); +/** Sets maximum download receive speed. */ +int alpm_option_set_max_recv_speed(alpm_handle_t *handle, int rate); + /** @name Accessors to the list of no-upgrade files. * These functions modify the list of files which should * not be updated by package installation. diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 8537b3d..25f2423 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -331,6 +331,10 @@ static void curl_set_handle_opts(struct dload_payload *payload, (intmax_t)st.st_size); payload->initial_size = st.st_size; } + + if(payload->handle->max_recv_speed) { + curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, payload->handle->max_recv_speed); + } } static void mask_signal(int signum, void (*handler)(int), diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 53c86c5..b061efd 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -181,6 +181,12 @@ alpm_cb_progress SYMEXPORT alpm_option_get_progresscb(alpm_handle_t *handle) return handle->progresscb; } +int SYMEXPORT alpm_option_get_max_recv_speed(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->max_recv_speed; +} + const char SYMEXPORT *alpm_option_get_root(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); @@ -314,6 +320,13 @@ int SYMEXPORT alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress return 0; } +int SYMEXPORT alpm_option_set_max_recv_speed(alpm_handle_t *handle, int rate) +{ + CHECK_HANDLE(handle, return -1); + handle->max_recv_speed = rate; + return 0; +} + static char *canonicalize_path(const char *path) { char *new_path; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5e84d58..f5b4baf 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -90,6 +90,7 @@ struct __alpm_handle_t { char *arch; /* Architecture of packages we should allow */ double deltaratio; /* Download deltas if possible; a ratio value */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ + int max_recv_speed; /* Maximum download receive speed. */ int checkspace; /* Check disk space before installing */ alpm_siglevel_t siglevel; /* Default signature verification level */ alpm_siglevel_t localfilesiglevel; /* Signature verification level for local file diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cd357ab..e6112f1 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -682,6 +682,7 @@ static int setup_libalpm(void) alpm_option_set_eventcb(handle, cb_event); alpm_option_set_questioncb(handle, cb_question); alpm_option_set_progresscb(handle, cb_progress); + alpm_option_set_max_recv_speed(handle, config->max_recv_speed); config->logfile = config->logfile ? config->logfile : strdup(LOGFILE); ret = alpm_option_set_logfile(handle, config->logfile); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index dcd3204..30ccd60 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -47,6 +47,7 @@ typedef struct __config_t { unsigned short checkspace; unsigned short usesyslog; unsigned short color; + unsigned int max_recv_speed; double deltaratio; char *arch; char *print_format; @@ -143,6 +144,7 @@ enum { OP_ASEXPLICIT, OP_ARCH, OP_PRINTFORMAT, + OP_MAXRECVSPEED, OP_GPGDIR, OP_DBONLY, OP_FORCE, diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 24fd57f..c1c6705 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -177,6 +177,7 @@ static void usage(int op, const char * const myname) addlist(_(" --force force install, overwrite conflicting files\n")); addlist(_(" --asdeps install packages as non-explicitly installed\n")); addlist(_(" --asexplicit install packages as explicitly installed\n")); + addlist(_(" --max-recv-speed <bits> limit download speed to bits per second (libcurl)\n")); addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); addlist(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); @@ -510,6 +511,10 @@ static int parsearg_trans(int opt) check_optarg(); config->print_format = strdup(optarg); break; + case OP_MAXRECVSPEED: + check_optarg(); + config->max_recv_speed = (unsigned int)atoi(optarg); + break; default: return 1; } return 0; @@ -645,6 +650,7 @@ static int parseargs(int argc, char *argv[]) {"asexplicit", no_argument, 0, OP_ASEXPLICIT}, {"arch", required_argument, 0, OP_ARCH}, {"print-format", required_argument, 0, OP_PRINTFORMAT}, + {"max-recv-speed", required_argument, 0, OP_MAXRECVSPEED}, {"gpgdir", required_argument, 0, OP_GPGDIR}, {"dbonly", no_argument, 0, OP_DBONLY}, {"color", required_argument, 0, OP_COLOR}, -- 1.8.4

2 2

[pacman-dev] [PATCH 1/1] fix db filename handling
by Christian Hesse 07 Sep '13

07 Sep '13

From: Christian Hesse <mail(a)eworm.de> If the server redirects from ${repo}.db to ${repo}.db.tar.gz pacman gets this wrong: It saves to new filename and fails when accessing ${repo}.db. This introduces a new field 'deny_rename' to payload. If set pacman downloads to the filename specified in payload.remote_name. --- lib/libalpm/be_sync.c | 2 ++ lib/libalpm/dload.c | 36 ++++++++++++++++++++---------------- lib/libalpm/dload.h | 1 + 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 123d953..622153d 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -223,6 +223,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) payload.handle = handle; payload.force = force; payload.unlink_on_fail = 1; + payload.deny_rename = 1; ret = _alpm_download(&payload, syncpath, NULL, NULL); _alpm_dload_payload_reset(&payload); @@ -245,6 +246,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) snprintf(payload.fileurl, len, "%s/%s.db.sig", server, db->treename); payload.handle = handle; payload.force = 1; + payload.deny_rename = 1; payload.errors_ok = (level & ALPM_SIG_DATABASE_OPTIONAL); /* set hard upper limit of 16KiB */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 8537b3d..381e548 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -547,23 +547,27 @@ static int curl_download_internal(struct dload_payload *payload, goto cleanup; } - if(payload->content_disp_name) { - /* content-disposition header has a better name for our file */ - free(payload->destfile_name); - payload->destfile_name = get_fullpath(localpath, payload->content_disp_name, ""); + if(payload->deny_rename) { + payload->destfile_name = get_fullpath(localpath, payload->remote_name, ""); } else { - const char *effective_filename = strrchr(effective_url, '/'); - if(effective_filename && strlen(effective_filename) > 2) { - effective_filename++; - - /* if destfile was never set, we wrote to a tempfile. even if destfile is - * set, we may have followed some redirects and the effective url may - * have a better suggestion as to what to name our file. in either case, - * refactor destfile to this newly derived name. */ - if(!payload->destfile_name || strcmp(effective_filename, - strrchr(payload->destfile_name, '/') + 1) != 0) { - free(payload->destfile_name); - payload->destfile_name = get_fullpath(localpath, effective_filename, ""); + if(payload->content_disp_name) { + /* content-disposition header has a better name for our file */ + free(payload->destfile_name); + payload->destfile_name = get_fullpath(localpath, payload->content_disp_name, ""); + } else { + const char *effective_filename = strrchr(effective_url, '/'); + if(effective_filename && strlen(effective_filename) > 2) { + effective_filename++; + + /* if destfile was never set, we wrote to a tempfile. even if destfile is + * set, we may have followed some redirects and the effective url may + * have a better suggestion as to what to name our file. in either case, + * refactor destfile to this newly derived name. */ + if(!payload->destfile_name || strcmp(effective_filename, + strrchr(payload->destfile_name, '/') + 1) != 0) { + free(payload->destfile_name); + payload->destfile_name = get_fullpath(localpath, effective_filename, ""); + } } } } diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 95bb91a..bd01d8b 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -38,6 +38,7 @@ struct dload_payload { int allow_resume; int errors_ok; int unlink_on_fail; + int deny_rename; alpm_list_t *servers; #ifdef HAVE_LIBCURL CURLcode curlerr; /* last error produced by curl */ -- 1.8.4

3 5

[pacman-dev] [PATCH v3 1/1] contrib: Unify quoting in error messages
by Aaron Lindsay 05 Sep '13

05 Sep '13

This fixes error messages to display the contents of variables rather than the variable name by replacing backticks with single quotes (m4 eats backticks). It also removes $"" localization from error messages to eliminate security holes. For instance, `rankmirrors nonexistent_file' will now display: 'nonexistent_file' does not exist. rather than: $1 does not exist. Signed-off-by: Aaron Lindsay <aaron(a)aclindsay.com> --- contrib/bacman.sh.in | 2 +- contrib/rankmirrors.sh.in | 10 +++++----- contrib/updpkgsums.sh.in | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 5435e40..33e3920 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -124,7 +124,7 @@ fi if [[ ! -d $pkg_dir ]]; then error "package %s is found in pacman database," "${pkg_name}" - plain " but \`%s' is not a directory" "${pkg_dir}" + plain " but '%s' is not a directory" "${pkg_dir}" exit 1 fi diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in index 875a143..5555edf 100644 --- a/contrib/rankmirrors.sh.in +++ b/contrib/rankmirrors.sh.in @@ -127,7 +127,7 @@ while [[ $1 ]]; do verbose) VERBOSE=1 ; shift ;; url) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; shift 2;; repo) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; shift 2;; - *) err "\`$1' is an invalid argument." + *) err "'$1' is an invalid argument." esac elif [[ ${1:0:1} = - ]]; then @@ -146,7 +146,7 @@ while [[ $1 ]]; do u) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; snum=2;; r) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; snum=2;; n) [[ $2 ]] || err "Must specify number." ; NUM="$2" ; snum=2;; - *) err "\`-$1' is an invald argument." ;; + *) err "'$1' is an invalid argument." ;; esac done shift $snum @@ -157,7 +157,7 @@ while [[ $1 ]]; do [[ $linearray ]] || err "File is empty." shift else - err "\`$1' does not exist." + err "'$1' does not exist." fi done @@ -169,7 +169,7 @@ done # Single url handling if [[ $CHECKURL ]]; then url="$(getfetchurl "$URL")" - [[ $url = fail ]] && err "url \`$URL' is malformed." + [[ $url = fail ]] && err "url '$URL' is malformed." [[ $VERBOSE ]] && echo "Testing $url..." time=$(gettime "$url") echo "$URL : $time" @@ -193,7 +193,7 @@ for line in "${linearray[@]}"; do server="${line#*= }" server="${server%%#*}" url="$(getfetchurl "$server")" - [[ $url = fail ]] && err "url \`$URL' is malformed." + [[ $url = fail ]] && err "url '$URL' is malformed." time=$(gettime "$url") timesarray+=("$time $server") diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index ffea96b..4d35357 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -67,7 +67,7 @@ fi # Check $PWD/ for permission to unlink the $buildfile and write a new one if [[ ! -w . ]]; then - printf $'==> ERROR: No write permission in `%s\'\n' "$PWD" + printf "==> ERROR: No write permission in '%s'\n" "$PWD" exit 1 fi -- 1.8.4

1 0

[pacman-dev] [PATCH v2 1/1] contrib: Unify quoting in error messages
by Aaron Lindsay 05 Sep '13

05 Sep '13

This fixes error messages to display the contents of variables rather than the variable name by replacing backticks with single quotes (m4 eats backticks). It also removes $"" localization from error messages to eliminate security holes. For instance, `rankmirrors nonexistent_file' will now display: 'nonexistent_file' does not exist. rather than: $1 does not exist. Signed-off-by: Aaron Lindsay <aaron(a)aclindsay.com> --- contrib/bacman.sh.in | 2 +- contrib/paclog-pkglist.sh.in | 2 +- contrib/rankmirrors.sh.in | 10 +++++----- contrib/updpkgsums.sh.in | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 5435e40..33e3920 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -124,7 +124,7 @@ fi if [[ ! -d $pkg_dir ]]; then error "package %s is found in pacman database," "${pkg_name}" - plain " but \`%s' is not a directory" "${pkg_dir}" + plain " but '%s' is not a directory" "${pkg_dir}" exit 1 fi diff --git a/contrib/paclog-pkglist.sh.in b/contrib/paclog-pkglist.sh.in index 9b3abad..b6f4ffe 100755 --- a/contrib/paclog-pkglist.sh.in +++ b/contrib/paclog-pkglist.sh.in @@ -43,7 +43,7 @@ if [[ $1 ]]; then version exit 0 elif [[ ! -e $logfile ]]; then - printf $"target not found: %s\n" "$1" + printf "target not found: '%s'\n" "$1" exit 1 fi fi diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in index 875a143..5555edf 100644 --- a/contrib/rankmirrors.sh.in +++ b/contrib/rankmirrors.sh.in @@ -127,7 +127,7 @@ while [[ $1 ]]; do verbose) VERBOSE=1 ; shift ;; url) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; shift 2;; repo) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; shift 2;; - *) err "\`$1' is an invalid argument." + *) err "'$1' is an invalid argument." esac elif [[ ${1:0:1} = - ]]; then @@ -146,7 +146,7 @@ while [[ $1 ]]; do u) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; snum=2;; r) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; snum=2;; n) [[ $2 ]] || err "Must specify number." ; NUM="$2" ; snum=2;; - *) err "\`-$1' is an invald argument." ;; + *) err "'$1' is an invalid argument." ;; esac done shift $snum @@ -157,7 +157,7 @@ while [[ $1 ]]; do [[ $linearray ]] || err "File is empty." shift else - err "\`$1' does not exist." + err "'$1' does not exist." fi done @@ -169,7 +169,7 @@ done # Single url handling if [[ $CHECKURL ]]; then url="$(getfetchurl "$URL")" - [[ $url = fail ]] && err "url \`$URL' is malformed." + [[ $url = fail ]] && err "url '$URL' is malformed." [[ $VERBOSE ]] && echo "Testing $url..." time=$(gettime "$url") echo "$URL : $time" @@ -193,7 +193,7 @@ for line in "${linearray[@]}"; do server="${line#*= }" server="${server%%#*}" url="$(getfetchurl "$server")" - [[ $url = fail ]] && err "url \`$URL' is malformed." + [[ $url = fail ]] && err "url '$URL' is malformed." time=$(gettime "$url") timesarray+=("$time $server") diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index ffea96b..4d35357 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -67,7 +67,7 @@ fi # Check $PWD/ for permission to unlink the $buildfile and write a new one if [[ ! -w . ]]; then - printf $'==> ERROR: No write permission in `%s\'\n' "$PWD" + printf "==> ERROR: No write permission in '%s'\n" "$PWD" exit 1 fi -- 1.8.4

2 1

[pacman-dev] [PATCH] contrib: Fix various error messages.
by Aaron Lindsay 05 Sep '13

05 Sep '13

For instance, `rankmirrors nonexistent_file' should display: 'nonexistent_file' does not exist. rather than: $1 does not exist. Signed-off-by: Aaron Lindsay <aaron(a)aclindsay.com> --- contrib/bacman.sh.in | 2 +- contrib/rankmirrors.sh.in | 10 +++++----- contrib/updpkgsums.sh.in | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 5435e40..33e3920 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -124,7 +124,7 @@ fi if [[ ! -d $pkg_dir ]]; then error "package %s is found in pacman database," "${pkg_name}" - plain " but \`%s' is not a directory" "${pkg_dir}" + plain " but '%s' is not a directory" "${pkg_dir}" exit 1 fi diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in index 875a143..5555edf 100644 --- a/contrib/rankmirrors.sh.in +++ b/contrib/rankmirrors.sh.in @@ -127,7 +127,7 @@ while [[ $1 ]]; do verbose) VERBOSE=1 ; shift ;; url) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; shift 2;; repo) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; shift 2;; - *) err "\`$1' is an invalid argument." + *) err "'$1' is an invalid argument." esac elif [[ ${1:0:1} = - ]]; then @@ -146,7 +146,7 @@ while [[ $1 ]]; do u) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; snum=2;; r) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; snum=2;; n) [[ $2 ]] || err "Must specify number." ; NUM="$2" ; snum=2;; - *) err "\`-$1' is an invald argument." ;; + *) err "'$1' is an invalid argument." ;; esac done shift $snum @@ -157,7 +157,7 @@ while [[ $1 ]]; do [[ $linearray ]] || err "File is empty." shift else - err "\`$1' does not exist." + err "'$1' does not exist." fi done @@ -169,7 +169,7 @@ done # Single url handling if [[ $CHECKURL ]]; then url="$(getfetchurl "$URL")" - [[ $url = fail ]] && err "url \`$URL' is malformed." + [[ $url = fail ]] && err "url '$URL' is malformed." [[ $VERBOSE ]] && echo "Testing $url..." time=$(gettime "$url") echo "$URL : $time" @@ -193,7 +193,7 @@ for line in "${linearray[@]}"; do server="${line#*= }" server="${server%%#*}" url="$(getfetchurl "$server")" - [[ $url = fail ]] && err "url \`$URL' is malformed." + [[ $url = fail ]] && err "url '$URL' is malformed." time=$(gettime "$url") timesarray+=("$time $server") diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index ffea96b..f459524 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -67,7 +67,7 @@ fi # Check $PWD/ for permission to unlink the $buildfile and write a new one if [[ ! -w . ]]; then - printf $'==> ERROR: No write permission in `%s\'\n' "$PWD" + printf $'==> ERROR: No write permission in "%s"\n' "$PWD" exit 1 fi -- 1.8.4

2 3

[pacman-dev] [PATCH 1/4] makepkg: cleanup a few format string injections
by Dave Reisner 05 Sep '13

05 Sep '13

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d0951df..5a74b3e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1204,16 +1204,16 @@ check_checksums() { for file in "${source[@]}"; do local found=1 file="$(get_filename "$file")" - printf "%s" " $file ... " >&2 + printf ' %s ... ' "$file" >&2 if [[ ${integrity_sums[$idx]} = 'SKIP' ]]; then - echo "$(gettext "Skipped")" >&2 + printf '%s\n' "$(gettext "Skipped")" >&2 idx=$((idx + 1)) continue fi if ! file="$(get_filepath "$file")"; then - printf -- "$(gettext "NOT FOUND")\n" >&2 + printf '%s\n' "$(gettext "NOT FOUND")" >&2 errors=1 found=0 fi @@ -1223,9 +1223,9 @@ check_checksums() { local realsum="$(openssl dgst -${integ} "$file")" realsum="${realsum##* }" if [[ $expectedsum = "$realsum" ]]; then - printf -- "$(gettext "Passed")\n" >&2 + printf '%s\n' "$(gettext "Passed")" >&2 else - printf -- "$(gettext "FAILED")\n" >&2 + printf '%s\n' "$(gettext "FAILED")" >&2 errors=1 fi fi -- 1.8.4

2 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-120-g61e806b
by allan＠archlinux.org 03 Sep '13

03 Sep '13

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 61e806b96a8828152e78ab9eff03c490a23b22e9 (commit) via c0ee713704d058bac560172544d6bdef5414fe4e (commit) via 106d0fc541ad21306f5722e0178171eef6a222e9 (commit) via 5f80d7afbd45100f5b5d28e43a9d9a80dde4b559 (commit) via 8a72761743d746ed0a9b8b1201672e8ea0b8af4d (commit) via a86015f73fdda878287a2ad21011594862bf506a (commit) via 4245c6b222703dda7bd6000e180c777f480e4420 (commit) via b370f0ca427fe9d83a5d8e0951f30e9b6c9e03f8 (commit) via aade18cf3b32ffb5352f21edd135056286c3658d (commit) via 9020bcee379502115e1109d0646a6488f1667dff (commit) via 9e50e5314c76085814187272c544cecda0a63534 (commit) via 3a2a752e1eb1b9a57d62e6982461456c9693d34c (commit) from ce7456b4ccbe3ca7b06c9b50fe59ce7367172c4f (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 61e806b96a8828152e78ab9eff03c490a23b22e9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jul 9 10:03:20 2012 -0400 pactree: set full usage on DBs when registering Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c0ee713704d058bac560172544d6bdef5414fe4e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jul 2 17:16:58 2012 -0400 pacman: add front end support for repo usage level Add a "Usage" key to the repo section of the config which allows for the tokens "Search", "Install", "Upgrade", "All", which correspond to values in the alpm_db_usage_t enum. Users can specify "Usage" multiple times for a given repo, or multiple flags per "Usage" line and they will be OR'd together. If unspecified, the default is full usage of the repo. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 106d0fc541ad21306f5722e0178171eef6a222e9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Mar 9 18:28:28 2013 -0500 libalpm: introduce a usage level for repos This defines a level of interest a user has in a repository. These are described by the bitmask flags in the alpm_db_usage_t enum: ALPM_DB_USAGE_SEARCH: repo is valid for searching ALPM_DB_USAGE_INSTALL: repo is valid for installs (e.g. -S pkg) ALPM_DB_USAGE_UPGRADE: repo is valid for sysupgrades ALPM_DB_USAGE_ALL: all of the above are valid Explicitly listing the contents of a repo will always be valid, and the repo will always be refreshed appropriately on sync operations. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5f80d7afbd45100f5b5d28e43a9d9a80dde4b559 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Mar 10 15:56:12 2013 -0400 proto: remove redundancy in cd for each function Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8a72761743d746ed0a9b8b1201672e8ea0b8af4d Author: Sami Kerola <kerolasa(a)iki.fi> Date: Mon Sep 2 21:30:47 2013 +0100 pacman/util.c: use switch when there are fall through statements An 'if' clause with empty statement is allowed, but unusual construct. When 'if' is used this way the statement should at least have orphan semicolon ';'. For empty statements 'switch' feels like a native way express what is meant. Signed-off-by: Sami Kerola <kerolasa(a)iki.fi> [Allan] Keep comment Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a86015f73fdda878287a2ad21011594862bf506a Author: Jason St. John <jstjohn(a)purdue.edu> Date: Tue Sep 3 15:20:50 2013 -0400 Improve --help switch output for pacman utils Unify the formatting of the --help switch for pacman utils, if it exists. All of the pacman utils will now output help text using the following format: util-name (pacman) v<pacman version> one line description of util's purpose Usage: util-name [options] -b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message The --help switch does not exist for a couple of the utils, so the help/usage text for those will be displayed when the util is run with no arguments. Reported-by: Karol Błażewicz <karol.blazewicz at gmail.com> Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4245c6b222703dda7bd6000e180c777f480e4420 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 2 16:02:34 2013 -0400 makepkg: add support for sha224 checksums Implements FS#36776. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b370f0ca427fe9d83a5d8e0951f30e9b6c9e03f8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 2 15:53:33 2013 -0400 makepkg: unify list of known hash algorithms Unifying this list makes adding new algorithms easier. There's also some menial cleanup in this patch to avoid use of eval and properly treat lists of data as array instead of simple strings. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aade18cf3b32ffb5352f21edd135056286c3658d Author: Sami Kerola <kerolasa(a)iki.fi> Date: Mon Sep 2 21:30:48 2013 +0100 libalpm: avoid name space conflict The symbol 'err' refers to err() from err.h, and is wisest to be avoided as a variable name. Reference: http://man7.org/linux/man-pages/man3/err.3.html Signed-off-by: Sami Kerola <kerolasa(a)iki.fi> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9020bcee379502115e1109d0646a6488f1667dff Author: Sami Kerola <kerolasa(a)iki.fi> Date: Mon Sep 2 21:30:46 2013 +0100 common: compare value rather than pointer address Signed-off-by: Sami Kerola <kerolasa(a)iki.fi> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9e50e5314c76085814187272c544cecda0a63534 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Aug 21 11:16:44 2013 -0400 makepkg.8: fix typo in usage Looks like I fat fingered something when I refactored the original submissions. Woops. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3a2a752e1eb1b9a57d62e6982461456c9693d34c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 20 22:00:10 2013 -0400 alpm: log errors for scriptlets terminated by a signal Fixes FS#36618. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 2 +- doc/pacman.conf.5.txt | 21 +++++++++ lib/libalpm/alpm.h | 22 +++++++++ lib/libalpm/be_local.c | 1 + lib/libalpm/be_sync.c | 4 ++ lib/libalpm/db.c | 22 +++++++++ lib/libalpm/db.h | 1 + lib/libalpm/deps.c | 15 +++++- lib/libalpm/signing.c | 70 ++++++++++++++-------------- lib/libalpm/sync.c | 15 +++++- lib/libalpm/util.c | 9 ++++ proto/PKGBUILD-split.proto | 8 ++-- proto/PKGBUILD.proto | 6 +-- scripts/makepkg.sh.in | 31 ++++++------ src/common/util-common.c | 2 +- src/pacman/conf.c | 53 +++++++++++++++++++++ src/pacman/sync.c | 11 +++++ src/pacman/util.c | 14 +++--- src/util/cleanupdelta.c | 9 ++-- src/util/pacsort.c | 5 +- src/util/pactree.c | 10 ++-- src/util/testdb.c | 12 ++--- src/util/testpkg.c | 6 +-- src/util/vercmp.c | 17 +++---- test/pacman/tests/sync051.py | 17 +++++++ test/pacman/tests/{sync137.py => sync052.py} | 11 +++-- 26 files changed, 289 insertions(+), 105 deletions(-) create mode 100644 test/pacman/tests/sync051.py copy test/pacman/tests/{sync137.py => sync052.py} (52%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/3] common: compare value rather than pointer address
by Sami Kerola 03 Sep '13

03 Sep '13

Signed-off-by: Sami Kerola <kerolasa(a)iki.fi> --- src/common/util-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/util-common.c b/src/common/util-common.c index 7145e49..40623b9 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -48,7 +48,7 @@ char *mdirname(const char *path) char *ret, *last; /* null or empty path */ - if(path == NULL || path == '\0') { + if(path == NULL || *path == '\0') { return strdup("."); } -- 1.8.4

2 4

[pacman-dev] [PATCH 1/3] Fix whitespace in pacsort.c and pactree.c
by Jason St. John 03 Sep '13

03 Sep '13

Replace spaces with tabs. Remove extra spaces. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- src/util/pacsort.c | 20 ++++++++++---------- src/util/pactree.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 50b9c65..7c551c2 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -26,7 +26,7 @@ #include <alpm.h> -#define DELIM ' ' +#define DELIM ' ' struct buffer_t { char *mem; @@ -52,21 +52,21 @@ static struct options_t { /* A quick and dirty implementation derived from glibc */ static size_t strnlen(const char *s, size_t max) { - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); } char *strndup(const char *s, size_t n) { - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); - if(new == NULL) - return NULL; + if(new == NULL) + return NULL; - new[len] = '\0'; - return (char *)memcpy(new, s, len); + new[len] = '\0'; + return (char *)memcpy(new, s, len); } #endif diff --git a/src/util/pactree.c b/src/util/pactree.c index 33cf66c..2cba1b0 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -125,21 +125,21 @@ const char *configfile = CONFFILE; /* A quick and dirty implementation derived from glibc */ static size_t strnlen(const char *s, size_t max) { - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); } char *strndup(const char *s, size_t n) { - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); - if(new == NULL) - return NULL; + if(new == NULL) + return NULL; - new[len] = '\0'; - return (char *)memcpy(new, s, len); + new[len] = '\0'; + return (char *)memcpy(new, s, len); } #endif @@ -362,7 +362,7 @@ static void print_text(const char *pkg, const char *provision, /* print tip */ if(!pkg && provision) { - printf("%s%s%s%s [unresolvable]%s\n", tip, color->leaf1, + printf("%s%s%s%s [unresolvable]%s\n", tip, color->leaf1, provision, color->branch1, color->off); } else if(provision && strcmp(pkg, provision) != 0) { printf("%s%s%s%s%s %s%s%s\n", tip, color->leaf1, pkg, -- 1.8.3.3

3 10