- Pacman-dev - lists.archlinux.org

[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

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

03 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 f89277536612ff8e204cefcb6ff7cca7079d6bd5 (commit) via 35a8cf134bedf723dc6df5c6c2d6744ed942f31f (commit) via d8c4b12c66f1b4851eac5b61c7455a05d891ac70 (commit) via 332dd86912515dda5703127d13fd21f96e8273b9 (commit) via 3444146b48685deb4ebd68c3a5b4be5d2197b935 (commit) from 87240dae6d4631a812ee81ed53c1622dd164bfcf (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 f89277536612ff8e204cefcb6ff7cca7079d6bd5 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Feb 3 11:01:01 2011 +1000 makepkg: initialize local arrays to empty Fixes bash-3.2 compatibility. Thanks-to: Dave Reisner <d(a)falconindy.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 35a8cf134bedf723dc6df5c6c2d6744ed942f31f Author: Allan McRae <allan(a)archlinux.org> Date: Thu Feb 3 10:15:36 2011 +1000 makepkg: error on invalid optdepends Missed in commit a88cb03a. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d8c4b12c66f1b4851eac5b61c7455a05d891ac70 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue Feb 1 15:59:35 2011 +0100 makepkg: make SRCPKGDEST default to $startdir The current behaviour, which is placing source packages in PKGDEST if SRCPKGDEST is not set, is inconsistent with {SRC,PKG}DEST handling and there is no real advantage in doing so. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 332dd86912515dda5703127d13fd21f96e8273b9 Author: Nezmer <git(a)nezmer.info> Date: Tue Feb 1 12:02:50 2011 -0500 makepkg: Fix the check for references to srcdir/pkgdir At least in FreeBSD, find always returns 0 if it finds stuff (imagine that). It doesn't care about the exit status of whatever is passed to -exec. This patch makes the checks compatible with this behaviour. Using xargs and not using grep directly because packages with too many files would cause grep to complain about argument list being too long. This should also fix the false positive in packages with no files. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3444146b48685deb4ebd68c3a5b4be5d2197b935 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue Feb 1 15:59:34 2011 +0100 makepkg: fix indention to follow style guide Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.txt | 4 ++-- scripts/makepkg.sh.in | 27 ++++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: initialize local arrays to empty
by Allan McRae 03 Feb '11

03 Feb '11

Fixes bash-3.2 compatibility. Thanks-to: Dave Reisner <d(a)falconindy.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e8f57e1..13415fb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1257,7 +1257,7 @@ check_sanity() { fi fi - local provides_list + local provides_list=() eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | sed "s/provides=/provides_list+=/") for i in ${provides_list[@]}; do if [[ $i != ${i//</} || $i != ${i//>/} ]]; then @@ -1266,7 +1266,7 @@ check_sanity() { fi done - local backup_list + local backup_list=() eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | sed "s/backup=/backup_list+=/") for i in "${backup_list[@]}"; do if [[ ${i:0:1} = "/" ]]; then @@ -1275,7 +1275,7 @@ check_sanity() { fi done - local optdepends_list + local optdepends_list=() eval $(awk '/^[[:space:]]*optdepends=/,/\)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") for i in "${optdepends_list[@]}"; do local pkg=${i%%:*} -- 1.7.4

1 0

[pacman-dev] makepkg bash-3.2 issue
by Allan McRae 03 Feb '11

03 Feb '11

Hi, Can anyone give me a fix for this: local optdepends_list eval $(awk '/^[[:space:]]*optdepends=/,/\)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") In bash-3.2, this gives optdepends_list with "" as the first item in the array. It appears that declaring a local variable in bash-3.2 causes it to be given a blank value: bash-4.1 > declare optdepends_list > echo ${#optdepends_list[@]} 0 bash-3.2 > declare optdepends_list > echo ${#optdepends_list[@]} 1 Anyone know how to work around this? Allan

3 3

[pacman-dev] [PATCH] makepkg: make SRCPKGDEST default to $startdir
by Cedric Staniewski 03 Feb '11

03 Feb '11

The current behaviour, which is placing source packages in PKGDEST if SRCPKGDEST is not set, is inconsistent with {SRC,PKG}DEST handling and there is no real advantage in doing so. --- doc/makepkg.conf.5.txt | 4 ++-- scripts/makepkg.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 020804c..6130249 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -183,8 +183,8 @@ Options **SRCPKGDEST=**"/path/to/folder":: If this value is not set, source package files will be stored in - PKGDEST. Many people like to keep all source package files in - a central location for easy cleanup, so this path can be set here. + in the current directory. Many people like to keep all source package files + in a central location for easy cleanup, so this path can be set here. **PACKAGER=**"John Doe <john(a)example.com>":: This value is used when querying a package to see who was the builder. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0a90b89..493c962 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1744,7 +1744,7 @@ if [[ ! -w $SRCDEST ]] ; then fi SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST} -SRCPKGDEST=${SRCPKGDEST:-$PKGDEST} #default to $PKGDEST if undefined +SRCPKGDEST=${SRCPKGDEST:-$startdir} #default to $startdir if undefined if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then -- 1.7.4

3 3

[pacman-dev] [PATCH] makepkg: error on invalid optdepends
by Allan McRae 03 Feb '11

03 Feb '11

Missed in commit a88cb03a. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ebafa0b..e8f57e1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1281,6 +1281,7 @@ check_sanity() { local pkg=${i%%:*} if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then error "$(gettext "Invalid syntax for optdepend : '%s'")" "$i" + ret=1 fi done -- 1.7.4

1 0