- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Handle null pkgcache for local/sync db_populate()
by Pang Yan Han 07 Feb '11

07 Feb '11

In sync_db_populate() and local_db_populate(), a NULL db->pkgcache is not caught, allowing the functions to continue instead of exiting. A later alpm_list_msort() call which uses alpm_list_nth() will thus traverse invalid pointers in a non-existent db->pkgcache->list. pmerrno is set to PM_ERR_MEMORY as _alpm_pkghash_create() will only return NULL when we run out of memory / exceed max hash table size. The local/sync db_populate() functions are also exited. db->pkgcache_loaded is initialized to 0 in _alpm_db_new() as this value is used to ascertain the whether db->pkgcache is loaded. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- lib/libalpm/be_local.c | 4 ++++ lib/libalpm/be_sync.c | 8 +++++++- lib/libalpm/db.c | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index c5b2498..5858270 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -393,6 +393,10 @@ static int local_db_populate(pmdb_t *db) /* initialize hash at 50% full */ db->pkgcache = _alpm_pkghash_create(est_count * 2); + if(db->pkgcache == NULL){ + closedir(dbdir); + RET_ERR(PM_ERR_MEMORY, -1); + } while((ent = readdir(dbdir)) != NULL) { const char *name = ent->d_name; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 4ad045c..4e9b4d3 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -234,6 +234,9 @@ static int sync_db_populate(pmdb_t *db) /* initialize hash at 66% full */ db->pkgcache = _alpm_pkghash_create(est_count * 3 / 2); + if(db->pkgcache == NULL) { + RET_ERR(PM_ERR_MEMORY, -1); + } while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) { const struct stat *st; @@ -348,6 +351,9 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, if(likely_pkg && strcmp(likely_pkg->name, pkgname) == 0) { pkg = likely_pkg; } else { + if(db->pkgcache == NULL) { + RET_ERR(PM_ERR_MEMORY, -1); + } pkg = _alpm_pkghash_find(db->pkgcache, pkgname); } if(pkg == NULL) { @@ -459,10 +465,10 @@ pmdb_t *_alpm_db_register_sync(const char *treename) _alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename); db = _alpm_db_new(treename, 0); - db->ops = &sync_db_ops; if(db == NULL) { RET_ERR(PM_ERR_DB_CREATE, NULL); } + db->ops = &sync_db_ops; handle->dbs_sync = alpm_list_add(handle->dbs_sync, db); return(db); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 02f8282..d43a16b 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -370,6 +370,7 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local) CALLOC(db, 1, sizeof(pmdb_t), RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(db->treename, treename, RET_ERR(PM_ERR_MEMORY, NULL)); db->is_local = is_local; + db->pkgcache_loaded = 0; return(db); } -- 1.7.4

2 1

[pacman-dev] [PATCH] Handle null pkgcache for db_populate, refactor hash
by Pang Yan Han 07 Feb '11

07 Feb '11

In sync_db_populate() and local_db_populate(), a NULL db->pkgcache is not handled. This not only involves unnecessary operations, but also potentially merge sorting db->pkgcache->list which does not even exist in the case that db->pkgcache is NULL. This may lead to serious issues since alpm_list_msort calls alpm_list_nth which will dereference invalid pointers. Thus, db->pkgcache is checked during local/sync db_populate calls. For this purpose, PM_ERR_DB_PKGCACHE_NULL error is added to _pmerrno_t and taken care of in alpm_strerror(). In addition, common code between _alpm_pkghash_add() and _alpm_pkghash_add_sorted() is refactored out to _alpm_pkghash_add_pkg(). The 2 functions are now wrappers around _alpm_pkghash_add_pkg(). Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- Please give me advice on this as to whether it needs tweaking or if it won't be accepted. Thanks! lib/libalpm/alpm.h | 1 + lib/libalpm/be_local.c | 4 ++++ lib/libalpm/be_sync.c | 8 +++++++- lib/libalpm/db.c | 1 + lib/libalpm/error.c | 2 ++ lib/libalpm/pkghash.c | 46 +++++++++++++++------------------------------- lib/libalpm/pkghash.h | 1 + 7 files changed, 31 insertions(+), 32 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 7fec293..57c68bd 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -501,6 +501,7 @@ enum _pmerrno_t { PM_ERR_DB_NOT_FOUND, PM_ERR_DB_WRITE, PM_ERR_DB_REMOVE, + PM_ERR_DB_PKGCACHE_NULL, /* Servers */ PM_ERR_SERVER_BAD_URL, PM_ERR_SERVER_NONE, diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index c5b2498..c7980f9 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -393,6 +393,10 @@ static int local_db_populate(pmdb_t *db) /* initialize hash at 50% full */ db->pkgcache = _alpm_pkghash_create(est_count * 2); + if(db->pkgcache == NULL){ + closedir(dbdir); + RET_ERR(PM_ERR_DB_PKGCACHE_NULL, -1); + } while((ent = readdir(dbdir)) != NULL) { const char *name = ent->d_name; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 4ad045c..853ad30 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -234,6 +234,9 @@ static int sync_db_populate(pmdb_t *db) /* initialize hash at 66% full */ db->pkgcache = _alpm_pkghash_create(est_count * 3 / 2); + if(db->pkgcache == NULL) { + RET_ERR(PM_ERR_DB_PKGCACHE_NULL, -1); + } while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) { const struct stat *st; @@ -348,6 +351,9 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, if(likely_pkg && strcmp(likely_pkg->name, pkgname) == 0) { pkg = likely_pkg; } else { + if(db->pkgcache == NULL) { + RET_ERR(PM_ERR_DB_PKGCACHE_NULL, -1); + } pkg = _alpm_pkghash_find(db->pkgcache, pkgname); } if(pkg == NULL) { @@ -459,10 +465,10 @@ pmdb_t *_alpm_db_register_sync(const char *treename) _alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename); db = _alpm_db_new(treename, 0); - db->ops = &sync_db_ops; if(db == NULL) { RET_ERR(PM_ERR_DB_CREATE, NULL); } + db->ops = &sync_db_ops; handle->dbs_sync = alpm_list_add(handle->dbs_sync, db); return(db); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 02f8282..d43a16b 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -370,6 +370,7 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local) CALLOC(db, 1, sizeof(pmdb_t), RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(db->treename, treename, RET_ERR(PM_ERR_MEMORY, NULL)); db->is_local = is_local; + db->pkgcache_loaded = 0; return(db); } diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 2cc6685..5b48c89 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -81,6 +81,8 @@ const char SYMEXPORT *alpm_strerror(int err) return _("could not update database"); case PM_ERR_DB_REMOVE: return _("could not remove database entry"); + case PM_ERR_DB_PKGCACHE_NULL: + return _("could not initialize database package cache"); /* Servers */ case PM_ERR_SERVER_BAD_URL: return _("invalid url for server"); diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index 5480527..7006888 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -150,6 +150,16 @@ static pmpkghash_t *rehash(pmpkghash_t *oldhash) pmpkghash_t *_alpm_pkghash_add(pmpkghash_t *hash, pmpkg_t *pkg) { + return(_alpm_pkghash_add_pkg(hash, pkg, 0)); +} + +pmpkghash_t *_alpm_pkghash_add_sorted(pmpkghash_t *hash, pmpkg_t *pkg) +{ + return(_alpm_pkghash_add_pkg(hash, pkg, 1)); +} + +pmpkghash_t *_alpm_pkghash_add_pkg(pmpkghash_t *hash, pmpkg_t *pkg, int sorted) +{ alpm_list_t *ptr; size_t position; @@ -173,40 +183,13 @@ pmpkghash_t *_alpm_pkghash_add(pmpkghash_t *hash, pmpkg_t *pkg) ptr->prev = ptr; hash->hash_table[position] = ptr; - hash->list = alpm_list_join(hash->list, ptr); - hash->entries += 1; - - return(hash); -} - -pmpkghash_t *_alpm_pkghash_add_sorted(pmpkghash_t *hash, pmpkg_t *pkg) -{ - if(!hash) { - return(_alpm_pkghash_add(hash, pkg)); - } - - alpm_list_t *ptr; - size_t position; - - if((hash->entries + 1) / MAX_HASH_LOAD > hash->buckets) { - hash = rehash(hash); + if(!sorted){ + hash->list = alpm_list_join(hash->list, ptr); + }else{ + hash->list = alpm_list_mmerge(hash->list, ptr, _alpm_pkg_cmp); } - position = get_hash_position(pkg->name_hash, hash); - - ptr = calloc(1, sizeof(alpm_list_t)); - if(ptr == NULL) { - return(hash); - } - - ptr->data = pkg; - ptr->next = NULL; - ptr->prev = ptr; - - hash->hash_table[position] = ptr; - hash->list = alpm_list_mmerge(hash->list, ptr, _alpm_pkg_cmp); hash->entries += 1; - return(hash); } @@ -344,3 +327,4 @@ pmpkg_t *_alpm_pkghash_find(pmpkghash_t *hash, const char *name) return(NULL); } +/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/pkghash.h b/lib/libalpm/pkghash.h index a6c1db7..d63c6f0 100644 --- a/lib/libalpm/pkghash.h +++ b/lib/libalpm/pkghash.h @@ -47,6 +47,7 @@ pmpkghash_t *_alpm_pkghash_create(size_t size); pmpkghash_t *_alpm_pkghash_add(pmpkghash_t *hash, pmpkg_t *pkg); pmpkghash_t *_alpm_pkghash_add_sorted(pmpkghash_t *hash, pmpkg_t *pkg); +pmpkghash_t *_alpm_pkghash_add_pkg(pmpkghash_t *hash, pmpkg_t *pkg, int sorted); pmpkghash_t *_alpm_pkghash_remove(pmpkghash_t *hash, pmpkg_t *pkg, pmpkg_t **data); void _alpm_pkghash_free(pmpkghash_t *hash); -- 1.7.4

2 3

[pacman-dev] namcap 2.8.1 and namcap 2.99
by Rémy Oudompheng 07 Feb '11

07 Feb '11

Hello, I am willing to release a 2.8.1 version of namcap corresponding to the namcap-2.x branch of the repository. It includes the following changes: * revert a dictatorial choice of valid filename characters to include all reasonable ASCII characters * fix the emptydir rule that did not work * the extravars rule was never run (and didn't know options was a standard variable) * an even bigger test suite. The rules with no test cases are : depends, elffiles, kdeprograms, licensepkg, lotsofdocs, missingbackups, perllocal, rpath, scrollkeeper, symlink. In the other branches (python3 in my repo), I have a version of namcap that runs with Python 3 (the bytes vs. string battle was ended prematurely). The plans: * finish the test suite to have at least a test case for each rule * add basic split package support * read tarballs in one pass I'd like to have beta-level intermediate releases (something like version 2.99) because the changes made to the code are becoming quite large, and it needs many testers to spot regressions. -- Rémy.

2 4

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.3-4-ge17c4fe
by dan＠archlinux.org 06 Feb '11

06 Feb '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, maint has been updated via e17c4fe6115fb7b0f58540c8f825267688fa81b6 (commit) via 15e143bdfba292bf47107e88415812c90c54e15b (commit) from 272f7cf25e9a12268f23a6018000625630026434 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/LINGUAS | 3 + lib/libalpm/po/{en_GB.po => da.po} | 271 +++++----- lib/libalpm/po/{libalpm.pot => fi.po} | 14 +- lib/libalpm/po/{libalpm.pot => ko.po} | 14 +- po/LINGUAS | 3 + po/{en_GB.po => da.po} | 1001 +++++++++++++++++---------------- po/{pacman.pot => fi.po} | 14 +- po/kk.po | 192 +------ po/{pacman.pot => ko.po} | 14 +- 9 files changed, 697 insertions(+), 829 deletions(-) copy lib/libalpm/po/{en_GB.po => da.po} (53%) copy lib/libalpm/po/{libalpm.pot => fi.po} (96%) copy lib/libalpm/po/{libalpm.pot => ko.po} (96%) copy po/{en_GB.po => da.po} (52%) copy po/{pacman.pot => fi.po} (99%) copy po/{pacman.pot => ko.po} (99%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.3-341-gbb071f4
by dan＠archlinux.org 06 Feb '11

06 Feb '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 bb071f4eb20810216b731f6792a32c148eb78931 (commit) via 3cf870eda5842fb07e384026c7dc4279d2c26aca (commit) via 3865352d2390982f45e2b85185dd5b4d89763e93 (commit) via 30bb969ace21b86a8e41de7d30e9d39d86271ed5 (commit) via e17c4fe6115fb7b0f58540c8f825267688fa81b6 (commit) via 15e143bdfba292bf47107e88415812c90c54e15b (commit) via fafa909a2dd7efa2966f72e4ceae41dd1457f48c (commit) via 7664a58d4e95f0e1f1b433add61f3b658b926aaa (commit) via e34fc4eddf73f2453b42235f5ae7d65f75db66fc (commit) via c12ccbfb2c7aa907ba01339a1a29089c65ea9911 (commit) via 7467fb9e763d9895044791eb0407e58d2793f377 (commit) via 6b0d4674bb132b2583920211cc798f3db77ec392 (commit) via 1f145bcd1a4fb22d4cb548a3be64898f60820695 (commit) via 14fd1e63a2ce420c555c6de34a815a8b62a9859b (commit) via 09e582b4117356f996f6d94ca5e490aebd0a0fd5 (commit) via 01c3c7e4f28d837f0b8a6aaaf27d16894d4b762d (commit) via 11e5e86151f83219b1cedbca31be7530911e25eb (commit) via 93207863493b54e794098b4ee5987d59c8c4b14b (commit) via c9820ec97b417d33dc37eb589f069766f1068ea1 (commit) via d843c86b7b7cbf376716817e7c2c55b1f9360a72 (commit) via 021085624ea94a7116c60552e5c153de6cb5f057 (commit) via ce5471511257ada996bfcb6ea4236cd89c0d6890 (commit) via f8fdce6cb0da4d832ffa730e0dacb5544c1f8154 (commit) via 5dae577a87795e7666f05613cf9aa7207fd17346 (commit) via e17b0446bd815f7b25f5bf0b838ef3d02d4eb64e (commit) from f89277536612ff8e204cefcb6ff7cca7079d6bd5 (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 bb071f4eb20810216b731f6792a32c148eb78931 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 5 10:24:58 2011 +1000 makepkg: more bash-3.2 compatibility Adding the "|| true" to the subshell prevents bash-3.2 setting off the error_trap but requires changing the if statement. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3cf870eda5842fb07e384026c7dc4279d2c26aca Merge: 3865352 e17c4fe Author: Dan McGee <dan(a)archlinux.org> Date: Sun Feb 6 12:52:20 2011 -0600 Merge branch 'maint' commit 3865352d2390982f45e2b85185dd5b4d89763e93 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Sat Feb 5 11:48:54 2011 +0800 Remove redundant _alpm_strtrim() in be_local.c When reading the "desc" file in _alpm_local_db_read(), some strings are trimmed and checked for length > 0 before their use/duplication subsequently. They are then trimmed again when there is no need to. The following code snippet should illustrate it clearly: while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->groups = alpm_list_add(info->groups, linedup); } This patch removes the redundant _alpm_strtrim() calls in _alpm_local_db_read() such as the one inside the STRDUP shown above. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 30bb969ace21b86a8e41de7d30e9d39d86271ed5 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Fri Feb 4 23:34:16 2011 +0800 Handle PM_ERR_WRITE in alpm_strerror() PM_ERR_WRITE is defined in alpm.h but not handled in alpm_strerror(). This patch corrects that. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fafa909a2dd7efa2966f72e4ceae41dd1457f48c Author: Dan McGee <dan(a)archlinux.org> Date: Fri Feb 4 09:15:51 2011 -0600 Update translation file indexes and Makevars Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7664a58d4e95f0e1f1b433add61f3b658b926aaa Author: Dan McGee <dan(a)archlinux.org> Date: Fri Feb 4 09:15:22 2011 -0600 Add comment about download file resolution Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e34fc4eddf73f2453b42235f5ae7d65f75db66fc Merge: c12ccbf 6b0d467 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Feb 4 09:10:25 2011 -0600 Merge remote-tracking branch 'allan/hash' commit c12ccbfb2c7aa907ba01339a1a29089c65ea9911 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Feb 4 09:00:47 2011 -0600 Add more error checking and logging Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7467fb9e763d9895044791eb0407e58d2793f377 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Feb 4 08:42:52 2011 -0600 Ensure found files are actually files We located files in a few places but didn't check if they were files or directories. Ensure they are actually files using stat() and S_ISREG(); this showed itself when trying to download to the directory name itself in FS#22645. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6b0d4674bb132b2583920211cc798f3db77ec392 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Feb 3 10:55:26 2011 -0600 Improve pkghash_remove algorithm Rather than potentially move every item to the next NULL, attempt to move at most one item at a time by iterating backwards from the NULL location in the hash array. If we move an item, we repeat the process on the now shorter "chain" until no more items need moving. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1f145bcd1a4fb22d4cb548a3be64898f60820695 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 2 20:46:29 2011 -0600 Use alpm_list_remove_item in pkghash_remove Removes the code that was duplicated and has now been refactored into a separate method. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 14fd1e63a2ce420c555c6de34a815a8b62a9859b Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 2 20:46:28 2011 -0600 Add new alpm_list_remove_item() function This takes in the list and a list item, and does the pointer dance necessary to remove it from the list regardless of whether it is first, last, or somewhere in the middle. It is useful for callers that already know what item needs to be removed and have a pointer to it rather than doing a search by data that the plain alpm_list_remove() does. Refactor alpm_list_remove() to use this function as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 09e582b4117356f996f6d94ca5e490aebd0a0fd5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 2 20:46:27 2011 -0600 Add a new removal smoke test Hint: this will really stress hash table removal. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 01c3c7e4f28d837f0b8a6aaaf27d16894d4b762d Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 30 22:42:45 2011 +1000 Actually remove packages from pkghash on removal Fully removes a package from the hash. Also unify prototype with removal from an alpm_list_t, fixing issues when removing a package from the pkgcache. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 11e5e86151f83219b1cedbca31be7530911e25eb Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 29 23:24:13 2011 +1000 Refactor finding position for new hash entry Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 93207863493b54e794098b4ee5987d59c8c4b14b Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 29 22:50:55 2011 +1000 Rehash efficiently Rehash without recreating the hash table list or reallocating the memory for holding the list nodes. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c9820ec97b417d33dc37eb589f069766f1068ea1 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 29 11:47:31 2011 +1000 Slightly more efficient rehash size selection While probably still not optimal in terms of everyday usage in pacman, this reduces the absolute size increase to "more reasonable" levels. For databases greater than 5000 in size, the minimum size increase is used which is still on the order of a 10% increase. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d843c86b7b7cbf376716817e7c2c55b1f9360a72 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jan 29 11:39:25 2011 +1000 Error handling for maximum database size Check that the requested size of a pkghash is not beyond the maximum prime. Also check for successful creation of a new hash before rehashing. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 021085624ea94a7116c60552e5c153de6cb5f057 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 28 12:04:27 2011 -0600 Change default sync hash table sizing to 66% full Since the sync database never changes size once we initialize it, we allow it to be filled a bit more. This reduces the overall memory footprint needed by the hash table. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ce5471511257ada996bfcb6ea4236cd89c0d6890 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 28 12:03:36 2011 -0600 Implement a quick and dirty rehash function This allows us to get through the rehash required by smoke001 and pass all pactests. It is by no means the best or most efficient implementation but it does do the job. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f8fdce6cb0da4d832ffa730e0dacb5544c1f8154 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 25 11:49:34 2011 +1000 Read pkgcache into hash Read the package information for sync/local databases into a pmpkghash_t structure. Provide a alpm_db_get_pkgcache_list() method that returns the list from the hash object. Most usages of alpm_db_get_pkgcache are converted to this at this stage for ease of implementation. Review whether these are better accessing the hash table directly at a later stage. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5dae577a87795e7666f05613cf9aa7207fd17346 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 24 17:48:54 2011 -0600 Get estimated package count when populating databases This works for both local and sync databases in slightly different ways. For the local database, we can use the directory hard link count on the local/ folder. For sync databases, we use the archive size coupled with some computed average per-package sizes to determine an estimate. This is currently a dead assignment once calculated, but could be used to set the initial size of a hash table. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e17b0446bd815f7b25f5bf0b838ef3d02d4eb64e Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 7 00:32:17 2011 +1000 Add a hash table for holding packages Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/Makefile.am | 1 + lib/libalpm/alpm.h | 4 +- lib/libalpm/alpm_list.c | 86 ++-- lib/libalpm/alpm_list.h | 1 + lib/libalpm/be_local.c | 38 +- lib/libalpm/be_sync.c | 77 +++- lib/libalpm/conflict.c | 4 +- lib/libalpm/db.c | 55 ++- lib/libalpm/db.h | 7 +- lib/libalpm/deps.c | 8 +- lib/libalpm/dload.c | 18 +- lib/libalpm/error.c | 2 + lib/libalpm/package.c | 2 +- lib/libalpm/pkghash.c | 346 ++++++++++++ lib/libalpm/pkghash.h | 58 ++ lib/libalpm/po/LINGUAS | 3 + lib/libalpm/po/Makevars | 2 +- lib/libalpm/po/POTFILES.in | 3 +- lib/libalpm/po/{en_GB.po => da.po} | 271 +++++----- lib/libalpm/po/{libalpm.pot => fi.po} | 14 +- lib/libalpm/po/{libalpm.pot => ko.po} | 14 +- lib/libalpm/remove.c | 6 +- lib/libalpm/sync.c | 8 +- lib/libalpm/util.c | 5 +- po/LINGUAS | 3 + po/Makevars | 5 +- po/POTFILES.in | 3 + po/{en_GB.po => da.po} | 1001 +++++++++++++++++---------------- po/{pacman.pot => fi.po} | 14 +- po/kk.po | 192 +------ po/{pacman.pot => ko.po} | 14 +- scripts/makepkg.sh.in | 4 +- src/pacman/deptest.c | 2 +- src/pacman/query.c | 6 +- src/pacman/sync.c | 10 +- src/pacman/upgrade.c | 2 + src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 4 +- src/util/testdb.c | 4 +- test/pacman/tests/smoke001.py | 9 +- test/pacman/tests/smoke003.py | 19 + 41 files changed, 1386 insertions(+), 941 deletions(-) create mode 100644 lib/libalpm/pkghash.c create mode 100644 lib/libalpm/pkghash.h copy lib/libalpm/po/{en_GB.po => da.po} (53%) copy lib/libalpm/po/{libalpm.pot => fi.po} (96%) copy lib/libalpm/po/{libalpm.pot => ko.po} (96%) copy po/{en_GB.po => da.po} (52%) copy po/{pacman.pot => fi.po} (99%) copy po/{pacman.pot => ko.po} (99%) create mode 100644 test/pacman/tests/smoke003.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove redundant _alpm_strtrim() in be_local.c
by Pang Yan Han 06 Feb '11

06 Feb '11

When reading the "desc" file in _alpm_local_db_read(), some strings are trimmed and checked for length > 0 before their use/duplication subsequently. They are then trimmed again when there is no need to. The following code snippet should illustrate it clearly: while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->groups = alpm_list_add(info->groups, linedup); } This patch removes the redundant _alpm_strtrim() calls in _alpm_local_db_read() such as the one inside the STRDUP shown above. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- lib/libalpm/be_local.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index c7110fa..c005532 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -539,7 +539,7 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } else if(strcmp(line, "%GROUPS%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); + STRDUP(linedup, line, goto error); info->groups = alpm_list_add(info->groups, linedup); } } else if(strcmp(line, "%URL%") == 0) { @@ -550,7 +550,7 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } else if(strcmp(line, "%LICENSE%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); + STRDUP(linedup, line, goto error); info->licenses = alpm_list_add(info->licenses, linedup); } } else if(strcmp(line, "%ARCH%") == 0) { @@ -595,30 +595,30 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } else if(strcmp(line, "%REPLACES%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); + STRDUP(linedup, line, goto error); info->replaces = alpm_list_add(info->replaces, linedup); } } else if(strcmp(line, "%DEPENDS%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { - pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); + pmdepend_t *dep = _alpm_splitdep(line); info->depends = alpm_list_add(info->depends, dep); } } else if(strcmp(line, "%OPTDEPENDS%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); + STRDUP(linedup, line, goto error); info->optdepends = alpm_list_add(info->optdepends, linedup); } } else if(strcmp(line, "%CONFLICTS%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); + STRDUP(linedup, line, goto error); info->conflicts = alpm_list_add(info->conflicts, linedup); } } else if(strcmp(line, "%PROVIDES%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); + STRDUP(linedup, line, goto error); info->provides = alpm_list_add(info->provides, linedup); } } @@ -639,13 +639,13 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(strcmp(line, "%FILES%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); + STRDUP(linedup, line, goto error); info->files = alpm_list_add(info->files, linedup); } } else if(strcmp(line, "%BACKUP%") == 0) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); + STRDUP(linedup, line, goto error); info->backup = alpm_list_add(info->backup, linedup); } } -- 1.7.4

2 1

[pacman-dev] [PATCH] makepkg: more bash-3.2 compatibility
by Allan McRae 05 Feb '11

05 Feb '11

Adding the "|| true" to the subshell prevents bash-3.2 setting off the error_trap but requires changing the if statement. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 13415fb..001178a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -507,8 +507,8 @@ download_sources() { local netfile for netfile in "${source[@]}"; do - local file - if file=$(get_filepath "$netfile"); then + local file=$(get_filepath "$netfile" || true) + if [[ -n "$file" ]]; then msg2 "$(gettext "Found %s")" "${file##*/}" ln -sf "$file" "$srcdir/" continue -- 1.7.4

2 5

[pacman-dev] [PATCH] Handle PM_ERR_WRITE in alpm_strerror()
by Pang Yan Han 04 Feb '11

04 Feb '11

PM_ERR_WRITE is defined in alpm.h but not handled in alpm_strerror(). This patch corrects that. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- lib/libalpm/error.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 1b144a5..2cc6685 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -135,6 +135,8 @@ const char SYMEXPORT *alpm_strerror(int err) /* Miscellaenous */ case PM_ERR_RETRIEVE: return _("failed to retrieve some files"); + case PM_ERR_WRITE: + return _("failed to copy some file"); case PM_ERR_INVALID_REGEX: return _("invalid regular expression"); /* Errors from external libraries- our own wrapper error */ -- 1.7.4

2 1

[pacman-dev] [Package Signing] [repo-add] Check signature used to verify is not only good but is also in a list of accepted keys
by Denis A. Altoé Falqueto 04 Feb '11

04 Feb '11

Hi, Allan and friends :) I'm working on the items of the todo list [1] for package signing and have a question with the item of the subject of this email. Basically, what should be the list of accepted keys? The keys in pacman's keyring? Probably yes, isn't it? So the signature is made with a key from user's keyring (be it the default or one passed as parameter) and the verifying should be made with pacman's keyring? Just asking to be sure. [1] https://wiki.archlinux.org/index.php/User:Allan/Package_Signing -- ------------------------------------------- Denis A. Altoe Falqueto Linux user #524555 -------------------------------------------

2 2

[pacman-dev] [PATCH] WIP: check local DB version
by Dan McGee 03 Feb '11

03 Feb '11

--- Thoughts on this approach to a sanity check? It is a bit unfortunate that we do the glob() call only to throw the results away, but it does work. It would be a lot more efficient to do our own opendir()/access() loop since we only care about existence, not the actual file paths. We could also scan only the first few entries if we felt that was safe enough of an approach. -Dan lib/libalpm/alpm.c | 2 ++ lib/libalpm/alpm.h | 1 + lib/libalpm/db.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/db.h | 4 +++- lib/libalpm/error.c | 2 ++ lib/libalpm/trans.c | 15 +++++++++++++-- src/pacman/util.c | 4 ++++ 7 files changed, 71 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 7c3bfc2..4f95832 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -56,6 +56,8 @@ int SYMEXPORT alpm_initialize(void) } if(_alpm_db_register_local() == NULL) { /* error code should be set */ + _alpm_handle_free(handle); + handle = NULL; return(-1); } diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 19ea4ff..c4edb43 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -497,6 +497,7 @@ enum _pmerrno_t { PM_ERR_DB_NULL, PM_ERR_DB_NOT_NULL, PM_ERR_DB_NOT_FOUND, + PM_ERR_DB_VERSION, PM_ERR_DB_WRITE, PM_ERR_DB_REMOVE, /* Servers */ diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index c80dcbb..6ebc344 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -31,6 +31,8 @@ #include <sys/stat.h> #include <regex.h> #include <time.h> +#include <limits.h> /* PATH_MAX */ +#include <glob.h> /* libalpm */ #include "db.h" @@ -405,6 +407,50 @@ const char *_alpm_db_path(pmdb_t *db) return(db->_path); } +int _alpm_db_version(pmdb_t *db) +{ + const char *db_path; + + if(db && db->_version) { + return(db->_version); + } + + db_path = _alpm_db_path(db); + if(!db || !db_path) { + return(-1); + } + + if(db->is_local) { + char path[PATH_MAX]; + int globret; + glob_t globbuf; + + snprintf(path, PATH_MAX, "%s*/depends", db_path); + globret = glob(path, GLOB_NOSORT, NULL, &globbuf); + switch(globret) { + case 0: + /* we found some depends files */ + db->_version = 1; + break; + case GLOB_NOMATCH: + /* this is the good case */ + db->_version = 2; + break; + case GLOB_NOSPACE: + case GLOB_ABORTED: + /* error cases */ + db->_version = -1; + break; + } + globfree(&globbuf); + _alpm_log(PM_LOG_DEBUG, "database version for tree %s set to %d\n", + db->treename, db->_version); + return(db->_version); + } else { + return(-1); + } +} + int _alpm_db_cmp(const void *d1, const void *d2) { pmdb_t *db1 = (pmdb_t *)d1; diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index b7fa7ca..9b3c42c 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -50,6 +50,7 @@ struct __pmdb_t { char *treename; /* do not access directly, use _alpm_db_path(db) for lazy access */ char *_path; + int _version; int pkgcache_loaded; int grpcache_loaded; /* also indicates whether we are RO or RW */ @@ -63,14 +64,15 @@ struct __pmdb_t { /* db.c, database general calls */ +pmdb_t *_alpm_db_new(const char *treename, int is_local); void _alpm_db_free(pmdb_t *db); const char *_alpm_db_path(pmdb_t *db); +int _alpm_db_version(pmdb_t *db); int _alpm_db_cmp(const void *d1, const void *d2); alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles); pmdb_t *_alpm_db_register_local(void); pmdb_t *_alpm_db_register_sync(const char *treename); void _alpm_db_unregister(pmdb_t *db); -pmdb_t *_alpm_db_new(const char *treename, int is_local); /* be_*.c, backend specific calls */ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 1b144a5..bbe210b 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -77,6 +77,8 @@ const char SYMEXPORT *alpm_strerror(int err) return _("database already registered"); case PM_ERR_DB_NOT_FOUND: return _("could not find database"); + case PM_ERR_DB_VERSION: + return _("database is incorrect version"); case PM_ERR_DB_WRITE: return _("could not update database"); case PM_ERR_DB_REMOVE: diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 804ab7a..3bc2207 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -59,10 +59,11 @@ * @return 0 on success, -1 on error (pm_errno is set accordingly) */ int SYMEXPORT alpm_trans_init(pmtransflag_t flags, - alpm_trans_cb_event event, alpm_trans_cb_conv conv, - alpm_trans_cb_progress progress) + alpm_trans_cb_event event, alpm_trans_cb_conv conv, + alpm_trans_cb_progress progress) { pmtrans_t *trans; + const int localdb_version = 2; ALPM_LOG_FUNC; @@ -79,6 +80,16 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags, } } + /* check database version */ + if(_alpm_db_version(handle->db_local) < localdb_version) { + _alpm_log(PM_LOG_ERROR, + _("%s database version %d is too old, version %d required\n"), + handle->db_local->treename, _alpm_db_version(handle->db_local), + localdb_version); + _alpm_lckrm(); + RET_ERR(PM_ERR_DB_VERSION, -1); + } + trans = _alpm_trans_new(); if(trans == NULL) { RET_ERR(PM_ERR_MEMORY, -1); diff --git a/src/pacman/util.c b/src/pacman/util.c index c08ebb1..9d50afb 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -63,6 +63,10 @@ int trans_init(pmtransflag_t flags) fprintf(stderr, _(" if you're sure a package manager is not already\n" " running, you can remove %s\n"), alpm_option_get_lockfile()); } + else if(pm_errno == PM_ERR_DB_VERSION) { + fprintf(stderr, _(" try running pacman-db-upgrade\n")); + } + return(-1); } return(0); -- 1.7.4

1 0