- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Silence warning from clang
by Allan McRae 24 Apr '15

24 Apr '15

clang is wrong - dbfile is always used initialized in that function. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ed29e68..e608107 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -148,7 +148,7 @@ static int extract_db_file(alpm_handle_t *handle, struct archive *archive, struct archive_entry *entry, alpm_pkg_t *newpkg, const char *entryname) { char filename[PATH_MAX]; /* the actual file we're extracting */ - const char *dbfile; + const char *dbfile = NULL; if(strcmp(entryname, ".INSTALL") == 0) { dbfile = "install"; } else if(strcmp(entryname, ".CHANGELOG") == 0) { -- 2.3.5

2 1

[pacman-dev] [PATCH] makepkg-template: support multiple --template-dirs
by Dominik Fischer 24 Apr '15

24 Apr '15

Especially when maintaining local templates in addition to the ones stored in /usr/share/makepkg-template, it can be useful to include templates stored in multiple different locations into one PKGBUILD. This patch makes this possible by allowing --template-dir to be specified multiple times. This also introduces a dedicated error message when a template cannot be found, in contrast to the already existing "Couldn't detect version for template '%s'". If a template of the same name is present in more than one of the given directories, the last one always takes precedence. Neither the default behaviour without the option given, nor the handling of a single template dir is changed. Signed-off-by: Dominik Fischer <d.f.fischer(a)web.de> --- I reused some already translated strings for the new error message. Perhaps a new string should be introduced here, but I do not know what to do to update the translation files appropriately. doc/makepkg-template.1.txt | 4 +++- scripts/makepkg-template.pl.in | 41 ++++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/doc/makepkg-template.1.txt b/doc/makepkg-template.1.txt index a0a6303..03b2a38 100644 --- a/doc/makepkg-template.1.txt +++ b/doc/makepkg-template.1.txt @@ -72,7 +72,9 @@ Options Always use the newest available template file. *\--template-dir* <dir>:: - Change the dir where we are looking for template files. + Change the dir where we are looking for template files. This option may be + given multiple times in which case files found in directory given last will + take precedence. Example PKGBUILD diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index 71d2aae..6fc0171 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -27,7 +27,7 @@ use Module::Load::Conditional qw(can_load); my %opts = ( input => '@BUILDSCRIPT@', - template_dir => '@TEMPLATE_DIR@', + template_dir => ['@TEMPLATE_DIR@'], ); my $template_name_charset = qr/[[:alnum:]+_.@-]/; @@ -98,26 +98,33 @@ sub load_template { my $ret = ""; - my $path; + my $template_name = "$values->{name}"; if (!$opts{newest} and $values->{version}) { - $path = "$opts{template_dir}/$values->{name}-$values->{version}.template"; - } else { - $path = "$opts{template_dir}/$values->{name}.template"; + $template_name .= "-$values->{version}"; } + $template_name .= ".template"; - # resolve symlink(s) and use the real file's name for version detection - my ($version) = (abs_path($path) =~ /-([0-9.]+)[.]template$/); - - if (!$version) { - die sprintf(gettext("Couldn't detect version for template '%s'\n"), $values->{name}); - } + my $path; + foreach my $dir (reverse @{$opts{template_dir}}) { + $path = "$dir/$template_name"; + if ( -e $path ) { + # resolve symlink(s) and use the real file's name for version detection + my ($version) = (abs_path($path) =~ /-([0-9.]+)[.]template$/); + + if (!$version) { + die sprintf(gettext("Couldn't detect version for template '%s'\n"), $values->{name}); + } - my $parsed = process_file($path); + my $parsed = process_file($path); - $ret .= "# template start; name=$values->{name}; version=$version;\n"; - $ret .= $parsed; - $ret .= "# template end;\n"; - return $ret; + $ret .= "# template start; name=$values->{name}; version=$version;\n"; + $ret .= $parsed; + $ret .= "# template end;\n"; + return $ret; + } + } + die sprintf(gettext("failed to open '%s': %s\n"), $values->{name}, + sprintf(gettext("File '%s' not found."), $template_name)); } # process input file and load templates for all markers found @@ -199,7 +206,7 @@ GetOptions( "input|p=s" => \$opts{input}, "output|o=s" => \$opts{output}, "newest|n" => \$opts{newest}, - "template-dir=s" => \$opts{template_dir}, + "template-dir=s@" => \$opts{template_dir}, ) or usage(1); $opts{output} = $opts{input} unless $opts{output}; -- 2.3.5

2 5

[pacman-dev] [PATCH] pacsort: fix warning about signed overflow potential during comparison.
by Allan McRae 23 Apr '15

23 Apr '15

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> Some crazy person assumed we would have fewer than INT_MAX columns. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/util/pacsort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 9d248fa..b0137ec 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -308,7 +308,7 @@ static const char *nth_column(const char *string) int col; ptr = prev = string; - for(col = 1; ptr && col <= opts.sortkey; col++) { + for(col = 0; ptr && col < opts.sortkey; col++) { prev = ptr; ptr = strchr(ptr, opts.delim); if(ptr) { -- 2.3.5

1 0

[pacman-dev] Download timeouts
by David Macek 18 Apr '15

18 Apr '15

Hi. The MSYS2 package repositories are hosted on SF.net. Their balancers and/or mirrors are having problems from time to time and the users are then complaining about being unable to update databases or install packages. SF.net support says 10 seconds slow-timeout is too low. I didn't find many resources on this topic, but libalpm's source code suggests the timeout is non-configurable except when using an external downloader. Is it possible to increase the default timeout values, or to add an option to configure them in pacman.conf? -- David Macek

2 1

[pacman-dev] [PATCH] Pluralize callback string
by Allan McRae 14 Apr '15

14 Apr '15

In English, this string only has it plural form. However, we need to use the pluralized translation as some languages can have multiple plural formats. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Is "UNUSED STRING" clear enough? src/pacman/callback.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 695e38d..8d138bf 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -418,8 +418,8 @@ void cb_question(alpm_question_t *question) alpm_question_select_provider_t *q = &question->select_provider; size_t count = alpm_list_count(q->providers); char *depstring = alpm_dep_compute_string(q->depend); - colon_printf(_("There are %zd providers available for %s:\n"), count, - depstring); + colon_printf(_n("UNUSED STRING %zd %s\n", "There are %zd providers available for %s:\n", count), + count, depstring); free(depstring); select_display(q->providers); q->use_index = select_question(count); -- 2.3.5

3 2

[pacman-dev] [PATCH] package.c: prettify package size printing
by Ganesh Ajjanagadde 12 Apr '15

12 Apr '15

Unnecessary whitespace after the colon in the package size field is removed by left-justifying the size value. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> --- src/pacman/package.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 33184bd..ba4f877 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -167,10 +167,10 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) size = humanize_size(alpm_pkg_get_size(pkg), '\0', 2, &label); if(from == ALPM_PKG_FROM_SYNCDB) { - printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Download Size :"), + printf("%s%s%s %-6.2f %s\n", config->colstr.title, _("Download Size :"), config->colstr.nocolor, size, label); } else if(from == ALPM_PKG_FROM_FILE) { - printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Compressed Size:"), + printf("%s%s%s %-6.2f %s\n", config->colstr.title, _("Compressed Size:"), config->colstr.nocolor, size, label); } else { // autodetect size for "Installed Size" @@ -178,7 +178,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } size = humanize_size(alpm_pkg_get_isize(pkg), label[0], 2, &label); - printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Installed Size :"), + printf("%s%s%s %-6.2f %s\n", config->colstr.title, _("Installed Size :"), config->colstr.nocolor, size, label); string_display(_("Packager :"), alpm_pkg_get_packager(pkg), cols); -- 2.3.5

3 4

[pacman-dev] [PATCH 1/4] merge _alpm_logaction into alpm_logaction
by Andrew Gregory 12 Apr '15

12 Apr '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/log.c | 36 +++++++++++++++++++++++++++++------- lib/libalpm/util.c | 44 -------------------------------------------- lib/libalpm/util.h | 3 --- 3 files changed, 29 insertions(+), 54 deletions(-) diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index 8ee61df..fceb96f 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdarg.h> #include <errno.h> +#include <syslog.h> /* libalpm */ #include "log.h" @@ -42,11 +43,15 @@ int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix, const char *fmt, ...) { - int ret; + int ret = 0; va_list args; ASSERT(handle != NULL, return -1); + if(!(prefix && *prefix)) { + prefix = "UNKNOWN"; + } + /* check if the logstream is open already, opening it if needed */ if(handle->logstream == NULL) { int fd; @@ -54,11 +59,8 @@ int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix, fd = open(handle->logfile, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644); } while(fd == -1 && errno == EINTR); - if(fd >= 0) { - handle->logstream = fdopen(fd, "a"); - } /* if we couldn't open it, we have an issue */ - if(fd < 0 || handle->logstream == NULL) { + if(fd < 0 || (handle->logstream = fdopen(fd, "a")) == NULL) { if(errno == EACCES) { handle->pm_errno = ALPM_ERR_BADPERMS; } else if(errno == ENOENT) { @@ -71,9 +73,29 @@ int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix, } va_start(args, fmt); - ret = _alpm_logaction(handle, prefix, fmt, args); - va_end(args); + if(handle->usesyslog) { + /* we can't use a va_list more than once, so we need to copy it + * so we can use the original when calling vfprintf below. */ + va_list args_syslog; + va_copy(args_syslog, args); + vsyslog(LOG_WARNING, fmt, args_syslog); + va_end(args_syslog); + } + + if(handle->logstream) { + time_t t = time(NULL); + struct tm *tm = localtime(&t); + + /* Use ISO-8601 date format */ + fprintf(handle->logstream, "[%04d-%02d-%02d %02d:%02d] [%s] ", + tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, + tm->tm_hour, tm->tm_min, prefix); + ret = vfprintf(handle->logstream, fmt, args); + fflush(handle->logstream); + } + + va_end(args); return ret; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 26d091b..66a2742 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -27,7 +27,6 @@ #include <ctype.h> #include <dirent.h> #include <time.h> -#include <syslog.h> #include <errno.h> #include <limits.h> #include <sys/wait.h> @@ -446,49 +445,6 @@ ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path, return files; } -/** Write formatted message to log. - * @param handle the context handle - * @param format formatted string to write out - * @param args formatting arguments - * @return 0 or number of characters written on success, vfprintf return value - * on error - */ -int _alpm_logaction(alpm_handle_t *handle, const char *prefix, - const char *fmt, va_list args) -{ - int ret = 0; - - if(!(prefix && *prefix)) { - prefix = "UNKNOWN"; - } - - if(handle->usesyslog) { - /* we can't use a va_list more than once, so we need to copy it - * so we can use the original when calling vfprintf below. */ - va_list args_syslog; - va_copy(args_syslog, args); - vsyslog(LOG_WARNING, fmt, args_syslog); - va_end(args_syslog); - } - - if(handle->logstream) { - time_t t; - struct tm *tm; - - t = time(NULL); - tm = localtime(&t); - - /* Use ISO-8601 date format */ - fprintf(handle->logstream, "[%04d-%02d-%02d %02d:%02d] [%s] ", - tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, - tm->tm_hour, tm->tm_min, prefix); - ret = vfprintf(handle->logstream, fmt, args); - fflush(handle->logstream); - } - - return ret; -} - /** Execute a command with arguments in a chroot. * @param handle the context handle * @param cmd command to execute diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 4839618..95112cf 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -119,9 +119,6 @@ int _alpm_unpack(alpm_handle_t *handle, const char *archive, const char *prefix, ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path, int full_count); -int _alpm_logaction(alpm_handle_t *handle, const char *prefix, const char *fmt, va_list args) - __attribute__((format(printf, 3, 0))); - int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]); int _alpm_ldconfig(alpm_handle_t *handle); int _alpm_str_cmp(const void *s1, const void *s2); -- 2.3.5

1 3

[pacman-dev] Providing a better way for users to answer "yes" to a specific, focused question
by Charles Duffy 07 Apr '15

07 Apr '15

Howdy -- Right now, the common practice for users wishing to automate an answer of "yes" to ALPM_QUESTION_CONFLICT_PKG, ALPM_QUESTION_REPLACE_PKG, ALPM_QUESTION_REMOVE_PKGS, ALPM_QUESTION_CORRUPTED_PKG, ALPM_QUESTION_IMPORT_KEY or similar is to pipe from "yes". This has the side effect of not overriding only the single, desired option, but overriding answers for the entire set of questions -- including others which the user may not intend. While I understand the intent to encourage human involvement in deciding to take actions that could easily result in a broken system, if users _are_ going to automate such acts, it would be appropriate to provide a supported means of doing so as specific as possible. As such, I'd like to propose one of the following: - [Most limited to my immediate purpose, already implemented in my local tree]: Adding a --remove-conflicted option which makes ALPM_QUESTION_CONFLICT_PKG automatically answered "yes" - [Somewhat more general]: Adding a set of related options: --answer-{conflict,replace,remove,corrupted,import-key}={yes,no}. Not ideal, since some of these situations (particularly import-key) may be best handled with information specific to the item at hand. - Add a set of environment variables: PACMAN_QUESTION_{CONFLICT,REPLACE,REMOVE,CORRUPTED,IMPORTKEY}{,_$VALUE}={yes,no} In this proposal, a user could set PACMAN_QUESTION_IMPORTKEY_abcdefg=yes, and allow only that one key -- or PACMAN_QUESTION_IMPORTKEY=yes if they're exceptionally reckless and want to import all keys. Similarly, PACMAN_QUESTION_CONFLICT=yes to allow all conflicts to be resolved by removing a package, or PACMAN_QUESTION_CONFLICT_foo to allow conflicts over package foo to be resolved by removing that package. Would any of these, if implemented and adjusted per feedback, be likely to be considered for merge? Thanks!

1 1

[pacman-dev] [PATCH] Update source URL
by Allan McRae 27 Mar '15

27 Mar '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/index.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.txt b/doc/index.txt index d4d8ebf..170717e 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -174,7 +174,7 @@ Releases |====== Source code for all releases is available at -link:ftp://ftp.archlinux.org/other/pacman/[]. To install, download the newest +link:https://sources.archlinux.org/other/pacman/[]. To install, download the newest available source tarball, unpack it in a directory, and run the three magic commands: -- 2.3.4

1 0

[pacman-dev] [PATCH 3/3] makepkg: Empty/create only $pkgdir's relevant to current PKGBUILD (unless CLEANUP is set)
by David Macek 26 Mar '15

26 Mar '15

--- scripts/makepkg.sh.in | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6ca678e..af8a606 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2822,6 +2822,11 @@ run_split_packaging() { local pkgname_backup=${pkgname[@]} for pkgname in ${pkgname_backup[@]}; do pkgdir="$pkgdirbase/$pkgname" + # clean existing pkg directory + if [[ -d $pkgdir ]]; then + msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" + rm -rf "$pkgdir" + fi mkdir "$pkgdir" backup_package_variables run_package $pkgname @@ -3276,6 +3281,11 @@ if (( INFAKEROOT )); then chmod 755 "$pkgdirbase" if (( ! SPLITPKG )); then pkgdir="$pkgdirbase/$pkgname" + # clean existing pkg directory + if [[ -d $pkgdir ]]; then + msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" + rm -rf "$pkgdir" + fi mkdir "$pkgdir" if (( PKGFUNC )); then run_package @@ -3396,11 +3406,6 @@ else cd_safe "$startdir" fi - # clean existing pkg directory - if [[ -d $pkgdirbase ]]; then - msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" - rm -rf "$pkgdirbase" - fi mkdir -p "$pkgdirbase" chmod a-srwx "$pkgdirbase" -- 1.9.4.msysgit.2 -- David Macek

3 10