- Pacman-dev - lists.archlinux.org

[pacman-dev] Feature request: Show exact matches first
by Markus Jochim 20 Oct '11

20 Oct '11

Dear developers, I'd like to request a feature. When I search for some package, let's say openconnect: $ pacman -Ss openconnect (or -Qs) it takes quite a while until I get any results on my netbook (Atom N450 cpu). Maybe this could be sped up by showing exact matches right away. I've had this situation quite some times now and it can be a real pain in the ass to wait for 10 seconds (this may vary of course) when I simply want to know whether I have a particular package installed. Kindly, Markus

6 7

[pacman-dev] [PATCH] bacman: pkgrel does not have to be an integer
by lolilolicon 20 Oct '11

20 Oct '11

pkgrel, as with pkgver, simply mustn't contain hyphens. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- contrib/bacman.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/bacman.in b/contrib/bacman.in index 9636091..c55d716 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -93,7 +93,7 @@ pkg_dest="${PKGDEST:-$PWD}" pkg_pkger=${PACKAGER:-'Unknown Packager'} pkg_name="$1" -pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([0-9])) +pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([^-])) pkg_namver=("${pkg_dir[@]##*/}") # -- 1.7.6.4

1 0

[pacman-dev] [PATCH] add gpg key length to import message
by Florian Pritz 18 Oct '11

18 Oct '11

Displaying the length of the key we are about to import allows the user to spot forged keys more easily. References: http://www.pgp.net/pgpnet/pgp-faq/pgp-faq-keys.html#key-public-key-forgery Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- lib/libalpm/alpm.h | 1 + lib/libalpm/signing.c | 1 + src/pacman/callback.c | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 9fda940..2e4de79 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -226,6 +226,7 @@ typedef struct _alpm_pgpkey_t { char *email; alpm_time_t created; alpm_time_t expires; + unsigned int length; } alpm_pgpkey_t; /** Signature result. Contains the key, status, and validity of a given diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index bdaa83a..3d965b4 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -270,6 +270,7 @@ static int key_search(alpm_handle_t *handle, const char *fpr, pgpkey->email = key->uids->email; pgpkey->created = key->subkeys->timestamp; pgpkey->expires = key->subkeys->expires; + pgpkey->length = key->subkeys->length; ret = 1; error: diff --git a/src/pacman/callback.c b/src/pacman/callback.c index d856455..cb2b080 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -349,8 +349,8 @@ void cb_question(alpm_question_t event, void *data1, void *data2, char created[12]; time_t time = (time_t)key->created; strftime(created, 12, "%Y-%m-%d", localtime(&time)); - *response = yesno(_(":: Import PGP key %s, \"%s\", created %s?"), - key->fingerprint, key->uid, created); + *response = yesno(_(":: Import PGP key %s, \"%s\", created %s, length %d bytes?"), + key->fingerprint, key->uid, created, key->length); } break; } -- 1.7.7

2 1

[pacman-dev] [PATCH 1/2] Show an error message on failed remote key lookup
by Dan McGee 17 Oct '11

17 Oct '11

The absolutely terrible part about this is the failure on GPGME's part to distinguish between "key not found" and "keyserver timeout". Instead, it returns the same silly GPG_ERR_EOF in both cases (why isn't GPG_ERR_TIMEOUT being used?), leaving us helpless to tell them apart. Spit out a generic enough error message that covers both cases; unfortunately we can't provide much guidance to the user because we aren't sure what actually happened. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/signing.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index bdaa83a..92f34b5 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -797,8 +797,8 @@ int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier, fetch_key.fingerprint, fetch_key.uid); } } else { - _alpm_log(handle, ALPM_LOG_DEBUG, - "key could not be looked up remotely\n"); + _alpm_log(handle, ALPM_LOG_ERROR, + _("key \"%s\" could not be looked up remotely\n"), name); } gpgme_key_unref(fetch_key.data); } -- 1.7.7

1 1

[pacman-dev] [PATCH 0/5] download diskspace checking
by Dave Reisner 16 Oct '11

16 Oct '11

I don't think this patchset is ready for merging, but I figured I'd post it here for some possible feedback. This is mostly for the purposes of adding diskspace checking prior to downloads, but it also changes some ancient behavior that Judd added of grouping sync records by repo. Instead, we just gather all the records together at once and download them. I've left some comments in the header for each patch... d Dave Reisner (5): diskspace: add _alpm_check_downloadspace() dload: add RO copy of servers list to each payload sync: dont group sync records by repository sync: check for necessary disk space for download sync: move file download loop out of download_files lib/libalpm/diskspace.c | 54 ++++++++++++++ lib/libalpm/diskspace.h | 2 + lib/libalpm/dload.h | 1 + lib/libalpm/sync.c | 184 ++++++++++++++++++++++++++++------------------ src/pacman/callback.c | 2 +- 5 files changed, 170 insertions(+), 73 deletions(-) -- 1.7.7

2 11

[pacman-dev] [PATCH 1/2] Make _alpm_filelist_contains() NULL-safe
by Dan McGee 14 Oct '11

14 Oct '11

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/conflict.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 14c23f4..f686ca8 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -318,12 +318,16 @@ const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist, const char *name) { size_t i; - const alpm_file_t *file = filelist->files; - for(i = 0; i < filelist->count; i++) { + const alpm_file_t *file; + + if(!filelist) { + return NULL; + } + + for(file = filelist->files, i = 0; i < filelist->count; file++, i++) { if(strcmp(file->name, name) == 0) { return file; } - file++; } return NULL; } -- 1.7.7

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-28-ga33424f
by dan＠archlinux.org 14 Oct '11

14 Oct '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 a33424f87955c43652a61fcef5817df07e17bee3 (commit) via 020bdb4298cd1bc53df7ca4d911cda7aaa65329c (commit) via dbd54c0cb95c5d9c914e5d99b23556d2528ee9b9 (commit) via 0d2600c575033774485f84ad67cbc602592237ab (commit) via 185cbb8a44d9e084580d6a9f4ca004c20ee90103 (commit) via 8605284e0d1b70d9845ca4c6362d7d451f503d32 (commit) via 9934052b54fd4dcd2339a2beb87ccc81b5e144bd (commit) via 5b5b250443ed416a2c2315c28a034501603cd003 (commit) via 86bc36412e2619e0e05d61cf6216ef68814cf1cd (commit) via 1ebe5dc1979e90c37d6534d6b1e0173a884326b1 (commit) via 43cad9c871f32da7a5342ba8b68aa316d7e47e9e (commit) from 53e525c4f3a6b0bfdc346b4563c6c8fc0e1b5b11 (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 a33424f87955c43652a61fcef5817df07e17bee3 Merge: dbd54c0 020bdb4 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 14 08:16:18 2011 -0500 Merge branch 'maint' commit dbd54c0cb95c5d9c914e5d99b23556d2528ee9b9 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 12:34:58 2011 -0500 Use fputs and putchar in callback progress display When we have fixed strings or output, printf overhead is unnecessary. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0d2600c575033774485f84ad67cbc602592237ab Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 11 12:35:33 2011 -0500 Remove -f short option for --force This is not something that should be used on a frequent basis, and giving it a short option encourages use without making the drawbacks obvious. For the 1% of situations that require it, the 5 extra keystrokes are a fair price to pay. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8605284e0d1b70d9845ca4c6362d7d451f503d32 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 3 10:54:08 2011 -0500 Use puts() instead of no-op printf() where applicable This replaces several printf calls of the following styles: printf("%s", ...); printf("some fixed string"); printf("x"); We can use either fputs() or putchar() here to do the same thing without incurring the overhead of the printf format parser. The biggest gain here comes when we are calling the print function in a loop repeatedly; notably when printing local package files. $ /usr/bin/time ./pacman-before -Ql | md5sum 0.25user 0.04system 0:00.30elapsed 98%CPU $ /usr/bin/time ./pacman-after -Ql | md5sum 0.17user 0.06system 0:00.25elapsed 94%CPU $ /usr/bin/time ./pacman-before -Qlq | md5sum 0.20user 0.05system 0:00.26elapsed 98%CPU $ /usr/bin/time ./pacman-after -Qlq | md5sum 0.15user 0.05system 0:00.23elapsed 93%CPU So '-Ql' shows a 17% improvement while '-Qlq' shows a 13% improvement on 382456 total files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9934052b54fd4dcd2339a2beb87ccc81b5e144bd Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 18:03:10 2011 -0500 Remove mcheck.h support When was the last time anyone used this? That's what I thought. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 - contrib/bash_completion.in | 4 +- contrib/zsh_completion.in | 4 +- doc/.gitignore | 4 +- doc/Makefile.am | 12 ++-- doc/asciidoc-override.css | 7 ++ doc/index.txt | 135 +++++++++++++++++++++++++++------------ doc/pacman.8.txt | 2 +- lib/libalpm/dload.c | 24 ++++--- lib/libalpm/dload.h | 2 + scripts/makepkg.sh.in | 20 +++--- src/pacman/callback.c | 34 +++++----- src/pacman/conf.h | 3 +- src/pacman/package.c | 15 +++-- src/pacman/pacman.c | 16 +---- src/pacman/query.c | 10 ++-- src/pacman/sync.c | 10 ++-- src/pacman/util.c | 18 +++--- test/pacman/tests/upgrade012.py | 2 +- test/pacman/tests/upgrade014.py | 2 +- test/pacman/tests/upgrade015.py | 2 +- test/pacman/tests/upgrade016.py | 2 +- test/pacman/tests/upgrade046.py | 2 +- 23 files changed, 198 insertions(+), 134 deletions(-) create mode 100644 doc/asciidoc-override.css hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-12-g020bdb4
by dan＠archlinux.org 14 Oct '11

14 Oct '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 020bdb4298cd1bc53df7ca4d911cda7aaa65329c (commit) via 185cbb8a44d9e084580d6a9f4ca004c20ee90103 (commit) via 5b5b250443ed416a2c2315c28a034501603cd003 (commit) via 86bc36412e2619e0e05d61cf6216ef68814cf1cd (commit) via 1ebe5dc1979e90c37d6534d6b1e0173a884326b1 (commit) via 43cad9c871f32da7a5342ba8b68aa316d7e47e9e (commit) from 04fd320e97770911894fb06ba98f3c17fc30c7d9 (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 020bdb4298cd1bc53df7ca4d911cda7aaa65329c Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 17:26:17 2011 -0500 makepkg: don't attach traps until after argument parsing Nothing we do in our traps is necessary this early in the script. This fixes FS#26196. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 185cbb8a44d9e084580d6a9f4ca004c20ee90103 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 14 07:38:58 2011 -0500 Add missing #ifdef around cURL error code in download struct Thanks to Eduardo Tongson on the mailing list. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5b5b250443ed416a2c2315c28a034501603cd003 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 12:30:31 2011 -0500 Coding style cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 86bc36412e2619e0e05d61cf6216ef68814cf1cd Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 12:53:56 2011 -0500 curl_gethost() potential bug fixups This is in the realm of "probably not going to happen", but if someone were to translate "disk" to a string longer than 256 characters, we would have a smashed/corrupted stack due to our unchecked strcpy() call. Rework the function to always length-check the value we copy into the hostname buffer, and do it with memcpy rather than the more cumbersome and unnecessary snprintf. Finally, move the magic 256 value into a constant and pass it into the function which is going to get inlined anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1ebe5dc1979e90c37d6534d6b1e0173a884326b1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 14:54:49 2011 -0500 doc/index.txt: Reformat past releases chart This makes it a three-column deal with releases all the way back to 1.0. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 43cad9c871f32da7a5342ba8b68aa316d7e47e9e Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 14:49:48 2011 -0500 doc: update .gitignore, add CSS override for new tables usage * Make all docs depend on Makefile; if we change flags here we want them rebuilt. * Add explicit filenames to .gitignore so we can add our own CSS override file, and add an asciidoc-override.css resource. * Adjust a few asciidoc options when generating HTML. * Remove asciidoc-manpage.css; apparantly this doesn't exist anymore. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/.gitignore | 4 +- doc/Makefile.am | 12 ++-- doc/asciidoc-override.css | 7 ++ doc/index.txt | 135 +++++++++++++++++++++++++++++++-------------- lib/libalpm/dload.c | 24 +++++--- lib/libalpm/dload.h | 2 + scripts/makepkg.sh.in | 20 +++---- src/pacman/util.c | 10 ++-- 8 files changed, 141 insertions(+), 73 deletions(-) create mode 100644 doc/asciidoc-override.css hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Missing ifdef
by Eduardo Tongson 14 Oct '11

14 Oct '11

Thanks! - e

2 1

[pacman-dev] [PATCH] Use puts() instead of no-op printf() where applicable
by Dan McGee 14 Oct '11

14 Oct '11

This replaces several printf calls of the following styles: printf("%s", ...); printf("some fixed string"); printf("x"); We can use either fputs() or putchar() here to do the same thing without incurring the overhead of the printf format parser. The biggest gain here comes when we are calling the print function in a loop repeatedly; notably when printing local package files. $ /usr/bin/time ./pacman-before -Ql | md5sum 0.25user 0.04system 0:00.30elapsed 98%CPU $ /usr/bin/time ./pacman-after -Ql | md5sum 0.17user 0.06system 0:00.25elapsed 94%CPU $ /usr/bin/time ./pacman-before -Qlq | md5sum 0.20user 0.05system 0:00.26elapsed 98%CPU $ /usr/bin/time ./pacman-after -Qlq | md5sum 0.15user 0.05system 0:00.23elapsed 93%CPU So '-Ql' shows a 17% improvement while '-Qlq' shows a 13% improvement on 382456 total files. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/callback.c | 4 ++-- src/pacman/package.c | 15 ++++++++++----- src/pacman/pacman.c | 2 +- src/pacman/query.c | 10 +++++----- src/pacman/sync.c | 10 +++++----- src/pacman/util.c | 8 ++++---- 6 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 7235d39..80db402 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -228,7 +228,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("failed.\n")); break; case ALPM_EVENT_SCRIPTLET_INFO: - printf("%s", (char *)data1); + fputs((const char *)data1, stdout); break; case ALPM_EVENT_RETRIEVE_START: printf(_(":: Retrieving packages from %s...\n"), (char *)data1); @@ -495,7 +495,7 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, alpm_list_t *i = NULL; on_progress = 0; for(i = output; i; i = i->next) { - printf("%s", (char *)i->data); + fputs((const char *)i->data, stdout); } fflush(stdout); FREELIST(output); diff --git a/src/pacman/package.c b/src/pacman/package.c index 4950957..f82be47 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -252,11 +252,16 @@ void dump_pkg_files(alpm_pkg_t *pkg, int quiet) for(i = 0; i < pkgfiles->count; i++) { const alpm_file_t *file = pkgfiles->files + i; + /* Regular: '<pkgname> <root><filepath>\n' + * Quiet : '<root><filepath>\n' + */ if(!quiet) { - fprintf(stdout, "%s %s%s\n", pkgname, root, file->name); - } else { - fprintf(stdout, "%s%s\n", root, file->name); + fputs(pkgname, stdout); + putchar(' '); } + fputs(root, stdout); + fputs(file->name, stdout); + putchar('\n'); } fflush(stdout); @@ -281,10 +286,10 @@ void dump_pkg_changelog(alpm_pkg_t *pkg) /* if we hit the end of the file, we need to add a null terminator */ *(buf + ret) = '\0'; } - printf("%s", buf); + fputs(buf, stdout); } alpm_pkg_changelog_close(pkg, fp); - printf("\n"); + putchar('\n'); } } diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 5ebced2..ac793df 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -208,7 +208,7 @@ static void usage(int op, const char * const myname) } list = alpm_list_msort(list, alpm_list_count(list), options_cmp); for (i = list; i; i = alpm_list_next(i)) { - printf("%s", (const char *)i->data); + fputs((const char *)i->data, stdout); } alpm_list_free(list); #undef addlist diff --git a/src/pacman/query.c b/src/pacman/query.c index dbea966..f3df923 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -268,23 +268,23 @@ static int query_search(alpm_list_t *targets) if(!config->quiet) { printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); } else { - printf("%s", alpm_pkg_get_name(pkg)); + fputs(alpm_pkg_get_name(pkg), stdout); } if(!config->quiet) { if((grp = alpm_pkg_get_groups(pkg)) != NULL) { alpm_list_t *k; - printf(" ("); + fputs(" (", stdout); for(k = grp; k; k = alpm_list_next(k)) { const char *group = k->data; - printf("%s", group); + fputs(group, stdout); if(alpm_list_next(k)) { /* only print a spacer if there are more groups */ - printf(" "); + putchar(' '); } } - printf(")"); + putchar(')'); } /* we need a newline and initial indent first */ diff --git a/src/pacman/sync.c b/src/pacman/sync.c index dd8eb74..925257e 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -359,22 +359,22 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) printf("%s/%s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); } else { - printf("%s", alpm_pkg_get_name(pkg)); + fputs(alpm_pkg_get_name(pkg), stdout); } if(!config->quiet) { if((grp = alpm_pkg_get_groups(pkg)) != NULL) { alpm_list_t *k; - printf(" ("); + fputs(" (", stdout); for(k = grp; k; k = alpm_list_next(k)) { const char *group = k->data; - printf("%s", group); + fputs(group, stdout); if(alpm_list_next(k)) { /* only print a spacer if there are more groups */ - printf(" "); + putchar(' '); } } - printf(")"); + putchar(')'); } print_installed(db_local, pkg); diff --git a/src/pacman/util.c b/src/pacman/util.c index 278b65c..2696451 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -266,7 +266,7 @@ void indentprint(const char *str, size_t indent) /* if we're not a tty, or our tty is not wide enough that wrapping even makes * sense, print without indenting */ if(cols == 0 || indent > cols) { - printf("%s", str); + fputs(str, stdout); return; } @@ -623,7 +623,7 @@ void list_display(const char *title, const alpm_list_t *list) const unsigned short maxcols = getcols(); size_t cols = len; const char *str = list->data; - printf("%s", str); + fputs(str, stdout); cols += string_length(str); for(i = alpm_list_next(list); i; i = alpm_list_next(i)) { str = i->data; @@ -641,10 +641,10 @@ void list_display(const char *title, const alpm_list_t *list) printf(" "); cols += 2; } - printf("%s", str); + fputs(str, stdout); cols += s; } - printf("\n"); + putchar('\n'); } } -- 1.7.7

1 0