From ff58e5cb2d6aca0e1c8ed0e77770f3c5d2442c46 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 12 Mar 2012 21:16:14 -0500 Subject: Add 3.0.x versions to doc/index.txt These got lost when I switched to the new Asciidoc tables syntax in commit 1ebe5dc1979e. Signed-off-by: Dan McGee --- doc/index.txt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/doc/index.txt b/doc/index.txt index b221d237..9e94dbb7 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -96,12 +96,19 @@ Releases !3.1.3 !2008-03-06 !3.1.2 !2008-02-20 !3.1.1 !2008-01-20 -!3.1.0 !2008-01-09 !====== | [frame="topbot",grid="none",options="header,autowidth"] !====== !Version !Date +!3.1.0 !2008-01-09 +!3.0.6 !2007-09-16 +!3.0.5 !2007-06-17 +!3.0.4 !2007-05-08 +!3.0.3 !2007-04-28 +!3.0.2 !2007-04-23 +!3.0.1 !2007-04-04 +!3.0.0 !2007-03-25 !2.9.8 !2006-02-02 !2.9.7 !2005-09-16 !2.9.7-TEST3 !2005-09-11 @@ -122,15 +129,15 @@ Releases !2.7.9 !2004-04-30 !2.7.8 !2004-04-29 !2.7.7 !2004-04-15 -!2.7.6 !2004-04-04 -!2.7.5 !2004-03-02 -!2.7.4 !2004-02-18 -!2.7.3 !2004-02-07 !====== | [frame="topbot",grid="none",options="header,autowidth"] !====== !Version !Date +!2.7.6 !2004-04-04 +!2.7.5 !2004-03-02 +!2.7.4 !2004-02-18 +!2.7.3 !2004-02-07 !2.7.2 !2004-01-04 !2.7.1 !2003-12-21 !2.7 !2003-11-25 -- cgit v1.2.3-70-g09d2 From 47d0df6c101455c989887551bd0f0149a0f00de7 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 9 Mar 2012 23:16:40 +1000 Subject: Skip special files when cleaning package cache Ignore *.sig, *.db*, and *.src.tar* when cleaning the package cache. Fixes FS#25166. Signed-off-by: Allan McRae --- src/pacman/sync.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index a9a9e99c..951ee94c 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -224,6 +225,22 @@ static int sync_cleancache(int level) if(strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) { continue; } + + /* skip signature files - they are removed with their package file */ + if(fnmatch("*.sig", ent->d_name, 0) == 0) { + continue; + } + + /* skip package database within the cache directory */ + if(fnmatch("*.db*", ent->d_name, 0) == 0) { + continue; + } + + /* skip source packages within the cache directory */ + if(fnmatch("*.src.tar*", ent->d_name, 0) == 0) { + continue; + } + /* build the full filepath */ snprintf(path, PATH_MAX, "%s%s", cachedir, ent->d_name); -- cgit v1.2.3-70-g09d2 From 952ee5e6cb8bb1849c1bceedae38744935c82fca Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 14 Mar 2012 23:04:43 -0400 Subject: dload: reset payload filename members before download To avoid conflicts on reusing a payload after a failed download, ensure that we reset the filename hints in the payload struct prior to the download operation. Signed-off-by: Dave Reisner Signed-off-by: Dan McGee --- lib/libalpm/dload.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index ee95e8a7..9d982183 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -394,6 +394,11 @@ static int curl_download_internal(struct dload_payload *payload, CURL *curl = get_libcurl_handle(handle); handle->pm_errno = 0; + /* make sure these are NULL */ + FREE(payload->tempfile_name); + FREE(payload->destfile_name); + FREE(payload->content_disp_name); + payload->tempfile_openmode = "wb"; if(!payload->remote_name) { STRDUP(payload->remote_name, get_filename(payload->fileurl), -- cgit v1.2.3-70-g09d2 From f41037358af167424403d30a3b972b1fd733c755 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 14 Mar 2012 23:06:24 -0400 Subject: lib/sync: avoid unwanted unlink after download fail In case we have a mirror failure, unlink_on_fail would remain set, causing an interrupt in a successive download attempt to be wrongly unlinked. This also fixes a memory leak in the url member, as we would allocate over the previous, unfreed URL. Signed-off-by: Dave Reisner --- lib/libalpm/sync.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 185878aa..05959ca8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -896,6 +896,8 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas) if(ret != -1) { break; } + free(payload->fileurl); + payload->unlink_on_fail = 0; } if(ret == -1) { errors++; -- cgit v1.2.3-70-g09d2 From f988aa6b32503f5d4003b1402089df74adf8b485 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 9 Mar 2012 17:32:11 +1000 Subject: makepkg: quote removed filename as it can have spaces Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4656ab03..2d672a37 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -170,7 +170,7 @@ clean_up() { for pkg in ${pkgname[@]}; do for file in ${pkg}-*-*-${CARCH}{${PKGEXT},${SRCEXT}}; do if [[ -h $file && ! -e $file ]]; then - rm -f $file + rm -f "$file" fi done done -- cgit v1.2.3-70-g09d2