- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-132-g234b6ff
by dan＠archlinux.org 30 Aug '11

30 Aug '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 234b6ffc2c39268d1efdc414e02bc4b352e5d931 (commit) via d74dad79b7770725090e1eb2a015cbd6f88aed66 (commit) via 515720a6fcc54c35420b5b5cf9258c8f2b5dc01b (commit) via 8129b93afe13a6546f46c6615c316ed85f341191 (commit) via e3676ae7b51fdaa68fcf2923c19681ec7d6f3952 (commit) via 499e09734bc6f4a121b3363d88aeb085bcfd9ce9 (commit) via b3c0ae5205ee9615af077ff00b1a01be3aab4eb6 (commit) via 7480df68ce7fe60e93dd833faf83dd5f2d6149c1 (commit) from f46db04f98cb63b48208026865943e42e7ece2f4 (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 234b6ffc2c39268d1efdc414e02bc4b352e5d931 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 12:12:54 2011 -0500 Parse > 2GiB file sizes correctly We were using atol(), which on 32 bit, cannot handle values greater than 2GiB, which is fail. Switch to a strtoull() wrapper function tailored toward parsing off_t values. This allows parsing of very large positive integer values. off_t is a signed type, but in our usages, we never parse or have a need for negative values, so the function will return -1 on error. Before: $ pacman -Si flightgear-data | grep Size Download Size : 2097152.00 K Installed Size : 2097152.00 K After: $ ./src/pacman/pacman -Si flightgear-data | grep Size Download Size : 2312592.52 KiB Installed Size : 5402896.00 KiB Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d74dad79b7770725090e1eb2a015cbd6f88aed66 Author: Helder Martins <heldermartins89(a)gmail.com> Date: Mon Aug 29 22:07:26 2011 +0100 lib/libalpm/handle.c: Removed redundant if condition Signed-off-by: Helder Martins <heldermartins89(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 515720a6fcc54c35420b5b5cf9258c8f2b5dc01b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 16:23:06 2011 -0500 Ensure progress callback updates if XX/YY numerator changes We only updated if the percentage incremented and enough time had elapsed, even though the numerator of the current/howmany fraction may have changed. Ensure we proceed with the progress bar update in these cases so as to not mislead the user. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8129b93afe13a6546f46c6615c316ed85f341191 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 10:52:12 2011 -0500 pacman-key: fix broken logic around updating trust database Any option that flips UPDATEDB=1 doesn't work right now due to what we thought was a good idea in commit cab1379a1ab14. Fix this by not including the update operation in the option count and special casing it where necessary. Also, bring back the helpful "Updating trust database" message. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e3676ae7b51fdaa68fcf2923c19681ec7d6f3952 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Aug 29 21:28:22 2011 +1000 Run pacman test-suite with LC_ALL=C Running the pacman test-suite in a non-English locale results in a few failures. Force the test-suite to run with LC_ALL=C. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 499e09734bc6f4a121b3363d88aeb085bcfd9ce9 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 28 23:29:53 2011 -0500 Streamline alpm_splitdep() comparisons This reduces from 5 to 3 the number of searches needed on the string looking for a comparison operator, since we can so a second quick comparison looking for '=' if we find '<' or '>'. It also makes every search doable with strchr() or memchr() rather than the slower strstr() method. In testing, only 10% of splitdep calls (~1600 / 16000) during an -Ss database load found a version comparison operator, so optimizing the not found path to be require less work makes sense. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b3c0ae5205ee9615af077ff00b1a01be3aab4eb6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Aug 29 20:46:28 2011 -0400 pacsort: use boolean, not binary OR operation Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7480df68ce7fe60e93dd833faf83dd5f2d6149c1 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 29 07:48:59 2011 -0500 Rework scriptlet tests to not depend on pacman output This actually does something in a scriptlet we can check with our normal set of rules, rather than relying on pacman debug output. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- lib/libalpm/be_local.c | 4 ++-- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 4 ++-- lib/libalpm/delta.c | 2 +- lib/libalpm/deps.c | 32 +++++++++++++++++++------------- lib/libalpm/handle.c | 7 +++---- lib/libalpm/util.c | 25 +++++++++++++++++++++++++ lib/libalpm/util.h | 1 + scripts/pacman-key.sh.in | 14 ++++++++++---- src/pacman/callback.c | 13 ++++++++----- src/util/pacsort.c | 2 +- test/pacman/tests/scriptlet001.py | 13 +++++-------- test/pacman/tests/scriptlet002.py | 13 +++++-------- 14 files changed, 84 insertions(+), 50 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] lib/libalpm/handle.c: Removed redudant if condition
by Helder Martins 29 Aug '11

29 Aug '11

Removed redudant if condition in lib/libalpm/handle.c, _alpm_handle_unlock() Signed-off-by: Helder Martins <heldermartins89(a)gmail.com> --- lib/libalpm/handle.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 266b4bc..b9d71db 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -132,10 +132,9 @@ int _alpm_handle_unlock(alpm_handle_t *handle) ASSERT(handle->lockfile != NULL, return -1); ASSERT(handle->lckstream != NULL, return 0); - if(handle->lckstream != NULL) { - fclose(handle->lckstream); - handle->lckstream = NULL; - } + fclose(handle->lckstream); + handle->lckstream = NULL; + if(unlink(handle->lockfile) && errno != ENOENT) { return -1; } -- 1.7.6.1

2 1

[pacman-dev] [PATCH 1/2] Ensure progress callback updates if XX/YY numerator changes
by Dan McGee 29 Aug '11

29 Aug '11

We only updated if the percentage incremented and enough time had elapsed, even though the numerator of the current/howmany fraction may have changed. Ensure we proceed with the progress bar update in these cases so as to not mislead the user. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/callback.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 04b3a52..e832b49 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -43,9 +43,6 @@ static off_t list_xfered = 0.0; static off_t list_total = 0.0; static struct timeval initial_time; -/* transaction progress bar */ -static int prevpercent = 0; /* for less progressbar output */ - /* delayed output during progress bar */ static int on_progress = 0; static alpm_list_t *output = NULL; @@ -349,6 +346,8 @@ void cb_trans_conv(alpm_transconv_t event, void *data1, void *data2, void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent, size_t howmany, size_t current) { + static int prevpercent; + static size_t prevcurrent; /* size of line to allocate for text printing (e.g. not progressbar) */ int infolen; int digits, textlen; @@ -373,14 +372,18 @@ void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent, return; } } else { - if(!pkgname || percent == prevpercent || get_update_timediff(0) < UPDATE_SPEED_SEC) { + if(current != prevcurrent) { + /* update always */ + } else if(!pkgname || percent == prevpercent || + get_update_timediff(0) < UPDATE_SPEED_SEC) { /* only update the progress bar when we have a package name, the - * percentage has changed, and it has been long enough. */ + * percentage has changed, and it has been long enough. */ return; } } prevpercent = percent; + prevcurrent = current; /* set text of message to display */ switch (event) { -- 1.7.6.1

1 1

[pacman-dev] Possible redudant condition in handle.c
by Helder Martins 29 Aug '11

29 Aug '11

Hi. I saw this little piece of code in handle.c in libpalm, starts at line 130: ASSERT(handle->lockfile != NULL, return -1); -> ASSERT(handle->lckstream != NULL, return 0); -> if(handle->lckstream != NULL) { fclose(handle->lckstream); handle->lckstream = NULL; } So i was wondering if that assert or the if condition are redundant, and if yes which one has the correct behaviour for the objective of this function. I can provide the patch once i know which one is the correct behaviour. Thanks, Helder Martins

2 2

[pacman-dev] [PATCH] Parse > 2GiB file sizes correctly
by Dan McGee 29 Aug '11

29 Aug '11

We were using atol(), which on 32 bit, cannot handle values greater than 2GiB, which is fail. Switch to a strtoull() wrapper function tailored toward parsing off_t values. This allows parsing of very large positive integer values. off_t is a signed type, but in our usages, we never parse or have a need for negative values, so the function will return -1 on error. Before: $ pacman -Si flightgear-data | grep Size Download Size : 2097152.00 K Installed Size : 2097152.00 K After: $ ./src/pacman/pacman -Si flightgear-data | grep Size Download Size : 2312592.52 KiB Installed Size : 5402896.00 KiB Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_local.c | 4 ++-- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 4 ++-- lib/libalpm/delta.c | 2 +- lib/libalpm/util.c | 25 +++++++++++++++++++++++++ lib/libalpm/util.h | 1 + 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index be02bb5..dc9e361 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -619,7 +619,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) READ_AND_STORE(info->packager); } else if(strcmp(line, "%REASON%") == 0) { READ_NEXT(); - info->reason = (alpm_pkgreason_t)atol(line); + info->reason = (alpm_pkgreason_t)atoi(line); } else if(strcmp(line, "%SIZE%") == 0) { /* NOTE: the CSIZE and SIZE fields both share the "size" field * in the pkginfo_t struct. This can be done b/c CSIZE @@ -627,7 +627,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) * only used in local databases. */ READ_NEXT(); - info->size = atol(line); + info->size = _alpm_strtoofft(line); /* also store this value to isize */ info->isize = info->size; } else if(strcmp(line, "%REPLACES%") == 0) { diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 0e58d20..98a1240 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -187,7 +187,7 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * STRDUP(newpkg->arch, ptr, return -1); } else if(strcmp(key, "size") == 0) { /* size in the raw package is uncompressed (installed) size */ - newpkg->isize = atol(ptr); + newpkg->isize = _alpm_strtoofft(ptr); } else if(strcmp(key, "depend") == 0) { alpm_depend_t *dep = _alpm_splitdep(ptr); newpkg->depends = alpm_list_add(newpkg->depends, dep); diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 12d5b7f..982d355 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -566,14 +566,14 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, * in sync databases, and SIZE is only used in local databases. */ READ_NEXT(); - pkg->size = atol(line); + pkg->size = _alpm_strtoofft(line); /* also store this value to isize if isize is unset */ if(pkg->isize == 0) { pkg->isize = pkg->size; } } else if(strcmp(line, "%ISIZE%") == 0) { READ_NEXT(); - pkg->isize = atol(line); + pkg->isize = _alpm_strtoofft(line); } else if(strcmp(line, "%MD5SUM%") == 0) { READ_AND_STORE(pkg->md5sum); } else if(strcmp(line, "%SHA256SUM%") == 0) { diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 1b7e3ee..c88955f 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -299,7 +299,7 @@ alpm_delta_t *_alpm_delta_parse(char *line) tmp2 = tmp; tmp = strchr(tmp, ' '); *(tmp++) = '\0'; - delta->delta_size = atol(tmp2); + delta->delta_size = _alpm_strtoofft(tmp2); tmp2 = tmp; tmp = strchr(tmp, ' '); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 98eaa17..4cb31a8 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1074,6 +1074,31 @@ unsigned long _alpm_hash_sdbm(const char *str) return hash; } +off_t _alpm_strtoofft(const char *line) +{ + char *end; + unsigned long long result; + errno = 0; + + /* we are trying to parse bare numbers only, no leading anything */ + if(line[0] < '1' || line[0] > '9') { + return (off_t)-1; + } + result = strtoull(line, &end, 10); + if (result == 0 && end == line) { + /* line was not a number */ + return (off_t)-1; + } else if (result == ULLONG_MAX && errno == ERANGE) { + /* line does not fit in unsigned long long */ + return (off_t)-1; + } else if (*end) { + /* line began with a number but has junk left over at the end */ + return (off_t)-1; + } + + return (off_t)result; +} + long _alpm_parsedate(const char *line) { if(isalpha((unsigned char)line[0])) { diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 921ed45..c5544a0 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -119,6 +119,7 @@ int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b); int _alpm_splitname(const char *target, char **name, char **version, unsigned long *name_hash); unsigned long _alpm_hash_sdbm(const char *str); +off_t _alpm_strtoofft(const char *line); long _alpm_parsedate(const char *line); int _alpm_raw_cmp(const char *first, const char *second); int _alpm_raw_ncmp(const char *first, const char *second, size_t max); -- 1.7.6.1

1 0

[pacman-dev] [PATCH] pacman-key: fix broken logic around updating trust database
by Dan McGee 29 Aug '11

29 Aug '11

Any option that flips UPDATEDB=1 doesn't work right now due to what we thought was a good idea in commit cab1379a1ab14. Fix this by not including the update operation in the option count and special casing it where necessary. Also, bring back the helpful "Updating trust database" message. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Allan broke it! :) But in all seriousness, this code is getting a bit hacky/dirty, so open to other suggestions if we can clean anything up. scripts/pacman-key.sh.in | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 1bac3d3..0b46b10 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -419,13 +419,16 @@ PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(get_from "$CONFIG" "GPGDir" || echo " GPG_PACMAN=(gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning) # check only a single operation has been given +# don't include UPDATEDB in here as other opts can induce it numopt=$(( ADD + DELETE + EDITKEY + EXPORT + FINGER + IMPORT + IMPORT_TRUSTDB + - INIT + LISTKEYS + LISTSIGS + POPULATE + RECEIVE + UPDATEDB + VERIFY )) + INIT + LISTKEYS + LISTSIGS + POPULATE + RECEIVE + VERIFY )) case $numopt in 0) - error "$(gettext "no operation specified (use -h for help)")" - exit 1 + if (( ! UPDATEDB )); then + error "$(gettext "no operation specified (use -h for help)")" + exit 1 + fi ;; [!1]) error "$(gettext "Multiple operations specified")" @@ -450,6 +453,9 @@ esac (( RECEIVE )) && receive_keys (( VERIFY )) && "${GPG_PACMAN[@]}" --verify $SIGNATURE -(( UPDATEDB )) && "${GPG_PACMAN[@]}" --batch --check-trustdb +if (( UPDATEDB )); then + msg "$(gettext "Updating trust database...")" + "${GPG_PACMAN[@]}" --batch --check-trustdb +fi # vim: set ts=2 sw=2 noet: -- 1.7.6.1

1 0

[pacman-dev] [PATCH] Streamline alpm_splitdep() comparisons
by Dan McGee 29 Aug '11

29 Aug '11

This reduces from 5 to 3 the number of searches needed on the string looking for a comparison operator, since we can so a second quick comparison looking for '=' if we find '<' or '>'. It also makes every search doable with strchr() or memchr() rather than the slower strstr() method. In testing, only 10% of splitdep calls (~1600 / 16000) during an -Ss database load found a version comparison operator, so optimizing the not found path to be require less work makes sense. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/deps.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index e268157..639f14b 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -410,31 +410,37 @@ alpm_depend_t *_alpm_splitdep(const char *depstring) { alpm_depend_t *depend; const char *ptr, *version = NULL; + size_t deplen; if(depstring == NULL) { return NULL; } CALLOC(depend, 1, sizeof(alpm_depend_t), return NULL); + deplen = strlen(depstring); /* Find a version comparator if one exists. If it does, set the type and * increment the ptr accordingly so we can copy the right strings. */ - if((ptr = strstr(depstring, ">="))) { - depend->mod = ALPM_DEP_MOD_GE; - version = ptr + 2; - } else if((ptr = strstr(depstring, "<="))) { - depend->mod = ALPM_DEP_MOD_LE; - version = ptr + 2; - } else if((ptr = strstr(depstring, "="))) { + if((ptr = memchr(depstring, '<', deplen))) { + if(ptr[1] == '=') { + depend->mod = ALPM_DEP_MOD_LE; + version = ptr + 2; + } else { + depend->mod = ALPM_DEP_MOD_LT; + version = ptr + 1; + } + } else if((ptr = memchr(depstring, '>', deplen))) { + if(ptr[1] == '=') { + depend->mod = ALPM_DEP_MOD_GE; + version = ptr + 2; + } else { + depend->mod = ALPM_DEP_MOD_GT; + version = ptr + 1; + } + } else if((ptr = memchr(depstring, '=', deplen))) { /* Note: we must do =,<,> checks after <=, >= checks */ depend->mod = ALPM_DEP_MOD_EQ; version = ptr + 1; - } else if((ptr = strstr(depstring, "<"))) { - depend->mod = ALPM_DEP_MOD_LT; - version = ptr + 1; - } else if((ptr = strstr(depstring, ">"))) { - depend->mod = ALPM_DEP_MOD_GT; - version = ptr + 1; } else { /* no version specified, leave version and ptr NULL */ depend->mod = ALPM_DEP_MOD_ANY; -- 1.7.6.1

1 0

[pacman-dev] [PATCH] Run pacman test-suite with LC_ALL=C
by Allan McRae 29 Aug '11

29 Aug '11

Running the pacman test-suite in a non-English locale results in a few failures. Force the test-suite to run with LC_ALL=C. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Not sure if this is the best approach or whether we should just have the three tests that require it to run under the C locale. Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 75760bb..fb7a4d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ dist_pkgdata_DATA = \ # run the pactest test suite and vercmp tests check-local: test/pacman test/util src/pacman src/util - $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ + LC_ALL=C $(PYTHON) $(top_srcdir)/test/pacman/pactest.py --debug=1 \ --test $(top_srcdir)/test/pacman/tests/*.py \ -p $(top_builddir)/src/pacman/pacman $(SH) $(top_srcdir)/test/util/pacsorttest.sh \ -- 1.7.6.1

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc1-124-gf46db04
by dan＠archlinux.org 29 Aug '11

29 Aug '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 f46db04f98cb63b48208026865943e42e7ece2f4 (commit) via 8973875a1fc52ec35c255afd34c9cd7d5c285caa (commit) via b221af660d101301606e263cef73b358937516a6 (commit) via 040083b97fab61c8afc16a1c49a8384d097c272a (commit) via 3a458783a2617b7b22a756f95b5f66f3da79146f (commit) via 12a6c77fdd0c465761f4f9518eff0eeeda668d20 (commit) via 7ceeebf1505dba655b43e095f5392367a3a0f9b8 (commit) via e1b9f7b3005c4d6db9cc84e95a42d4beba6c7e24 (commit) via 29dede2eb76ab5a139d4e8236be1037a7a86b6e5 (commit) via cab1379a1ab14e29414c5fdf6252d1f5ea7263fb (commit) via 710e83999bbf8ae614b9310744c5306a7cbc858b (commit) via d1240f67eab6dfa7e3344cd84dd8849b38ce337c (commit) from 2cfcc874b9332ad207398b9e20dc8880d93e8ae4 (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 f46db04f98cb63b48208026865943e42e7ece2f4 Merge: 8973875 12a6c77 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 28 23:51:05 2011 -0500 Merge branch 'allan/pacman-key' commit 8973875a1fc52ec35c255afd34c9cd7d5c285caa Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 28 23:05:20 2011 -0500 _alpm_splitdep(): don't pass bogus length value to strndup If we fell through to the ALPM_DEP_MOD_ANY case, ptr would be NULL, and we would pass (0 - <str>), which is a rather large negative number or bogus positive number, depending on signed/unsigned. Just use strdup in the case where we don't have a ptr available. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b221af660d101301606e263cef73b358937516a6 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 28 22:20:41 2011 -0500 Database read optimizations Hard to believe there was still more room to improve on this, but I found an easily correctable oversight tonight. Our databases (both sync and local) contain many blank lines, and we were not moving onto the next line right away in these cases; instead we would proceed through our strcmp() conditional checks as normal. Some local numbers follow to show the effects of this patch: Sync `-Ss foobarbaz`: 71,709 blank lines skipped early ~1,505,889 strcmp() calls avoided (21 per line) ~15% speed improvement (.210 --> .179 sec) Local `-Qs foobarbaz`: 6,823 blank lines skipped early 115,991 strcmp() calls avoided (17 per line) ~6% speed improvement (.080 -> .071 sec) Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 040083b97fab61c8afc16a1c49a8384d097c272a Author: Dan McGee <dan(a)archlinux.org> Date: Sun Aug 28 23:41:17 2011 -0500 Allow access to package origin data Add new alpm_pkg_get_origin() method, use it in the front end now that the enum constants are publicly available. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3a458783a2617b7b22a756f95b5f66f3da79146f Author: Diogo Sousa <diogogsousa(a)gmail.com> Date: Mon Aug 29 02:51:32 2011 +0100 Removed multiple definitions of pkgfrom_t libalpm now exports type alpm_pkgfrom_t in alpm.h, which may be used by frontends. Pacman now uses alpm_pkgfrom_t instead of replicating that type (pkg_from as was in src/pacman/package.h) Updated API change in README. Signed-off-by: Diogo Sousa <diogogsousa(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 12a6c77fdd0c465761f4f9518eff0eeeda668d20 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 12:59:27 2011 -0500 pacman-key: have --init add more options to default gpg.conf This adds a add_gpg_conf_option() helper function which tries to be intelligent and only add not found options, and those which have not been explicitly commented out. The new options added are 'no-greeting', 'no-permission-warning', and a default 'keyserver'. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7ceeebf1505dba655b43e095f5392367a3a0f9b8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Aug 25 12:59:26 2011 -0500 pacman-key: refine permission and locking checks * secring.gpg can be 600, readable by root user only * ensure grep for lock-never option in check_keyring doesn't catch comments Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e1b9f7b3005c4d6db9cc84e95a42d4beba6c7e24 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 23 16:10:06 2011 +1000 pacman-key: rework and document holding keys in keyring The HoldKey option was undocumented and was not suited for pacman.conf. Instead use the file "/etc/pacman.d/gnupg/heldkeys" to contain a list of keys not to be removed from the pacman keyring with the --populate option. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 29dede2eb76ab5a139d4e8236be1037a7a86b6e5 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 23 15:46:46 2011 +1000 pacman-key: Improve documentation for --populate Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cab1379a1ab14e29414c5fdf6252d1f5ea7263fb Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 23 15:12:08 2011 +1000 pacman-key: update trust database for relevant operations After most operations that touch the keyring, it is a good idea to always run a check on the trustdb as this prevents gpg complaining on later operations. Inspiration-from: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 710e83999bbf8ae614b9310744c5306a7cbc858b Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 23 15:00:19 2011 +1000 pacman-key: import everything then revoke on --populate The optimization of only importing keys that were not to be later revoked was a not smart enough. For example, if a key was in both a repos keyring and its revoke list, alternate runs of pacman-key --populate would add then remove the key from the pacman keyring. This problem is made worse when considering the possibility of multiple keyrings being imported. Instead, import all keys followed by the revoking of all keys. This may result in a key being added then revoked, but that is not much of an issue given that is a very fast operation. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d1240f67eab6dfa7e3344cd84dd8849b38ce337c Author: Allan McRae <allan(a)archlinux.org> Date: Mon Aug 15 22:51:58 2011 +1000 pacman-key: rework importing distro/repo provided keyrings The current --reload option, apart from being non-clear in its naming, is very limited in that only one keyring can be provided. A distribution may want to provide multiple keyrings for various subsets of its organisation or custom repo providers may also want to provide a keyring. This patch adds a --populate option that reads keyrings from (by default) /usr/share/pacman/keyrings. A keyring is named foo.gpg, with optional foo-revoked file providing a list of revoked key ids. These files are required to be signed (detached) by a key trusted by pacman-key, in practice probably by the key that signed the package providing these files. The --populate flag either updates the pacman keyring using all keyrings in the directory or individual keyrings can be specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 4 +- doc/pacman-key.8.txt | 23 +++++- lib/libalpm/alpm.h | 11 +++ lib/libalpm/be_local.c | 8 ++- lib/libalpm/be_sync.c | 5 +- lib/libalpm/deps.c | 6 +- lib/libalpm/package.c | 7 ++ lib/libalpm/package.h | 6 -- scripts/Makefile.am | 1 + scripts/pacman-key.sh.in | 223 ++++++++++++++++++++++++---------------------- src/pacman/package.c | 7 +- src/pacman/package.h | 9 +-- src/pacman/query.c | 4 +- src/pacman/sync.c | 4 +- 14 files changed, 183 insertions(+), 135 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Standardize output when db.lck is present
by pangyanhan＠gmail.com 29 Aug '11

29 Aug '11

From: Pang Yan Han <pangyanhan(a)gmail.com> When db.lck file is present, pacman -Syy and other Sync operations involving transactions show: :: Synchronizing package databases... error: failed to update core (unable to lock database) error: failed to update extra (unable to lock database) error: failed to update community (unable to lock database) error: failed to update multilib (unable to lock database) error: failed to synchronize any databases Whereas pacman -U <pkg> shows: error: failed to init transaction (unable to lock database) if you're sure a package manager is not already running, you can remove /var/lib/pacman/db.lck which is much more meaningful. Standardize the output to that of pacman -U when db.lck is present. Reported-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- src/pacman/sync.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index ea32a26..37f6ecb 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -288,6 +288,15 @@ static int sync_synctree(int level, alpm_list_t *syncs) ret = alpm_db_update((level < 2 ? 0 : 1), db); if(ret < 0) { + enum _alpm_errno_t err = alpm_errno(config->handle); + pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to init transaction (%s)\n"), + alpm_strerror(err)); + if(err == ALPM_ERR_HANDLE_LOCK) { + fprintf(stderr, _(" if you're sure a package manager is not already\n" + " running, you can remove %s\n"), + alpm_option_get_lockfile(config->handle)); + return 0; + } pm_fprintf(stderr, ALPM_LOG_ERROR, _("failed to update %s (%s)\n"), alpm_db_get_name(db), alpm_strerror(alpm_errno(config->handle))); } else if(ret == 1) { -- 1.7.6.1.385.gb7fcd0

2 1