- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Quote sources in PKGBUILD prototypes
by Jason St. John 28 May '13

28 May '13

From: "Jason St. John" <jstjohn(a)purdue.edu> --- Does this require further explanation? proto/PKGBUILD-split.proto | 4 ++-- proto/PKGBUILD.proto | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 672e7df..54e5557 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -24,8 +24,8 @@ backup=() options=() install= changelog= -source=($pkgbase-$pkgver.tar.gz - $pkgname-$pkgver.patch) +source=("$pkgbase-$pkgver.tar.gz" + "$pkgname-$pkgver.patch") noextract=() md5sums=() #generate with 'makepkg -g' diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index d4c01b8..5b854ce 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -24,8 +24,8 @@ backup=() options=() install= changelog= -source=($pkgname-$pkgver.tar.gz - $pkgname-$pkgver.patch) +source=("$pkgname-$pkgver.tar.gz" + "$pkgname-$pkgver.patch") noextract=() md5sums=() #generate with 'makepkg -g' -- 1.8.3

2 1

[pacman-dev] XferCommand substitutions and quoting
by Xyne 27 May '13

27 May '13

Hi, The commented XferCommands in the default pacman.conf lack proper quoting. Would you please add single quotes around the place holders "%u" and "%o"? Thanks. Regards, Xyne

2 3

[pacman-dev] [PATCH] Indicate ignored packages in -Qu output
by Allan McRae 23 May '13

23 May '13

Add "[ignored]" after packages that have their upgrades ignored in the pacman -Qu output. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/query.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index f051571..2f336d6 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -387,8 +387,17 @@ static int display(alpm_pkg_t *pkg) && !config->op_q_changelog && !config->op_q_check) { if(!config->quiet) { const colstr_t *colstr = &config->colstr; - printf("%s%s %s%s%s\n", colstr->title, alpm_pkg_get_name(pkg), - colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); + const char *pkgname = alpm_pkg_get_name(pkg); + const char *pkgver = alpm_pkg_get_version(pkg); + + if(config->op_q_upgrade && + alpm_list_find_str(alpm_option_get_ignorepkgs(config->handle), pkgname)) { + printf("%s%s %s%s%s %s\n", colstr->title, pkgname, colstr->version, + pkgver, colstr->nocolor, _("[ignored]")); + } else { + printf("%s%s %s%s%s\n", colstr->title, pkgname, colstr->version, + pkgver, colstr->nocolor); + } } else { printf("%s\n", alpm_pkg_get_name(pkg)); } -- 1.8.2.3

2 1

[pacman-dev] Feature Request: line buffering for stdout/stderr even when they're not tty
by Damjan Georgievski 22 May '13

22 May '13

I wanted to make some analysis of the output of -Qkk and wanted to pipe both stdout and stderr to a grep pipeline pacman -Qkk 2>&1 | ... but it seems when stdout/stderr is not a tty pacman (or some lib) started using bigger, not line oriented buffers so the output got badly interwoven. -- damjan

4 3

[pacman-dev] [PATCH] makepkg-template: Stop using given/when
by Florian Pritz 22 May '13

22 May '13

given/when has been marked experimental in perl 5.18 because it will change it 5.20. if/else is ugly, but hiding the generated warning is no good solution either, so we us if/else for now. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/makepkg-template.pl.in | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index 6997a83..7e37799 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -120,21 +120,15 @@ sub process_file { if ($line =~ $template_marker) { my $values = parse_template_line($line, $filename, $linenumber); - given ($values->{command}) { - when (['start', 'input']) { - if ($nesting_level == 0) { - $ret .= load_template($values); - } - } - - when ('end') { - # nothing to do here, just for completeness - } - - default { - die sprintf(gettext("Unknown template marker '%s'\n"), $values->{command}), - "$filename:$linenumber: $line"; + if ($values->{command} eq "start" or $values->{command} eq "input") { + if ($nesting_level == 0) { + $ret .= load_template($values); } + } elsif ($values->{command} eq "end") { + # nothing to do here, just for completeness + } else { + die sprintf(gettext("Unknown template marker '%s'\n"), $values->{command}), + "$filename:$linenumber: $line"; } $nesting_level++ if $values->{command} eq "start"; -- 1.8.2.3

1 0

[pacman-dev] [PATCH] Improve and colourize VerbosePkgList
by Simon Gomizelj 22 May '13

22 May '13

Improve VerbosePkgList by caching attributes then and cell's length with the cell's label instead of recalculating. Right align every cell that containing a file size, not just the last collumn. Simplify printf statements and the alignment application. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- src/pacman/util.c | 135 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 60 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 862c8e8..70a76b8 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -52,6 +52,18 @@ struct table_row_t { int size; }; +struct verbose_cell_t { + char *label; + size_t len; + int mode; +}; + +enum { + CELL_NORMAL = 0, + CELL_TITLE = 1, + CELL_RIGHT_ALIGN = 1 << 2 +}; + int trans_init(alpm_transflag_t flags, int check_valid) { int ret; @@ -424,6 +436,35 @@ static size_t string_length(const char *s) return len; } +static void add_verbose_cell(alpm_list_t **row, char *label, int mode) +{ + struct verbose_cell_t *cell = malloc(sizeof(struct verbose_cell_t)); + + cell->label = label; + cell->mode = mode; + cell->len = string_length(label); + + *row = alpm_list_add(*row, cell); +} + +static void free_verbose_cell(void *ptr) +{ + struct verbose_cell_t *cell = ptr; + + free(cell->label); + free(cell); +} + +static void add_transaction_sizes_row(alpm_list_t **table, const char *label, int size) +{ + struct table_row_t *row = malloc(sizeof(struct table_row_t)); + + row->label = label; + row->size = size; + + *table = alpm_list_add(*table, row); +} + void string_display(const char *title, const char *string, unsigned short cols) { if(title) { @@ -442,43 +483,30 @@ void string_display(const char *title, const char *string, unsigned short cols) static void table_print_line(const alpm_list_t *line, short col_padding, size_t colcount, size_t *widths, int *has_data) { - size_t i, lastcol = 0; + size_t i; int need_padding = 0; const alpm_list_t *curcell; - for(i = colcount; i > 0; i--) { - if(has_data[i - 1]) { - lastcol = i - 1; - break; - } - } - for(i = 0, curcell = line; curcell && i < colcount; i++, curcell = alpm_list_next(curcell)) { - const char *value; + const struct verbose_cell_t *cell = curcell->data; + const char *str = (cell->label ? cell->label : ""); int cell_padding; if(!has_data[i]) { continue; } - value = curcell->data; - if(!value) { - value = ""; - } - /* silly printf requires padding size to be an int */ - cell_padding = (int)widths[i] - (int)string_length(value); - if(cell_padding < 0) { - cell_padding = 0; - } + cell_padding = (cell->mode & CELL_RIGHT_ALIGN ? (int)widths[i] : -(int)widths[i]); + if(need_padding) { printf("%*s", col_padding, ""); } - /* left-align all but the last column */ - if(i != lastcol) { - printf("%s%*s", value, cell_padding, ""); + + if(cell->mode & CELL_TITLE) { + printf("%s%*s%s", config->colstr.title, cell_padding, str, config->colstr.nocolor); } else { - printf("%*s%s", cell_padding, "", value); + printf("%*s", cell_padding, str); } need_padding = 1; } @@ -487,7 +515,6 @@ static void table_print_line(const alpm_list_t *line, short col_padding, } - /** * Find the max string width of each column. Also determines whether values * exist in the column and sets the value in has_data accordingly. @@ -522,7 +549,8 @@ static size_t table_calc_widths(const alpm_list_t *header, } /* header determines column count and initial values of longest_strs */ for(i = header, curcol = 0; i; i = alpm_list_next(i), curcol++) { - colwidths[curcol] = string_length(i->data); + const struct verbose_cell_t *row = i->data; + colwidths[curcol] = row->len; /* note: header does not determine whether column has data */ } @@ -531,8 +559,8 @@ static size_t table_calc_widths(const alpm_list_t *header, /* grab first column of each row and iterate through columns */ const alpm_list_t *j = i->data; for(curcol = 0; j; j = alpm_list_next(j), curcol++) { - const char *str = j->data; - size_t str_len = string_length(str); + const struct verbose_cell_t *row = j->data; + size_t str_len = row ? row->len : 0; if(str_len > colwidths[curcol]) { colwidths[curcol] = str_len; @@ -597,11 +625,10 @@ static int table_display(const char *title, const alpm_list_t *header, } if(title != NULL) { - printf("%s\n\n", title); + printf("%s%s%s\n\n", config->colstr.title, title, config->colstr.nocolor); } table_print_line(header, padding, totalcols, widths, has_data); - printf("\n"); for(i = rows; i; i = alpm_list_next(i)) { table_print_line(i->data, padding, totalcols, widths, has_data); @@ -761,21 +788,15 @@ void signature_display(const char *title, alpm_siglist_t *siglist, /* creates a header row for use with table_display */ static alpm_list_t *create_verbose_header(void) { - alpm_list_t *res = NULL; - char *str; + alpm_list_t *ret = NULL; - str = _("Name"); - res = alpm_list_add(res, str); - str = _("Old Version"); - res = alpm_list_add(res, str); - str = _("New Version"); - res = alpm_list_add(res, str); - str = _("Net Change"); - res = alpm_list_add(res, str); - str = _("Download Size"); - res = alpm_list_add(res, str); - - return res; + add_verbose_cell(&ret, _("Name"), CELL_TITLE); + add_verbose_cell(&ret, _("Old Version"), CELL_TITLE); + add_verbose_cell(&ret, _("New Version"), CELL_TITLE); + add_verbose_cell(&ret, _("Net Change"), CELL_TITLE); + add_verbose_cell(&ret, _("Download Size"), CELL_TITLE); + + return ret; } /* returns package info as list of strings */ @@ -798,23 +819,23 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) } else { pm_asprintf(&str, "%s", alpm_pkg_get_name(target->remove)); } - ret = alpm_list_add(ret, str); + add_verbose_cell(&ret, str, CELL_NORMAL); /* old and new versions */ pm_asprintf(&str, "%s", target->remove != NULL ? alpm_pkg_get_version(target->remove) : ""); - ret = alpm_list_add(ret, str); + add_verbose_cell(&ret, str, CELL_NORMAL); pm_asprintf(&str, "%s", target->install != NULL ? alpm_pkg_get_version(target->install) : ""); - ret = alpm_list_add(ret, str); + add_verbose_cell(&ret, str, CELL_NORMAL); /* and size */ size -= target->remove ? alpm_pkg_get_isize(target->remove) : 0; size += target->install ? alpm_pkg_get_isize(target->install) : 0; human_size = humanize_size(size, 'M', 2, &label); pm_asprintf(&str, "%.2f %s", human_size, label); - ret = alpm_list_add(ret, str); + add_verbose_cell(&ret, str, CELL_RIGHT_ALIGN); size = target->install ? alpm_pkg_download_size(target->install) : 0; if(size != 0) { @@ -823,21 +844,11 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) } else { str = NULL; } - ret = alpm_list_add(ret, str); + add_verbose_cell(&ret, str, CELL_RIGHT_ALIGN); return ret; } -static void add_transaction_sizes_row(alpm_list_t **table, const char *label, int size) -{ - struct table_row_t *row = malloc(sizeof(struct table_row_t)); - - row->label = label; - row->size = size; - - *table = alpm_list_add(*table, row); -} - static void display_transaction_sizes(alpm_list_t *table) { alpm_list_t *i; @@ -894,7 +905,10 @@ static void _display_targets(alpm_list_t *targets, int verbose) for(i = targets; i; i = alpm_list_next(i)) { pm_target_t *target = i->data; - rows = alpm_list_add(rows, create_verbose_row(target)); + if(verbose) { + rows = alpm_list_add(rows, create_verbose_row(target)); + } + if(target->install) { pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), alpm_pkg_get_version(target->install)); @@ -927,8 +941,9 @@ static void _display_targets(alpm_list_t *targets, int verbose) /* rows is a list of lists of strings, free inner lists here */ for(i = rows; i; i = alpm_list_next(i)) { - alpm_list_t *lp = i->data; - FREELIST(lp); + if(i->data) { + alpm_list_free_inner(i->data, free_verbose_cell); + } } alpm_list_free(rows); FREELIST(names); -- 1.8.2.3

3 3

[pacman-dev] [PATCH] makepkg: list files containing $srcdir (FS#31558)
by Phillip Smith 21 May '13

21 May '13

From: Phillip Smith <fukawi2(a)gmail.com> when checking for files in a built package that contain references to $srcdir or $pkgdir_base, show the files that match to assist in debugging. Signed-off-by: Phillip Smith <fukawi2(a)gmail.com> --- scripts/makepkg.sh.in | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 75ddfe5..1b3cc5a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1606,11 +1606,19 @@ tidy_install() { done # check for references to the build and package directory - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then - warning "$(gettext "Package contains reference to %s")" "\$srcdir" + mapfile -t srcdir_refs <<< $(cd "${pkgdir}" && find -type f -exec grep -I -l "$srcdir" {} \;) + if [[ -n ${srcdir_refs[*]} ]] ; then + warning "$(gettext "The following files within the package reference %s")" "\$srcdir" + for fname in ${srcdir_refs[*]} ; do + printf " %s\n" "$fname" + done fi - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdirbase}" ; then - warning "$(gettext "Package contains reference to %s")" "\$pkgdir" + mapfile -t pkgdir_refs <<< $(cd "${pkgdir}" && find -type f -exec grep -I -l "${pkgdirbase}" {} \;) + if [[ -n ${pkgdir_refs[*]} ]] ; then + warning "$(gettext "The following files within the package reference %s")" "\$pkgdir" + for fname in ${pkgdir_refs[*]} ; do + printf " %s\n" "$fname" + done fi if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then -- 1.8.2.3

3 5

[pacman-dev] [PATCH] makepkg: list files containing $srcdir (FS#31558)
by Phillip Smith 20 May '13

20 May '13

Attached is a patch to resolve FS#31558 [1] Submitted it to the list at Allan's request :) Cheers, ~p [1] https://bugs.archlinux.org/task/31558

4 5

[pacman-dev] [PATCH] Improve error message when package is missing required signature
by Allan McRae 20 May '13

20 May '13

When attempting to install a package (either via -S or -U) and the signature is missing, the current error message "invalid or corrupted package (PGP signature)" is very unclear. Instead inform the user that the package is missing the required signature. Partial fix for FS#34741. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 1 + lib/libalpm/be_package.c | 6 +++++- lib/libalpm/error.c | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2277a69..806cd95 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1267,6 +1267,7 @@ typedef enum _alpm_errno_t { ALPM_ERR_PKG_INVALID, ALPM_ERR_PKG_INVALID_CHECKSUM, ALPM_ERR_PKG_INVALID_SIG, + ALPM_ERR_PKG_MISSING_SIG, ALPM_ERR_PKG_OPEN, ALPM_ERR_PKG_CANT_REMOVE, ALPM_ERR_PKG_INVALID_NAME, diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index cfe5fb3..ea48b6e 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -323,9 +323,13 @@ int _alpm_pkg_validate_internal(alpm_handle_t *handle, } /* even if we don't have a sig, run the check code if level tells us to */ - if(has_sig || level & ALPM_SIG_PACKAGE) { + if(level & ALPM_SIG_PACKAGE) { const char *sig = syncpkg ? syncpkg->base64_sig : NULL; _alpm_log(handle, ALPM_LOG_DEBUG, "sig data: %s\n", sig ? sig : "<from .sig>"); + if(!sig) { + handle->pm_errno = ALPM_ERR_PKG_MISSING_SIG; + return -1; + } if(_alpm_check_pgp_helper(handle, pkgfile, sig, level & ALPM_SIG_PACKAGE_OPTIONAL, level & ALPM_SIG_PACKAGE_MARGINAL_OK, level & ALPM_SIG_PACKAGE_UNKNOWN_OK, sigdata)) { diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index a59f4fe..8622180 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -111,6 +111,8 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err) return _("invalid or corrupted package (checksum)"); case ALPM_ERR_PKG_INVALID_SIG: return _("invalid or corrupted package (PGP signature)"); + case ALPM_ERR_PKG_MISSING_SIG: + return _("package missing required signature"); case ALPM_ERR_PKG_OPEN: return _("cannot open package file"); case ALPM_ERR_PKG_CANT_REMOVE: -- 1.8.2.3

3 4

[pacman-dev] [PATCH] makepkg-template: Add gettext support
by Florian Pritz 20 May '13

20 May '13

This also slighty changes the word order in the description for --newest. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/makepkg-template.pl.in | 74 +++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index 1ba007b..10035a6 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -5,7 +5,8 @@ use v5.10.1; use Cwd qw(abs_path); use File::Spec; use Getopt::Long; -use Pod::Usage; +use Module::Load; +use Module::Load::Conditional qw(can_load); my %opts = ( input => '@BUILDSCRIPT@', @@ -15,9 +16,27 @@ my %opts = ( my $template_name_charset = qr/[[:alnum:]+_.@-]/; my $template_marker = qr/# template/; +# runtime loading to avoid dependency on cpan since this is the only non-core module +my $have_gettext = can_load(modules => {'Locale::gettext' => undef}); +if ($have_gettext) { + load 'Locale::gettext', qw(gettext); + Locale::gettext::bindtextdomain("pacman-scripts", '@localedir@'); + Locale::gettext::textdomain("pacman-scripts"); +} + +sub _ { + my ($string) = @_; + + if ($have_gettext) { + return gettext($string); + } else { + return $string; + } +} + sub burp { my ($file_name, @lines) = @_; - open (my $fh, ">", $file_name) || die "can't create $file_name $!" ; + open (my $fh, ">", $file_name) || die sprintf(_("can't create '%s': %s"), $file_name, $!); print $fh @lines; close $fh; } @@ -34,20 +53,22 @@ sub parse_template_line { foreach my $element (@elements) { my ($key, $val) = ($element =~ /^([a-z0-9]+)=(.*)$/); - die "invalid key/value pair $filename:$linenumber: $line" - unless $key and $val; + unless ($key and $val) { + die _("invalid key/value pair\n%s:%s: %s"), + "$filename:$linenumber: $line"; + } $values{$key} = $val; } # end doesn't take arguments if ($values{command} ne "end") { if (!$values{name}) { - die "invalid template line: can't find template name\n", + die _("invalid template line: can't find template name\n"), "$filename:$linenumber: $line"; } unless ($values{name} =~ /^$template_name_charset+$/) { - die "invalid chars used in name '$values{name}'. allowed: [:alnum:]+_.@-\n", + die sprintf(_("invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"), $values{name}), "$filename:$linenumber: $line"; } } @@ -72,7 +93,7 @@ sub load_template { my ($version) = (abs_path($path) =~ /-([0-9.]+)[.]template$/); if (!$version) { - die "Couldn't detect version for template '$values->{name}'"; + die sprintf(_("Couldn't detect version for template '%s'"), $values->{name}); } my $parsed = process_file($path); @@ -91,7 +112,7 @@ sub process_file { my $nesting_level = 0; my $linenumber = 0; - open (my $fh, "<", $filename) or die "failed to open '$filename': $!"; + open (my $fh, "<", $filename) or die sprintf(_("failed to open '%s': %s"), $filename, $!); my @lines = <$fh>; close $fh; @@ -113,7 +134,7 @@ sub process_file { } default { - die "Unknown template marker '$values->{command}'\n", + die sprintf(_("Unknown template marker '%s'\n"), $values->{command}), "$filename:$linenumber: $line"; } } @@ -134,15 +155,30 @@ sub process_file { return $ret; } +sub usage { + my ($exitstatus) = @_; + print "makepkg-template [options]\n"; + print "\n"; + print _("Options:\n"); + printf(_(" --input, -p <file> Build script to read (default: %s)\n"), '@BUILDSCRIPT@'); + print _(" --output, -o <file> file to output to (default: input file)\n"); + print _(" --newest, -n update templates to newest version\n"); + print _(" (default: use version specified in the template markers)\n"); + print _(" --template-dir <dir> directory to search for templates\n"); + printf(_(" (default: %s)\n"), '@TEMPLATE_DIR@'); + print "\n"; + exit($exitstatus); +} + Getopt::Long::Configure ("bundling"); GetOptions( - "help" => sub {pod2usage(-exitval => 0, -verbose => 1); }, - "h" => sub {pod2usage(-exitval => 0, -verbose => 0); }, + "help" => sub {usage(0); }, + "h" => sub {usage(0); }, "input|p=s" => \$opts{input}, "output|o=s" => \$opts{output}, "newest|n" => \$opts{newest}, "template-dir=s" => \$opts{template_dir}, -) or pod2usage(1); +) or usage(1); $opts{output} = $opts{input} unless $opts{output}; @@ -151,18 +187,4 @@ $opts{output} = "/dev/stdout" if $opts{output} eq "-"; burp($opts{output}, process_file($opts{input})); -__END__ -=head1 SYNOPSIS - -makepkg-template [options] - - Options: - --input, -p <file> Build script to read (default: @BUILDSCRIPT@) - --output, -o <file> file to output to (default: input file) - --newest, -n update templates to newest version - (default: use specified version in the template markers) - --template-dir <dir> directory to search for templates - (default: @TEMPLATE_DIR@) - -=cut # vim: set noet: -- 1.8.2.3

2 5