- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix typo in PKGBUILD man page
by Allan McRae 11 Oct '11

11 Oct '11

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 60d8e53..0ba9ca8 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -87,7 +87,7 @@ similar to `$_basekernver`. Specifies a special install script that is to be included in the package. This file should reside in the same directory as the PKGBUILD, and will be copied into the package by makepkg. It does not need to be included - in the source array (e.g., `install=pkgname.install`). + in the source array (e.g., `install=$pkgname.install`). *changelog*:: Specifies a changelog file that is to be included in the package. -- 1.7.7

1 1

[pacman-dev] [PATCH] VerbosePkgLists: format table lines in i18n-compatible way
by Dan McGee 11 Oct '11

11 Oct '11

This had the unfortunate implementation detail that depended on the strings having 1 byte == 1 column hold true. As we know, this is not at all the case once you move past the base ASCII character set. Reimplement this whole thing so it doesn't depend on format strings at all. Instead, simply calculate the max column widths, and then when displaying each row add the correct amount of padding using UTF-8 safe string length functions. Before: 名字旧版本新版本净变化下载大小 libgee 0.6.2.1-1 0.60 MiB 0.10 MiB libsocialweb 0.25.19-2 1.92 MiB 0.23 MiB folks 0.6.3.2-1 1.38 MiB 0.25 MiB After: 名字旧版本新版本净变化下载大小 libgee 0.6.2.1-1 0.60 MiB 0.10 MiB libsocialweb 0.25.19-2 1.92 MiB 0.23 MiB folks 0.6.3.2-1 1.38 MiB 0.25 MiB Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Given the scope of this change, I'd rather wait for 4.0.1 to land this so it gets at least a little testing in -git first and doesn't cause segfaults. Note this also removes the two extra spaces in the final column because we weren't good about padding between columns, instead we had padding on every column. Lesson to be learned here: don't use exotic format strings. src/pacman/util.c | 89 ++++++++++++++++++++++++++++------------------------- 1 files changed, 47 insertions(+), 42 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 79fb54d..ee8fe3f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -488,34 +488,47 @@ void string_display(const char *title, const char *string) } static void table_print_line(const alpm_list_t *line, - const alpm_list_t *formats) + size_t colcount, size_t *widths) { - const alpm_list_t *curformat = formats; - const alpm_list_t *curcell = line; + size_t i; + const alpm_list_t *curcell; - while(curcell && curformat) { - printf(alpm_list_getdata(curformat), alpm_list_getdata(curcell)); - curcell = alpm_list_next(curcell); - curformat = alpm_list_next(curformat); + for(i = 0, curcell = line; curcell && i < colcount; + i++, curcell = alpm_list_next(curcell)) { + const char *value = curcell->data; + size_t len = string_length(value); + /* silly printf requires padding size to be an int */ + int padding = (int)widths[i] - (int)len; + if(padding < 0) { + padding = 0; + } + /* left-align all but the last column */ + if(i + 1 < colcount) { + printf("%s%*s", value, padding, ""); + } else { + printf("%*s%s", padding, "", value); + } } printf("\n"); } -/* creates format strings by checking max cell lengths in cols */ -static alpm_list_t *table_create_format(const alpm_list_t *header, - const alpm_list_t *rows) +/* find the max string width of each column */ +static size_t table_calc_widths(const alpm_list_t *header, + const alpm_list_t *rows, size_t totalcols, size_t **widths) { - alpm_list_t *formats = NULL; const alpm_list_t *i; const unsigned short padding = 2; - size_t curcol, totalcols, totalwidth = 0; + size_t curcol, totalwidth = 0; size_t *colwidths; - totalcols = alpm_list_count(header); + if(totalcols <= 0) { + return 0; + } + colwidths = malloc(totalcols * sizeof(size_t)); if(!colwidths) { - return NULL; + return 0; } /* header determines column count and initial values of longest_strs */ for(i = header, curcol = 0; i; i = alpm_list_next(i), curcol++) { @@ -536,30 +549,16 @@ static alpm_list_t *table_create_format(const alpm_list_t *header, } } - /* now use the column width info to generate format strings */ - for(curcol = 0; curcol < totalcols; curcol++) { - const char *display; - char *formatstr; - size_t colwidth = colwidths[curcol] + padding; - totalwidth += colwidth; - - /* right align the last column for a cleaner table display */ - display = (curcol + 1 < totalcols) ? "%%-%ds" : "%%%ds"; - pm_asprintf(&formatstr, display, colwidth); - - formats = alpm_list_add(formats, formatstr); - } - - free(colwidths); - - /* return NULL if terminal is not wide enough */ - if(totalwidth > getcols()) { - fprintf(stderr, _("insufficient columns available for table display\n")); - FREELIST(formats); - return NULL; + for(i = header, curcol = 0; i; i = alpm_list_next(i), curcol++) { + /* pad everything but the last column */ + if(curcol + 1 < totalcols) { + colwidths[curcol] += padding; + } + totalwidth += colwidths[curcol]; } - return formats; + *widths = colwidths; + return totalwidth; } /** Displays the list in table format @@ -576,14 +575,20 @@ int table_display(const char *title, const alpm_list_t *header, const alpm_list_t *rows) { const alpm_list_t *i; - alpm_list_t *formats; + size_t *widths = NULL, totalcols, totalwidth; if(rows == NULL || header == NULL) { return 0; } - formats = table_create_format(header, rows); - if(formats == NULL) { + totalcols = alpm_list_count(header); + totalwidth = table_calc_widths(header, rows, totalcols, &widths); + /* return -1 if terminal is not wide enough */ + if(totalwidth > getcols()) { + fprintf(stderr, _("insufficient columns available for table display\n")); + return -1; + } + if(!totalwidth || !widths) { return -1; } @@ -591,14 +596,14 @@ int table_display(const char *title, const alpm_list_t *header, printf("%s\n\n", title); } - table_print_line(header, formats); + table_print_line(header, totalcols, widths); printf("\n"); for(i = rows; i; i = alpm_list_next(i)) { - table_print_line(alpm_list_getdata(i), formats); + table_print_line(alpm_list_getdata(i), totalcols, widths); } - FREELIST(formats); + free(widths); return 0; } -- 1.7.7

1 1

[pacman-dev] i18n and VerbosePkgLists (was: pacman 4.0.0 string freeze)
by Dan McGee 11 Oct '11

11 Oct '11

On Mon, Oct 10, 2011 at 8:08 PM, Christos Nouskas <nous(a)archlinux.us> wrote: > On 6 October 2011 06:48, Dan McGee <dpmcgee(a)gmail.com> wrote: >> If you've helped us out before, or are looking to get involved, the >> string freeze for the magic 4.0 release is now in effect. > > Dan, alpm_list_free(header) doesn't display correctly in other > languages when VerbosePkgLists is enabled in pacman.conf. Please see > http://pastebin.archlinux.fr/434271 The alpm_list_free() bit is confusing here (and doesn't really make sense); but the gist of what you were getting at is the widths of the headers don't line up when they are translated and are formed with multibyte characters. This is something we did discover but hadn't fixed yet; expect a fix in 4.0.1. -Dan

1 0

[pacman-dev] [translation] pacman 4.0.0 string freeze
by Dan McGee 11 Oct '11

11 Oct '11

If you've helped us out before, or are looking to get involved, the string freeze for the magic 4.0 release is now in effect. Translators: http://www.archlinux.org/pacman/translation-help.html Transifex release page: https://www.transifex.net/projects/p/archlinux-pacman/r/4-0-0/ I've set the deadline 7 days from today. -Dan

3 2

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

11 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 abfa8370c0009e415ef2fa97b96c8b042002d92a (commit) via 8f414cd040aa11957a443ddda42ad14b83733007 (commit) via fb401f569e2d85cf90e45deeeeb28992360d60f7 (commit) via 36f31dd133a6833f641823c3e3c12b0c0edca877 (commit) via cc13f4753211599f1579a714f41f55a8c5d99081 (commit) from 9168977b3b33e1aa3f9d130bbd82be4536684171 (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 abfa8370c0009e415ef2fa97b96c8b042002d92a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 9 23:03:04 2011 -0400 dload: unhook error buffer after transfer finishes Similar to what we did in edd9ed6a, disconnect the relationship with our stack allocated error buffer from the curl handle. Just as an FTP connection might have some network chatter on teardown causing the progress callback to be triggered, we might also hit an error condition that causes curl to write to our (now out of scope) error buffer. I'm unable to reproduce FS#26327, but I have a suspicion that this should fix it. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f414cd040aa11957a443ddda42ad14b83733007 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Mon Oct 10 15:22:52 2011 +0200 pactree: Make error message smarter in register_syncs() Our error message used to be very unclear when the configuration file could not be found: $ ./pactree -lsr gtk error: failed to register sync DBs Instead, display an accurate message and include the file name: $ ./pactree -lsr gtk error: config file /usr/local/etc/pacman.conf could not be read Also, move the error message inside register_syncs() to allow for differentiating between different errors that might require a handler in the future. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb401f569e2d85cf90e45deeeeb28992360d60f7 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Mon Oct 10 14:38:59 2011 +0200 pactree: Add "--config" option This allows for specifying an alternate configuration file path, similar to pacman's "--config" option. Given that there is currently no other way to tell pactree to read from another configuration file (except for patching or symlinking), this seems totally sensible - even if there are plans to refactor and/or replace the standalone configuration file parser. We do not define a short option for the sake of consistency with pacman's set of command line options. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 36f31dd133a6833f641823c3e3c12b0c0edca877 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 8 19:38:01 2011 +1000 makepkg: strip comments after pkgver/pkgrel when checking value Inline comments after pkgver or pkgrel would cause the sanity checks to fail so remove them before checking the value. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cc13f4753211599f1579a714f41f55a8c5d99081 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Oct 7 16:40:43 2011 +1000 Format pacsort and vercmp testsuite output Make the output into a single block and add separators at the end so that they do not merge into each other. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/dload.c | 5 ++++- scripts/makepkg.sh.in | 4 ++-- src/util/pactree.c | 20 ++++++++++++++++---- test/util/pacsorttest.sh | 6 ++++-- test/util/vercmptest.sh | 6 ++++-- 5 files changed, 30 insertions(+), 11 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pactree: Add "--config" option
by Lukas Fleischer 11 Oct '11

11 Oct '11

This allows for specifying an alternate configuration file path, similar to pacman's "--config" option. Given that there is currently no other way to tell pactree to read from another configuration file (except for patching or symlinking), this seems totally sensible - even if there are plans to refactor and/or replace the standalone configuration file parser. We do not define a short option for the sake of consistency with pacman's set of command line options. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- src/util/pactree.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/util/pactree.c b/src/util/pactree.c index 09fe101..5e98f79 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -76,6 +76,11 @@ static struct color_choices no_color = { "" }; +/* long operations */ +enum { + OP_CONFIG = 1000 +}; + /* globals */ alpm_handle_t *handle = NULL; alpm_list_t *walked = NULL; @@ -90,6 +95,7 @@ int reverse = 0; int unique = 0; int searchsyncs = 0; const char *dbpath = DBPATH; +const char *configfile = CONFFILE; #ifndef HAVE_STRNDUP /* A quick and dirty implementation derived from glibc */ @@ -154,7 +160,7 @@ static int register_syncs(void) { char line[LINE_MAX]; const alpm_siglevel_t level = ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; - fp = fopen(CONFFILE, "r"); + fp = fopen(configfile, "r"); if(!fp) { return 1; } @@ -202,6 +208,8 @@ static int parse_options(int argc, char *argv[]) {"reverse", no_argument, 0, 'r'}, {"sync", no_argument, 0, 'S'}, {"unique", no_argument, 0, 'u'}, + + {"config", required_argument, 0, OP_CONFIG}, {0, 0, 0, 0} }; @@ -211,6 +219,9 @@ static int parse_options(int argc, char *argv[]) } switch(opt) { + case OP_CONFIG: + configfile = optarg; + break; case 'b': dbpath = optarg; break; @@ -263,11 +274,12 @@ static void usage(void) " -c, --color colorize output\n" " -d, --depth <#> limit the depth of recursion\n" " -g, --graph generate output for graphviz's dot\n" + " -h, --help display this help message\n" " -l, --linear enable linear output\n" " -r, --reverse show reverse dependencies\n" " -s, --sync search sync DBs instead of local\n" - " -u, --unique show dependencies with no duplicates (implies -l)\n\n" - " -h, --help display this help message\n"); + " -u, --unique show dependencies with no duplicates (implies -l)\n" + " --config <path> set an alternate configuration file\n"); } static void cleanup(void) -- 1.7.7

2 4

[pacman-dev] [PATCH 1/2] dload: unhook error buffer after transfer finishes
by Dave Reisner 10 Oct '11

10 Oct '11

Similar to what we did in edd9ed6a, disconnect the relationship with our stack allocated error buffer from the curl handle. Just as an FTP connection might have some network chatter on teardown causing the progress callback to be triggered, we might also hit an error condition that causes curl to write to our (now out of scope) error buffer. I'm unable to reproduce FS#26327, but I have a suspicion that this should fix it. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/dload.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 33824be..e848b30 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -377,8 +377,11 @@ static int curl_download_internal(struct dload_payload *payload, /* perform transfer */ payload->curlerr = curl_easy_perform(curl); - /* immediately unhook the progress callback */ + /* disconnect relationships from the curl handle for things that might go out + * of scope, but could still be touched on connection teardown. This really + * only applies to FTP transfers. See FS#26327 for an example. */ curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L); + curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)0); /* was it a success? */ switch(payload->curlerr) { -- 1.7.7

3 5

[pacman-dev] [PATCH] makepkg: strip comments after pkgver/pkgrel when checking value
by Allan McRae 10 Oct '11

10 Oct '11

Inline comments after pkgver or pkgrel would cause the sanity checks to fail so remove them before checking the value. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 84221d0..50cf272 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1448,7 +1448,7 @@ check_sanity() { ret=1 fi - awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | + awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "$i")\" if [[ $i = *[[:space:]:-]* ]]; then @@ -1457,7 +1457,7 @@ check_sanity() { fi done || ret=1 - awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | + awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "$i")\" if [[ $i = *[[:space:]-]* ]]; then -- 1.7.7

1 0

[pacman-dev] [PATCH] Format pacsort and vercmp testsuite output
by Allan McRae 10 Oct '11

10 Oct '11

Make the output into a single block and add separators at the end so that they do not merge into each other. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/util/pacsorttest.sh | 6 ++++-- test/util/vercmptest.sh | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/test/util/pacsorttest.sh b/test/util/pacsorttest.sh index ff82a53..9d52d69 100755 --- a/test/util/pacsorttest.sh +++ b/test/util/pacsorttest.sh @@ -40,10 +40,11 @@ runtest() { if ! type -p "$bin"; then echo "pacsort binary ($bin) could not be located" + echo exit 1 fi -echo "Beginning pacsort tests" +echo "Running pacsort tests..." # BEGIN TESTS @@ -93,11 +94,12 @@ runtest "$separator" "$separator_reverse" "really long input, sort key, separato #END TESTS -echo if [[ $failure -eq 0 ]]; then echo "All $total tests successful" + echo exit 0 fi echo "$failure of $total tests failed" +echo exit 1 diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh index 6b4bcbc..04b841f 100755 --- a/test/util/vercmptest.sh +++ b/test/util/vercmptest.sh @@ -64,10 +64,11 @@ runtest() { if ! type -p "$bin"; then echo "vercmp binary ($bin) could not be located" + echo exit 1 fi -echo "Beginning vercmp tests" +echo "Running vercmp tests..." # BEGIN TESTS @@ -145,11 +146,12 @@ runtest 1:1.1 1.1 1 #END TESTS -echo if [[ $failure -eq 0 ]]; then echo "All $total tests successful" + echo exit 0 fi echo "$failure of $total tests failed" +echo exit 1 -- 1.7.7

1 0

[pacman-dev] Improvements to the Norwegian Bokmål (nb) translation
by Alexander Rødseth 10 Oct '11

10 Oct '11

Hi, I felt the Norwegian Bokmål translation could need a little touch up. Attaching nb.patch that can be applied with "git apply". -- Cordially, Alexander Rødseth Arch Linux Trusted User (xyproto on IRC, trontonic on AUR)

2 3