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

[pacman-dev] [PATCH] pacman-key: return 0 from get_from if default value used
by Allan McRae 30 Sep '11

30 Sep '11

This prevents the error trap being set off when GPGDir is commented in pacman.conf. Bug introduced in 507b01b9. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/pacman-key.sh.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 8642928..e293d49 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -106,7 +106,10 @@ get_from() { return 0 fi done < "$1" - printf '%s\n' "$3" + if [[ -n "$3" ]]; then + printf '%s\n' "$3" + return 0 + fi return 1 } -- 1.7.6.4

1 0

[pacman-dev] Pacman 4.0.0rc2
by Dan McGee 30 Sep '11

30 Sep '11

You don't need to be as daring this time- we've had some 246 commits since RC1. The most relevant changes is signing is about 95% functional at this point- see directions below the links. * pacman -U http://dev.archlinux.org/~dan/pacman-4.0.0rc2-1-i686.pkg.tar.gz * pacman -U http://dev.archlinux.org/~dan/pacman-4.0.0rc2-1-x86_64.pkg.tar.gz Please report any issues you may find with this package, as it is getting very close to being an actual releasable version. These are debug builds with symbols, so getting stack traces and helpful logging should be relatively straight forward if necessary. == How to enable package signature checking == 1. Install above pacman RC package. 2. sudo pacman-key --init 3. `SigLevel = Optional` in pacman.conf is the default- for more info, see man pacman.conf, but this means signatures will be checked *if available*, and there will be no error if they are not. However, due to us not having a web of trust for Arch developer keys, you will need to add this to the [options] section: SigLevel = Optional TrustAll 4. Run -Syu or any other operation that fetches packages from sync databases. When it comes time to check package integrity, you may be prompted to import keys that are not in your keychain. If a signature is available, it will be used instead of sha256sums/md5sums. -Dan

2 5

[pacman-dev] [PATCH] makepkg: unify tarball creation
by lolilolicon 29 Sep '11

29 Sep '11

Introduce ext_to_tar_opt() to unify package and source package tarball creation. This requires bsdtar to support the compression options -z, -j, -J and -Z. Note also the 'compress' command is not available in Arch (FS#25908), so 'bsdtar -Z' seems to be the only way to support .tar.Z archive creation. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- scripts/makepkg.sh.in | 107 ++++++++++++++++++------------------------------ 1 files changed, 40 insertions(+), 67 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 86e74a6..75c3730 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1212,6 +1212,22 @@ check_package() { } +# get bsdtar compression flag from extension +ext_to_tar_opt() { + local extension=$1 TAR_OPT= + case "$extension" in + *.tar.gz) TAR_OPT="z" ;; + *.tar.bz2) TAR_OPT="j" ;; + *.tar.xz) TAR_OPT="J" ;; + *.tar.Z) TAR_OPT="Z" ;; + *.tar) ;; + *) warning "$(gettext "'%s' is not a valid archive extension.")" \ + "$extension" ;; + esac + + printf '%s' "$TAR_OPT" +} + create_package() { if [[ ! -d $pkgdir ]]; then error "$(gettext "Missing %s directory.")" "pkg/" @@ -1253,71 +1269,43 @@ create_package() { fi done - # tar it up - msg2 "$(gettext "Compressing package...")" - - local EXT - case "$PKGEXT" in - *tar.gz) EXT=${PKGEXT%.gz} ;; - *tar.bz2) EXT=${PKGEXT%.bz2} ;; - *tar.xz) EXT=${PKGEXT%.xz} ;; - *tar.Z) EXT=${PKGEXT%.Z} ;; - *tar) EXT=${PKGEXT} ;; - *) warning "$(gettext "'%s' is not a valid archive extension.")" \ - "$PKGEXT" ; EXT=$PKGEXT ;; - esac - local fullver=$(get_full_version) local pkg_file="$PKGDEST/${nameofpkg}-${fullver}-${PKGARCH}${PKGEXT}" - local ret=0 [[ -f $pkg_file ]] && rm -f "$pkg_file" [[ -f $pkg_file.sig ]] && rm -f "$pkg_file.sig" + # tar it up + msg2 "$(gettext "Compressing package...")" + local TAR_OPT=$(ext_to_tar_opt "$PKGEXT") # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob - # TODO: Maybe this can be set globally for robustness - shopt -s -o pipefail - bsdtar -cf - $comp_files * | - case "$PKGEXT" in - *tar.gz) gzip -c -f -n ;; - *tar.bz2) bzip2 -c -f ;; - *tar.xz) xz -c -z - ;; - *tar.Z) compress -c -f ;; - *tar) cat ;; - esac > "${pkg_file}" || ret=$? - - shopt -u nullglob - shopt -u -o pipefail - - if (( ret )); then + if ! bsdtar -c${TAR_OPT}f "$pkg_file" $comp_files *; then error "$(gettext "Failed to create package file.")" exit 1 # TODO: error code - fi - - create_signature "$pkg_file" - - if (( ! ret )) && [[ ! "$PKGDEST" -ef "${startdir}" ]]; then - rm -f "${pkg_file/$PKGDEST/$startdir}" - ln -s "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}" - ret=$? - if [[ -f $pkg_file.sig ]]; then - rm -f "${pkg_file/$PKGDEST/$startdir}.sig" - ln -s "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig" + else + create_signature "$pkg_file" + if [[ ! "$PKGDEST" -ef "${startdir}" ]]; then + rm -f "${pkg_file/$PKGDEST/$startdir}" + if ! ln -s "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}" + warning "$(gettext "Failed to create symlink to package file.")" + fi + if [[ -f $pkg_file.sig ]]; then + rm -f "${pkg_file/$PKGDEST/$startdir}.sig" + if ! ln -s "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig" + warning "$(gettext "Failed to create symlink to signature file.")" + fi + fi fi fi - - if (( ret )); then - warning "$(gettext "Failed to create symlink to package file.")" - fi + shopt -u nullglob } create_signature() { if [[ $SIGNPKG != 'y' ]]; then return fi - local ret=0 local filename="$1" msg "$(gettext "Signing package...")" @@ -1326,10 +1314,7 @@ create_signature() { SIGNWITHKEY="-u ${GPGKEY}" fi # The signature will be generated directly in ascii-friendly format - gpg --detach-sign --use-agent ${SIGNWITHKEY} "$filename" &>/dev/null || ret=$? - - - if (( ! ret )); then + if gpg --detach-sign --use-agent ${SIGNWITHKEY} "$filename" &>/dev/null; then msg2 "$(gettext "Created signature file %s.")" "$filename.sig" else warning "$(gettext "Failed to sign package file.")" @@ -1369,35 +1354,23 @@ create_srcpackage() { done < <(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE") done - local TAR_OPT - case "$SRCEXT" in - *tar.gz) TAR_OPT="z" ;; - *tar.bz2) TAR_OPT="j" ;; - *tar.xz) TAR_OPT="J" ;; - *tar) TAR_OPT="" ;; - *) warning "$(gettext "'%s' is not a valid archive extension.")" \ - "$SRCEXT" ;; - esac - local fullver=$(get_full_version) local pkg_file="$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}" # tar it up msg2 "$(gettext "Compressing source package...")" cd "${srclinks}" + local TAR_OPT=$(ext_to_tar_opt "$SRCEXT") if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi - if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then + elif [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then rm -f "${pkg_file/$SRCPKGDEST/$startdir}" - ln -s "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" - ret=$? - fi - - if (( ret )); then - warning "$(gettext "Failed to create symlink to source package file.")" + if ! ln -s "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}"; then + warning "$(gettext "Failed to create symlink to source package file.")" + fi fi cd "${startdir}" -- 1.7.6.4

3 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-42-g83c05e7
by dan＠archlinux.org 29 Sep '11

29 Sep '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 83c05e71bc6e614f6f3d190d5e752a0c5239a2d1 (commit) via 1463a9aa3646a0886b7ec892f4a436ea5bb4749a (commit) via ad8d3ceb898716cf2642fb71963c0ef5a490621e (commit) via 775b94e64903057a75071491670013975fc3ecb2 (commit) via 497501d1c751b340a115657084402bb3899396c4 (commit) via d1af9b70c8ed76d38c5cb6205de6c9349b6d8a09 (commit) via e0acf2f144404e613a75d5aafea2a909989544e9 (commit) via 9a58d5c6c5a69ebf7a920c357820a59c19d5b641 (commit) via 83f99bfb39841b254046f6c8a210b6a91aca22ee (commit) from a8ed39ce05b68f5c9f0e29d86bf9bb0ac81b0ffd (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 83c05e71bc6e614f6f3d190d5e752a0c5239a2d1 Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Sep 29 10:45:20 2011 +0800 paccache: allow strictly integer for -k option Verify the argument to -k is a non-negative integer. Leading zeros are simply stripped. 'declare -i keep' allowed the argument to -k to be any arithmetic evaluation expression. The simple assignment 'keep=$OPTARG' triggers arithmetic evaluation implicitly, which can either consume a huge amount of resources with input such as '2**2**32' or immediately produce an error on invalid input. Instead, we simply 'declare -- keep' and avoid all that. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 1463a9aa3646a0886b7ec892f4a436ea5bb4749a Author: Allan McRae <allan(a)archlinux.org> Date: Thu Sep 29 21:07:48 2011 +1000 Remove redundant "removal" output in pure remove operation Printing "[removal]" beside all package names is redundant when all packages are being removed (i.e. when using -R). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ad8d3ceb898716cf2642fb71963c0ef5a490621e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Sep 29 12:17:16 2011 -0400 move prevprogress onto payload handle This is a poor place for it, and it will likely move again in the future, but it's better to have it here than as a static variable. Initialization of this variable is now no longer necessary as its zeroed on creation of the payload struct. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 775b94e64903057a75071491670013975fc3ecb2 Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Sep 29 03:05:03 2011 +0800 pkgdelta: proper quoting in [[ expression ]] Always quote the right-hand side of expression when the == or != operator is used, unless intended as a pattern. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> commit 497501d1c751b340a115657084402bb3899396c4 Author: lolilolicon <lolilolicon(a)gmail.com> Date: Wed Sep 28 13:06:03 2011 -0500 makepkg: proper quoting in [[ expression ]] Always quote the righthand side of expression when the == or != operator is used, unless intended as a pattern. Quoting bash(1): When the == and != operators are used, the string to the right of the operator is considered a pattern. Any part of the pattern may be quoted to force it to be matched as a string. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> commit d1af9b70c8ed76d38c5cb6205de6c9349b6d8a09 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 12:55:27 2011 -0500 Refactor display_targets to not be recursive This also fixes a memory leak and makes the dual-purpose "rows" variable go away in favor of storing the rows and non-verbose names separately. This also fixes some potential memory leaks and/or wrong behavior due to the config->verbosepkglists flag being flipped, which we should never be doing. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e0acf2f144404e613a75d5aafea2a909989544e9 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 12:58:43 2011 -0500 Refactor download payload reset and free This was done to squash a memory leak in the sync database download code. When we downloaded a database and then reused the payload struct, we could find ourselves calling get_fullpath() for the signatures and overwriting non-freed values we had left over from the database download. Refactor the payload_free function into a payload_reset function that we can call that does NOT free the payload itself, so we can reuse payload structs. This also allows us to move the payload to the stack in some call paths, relieving us of the need to alloc space. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9a58d5c6c5a69ebf7a920c357820a59c19d5b641 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 12:06:36 2011 -0500 Initialize cURL library on first use Rather than always initializing it on any handle creation. There are several frontend operations (search, info, etc.) that never need the download code, so spending time initializing this every single time is a bit silly. This makes it a bit more like the GPGME code init path. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 83f99bfb39841b254046f6c8a210b6a91aca22ee Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 04:47:28 2011 -0500 Add more valgrind suppressions Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.in | 8 ++- lib/libalpm/alpm.c | 5 -- lib/libalpm/be_sync.c | 42 ++++++++------- lib/libalpm/dload.c | 138 +++++++++++++++++++++++++----------------------- lib/libalpm/dload.h | 4 +- lib/libalpm/handle.h | 1 - lib/libalpm/sync.c | 5 +- scripts/makepkg.sh.in | 6 +- scripts/pkgdelta.sh.in | 6 +- src/pacman/util.c | 62 ++++++++++----------- valgrind.supp | 25 +++++++++ 11 files changed, 164 insertions(+), 138 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] move prevprogress onto payload handle
by Dave Reisner 29 Sep '11

29 Sep '11

This is a poor place for it, and it will likely move again in the future, but it's better to have it here than as a static variable. Initialization of this variable is now no longer necessary as its zeroed on creation of the payload struct. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/dload.c | 11 +++-------- lib/libalpm/dload.h | 1 + 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1e8db1e..d53187b 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -43,8 +43,6 @@ #include "handle.h" #ifdef HAVE_LIBCURL -static off_t prevprogress; /* last download amount */ - static const char *get_filename(const char *url) { char *filename = strrchr(url, '/'); @@ -103,19 +101,19 @@ static int curl_progress(void *file, double dltotal, double dlnow, total_size = payload->initial_size + (off_t)dltotal; - if(DOUBLE_EQ(dltotal, 0.0) || prevprogress == total_size) { + if(DOUBLE_EQ(dltotal, 0.0) || payload->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(prevprogress == 0) { + if(payload->prevprogress == 0) { payload->handle->dlcb(payload->remote_name, 0, (off_t)dltotal); } payload->handle->dlcb(payload->remote_name, current_size, total_size); - prevprogress = current_size; + payload->prevprogress = current_size; return 0; } @@ -367,9 +365,6 @@ static int curl_download_internal(struct dload_payload *payload, mask_signal(SIGPIPE, SIG_IGN, &orig_sig_pipe); mask_signal(SIGINT, &inthandler, &orig_sig_int); - /* Progress 0 - initialize */ - prevprogress = 0; - /* perform transfer */ handle->curlerr = curl_easy_perform(handle->curl); diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 765c5fd..8a2dbc6 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -35,6 +35,7 @@ struct dload_payload { char *fileurl; off_t initial_size; off_t max_size; + off_t prevprogress; int force; int allow_resume; int errors_ok; -- 1.7.6.4

1 0

[pacman-dev] [PATCH 1/3] paccache: allow strictly integer for -k option
by lolilolicon 29 Sep '11

29 Sep '11

Verify the argument to -k is a non-negative integer. Leading zeros are simply tripped. 'declare -i keep' allowed the argument to -k to be any arithmetic evaluation expression. The simple assignment 'keep=$OPTARG' triggers arithmetic evaluation implicitly, which can either consume a huge amount of resources with input such as '2**2**32' or immediately produce an error on invalid input. Instead, we simply 'declare -- keep' and avoid all that. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- contrib/paccache.in | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/paccache.in b/contrib/paccache.in index 11b7bbb..7c35cf2 100755 --- a/contrib/paccache.in +++ b/contrib/paccache.in @@ -21,8 +21,8 @@ shopt -s extglob declare -a candidates=() cmdopts=() whitelist=() blacklist=() -declare -i delete=0 dryrun=0 filecount=0 keep=3 move=0 totalsaved=0 -declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' movedir= scanarch= +declare -i delete=0 dryrun=0 filecount=0 move=0 totalsaved=0 +declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' keep=3 movedir= scanarch= msg() { local mesg=$1; shift @@ -220,8 +220,10 @@ while getopts ':a:c:dfhi:k:m:rsuvz' opt; do blacklist+=("${ign[@]}") unset i ign ;; k) keep=$OPTARG - if [[ $keep != $OPTARG ]] || (( keep < 0 )); then + if [[ -z $keep || -n ${keep//[0-9]/} ]]; then die 'argument to option -k must be a non-negative integer' + else + keep=$(( 10#$keep )) fi ;; m) move=1 movedir=$OPTARG ;; r) delete=1 ;; -- 1.7.6.4

2 4

[pacman-dev] [PATCH 3/3] paccache: verify nonnegative integer for -k option
by lolilolicon 28 Sep '11

28 Sep '11

Allow leading zeros, but always treat it as decimal. Also quote right side of [[ expression ]] when the != or == operator is used, unless a pattern is intended. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- contrib/paccache.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/paccache.in b/contrib/paccache.in index 11b7bbb..c86ea31 100755 --- a/contrib/paccache.in +++ b/contrib/paccache.in @@ -153,7 +153,7 @@ summarize() { while read -r pkg; do if (( verbose >= 3 )); then [[ $pkg =~ $pkg_re ]] && name=${BASH_REMATCH[1]} arch=${BASH_REMATCH[2]} - if [[ -z $seen || $seenarch != $arch || $seen != $name ]]; then + if [[ -z $seen || $seenarch != "$arch" || $seen != "$name" ]]; then printf '%s (%s):\n' "$name" "$arch" fi printf ' %s\n' "$pkg" @@ -220,8 +220,10 @@ while getopts ':a:c:dfhi:k:m:rsuvz' opt; do blacklist+=("${ign[@]}") unset i ign ;; k) keep=$OPTARG - if [[ $keep != $OPTARG ]] || (( keep < 0 )); then + if [[ -z $keep || -n ${keep//[0-9]/} ]]; then die 'argument to option -k must be a non-negative integer' + else + keep=$(( 10#$keep )) fi ;; m) move=1 movedir=$OPTARG ;; r) delete=1 ;; -- 1.7.6.4

2 3

[pacman-dev] [PATCH 2/3] pkgdelta: clean up quoting
by lolilolicon 28 Sep '11

28 Sep '11

Always quote the righthand side of expression when the == or != operator is used, unless intended as a pattern. Also, remove unnecessary quoting in variable assignments. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- scripts/pkgdelta.sh.in | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index a0e3cee..c53098a 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -85,25 +85,25 @@ create_xdelta() deltafile read_pkginfo "$oldfile" || return 1 - oldname="$pkgname" - oldver="$pkgver" - oldarch="$arch" + oldname=$pkgname + oldver=$pkgver + oldarch=$arch read_pkginfo "$newfile" || return 1 - newname="$pkgname" - newver="$pkgver" - newarch="$arch" + newname=$pkgname + newver=$pkgver + newarch=$arch - if [[ $oldname != $newname ]]; then + if [[ $oldname != "$newname" ]]; then error "$(gettext "The package names don't match : '%s' and '%s'")" "$oldname" "$newname" return 1 fi - if [[ $oldarch != $newarch ]]; then + if [[ $oldarch != "$newarch" ]]; then error "$(gettext "The package architectures don't match : '%s' and '%s'")" "$oldarch" "$newarch" return 1 fi - if [[ $oldver == $newver ]]; then + if [[ $oldver == "$newver" ]]; then error "$(gettext "Both packages have the same version : '%s'")" "$newver" return 1 fi -- 1.7.6.4

4 6

[pacman-dev] [PATCH 1/3] makepkg: proper quoting in [[ expression ]]
by lolilolicon 28 Sep '11

28 Sep '11

Always quote the righthand side of expression when the == or != operator is used, unless intended as a pattern. Quoting bash(1): When the == and != operators are used, the string to the right of the operator is considered a pattern. Any part of the pattern may be quoted to force it to be matched as a string. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- scripts/makepkg.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 86e74a6..cc06baa 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -414,7 +414,7 @@ download_file() { fi # rename the temporary download file to the final destination - if [[ $dlfile != $file ]]; then + if [[ $dlfile != "$file" ]]; then mv -f "$SRCDEST/$dlfile" "$SRCDEST/$file" fi } @@ -1509,7 +1509,7 @@ check_sanity() { eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | \ sed -e "s/provides=/provides_list+=/" -e "s/#.*//" -e 's/\\$//') for i in ${provides_list[@]}; do - if [[ $i != ${i//</} || $i != ${i//>/} ]]; then + if [[ $i == *['<>']* ]]; then error "$(gettext "%s array cannot contain comparison (< or >) operators.")" "provides" ret=1 fi @@ -1767,7 +1767,7 @@ devel_update() { # _foo=pkgver # if [[ -n $newpkgver ]]; then - if [[ $newpkgver != $pkgver ]]; then + if [[ $newpkgver != "$pkgver" ]]; then if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" -- 1.7.6.4

3 3

[pacman-dev] [PATCH 1/3] Initialize cURL library on first use
by Dan McGee 28 Sep '11

28 Sep '11

Rather than always initializing it on any handle creation. There are several frontend operations (search, info, etc.) that never need the download code, so spending time initializing this every single time is a bit silly. This makes it a bit more like the GPGME code init path. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.c | 5 --- lib/libalpm/dload.c | 77 ++++++++++++++++++++++++++++---------------------- lib/libalpm/dload.h | 1 + lib/libalpm/handle.h | 1 - 4 files changed, 44 insertions(+), 40 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 772c84d..3884334 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -78,11 +78,6 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, bindtextdomain("libalpm", LOCALEDIR); #endif -#ifdef HAVE_LIBCURL - curl_global_init(CURL_GLOBAL_SSL); - myhandle->curl = curl_easy_init(); -#endif - return myhandle; cleanup: diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1e8db1e..dbf7a8c 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -66,6 +66,15 @@ static char *get_fullpath(const char *path, const char *filename, return filepath; } +static CURL *get_libcurl_handle(alpm_handle_t *handle) +{ + if(!handle->curl) { + curl_global_init(CURL_GLOBAL_SSL); + handle->curl = curl_easy_init(); + } + return handle->curl; +} + enum { ABORT_SIGINT = 1, ABORT_OVER_MAXFILESIZE @@ -201,7 +210,7 @@ static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user) } static void curl_set_handle_opts(struct dload_payload *payload, - char *error_buffer) + CURL *curl, char *error_buffer) { alpm_handle_t *handle = payload->handle; const char *useragent = getenv("HTTP_USER_AGENT"); @@ -209,47 +218,46 @@ static void curl_set_handle_opts(struct dload_payload *payload, /* the curl_easy handle is initialized with the alpm handle, so we only need * to reset the handle's parameters for each time it's used. */ - curl_easy_reset(handle->curl); - curl_easy_setopt(handle->curl, CURLOPT_URL, payload->fileurl); - curl_easy_setopt(handle->curl, CURLOPT_FAILONERROR, 1L); - curl_easy_setopt(handle->curl, CURLOPT_ERRORBUFFER, error_buffer); - curl_easy_setopt(handle->curl, CURLOPT_CONNECTTIMEOUT, 10L); - curl_easy_setopt(handle->curl, CURLOPT_FILETIME, 1L); - curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 0L); - curl_easy_setopt(handle->curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(handle->curl, CURLOPT_PROGRESSFUNCTION, curl_progress); - curl_easy_setopt(handle->curl, CURLOPT_PROGRESSDATA, (void *)payload); - curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_LIMIT, 1024L); - curl_easy_setopt(handle->curl, CURLOPT_LOW_SPEED_TIME, 10L); - curl_easy_setopt(handle->curl, CURLOPT_HEADERFUNCTION, parse_headers); - curl_easy_setopt(handle->curl, CURLOPT_WRITEHEADER, (void *)payload); - curl_easy_setopt(handle->curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); + curl_easy_reset(curl); + curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer); + curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L); + curl_easy_setopt(curl, CURLOPT_FILETIME, 1L); + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, curl_progress); + curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *)payload); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1024L); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L); + curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, parse_headers); + curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload); + curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); _alpm_log(handle, ALPM_LOG_DEBUG, "url: %s\n", payload->fileurl); if(payload->max_size) { _alpm_log(handle, ALPM_LOG_DEBUG, "maxsize: %jd\n", (intmax_t)payload->max_size); - curl_easy_setopt(handle->curl, CURLOPT_MAXFILESIZE_LARGE, + curl_easy_setopt(curl, CURLOPT_MAXFILESIZE_LARGE, (curl_off_t)payload->max_size); } if(useragent != NULL) { - curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, useragent); + curl_easy_setopt(curl, CURLOPT_USERAGENT, useragent); } if(!payload->allow_resume && !payload->force && payload->destfile_name && stat(payload->destfile_name, &st) == 0) { /* start from scratch, but only download if our local is out of date. */ - curl_easy_setopt(handle->curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); - curl_easy_setopt(handle->curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); + curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + curl_easy_setopt(curl, CURLOPT_TIMEVALUE, (long)st.st_mtime); _alpm_log(handle, ALPM_LOG_DEBUG, "using time condition: %lu\n", (long)st.st_mtime); } else if(stat(payload->tempfile_name, &st) == 0 && payload->allow_resume) { /* a previous partial download exists, resume from end of file. */ payload->tempfile_openmode = "ab"; - curl_easy_setopt(handle->curl, CURLOPT_RESUME_FROM_LARGE, - (curl_off_t)st.st_size); + curl_easy_setopt(curl, CURLOPT_RESUME_FROM_LARGE, (curl_off_t)st.st_size); _alpm_log(handle, ALPM_LOG_DEBUG, "tempfile found, attempting continuation from %jd bytes\n", (intmax_t)st.st_size); @@ -319,6 +327,7 @@ static int curl_download_internal(struct dload_payload *payload, struct sigaction orig_sig_pipe, orig_sig_int; /* shortcut to our handle within the payload */ alpm_handle_t *handle = payload->handle; + CURL *curl = get_libcurl_handle(handle); handle->pm_errno = 0; payload->tempfile_openmode = "wb"; @@ -347,7 +356,7 @@ static int curl_download_internal(struct dload_payload *payload, } } - curl_set_handle_opts(payload, error_buffer); + curl_set_handle_opts(payload, curl, error_buffer); if(localf == NULL) { localf = fopen(payload->tempfile_name, payload->tempfile_openmode); @@ -360,7 +369,7 @@ static int curl_download_internal(struct dload_payload *payload, "opened tempfile for download: %s (%s)\n", payload->tempfile_name, payload->tempfile_openmode); - curl_easy_setopt(handle->curl, CURLOPT_WRITEDATA, localf); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, localf); /* ignore any SIGPIPE signals- these may occur if our FTP socket dies or * something along those lines. Store the old signal handler first. */ @@ -371,16 +380,16 @@ static int curl_download_internal(struct dload_payload *payload, prevprogress = 0; /* perform transfer */ - handle->curlerr = curl_easy_perform(handle->curl); + payload->curlerr = curl_easy_perform(curl); /* immediately unhook the progress callback */ - curl_easy_setopt(handle->curl, CURLOPT_NOPROGRESS, 1L); + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L); /* was it a success? */ - switch(handle->curlerr) { + switch(payload->curlerr) { case CURLE_OK: /* get http/ftp response code */ - curl_easy_getinfo(handle->curl, CURLINFO_RESPONSE_CODE, &respcode); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &respcode); if(respcode >=400) { payload->unlink_on_fail = 1; goto cleanup; @@ -389,7 +398,7 @@ static int curl_download_internal(struct dload_payload *payload, case CURLE_ABORTED_BY_CALLBACK: /* handle the interrupt accordingly */ if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { - handle->curlerr = CURLE_FILESIZE_EXCEEDED; + payload->curlerr = CURLE_FILESIZE_EXCEEDED; handle->pm_errno = ALPM_ERR_LIBCURL; /* the hardcoded 'size exceeded' message is same as libcurl's normal */ _alpm_log(handle, ALPM_LOG_ERROR, @@ -416,11 +425,11 @@ static int curl_download_internal(struct dload_payload *payload, } /* retrieve info about the state of the transfer */ - curl_easy_getinfo(handle->curl, CURLINFO_FILETIME, &remote_time); - curl_easy_getinfo(handle->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &remote_size); - curl_easy_getinfo(handle->curl, CURLINFO_SIZE_DOWNLOAD, &bytes_dl); - curl_easy_getinfo(handle->curl, CURLINFO_CONDITION_UNMET, &timecond); - curl_easy_getinfo(handle->curl, CURLINFO_EFFECTIVE_URL, &effective_url); + curl_easy_getinfo(curl, CURLINFO_FILETIME, &remote_time); + curl_easy_getinfo(curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &remote_size); + curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &bytes_dl); + curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &timecond); + curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url); /* time condition was met and we didn't download anything. we need to * clean up the 0 byte .part file that's left behind. */ diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 765c5fd..c2fd609 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -39,6 +39,7 @@ struct dload_payload { int allow_resume; int errors_ok; int unlink_on_fail; + CURLcode curlerr; /* last error produced by curl */ }; void _alpm_dload_payload_free(struct dload_payload *payload); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index b1d70d2..8477dca 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -60,7 +60,6 @@ struct __alpm_handle_t { #ifdef HAVE_LIBCURL /* libcurl handle */ CURL *curl; /* reusable curl_easy handle */ - CURLcode curlerr; /* last error produced by curl */ #endif /* callback functions */ -- 1.7.6.4

1 2