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

[pacman-dev] [PATCH] pacman-key: better handling of options and supressing gpg output
by Denis A. Altoé Falqueto 01 Apr '11

01 Apr '11

The option --trust was changed to --edit-key, for better alignment with the underlying --edit-key of gnupg. The options --config and --gpgdir were not being handled correctly. They would not work if were not used as first arguments always. Now the handling is more flexible. The use of gpg for verification purposes was leaking inconvenient messages to the output, so they were quieted with --quiet, 1>/dev/null and 2>&1. The check for existence of gpg and if user is root was put in a function and called just when needed. Signed-off-by: Denis A. Altoé Falqueto <denisfalqueto(a)gmail.com> --- This patch is a remake of this one: http://mailman.archlinux.org/pipermail/pacman-dev/2011-February/012457.html. It is adapted for master branch. I've applied some suggestions from other emails regarding that implementation, like a function to check if gpg exists and if user is root. It is called just if an operation needs to check it, avoiding a special casing for -h or -v. doc/pacman-key.8.txt | 4 +- scripts/pacman-key.sh.in | 137 ++++++++++++++++++++++++++++++---------------- 2 files changed, 92 insertions(+), 49 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 8a08480..e806b81 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -68,8 +68,8 @@ Commands *\--reload*:: Reloads the keys from the keyring package. -*-t, \--trust* keyid:: - Set the trust level of the given key. +*-t*, *\--edit-key* 'keyid ...':: + Edit trust properties for the given keys *-u, \--updatedb*:: Equivalent to \--check-trustdb in GnuPG. diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 89e52fc..2b19611 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -66,7 +66,7 @@ usage() { echo "$(gettext " -h, --help This help")" echo "$(gettext " -l, --list List keys")" echo "$(gettext " -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids")" - echo "$(gettext " -t, --trust <keyid(s)> Set the trust level of the given keyids")" + echo "$(gettext " -t, --edit-key <keyid> ... edit trust properties for the given keys")" echo "$(gettext " -u, --updatedb Update the trustdb of pacman")" echo "$(gettext " -V, --version Show program version")" echo "$(gettext " --adv <params> Use pacman's keyring with advanced gpg commands")" @@ -110,7 +110,7 @@ reload_keyring() { # Verify signatures of related files, if they exist if [[ -r "${ADDED_KEYS}" ]]; then msg "$(gettext "Verifying official keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${ADDED_KEYS}.sig" 1>/dev/null; then + if ! ${GPG_PACMAN} --verify "${ADDED_KEYS}.sig" &>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${ADDED_KEYS}" exit 1 fi @@ -118,7 +118,7 @@ reload_keyring() { if [[ -r "${DEPRECATED_KEYS}" ]]; then msg "$(gettext "Verifying deprecated keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${DEPRECATED_KEYS}.sig" 1>/dev/null; then + if ! ${GPG_PACMAN} --verify "${DEPRECATED_KEYS}.sig" &>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${DEPRECATED_KEYS}" exit 1 fi @@ -126,7 +126,7 @@ reload_keyring() { if [[ -r "${REMOVED_KEYS}" ]]; then msg "$(gettext "Verifying deleted keys file signature...")" - if ! ${GPG_PACMAN} --quiet --batch --verify "${REMOVED_KEYS}.sig"; then + if ! ${GPG_PACMAN} --verify "${REMOVED_KEYS}.sig" &>/dev/null; then error "$(gettext "The signature of file %s is not valid.")" "${REMOVED_KEYS}" exit 1 fi @@ -204,14 +204,8 @@ reload_keyring() { ${GPG_PACMAN} --batch --check-trustdb } -# PROGRAM START -if ! type gettext &>/dev/null; then - gettext() { - echo "$@" - } -fi - -if [[ $1 != "--version" && $1 != "-V" && $1 != "--help" && $1 != "-h" && $1 != "" ]]; then +# Checks if gpg exists and user is root +function check_environment() { if type -p gpg >/dev/null 2>&1 = 1; then error "$(gettext "gnupg does not seem to be installed.")" msg2 "$(gettext "pacman-key requires gnupg for most operations.")" @@ -220,17 +214,49 @@ if [[ $1 != "--version" && $1 != "-V" && $1 != "--help" && $1 != "-h" && $1 != " error "$(gettext "pacman-key needs to be run as root.")" exit 1 fi +} + +# PROGRAM START +if ! type gettext &>/dev/null; then + gettext() { + echo "$@" + } fi -# Parse global options +# Iterate over the parameters to get --config and --gpgdir +# The other parameters will be filtered to another array, +# so --config and --gpgdir don't interfere with other options. CONFIG="@sysconfdir@/pacman.conf" -PACMAN_KEYRING_DIR="@sysconfdir@/pacman.d/gnupg" -while [[ $1 =~ ^--(config|gpgdir)$ ]]; do - case "$1" in - --config) shift; CONFIG="$1" ;; - --gpgdir) shift; PACMAN_KEYRING_DIR="$1" ;; +declare -a PARAMS +GPGDIR="" +isconfig=0 +isgpgdir=0 +for arg in "$@"; do + if (( isconfig )); then + isconfig=0 + CONFIG="$arg" + if [[ ! -f "$CONFIG" ]]; then + error "$(gettext "The configuration file is not a valid file.")" + usage + exit 1 + fi + continue + fi + if (( isgpgdir )); then + isgpgdir=0 + GPGDIR="$arg" + if [[ ! -d "$GPGDIR" ]]; then + error "$(gettext "The home directory for GnuPG is not valid.")" + usage + exit 1 + fi + continue + fi + case "$arg" in + --config) isconfig=1;; + --gpgdir) isgpgdir=1;; + *) PARAMS[${#PARAMS[@]}]="$arg" esac - shift done if [[ ! -r "${CONFIG}" ]]; then @@ -239,11 +265,13 @@ if [[ ! -r "${CONFIG}" ]]; then fi # Read GPGDIR from $CONFIG. -# The pattern is: any spaces or tabs, GPGDir, any spaces or tabs, equal sign -# and the rest of the line. The string is splitted after the first occurrence of = -if [[ GPGDIR=$(find_config "GPGDir") == 0 ]]; then - PACMAN_KEYRING_DIR="${GPGDIR}" -fi +# The precedence for GPGDIR is: +# 1st: command line +# 2nd: pacman.conf +# 3rd: default value +[[ -z "$GPGDIR" ]] && GPGDIR=$(find_config "GPGDir") +[[ -z "$GPGDIR" ]] && GPGDIR="@sysconfdir@/pacman.d/gnupg" +PACMAN_KEYRING_DIR="${GPGDIR}" GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning" # Try to create $PACMAN_KEYRING_DIR if non-existent @@ -252,74 +280,89 @@ GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning" [[ -e ${PACMAN_KEYRING_DIR} ]] || mkdir -p -m 755 "${PACMAN_KEYRING_DIR}" # Parse and execute command -command="$1" +command="${PARAMS[0]}" if [[ -z "${command}" ]]; then usage exit 1 fi -shift +unset PARAMS[0] case "${command}" in -a|--add) + check_environment # If there is no extra parameter, gpg will read stdin - ${GPG_PACMAN} --quiet --batch --import "$@" + ${GPG_PACMAN} --quiet --batch --import "${PARAMS[@]}" ;; -d|--del) - if (( $# == 0 )); then + check_environment + if (( ${#PARAMS[@]} == 0 )); then error "$(gettext "You need to specify at least one key identifier")" exit 1 fi - ${GPG_PACMAN} --quiet --batch --delete-key --yes "$@" + ${GPG_PACMAN} --quiet --batch --delete-key --yes "${PARAMS[@]}" ;; -u|--updatedb) + check_environment ${GPG_PACMAN} --batch --check-trustdb ;; --reload) + check_environment reload_keyring ;; -l|--list) - ${GPG_PACMAN} --batch --list-sigs "$@" + check_environment + ${GPG_PACMAN} --list-sigs "${PARAMS[@]}" ;; -f|--finger) - ${GPG_PACMAN} --batch --fingerprint "$@" + check_environment + ${GPG_PACMAN} --fingerprint "${PARAMS[@]}" ;; -e|--export) - ${GPG_PACMAN} --armor --export "$@" + check_environment + ${GPG_PACMAN} --armor --export "${PARAMS[@]}" ;; -r|--receive) - if (( $# < 2 )); then + check_environment + if (( ${#PARAMS[@]} < 2 )); then error "$(gettext "You need to specify the keyserver and at least one key identifier")" exit 1 fi - keyserver="$1" - shift - ${GPG_PACMAN} --keyserver "${keyserver}" --recv-keys "$@" + keyserver="${PARAMS[1]}" + unset PARAMS[1] + ${GPG_PACMAN} --keyserver "${keyserver}" --recv-keys "${PARAMS[@]}" ;; - -t|--trust) - if (( $# == 0 )); then + -t|--edit-key) + check_environment + if (( ${#PARAMS[@]} == 0 )); then error "$(gettext "You need to specify at least one key identifier")" + usage exit 1 fi - while (( $# > 0 )); do - # Verify if the key exists in pacman's keyring - if ${GPG_PACMAN} --list-keys "$1" > /dev/null 2>&1; then - ${GPG_PACMAN} --edit-key "$1" - else - error "$(gettext "The key identified by %s doesn't exist")" "$1" - exit 1 + for key in "${PARAMS[@]}"; do + if [[ -n "$key" ]]; then + # Verify if the key exists in pacman's keyring + if ${GPG_PACMAN} --list-keys "$key" &>/dev/null; then + ${GPG_PACMAN} --edit-key "$key" + else + error "$(gettext "The key identified by %s doesn't exist")" "$key" + exit 1 + fi fi - shift done ;; --adv) + check_environment msg "$(gettext "Executing: %s ")$*" "${GPG_PACMAN}" - ${GPG_PACMAN} "$@" || ret=$? + ${GPG_PACMAN} "${PARAMS[@]}" || ret=$? exit $ret ;; -h|--help) usage; exit 0 ;; -V|--version) version; exit 0 ;; + # Parameters already handled + --config) shift ;; + --gpgdir) shift ;; *) usage; exit 1 ;; esac -- 1.7.4.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.1-22-gd8d89d8
by dan＠archlinux.org 01 Apr '11

01 Apr '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via d8d89d8d27794d493ed2aa9eba4649e6e3ff4a9d (commit) via 7f6d986ac93e3465db6a4ed5c3ac77b72d890e68 (commit) via 39fd8bc318d4a90aab704f892cd80c22f5c7345f (commit) via 20c4928ee155db7b43b9f5b440a2cb199f178bb4 (commit) via a164c8405a0fb08cc7783d51796fbb76d0e4f493 (commit) via 541c2470b8ad8c1c0c925d2474da44384b5d7d66 (commit) from 287e8d356e8be8ae4af00e34e25d3f6727945952 (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 d8d89d8d27794d493ed2aa9eba4649e6e3ff4a9d Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 1 15:16:26 2011 -0500 Ensure stdout/stderr are flushed when asking questions Addresses FS#23492, where the question was shown without knowing what one was answering to. Ensure we flush our output streams before printing the question, and flush the stream on which we ask the question before waiting for an answer. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7f6d986ac93e3465db6a4ed5c3ac77b72d890e68 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 1 15:13:37 2011 -0500 Add default changelog functions to pkg_operations So we don't segfault when calling this on be_sync loaded packages. They return logical values as much as possible for indicating there is no changelog available. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 39fd8bc318d4a90aab704f892cd80c22f5c7345f Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 1 14:31:50 2011 -0500 Ensure dbpath is not null when populating sync database We didn't do this sanity check before trying to open an archive. If the alpm dbpath wasn't set, the sync database dbpath would be NULL, causing us to hang indefinitely in archive_read_open_filename() rather than erroring out. We already have a corresponding check in local_db_populate(). The following program will test this case, and hangs before this patch without the call to set_dbpath: int main(int argc, char *argv[]) { alpm_initialize(); // alpm_option_set_dbpath("/var/lib/pacman/"); pmdb_t *core = alpm_db_register_sync("core"); pmpkg_t *pkg = alpm_db_get_pkg(core, "pacman"); return 0; } Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20c4928ee155db7b43b9f5b440a2cb199f178bb4 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Apr 1 12:30:57 2011 -0500 Ignore upcoming new values in sync backend PGPSIG and SHA256SUM are new and we can safely ignore them for now if we come across them. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a164c8405a0fb08cc7783d51796fbb76d0e4f493 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Mar 31 11:12:58 2011 +1000 makepkg: remove unnecessary tr usage The use of "tr" only leads to trouble. Remove unnecessary usage of it from within makepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 541c2470b8ad8c1c0c925d2474da44384b5d7d66 Author: Dave Reisner <d(a)falconindy.com> Date: Tue Mar 29 20:35:48 2011 -0400 makepkg: avoid usage of tr to sidestep locale issues to quote dan: "turkish will FUCK YOU UP. this is not the first or the last time" Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_sync.c | 21 ++++++++++++++++++--- lib/libalpm/package.c | 9 +++++++++ scripts/makepkg.sh.in | 15 ++++++--------- src/pacman/util.c | 5 +++++ 4 files changed, 38 insertions(+), 12 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Problem with alpm_pkg_changelog_open
by kachelaqa 01 Apr '11

01 Apr '11

hello i have used swig to create some python bindings for libalpm. with pacman-3.4 it was possible to use alpm_pkg_changelog_open with packages from both the local and sync databases. with pacman-3.5, however, packages from sync databases now produce a segfault (local packages still work fine). here is a sample of some code which is currently segfaulting for me: int test_changelog(pmpkg_t *pkg) { void *fp = NULL; if (pkg != NULL) { if ((fp = alpm_pkg_changelog_open(pkg)) != NULL) { alpm_pkg_changelog_close(pkg, fp); return 1; } } return 0; } am i doing something wrong, or should i post a bug report?

2 5