February 2019 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: propagate E_REMOVE_BUILD_DEPS
by Alad Wenter 07 Oct '19

07 Oct '19

remove_deps is called once, at the end of clean_up() before makepkg exit. If remove_deps returns >0 (e.g. when pressing "n" in the resulting prompt), the error is caught by the ERR signal handler. This in turns sends SIGUSR1 to the process group, with resulting exit code 138. In case remove_deps fails, this patch exits makepkg with E_REMOVE_DEPS if there was no previous error (that is, EXIT_CODE equals E_OK). Otherwise, makepkg exits with EXIT_CODE. --- scripts/makepkg.sh.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c81dc801..fd459532 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -176,7 +176,11 @@ clean_up() { fi fi - remove_deps + if ! remove_deps && (( EXIT_CODE == E_OK )); then + exit $E_REMOVE_DEPS_FAILED + else + exit $EXIT_CODE + fi } enter_fakeroot() { -- 2.20.1

2 1

[pacman-dev] [PATCH 1/2] pacman: refactor file match printing to its own function
by morganamilo 29 May '19

29 May '19

Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- src/pacman/files.c | 56 +++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index fa4170bd..3ebd9b9b 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -99,11 +99,39 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) { return 0; } +static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg) +{ + alpm_db_t *db_local = alpm_get_localdb(config->handle); + const colstr_t *colstr = &config->colstr; + + if(config->op_f_machinereadable) { + alpm_list_t *ml; + for(ml = match; ml; ml = alpm_list_next(ml)) { + char *filename = ml->data; + print_line_machinereadable(repo, pkg, filename); + } + } else if(config->quiet) { + printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg)); + } else { + alpm_list_t *ml; + printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(repo), + colstr->title, alpm_pkg_get_name(pkg), + colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); + + print_groups(pkg); + print_installed(db_local, pkg); + printf("\n"); + + for(ml = match; ml; ml = alpm_list_next(ml)) { + char *filename = ml->data; + printf(" %s\n", filename); + } + } +} + static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { int ret = 0; - alpm_db_t *db_local = alpm_get_localdb(config->handle); alpm_list_t *t; - const colstr_t *colstr = &config->colstr; for(t = targets; t; t = alpm_list_next(t)) { char *targ = t->data; @@ -148,29 +176,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { } if(match != NULL) { - if(config->op_f_machinereadable) { - alpm_list_t *ml; - for(ml = match; ml; ml = alpm_list_next(ml)) { - char *filename = ml->data; - print_line_machinereadable(repo, pkg, filename); - } - } else if(config->quiet) { - printf("%s/%s\n", alpm_db_get_name(repo), alpm_pkg_get_name(pkg)); - } else { - alpm_list_t *ml; - printf("%s%s/%s%s %s%s%s", colstr->repo, alpm_db_get_name(repo), - colstr->title, alpm_pkg_get_name(pkg), - colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); - - print_groups(pkg); - print_installed(db_local, pkg); - printf("\n"); - - for(ml = match; ml; ml = alpm_list_next(ml)) { - c = ml->data; - printf(" %s\n", c); - } - } + print_match(match, repo, pkg); alpm_list_free(match); } } -- 2.20.1

4 14

[pacman-dev] [PATCH] libmakepkg: add routine for linting $SOURCE_DATE_EPOCH
by Eli Schwartz 16 Apr '19

16 Apr '19

This can only ever be an int, and the specification states that a malformed timestamp should be considered a fatal error. https://reproducible-builds.org/specs/source-date-epoch/ Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/Makefile.am | 1 + .../lint_config/source_date_epoch.sh.in | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100755 scripts/libmakepkg/lint_config/source_date_epoch.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 54a8d215..255aee2b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -71,6 +71,7 @@ LIBMAKEPKG_IN = \ libmakepkg/integrity/verify_signature.sh \ libmakepkg/lint_config.sh \ libmakepkg/lint_config/paths.sh \ + libmakepkg/lint_config/source_date_epoch.sh \ libmakepkg/lint_config/variable.sh \ libmakepkg/lint_package.sh \ libmakepkg/lint_package/build_references.sh \ diff --git a/scripts/libmakepkg/lint_config/source_date_epoch.sh.in b/scripts/libmakepkg/lint_config/source_date_epoch.sh.in new file mode 100755 index 00000000..38fbfd77 --- /dev/null +++ b/scripts/libmakepkg/lint_config/source_date_epoch.sh.in @@ -0,0 +1,37 @@ +#!/bin/bash +# +# source_date_epoch.sh - Check that reproducible builds timestamp is valid +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n $LIBMAKEPKG_LINT_CONFIG_SOURCE_DATE_EPOCH_SH ]] && return +LIBMAKEPKG_LINT_CONFIG_SOURCE_DATE_EPOCH_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + +lint_config_functions+=('lint_source_date_epoch') + + +lint_source_date_epoch() { + if [[ $SOURCE_DATE_EPOCH = *[^[:digit:]]* ]]; then + error "$(gettext "%s contains invalid characters: %s")" \ + "\$SOURCE_DATE_EPOCH" "${SOURCE_DATE_EPOCH//[[:digit:]]}" + return 1 + fi +} -- 2.20.1

2 6

[pacman-dev] [PATCH] doc: add man page for pacman-conf
by Jelle van der Waa 07 Mar '19

07 Mar '19

Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- doc/Makefile.am | 3 +- doc/pacman-conf.8.asciidoc | 60 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 doc/pacman-conf.8.asciidoc diff --git a/doc/Makefile.am b/doc/Makefile.am index de87c409..f68f4ea0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,7 +16,8 @@ MANPAGES = \ makepkg.conf.5 \ pacman.conf.5 \ libalpm.3 \ - BUILDINFO.5 + BUILDINFO.5 \ + pacman-conf.8 DOXYGEN_MANS = $(wildcard man3/*.3) diff --git a/doc/pacman-conf.8.asciidoc b/doc/pacman-conf.8.asciidoc new file mode 100644 index 00000000..0e4c96be --- /dev/null +++ b/doc/pacman-conf.8.asciidoc @@ -0,0 +1,60 @@ +pacman-conf(8) +============== + +Name +---- +pacman-conf - query pacman's configuration file + + +Synopsis +-------- +'pacman-conf' [options] [<directive> ...] + + +Description +----------- +The 'pacman-conf' utility is created since parsing pacman's configuration file +is non-trivial and extremely difficult to do correctly from scripts. It makes it +easy for scripts to get the same configuration value which pacman itself would +use. + + +Options +------- +*-c, \--config* <path>:: + Specify an alternate configuration file. + +*-R, \--rootdir* <path>:: + Specify an alternate installation root (default is `/`). + +*-r, \--repo* <remote>:: + Query options for a specific repository. + +*-v, \--verbose*:: + Always shown directive names. + +*-l, \--repo-list*:: + List configured repositories. + +*-V, \--version*:: + Display version and exit. + +*-h, \--help*:: + Output syntax and command line options. + + +Examples +-------- + +pacman-conf -r core Usage:: + Show the value of the Usage configuration option for core repository. + +pacman-conf HoldPkg:: + Show the value of the HoldPkg configuration option. + + +See Also +-------- +linkman:pacman.conf[5] + +include::footer.asciidoc[] -- 2.20.1

3 6

[pacman-dev] [PATCH] doc: set rootdir correctly in man pages
by Jelle van der Waa 07 Mar '19

07 Mar '19

If an alternative rootdir is specified in either meson or configure it's not respected in the generated man pages. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- doc/Makefile.am | 3 ++- doc/meson.build | 1 + doc/pacman.8.asciidoc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index de87c409..e03d6ab8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -112,7 +112,8 @@ ASCIIDOC_OPTS = \ -a pkgdatadir=$(pkgdatadir) \ -a localstatedir=$(localstatedir) \ -a sysconfdir=$(sysconfdir) \ - -a datarootdir=$(datarootdir) + -a datarootdir=$(datarootdir) \ + -a rootdir=$(ROOTDIR) A2X_OPTS = \ --no-xmllint \ diff --git a/doc/meson.build b/doc/meson.build index b7514ef7..d6403bae 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -31,6 +31,7 @@ asciidoc_opts = [ '-a', 'localstatedir=@0@'.format(LOCALSTATEDIR), '-a', 'sysconfdir=@0@'.format(SYSCONFDIR), '-a', 'datarootdir=@0@'.format(DATAROOTDIR), + '-a', 'rootdir=@0@'.format(ROOTDIR), ] html_targets = [] diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index 6b2d9172..fe95178d 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -131,7 +131,7 @@ Options not automatically prepended. *-r, \--root* <path>:: - Specify an alternative installation root (default is `/`). This should + Specify an alternative installation root (default is +{rootdir}+). This should not be used as a way to install software into `/usr/local` instead of `/usr`. *NOTE*: If database path or log file are not specified on either the -- 2.20.1

2 1

[pacman-dev] [PATCH 1/2] libmakepkg: migrate to schema.sh for integsums
by Eli Schwartz 07 Mar '19

07 Mar '19

We cannot use most of the arrays defined there as srcinfo is dependent on the order, but migrate the hashes for now. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/srcinfo.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/srcinfo.sh.in b/scripts/libmakepkg/srcinfo.sh.in index 509c4860..b9eeb817 100644 --- a/scripts/libmakepkg/srcinfo.sh.in +++ b/scripts/libmakepkg/srcinfo.sh.in @@ -24,6 +24,7 @@ LIBMAKEPKG_SRCINFO_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/pkgbuild.sh" +source "$LIBRARY/util/schema.sh" srcinfo_open_section() { printf '%s = %s\n' "$1" "$2" @@ -63,7 +64,7 @@ srcinfo_write_section_details() { local attr package_arch a local multivalued_arch_attrs=(source provides conflicts depends replaces optdepends makedepends checkdepends - {md5,sha{1,224,256,384,512}}sums) + "${known_hash_algos[@]/%/sums}") for attr in "${singlevalued[@]}"; do pkgbuild_extract_to_srcinfo "$1" "$attr" 0 -- 2.20.1

2 5

[pacman-dev] Discrepancies with keyring locations in pacman-key manual.
by Gabriel Hansson 27 Feb '19

27 Feb '19

Hello, Working on a project which requires me to learn a bit about package signing in Arch. Anyway, read the manual which states that keyrings are stored in /usr/local/share/keyrings since that is where --populate looks when used with pacman-key. Yet as far as I know, key can be perfectly stored in /usr/share/keyrings and found with populate. So sending this mail mostly as a question whether a correction should be made in the manual or if there is something that I'm missing :) Best regards, Gabriel Hansson

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-139-gadb961a8
by Allan McRae 23 Feb '19

23 Feb '19

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 adb961a88e6644d5edb16cfcb5dbd1f02e4a1781 (commit) via ba7a41031c201b20d26cb69aa8b25acfb55c56bd (commit) via 3c774252ef11fd71270895bbbe892c81093aac77 (commit) via 656e851f0a3947a997d852da267e06e47355d134 (commit) via 4b83bcfcee46b6adcb80fc7a9fb85d3af58fb741 (commit) from 477a66cd0e7a1b8f5fb7d3b79d977da2771ee09a (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 adb961a88e6644d5edb16cfcb5dbd1f02e4a1781 Author: Sever Oraz <severoraz(a)gmail.com> Date: Tue Feb 12 23:27:05 2019 +0100 Use standard, consistent units in the download progress. Rather than use M/s which can be either MB or MiB, specify that it uses MiB (consistent with the displayed total size). Fixes FS#59201 Signed-off-by: Sever Oraz <severoraz(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ba7a41031c201b20d26cb69aa8b25acfb55c56bd Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 13 13:10:27 2019 -0500 meson: fix static/shared split again shared_library does not generate a sane pkg-config file because it assumes we don't want dependencies. Additionally, since we key off of buildstatic, when *not* using buildstatic but attempting to build libalpm on its own as static using -Ddefault_library=static, we are building and linking to a shared libalpm anyway. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3c774252ef11fd71270895bbbe892c81093aac77 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Feb 15 11:38:17 2019 -0500 libmakepkg: migrate to schema.sh for integsums We cannot use most of the arrays defined in schema.sh as srcinfo is dependent on the order, but migrate the hashes for now. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 656e851f0a3947a997d852da267e06e47355d134 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 20 20:55:44 2019 -0500 makepkg: simplify run_pacman logic We don't need to check the options twice, since it is the same check both times. Instead, merge the conditionals. As far as I can tell, the only reason the checks for: - PACMAN_OPTS and - whether to use sudo were ever separated is due to the historic existence of --asroot, since the second check included a check for (( ! ASROOT )) until it was cleaned up in commit 61ba5c961e4a3536c4bbf41edb348987a9993fdb. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4b83bcfcee46b6adcb80fc7a9fb85d3af58fb741 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 20 21:35:19 2019 -0500 makepkg: implement locking for pacman commands When pacman is run as root to do -S, -U, or -R, it would immediately abort if pacman is not ready for use. Instead, poll the lockfile and wait until it becomes available. Implements FS#28840 Original-patch-by: Georges Dubus <georges.dubus(a)compiletoi.net> Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: meson.build | 4 ++-- scripts/libmakepkg/srcinfo.sh.in | 3 ++- scripts/makepkg.sh.in | 17 ++++++++++++----- src/pacman/callback.c | 20 ++++++++++---------- 4 files changed, 26 insertions(+), 18 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fixes bug FS 59201
by Sever Oraz 21 Feb '19

21 Feb '19

Signed-off-by: Sever Oraz <severoraz(a)gmail.com> --- src/pacman/callback.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index ee75297c..c0f5ade1 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -837,16 +837,16 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) xfered_human = humanize_size(xfered, '\0', -1, &xfered_label); printf(" %ls%-*s ", wcfname, padwid, ""); - /* We will show 1.62M/s, 11.6M/s, but 116K/s and 1116K/s */ + /* We will show 1.62 MiB/s, 11.6 MiB/s, but 116 KiB/s and 1116 KiB/s */ if(rate_human < 9.995) { - printf("%6.1f %3s %4.2f%c/s ", - xfered_human, xfered_label, rate_human, rate_label[0]); + printf("%6.1f %3s %4.2f %3s/s ", + xfered_human, xfered_label, rate_human, rate_label); } else if(rate_human < 99.95) { - printf("%6.1f %3s %4.1f%c/s ", - xfered_human, xfered_label, rate_human, rate_label[0]); + printf("%6.1f %3s %4.1f %3s/s ", + xfered_human, xfered_label, rate_human, rate_label); } else { - printf("%6.1f %3s %4.f%c/s ", - xfered_human, xfered_label, rate_human, rate_label[0]); + printf("%6.1f %3s %4.f %3s/s ", + xfered_human, xfered_label, rate_human, rate_label); } if(eta_h == 0) { printf("%02u:%02u", eta_m, eta_s); -- 2.20.1

3 7

[pacman-dev] [PATCH] meson: fix static/shared split again
by Eli Schwartz 21 Feb '19

21 Feb '19

shared_library does not generate a sane pkg-config file because it assumes we don't want dependencies. Additionally, since we key off of buildstatic, when *not* using buildstatic but attempting to build libalpm on its own as static using -Ddefault_library=static, we are building and linking to a shared libalpm anyway. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 8e9dbd71..0f706c64 100644 --- a/meson.build +++ b/meson.build @@ -363,8 +363,8 @@ libalpm_a = static_library( link_with : [libcommon], install : true) -if not get_option('buildstatic') - libalpm = shared_library( +if get_option('default_library') != 'static' + libalpm = library( 'alpm', version : libalpm_version, link_whole: [libalpm_a], -- 2.20.1

2 1