From b48f71841712d1839f5e900f1ec0fdf5665354ba Mon Sep 17 00:00:00 2001 From: tuxce Date: Thu, 17 Mar 2011 10:51:44 -0500 Subject: Correctly parse %DELTAS% entries in sync DB We erroniously dropped the call to _alpm_delta_parse() when macro-izing, causing segfaults for repos that provide deltas. Addresses FS#23314. Signed-off-by: Dan McGee --- lib/libalpm/be_sync.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/libalpm/be_sync.c') diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 6c0d2d67..ca76105f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -429,7 +429,12 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, } else if(strcmp(line, "%PROVIDES%") == 0) { READ_AND_STORE_ALL(pkg->provides); } else if(strcmp(line, "%DELTAS%") == 0) { - READ_AND_STORE_ALL(pkg->deltas); + /* Different than the rest because of the _alpm_delta_parse call. */ + while(1) { + READ_NEXT(line); + if(strlen(line) == 0) break; + pkg->deltas = alpm_list_add(pkg->deltas, _alpm_delta_parse(line)); + } } } } else if(strcmp(filename, "files") == 0) { -- cgit v1.2.3 From f6716ae94a5f299569b35bebb4d0aae23cd9af97 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 19 Mar 2011 11:22:19 +1000 Subject: Use sane umask for repo db downloads Fixes FS#23343. Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- lib/libalpm/be_sync.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/libalpm/be_sync.c') diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index ca76105f..98516fd8 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -84,6 +84,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) struct stat buf; size_t len; int ret; + mode_t oldmask; ALPM_LOG_FUNC; @@ -104,6 +105,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) MALLOC(syncpath, len, RET_ERR(PM_ERR_MEMORY, -1)); sprintf(syncpath, "%s%s", dbpath, "sync/"); + /* make sure we have a sane umask */ + oldmask = umask(0022); + if(stat(syncpath, &buf) != 0) { _alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", syncpath); @@ -124,6 +128,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) ret = _alpm_download_single_file(dbfile, db->servers, syncpath, force); free(dbfile); free(syncpath); + umask(oldmask); if(ret == 1) { /* files match, do nothing */ -- cgit v1.2.3