- Pacman-dev - lists.archlinux.org

[pacman-dev] Should we bump major version number too?
by Rémy Oudompheng 08 Jun '11

08 Jun '11

Hi all, It's in the mood: GTK, Gnome, Linux are bumping their major version numbers. Should we follow the same path? Several reasons why I think this is a good idea: - we have a major feature coming: signature checks - we have a major API breakage: the pmhandle_t thing, the signature check level thing - throughout the 3.x development cycle, a lot of incompatibilities/changes have happened: * database have no longer the separate "depends" file * sync DBs are now a single tarball * packages have an "epoch" field not understood by previous versions * packages can be xz-compressed * PKGBUILDs have epoch, check() and checkdepends * force is not accepted anymore by makepkg If the next pacman version were to be 3.6, it would have very little similarities with pacman 3.0. They don't seem to be forward-compatible, neither are they backward-compatible. So maybe it's time to go pacman 4.0 ? Cheers, Rémy.

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-207-gdfaeb6b
by dan＠archlinux.org 08 Jun '11

08 Jun '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 dfaeb6bb2ca8311ac418a16c30006eb7d0534d71 (commit) via 11ba7a0e8a253bff53778688ee174f42c1513738 (commit) via beffab02c41251d4d05d29c0eebbe5a6b6997095 (commit) via 2668782db282130bc1f845173228371d3447e4a2 (commit) via 87072ff63907ce6040be7e59b9b07fd891a8254a (commit) via 361b6a9403c9b87521ec3e1df64b6fe95fe52d7d (commit) via 80b024d56ae61902025983470e93893d76109ac4 (commit) via 45fe92bf39a193252d0fc5e44526877002297659 (commit) from 8c6a636cd970c19e7a79bb17c484b28454da877d (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 dfaeb6bb2ca8311ac418a16c30006eb7d0534d71 Merge: 11ba7a0 87072ff Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 8 02:49:09 2011 -0500 Merge remote-tracking branch 'allan/working' commit 11ba7a0e8a253bff53778688ee174f42c1513738 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 8 02:47:26 2011 -0500 Fix graph free valgrind warnings Due to the way we set up the graph structure, we don't always have good parent information. The changes made in dd8cf0c12dd5e assumed this, so back them out and just live with the dead pointers being there in the memory while we are cleaning up after ourselves. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit beffab02c41251d4d05d29c0eebbe5a6b6997095 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 8 02:32:56 2011 -0500 pactest: only create install file if necessary We were testing whether there were any values in the array, rather than looking if the values contained anything. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2668782db282130bc1f845173228371d3447e4a2 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 23:26:28 2011 -0500 Plug a memory leak Introduced by me in commit cc25576f8b54b3. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 87072ff63907ce6040be7e59b9b07fd891a8254a Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 8 17:36:03 2011 +1000 Fix name of original files in scripts Our scripts all currently say: Generated from foo.in; do not edit by hand. Fix this to say foo.sh.in, which is the actual original file name. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 361b6a9403c9b87521ec3e1df64b6fe95fe52d7d Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 8 16:48:56 2011 +1000 pacman-key: add vim modeline and fix whitespace issues Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 80b024d56ae61902025983470e93893d76109ac4 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 8 16:44:38 2011 +1000 pkgdelta: add vim modeline Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 45fe92bf39a193252d0fc5e44526877002297659 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jun 8 15:34:47 2011 +1000 Remove incorrect output with download only and IgnorePkg When only downloading a package that is in IgnorePkg, pacman incorrectly asks about installing. e.g. with <pkg> in IgnorePkg in pacman.conf: > pacman -Sddw <pkg> :: <pkg> is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] This output is now silenced when downloading only. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_sync.c | 1 + lib/libalpm/graph.c | 11 ----------- scripts/Makefile.am | 2 +- scripts/pacman-key.sh.in | 14 ++++++++------ scripts/pkgdelta.sh.in | 2 ++ src/pacman/callback.c | 8 ++++++-- test/pacman/pmpkg.py | 4 ++-- 7 files changed, 20 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove incorrect output with download only and IgnorePkg
by Allan McRae 08 Jun '11

08 Jun '11

When only downloading a package that is in IgnorePkg, pacman incorrectly asks about installing. e.g. with <pkg> in IgnorePkg in pacman.conf: > pacman -Sddw <pkg> :: <pkg> is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] This output is now silenced when downloading only. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This moves the hiding of the output to the pacman callback rather than doing it in the libalpmm backend as previously submitted. Note this is the same as how the similar output issue with PM_TRANS_CONV_LOCAL_NEWER is handled. src/pacman/callback.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index f1c314f..4a02574 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -256,8 +256,12 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, { switch(event) { case PM_TRANS_CONV_INSTALL_IGNOREPKG: - *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), - alpm_pkg_get_name(data1)); + if(!config->op_s_downloadonly) { + *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), + alpm_pkg_get_name(data1)); + } else { + *response = 1; + } break; case PM_TRANS_CONV_REPLACE_PKG: *response = yesno(_(":: Replace %s with %s/%s?"), -- 1.7.5.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-199-g8c6a636
by dan＠archlinux.org 07 Jun '11

07 Jun '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 8c6a636cd970c19e7a79bb17c484b28454da877d (commit) via c7501148942159597677c2a8a738f0d59fdaa6dd (commit) via 4fdcf50d6696709fde8942fee592ab076ddb6004 (commit) via 19755b648c80f637a430ba5c914db76264024c9a (commit) via fb4b422fc4567238332050b9a6c8c1cac2a8f091 (commit) via 992fa50dfd4faba93e37364bded015ea04d1fe15 (commit) via c1a5b11f1151040e3341d9222cc246c3aa140182 (commit) via 991b3ff7e63314ea14a40bb437e49ec8553abff2 (commit) via e62566a7635449e3e35d757c4b3bb768479689ab (commit) via 67c33fb8fff4db008e3afde8b6dd228f181755ed (commit) via 3df88a1a01926587b0b68dcff97d539746e3a8f9 (commit) via cc25576f8b54b3e975949ac7991a193053b519bc (commit) via e68f5d9a30671419c853b255b32b2e9d0239c9f1 (commit) via d2f05f72f02e15164f2d83347317f15c7e8c4fb9 (commit) via 307a6de17a3bca9f8666b33aa3fb9a8dd88c300b (commit) via 4015b23e8ef1e5a0e8d103ffefca0ffc4ad9e6c0 (commit) via 7fc635fee071e18d0422a4773937e66960be96b2 (commit) via de36c5fac4ab50259418c3850b6fb25b96b702f3 (commit) via 7f98460e37bc032b58ca7c82e70c357aa39370f8 (commit) via c47d25d74be9ce1fbbfb8577687d9f37ba38d98b (commit) via 2102d1a2eb6cb9db674fd76aa7aa3192befad733 (commit) via 78cbc045c129ca7767b13127e1e17c400b112770 (commit) from 9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9 (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 8c6a636cd970c19e7a79bb17c484b28454da877d Merge: c750114 e62566a Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 11:41:16 2011 -0500 Merge branch 'maint' Conflicts: lib/libalpm/add.c commit c7501148942159597677c2a8a738f0d59fdaa6dd Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 5 00:18:33 2011 +1000 pacman-key: update copyright Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4fdcf50d6696709fde8942fee592ab076ddb6004 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 16:13:04 2011 -0500 Revamp pacman setup code to handle new alpm initialize routine Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 19755b648c80f637a430ba5c914db76264024c9a Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 15:46:06 2011 -0500 Update utilities for new initialize/release methods Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb4b422fc4567238332050b9a6c8c1cac2a8f091 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 15:24:01 2011 -0500 New signatures for alpm initialize and release These new method signatures return and take handle objects to operate on so we can move away from the idea of one global handle in the API. There is also another important change and that deals with the setting of root and dbpaths. These are now done at initialization time instead of using setter methods. This allows the library to operate more safely knowing that paths won't change underneath it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 992fa50dfd4faba93e37364bded015ea04d1fe15 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 11:36:30 2011 -0500 Add cachedirs one-by-one in set_cachedirs() This addresses the issue where calling set_cachedirs() didn't canonicalize the passed-in paths. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c1a5b11f1151040e3341d9222cc246c3aa140182 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 11:33:29 2011 -0500 Be consistent with memory treatment for plural option setters In all cases we should duplicate the passed-in list so the caller is free to do with it as it pleases. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 991b3ff7e63314ea14a40bb437e49ec8553abff2 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 16:42:41 2011 -0500 Add helper methods for setting directory options This keeps duplicate code to a minimum. This will come in more handy as we refactor some of these option setters away. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cc25576f8b54b3e975949ac7991a193053b519bc Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 14:37:51 2011 -0500 Use standard errno codes in return from _alpm_archive_fgets This allows us to not require the context (e.g. handle) when calling this function. Also beef up the checks in the two callers of this function to bail if the last return code is not ARCHIVE_EOF, which is the expected value. This requires a change to one of the pactest return codes and the overall result of the test, but results in a much safer operating condition whereby invalid database entries will stop the operation. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e68f5d9a30671419c853b255b32b2e9d0239c9f1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 13:18:36 2011 -0500 Remove global handle dependencies from sync/upgrade paths This kills a lot more global handle business off. sync.c still requires the handle declaration for one reference that can't be changed yet; it will be removed in a future patch which isolates all of the necesary API changes. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d2f05f72f02e15164f2d83347317f15c7e8c4fb9 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:53:53 2011 -0500 Remove global handle from remove.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 307a6de17a3bca9f8666b33aa3fb9a8dd88c300b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:44:01 2011 -0500 Remove global handle from some package and db code Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4015b23e8ef1e5a0e8d103ffefca0ffc4ad9e6c0 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:36:13 2011 -0500 Remove global handle from diskspace.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7fc635fee071e18d0422a4773937e66960be96b2 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:33:18 2011 -0500 Remove global handle from util.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit de36c5fac4ab50259418c3850b6fb25b96b702f3 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:23:32 2011 -0500 Push down extern handle variable to files that need it This will make the patching process less invasive as we start to remove this variable from all source files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7f98460e37bc032b58ca7c82e70c357aa39370f8 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:13:22 2011 -0500 Add handle attribute to pmpkg_t struct Similar to what we just did for the database; this will make it easy to always know what handle a given package originated from. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c47d25d74be9ce1fbbfb8577687d9f37ba38d98b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 12:06:25 2011 -0500 Add handle attribute to pmdb_t struct This is the first step in a long process to remove our dependence on the global handle variable we currently share in libalpm, with the goal to make things a bit more thread-safe and re-entrant. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2102d1a2eb6cb9db674fd76aa7aa3192befad733 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 11:54:58 2011 -0500 Remove unnecessary handle != NULL asserts These are simple accessor functions for a struct; the handle never even comes into play when calling these functions. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 78cbc045c129ca7767b13127e1e17c400b112770 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jun 3 11:48:24 2011 -0500 Remove ALPM_LOG_FUNC macro The usefulness of this is rather limited due to it not being compiled into production builds. When you do choose to see the output, it is often overwhelming and not helpful. The best bet is to use a debugger and/or well-placed fprintf() statements. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 68 ++++++-------- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 76 +++++++++++----- lib/libalpm/alpm.h | 37 +++----- lib/libalpm/backup.c | 2 - lib/libalpm/be_local.c | 39 +------- lib/libalpm/be_package.c | 23 +++-- lib/libalpm/be_sync.c | 38 +++++--- lib/libalpm/conflict.c | 44 ++-------- lib/libalpm/conflict.h | 4 +- lib/libalpm/db.c | 84 ++--------------- lib/libalpm/db.h | 9 +- lib/libalpm/delta.c | 2 - lib/libalpm/deps.c | 28 +----- lib/libalpm/diskspace.c | 19 ++-- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 5 +- lib/libalpm/error.c | 3 + lib/libalpm/group.c | 8 -- lib/libalpm/handle.c | 152 +++++++++++-------------------- lib/libalpm/handle.h | 13 +-- lib/libalpm/log.c | 5 +- lib/libalpm/log.h | 7 -- lib/libalpm/package.c | 27 +---- lib/libalpm/package.h | 3 +- lib/libalpm/pkghash.c | 2 - lib/libalpm/remove.c | 72 ++++++--------- lib/libalpm/remove.h | 7 +- lib/libalpm/signing.c | 7 -- lib/libalpm/sync.c | 51 +++++------ lib/libalpm/sync.h | 4 +- lib/libalpm/trans.c | 40 +++------ lib/libalpm/trans.h | 5 +- lib/libalpm/util.c | 43 ++++----- lib/libalpm/util.h | 5 +- po/fr.po | 149 +++++++++++++++--------------- po/zh_CN.po | 13 ++- scripts/makepkg.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- src/pacman/conf.c | 205 +++++++++++++++++++++++------------------ src/pacman/conf.h | 16 +++- src/pacman/pacman.c | 52 +++-------- src/util/cleanupdelta.c | 14 ++- src/util/pactree.c | 21 +--- src/util/testdb.c | 17 ++-- src/util/testpkg.c | 11 ++- test/pacman/pactest.py | 1 + test/pacman/tests/smoke002.py | 12 +-- 48 files changed, 603 insertions(+), 848 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/6] Use standard errno codes in return from _alpm_archive_fgets
by Dan McGee 07 Jun '11

07 Jun '11

This allows us to not require the context (e.g. handle) when calling this function. Also beef up the checks in the two callers of this function to bail if the last return code is not ARCHIVE_EOF, which is the expected value. This requires a change to one of the pactest return codes and the overall result of the test, but results in a much safer operating condition whereby invalid database entries will stop the operation. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_package.c | 10 +++++++--- lib/libalpm/be_sync.c | 22 ++++++++++++++++++---- lib/libalpm/util.c | 7 +++---- test/pacman/pactest.py | 1 + test/pacman/tests/smoke002.py | 12 +++++------- 5 files changed, 34 insertions(+), 18 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index c70d1e9..c89365a 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -137,13 +137,13 @@ static struct pkg_operations *get_file_pkg_ops(void) * @param archive the archive to read from, pointed at the .PKGINFO entry * @param newpkg an empty pmpkg_t struct to fill with package info * - * @return 0 on success, 1 on error + * @return 0 on success, -1 on error */ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) { char *ptr = NULL; char *key = NULL; - int linenum = 0; + int ret, linenum = 0; struct archive_read_buffer buf; memset(&buf, 0, sizeof(buf)); @@ -151,7 +151,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) buf.max_line_size = 512 * 1024; /* loop until we reach EOF or other error */ - while(_alpm_archive_fgets(a, &buf) == ARCHIVE_OK) { + while((ret = _alpm_archive_fgets(a, &buf)) == ARCHIVE_OK) { char *line = _alpm_strtrim(buf.line); linenum++; @@ -215,6 +215,10 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) } line[0] = '\0'; } + if(ret != ARCHIVE_EOF) { + _alpm_log(PM_LOG_DEBUG, "error parsing package descfile\n"); + return -1; + } return 0; } diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 953e4dc..aeba86f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -294,6 +294,7 @@ static int sync_db_populate(pmdb_t *db) _alpm_log(PM_LOG_ERROR, _("invalid name for database entry '%s'\n"), name); _alpm_pkg_free(pkg); + pkg = NULL; continue; } @@ -301,6 +302,7 @@ static int sync_db_populate(pmdb_t *db) if(_alpm_pkghash_find(db->pkgcache, pkg->name)) { _alpm_log(PM_LOG_ERROR, _("duplicated database entry '%s'\n"), pkg->name); _alpm_pkg_free(pkg); + pkg = NULL; continue; } @@ -316,7 +318,14 @@ static int sync_db_populate(pmdb_t *db) count++; } else { /* we have desc, depends or deltas - parse it */ - sync_db_read(db, archive, entry, pkg); + if(sync_db_read(db, archive, entry, pkg) != 0) { + _alpm_log(PM_LOG_ERROR, + _("could not parse package '%s' description file from db '%s'\n"), + pkg->name, db->treename); + _alpm_pkg_free(pkg); + pkg = NULL; + continue; + } } } @@ -401,7 +410,8 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0 || strcmp(filename, "deltas") == 0) { - while(_alpm_archive_fgets(archive, &buf) == ARCHIVE_OK) { + int ret; + while((ret = _alpm_archive_fgets(archive, &buf)) == ARCHIVE_OK) { char *line = _alpm_strtrim(buf.line); if(strcmp(line, "%NAME%") == 0) { @@ -478,6 +488,9 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, } } } + if(ret != ARCHIVE_EOF) { + goto error; + } } else if(strcmp(filename, "files") == 0) { /* currently do nothing with this file */ } else { @@ -485,10 +498,11 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, _alpm_log(PM_LOG_DEBUG, "unknown database file: %s\n", filename); } + return 0; + error: FREE(pkgname); - /* TODO: return 0 always? */ - return 0; + return -1; } static int sync_db_version(pmdb_t UNUSED *db) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index e25e19d..5821bf9 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -771,20 +771,19 @@ int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b) /* allocate our buffer, or ensure our existing one is big enough */ if(!b->line) { /* set the initial buffer to the read block_size */ - CALLOC(b->line, b->block_size + 1, sizeof(char), - RET_ERR(PM_ERR_MEMORY, -1)); + CALLOC(b->line, b->block_size + 1, sizeof(char), return ENOMEM); b->line_size = b->block_size + 1; b->line_offset = b->line; } else { size_t needed = (size_t)((b->line_offset - b->line) + (i - b->block_offset) + 1); if(needed > b->max_line_size) { - RET_ERR(PM_ERR_MEMORY, -1); + return ERANGE; } if(needed > b->line_size) { /* need to realloc + copy data to fit total length */ char *new; - CALLOC(new, needed, sizeof(char), RET_ERR(PM_ERR_MEMORY, -1)); + CALLOC(new, needed, sizeof(char), return ENOMEM); memcpy(new, b->line, b->line_size); b->line_size = needed; b->line_offset = new + (b->line_offset - b->line); diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index 64d5651..77f87da 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -114,6 +114,7 @@ def createOptParser(): env.results() if env.failed > 0: + print "pacman testing root saved: %s" % root_path sys.exit(1) if not opts.keeproot: diff --git a/test/pacman/tests/smoke002.py b/test/pacman/tests/smoke002.py index 44f2d0e..8ff5cab 100644 --- a/test/pacman/tests/smoke002.py +++ b/test/pacman/tests/smoke002.py @@ -10,10 +10,8 @@ self.args = "-U %s %s" % (p1.filename(), p2.filename()) -# Note that the current cutoff on line length is 512K, so the first package -# will succeed while the second one will fail to record the description. -self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("PKG_DESC=pkg1|%s" % p1.desc) -self.addrule("PKG_EXIST=pkg1") -self.addrule("!PKG_DESC=pkg1|%s" % p2.desc) +# We error out when fed a package with an invalid description; the second one +# fits the bill in this case as the desc is > 512K +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg1") -- 1.7.5.2

3 9

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.5.3, created. v3.5.3
by dan＠archlinux.org 07 Jun '11

07 Jun '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 annotated tag, v3.5.3 has been created at 44c1b8973978438580025804cdc07c474c88c251 (tag) tagging e62566a7635449e3e35d757c4b3bb768479689ab (commit) replaces v3.5.2 tagged by Dan McGee on Tue Jun 7 11:04:23 2011 -0500 - Log ----------------------------------------------------------------- 3.5.3 maint release -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk3uTA8ACgkQXC5GoPU6du09cgCfXKr+vXIk760ODTuWZVCHEfDT WjYAn1OphHM5eUIFikysETqcn+KmvmVN =1uZ4 -----END PGP SIGNATURE----- Allan McRae (4): Update PKGBUILD example makepkg: quote variable that may contain spaces makepkg: fix creation of source package with -p Remove incorrect output when downloading only Dan McGee (17): Small translation update from Transifex Transifex updates Ensure populate error return codes are consistent Transifex updates pactest: treat symlinks with more respect Add test for FS#24230, dead backup symlink removal Fix segfault when uninstalling broken backed-up symlink Ensure --print doesn't enable --noconfirm when not expected Coding style cleanups; add a null check Bail early if we don't have a valid lockfile path doc: add a few more escapes and fix usage of {} doc: update Makefile for new asciidoc resource location doc: fix attribute substitution in monospaced text Ensure list_display works on outputs of unknown width repo-add: anchor exclusion pattern when generating filelist 3.5.3 release preparation Transifex updates Dave Reisner (1): trans.c: create transaction prior to checking DB version Matt Mooney (2): pacman(8): change "options" to "operation" when referring to -D pacman(8): grammar correction for relative clauses Pang Yan Han (1): alpm_list: fix typo in doxygen comment Xavier Chantry (1): doc/pacman: split -Su description in 3 paragraphs ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.2-26-ge62566a
by dan＠archlinux.org 07 Jun '11

07 Jun '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 e62566a7635449e3e35d757c4b3bb768479689ab (commit) via 67c33fb8fff4db008e3afde8b6dd228f181755ed (commit) via 3df88a1a01926587b0b68dcff97d539746e3a8f9 (commit) from 1744fe12d4b29eff681995441c9565403348aaa2 (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 e62566a7635449e3e35d757c4b3bb768479689ab Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jun 7 10:52:57 2011 -0500 Transifex updates Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 67c33fb8fff4db008e3afde8b6dd228f181755ed Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jun 6 22:39:17 2011 +1000 Remove incorrect output when downloading only When only downloading a package, pacman can produce some incorrect output. > pacman -Sddw nvidia-utils warning: nvidia-utils-270.41.19-1 is up to date -- reinstalling This line is now now silenced when using -Sw. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3df88a1a01926587b0b68dcff97d539746e3a8f9 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jun 4 17:15:09 2011 +1000 makepkg: fix creation of source package with -p When creating a source package using an non-local buildscript via the -p option, the inclusion of changelog and install files would fail. Fixes FS#24567. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 2 +- po/fr.po | 149 +++++++++++++++++++++++++------------------------ po/zh_CN.po | 13 +++-- scripts/makepkg.sh.in | 2 +- 4 files changed, 85 insertions(+), 81 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove incorrect output when downloading only
by Allan McRae 07 Jun '11

07 Jun '11

When only downloading a package, pacman can produce some incorrect output. This is compounded when the package is in IgnorePkg. e.g. > pacman -Sddw nvidia-utils :: nvidia-utils is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] y warning: nvidia-utils-270.41.19-1 is up to date -- reinstalling These two lines are now silenced when using -Sw. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 6 ++++-- lib/libalpm/deps.c | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ee56e87..ceafb3e 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -87,8 +87,10 @@ int SYMEXPORT alpm_add_pkg(pmpkg_t *pkg) localpkgname, localpkgver); return 0; } else { - _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"), - localpkgname, localpkgver); + if(!(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY)) { + _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"), + localpkgname, localpkgver); + } } } else if(cmp < 0) { /* local version is newer */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index c5fb92e..b03cd48 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -570,8 +570,12 @@ static pmpkg_t *resolvedep(pmdepend_t *dep, alpm_list_t *dbs, if(_alpm_pkg_should_ignore(pkg)) { int install = 0; if(prompt) { - QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, - NULL, NULL, &install); + if(handle->trans->flags & PM_TRANS_FLAG_DOWNLOADONLY) { + install = 1; + } else { + QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, + NULL, NULL, &install); + } } else { _alpm_log(PM_LOG_WARNING, _("ignoring package %s-%s\n"), pkg->name, pkg->version); } @@ -592,8 +596,13 @@ static pmpkg_t *resolvedep(pmdepend_t *dep, alpm_list_t *dbs, if(_alpm_pkg_should_ignore(pkg)) { int install = 0; if(prompt) { - QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, - pkg, NULL, NULL, &install); + + if(handle->trans->flags & PM_TRANS_FLAG_DOWNLOADONLY) { + install = 1; + } else { + QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, + NULL, NULL, &install); + } } else { _alpm_log(PM_LOG_WARNING, _("ignoring package %s-%s\n"), pkg->name, pkg->version); } -- 1.7.5.4

4 3

[pacman-dev] [PATCH] makepkg: fix creation of source package with -p
by Allan McRae 04 Jun '11

04 Jun '11

When creating a source package using an non-local buildscript via the -p option, the inclusion of changelog and install files would fail. Fixes FS#24567. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b0d0c23..b3081fc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1169,7 +1169,7 @@ create_srcpackage() { local i for i in 'changelog' 'install'; do - local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") + local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE") local file for file in $filelist; do # evaluate any bash variables used -- 1.7.5.4

1 0

[pacman-dev] Does anyone use ALPM_LOG_FUNC?
by Dan McGee 03 Jun '11

03 Jun '11

It isn't even enabled in non-debug builds, so this seems like a not-so-useful feature as a debugger and/or a few printf() calls will help you do anything this can, and will be a lot less crazy. If there are no objections I'd like to kill it. The motivation for this change will be shared soon as well. -Dan

4 3

[pacman-dev] [PATCH 01/10] Remove ALPM_LOG_FUNC macro
by Dan McGee 03 Jun '11

03 Jun '11

The usefulness of this is rather limited due to it not being compiled into production builds. When you do choose to see the output, it is often overwhelming and not helpful. The best bet is to use a debugger and/or well-placed fprintf() statements. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 6 ---- lib/libalpm/alpm.c | 2 - lib/libalpm/backup.c | 2 - lib/libalpm/be_local.c | 19 -------------- lib/libalpm/be_package.c | 8 ------ lib/libalpm/be_sync.c | 7 ----- lib/libalpm/conflict.c | 24 ------------------ lib/libalpm/db.c | 60 ---------------------------------------------- lib/libalpm/delta.c | 2 - lib/libalpm/deps.c | 24 ------------------ lib/libalpm/dload.c | 2 - lib/libalpm/group.c | 8 ------ lib/libalpm/handle.c | 12 --------- lib/libalpm/log.c | 2 - lib/libalpm/log.h | 7 ----- lib/libalpm/package.c | 16 ------------ lib/libalpm/pkghash.c | 2 - lib/libalpm/remove.c | 14 ---------- lib/libalpm/signing.c | 7 ----- lib/libalpm/sync.c | 6 ---- lib/libalpm/trans.c | 16 ------------ lib/libalpm/util.c | 6 ---- 22 files changed, 0 insertions(+), 252 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ee56e87..e9dc7dc 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -55,8 +55,6 @@ int SYMEXPORT alpm_add_pkg(pmpkg_t *pkg) pmdb_t *db_local; pmpkg_t *local; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); @@ -474,8 +472,6 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current, int is_upgrade = 0; pmpkg_t *oldpkg = NULL; - ALPM_LOG_FUNC; - ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", @@ -708,8 +704,6 @@ int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db) int skip_ldconfig = 0, ret = 0; alpm_list_t *targ; - ALPM_LOG_FUNC; - ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index bafd922..a13d653 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -79,8 +79,6 @@ int SYMEXPORT alpm_release(void) { pmdb_t *db; - ALPM_LOG_FUNC; - ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); /* close local database */ diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index 7df9747..6431b28 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -83,8 +83,6 @@ char *_alpm_needbackup(const char *file, const alpm_list_t *backup) { const alpm_list_t *lp; - ALPM_LOG_FUNC; - if(file == NULL || backup == NULL) { return NULL; } diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 3610545..fc138e3 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -44,7 +44,6 @@ #define LAZY_LOAD(info, errret) \ do { \ - ALPM_LOG_FUNC; \ ASSERT(handle != NULL, return (errret)); \ if(pkg->origin != PKG_FROM_FILE && !(pkg->infolevel & info)) { \ _alpm_local_db_read(pkg->origin_data.db, pkg, info); \ @@ -138,8 +137,6 @@ static alpm_list_t *_cache_get_groups(pmpkg_t *pkg) static int _cache_has_scriptlet(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return -1); @@ -187,8 +184,6 @@ static alpm_list_t *_cache_get_deltas(pmpkg_t UNUSED *pkg) static alpm_list_t *_cache_get_files(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); @@ -201,8 +196,6 @@ static alpm_list_t *_cache_get_files(pmpkg_t *pkg) static alpm_list_t *_cache_get_backup(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); @@ -221,8 +214,6 @@ static alpm_list_t *_cache_get_backup(pmpkg_t *pkg) */ static void *_cache_changelog_open(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); @@ -346,8 +337,6 @@ static int local_db_populate(pmdb_t *db) const char *dbpath; DIR *dbdir; - ALPM_LOG_FUNC; - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); dbpath = _alpm_db_path(db); @@ -473,8 +462,6 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) char line[1024]; char *pkgpath = NULL; - ALPM_LOG_FUNC; - if(db == NULL) { RET_ERR(PM_ERR_DB_NULL, -1); } @@ -721,8 +708,6 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) int retval = 0; char *pkgpath = NULL; - ALPM_LOG_FUNC; - if(db == NULL || info == NULL) { return -1; } @@ -884,8 +869,6 @@ int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info) int ret = 0; char *pkgpath = NULL; - ALPM_LOG_FUNC; - if(db == NULL || info == NULL) { RET_ERR(PM_ERR_DB_NULL, -1); } @@ -962,8 +945,6 @@ pmdb_t *_alpm_db_register_local(void) { pmdb_t *db; - ALPM_LOG_FUNC; - _alpm_log(PM_LOG_DEBUG, "registering local database\n"); db = _alpm_db_new("local", 1); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 9e59d69..8da317f 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -43,8 +43,6 @@ */ static void *_package_changelog_open(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - ASSERT(pkg != NULL, return NULL); struct archive *archive = NULL; @@ -144,8 +142,6 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg) int linenum = 0; struct archive_read_buffer buf; - ALPM_LOG_FUNC; - memset(&buf, 0, sizeof(buf)); /* 512K for a line length seems reasonable */ buf.max_line_size = 512 * 1024; @@ -236,8 +232,6 @@ pmpkg_t *_alpm_pkg_load_internal(const char *pkgfile, int full, pmpkg_t *newpkg = NULL; struct stat st; - ALPM_LOG_FUNC; - if(pkgfile == NULL || strlen(pkgfile) == 0) { RET_ERR(PM_ERR_WRONG_ARGS, NULL); } @@ -383,8 +377,6 @@ error: int SYMEXPORT alpm_pkg_load(const char *filename, int full, pgp_verify_t check_sig, pmpkg_t **pkg) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 9d85a45..77c9207 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -87,8 +87,6 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) 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)); @@ -242,8 +240,6 @@ static int sync_db_populate(pmdb_t *db) struct archive_entry *entry; pmpkg_t *pkg = NULL; - ALPM_LOG_FUNC; - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); if((archive = archive_read_new()) == NULL) { @@ -360,8 +356,6 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, pmpkg_t *pkg; struct archive_read_buffer buf; - ALPM_LOG_FUNC; - if(db == NULL) { RET_ERR(PM_ERR_DB_NULL, -1); } @@ -512,7 +506,6 @@ pmdb_t *_alpm_db_register_sync(const char *treename) { pmdb_t *db; - ALPM_LOG_FUNC; _alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename); db = _alpm_db_new(treename, 0); diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index fbc988b..995c6cb 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -45,8 +45,6 @@ pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, { pmconflict_t *conflict; - ALPM_LOG_FUNC; - MALLOC(conflict, sizeof(pmconflict_t), RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(conflict->package1, package1, RET_ERR(PM_ERR_MEMORY, NULL)); @@ -82,8 +80,6 @@ static int conflict_isin(pmconflict_t *needle, alpm_list_t *haystack) const char *npkg1 = needle->package1; const char *npkg2 = needle->package2; - ALPM_LOG_FUNC; - for(i = haystack; i; i = i->next) { pmconflict_t *conflict = i->data; const char *cpkg1 = conflict->package1; @@ -168,8 +164,6 @@ alpm_list_t *_alpm_innerconflicts(alpm_list_t *packages) { alpm_list_t *baddeps = NULL; - ALPM_LOG_FUNC; - _alpm_log(PM_LOG_DEBUG, "check targets vs targets\n"); check_conflict(packages, packages, &baddeps, 0); @@ -184,8 +178,6 @@ alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages) { alpm_list_t *baddeps = NULL; - ALPM_LOG_FUNC; - if(db == NULL) { return NULL; } @@ -359,8 +351,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, size_t numtargs = alpm_list_count(upgrade); size_t current; - ALPM_LOG_FUNC; - if(db == NULL || upgrade == NULL || trans == NULL) { return NULL; } @@ -517,8 +507,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); @@ -528,8 +516,6 @@ const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict) const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); @@ -539,8 +525,6 @@ const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict) const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); @@ -550,8 +534,6 @@ const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict) const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); @@ -561,8 +543,6 @@ const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict) pmfileconflicttype_t SYMEXPORT alpm_fileconflict_get_type(pmfileconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return -1); ASSERT(conflict != NULL, return -1); @@ -572,8 +552,6 @@ pmfileconflicttype_t SYMEXPORT alpm_fileconflict_get_type(pmfileconflict_t *conf const char SYMEXPORT *alpm_fileconflict_get_file(pmfileconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); @@ -583,8 +561,6 @@ const char SYMEXPORT *alpm_fileconflict_get_file(pmfileconflict_t *conflict) const char SYMEXPORT *alpm_fileconflict_get_ctarget(pmfileconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 3133614..94173a2 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -47,8 +47,6 @@ /** Register a sync database of packages. */ pmdb_t SYMEXPORT *alpm_db_register_sync(const char *treename) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, NULL)); ASSERT(treename != NULL && strlen(treename) != 0, RET_ERR(PM_ERR_WRONG_ARGS, NULL)); @@ -75,8 +73,6 @@ int SYMEXPORT alpm_db_unregister_all(void) alpm_list_t *i; pmdb_t *db; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); /* Do not unregister a database if a transaction is on-going */ @@ -97,8 +93,6 @@ int SYMEXPORT alpm_db_unregister(pmdb_t *db) { int found = 0; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); @@ -132,8 +126,6 @@ int SYMEXPORT alpm_db_unregister(pmdb_t *db) /** Get the serverlist of a database. */ alpm_list_t SYMEXPORT *alpm_db_get_servers(const pmdb_t *db) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL)); @@ -143,8 +135,6 @@ alpm_list_t SYMEXPORT *alpm_db_get_servers(const pmdb_t *db) /** Set the serverlist of a database. */ int SYMEXPORT alpm_db_set_servers(pmdb_t *db, alpm_list_t *servers) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); @@ -175,8 +165,6 @@ int SYMEXPORT alpm_db_add_server(pmdb_t *db, const char *url) { char *newurl; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(url != NULL && strlen(url) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1)); @@ -202,8 +190,6 @@ int SYMEXPORT alpm_db_remove_server(pmdb_t *db, const char *url) { char *newurl, *vdata = NULL; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(url != NULL && strlen(url) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1)); @@ -230,8 +216,6 @@ int SYMEXPORT alpm_db_remove_server(pmdb_t *db, const char *url) */ int SYMEXPORT alpm_db_set_pgp_verify(pmdb_t *db, pgp_verify_t verify) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); @@ -245,8 +229,6 @@ int SYMEXPORT alpm_db_set_pgp_verify(pmdb_t *db, pgp_verify_t verify) /** Get the name of a package database. */ const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); @@ -259,8 +241,6 @@ const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db) { char *url; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); @@ -275,8 +255,6 @@ const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db) /** Get a package entry from a package database. */ pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); @@ -288,8 +266,6 @@ pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name) /** Get the package cache of a package database. */ alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); @@ -300,8 +276,6 @@ alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db) /** Get a group entry from a package database. */ pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); @@ -313,8 +287,6 @@ pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name) /** Get the group cache of a package database. */ alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); @@ -325,8 +297,6 @@ alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db) /** Searches a database. */ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); @@ -337,8 +307,6 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles) /** Set install reason for a package in db. */ int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(db != NULL && name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); @@ -369,8 +337,6 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local) { pmdb_t *db; - ALPM_LOG_FUNC; - 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; @@ -380,8 +346,6 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local) void _alpm_db_free(pmdb_t *db) { - ALPM_LOG_FUNC; - /* cleanup pkgcache */ _alpm_db_free_pkgcache(db); /* cleanup server list */ @@ -446,8 +410,6 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles) /* copy the pkgcache- we will free the list var after each needle */ alpm_list_t *list = alpm_list_copy(_alpm_db_get_pkgcache(db)); - ALPM_LOG_FUNC; - for(i = needles; i; i = i->next) { char *targ; regex_t reg; @@ -520,8 +482,6 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles) */ int _alpm_db_load_pkgcache(pmdb_t *db) { - ALPM_LOG_FUNC; - if(db == NULL) { return -1; } @@ -541,8 +501,6 @@ int _alpm_db_load_pkgcache(pmdb_t *db) void _alpm_db_free_pkgcache(pmdb_t *db) { - ALPM_LOG_FUNC; - if(db == NULL || !db->pkgcache_loaded) { return; } @@ -560,8 +518,6 @@ void _alpm_db_free_pkgcache(pmdb_t *db) pmpkghash_t *_alpm_db_get_pkgcache_hash(pmdb_t *db) { - ALPM_LOG_FUNC; - if(db == NULL) { return NULL; } @@ -580,8 +536,6 @@ pmpkghash_t *_alpm_db_get_pkgcache_hash(pmdb_t *db) alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db) { - ALPM_LOG_FUNC; - pmpkghash_t *hash = _alpm_db_get_pkgcache_hash(db); if(hash == NULL) { @@ -596,8 +550,6 @@ int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg) { pmpkg_t *newpkg; - ALPM_LOG_FUNC; - if(db == NULL || !db->pkgcache_loaded || pkg == NULL) { return -1; } @@ -620,8 +572,6 @@ int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg) { pmpkg_t *data = NULL; - ALPM_LOG_FUNC; - if(db == NULL || !db->pkgcache_loaded || pkg == NULL) { return -1; } @@ -646,8 +596,6 @@ int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg) pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target) { - ALPM_LOG_FUNC; - if(db == NULL) { return NULL; } @@ -668,8 +616,6 @@ int _alpm_db_load_grpcache(pmdb_t *db) { alpm_list_t *lp; - ALPM_LOG_FUNC; - if(db == NULL) { return -1; } @@ -716,8 +662,6 @@ void _alpm_db_free_grpcache(pmdb_t *db) { alpm_list_t *lg; - ALPM_LOG_FUNC; - if(db == NULL || !db->grpcache_loaded) { return; } @@ -735,8 +679,6 @@ void _alpm_db_free_grpcache(pmdb_t *db) alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db) { - ALPM_LOG_FUNC; - if(db == NULL) { return NULL; } @@ -752,8 +694,6 @@ pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, const char *target) { alpm_list_t *i; - ALPM_LOG_FUNC; - if(db == NULL || target == NULL || strlen(target) == 0) { return NULL; } diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index d3213fd..cd23487 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -225,8 +225,6 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas, alpm_list_t *vertices; off_t bestsize = LONG_MAX; - ALPM_LOG_FUNC; - if(deltas == NULL) { *path = NULL; return bestsize; diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index c5fb92e..2d6b5b3 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -48,8 +48,6 @@ static pmdepmissing_t *depmiss_new(const char *target, pmdepend_t *dep, { pmdepmissing_t *miss; - ALPM_LOG_FUNC; - MALLOC(miss, sizeof(pmdepmissing_t), RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(miss->target, target, RET_ERR(PM_ERR_MEMORY, NULL)); @@ -134,8 +132,6 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse) alpm_list_t *vptr; pmgraph_t *vertex; - ALPM_LOG_FUNC; - if(targets == NULL) { return NULL; } @@ -271,8 +267,6 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps, alpm_list_t *baddeps = NULL; int nodepversion; - ALPM_LOG_FUNC; - targets = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade)); for(i = pkglist; i; i = i->next) { pmpkg_t *pkg = i->data; @@ -521,8 +515,6 @@ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit) { alpm_list_t *i, *j; - ALPM_LOG_FUNC; - if(db == NULL || targs == NULL) { return; } @@ -696,8 +688,6 @@ int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pk alpm_list_t *deps = NULL; alpm_list_t *packages_copy; - ALPM_LOG_FUNC; - if(_alpm_pkg_find(*packages, pkg->name) != NULL) { return 0; } @@ -765,8 +755,6 @@ int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pk const char SYMEXPORT *alpm_miss_get_target(const pmdepmissing_t *miss) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(miss != NULL, return NULL); @@ -775,8 +763,6 @@ const char SYMEXPORT *alpm_miss_get_target(const pmdepmissing_t *miss) const char SYMEXPORT *alpm_miss_get_causingpkg(const pmdepmissing_t *miss) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(miss != NULL, return NULL); @@ -785,8 +771,6 @@ const char SYMEXPORT *alpm_miss_get_causingpkg(const pmdepmissing_t *miss) pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(miss != NULL, return NULL); @@ -795,8 +779,6 @@ pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) pmdepmod_t SYMEXPORT alpm_dep_get_mod(const pmdepend_t *dep) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(dep != NULL, return -1); @@ -805,8 +787,6 @@ pmdepmod_t SYMEXPORT alpm_dep_get_mod(const pmdepend_t *dep) const char SYMEXPORT *alpm_dep_get_name(const pmdepend_t *dep) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(dep != NULL, return NULL); @@ -815,8 +795,6 @@ const char SYMEXPORT *alpm_dep_get_name(const pmdepend_t *dep) const char SYMEXPORT *alpm_dep_get_version(const pmdepend_t *dep) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(dep != NULL, return NULL); @@ -834,8 +812,6 @@ char SYMEXPORT *alpm_dep_compute_string(const pmdepend_t *dep) char *str; size_t len; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(dep != NULL, return NULL); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 1825eed..9583b36 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -335,8 +335,6 @@ char SYMEXPORT *alpm_fetch_pkgurl(const char *url) const char *filename, *cachedir; int ret; - ALPM_LOG_FUNC; - filename = get_filename(url); /* find a valid cache dir to download to */ diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index dbcc755..383d016 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -34,8 +34,6 @@ pmgrp_t *_alpm_grp_new(const char *name) { pmgrp_t* grp; - ALPM_LOG_FUNC; - CALLOC(grp, 1, sizeof(pmgrp_t), RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(grp->name, name, RET_ERR(PM_ERR_MEMORY, NULL)); @@ -44,8 +42,6 @@ pmgrp_t *_alpm_grp_new(const char *name) void _alpm_grp_free(pmgrp_t *grp) { - ALPM_LOG_FUNC; - if(grp == NULL) { return; } @@ -58,8 +54,6 @@ void _alpm_grp_free(pmgrp_t *grp) const char SYMEXPORT *alpm_grp_get_name(const pmgrp_t *grp) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(grp != NULL, return NULL); @@ -68,8 +62,6 @@ const char SYMEXPORT *alpm_grp_get_name(const pmgrp_t *grp) alpm_list_t SYMEXPORT *alpm_grp_get_pkgs(const pmgrp_t *grp) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(grp != NULL, return NULL); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 39b3b60..e94528f 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -53,8 +53,6 @@ pmhandle_t *_alpm_handle_new() void _alpm_handle_free(pmhandle_t *handle) { - ALPM_LOG_FUNC; - if(handle == NULL) { return; } @@ -306,8 +304,6 @@ int SYMEXPORT alpm_option_set_root(const char *root) char *realroot; size_t rootlen; - ALPM_LOG_FUNC; - ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(!root) { @@ -348,8 +344,6 @@ int SYMEXPORT alpm_option_set_dbpath(const char *dbpath) size_t dbpathlen, lockfilelen; const char *lf = "db.lck"; - ALPM_LOG_FUNC; - ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(!dbpath) { pm_errno = PM_ERR_WRONG_ARGS; @@ -387,8 +381,6 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir) char *newcachedir; size_t cachedirlen; - ALPM_LOG_FUNC; - ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(!cachedir) { pm_errno = PM_ERR_WRONG_ARGS; @@ -445,8 +437,6 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) { char *oldlogfile = handle->logfile; - ALPM_LOG_FUNC; - ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); if(!logfile) { pm_errno = PM_ERR_WRONG_ARGS; @@ -470,8 +460,6 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile) int SYMEXPORT alpm_option_set_signaturedir(const char *signaturedir) { - ALPM_LOG_FUNC; - if(!signaturedir) { pm_errno = PM_ERR_WRONG_ARGS; return -1; diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 9093af7..f500754 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -44,8 +44,6 @@ int SYMEXPORT alpm_logaction(const char *fmt, ...) int ret; va_list args; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h index 9a2961f..1fd66a6 100644 --- a/lib/libalpm/log.h +++ b/lib/libalpm/log.h @@ -22,13 +22,6 @@ #include "alpm.h" -#ifdef PACMAN_DEBUG -/* Log funtion entry points if debugging is enabled */ -#define ALPM_LOG_FUNC _alpm_log(PM_LOG_FUNCTION, "Enter %s\n", __func__) -#else -#define ALPM_LOG_FUNC -#endif - void _alpm_log(pmloglevel_t flag, const char *fmt, ...) __attribute__((format(printf,2,3))); #endif /* _ALPM_LOG_H */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 990f532..205bc10 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -45,8 +45,6 @@ /** Free a package. */ int SYMEXPORT alpm_pkg_free(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); /* Only free packages loaded in user space */ @@ -63,8 +61,6 @@ int SYMEXPORT alpm_pkg_checkmd5sum(pmpkg_t *pkg) char *fpath; int retval; - ALPM_LOG_FUNC; - ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); /* We only inspect packages from sync repositories */ ASSERT(pkg->origin == PKG_FROM_SYNCDB, RET_ERR(PM_ERR_PKG_INVALID, -1)); @@ -370,8 +366,6 @@ pmpkg_t *_alpm_pkg_new(void) { pmpkg_t* pkg; - ALPM_LOG_FUNC; - CALLOC(pkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL)); return pkg; @@ -382,8 +376,6 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) pmpkg_t *newpkg; alpm_list_t *i; - ALPM_LOG_FUNC; - CALLOC(newpkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL)); newpkg->name_hash = pkg->name_hash; @@ -430,8 +422,6 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) void _alpm_pkg_free(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - if(pkg == NULL) { return; } @@ -473,8 +463,6 @@ void _alpm_pkg_free(pmpkg_t *pkg) */ void _alpm_pkg_free_trans(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - if(pkg == NULL) { return; } @@ -491,8 +479,6 @@ void _alpm_pkg_free_trans(pmpkg_t *pkg) /* Is spkg an upgrade for localpkg? */ int _alpm_pkg_compare_versions(pmpkg_t *spkg, pmpkg_t *localpkg) { - ALPM_LOG_FUNC; - return alpm_pkg_vercmp(alpm_pkg_get_version(spkg), alpm_pkg_get_version(localpkg)); } @@ -514,8 +500,6 @@ pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle) alpm_list_t *lp; unsigned long needle_hash; - ALPM_LOG_FUNC; - if(needle == NULL || haystack == NULL) { return NULL; } diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c index f415330..7e5e1fc 100644 --- a/lib/libalpm/pkghash.c +++ b/lib/libalpm/pkghash.c @@ -304,8 +304,6 @@ pmpkg_t *_alpm_pkghash_find(pmpkghash_t *hash, const char *name) unsigned long name_hash; size_t position; - ALPM_LOG_FUNC; - if(name == NULL || hash == NULL) { return NULL; } diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 2d840ce..48348fa 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -49,8 +49,6 @@ int SYMEXPORT alpm_remove_pkg(pmpkg_t *pkg) pmtrans_t *trans; const char *pkgname; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); @@ -74,8 +72,6 @@ int SYMEXPORT alpm_remove_pkg(pmpkg_t *pkg) static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db, alpm_list_t *lp) { - ALPM_LOG_FUNC; - while(lp) { alpm_list_t *i; for(i = lp; i; i = i->next) { @@ -101,8 +97,6 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db, static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, alpm_list_t *lp) { - ALPM_LOG_FUNC; - /* Remove needed packages (which break dependencies) from target list */ while(lp != NULL) { alpm_list_t *i; @@ -140,8 +134,6 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) { alpm_list_t *lp; - ALPM_LOG_FUNC; - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); @@ -227,8 +219,6 @@ static void unlink_file(pmpkg_t *info, char *filename, alpm_list_t *skip_remove, struct stat buf; char file[PATH_MAX+1]; - ALPM_LOG_FUNC; - snprintf(file, PATH_MAX, "%s%s", handle->root, filename); /* check the remove skip list before removing the file. @@ -297,8 +287,6 @@ int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, alpm_list_t *files = alpm_pkg_get_files(oldpkg); const char *pkgname = alpm_pkg_get_name(oldpkg); - ALPM_LOG_FUNC; - _alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n", oldpkg->name, oldpkg->version); @@ -367,8 +355,6 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db) alpm_list_t *targ, *lp; size_t pkg_count; - ALPM_LOG_FUNC; - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 9bb9d0a..f6a5a1a 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -111,8 +111,6 @@ static int gpgme_init(void) gpgme_error_t err; gpgme_engine_info_t enginfo; - ALPM_LOG_FUNC; - if(init) { /* we already successfully initialized the library */ return 0; @@ -213,8 +211,6 @@ int _alpm_gpgme_checksig(const char *path, const char *base64_sig) unsigned char *decoded_sigdata = NULL; FILE *file = NULL, *sigfile = NULL; - ALPM_LOG_FUNC; - if(!path || access(path, R_OK) != 0) { RET_ERR(PM_ERR_NOT_A_FILE, -1); } @@ -371,7 +367,6 @@ int _alpm_gpgme_checksig(const char *path, const char *base64_sig) */ pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db) { - ALPM_LOG_FUNC; ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, PM_PGP_VERIFY_UNKNOWN)); if(db->pgp_verify != PM_PGP_VERIFY_UNKNOWN) { @@ -388,7 +383,6 @@ pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db) */ int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg) { - ALPM_LOG_FUNC; ASSERT(pkg != NULL, return 0); return _alpm_gpgme_checksig(alpm_pkg_get_filename(pkg), pkg->base64_sig); @@ -401,7 +395,6 @@ int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg) */ int SYMEXPORT alpm_db_check_pgp_signature(pmdb_t *db) { - ALPM_LOG_FUNC; ASSERT(db != NULL, return 0); return _alpm_gpgme_checksig(_alpm_db_path(db), NULL); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8dd51aa..b84d625 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -89,8 +89,6 @@ int SYMEXPORT alpm_sync_sysupgrade(int enable_downgrade) pmdb_t *db_local; alpm_list_t *dbs_sync; - ALPM_LOG_FUNC; - ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); trans = handle->trans; db_local = handle->db_local; @@ -307,8 +305,6 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync alpm_list_t *remove = NULL; int ret = 0; - ALPM_LOG_FUNC; - ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); @@ -840,8 +836,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) size_t numtargs, current = 0, replaces = 0; int errors; - ALPM_LOG_FUNC; - ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); if(download_files(trans, &deltas)) { diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 5ffb5df..31c5885 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -104,8 +104,6 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags, const int required_db_version = 2; int db_version; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1)); @@ -173,8 +171,6 @@ int SYMEXPORT alpm_trans_prepare(alpm_list_t **data) { pmtrans_t *trans; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); @@ -219,8 +215,6 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data) { pmtrans_t *trans; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); @@ -260,8 +254,6 @@ int SYMEXPORT alpm_trans_interrupt(void) { pmtrans_t *trans; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); @@ -280,8 +272,6 @@ int SYMEXPORT alpm_trans_release(void) { pmtrans_t *trans; - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); @@ -313,8 +303,6 @@ pmtrans_t *_alpm_trans_new(void) { pmtrans_t *trans; - ALPM_LOG_FUNC; - CALLOC(trans, 1, sizeof(pmtrans_t), RET_ERR(PM_ERR_MEMORY, NULL)); trans->state = STATE_IDLE; @@ -323,8 +311,6 @@ pmtrans_t *_alpm_trans_new(void) void _alpm_trans_free(pmtrans_t *trans) { - ALPM_LOG_FUNC; - if(trans == NULL) { return; } @@ -377,8 +363,6 @@ int _alpm_runscriptlet(const char *root, const char *installfn, int clean_tmpdir = 0; int retval = 0; - ALPM_LOG_FUNC; - if(access(installfn, R_OK)) { /* not found */ _alpm_log(PM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 99dd3be..1918631 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -252,8 +252,6 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int char cwd[PATH_MAX]; int restore_cwd = 0; - ALPM_LOG_FUNC; - if((_archive = archive_read_new()) == NULL) RET_ERR(PM_ERR_LIBARCHIVE, 1); @@ -425,8 +423,6 @@ int _alpm_run_chroot(const char *root, const char *path, char *const argv[]) int restore_cwd = 0; int retval = 0; - ALPM_LOG_FUNC; - /* save the cwd so we can restore it later */ if(getcwd(cwd, PATH_MAX) == NULL) { _alpm_log(PM_LOG_ERROR, _("could not get current working directory\n")); @@ -690,8 +686,6 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) char *md5sum; int ret, i; - ALPM_LOG_FUNC; - ASSERT(filename != NULL, return NULL); /* allocate 32 chars plus 1 for null */ -- 1.7.5.2

3 11

[pacman-dev] [translation] Pacman 3.5.3 release soon
by Dan McGee 03 Jun '11

03 Jun '11

If you are interested in updating any translations before I release this maint version early next week, please do so: https://www.transifex.net/projects/p/archlinux-pacman/r/3-5-3/ Thanks! -Dan

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-203-g9d73b26
by dan＠archlinux.org 02 Jun '11

02 Jun '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 9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9 (commit) via 8f30e1b110e5c7bf2ec3eb397fe6880a2c8ee0a9 (commit) via 142c2132cf3312c1ad38d87e323277664985701c (commit) via 1744fe12d4b29eff681995441c9565403348aaa2 (commit) via d63599719af6db4fa3e41b4129b4a5b1fef41cf8 (commit) via c1f742d7750a14b680d2ceb2c75d952ccb53585d (commit) from 0d1fcd329fac091568ad7ad3978771a534e7e09e (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 9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9 Merge: 8f30e1b 1744fe1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 2 17:33:56 2011 -0500 Merge branch 'maint' Conflicts: src/pacman/callback.c commit 8f30e1b110e5c7bf2ec3eb397fe6880a2c8ee0a9 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 17:11:45 2011 -0500 Show net upgrade size on -U/-S operations If it is different than the raw installed size metric we already show, compute the net upgrade size. For some sync operations, this can even be negative if newer packages are smaller than the ones they replace locally. Implements FS#12566. Example: Targets (1): telepathy-glib-0.14.7-1 Total Download Size: 1.07 MiB Total Installed Size: 15.72 MiB Net Upgrade Size: -0.29 MiB Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 142c2132cf3312c1ad38d87e323277664985701c Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 2 17:20:45 2011 -0500 Add two currently failing test cases from bug reports Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 7 +++++++ configure.ac | 4 ++-- scripts/repo-add.sh.in | 2 +- src/pacman/callback.c | 18 +++++++++++------- src/pacman/remove.c | 2 +- src/pacman/util.c | 35 ++++++++++++++++++++++------------- src/pacman/util.h | 2 +- test/pacman/tests/replace101.py | 25 +++++++++++++++++++++++++ test/pacman/tests/replace102.py | 27 +++++++++++++++++++++++++++ 9 files changed, 97 insertions(+), 25 deletions(-) create mode 100644 test/pacman/tests/replace101.py create mode 100644 test/pacman/tests/replace102.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.2-23-g1744fe1
by dan＠archlinux.org 02 Jun '11

02 Jun '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 1744fe12d4b29eff681995441c9565403348aaa2 (commit) via d63599719af6db4fa3e41b4129b4a5b1fef41cf8 (commit) via c1f742d7750a14b680d2ceb2c75d952ccb53585d (commit) from aad57cc06ac60dc8fdcff9bea811e990d64f74d3 (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 1744fe12d4b29eff681995441c9565403348aaa2 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 2 16:33:43 2011 -0500 3.5.3 release preparation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d63599719af6db4fa3e41b4129b4a5b1fef41cf8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 2 07:59:45 2011 -0500 repo-add: anchor exclusion pattern when generating filelist Fixes FS#24534. Dotfiles, such as /etc/skel/.bash_profile, were not being included in generated files entries. bsdtar --exclude option supports anchors on the pattern, so using "^.*" instead of ".*" solves our problem and still excludes all root-level dotfiles (e.g. .PKGINFO). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c1f742d7750a14b680d2ceb2c75d952ccb53585d Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 13:28:00 2011 -0500 Ensure list_display works on outputs of unknown width If getcols() returns 0, we were getting stuck before in a loop of no return. Teach getcols() to take a default value to return if the width is unknown, and use this everywhere as appropriate. Also make a few other cleanups while diagnosing this issue, such as const-ifying some variables. Noticed-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 7 +++++++ configure.ac | 4 ++-- scripts/repo-add.sh.in | 2 +- src/pacman/callback.c | 18 +++++++++++------- src/pacman/util.c | 20 +++++++++----------- src/pacman/util.h | 2 +- 6 files changed, 31 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] 3.5.3 release early next week
by Dan McGee 02 Jun '11

02 Jun '11

I'm thinking about rolling a 3.5.3 maint release next week; if you have anything pending that should be in there that is not pushed to projects.archlinux.org, please let me know. https://bugs.archlinux.org/index.php?do=index&tasks=&project=3&due=95&statu… -Dan

1 0

[pacman-dev] [PATCH] repo-add: anchor exclusion pattern when generating filelist
by Dan McGee 02 Jun '11

02 Jun '11

Fixes FS#24534 where dotfiles, such as /etc/skel/.bash_profile, were not being included in generated files entries. bsdtar --exclude option supports anchors on the pattern, so using "^.*" instead of ".*" solves our problem and still excludes all root-level dotfiles (e.g. .PKGINFO). Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index dfc9397..02ab389 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -292,7 +292,7 @@ db_write_entry() msg2 "$(gettext "Creating '%s' db entry...")" 'files' local files_path="$tmpdir/$pkgname-$pkgver/files" echo "%FILES%" >$files_path - bsdtar --exclude='.*' -tf "$pkgfile" >>$files_path + bsdtar --exclude='^.*' -tf "$pkgfile" >>$files_path fi # create a delta file -- 1.7.5.2

1 0

[pacman-dev] [PATCH 0/2] --verify option for sig levels
by Pang Yan Han 02 Jun '11

02 Jun '11

This is a 2nd reroll of a series to introduce the --verify option for the user to change pacman's default signature verification level on the command line. Patch 1/2 changes option_verifysig to accept non-capitalized versions of "Always", "Optional" and "Never". Patch 2/2 introduces the --verify option itself Pang Yan Han (2): option_verifysig: Accept non-caps sig levels Add --verify option for signature level doc/pacman.8.txt | 5 +++++ src/pacman/conf.c | 20 +++++++++++++++++--- src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 5 +++++ 4 files changed, 30 insertions(+), 4 deletions(-) -- 1.7.5.rc0.101.g3d23c

2 3

[pacman-dev] [PATCH] Show net upgrade size on -U/-S operations
by Dan McGee 01 Jun '11

01 Jun '11

If it is different than the raw installed size metric we already show, compute the net upgrade size. For some sync operations, this can even be negative if newer packages are smaller than the ones they replace locally. Implements FS#12566. Example: Targets (1): telepathy-glib-0.14.7-1 Total Download Size: 1.07 MiB Total Installed Size: 15.72 MiB Net Upgrade Size: -0.29 MiB Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/remove.c | 2 +- src/pacman/util.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 58e6edd..094a43b 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -31,7 +31,7 @@ #include "util.h" #include "conf.h" -static int remove_target(char *target) +static int remove_target(const char *target) { pmpkg_t *info; pmdb_t *db_local = alpm_option_get_localdb(); diff --git a/src/pacman/util.c b/src/pacman/util.c index 8631075..bfc707c 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -688,8 +688,9 @@ void display_targets(const alpm_list_t *pkgs, int install) const char *title, *label; double size; const alpm_list_t *i; - off_t isize = 0, dlsize = 0; + off_t isize = 0, rsize = 0, dlsize = 0; alpm_list_t *j, *lp, *header = NULL, *targets = NULL; + pmdb_t *db_local = alpm_option_get_localdb(); if(!pkgs) { return; @@ -700,7 +701,12 @@ void display_targets(const alpm_list_t *pkgs, int install) pmpkg_t *pkg = alpm_list_getdata(i); if(install) { + pmpkg_t *lpkg = alpm_db_get_pkg(db_local, alpm_pkg_get_name(pkg)); dlsize += alpm_pkg_download_size(pkg); + if(lpkg) { + /* add up size of all removed packages */ + rsize += alpm_pkg_get_isize(lpkg); + } } isize += alpm_pkg_get_isize(pkg); @@ -736,6 +742,11 @@ void display_targets(const alpm_list_t *pkgs, int install) if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY)) { size = humanize_size(isize, 'M', 1, &label); printf(_("Total Installed Size: %.2f %s\n"), size, label); + /* only show this net value if different from raw installed size */ + if(rsize > 0) { + size = humanize_size(isize - rsize, 'M', 1, &label); + printf(_("Net Upgrade Size: %.2f %s\n"), size, label); + } } } else { size = humanize_size(isize, 'M', 1, &label); -- 1.7.5.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-197-g0d1fcd3
by dan＠archlinux.org 01 Jun '11

01 Jun '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 0d1fcd329fac091568ad7ad3978771a534e7e09e (commit) via 8807cac100acb2d368232833b2478e96a1806fa9 (commit) from 8f1c873b5f07f42a8bdc65bb03097790135a9c94 (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 0d1fcd329fac091568ad7ad3978771a534e7e09e Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jun 1 14:39:20 2011 -0400 lib/dload.c: remove assumption in continuation logic Callers to curl_download_internal now tell us if its okay to continue a transfer, so obey this instead of using a heuristic. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8807cac100acb2d368232833b2478e96a1806fa9 Author: Dave Reisner <d(a)falconindy.com> Date: Thu May 26 19:32:45 2011 -0400 dload: abort transfer on CURLOPT_LOW_SPEED_LIMIT If a connection drops below 1kb/s for 10s, curl will kill the transfer and we'll report failure. This is the average transfer speed over the delta defined by CURLOPT_LOW_SPEED_TIME, so setting a low value here shouldn't bother folks using 14.4k dial-up. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Finishing off the package signing issue -- Update
by Kerrick Staley 01 Jun '11

01 Jun '11

All, I examined the code in pacman's git master branch, and I found that it appears nearly finished. There are some issues, both blocking and non-blocking. Note that the following statements are to be interpreted as suggestions and may be revised if anyone has objections; if there are no objections, then this is the course of action that should be taken. Blocking: 1) The option/function naming conventions need to be unified, per https://wiki.archlinux.org/index.php/User:Allan/Package_Signing . This will be significantly harder to fix once the signing feature is shipped. 2) A means of initially installing keys and of updating the list of keys must be created. This will be implemented as a package called pacman-keys. [1] 3) The Arch Developers must create keys. The page https://wiki.archlinux.org/index.php/DeveloperWiki:Signing_Packages must be finalized, and then an informational email can be posted to arch-general. 4) The Arch Developers must place their keys into the pacman-keys package. The developers that can access the central repository can update the package directly. The developers that lack this access (if any) can generate a fingerprint, email their key to a developer with access, and use Skype to verify the fingerprint. If this is a problem, other arrangements can be made. 5) The existing packages and databases on the central repository need to be signed. A single developer can do this. 6) The entire signing process needs to be tested, and pactest tests should be written for it. 7) The pacman manpage should be reviewed and finalized. Non-blocking: 1) Package validation without root privileges must be implemented. Fixing this issue after the signing feature is introduced will not require more work than fixing it first. Omission of this feature will not decrease security but will cause inconvenience. 2) pacman-key should be made production-ready. pacman-key is nonessential because users will typically not edit pacman's trustdb, and pacman-key's functionality is available via sudo GNUPGHOME=/etc/pacman.d/gnupg gpg --options although this usage is cumbersome since it is not tailored for pacman usage. pacman-key should be renamed to pacman-manage-keys to avoid confusion with the pacman-keys package. 3) The documentation for developer tools (makepkg, repo-add) should be reviewed and finalized. 3) The page http://www.archlinux.org/download/ needs to be made to use HTTPS. This can be done independently of package signing implementation, but is necessary for complete security. 4) The output of tar -cf - /etc/pacman.d/gnupg/pacman_{valid,revoked}_keys | sha256sum as executed on an up-to-date system should be posted on an HTTPS page somewhere on archlinux.org and updated upon updates to the pacman-keys package. 5) Further issues are given at https://wiki.archlinux.org/index.php/User:Allan/Package_Signing . I have not had a chance to investigate these issues, but they appear to be non-blocking. Questions: 1) I am unsure as to who has access to the central repository regarding blocking issue 4, so if someone could clarify, I would appreciate it. 2) pacman-key should be updated after pacman but before any other packages. I am not sure if the SyncFirst field in /etc/pacman.conf supports this behavior. If not, the two packages will be both placed in this field and will be designed to install properly in either order until the SyncFirst functionality can be improved. 3) I don't know how quickly validated signatures from every single developer can be gathered, so maybe this will be an issue; I'm not sure. 4) I haven't yet had a chance to see how the documentation is, but pacman's manpage should be reviewed before shipping; manpages for developer-side tools can be reviewed after shipping. 5) I'm not sure what "output when downloading signature file - name when downloaded" from https://wiki.archlinux.org/index.php/User:Allan/Package_Signing means. I think it means that there is no indication when a database signature is being downloaded. I realize this message was rather long and does not have any patches attached to it. I apologize, but I felt that these basic points should be straightened out as development work continues. Tomorrow, I will transcribe some of the information in this email to https://wiki.archlinux.org/index.php?title=Pacman_package_signing, with expanded information on outstanding issues. If you are interested, please adopt an issue and also inform others so that work is not duplicated. If you have information that may be useful to others working on package signing, please place it on this page. I am working on blocking issue 1 and will be done fairly soon. I will then start to work on 2 and 3. 6 and 7 are big issues, so if anyone wants to help out, that'd be a good place. 4 and 5 require action of the Arch Developers; I only list them for completion. [1] This package will place keys (as generated by gpg --export) into the /etc/pacman.d/gnupg/pacman_valid_keys and /etc/pacman.d/gnupg/pacman_revoked_keys directories. The .INSTALL file will update the /etc/pacman.d/gnupg/trustdb.gpg according to the directories' contents. The PKGBUILD for this package will download valid and revoked keys from an HTTPS page on archlinux.org. Before the package is updated, the HTTPS page will be updated, so that the package will contain the changes when built on the developer's machine. The PKGBUILD cannot just copy keys out of the trustdb (with a special option to add or revoke keys for developers) because the PKGBUILD should be able to make the package even when the package isn't already properly installed. Or maybe it can just copy them; I'm too tired right now to decide which is best. Carpe Noctem, Kerrick Staley

5 9

[pacman-dev] [PATCH] Ensure list_display works on non-TTY terminals
by Dan McGee 01 Jun '11

01 Jun '11

If getcols() returns 0, we were getting stuck before in a loop of no return. Coerce any returned value of 0 to 80 for a sane width for our list. Also make a few other cleanups while diagnosing this issue. Noticed-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/util.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 3d26803..e1bc3ed 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -209,14 +209,13 @@ void indentprint(const char *str, int indent) { wchar_t *wcstr; const wchar_t *p; - int len, cidx, cols; + int len, cidx; + const int cols = getcols(); if(!str) { return; } - cols = getcols(); - /* if we're not a tty, print without indenting */ if(cols == 0) { printf("%s", str); @@ -425,8 +424,6 @@ static int string_length(const char *s) void string_display(const char *title, const char *string) { - int len = 0; - if(title) { printf("%s ", title); } @@ -434,7 +431,7 @@ void string_display(const char *title, const char *string) printf(_("None")); } else { /* compute the length of title + a space */ - len = string_length(title) + 1; + int len = string_length(title) + 1; indentprint(string, len); } printf("\n"); @@ -443,7 +440,7 @@ void string_display(const char *title, const char *string) void list_display(const char *title, const alpm_list_t *list) { const alpm_list_t *i; - int cols, len = 0; + int len = 0; if(title) { len = string_length(title) + 1; @@ -453,11 +450,13 @@ void list_display(const char *title, const alpm_list_t *list) if(!list) { printf("%s\n", _("None")); } else { + int cols, maxcols = getcols(); + /* coerce to 80 if we couldn't determine terminal width */ + maxcols = maxcols ? maxcols : 80; for(i = list, cols = len; i; i = alpm_list_next(i)) { char *str = alpm_list_getdata(i); int s = string_length(str); - int maxcols = getcols(); - if(maxcols > 0 && (cols + s + 2) >= maxcols) { + if(cols + s + 2 >= maxcols) { int j; cols = len; printf("\n"); -- 1.7.5.2

1 1

[pacman-dev] [PATCH 0/2] Minor tweaks to download code
by Dave Reisner 01 Jun '11

01 Jun '11

Just a couple fixes for the download code. I'm not entirely convinced that the values hard coded in patch 2/2 are appropriate, so I'll say that its up for discussion. I know that we have folks who insist on using dial-up, so we need to be aware of this as well. Based on the source of curl, it seems to be a comparison of the average speed over the life of the transfer against the low speed limit, so this would actually be elongated on larger transfers. Regardless, this should address bug reports such as FS#23690 and FS#15369. dave

2 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.2-195-g8f1c873
by dan＠archlinux.org 01 Jun '11

01 Jun '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 8f1c873b5f07f42a8bdc65bb03097790135a9c94 (commit) via 5842dad7e7b6265067ca8f286f945b3e7e76c321 (commit) via 41da2253366b6f641fc3e986817ee617c9e18df3 (commit) via fe9804a96d9e50a44e549c7be9189152e20893c5 (commit) via aad57cc06ac60dc8fdcff9bea811e990d64f74d3 (commit) via ac1726788c4bf9ae335df9f69f14a5f80208c413 (commit) via 1855b3073a33874a80d64e40296050641d63cd63 (commit) via 7b261675801822a1c5922dd982f012f91dd737f8 (commit) via e711e5b9501adcb692c65e7d358ae5b0e5bcfb57 (commit) via 65c18807350b2bedff0546b839fd5cd0004a6d4f (commit) from 11fb9c767450dc193bbeef755c228aa620df75d9 (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 8f1c873b5f07f42a8bdc65bb03097790135a9c94 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 12:56:38 2011 -0500 doc: monospace attribute escape fixes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5842dad7e7b6265067ca8f286f945b3e7e76c321 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Sat May 28 22:37:35 2011 +0800 pacman-key: print default gpgdir in usage Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 41da2253366b6f641fc3e986817ee617c9e18df3 Merge: fe9804a aad57cc Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 12:13:49 2011 -0500 Merge branch 'maint' commit fe9804a96d9e50a44e549c7be9189152e20893c5 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Sat May 28 22:37:32 2011 +0800 Update pacman manpage and pacman.conf for gpgdir pacman.8.txt --gpgdir section is updated based on the pacman.conf manpage pacman.conf is updated to include the default GPGDir Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7b261675801822a1c5922dd982f012f91dd737f8 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Sat May 28 22:37:31 2011 +0800 Let pacman -v print GPG Dir Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 4 ++-- doc/asciidoc.conf | 4 ++++ doc/makepkg.8.txt | 2 +- doc/pacman-key.8.txt | 4 ++-- doc/pacman.8.txt | 15 ++++++++------- doc/pacman.conf.5.txt | 14 +++++++------- etc/pacman.conf.in | 1 + lib/libalpm/alpm_list.c | 2 +- lib/libalpm/handle.c | 2 -- lib/libalpm/trans.c | 3 ++- scripts/pacman-key.sh.in | 2 +- src/pacman/pacman.c | 1 + 12 files changed, 30 insertions(+), 24 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.2-20-gaad57cc
by dan＠archlinux.org 01 Jun '11

01 Jun '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 aad57cc06ac60dc8fdcff9bea811e990d64f74d3 (commit) via ac1726788c4bf9ae335df9f69f14a5f80208c413 (commit) via 1855b3073a33874a80d64e40296050641d63cd63 (commit) via e711e5b9501adcb692c65e7d358ae5b0e5bcfb57 (commit) via 65c18807350b2bedff0546b839fd5cd0004a6d4f (commit) from f2c4e7e55220addef0581d1c38cc7363b5a0884c (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 aad57cc06ac60dc8fdcff9bea811e990d64f74d3 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 12:11:31 2011 -0500 doc: fix attribute substitution in monospaced text When I switched all paths to use `` formatting, I didn't realize substitution didn't work in these quote marks. Use ++ instead to ensure attributes are substituted where appropriate. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ac1726788c4bf9ae335df9f69f14a5f80208c413 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 12:10:32 2011 -0500 doc: update Makefile for new asciidoc resource location Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1855b3073a33874a80d64e40296050641d63cd63 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 1 11:46:13 2011 -0500 doc: add a few more escapes and fix usage of {} These addditional attributes come from the git asciidoc.conf file. Also, fix a place where we used {treename} without escaping the braces, causing the generated manpage to be missing text. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e711e5b9501adcb692c65e7d358ae5b0e5bcfb57 Author: Pang Yan Han <pangyanhan(a)gmail.com> Date: Tue May 24 11:25:13 2011 +0800 alpm_list: fix typo in doxygen comment Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 65c18807350b2bedff0546b839fd5cd0004a6d4f Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 19 17:42:22 2011 -0500 Bail early if we don't have a valid lockfile path This addresses FS#24292. If one does the bad thing of not checking pm_errno after calling set_dbpath(), you may not realize the initialization process went wrong and calling trans_init() resulted in a segfault. If we don't have a lockfile path, bail out and have trans_init() fail. Also remove a ALPM_LOG_FUNC call that was causing pm_errno to return "no handle"; this was due to a log call in the handle setup (whereby the log attempts to use a callback attached to the handle). Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 4 ++-- doc/asciidoc.conf | 4 ++++ doc/makepkg.8.txt | 2 +- doc/pacman.8.txt | 4 ++-- doc/pacman.conf.5.txt | 12 ++++++------ lib/libalpm/alpm_list.c | 2 +- lib/libalpm/handle.c | 2 -- lib/libalpm/trans.c | 3 ++- 8 files changed, 18 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 4/6] Add --verify option for signature level
by Pang Yan Han 01 Jun '11

01 Jun '11

The --verify option allows the user to change pacman's default signature verification level. It can take in one of "Always", "Optional" or "Verify". Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- This is a reroll after Remy suggested that it's better to set the signature verification level supplied from the command line in setlibpaths(). A new field is introduced in struct config which stores what the user passes to the --verify option at the command line. Is it possible for us to change option_verifysig to compare to non-caps versions of "Always", "Optional" and "Never"? src/pacman/conf.c | 14 ++++++++++++++ src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 4 ++++ 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 370ec51..869c005 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -68,6 +68,7 @@ int config_free(config_t *oldconfig) free(oldconfig->rootdir); free(oldconfig->dbpath); free(oldconfig->logfile); + free(oldconfig->sigverify); free(oldconfig->xfercommand); free(oldconfig->print_format); free(oldconfig); @@ -474,6 +475,19 @@ static int setlibpaths(void) } } + /* Set the signature verification level to what the user requested */ + if(config->sigverify) { + pgp_verify_t verify = option_verifysig(config->sigverify); + if (verify != PM_PGP_VERIFY_UNKNOWN) { + ret = alpm_option_set_default_sigverify(verify); + if(ret != 0) { + pm_printf(PM_LOG_ERROR, _("problem setting sigverify '%s' (%s)\n"), + config->sigverify, alpm_strerrorlast()); + return ret; + } + } + } + /* add a default cachedir if one wasn't specified */ if(alpm_option_get_cachedirs() == NULL) { alpm_option_add_cachedir(CACHEDIR); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 76c76cf..d08f83c 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -41,6 +41,7 @@ typedef struct __config_t { char *dbpath; char *logfile; char *gpgdir; + char *sigverify; /* TODO how to handle cachedirs? */ unsigned short op_q_isfile; @@ -111,7 +112,8 @@ enum { OP_ASEXPLICIT, OP_ARCH, OP_PRINTFORMAT, - OP_GPGDIR + OP_GPGDIR, + OP_VERIFY }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 8458c97..1e58890 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -438,6 +438,9 @@ static int parsearg_global(int opt) config->logfile = strndup(optarg, PATH_MAX); break; case OP_NOCONFIRM: config->noconfirm = 1; break; + case OP_VERIFY: + config->sigverify = strdup(optarg); + break; case 'b': check_optarg(); config->dbpath = strdup(optarg); @@ -635,6 +638,7 @@ static int parseargs(int argc, char *argv[]) {"arch", required_argument, 0, OP_ARCH}, {"print-format", required_argument, 0, OP_PRINTFORMAT}, {"gpgdir", required_argument, 0, OP_GPGDIR}, + {"verify", required_argument, 0, OP_VERIFY}, {0, 0, 0, 0} }; -- 1.7.5.rc0.101.g3d23c

2 1