1 files changed, 55 insertions, 31 deletions

diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index c440cd6b..cd4a8667 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -20,8 +20,7 @@
 
 #include "config.h"
 
-#include <errno.h>
-#include <limits.h>
+#include <sys/stat.h>
 
 /* libarchive */
 #include <archive.h>
@@ -79,26 +78,21 @@
  */
 int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
 {
-	char *dbfile, *syncpath;
+	char *syncpath;
 	const char *dbpath;
+	alpm_list_t *i;
 	struct stat buf;
 	size_t len;
-	int ret;
+	int ret = -1;
 	mode_t oldmask;
+	pgp_verify_t check_sig;
 
 	ALPM_LOG_FUNC;
 
 	/* Sanity checks */
 	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 	ASSERT(db != NULL && db != handle->db_local, RET_ERR(PM_ERR_WRONG_ARGS, -1));
-
-	if(!alpm_list_find_ptr(handle->dbs_sync, db)) {
-		RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
-	}
-
-	len = strlen(db->treename) + 4;
-	MALLOC(dbfile, len, RET_ERR(PM_ERR_MEMORY, -1));
-	sprintf(dbfile, "%s.db", db->treename);
+	ASSERT(db->servers != NULL, RET_ERR(PM_ERR_SERVER_NONE, -1));
 
 	dbpath = alpm_option_get_dbpath();
 	len = strlen(dbpath) + 6;
@@ -112,38 +106,67 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
 		_alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n",
 				syncpath);
 		if(_alpm_makepath(syncpath) != 0) {
-			free(dbfile);
 			free(syncpath);
 			RET_ERR(PM_ERR_SYSTEM, -1);
 		}
 	} else if(!S_ISDIR(buf.st_mode)) {
 		_alpm_log(PM_LOG_WARNING, _("removing invalid file: %s\n"), syncpath);
 		if(unlink(syncpath) != 0 || _alpm_makepath(syncpath) != 0) {
-			free(dbfile);
 			free(syncpath);
 			RET_ERR(PM_ERR_SYSTEM, -1);
 		}
 	}
 
-	ret = _alpm_download_single_file(dbfile, db->servers, syncpath, force);
-	free(dbfile);
-	free(syncpath);
-	umask(oldmask);
+	check_sig = _alpm_db_get_sigverify_level(db);
+
+	for(i = db->servers; i; i = i->next) {
+		const char *server = i->data;
+		char *fileurl;
+		size_t len;
+		int sig_ret = 0;
+
+		/* print server + filename into a buffer (leave space for .sig) */
+		len = strlen(server) + strlen(db->treename) + 9;
+		CALLOC(fileurl, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, -1));
+		snprintf(fileurl, len, "%s/%s.db", server, db->treename);
+
+		ret = _alpm_download(fileurl, syncpath, force, 0, 0);
+
+		if(ret == 0 && (check_sig == PM_PGP_VERIFY_ALWAYS ||
+					check_sig == PM_PGP_VERIFY_OPTIONAL)) {
+			int errors_ok = (check_sig == PM_PGP_VERIFY_OPTIONAL);
+			/* if we downloaded a DB, we want the .sig from the same server */
+			snprintf(fileurl, len, "%s/%s.db.sig", server, db->treename);
+
+			sig_ret = _alpm_download(fileurl, syncpath, 1, 0, errors_ok);
+			/* errors_ok suppresses error messages, but not the return code */
+			sig_ret = errors_ok ? 0 : sig_ret;
+		}
+
+		FREE(fileurl);
+		if(ret != -1 && sig_ret != -1) {
+			break;
+		}
+	}
 
 	if(ret == 1) {
 		/* files match, do nothing */
 		pm_errno = 0;
-		return(1);
+		goto cleanup;
 	} else if(ret == -1) {
 		/* pm_errno was set by the download code */
 		_alpm_log(PM_LOG_DEBUG, "failed to sync db: %s\n", alpm_strerrorlast());
-		return(-1);
+		goto cleanup;
 	}
 
 	/* Cache needs to be rebuilt */
 	_alpm_db_free_pkgcache(db);
 
-	return(0);
+cleanup:
+
+	free(syncpath);
+	umask(oldmask);
+	return ret;
 }
 
 /* Forward decl so I don't reorganize the whole file right now */
@@ -206,7 +229,7 @@ static size_t estimate_package_count(struct stat *st, struct archive *archive)
 			/* assume it is at least somewhat compressed */
 			per_package = 200;
 	}
-	return((size_t)(st->st_size / per_package) + 1);
+	return (size_t)((st->st_size / per_package) + 1);
 }
 
 static int sync_db_populate(pmdb_t *db)
@@ -305,8 +328,10 @@ static int sync_db_populate(pmdb_t *db)
 		db->pkgcache->list = alpm_list_msort(db->pkgcache->list, (size_t)count, _alpm_pkg_cmp);
 	}
 	archive_read_finish(archive);
+	_alpm_log(PM_LOG_DEBUG, "added %d packages to package cache for db '%s'\n",
+			count, db->treename);
 
-	return(count);
+	return count;
 }
 
 #define READ_NEXT(s) do { \
@@ -346,7 +371,7 @@ static int sync_db_read(pmdb_t *db, struct archive *archive,
 	}
 	if(entryname == NULL) {
 		_alpm_log(PM_LOG_DEBUG, "invalid archive entry provided to _alpm_sync_db_read, skipping\n");
-		return(-1);
+		return -1;
 	}
 
 	_alpm_log(PM_LOG_FUNCTION, "loading package data from archive entry %s\n",
@@ -377,7 +402,7 @@ static int sync_db_read(pmdb_t *db, struct archive *archive,
 	if(pkg == NULL) {
 		_alpm_log(PM_LOG_DEBUG, "package %s not found in %s sync database",
 					pkgname, db->treename);
-		return(-1);
+		return -1;
 	}
 
 	if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0
@@ -434,8 +459,7 @@ static int sync_db_read(pmdb_t *db, struct archive *archive,
 				/* we don't do anything with this value right now */
 				READ_NEXT(line);
 			} else if(strcmp(line, "%PGPSIG%") == 0) {
-				/* we don't do anything with this value right now */
-				READ_NEXT(line);
+				READ_AND_STORE(pkg->base64_sig);
 			} else if(strcmp(line, "%REPLACES%") == 0) {
 				READ_AND_STORE_ALL(pkg->replaces);
 			} else if(strcmp(line, "%DEPENDS%") == 0) {
@@ -470,12 +494,12 @@ static int sync_db_read(pmdb_t *db, struct archive *archive,
 error:
 	FREE(pkgname);
 	/* TODO: return 0 always? */
-	return(0);
+	return 0;
 }
 
-static int sync_db_version(pmdb_t *db)
+static int sync_db_version(pmdb_t UNUSED *db)
 {
-	return(2);
+	return 2;
 }
 
 struct db_operations sync_db_ops = {
@@ -508,7 +532,7 @@ pmdb_t *_alpm_db_register_sync(const char *treename)
 	db->ops = &sync_db_ops;
 
 	handle->dbs_sync = alpm_list_add(handle->dbs_sync, db);
-	return(db);
+	return db;
 }