- Pacman-dev - lists.archlinux.org

[pacman-dev] Public Keys
by Christian Hesse 21 Aug '11

21 Aug '11

Hello everybody, I've installed pacman-git on a test machine to play with package signing. Since today some packages in [core] and [extra], perhaps others, are signed. I found two keys on public key servers, the third one is still missing. The key in question was used to sign xfdesktop. Is there any official place I can find keys that are used to sign Arch packages? Or did I miss anything else? -- Regards, Chris

4 4

[pacman-dev] [PATCH] [makepkg] New patch for split debug support, using generic split packaging mechanism
by Vitaliy Gorbunov 20 Aug '11

20 Aug '11

---------- Forwarded message ---------- From: Vitaliy Gorbunov <vit.gorbunov(a)gmail.com> Date: Wed, Aug 10, 2011 at 9:14 PM Subject: Re: [pacman-dev] [PATCH] [makepkg] New patch for split debug support, using generic split packaging mechanism To: Dan McGee <dpmcgee(a)gmail.com> Sorry:) Here it is. --- bin/makepkg 2011-08-10 19:37:37.000000000 +0300 +++ local/bin/makepkg4 2011-08-10 19:41:15.000000000 +0300 @@ -44,7 +44,7 @@ srcdir="$startdir/src" pkgdir="$startdir/pkg" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') +packaging_options=('strip' 'splitdbg' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ @@ -74,6 +74,8 @@ CHECKFUNC=0 PKGFUNC=0 SPLITPKG=0 +SPLIT_DBG=0 +SKIP_DEBUG_PACKAGE=0 PKGLIST=() # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call @@ -902,21 +904,49 @@ done fi + local is_splitdbg + [ "$(check_option splitdbg)" = "y" ] || (( SPLIT_DBG )) && is_splitdbg=1 + (( is_splitdbg )) && backup_package_variables "dbg" + + local dbgdir="$pkgdir-dbg" if [[ $(check_option strip) = y ]]; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" # make sure library stripping variables are defined to prevent excess stripping [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" - local binary + local binary hardlink strip_opt find . -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -bi "$binary")" in *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip $STRIP_SHARED "$binary";; + strip_opt=$STRIP_SHARED;; *application/x-archive*) # Libraries (.a) - /usr/bin/strip $STRIP_STATIC "$binary";; + strip_opt=$STRIP_STATIC;; *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; + strip_opt=$STRIP_BINARIES;; + *) continue ;; esac + # Strip symbols + if (( is_splitdbg )); then + # Create directory for the symbol file + mkdir -p "${dbgdir}/usr/lib/debug/${binary%/*}" + if readelf -S $binary | grep "\.gnu_debuglink" &>/dev/null; then + # An already stripped binary is a hard link + find ${STRIP_DIRS[@]} -samefile "$binary" 2>/dev/null | while read hardlink ; do + # Is the symbol file for the hardlink in the right dir ? + [ -e "${dbgdir}/usr/lib/debug/${hardlink#/}.debug" ] && \ + [ "${hardlink%/*}" != "${binary%/*}" ] && \ + ln "${dbgdir}/usr/lib/debug/${hardlink#/}.debug" "${dbgdir}/usr/lib/debug/${binary%/*}" && break + done + else + # Strip the file + /usr/bin/objcopy --only-keep-debug "$binary" "${dbgdir}/usr/lib/debug/${binary#/}.debug" + /usr/bin/strip $strip_opts "$binary" + /usr/bin/objcopy --add-gnu-debuglink="${dbgdir}/usr/lib/debug/${binary#/}.debug" "$binary" + chmod 644 "${dbgdir}/usr/lib/debug/${binary#/}.debug" + fi + else + /usr/bin/strip $strip_opts "$binary" + fi done fi @@ -1008,6 +1038,12 @@ } create_package() { + if (( SKIP_DEBUG_PACKAGE )); then + warning "$(gettext "No .debug files for debug package found, skipping...")" + SKIP_DEBUG_PACKAGE=0 + return + fi + if [[ ! -d $pkgdir ]]; then error "$(gettext "Missing pkg/ directory.")" plain "$(gettext "Aborting...")" @@ -1096,6 +1132,38 @@ fi } +add_split_debug_packages(){ + [ ${#pkgname[@]} = 1 ] && eval "function package_${pkgname}() { package;}" + + local pkg pkgname_dbg + for pkg in ${pkgname[@]} + do + pkgname_dbg=( ${pkgname_dbg[@]} ${pkg} ${pkg/%/-dbg} ) + eval "function package_${pkg}-dbg() { package_dbg; }" + done + pkgname=( ${pkgname_dbg[@]} ) +} + +package_dbg(){ + check_dbg_files=`find $pkgdir/ -name "*.debug"` + if [ -z "$check_dbg_files" ]; then + SKIP_DEBUG_PACKAGE=1 + return + fi + + restore_package_variables "dbg" + pkgdesc="$pkgdesc (debugging symbols)" + depends=("${pkgname%-dbg}=$pkgver-$pkgrel") + groups=('debug' ${groups[@]/%/-debug}) + optdepends=() + replaces=() + provides=() + conflicts=() + backup=() + options=(!strip !splitdbg docs !zipman !purge libtool !emptydirs) + unset install +} + create_srcpackage() { cd "$startdir" @@ -1423,17 +1491,19 @@ } backup_package_variables() { - local var + local var suffix + suffix=$1 for var in ${splitpkg_overrides[@]}; do - local indirect="${var}_backup" + local indirect="${var}_backup${suffix}" eval "${indirect}=(\"\${$var[@]}\")" done } restore_package_variables() { - local var + local var suffix + suffix=$1 for var in ${splitpkg_overrides[@]}; do - local indirect="${var}_backup" + local indirect="${var}_backup${suffix}" if [[ -n ${!indirect} ]]; then eval "${var}=(\"\${$indirect[@]}\")" else @@ -1582,6 +1652,7 @@ echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" echo "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")" echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" + echo "$(gettext " -t, --splitdbg Split debugging symbols into separate package")" echo "$(gettext " --allsource Generate a source-only tarball including downloaded sources")" echo "$(gettext " --asroot Allow makepkg to run as root user")" printf "$(gettext " --check Run the check() function in the %s")\n" "$BUILDSCRIPT" @@ -1622,11 +1693,11 @@ ARGLIST=("$@") # Parse Command Line Options. -OPT_SHORT="AcCdefFghiLmop:rRsV" +OPT_SHORT="AcCdefFghiLmop:rRstV" OPT_LONG="allsource,asroot,ignorearch,check,clean,cleancache,nodeps" OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver" OPT_LONG+=",install,log,nocolor,nobuild,nocheck,pkg:,rmdeps" -OPT_LONG+=",repackage,skipinteg,source,syncdeps,version,config:" +OPT_LONG+=",repackage,skipinteg,source,syncdeps,splitdbg,version,config:" # Pacman Options OPT_LONG+=",noconfirm,noprogressbar" OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" @@ -1671,6 +1742,7 @@ --skipinteg) SKIPINTEG=1 ;; --source) SOURCEONLY=1 ;; -s|--syncdeps) DEP_BIN=1 ;; + -t|--splitdbg) SPLIT_DBG=1 ;; -h|--help) usage; exit 0 ;; # E_OK -V|--version) version; exit 0 ;; # E_OK @@ -1874,6 +1946,8 @@ devel_check devel_update +[ "$(check_option splitdbg)" = "y" ] || (( SPLIT_DBG )) && add_split_debug_packages + if (( ${#pkgname[@]} > 1 )); then SPLITPKG=1 fi On Wed, Aug 10, 2011 at 9:09 PM, Dan McGee <dpmcgee(a)gmail.com> wrote: > On Wed, Aug 10, 2011 at 12:04 PM, Vitaliy Gorbunov > <vit.gorbunov(a)gmail.com> wrote: > > I rewrite patch from Remy Oudomphen**g > Rémy Oudompheng ? Not sure what the ** was for. :) > > (http://bugs.archlinux.org/task/10975< > http://bugs.archlinux.org/task/10975>) > > in order to use generic split packaging mechanism. > > The main idea is that debug packages will be added to pkgname array and > for > > each of it package_<name>-dbg function will be created. So it treated > like > > usual split packages. > > Tested on split and non-split packages. All seems to work fine. > > Please send inline rather than as an attachment so we can review it, > thanks! > > -Dan >

4 4

[pacman-dev] [PATCH] Print debug timestamps to same stream as rest of output
by Dan McGee 20 Aug '11

20 Aug '11

We used fprintf() elsewhere in this function, but we didn't use it on the debug timestamp printing. Use fprintf() instead of printf() to fix this. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 91625a1..9c1e646 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1416,7 +1416,7 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list strftime(timestr, 9, "%H:%M:%S", tmp); timestr[8] = '\0'; - printf("[%s] ", timestr); + fprintf(stream, "[%s] ", timestr); } #endif -- 1.7.6

2 1

[pacman-dev] [PATCH 1/2][RFC] pacman/util: add methods to create a divider for tables
by Dave Reisner 20 Aug '11

20 Aug '11

This creates a dashed line underneath the header for each column in the table, e.g.: Name Old Version New Version Size ----- ------------ ------------ ----- at-spi2-core 2.0.2-1 0.18 MiB dconf 0.8.0-1 0.08 MiB at-spi2-atk 2.0.2-1 0.05 MiB gsettings-desktop-schemas 3.0.1-2 0.04 MiB Inspired-by: Pat Brisbin <pbrisbin(a)gmail.com> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- I think it's a nice touch, and it's not a hugely invasive patch. src/pacman/util.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 91625a1..0c83020 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -555,6 +555,40 @@ static alpm_list_t *table_create_format(const alpm_list_t *header, return formats; } +static char *string_create_filled(const unsigned int fill, size_t len) +{ + char *filled; + + filled = malloc(len + 1); + if(!filled) { + return NULL; + } + + memset(filled, fill, len); + filled[len] = '\0'; + + return filled; +} + +static alpm_list_t *table_create_divider(const alpm_list_t *header, + const unsigned int fill) +{ + const alpm_list_t *i; + alpm_list_t *divider = NULL; + + for(i = header; i; i = alpm_list_next(i)) { + const char *header = alpm_list_getdata(i); + char *div = string_create_filled(fill, string_length(header) + 1); + if(!div) { + FREELIST(divider); + return NULL; + } + divider = alpm_list_add(divider, div); + } + + return divider; +} + /** Displays the list in table format * * @param title the tables title @@ -569,7 +603,7 @@ int table_display(const char *title, const alpm_list_t *header, const alpm_list_t *rows) { const alpm_list_t *i; - alpm_list_t *formats; + alpm_list_t *formats, *divider; if(rows == NULL || header == NULL) { return 0; @@ -580,17 +614,24 @@ int table_display(const char *title, const alpm_list_t *header, return -1; } + divider = table_create_divider(header, '-'); + if(divider == NULL) { + FREELIST(formats); + return -1; + } + if(title != NULL) { printf("%s\n\n", title); } table_print_line(header, formats); - printf("\n"); + table_print_line(divider, formats); for(i = rows; i; i = alpm_list_next(i)) { table_print_line(alpm_list_getdata(i), formats); } + FREELIST(divider); FREELIST(formats); return 0; } -- 1.7.6

1 1

[pacman-dev] [PATCH] Print callback messages to stderr
by Allan McRae 20 Aug '11

20 Aug '11

Fixes FS#25099. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 873e3fc..5ee4e5a 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -690,7 +690,7 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) output = alpm_list_add(output, string); } } else { - pm_vfprintf(stdout, level, fmt, args); + pm_vfprintf(stderr, level, fmt, args); } } -- 1.7.6

3 6

[pacman-dev] Default value for SigLevel being wrongly overridden?
by Allan McRae 20 Aug '11

20 Aug '11

Is this expected behaviour for how the default value for SigLevel works? [options] # SigLevel = [repo] SigLevel = TrustAll is different from [options] SigLevel = Optional [repo] SigLevel = TrustAll and [options] # SigLevel = [repo] SigLevel = Optional TrustAll (the last two being the same) I thought if no option was specified in the [options] section, then Optional (being the default) would apply unless one of "Required" or "Never" was specified in the [repo] section to override it. It currently appears that specifying any option overrides it. Another example: [options] # SigLevel = [repo] SigLevel = DatabaseRequired is the same as [repo] SigLevel = DatabaseRequired PackageNever where I was really expecting PackageOptional through the Optional default. Allan

1 0

[pacman-dev] [PATCH] Fix formatting in pacman-key manpage
by Jakob Gruber 20 Aug '11

20 Aug '11

Signed-off-by: Jakob Gruber <jakob.gruber(a)gmail.com> --- doc/pacman-key.8.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index c8ce026..9dc175c 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -45,7 +45,7 @@ Options Export key(s) identified by the specified keyid(s) to 'stdout'. If no keyid is specified, all keys will be exported. -*\--edit-key * <keyid(s)>:: +*\--edit-key* <keyid(s)>:: Present a menu for key management task on the specified keyids. Useful for adjusting a keys trust level. @@ -86,7 +86,7 @@ Options *-u, \--updatedb*:: Equivalent to \--check-trustdb in GnuPG. -* -v, \--verify* <signature>:: +*-v, \--verify* <signature>:: Verify the given signature file. *-V, \--version*:: -- 1.7.6

1 0

[pacman-dev] [PATCH] Flush output of pacman debug times
by Allan McRae 20 Aug '11

20 Aug '11

This keeps the output going to stdout and stderr in sync fixing the pactests broken by changing the callback messages to stderr. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 91625a1..e0addc0 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1417,6 +1417,7 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list timestr[8] = '\0'; printf("[%s] ", timestr); + fflush(stdout); } #endif -- 1.7.6

1 0

[pacman-dev] [PATCH] Remove alpm_option_get_* usage from backend
by Dan McGee 20 Aug '11

20 Aug '11

These are all available directly on the handle without indirection. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 3 +-- lib/libalpm/be_sync.c | 7 +++---- lib/libalpm/db.c | 4 ++-- lib/libalpm/diskspace.c | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/trans.c | 6 +++--- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 1b48922..f53bd64 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -194,8 +194,7 @@ static void *_cache_changelog_open(alpm_pkg_t *pkg) char clfile[PATH_MAX]; alpm_db_t *db = alpm_pkg_get_db(pkg); snprintf(clfile, PATH_MAX, "%s/%s/%s-%s/changelog", - alpm_option_get_dbpath(pkg->handle), - db->treename, pkg->name, pkg->version); + pkg->handle->dbpath, db->treename, pkg->name, pkg->version); return fopen(clfile, "r"); } diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 75f0664..6e64e5f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -41,13 +41,12 @@ static char *get_sync_dir(alpm_handle_t *handle) { - const char *dbpath = alpm_option_get_dbpath(handle); - size_t len = strlen(dbpath) + 6; + size_t len = strlen(handle->dbpath) + 6; char *syncpath; struct stat buf; MALLOC(syncpath, len, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - sprintf(syncpath, "%s%s", dbpath, "sync/"); + sprintf(syncpath, "%s%s", handle->dbpath, "sync/"); if(stat(syncpath, &buf) != 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", @@ -260,7 +259,7 @@ cleanup: if(_alpm_handle_unlock(handle)) { _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), - alpm_option_get_lockfile(handle)); + handle->lockfile); } free(syncpath); umask(oldmask); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 33282b8..4b23509 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -224,7 +224,7 @@ alpm_siglevel_t SYMEXPORT alpm_db_get_siglevel(alpm_db_t *db) { ASSERT(db != NULL, return -1); if(db->siglevel & ALPM_SIG_USE_DEFAULT) { - return alpm_option_get_default_siglevel(db->handle); + return db->handle->siglevel; } else { return db->siglevel; } @@ -357,7 +357,7 @@ const char *_alpm_db_path(alpm_db_t *db) const char *dbpath; size_t pathsize; - dbpath = alpm_option_get_dbpath(db->handle); + dbpath = db->handle->dbpath; if(!dbpath) { _alpm_log(db->handle, ALPM_LOG_ERROR, _("database path is undefined\n")); RET_ERR(db->handle, ALPM_ERR_DB_OPEN, NULL); diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 1e2fa14..ad80304 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -211,7 +211,7 @@ static int calculate_installed_size(alpm_handle_t *handle, /* approximate space requirements for db entries */ if(filename[0] == '.') { - filename = alpm_option_get_dbpath(handle); + filename = handle->dbpath; } snprintf(path, PATH_MAX, "%s%s", handle->root, filename); diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 28ce620..4428b54 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -116,7 +116,7 @@ static int init_gpgme(alpm_handle_t *handle) return 0; } - sigdir = alpm_option_get_gpgdir(handle); + sigdir = handle->gpgdir; if (_alpm_access(handle, sigdir, "pubring.gpg", R_OK) || _alpm_access(handle, sigdir, "trustdb.gpg", R_OK)) { diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 3f59596..c594520 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -82,7 +82,7 @@ static alpm_list_t *check_arch(alpm_handle_t *handle, alpm_list_t *pkgs) alpm_list_t *i; alpm_list_t *invalid = NULL; - const char *arch = alpm_option_get_arch(handle); + const char *arch = handle->arch; if(!arch) { return NULL; } @@ -224,9 +224,9 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) if(!nolock_flag) { if(_alpm_handle_unlock(handle)) { _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), - alpm_option_get_lockfile(handle)); + handle->lockfile); alpm_logaction(handle, "warning: could not remove lock file %s\n", - alpm_option_get_lockfile(handle)); + handle->lockfile); } } -- 1.7.6

1 0

[pacman-dev] [PATCH] Rework finding a writable cache directory
by Dan McGee 19 Aug '11

19 Aug '11

This is a refactor and refresh of the code used to find where we should download packages. * Incorporate suggestions from FS#25435 to use TMPDIR from the environment if set, otherwise fall back to /tmp as before. * Make the writability tests a bit more in depth. We now do a three part check consisting of: - S_ISDIR(): is this even a directory - access(W_OK): is this directory writable by the current user. Unfortunately for root, this almost always returns that it is, but in the case of a RO mount or NFS share inaccessible to root, this check will exclude the directory. - mode & (any write bit): is there a writable bit set on this directory. This makes it possible to enforce a read-only cache directory by setting permissions to 0555, for example. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/util.c | 44 +++++++++++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 27709c6..7e3bc37 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -638,7 +638,7 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename) struct stat buf; /* Loop through the cache dirs until we find a matching file */ - for(i = alpm_option_get_cachedirs(handle); i; i = i->next) { + for(i = handle->cachedirs; i; i = i->next) { snprintf(path, PATH_MAX, "%s%s", (char *)alpm_list_getdata(i), filename); if(stat(path, &buf) == 0 && S_ISREG(buf.st_mode)) { @@ -659,11 +659,11 @@ char *_alpm_filecache_find(alpm_handle_t *handle, const char *filename) const char *_alpm_filecache_setup(alpm_handle_t *handle) { struct stat buf; - alpm_list_t *i, *tmp; - char *cachedir; + alpm_list_t *i; + char *cachedir, *tmpdir; - /* Loop through the cache dirs until we find a writeable dir */ - for(i = alpm_option_get_cachedirs(handle); i; i = i->next) { + /* Loop through the cache dirs until we find a usable directory */ + for(i = handle->cachedirs; i; i = i->next) { cachedir = alpm_list_getdata(i); if(stat(cachedir, &buf) != 0) { /* cache directory does not exist.... try creating it */ @@ -673,21 +673,35 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle) _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); return cachedir; } - } else if(S_ISDIR(buf.st_mode) && (buf.st_mode & S_IWUSR)) { + } else if(!S_ISDIR(buf.st_mode)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "skipping cachedir, not a directory: %s\n", cachedir); + } else if(access(cachedir, W_OK) != 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "skipping cachedir, not writable: %s\n", cachedir); + } else if(!(buf.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "skipping cachedir, no write bits set: %s\n", cachedir); + } else { _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); return cachedir; - } else { - _alpm_log(handle, ALPM_LOG_DEBUG, "skipping cachedir: %s\n", cachedir); } } - /* we didn't find a valid cache directory. use /tmp. */ - tmp = alpm_list_add(NULL, "/tmp/"); - alpm_option_set_cachedirs(handle, tmp); - alpm_list_free(tmp); - _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", "/tmp/"); - _alpm_log(handle, ALPM_LOG_WARNING, _("couldn't create package cache, using /tmp instead\n")); - return "/tmp/"; + /* we didn't find a valid cache directory. use TMPDIR or /tmp. */ + if((tmpdir = getenv("TMPDIR")) && stat(tmpdir, &buf) && S_ISDIR(buf.st_mode)) { + /* TMPDIR was good, we can use it */ + } else { + tmpdir = "/tmp"; + } + i = alpm_list_add(NULL, tmpdir); + alpm_option_set_cachedirs(handle, i); + alpm_list_free(i); + cachedir = handle->cachedirs->data; + _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); + _alpm_log(handle, ALPM_LOG_WARNING, + _("couldn't find or create package cache, using %s instead\n"), cachedir); + return cachedir; } /** lstat wrapper that treats /path/dirsymlink/ the same as /path/dirsymlink. -- 1.7.6

1 0