- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] Refactor _alpm_runscriptlet()
by Dan McGee 30 Sep '11

30 Sep '11

Add an is_archive parameter to reduce the amount of black magic going on. Rework to use fewer PATH_MAX sized local variables, and simplify some of the logic where appropriate in both this function and in the callers where duplicate calls can be replaced by some conditional parameter code. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 48 +++++++++++++++++--------------------------- lib/libalpm/remove.c | 4 +- lib/libalpm/trans.c | 53 +++++++++++++++++++++++++++++++++----------------- lib/libalpm/trans.h | 4 +- 4 files changed, 58 insertions(+), 51 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 170d09e..33b85c0 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -452,17 +452,13 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, size_t pkg_current, size_t pkg_count) { int i, ret = 0, errors = 0; - char scriptlet[PATH_MAX]; - int is_upgrade = 0; + int is_upgrade; alpm_pkg_t *oldpkg = NULL; alpm_db_t *db = handle->db_local; alpm_trans_t *trans = handle->trans; ASSERT(trans != NULL, return -1); - snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", - _alpm_db_path(db), newpkg->name, newpkg->version); - /* see if this is an upgrade. if so, remove the old package first */ alpm_pkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name); if(local) { @@ -474,30 +470,23 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, goto cleanup; } - EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local); - _alpm_log(handle, ALPM_LOG_DEBUG, "upgrading package %s-%s\n", - newpkg->name, newpkg->version); - /* copy over the install reason */ newpkg->reason = alpm_pkg_get_reason(local); - /* pre_upgrade scriptlet */ - if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, newpkg->origin_data.file, - "pre_upgrade", newpkg->version, local->version); - } + EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local); } else { is_upgrade = 0; - EVENT(handle, ALPM_EVENT_ADD_START, newpkg, NULL); - _alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s-%s\n", - newpkg->name, newpkg->version); + } - /* pre_install scriptlet */ - if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, newpkg->origin_data.file, - "pre_install", newpkg->version, NULL); - } + _alpm_log(handle, ALPM_LOG_DEBUG, "%s package %s-%s\n", + is_upgrade ? "upgrading" : "adding", newpkg->name, newpkg->version); + /* pre_install/pre_upgrade scriptlet */ + if(alpm_pkg_has_scriptlet(newpkg) && + !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { + const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install"; + _alpm_runscriptlet(handle, newpkg->origin_data.file, + scriptlet_name, newpkg->version, NULL, 1); } /* we override any pre-set reason if we have alldeps or allexplicit set */ @@ -661,13 +650,14 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - if(is_upgrade) { - _alpm_runscriptlet(handle, scriptlet, "post_upgrade", - newpkg->version, oldpkg ? oldpkg->version : NULL); - } else { - _alpm_runscriptlet(handle, scriptlet, "post_install", - newpkg->version, NULL); - } + char scriptlet[PATH_MAX]; + const char *scriptlet_name; + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", + _alpm_db_path(db), newpkg->name, newpkg->version); + scriptlet_name = is_upgrade ? "post_upgrade" : "post_install"; + + _alpm_runscriptlet(handle, scriptlet, scriptlet_name, + newpkg->version, oldpkg ? oldpkg->version : NULL, 0); } if(is_upgrade) { diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index a3aa4a5..7f917fa 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -376,7 +376,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL); + _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL, 0); } } @@ -453,7 +453,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, /* run the post-remove script if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL); + _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL, 0); } } diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index fbc5fee..cb97a4a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -275,40 +275,50 @@ static int grep(const char *fn, const char *needle) return 0; } -int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, - const char *script, const char *ver, const char *oldver) +int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, + const char *script, const char *ver, const char *oldver, int is_archive) { - char scriptfn[PATH_MAX]; char cmdline[PATH_MAX]; - char tmpdir[PATH_MAX]; char *argv[] = { "sh", "-c", cmdline, NULL }; - char *scriptpath; + char *tmpdir, *scriptfn = NULL, *scriptpath; int retval = 0; + size_t len; - if(_alpm_access(handle, NULL, installfn, R_OK) != 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn); + if(_alpm_access(handle, NULL, filepath, R_OK) != 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "scriptlet '%s' not found\n", filepath); return 0; } - /* creates a directory in $root/tmp/ for copying/extracting the scriptlet */ - snprintf(tmpdir, PATH_MAX, "%stmp/", handle->root); + if(!is_archive && !grep(filepath, script)) { + /* script not found in scriptlet file; we can only short-circuit this early + * if it is an actual scriptlet file and not an archive. */ + return 0; + } + + /* create a directory in $root/tmp/ for copying/extracting the scriptlet */ + len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX") + 1; + MALLOC(tmpdir, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(tmpdir, len, "%stmp/", handle->root); if(access(tmpdir, F_OK) != 0) { _alpm_makepath_mode(tmpdir, 01777); } - snprintf(tmpdir, PATH_MAX, "%stmp/alpm_XXXXXX", handle->root); + snprintf(tmpdir, len, "%stmp/alpm_XXXXXX", handle->root); if(mkdtemp(tmpdir) == NULL) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not create temp directory\n")); + free(tmpdir); return 1; } /* either extract or copy the scriptlet */ - snprintf(scriptfn, PATH_MAX, "%s/.INSTALL", tmpdir); - if(strcmp(script, "pre_upgrade") == 0 || strcmp(script, "pre_install") == 0) { - if(_alpm_unpack_single(handle, installfn, tmpdir, ".INSTALL")) { + len += strlen("/.INSTALL"); + MALLOC(scriptfn, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(scriptfn, len, "%s/.INSTALL", tmpdir); + if(is_archive) { + if(_alpm_unpack_single(handle, filepath, tmpdir, ".INSTALL")) { retval = 1; } } else { - if(_alpm_copyfile(installfn, scriptfn)) { + if(_alpm_copyfile(filepath, scriptfn)) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), scriptfn, strerror(errno)); retval = 1; } @@ -317,8 +327,8 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, goto cleanup; } - if(!grep(scriptfn, script)) { - /* script not found in scriptlet file */ + if(is_archive && !grep(scriptfn, script)) { + /* script not found in extracted scriptlet file */ goto cleanup; } @@ -338,10 +348,17 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, retval = _alpm_run_chroot(handle, "/bin/sh", argv); cleanup: - if(_alpm_rmrf(tmpdir)) { - _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir); + if(scriptfn && unlink(scriptfn)) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not remove %s\n"), scriptfn); + } + if(rmdir(tmpdir)) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not remove tmpdir %s\n"), tmpdir); } + free(scriptfn); + free(tmpdir); return retval; } diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index 38f45ff..ff944b0 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -47,8 +47,8 @@ struct __alpm_trans_t { void _alpm_trans_free(alpm_trans_t *trans); int _alpm_trans_init(alpm_trans_t *trans, alpm_transflag_t flags); -int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, - const char *script, const char *ver, const char *oldver); +int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, + const char *script, const char *ver, const char *oldver, int is_archive); #endif /* _ALPM_TRANS_H */ -- 1.7.6.4

1 1

[pacman-dev] [PATCH] Remove redundant "removal" output in pure remove operation
by Allan McRae 30 Sep '11

30 Sep '11

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> --- src/pacman/util.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 748c0e9..34cdc8c 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -849,6 +849,9 @@ static void _display_targets(alpm_list_t *targets) if(target->install) { pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), alpm_pkg_get_version(target->install)); + } else if(isize == 0) { + pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->remove), + alpm_pkg_get_version(target->remove)); } else { pm_asprintf(&str, "%s-%s [removal]", alpm_pkg_get_name(target->remove), alpm_pkg_get_version(target->remove)); -- 1.7.6.4

2 5

[pacman-dev] [PATCH] pacman-key: remove errexit flag from shebang
by Dave Reisner 30 Sep '11

30 Sep '11

We're ill equipped to be using this flag as we don't trap and respond to the ERR signal. The result is that if is ever tripped, pacman-key will instantly exit with no indication of why. At the same time, we're already fairly good about doing our own error checking and verbalizing it before dying. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- rage. scripts/pacman-key.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 8642928..1df7bb6 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # # pacman-key - manages pacman's keyring # Based on apt-key, from Debian -- 1.7.6.4

1 0

[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

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

28 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 a8ed39ce05b68f5c9f0e29d86bf9bb0ac81b0ffd (commit) from 6f3a657f66b9c766b5fa6c51c26283d3547f5169 (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 a8ed39ce05b68f5c9f0e29d86bf9bb0ac81b0ffd Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 10:26:48 2011 -0500 verbose package lists: remove errant debugger Left this in as part of the last set of commits, whoops. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/util.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

28 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 6f3a657f66b9c766b5fa6c51c26283d3547f5169 (commit) via bcc6a5d72df3cb3ee9f3d2347526c3dc03d5f55a (commit) via 1b8bb7c1cd81c1f8f0dcffc952cd464b6a436f06 (commit) via f682cbd43355daa7b13389d74e0ffea0370ba89b (commit) via 7edeb276b63efeea7e8f266dfee792e2709ba412 (commit) via bd83c8e7562a2d6794d4322845c23cc21985979a (commit) via 40a264478e65c652f863b3e43b0fc8aa10f0bd19 (commit) via 6e081a0c57f0f6f14428f7cb78bb22f6848fe4af (commit) via 98e0371ae38d748fb04cec4759addb54e3a618ea (commit) via f66f9f11cd010a05efe28d0607abbf29ff8dffa5 (commit) via ea3c47825ea6a8cfd0e0d63fd7da0120fcacabc8 (commit) via 69962184bb3cc313f744de6553ef31b4eb256a01 (commit) via d8fab9b4415b2382c9b5d92f6d0d40074ab65f30 (commit) via bf56fb6eb82b732900c32cbf375f7910ac479d98 (commit) via 619c3629ca61cea2c182fcb0197f9b84ba4209c3 (commit) from e70d540501d718583a8e4b91ca5989af3f3db77d (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 6f3a657f66b9c766b5fa6c51c26283d3547f5169 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 04:46:22 2011 -0500 Always show download size if -w/--downloadonly was provided The prompt can be rather confusing otherwise when all files have already been downloaded, but there is not a single total size listed. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bcc6a5d72df3cb3ee9f3d2347526c3dc03d5f55a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 12 21:25:58 2011 -0400 Table format creation code cleanup Better scoping of variables for the most part, and ensure we are using string_length() and not strlen() as appropriate. Also refactor the longest cell code to call string_length() a lot less; by simply using an array of max sizes we don't have to recompute values nearly as much. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1b8bb7c1cd81c1f8f0dcffc952cd464b6a436f06 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 09:44:15 2011 -0500 Use unsigned types for indent width and column count For getcols(), the functions we call return a value of type 'unsigned short', so it makes sense for us to do the same. string_length() is meant to behave like strlen(), so it should return type size_t. This exposes other functions such as indentprint() which should also be using signed return types. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f682cbd43355daa7b13389d74e0ffea0370ba89b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 12 20:44:15 2011 -0400 Show download sizes when using -S/--sync We now label the old 'Size' column as 'Net Change' to reflect the reality of what we are looking at. Sync operations now get an additional 'Download Size' column. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7edeb276b63efeea7e8f266dfee792e2709ba412 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 29 15:35:59 2011 -0500 Keep track of explicitly added and removed packages This allows us to sort the output list by showing all pulled dependencies first, followed by the explicitly specified targets. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bd83c8e7562a2d6794d4322845c23cc21985979a Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 22 12:01:58 2011 -0500 Combine add and removal package list display There was no real reason for these to be done separately. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 40a264478e65c652f863b3e43b0fc8aa10f0bd19 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 01:53:43 2011 -0500 Track unresolvable transaction packages Rather than free them right away, keep the list on the transaction as we already do with add and remove lists. This is necessary because we may be manipulating pointers the frontend needs to refer to packages, and we are breaking our contract as stated in the alpm_add_pkg() documentation of only freeing packages at the end of a transaction. This fixes an issue found when refactoring the package list display code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6e081a0c57f0f6f14428f7cb78bb22f6848fe4af Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 04:45:30 2011 -0500 Move pacsave path construction code off the stack This is definitely not in the normal hot path, so we can afford to do some temporary heap allocation here. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 98e0371ae38d748fb04cec4759addb54e3a618ea Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 04:06:43 2011 -0500 Use the full buffer when computing md5/sha256 sums No wonder these were slower than expected. We were only reading 4 (32-bit) or 8 (64-bit) bytes at a time and feeding it to the hash functions. Define a buffer size constant and use it correctly so we feed 8K at a time into the hashing algorithm. This cut one larger `-Sw --noconfirm` operation, with nothing to actually download so only timing integrity, from 3.3s to 1.7s. This has been broken since the original commit eba521913d6 introducing OpenSSL usage for crypto hash functions. Boy do I feel stupid. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f66f9f11cd010a05efe28d0607abbf29ff8dffa5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Sep 28 02:56:36 2011 -0500 Fix memory leak in download payload->remote_name In the sync code, we explicitly allocated a string for this field, while in the dload code itself it was filled in with a pointer to another string. This led to a memory leak in the sync download case. Make remote_name non-const and always explicitly allocate it. This patch ensures this as well as uses malloc + snprintf (rather than calloc) in several codepaths, and eliminates the only use of PATH_MAX in the download code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ea3c47825ea6a8cfd0e0d63fd7da0120fcacabc8 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 20:24:04 2011 -0500 Revert "libalpm: compare pkgname with strcoll" This commit was made with the intent of displaying "correctly" sorted package lists to users. Here are some reasons I think this is incorrect: * It is done in the wrong place. If a frontend application wants to show a different order of packages dependent on locale, it should do that on its own. * Even if one wants a locale-specific order, almost all package names are all ASCII and language agnostic, so this different comparison makes little sense and may serve only to confuse people. * _alpm_pkg_cmp was unlike any other comparator function. None of the rest had any dependency on anything but the content of the structs being compared (e.g., they only used strcmp() or other basic comparison operators). This reverts commit 3e4d2c3aa65416487939148828afb385de2ee146. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 69962184bb3cc313f744de6553ef31b4eb256a01 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 17:47:40 2011 -0500 _alpm_splitdep: use malloc instead of calloc There was only one simple to handle case where we left a field uninitialized; set it to NULL and use malloc() instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d8fab9b4415b2382c9b5d92f6d0d40074ab65f30 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 17:36:31 2011 -0500 be_sync: fetch only entry mode, not full stat struct This saves a lot of unnecessary work since we don't need any of the other fields in the stat struct. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bf56fb6eb82b732900c32cbf375f7910ac479d98 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 16:14:17 2011 -0500 alpm_list: use malloc instead of calloc In every case we were calling calloc, the struct we allocated (or the memory to be used) is fully specified later in the method. For alpm_list_t allocations, we always set all of data, next, and prev. For list copying and transforming to an array, we always copy the entire data element, so no need to zero it first. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 619c3629ca61cea2c182fcb0197f9b84ba4209c3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 27 11:27:54 2011 -0400 makepkg: ensure '-' is last in a character glob If '-' isn't the last item, it's interpreted as a range and not literally, causing problematic behavior in parsing optdepends. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm_list.c | 8 +- lib/libalpm/be_sync.c | 7 +- lib/libalpm/deps.c | 8 +- lib/libalpm/dload.c | 26 +++-- lib/libalpm/dload.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/pkghash.c | 8 +- lib/libalpm/remove.c | 8 +- lib/libalpm/sync.c | 21 ++-- lib/libalpm/trans.c | 3 + lib/libalpm/trans.h | 5 +- lib/libalpm/util.c | 10 +- scripts/makepkg.sh.in | 3 +- src/pacman/callback.c | 4 +- src/pacman/conf.c | 4 +- src/pacman/conf.h | 3 + src/pacman/remove.c | 12 +- src/pacman/sync.c | 6 +- src/pacman/upgrade.c | 1 + src/pacman/util.c | 284 ++++++++++++++++++++++++++++++----------------- src/pacman/util.h | 12 ++- 21 files changed, 277 insertions(+), 160 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Use the full buffer when computing md5/sha256 sums
by Dan McGee 28 Sep '11

28 Sep '11

No wonder these were slower than expected. We were only reading 4 (32-bit) or 8 (64-bit) bytes at a time and feeding it to the hash functions. Define a buffer size constant and use it correctly so we feed 8K at a time into the hashing algorithm. This cut one larger `-Sw --noconfirm` operation, with nothing to actually download so only timing integrity, from 3.3s to 1.7s. This has been broken since the original commit eba521913d6 introducing OpenSSL usage for crypto hash functions. Boy do I feel stupid. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index a15eb96..18d1c36 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -741,6 +741,8 @@ int _alpm_lstat(const char *path, struct stat *buf) } #ifdef HAVE_LIBSSL +#define BUFFER_SIZE 8192 + static int md5_file(const char *path, unsigned char output[16]) { FILE *f; @@ -748,7 +750,7 @@ static int md5_file(const char *path, unsigned char output[16]) MD5_CTX ctx; unsigned char *buf; - CALLOC(buf, 8192, sizeof(unsigned char), return 1); + CALLOC(buf, BUFFER_SIZE, sizeof(unsigned char), return 1); if((f = fopen(path, "rb")) == NULL) { free(buf); @@ -757,7 +759,7 @@ static int md5_file(const char *path, unsigned char output[16]) MD5_Init(&ctx); - while((n = fread(buf, 1, sizeof(buf), f)) > 0) { + while((n = fread(buf, 1, BUFFER_SIZE, f)) > 0) { MD5_Update(&ctx, buf, n); } @@ -783,7 +785,7 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) SHA256_CTX ctx; unsigned char *buf; - CALLOC(buf, 8192, sizeof(unsigned char), return 1); + CALLOC(buf, BUFFER_SIZE, sizeof(unsigned char), return 1); if((f = fopen(path, "rb")) == NULL) { free(buf); @@ -796,7 +798,7 @@ static int sha2_file(const char *path, unsigned char output[32], int is224) SHA256_Init(&ctx); } - while((n = fread(buf, 1, sizeof(buf), f)) > 0) { + while((n = fread(buf, 1, BUFFER_SIZE, f)) > 0) { if(is224) { SHA224_Update(&ctx, buf, n); } else { -- 1.7.6.4

1 0

[pacman-dev] [PATCH] Fix memory leak in download payload->remote_name
by Dan McGee 28 Sep '11

28 Sep '11

In the sync code, we explicitly allocated a string for this field, while in the dload code itself it was filled in with a pointer to another string. This led to a memory leak in the sync download case. Make remote_name non-const and always explicitly allocate it. This patch ensures this as well as uses malloc + snprintf (rather than calloc) in several codepaths, and eliminates the only use of PATH_MAX in the download code. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/dload.c | 26 ++++++++++++++++---------- lib/libalpm/dload.h | 2 +- lib/libalpm/sync.c | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 6f0139d..1e8db1e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -60,7 +60,7 @@ static char *get_fullpath(const char *path, const char *filename, char *filepath; /* len = localpath len + filename len + suffix len + null */ size_t len = strlen(path) + strlen(filename) + strlen(suffix) + 1; - CALLOC(filepath, len, sizeof(char), return NULL); + MALLOC(filepath, len, return NULL); snprintf(filepath, len, "%s%s%s", path, filename, suffix); return filepath; @@ -279,22 +279,27 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat { int fd; FILE *fp; - char randpath[PATH_MAX]; - alpm_handle_t *handle = payload->handle; + char *randpath; + size_t len; /* create a random filename, which is opened with O_EXCL */ - snprintf(randpath, PATH_MAX, "%salpmtmp.XXXXXX", localpath); + len = strlen(localpath) + 14 + 1; + MALLOC(randpath, len, RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL)); + snprintf(randpath, len, "%salpmtmp.XXXXXX", localpath); if((fd = mkstemp(randpath)) == -1 || !(fp = fdopen(fd, payload->tempfile_openmode))) { unlink(randpath); close(fd); - _alpm_log(handle, ALPM_LOG_ERROR, + _alpm_log(payload->handle, ALPM_LOG_ERROR, _("failed to create temporary file for download\n")); return NULL; } /* fp now points to our alpmtmp.XXXXXX */ - STRDUP(payload->tempfile_name, randpath, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - payload->remote_name = strrchr(randpath, '/') + 1; + free(payload->tempfile_name); + payload->tempfile_name = randpath; + free(payload->remote_name); + STRDUP(payload->remote_name, strrchr(randpath, '/') + 1, + RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL)); return fp; } @@ -318,7 +323,7 @@ static int curl_download_internal(struct dload_payload *payload, payload->tempfile_openmode = "wb"; if(!payload->remote_name) { - payload->remote_name = get_filename(payload->fileurl); + payload->remote_name = strdup(get_filename(payload->fileurl)); } if(!payload->remote_name || curl_gethost(payload->fileurl, hostname) != 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("url '%s' is invalid\n"), payload->fileurl); @@ -591,10 +596,11 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) void _alpm_dload_payload_free(struct dload_payload *payload) { ASSERT(payload, return); - FREE(payload->fileurl); - FREE(payload->content_disp_name); + FREE(payload->remote_name); FREE(payload->tempfile_name); FREE(payload->destfile_name); + FREE(payload->content_disp_name); + FREE(payload->fileurl); FREE(payload); } diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index bc5eb13..765c5fd 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -27,8 +27,8 @@ struct dload_payload { alpm_handle_t *handle; - const char *remote_name; const char *tempfile_openmode; + char *remote_name; char *tempfile_name; char *destfile_name; char *content_disp_name; diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 04ea7d2..8c50ec8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -874,7 +874,7 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas) /* print server + filename into a buffer */ len = strlen(server_url) + strlen(payload->remote_name) + 2; - CALLOC(payload->fileurl, len, sizeof(char), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + MALLOC(payload->fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); snprintf(payload->fileurl, len, "%s/%s", server_url, payload->remote_name); payload->handle = handle; payload->allow_resume = 1; -- 1.7.6.4

1 0

[pacman-dev] [PATCH] Revert "libalpm: compare pkgname with strcoll"
by Dan McGee 28 Sep '11

28 Sep '11

This commit was made with the intent of displaying "correctly" sorted package lists to users. Here are some reasons I think this is incorrect: * It is done in the wrong place. If a frontend application wants to show a different order of packages dependent on locale, it should do that on its own. * Even if one wants a locale-specific order, almost all package names are all ASCII and language agnostic, so this different comparison makes little sense and may serve only to confuse people. * _alpm_pkg_cmp was unlike any other comparator function. None of the rest had any dependency on anything but the content of the structs being compared (e.g., they only used strcmp() or other basic comparison operators). This reverts commit 3e4d2c3aa65416487939148828afb385de2ee146. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 11bf01a..a5ff238 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -641,7 +641,7 @@ int _alpm_pkg_cmp(const void *p1, const void *p2) { const alpm_pkg_t *pkg1 = p1; const alpm_pkg_t *pkg2 = p2; - return strcoll(pkg1->name, pkg2->name); + return strcmp(pkg1->name, pkg2->name); } /* Test for existence of a package in a alpm_list_t* -- 1.7.6.4

1 0

[pacman-dev] [PATCH 1/3] alpm_list: use malloc instead of calloc
by Dan McGee 27 Sep '11

27 Sep '11

In every case we were calling calloc, the struct we allocated (or the memory to be used) is fully specified later in the method. For alpm_list_t allocations, we always set all of data, next, and prev. For list copying and transforming to an array, we always copy the entire data element, so no need to zero it first. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm_list.c | 8 ++++---- lib/libalpm/pkghash.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 274d3af..15286aa 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -89,7 +89,7 @@ alpm_list_t SYMEXPORT *alpm_list_add(alpm_list_t *list, void *data) { alpm_list_t *ptr, *lp; - ptr = calloc(1, sizeof(alpm_list_t)); + ptr = malloc(sizeof(alpm_list_t)); if(ptr == NULL) { return list; } @@ -127,7 +127,7 @@ alpm_list_t SYMEXPORT *alpm_list_add_sorted(alpm_list_t *list, void *data, alpm_ } else { alpm_list_t *add = NULL, *prev = NULL, *next = list; - add = calloc(1, sizeof(alpm_list_t)); + add = malloc(sizeof(alpm_list_t)); if(add == NULL) { return list; } @@ -470,7 +470,7 @@ alpm_list_t SYMEXPORT *alpm_list_copy_data(const alpm_list_t *list, const alpm_list_t *lp = list; alpm_list_t *newlist = NULL; while(lp) { - void *newdata = calloc(1, size); + void *newdata = malloc(size); if(newdata) { memcpy(newdata, lp->data, size); newlist = alpm_list_add(newlist, newdata); @@ -775,7 +775,7 @@ void SYMEXPORT *alpm_list_to_array(const alpm_list_t *list, size_t n, return NULL; } - array = calloc(n, size); + array = malloc(n * size); if(array == NULL) { return NULL; } diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index f6207ad..963ba25 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -159,19 +159,19 @@ static alpm_pkghash_t *pkghash_add_pkg(alpm_pkghash_t *hash, alpm_pkg_t *pkg, in position = get_hash_position(pkg->name_hash, hash); - ptr = calloc(1, sizeof(alpm_list_t)); + ptr = malloc(sizeof(alpm_list_t)); if(ptr == NULL) { return hash; } ptr->data = pkg; - ptr->next = NULL; ptr->prev = ptr; + ptr->next = NULL; hash->hash_table[position] = ptr; - if(!sorted){ + if(!sorted) { hash->list = alpm_list_join(hash->list, ptr); - }else{ + } else { hash->list = alpm_list_mmerge(hash->list, ptr, _alpm_pkg_cmp); } -- 1.7.6.4

1 2

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

27 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 e70d540501d718583a8e4b91ca5989af3f3db77d (commit) via fa929e8258c8022f15dac79dc507fa0e53190656 (commit) via b242b2d0508a94cdc4c1a68e54ef90e941cbc6d7 (commit) via 47657107af6bcfd2ef583b3014e9faffbb5d300e (commit) via 5e13b2b6af7d0cb2cbb22d6090f731e74a64afa5 (commit) from 80b0f271254f965db4d94d6bb165c64ef3553588 (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 e70d540501d718583a8e4b91ca5989af3f3db77d Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 13:23:00 2011 -0500 pacman-key: use consistent punctuation in error messages Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fa929e8258c8022f15dac79dc507fa0e53190656 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 09:15:36 2011 -0500 Fix compilation using --without-gpgme I'm really good at breaking this on a regular basis. If only we had some sort of automated testing for this... Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b242b2d0508a94cdc4c1a68e54ef90e941cbc6d7 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 13:34:39 2011 -0500 Remove unnecessary logger This is just a wrapper function; the real function we call logs an almost identical line. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 47657107af6bcfd2ef583b3014e9faffbb5d300e Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 27 07:53:38 2011 -0500 Delay check for repository servers until we need them In the sync download code, we added an early check in 6731d0a9407e for sync download server existence so we wouldn't show the same error over and over for each file to be downloaded. Move this check into the download block so we only run it if there are actually files that need to be downloaded for this repository. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5e13b2b6af7d0cb2cbb22d6090f731e74a64afa5 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Sep 27 09:18:42 2011 +1000 Avoid comparison between signed and unsigned types Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/signing.c | 14 ++++++++++---- lib/libalpm/sync.c | 16 ++++++++-------- scripts/pacman-key.sh.in | 10 +++++----- src/pacman/pacman.c | 3 ++- 4 files changed, 25 insertions(+), 18 deletions(-) hooks/post-receive -- The official pacman repository

1 0

Re: [pacman-dev] [arch-projects] [mkinitcpio][PATCH 21/26] lsinitcpio: disable color when stdout isn't a tty
by Dan McGee 27 Sep '11

27 Sep '11

On Mon, Sep 26, 2011 at 9:01 PM, Dave Reisner <d(a)falconindy.com> wrote: > On Mon, Sep 26, 2011 at 08:57:40PM -0500, Dan McGee wrote: >> On Mon, Sep 26, 2011 at 8:22 PM, Dave Reisner <d(a)falconindy.com> wrote: >> > Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> >> Why were we using stderr before? Did something else change? > > You really wanna know? Copy/paste job from makepkg. We should fix this > over in makepkg as well. I'm not sure why it's used there either. makepkg -g >> PKGBUILD. Now whether that is a good reason is up for some debate, but you asked. :) -Dan

1 0

[pacman-dev] [PATCH] Aviod comparison between signed and unsigned types
by Allan McRae 26 Sep '11

26 Sep '11

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/pacman.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 40aa444..326664d 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -760,7 +760,8 @@ static void cl_to_log(int argc, char* argv[]) */ int main(int argc, char *argv[]) { - int i, ret = 0; + int ret = 0; + size_t i; struct sigaction new_action, old_action; const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV }; #if defined(HAVE_GETEUID) && !defined(CYGWIN) -- 1.7.6.4

2 1

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

26 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 80b0f271254f965db4d94d6bb165c64ef3553588 (commit) via d1fc3aec4c7f7bab30f8ad7dabd7832c7c8570e6 (commit) via 507b01b912d77f0cc5422e689623f1b19c208525 (commit) via b6ccae2d182899eaf199e868963646b3a14f7e8b (commit) via dd82b8d09f554d709f92fcdc7f873cb551b2d205 (commit) via 6adf502f0d0e684c67d7498057083958becf8b19 (commit) via d26d50e664665905d79a3d5fa589b2ca0bec4ba0 (commit) from 2517ba3303489ed35512cdaf2493ec81efd145e7 (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 80b0f271254f965db4d94d6bb165c64ef3553588 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 17:31:34 2011 -0500 Ensure fileconflict value is actually a string When we switched to a file object and not just a simple string, we missed an update along the way here in target-target conflicts. This patch looks large, but it really comes down to one errant (char *) cast before that has been reworked to explicitly point to the alpm_file_t object. The rest is simply code cleanup. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d1fc3aec4c7f7bab30f8ad7dabd7832c7c8570e6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 25 14:32:15 2011 -0400 bash_completion: add completion for pacman-key Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 507b01b912d77f0cc5422e689623f1b19c208525 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 25 15:24:53 2011 -0400 pacman-key: allow get_from to return a default value Keep the non-zero return val to let the caller know that the key wasn't found. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b6ccae2d182899eaf199e868963646b3a14f7e8b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Sep 25 14:34:36 2011 -0400 pacman-key: simplify writing to config file Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dd82b8d09f554d709f92fcdc7f873cb551b2d205 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Sep 24 15:08:21 2011 +1000 makepkg: normalize whitespace for optdepends in .PKGINFO Many PKGBUILDs use formatting whitespace when specifying optdepends. This is removed when adding a package to a repo-database so the output of "pacman -Si <package>" and "pacman -Qip <package file>" becomes inconsistent. Instead, do the adjustment when creating the .PKGINFO file. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6adf502f0d0e684c67d7498057083958becf8b19 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Sep 24 14:53:20 2011 +1000 makepkg: allow versioned optdepends with epoch Allow the specification of versioned optdepends with an epoch. This also (partially) enforces a whitespace between ":" and the description which is required for the future optdepends parsing code. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d26d50e664665905d79a3d5fa589b2ca0bec4ba0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 26 15:22:13 2011 -0500 Revamp pacman signal handler * All errors now go to stderr, so do the same here and simplify the writing of the error message. * Add SIGHUP to the handled signal list, and don't repeat code. * Attempt to release the transaction (e.g. remove the lock file) for all of HUP, INT, and TERM. Signals HUP and INT respects transaction state, TERM will immediately terminate the process. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 16 +++++++++++++++ lib/libalpm/conflict.c | 30 +++++++++++++--------------- scripts/makepkg.sh.in | 6 ++-- scripts/pacman-key.sh.in | 14 ++++++------ src/pacman/pacman.c | 46 ++++++++++++++++++++++---------------------- 5 files changed, 63 insertions(+), 49 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Ensure fileconflict value is actually a string
by Dan McGee 26 Sep '11

26 Sep '11

When we switched to a file object and not just a simple string, we missed an update along the way here in target-target conflicts. This patch looks large, but it really comes down to one errant (char *) cast before that has been reworked to explicitly point to the alpm_file_t object. The rest is simply code cleanup. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Should we take this opportunity to rework the file conflict struct type to be well typed instead of using strings everywhere? struct new_fileconflict_t { alpm_fileconflict_t *type; alpm_file_t *file; (frontend would be responsible for root path prepend) alpm_pkg_t *target; alpm_pkg_t *ctarget; }; could change package1 and package2 in _alpm_conflict_t also to be actual packages as well instead of strings. Thoughts? -Dan lib/libalpm/conflict.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 1c02f18..14c23f4 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -276,30 +276,29 @@ static alpm_list_t *filelist_operation(alpm_filelist_t *filesA, return ret; } -/* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, type - * (either ALPM_FILECONFLICT_TARGET or ALPM_FILECONFLICT_FILESYSTEM), a file - * string, and either two package names or one package name and NULL. This is - * a wrapper for former functionality that was done inline. +/* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, the + * conflicting file path, and either two packages or one package and NULL. */ static alpm_list_t *add_fileconflict(alpm_handle_t *handle, - alpm_list_t *conflicts, alpm_fileconflicttype_t type, const char *filestr, - const char *name1, const char *name2) + alpm_list_t *conflicts, const char *filestr, + alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) { alpm_fileconflict_t *conflict; MALLOC(conflict, sizeof(alpm_fileconflict_t), goto error); - conflict->type = type; - STRDUP(conflict->target, name1, goto error); + STRDUP(conflict->target, pkg1->name, goto error); STRDUP(conflict->file, filestr, goto error); - if(name2) { - STRDUP(conflict->ctarget, name2, goto error); + if(pkg2) { + conflict->type = ALPM_FILECONFLICT_TARGET; + STRDUP(conflict->ctarget, pkg2->name, goto error); } else { + conflict->type = ALPM_FILECONFLICT_FILESYSTEM; STRDUP(conflict->ctarget, "", goto error); } conflicts = alpm_list_add(conflicts, conflict); _alpm_log(handle, ALPM_LOG_DEBUG, "found file conflict %s, packages %s and %s\n", - filestr, name1, name2 ? name2 : "(filesystem)"); + filestr, pkg1->name, pkg2 ? pkg2->name : "(filesystem)"); return conflicts; @@ -416,9 +415,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_t *k; char path[PATH_MAX]; for(k = common_files; k; k = k->next) { - snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)k->data); - conflicts = add_fileconflict(handle, conflicts, - ALPM_FILECONFLICT_TARGET, path, p1->name, p2->name); + alpm_file_t *file = k->data; + snprintf(path, PATH_MAX, "%s%s", handle->root, file->name); + conflicts = add_fileconflict(handle, conflicts, path, p1, p2); if(handle->pm_errno == ALPM_ERR_MEMORY) { FREELIST(conflicts); FREELIST(common_files); @@ -567,8 +566,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, } if(!resolved_conflict) { - conflicts = add_fileconflict(handle, conflicts, - ALPM_FILECONFLICT_FILESYSTEM, path, p1->name, NULL); + conflicts = add_fileconflict(handle, conflicts, path, p1, NULL); if(handle->pm_errno == ALPM_ERR_MEMORY) { FREELIST(conflicts); if(dbpkg) { -- 1.7.6.4

1 1

[pacman-dev] [PATCH] Revamp pacman signal handler
by Dan McGee 26 Sep '11

26 Sep '11

* All errors now go to stdout, so do the same here and simplify the writing of the error message. * Add SIGHUP to the handled signal list, and don't repeat code. * Attempt to release the transaction (e.g. remove the lock file) for all of HUP, INT, and TERM. Signals HUP and INT respects transaction state, TERM will immediately terminate the process. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/pacman.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 061d593..40aa444 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -299,26 +299,29 @@ static void handler(int signum) { int out = fileno(stdout); int err = fileno(stderr); + const char *msg; if(signum == SIGSEGV) { - const char *msg1 = "error: segmentation fault\n"; - const char *msg2 = "Internal pacman error: Segmentation fault.\n" + msg = "\nerror: segmentation fault\n" "Please submit a full bug report with --debug if appropriate.\n"; - /* write a error message to out, the rest to err */ - xwrite(out, msg1, strlen(msg1)); - xwrite(err, msg2, strlen(msg2)); + xwrite(err, msg, strlen(msg)); exit(signum); - } else if(signum == SIGINT) { - const char *msg = "\nInterrupt signal received\n"; + } else if(signum == SIGINT || signum == SIGHUP) { + if(signum == SIGINT) { + msg = "\nInterrupt signal received\n"; + } else { + msg = "\nHangup signal received\n"; + } xwrite(err, msg, strlen(msg)); if(alpm_trans_interrupt(config->handle) == 0) { /* a transaction is being interrupted, don't exit pacman yet. */ return; } - /* no commiting transaction, we can release it now and then exit pacman */ - alpm_trans_release(config->handle); - /* output a newline to be sure we clear any line we may be on */ - xwrite(out, "\n", 1); } + /* SIGINT: no commiting transaction, release it now and then exit pacman + * SIGHUP, SIGTERM: release no matter what */ + alpm_trans_release(config->handle); + /* output a newline to be sure we clear any line we may be on */ + xwrite(out, "\n", 1); cleanup(128 + signum); } @@ -757,8 +760,9 @@ static void cl_to_log(int argc, char* argv[]) */ int main(int argc, char *argv[]) { - int ret = 0; + int i, ret = 0; struct sigaction new_action, old_action; + const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV }; #if defined(HAVE_GETEUID) && !defined(CYGWIN) /* geteuid undefined in CYGWIN */ uid_t myuid = geteuid(); @@ -775,17 +779,13 @@ int main(int argc, char *argv[]) sigemptyset(&new_action.sa_mask); new_action.sa_flags = 0; - sigaction(SIGINT, NULL, &old_action); - if(old_action.sa_handler != SIG_IGN) { - sigaction(SIGINT, &new_action, NULL); - } - sigaction(SIGTERM, NULL, &old_action); - if(old_action.sa_handler != SIG_IGN) { - sigaction(SIGTERM, &new_action, NULL); - } - sigaction(SIGSEGV, NULL, &old_action); - if(old_action.sa_handler != SIG_IGN) { - sigaction(SIGSEGV, &new_action, NULL); + /* assign our handler to any signals we care about */ + for(i = 0; i < sizeof(signals) / sizeof(signals[0]); i++) { + int signal = signals[i]; + sigaction(signal, NULL, &old_action); + if(old_action.sa_handler != SIG_IGN) { + sigaction(signal, &new_action, NULL); + } } /* i18n init */ -- 1.7.6.3

3 2