- Pacman-dev - lists.archlinux.org

[pacman-dev] should we show maintainer info in pacman -Qi / -Si ?
by Dieter Plaetinck 13 Feb '11

13 Feb '11

with pacman -Qi or pacman -Si we show the person who packaged it, but not the maintainer. This makes it harder to get in touch with the right person then it should be. Often I will start talking to the packager (or assign a ticket to him), only to have that person to tell me "hey, i'm just the guy who packaged it, you should really talk to $foo" Shouldn't we put the maintainer also in the pacman output? Dieter

5 4

[pacman-dev] Namcap 2.8.1 released
by Rémy Oudompheng 13 Feb '11

13 Feb '11

Hello, Namcap 2.8.1 has been released. You will find it at our mirrors : http://mirrors.kernel.org/archlinux/other/namcap/namcap-2.8.1.tar.gz The md5 checksum of the tarball is 2b688b8c8eabfcda91db283f8cf6ac86 The Git repository for namcap can be browsed at http://projects.archlinux.org/namcap.git/ This version is bugfix follow-up to 2.8. It brings a test suite covering nearly all rules, though it should not be considered as complete and any contributions (malformed PKGBUILDs or well-formed PKGBUILDs making bogus packages) are welcome. Notable bugfixes affect the rules emptydirs, extravars and kdeprograms. -- Rémy.

2 1

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

11 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 3afe3b6dfb928200166f348964de24e3f7188568 (commit) via 1358a4a80f4d8edbeedc0fdd1e026b491cbb8815 (commit) via 0eac60cd9d478774025a10decce835dea42f9ce4 (commit) via 06cbb516c35eb81220064878ff202c3107b12c99 (commit) via 56721c12cec02366816130aafaa974667db59a93 (commit) via 62fc966882aab2807c515614332ea74f848a5cf3 (commit) from 942bb9e64a7ba11e5f2a0db374bcaa21868eceb6 (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 3afe3b6dfb928200166f348964de24e3f7188568 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 8 21:19:00 2011 -0600 Check mountpoint read-only status when checking space This is a bit of a stopgap solution for the problem, but an easier one than revamping the file conflict checking code to support the same stuff. Using some more gross autoconf magic, figure out which struct field we need to look at to determine read-only status and store that on our mountpoint struct. If we find out we needed this partition after calculating size requirements, then toss an error. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1358a4a80f4d8edbeedc0fdd1e026b491cbb8815 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Feb 11 10:36:41 2011 -0600 diskspace: use calloc instead of malloc Prevents us from having to manually zero out several of our fields. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0eac60cd9d478774025a10decce835dea42f9ce4 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Feb 11 10:34:34 2011 -0600 Fix mount dir length calculation In the getmntinfo() section, the local variable mnt doesn't exist; this would have caused a compile error if I had tested the code on such a platform. Unify both codepaths to just run strlen() on the already copied mount path instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 06cbb516c35eb81220064878ff202c3107b12c99 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 8 21:16:36 2011 -0600 Avoid a memmove by advancing value pointer In packages, our description file contains: key = value is here type entries, and we passed "key " and " value is here" to our strtrim function, causing us to always memmove the value portion to remove the space. Since this is a throwaway buffer, do the advancing on our own before trimming to save the need to shift memory around; "value is here" will now be passed and strtrim will be responsible for trailing whitespace. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 56721c12cec02366816130aafaa974667db59a93 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 8 21:16:04 2011 -0600 Fix fileconflict progress with only one package Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 62fc966882aab2807c515614332ea74f848a5cf3 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Feb 9 07:54:42 2011 -0600 Ensure pkgbase/epoch are defined before doing anything When generating integrity sums, we could get some weird output before due to epoch being uninitialized: /usr/bin/makepkg: line 234: [[: 2.6.37: syntax error: invalid arithmetic operator (error token is ".6.37") Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 ++++ lib/libalpm/be_package.c | 1 + lib/libalpm/conflict.c | 6 ++++-- lib/libalpm/diskspace.c | 42 +++++++++++++++++++++++++----------------- lib/libalpm/diskspace.h | 1 + scripts/makepkg.sh.in | 7 ++++--- 6 files changed, 39 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Check mountpoint read-only status when checking space
by Dan McGee 11 Feb '11

11 Feb '11

This is a bit of a stopgap solution for the problem, but an easier one than revamping the file conflict checking code to support the same stuff. Using some more gross autoconf magic, figure out which struct field we need to look at to determine read-only status and store that on our mountpoint struct. If we find out we needed this partition after calculating size requirements, then toss an error. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Note: there are two definite areas for improvement here- we would fail on a package uninstall due to us not setting the ->used flag there. We may want two flags for this purpose- used, and "getting installed to" or something. Second is we don't do anything with directories and symlinks, so this would still fail if /boot was read-only: /var/lib/myfile /boot/youlose /boot/youloseagain -> /var/lib/myfile -Dan configure.ac | 4 ++++ lib/libalpm/diskspace.c | 30 +++++++++++++++++++++++------- lib/libalpm/diskspace.h | 1 + 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 47d6093..1039bba 100644 --- a/configure.ac +++ b/configure.ac @@ -194,6 +194,10 @@ AC_CHECK_FUNCS([geteuid getmntinfo realpath regcomp strcasecmp \ wcwidth uname]) # For the diskspace code FS_STATS_TYPE +AC_CHECK_MEMBERS([struct statvfs.f_flag],,,[[#include <sys/statvfs.h>]]) +AC_CHECK_MEMBERS([struct statfs.f_flags],,,[[#include <sys/param.h> + #include <sys/mount.h>]]) + # Enable large file support if available AC_SYS_LARGEFILE diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index ae2edf7..d47f9be 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -19,6 +19,7 @@ #include "config.h" +#include <errno.h> #if defined(HAVE_MNTENT_H) #include <mntent.h> #endif @@ -66,7 +67,7 @@ static alpm_list_t *mount_point_list(void) #if defined HAVE_GETMNTENT struct mntent *mnt; FILE *fp; - FSSTATSTYPE fsp; + struct statvfs fsp; fp = setmntent(MOUNTED, "r"); @@ -75,16 +76,22 @@ static alpm_list_t *mount_point_list(void) } while((mnt = getmntent(fp))) { + if(!mnt) { + _alpm_log(PM_LOG_WARNING, _("could not get filesystem information\n")); + continue; + } if(statvfs(mnt->mnt_dir, &fsp) != 0) { _alpm_log(PM_LOG_WARNING, - _("could not get filesystem information for %s\n"), mnt->mnt_dir); + _("could not get filesystem information for %s: %s\n"), + mnt->mnt_dir, strerror(errno)); continue; } MALLOC(mp, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(mnt->mnt_dir); - mp->mount_dir_len = strlen(mnt->mnt_dir); - memcpy(&(mp->fsp), &fsp, sizeof(FSSTATSTYPE)); + mp->mount_dir_len = strlen(mp->mount_dir); + memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs)); + mp->read_only = fsp.f_flag & ST_RDONLY; mp->blocks_needed = 0l; mp->max_blocks_needed = 0l; @@ -101,14 +108,19 @@ static alpm_list_t *mount_point_list(void) entries = getmntinfo(&fsp, MNT_NOWAIT); if (entries < 0) { - return NULL; + return(NULL); } for(; entries-- > 0; fsp++) { MALLOC(mp, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(fsp->f_mntonname); - mp->mount_dir_len = strlen(mnt->mnt_dir); + mp->mount_dir_len = strlen(mp->mount_dir); memcpy(&(mp->fsp), fsp, sizeof(FSSTATSTYPE)); +#if defined HAVE_STRUCT_STATVFS_F_FLAG + mp->read_only = fsp.f_flag & ST_RDONLY; +#elif defined HAVE_STRUCT_STATFS_F_FLAGS + mp->read_only = fsp.f_flags & MNT_RDONLY; +#endif mp->blocks_needed = 0l; mp->max_blocks_needed = 0l; @@ -303,7 +315,11 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) for(i = mount_points; i; i = alpm_list_next(i)) { alpm_mountpoint_t *data = i->data; - if(data->used == 1) { + if(data->used && data->read_only) { + _alpm_log(PM_LOG_ERROR, _("Partition %s is mounted read only\n"), + data->mount_dir); + abort = 1; + } else if(data->used) { /* cushion is roughly min(5% capacity, 20MiB) */ long fivepc = ((long)data->fsp.f_blocks / 20) + 1; long twentymb = (20 * 1024 * 1024 / (long)data->fsp.f_bsize) + 1; diff --git a/lib/libalpm/diskspace.h b/lib/libalpm/diskspace.h index ae99d0c..7c7dceb 100644 --- a/lib/libalpm/diskspace.h +++ b/lib/libalpm/diskspace.h @@ -37,6 +37,7 @@ typedef struct __alpm_mountpoint_t { long blocks_needed; long max_blocks_needed; int used; + int read_only; FSSTATSTYPE fsp; } alpm_mountpoint_t; -- 1.7.4

3 2

[pacman-dev] makepkg bug with epoch code
by Allan McRae 10 Feb '11

10 Feb '11

Have not had time to look into this, but I get this error with the kernel26 PKGBUILD in Arch Linux [core] repo: > makepkg -gc ==> Retrieving Sources... -> Found linux-2.6.37.tar.bz2 -> Found patch-2.6.37-4-ARCH.bz2 -> Found config -> Found config.x86_64 -> Found kernel26.preset ==> Generating checksums for source files... md5sums=('c8ee37b4fdccdb651e0603d35350b434' '732176aeb134678b4e369e1d5d5fca2e' 'cc49d27766f55df22f9cb78228880e78' '8f8059fa252e2f81b31be0c1bdbef123' '25584700a0a679542929c4bed31433b6') ==> Cleaning up... /usr/bin/makepkg: line 234: [[: 2.6.37: syntax error: invalid arithmetic operator (error token is ".6.37") Allan

3 3

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

08 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 942bb9e64a7ba11e5f2a0db374bcaa21868eceb6 (commit) via da3b93460258fd24e2535360586fea668fa055fb (commit) via be9a60a338fd8591918711f5e826012a0d83136e (commit) from bb071f4eb20810216b731f6792a32c148eb78931 (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 942bb9e64a7ba11e5f2a0db374bcaa21868eceb6 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Feb 7 21:33:30 2011 -0600 Skip diskspace checking for symlinks and directories in all cases We did this in some but not all cases, assuming the 0 value coming out of libarchive would not be a problem. However, this does not work for "fake" filesystems such as rpc_pipefs, which reports a free block and total block count of zero. Fix this by not ever counting symlinks or directories, and adding a note explaining that if we someday do count directories, their size needs to be attributed to the proper place. This patch also includes a few cleanups/performance tweaks- avoid calling strlen() on the mountpoint directory string as much by storing this size in our mountpoint struct, and push the snprintf() call up to the calculate functions since we were already doing it here in the remove case. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit da3b93460258fd24e2535360586fea668fa055fb Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Tue Feb 8 07:15:13 2011 +0800 Refactor out common code in pkghash add functions The overlapping code in _alpm_pkghash_add() and _alpm_pkghash_add_sorted() are now in a new static function pkghash_add_pkg(). This function has a third flag parameter which determines whether the package should be added in sorted order. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit be9a60a338fd8591918711f5e826012a0d83136e Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Tue Feb 8 06:59:04 2011 +0800 Handle null pkgcache for local/sync db_populate() 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. pm_errno 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. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 4 ++ lib/libalpm/be_sync.c | 8 ++++- lib/libalpm/diskspace.c | 85 ++++++++++++++++++++++++----------------------- lib/libalpm/diskspace.h | 1 + lib/libalpm/pkghash.c | 45 ++++++++---------------- 5 files changed, 70 insertions(+), 73 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Skip diskspace checking for symlinks and directories in all cases
by Dan McGee 08 Feb '11

08 Feb '11

We did this in some but not all cases, assuming the 0 value coming out of libarchive would not be a problem. However, this does not work for "fake" filesystems such as rpc_pipefs, which reports a free block and total block count of zero. Fix this by not ever counting symlinks or directories, and adding a note explaining that if we someday do count directories, their size needs to be attributed to the proper place. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/diskspace.c | 85 ++++++++++++++++++++++++----------------------- lib/libalpm/diskspace.h | 1 + 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index dfafdac..ae2edf7 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -54,7 +54,8 @@ static int mount_point_cmp(const void *p1, const void *p2) { const alpm_mountpoint_t *mp1 = p1; const alpm_mountpoint_t *mp2 = p2; - return(strcmp(mp1->mount_dir, mp2->mount_dir)); + /* the negation will sort all mountpoints before their parent */ + return(-strcmp(mp1->mount_dir, mp2->mount_dir)); } static alpm_list_t *mount_point_list(void) @@ -82,6 +83,7 @@ static alpm_list_t *mount_point_list(void) MALLOC(mp, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(mnt->mnt_dir); + mp->mount_dir_len = strlen(mnt->mnt_dir); memcpy(&(mp->fsp), &fsp, sizeof(FSSTATSTYPE)); mp->blocks_needed = 0l; @@ -105,6 +107,7 @@ static alpm_list_t *mount_point_list(void) for(; entries-- > 0; fsp++) { MALLOC(mp, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL)); mp->mount_dir = strdup(fsp->f_mntonname); + mp->mount_dir_len = strlen(mnt->mnt_dir); memcpy(&(mp->fsp), fsp, sizeof(FSSTATSTYPE)); mp->blocks_needed = 0l; @@ -120,22 +123,18 @@ static alpm_list_t *mount_point_list(void) return(mount_points); } -static alpm_list_t *match_mount_point(const alpm_list_t *mount_points, - const char *file) +static alpm_mountpoint_t *match_mount_point(const alpm_list_t *mount_points, + const char *real_path) { - char real_path[PATH_MAX]; - snprintf(real_path, PATH_MAX, "%s%s", handle->root, file); + const alpm_list_t *mp; - alpm_list_t *mp = alpm_list_last(mount_points); - do { + for(mp = mount_points; mp != NULL; mp = mp->next) { alpm_mountpoint_t *data = mp->data; - if(strncmp(data->mount_dir, real_path, strlen(data->mount_dir)) == 0) { - return(mp); + if(strncmp(data->mount_dir, real_path, data->mount_dir_len) == 0) { + return(data); } - - mp = mp->prev; - } while (mp != alpm_list_last(mount_points)); + } /* should not get here... */ return(NULL); @@ -148,38 +147,30 @@ static int calculate_removed_size(const alpm_list_t *mount_points, alpm_list_t *files = alpm_pkg_get_files(pkg); for(file = files; file; file = file->next) { - alpm_list_t *mp; - alpm_mountpoint_t *data; + alpm_mountpoint_t *mp; struct stat st; char path[PATH_MAX]; const char *filename = file->data; - /* skip directories to be consistent with libarchive that reports them - * to be zero size and to prevent multiple counting across packages */ - if(*(filename + strlen(filename) - 1) == '/') { + snprintf(path, PATH_MAX, "%s%s", handle->root, filename); + _alpm_lstat(path, &st); + + /* skip directories and symlinks to be consistent with libarchive that + * reports them to be zero size */ + if(S_ISDIR(st.st_mode) || S_ISLNK(st.st_mode)) { continue; } - mp = match_mount_point(mount_points, filename); + mp = match_mount_point(mount_points, path); if(mp == NULL) { _alpm_log(PM_LOG_WARNING, _("could not determine mount point for file %s"), filename); continue; } - snprintf(path, PATH_MAX, "%s%s", handle->root, filename); - _alpm_lstat(path, &st); - - /* skip symlinks to be consistent with libarchive that reports them to - * be zero size */ - if(S_ISLNK(st.st_mode)) { - continue; - } - - data = mp->data; /* the addition of (divisor - 1) performs ceil() with integer division */ - data->blocks_needed -= - (st.st_size + data->fsp.f_bsize - 1l) / data->fsp.f_bsize; + mp->blocks_needed -= + (st.st_size + mp->fsp.f_bsize - 1l) / mp->fsp.f_bsize; } return(0); @@ -191,7 +182,6 @@ static int calculate_installed_size(const alpm_list_t *mount_points, int ret=0; struct archive *archive; struct archive_entry *entry; - const char *file; if ((archive = archive_read_new()) == NULL) { pm_errno = PM_ERR_LIBARCHIVE; @@ -210,28 +200,39 @@ static int calculate_installed_size(const alpm_list_t *mount_points, } while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) { - alpm_list_t *mp; - alpm_mountpoint_t *data; + alpm_mountpoint_t *mp; + const char *filename; + mode_t mode; + char path[PATH_MAX]; - file = archive_entry_pathname(entry); + filename = archive_entry_pathname(entry); + mode = archive_entry_mode(entry); + + /* libarchive reports these as zero size anyways */ + /* NOTE: if we do start accounting for directory size, a dir matching a + * mountpoint needs to be attributed to the parent, not the mountpoint. */ + if(S_ISDIR(mode) || S_ISLNK(mode)) { + continue; + } /* approximate space requirements for db entries */ - if(file[0] == '.') { - file = alpm_option_get_dbpath(); + if(filename[0] == '.') { + filename = alpm_option_get_dbpath(); } - mp = match_mount_point(mount_points, file); + snprintf(path, PATH_MAX, "%s%s", handle->root, filename); + + mp = match_mount_point(mount_points, path); if(mp == NULL) { _alpm_log(PM_LOG_WARNING, - _("could not determine mount point for file %s"), file); + _("could not determine mount point for file %s"), filename); continue; } - data = mp->data; /* the addition of (divisor - 1) performs ceil() with integer division */ - data->blocks_needed += - (archive_entry_size(entry) + data->fsp.f_bsize - 1l) / data->fsp.f_bsize; - data->used = 1; + mp->blocks_needed += + (archive_entry_size(entry) + mp->fsp.f_bsize - 1l) / mp->fsp.f_bsize; + mp->used = 1; if(archive_read_data_skip(archive)) { _alpm_log(PM_LOG_ERROR, _("error while reading package %s: %s\n"), diff --git a/lib/libalpm/diskspace.h b/lib/libalpm/diskspace.h index 25b9cfb..ae99d0c 100644 --- a/lib/libalpm/diskspace.h +++ b/lib/libalpm/diskspace.h @@ -32,6 +32,7 @@ typedef struct __alpm_mountpoint_t { /* mount point information */ char *mount_dir; + size_t mount_dir_len; /* storage for additional disk usage calculations */ long blocks_needed; long max_blocks_needed; -- 1.7.4

3 2

[pacman-dev] [PATCH] Refactor out common code in pkghash add functions
by Pang Yan Han 08 Feb '11

08 Feb '11

The overlapping code in _alpm_pkghash_add() and _alpm_pkghash_add_sorted() are now in a new static function _alpm_pkghash_add_pkg(). This function has a third flag parameter which determines whether the package should be added in sorted order. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- lib/libalpm/pkghash.c | 44 ++++++++++++++------------------------------ 1 files changed, 14 insertions(+), 30 deletions(-) diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index 5480527..233985f 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -148,7 +148,7 @@ static pmpkghash_t *rehash(pmpkghash_t *oldhash) return(newhash); } -pmpkghash_t *_alpm_pkghash_add(pmpkghash_t *hash, pmpkg_t *pkg) +static pmpkghash_t *_alpm_pkghash_add_pkg(pmpkghash_t *hash, pmpkg_t *pkg, int sorted) { alpm_list_t *ptr; size_t position; @@ -173,41 +173,24 @@ 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; + if(!sorted){ + hash->list = alpm_list_join(hash->list, ptr); + }else{ + hash->list = alpm_list_mmerge(hash->list, ptr, _alpm_pkg_cmp); + } + hash->entries += 1; return(hash); } -pmpkghash_t *_alpm_pkghash_add_sorted(pmpkghash_t *hash, pmpkg_t *pkg) +pmpkghash_t *_alpm_pkghash_add(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); - } - - 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(_alpm_pkghash_add_pkg(hash, pkg, 0)); +} - return(hash); +pmpkghash_t *_alpm_pkghash_add_sorted(pmpkghash_t *hash, pmpkg_t *pkg) +{ + return(_alpm_pkghash_add_pkg(hash, pkg, 1)); } static size_t move_one_entry(pmpkghash_t *hash, size_t start, size_t end) @@ -344,3 +327,4 @@ pmpkg_t *_alpm_pkghash_find(pmpkghash_t *hash, const char *name) return(NULL); } +/* vim: set ts=2 sw=2 noet: */ -- 1.7.4

2 1

[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