- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] Improve --help switch output for pacman utils
by Jason St. John 03 Sep '13

03 Sep '13

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> --- This is a resubmit of a previous patch that has been rebased on the latest master. The original patch can be found on the ML here: https://mailman.archlinux.org/pipermail/pacman-dev/2013-July/017647.html This patch partially addresses the issues raised by Karol Błażewicz in this email: https://mailman.archlinux.org/pipermail/pacman-dev/2013-June/017391.html src/util/cleanupdelta.c | 9 ++++----- src/util/pacsort.c | 5 +++-- src/util/pactree.c | 7 ++++--- src/util/testdb.c | 12 +++++------- src/util/testpkg.c | 6 +++--- src/util/vercmp.c | 17 +++++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 4f34435..b13d770 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -24,8 +24,6 @@ #include <alpm.h> #include <alpm_list.h> -#define BASENAME "cleanupdelta" - alpm_handle_t *handle = NULL; static void cleanup(int signum) @@ -87,9 +85,10 @@ static void checkdbs(alpm_list_t *dbnames) static void usage(void) { - fprintf(stderr, "usage:\n"); - fprintf(stderr, - "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); + fprintf(stderr, "cleanupdelta (pacman) v" PACKAGE_VERSION "\n\n" + "Returns a list of unused delta in a given sync database.\n\n" + "Usage: cleanupdelta [options]\n\n" + " -b <pacman db> core extra ... : check the listed sync databases\n"); exit(1); } diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 7c551c2..687e558 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -343,9 +343,10 @@ static char escape_char(const char *string) static void usage(void) { - fprintf(stderr, "pacsort v" PACKAGE_VERSION "\n" + fprintf(stderr, "pacsort (pacman) v" PACKAGE_VERSION "\n\n" + "A sort utility implementing alpm_pkg_vercmp.\n\n" "Usage: pacsort [options] [files...]\n\n" - " -f, --files assume inputs are filepaths of packages\n" + " -f, --files assume inputs are file paths of packages\n" " -h, --help display this help message\n" " -k, --key <index> sort input starting on specified column\n" " -r, --reverse sort in reverse order (default: oldest to newest)\n" diff --git a/src/util/pactree.c b/src/util/pactree.c index 42c75aa..3d55d9f 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -310,9 +310,10 @@ static int parse_options(int argc, char *argv[]) static void usage(void) { - fprintf(stderr, "pactree v" PACKAGE_VERSION "\n" + fprintf(stderr, "pactree (pacman) v" PACKAGE_VERSION "\n\n" + "A simple dependency tree viewer.\n\n" "Usage: pactree [options] PACKAGE\n\n" - " -a, --ascii use ascii characters for tree formatting\n" + " -a, --ascii use ASCII characters for tree formatting\n" " -b, --dbpath <path> set an alternate database location\n" " -c, --color colorize output\n" " -d, --depth <#> limit the depth of recursion\n" @@ -320,7 +321,7 @@ static void usage(void) " -h, --help display this help message\n" " -l, --linear enable linear output\n" " -r, --reverse list packages that depend on the named package\n" - " -s, --sync search sync DBs instead of local\n" + " -s, --sync search sync databases instead of local\n" " -u, --unique show dependencies with no duplicates (implies -l)\n" " --config <path> set an alternate configuration file\n"); } diff --git a/src/util/testdb.c b/src/util/testdb.c index 0ca7ffc..3d341b3 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -27,8 +27,6 @@ #include <alpm.h> #include <alpm_list.h> -#define BASENAME "testdb" - alpm_handle_t *handle = NULL; static void cleanup(int signum) @@ -244,11 +242,11 @@ cleanup: static void usage(void) { - fprintf(stderr, "usage:\n"); - fprintf(stderr, - "\t%s [-b <pacman db>] : check the local database\n", BASENAME); - fprintf(stderr, - "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); + fprintf(stderr, "testdb (pacman) v" PACKAGE_VERSION "\n\n" + "Test a pacman local database for validity.\n\n" + "Usage: testdb [options]\n\n" + " -b <pacman db> : check the local database\n" + " -b <pacman db> core extra ... : check the listed sync databases\n"); exit(1); } diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 10b2f2c..d1b75ac 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -22,8 +22,6 @@ #include <alpm.h> -#define BASENAME "testpkg" - __attribute__((format(printf, 2, 0))) static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) { @@ -47,7 +45,9 @@ int main(int argc, char *argv[]) const alpm_siglevel_t level = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL; if(argc != 2) { - fprintf(stderr, "usage: %s <package file>\n", BASENAME); + fprintf(stderr, "testpkg (pacman) v" PACKAGE_VERSION "\n\n" + "Test a pacman package for validity.\n\n" + "Usage: testpkg <package file>\n"); return 1; } diff --git a/src/util/vercmp.c b/src/util/vercmp.c index f4356fb..41a4f8e 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -1,5 +1,6 @@ /* - * vercmp.c + * vercmp.c - Compare package version numbers using pacman's version + * comparison logic * * Copyright (c) 2006-2011 Pacman Development Team <pacman-dev(a)archlinux.org> * Copyright (c) 2002-2005 by Judd Vinet <jvinet(a)zeroflux.org> @@ -22,19 +23,19 @@ #include <stdio.h> /* printf */ #include <string.h> -#define BASENAME "vercmp" - /* forward declaration, comes from version.o in libalpm source that is linked * in directly so we don't have any library deps */ int alpm_pkg_vercmp(const char *a, const char *b); static void usage(void) { - fprintf(stderr, "usage: %s <ver1> <ver2>\n\n", BASENAME); - fprintf(stderr, "output values:\n"); - fprintf(stderr, " < 0 : if ver1 < ver2\n"); - fprintf(stderr, " 0 : if ver1 == ver2\n"); - fprintf(stderr, " > 0 : if ver1 > ver2\n"); + fprintf(stderr, "vercmp (pacman) v" PACKAGE_VERSION "\n\n" + "Compare package version numbers using pacman's version comparison logic.\n\n" + "Usage: vercmp <ver1> <ver2>\n\n" + "Output values:\n" + " < 0 : if ver1 < ver2\n" + " 0 : if ver1 == ver2\n" + " > 0 : if ver1 > ver2\n"); } int main(int argc, char *argv[]) -- 1.8.4

1 0

[pacman-dev] [PATCH 1/2] makepkg: unify list of known hash algorithms
by Dave Reisner 03 Sep '13

03 Sep '13

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> --- scripts/makepkg.sh.in | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 025f756..73f4eb7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -54,6 +54,8 @@ splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'replaces' 'backup' 'options' 'install' 'changelog') readonly -a packaging_options other_options splitpkg_overrides +known_hash_algos=(md5 sha1 sha256 sha384 sha512) + # Options ASDEPS=0 NEEDED=0 @@ -1107,10 +1109,10 @@ get_integlist() { local integ local integlist=() - for integ in md5 sha1 sha256 sha384 sha512; do - local integrity_sums=($(eval echo "\${${integ}sums[@]}")) - if [[ -n "$integrity_sums" ]]; then - integlist=(${integlist[@]} $integ) + for integ in "${known_hash_algos[@]}"; do + local sumname="${integ}sums[@]" + if [[ -n ${!sumname} ]]; then + integlist+=("$integ") fi done @@ -1131,19 +1133,17 @@ generate_checksums() { local integlist if (( $# == 0 )); then - integlist=$(get_integlist) + IFS=$'\n' read -ra integlist < <(get_integlist) else - integlist=$@ + integlist=("$@") fi local integ - for integ in ${integlist[@]}; do - case "$integ" in - md5|sha1|sha256|sha384|sha512) : ;; - *) - error "$(gettext "Invalid integrity algorithm '%s' specified.")" "$integ" - exit 1;; # $E_CONFIG_ERROR - esac + for integ in "${integlist[@]}"; do + if ! in_array "$integ" "${known_hash_algos[@]}"; then + error "$(gettext "Invalid integrity algorithm '%s' specified.")" "$integ" + exit 1 # $E_CONFIG_ERROR + fi local ct=0 local numsrc=${#source[@]} @@ -1192,8 +1192,9 @@ check_checksums() { local correlation=0 local integ required - for integ in md5 sha1 sha256 sha384 sha512; do - local integrity_sums=($(eval echo "\${${integ}sums[@]}")) + for integ in "${known_hash_algos[@]}"; do + local sumname="${integ}sums[@]" + local integrity_sums=("${!sumname}") if (( ${#integrity_sums[@]} == ${#source[@]} )); then msg "$(gettext "Validating source files with %s...")" "${integ}sums" correlation=1 -- 1.8.4

3 3

[pacman-dev] [PATCH 0/3] Add "Usage" option for repos
by Dave Reisner 03 Sep '13

03 Sep '13

I've been using these patches for a while now (see the author date on the actual patches) and would like to present them again for feedback. I've found it tremendously useful (particularly as an Arch packager) to be able to keep an eye on other repos like [staging] without actually having them enabled. Dave Reisner (3): libalpm: introduce a usage level for repos pacman: add front end support for repo usage level pactree: set full usage on DBs when registering doc/pacman.conf.5.txt | 18 +++++++++++++++ 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/sync.c | 15 +++++++++++-- src/pacman/conf.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ src/pacman/sync.c | 11 +++++++++ src/util/pactree.c | 3 ++- test/pacman/tests/sync051.py | 17 ++++++++++++++ test/pacman/tests/sync052.py | 14 ++++++++++++ 13 files changed, 191 insertions(+), 5 deletions(-) create mode 100644 test/pacman/tests/sync051.py create mode 100644 test/pacman/tests/sync052.py -- 1.8.3.4

3 7