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

[pacman-dev] [PATCH] makepkg: simplify run_pacman logic
by Eli Schwartz 21 Feb '19

21 Feb '19

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> --- scripts/makepkg.sh.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 25700b09..c51fec45 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -217,12 +217,10 @@ missing_source_file() { run_pacman() { local cmd - if [[ $1 != -@(T|Q)*([[:alpha:]]) ]]; then - cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@") - else + if [[ $1 = -@(T|Q)*([[:alpha:]]) ]]; then cmd=("$PACMAN_PATH" "$@") - fi - if [[ $1 != -@(T|Q)*([[:alpha:]]) ]]; then + else + cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@") if type -p sudo >/dev/null; then cmd=(sudo "${cmd[@]}") else -- 2.20.1

2 1

[pacman-dev] [PATCH] makepkg: implement locking for pacman commands
by Eli Schwartz 21 Feb '19

21 Feb '19

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> --- scripts/makepkg.sh.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cf30c302..25700b09 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -228,6 +228,14 @@ run_pacman() { else cmd=(su root -c "$(printf '%q ' "${cmd[@]}")") fi + + local lockfile="$(pacman-conf DBPath)/db.lck" + if [[ -f $lockfile ]]; then + msg "$(gettext "Pacman is currently in use, please wait...")" + while [[ -f $lockfile ]]; do + sleep 3 + done + fi fi "${cmd[@]}" } -- 2.20.1

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-134-g477a66cd
by Allan McRae 12 Feb '19

12 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 477a66cd0e7a1b8f5fb7d3b79d977da2771ee09a (commit) via 86004227d14bef059f71290b3c0454ad88ea0f86 (commit) from db102c67efe9cfd4367a9110c8f97ceff5afcbe3 (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 477a66cd0e7a1b8f5fb7d3b79d977da2771ee09a Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Feb 11 11:19:26 2019 -0500 build: link vercmp with a static copy of libalpm This has historically been the case in autotools since we want vercmp to not break mid-transaction in an install script. For convenience, we create libalpm.a and use this to optionally generate libalpm.so (when not configured with -Dbuildstatic=true) as well as to link any binary which explicitly wishes to be built statically "with libalpm", but does not care where a function is defined. meson then treats this correctly: it builds the object file only once for both libraries, and the compiler strips out unused functionality from the final static binary. Currently the only binary which requires this is vercmp. Fixes FS#61719 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 86004227d14bef059f71290b3c0454ad88ea0f86 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 12 11:17:30 2019 +1000 Add implicit fall through warning Requires modification to our comment about fall through to match compilers expectations. Works for GCC and Clang. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + meson.build | 16 +++++++++++++--- src/pacman/pacman.c | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] build: link vercmp with a static copy of libalpm
by Eli Schwartz 12 Feb '19

12 Feb '19

This has historically been the case in autotools since we want vercmp to not break mid-transaction in an install script. For convenience, we create libalpm.a and use this to optionally generate libalpm.so (when not configured with -Dbuildstatic=true) as well as to link any binary which explicitly wishes to be built statically "with libalpm", but does not care where a function is defined. meson then treats this correctly: it builds the object file only once for both libraries, and the compiler strips out unused functionality from the final static binary. Currently the only binary which requires this is vercmp. Fixes FS#61719 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- This is based on my initial suggestion via IRC for how to solve the vercmp build issue using two libalpm libraries. The important distinction is that in order to not be an error when buildstatic is used, we cannot try to create multiple rules that generate libalpm.a -- and also we don't want to install /usr/lib/libalpm_a.a meson.build | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 0a710653..4a74786b 100644 --- a/meson.build +++ b/meson.build @@ -354,15 +354,24 @@ libcommon = static_library( include_directories : includes, install : false) -libalpm = library( +libalpm_a = static_library( 'alpm', libalpm_sources, - version : libalpm_version, include_directories : includes, dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, link_with : [libcommon], install : true) +if not get_option('buildstatic') + libalpm = shared_library( + 'alpm', + version : libalpm_version, + link_whole: [libalpm_a], + install : true) +else + libalpm = libalpm_a +endif + install_headers( 'lib/libalpm/alpm.h', 'lib/libalpm/alpm_list.h') @@ -413,7 +422,7 @@ executable( 'vercmp', vercmp_sources, include_directories : includes, - link_with : [libalpm], + link_with : [libalpm_a], install : true, ) -- 2.20.1

2 1

[pacman-dev] [PATCH] Add implicit fall through warning
by Allan McRae 12 Feb '19

12 Feb '19

Requires modification to our comment about fall through to match compilers expectations. Works for GCC and Clang. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 1 + meson.build | 1 + src/pacman/pacman.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 415ed3cb..2f345b5d 100644 --- a/configure.ac +++ b/configure.ac @@ -462,6 +462,7 @@ if test "x$warningflags" = "xyes" ; then CFLAGS_ADD([-Wformat-nonliteral], [WARNING_CFLAGS]) CFLAGS_ADD([-Wformat-security], [WARNING_CFLAGS]) CFLAGS_ADD([-Wignored-qualifiers], [WARNING_CFLAGS]) + CFLAGS_ADD([-Wimplicit-fallthrough], [WARNING_CFLAGS]) CFLAGS_ADD([-Winit-self], [WARNING_CFLAGS]) CFLAGS_ADD([-Wlogical-op], [WARNING_CFLAGS]) CFLAGS_ADD([-Wmissing-declarations], [WARNING_CFLAGS]) diff --git a/meson.build b/meson.build index 0a710653..02a3a3d3 100644 --- a/meson.build +++ b/meson.build @@ -220,6 +220,7 @@ if get_option('buildtype').startswith('debug') '-Wformat-nonliteral', '-Wformat-security', '-Wignored-qualifiers', + '-Wimplicit-fallthrough', '-Winit-self', '-Wlogical-op', '-Wmissing-declarations', diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index a2a420b6..3bb622e6 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -196,7 +196,7 @@ static void usage(int op, const char * const myname) addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); addlist(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); - /* pass through */ + /* fall through */ case PM_OP_REMOVE: addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); addlist(_(" --assume-installed <package=version>\n" -- 2.20.1

1 0

[pacman-dev] [PATCH] build: link vercmp staticly with libalpm
by Dave Reisner 11 Feb '19

11 Feb '19

This makes the meson-built vercmp equivalent to the autotools build. Employ an intermediate archive of libalpm which our generic library rule can slurp in. Other alpm-only binaries (specifically we care about vercmp) can then link this in for alpm functionality without caring exactly where the function is defined. meson passes the right flags to ensure that unused data is stripped out of the executable. ref: FS#61719 --- meson.build | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 0a710653..5c1efd73 100644 --- a/meson.build +++ b/meson.build @@ -354,12 +354,21 @@ libcommon = static_library( include_directories : includes, install : false) +libalpm_a = static_library( + 'alpm_a', + libalpm_sources, + version : libalpm_version, + include_directories : includes, + dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, + link_with : [libcommon], + install : true) + libalpm = library( 'alpm', - libalpm_sources, version : libalpm_version, include_directories : includes, dependencies : [crypto_provider, libarchive, libcurl] + gpgme_libs, + link_whole : [libalpm_a], link_with : [libcommon], install : true) @@ -413,7 +422,7 @@ executable( 'vercmp', vercmp_sources, include_directories : includes, - link_with : [libalpm], + link_with : [libalpm_a], install : true, ) -- 2.20.1

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-132-gdb102c67
by Allan McRae 06 Feb '19

06 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 db102c67efe9cfd4367a9110c8f97ceff5afcbe3 (commit) via 714a1b4e4eaf7ffde5f30eccb476f59979fac44e (commit) from 04e77591d6333002815e9276ca08c01230fcf212 (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 db102c67efe9cfd4367a9110c8f97ceff5afcbe3 Author: Mark Ulrich <mark.ulrich.86(a)gmail.com> Date: Wed Feb 6 08:36:51 2019 -0600 libalpm: prevent 301 redirect loop from hanging the process If a mirror responds with a 301 redirect to itself, it will create an infinite redirect loop. This will cause pacman to hang, unresponsive to even a SIGINT. The result is pacman being unable to sync or download any package from a particular repo if its current mirror is stuck in a redirect loop. Setting libcurl's MAXREDIRS option effectively prevents a redirect loop from hanging the process. Signed-off-by: Mark Ulrich <mark.ulrich.86(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 714a1b4e4eaf7ffde5f30eccb476f59979fac44e Author: Allan McRae <allan(a)archlinux.org> Date: Mon Feb 4 10:32:50 2019 +1000 I blame everyone but me for this Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- lib/libalpm/dload.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libalpm: prevent 301 redirect loop from hanging the process
by Mark Ulrich 06 Feb '19

06 Feb '19

If a mirror responds with a 301 redirect to itself, it will create an infinite redirect loop. This will cause pacman to hang, unresponsive to even a SIGINT. The result is pacman being unable to sync or download any package from a particular repo if its current mirror is stuck in a redirect loop. Setting libcurl's MAXREDIRS option effectively prevents a redirect loop from hanging the process. Signed-off-by: Mark Ulrich <mark.ulrich.86(a)gmail.com> --- lib/libalpm/dload.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 36ae4ee1..d04a5e46 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -259,6 +259,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_URL, payload->fileurl); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L); + curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 1L); curl_easy_setopt(curl, CURLOPT_FILETIME, 1L); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); -- 2.20.1

3 4

[pacman-dev] Pacman failing with existing symlinks on the install path
by Peter Kehl 04 Feb '19

04 Feb '19

Dear Pacman maintainers, On current 4.19.16-1-MANJARO x64, I had /opt as symlink to /share/opt. I went to install current Google Chrome 72.0.3626.81-1 from https://aur.archlinux.org/packages/google-chrome (either by GNOME's Add/Remove Software, or by sudo pacman -U google-chrome-72.0.3626.81-1- x86_64.pkg.tar.xz). It failed with: error: failed to commit transaction (conflicting files) google-chrome: /opt exists in filesystem Knut Ahlers, the maintainer of AUR Google Chrome package, responded that the package doesn't check for the symlinks. Hence it's probably pacman. Have you/would you consider supporting existing symlinks on the install paths, please? Thanks in advance, -Peter Kehl Vancouver, B.C., Canada

3 3

[pacman-dev] [PATCH] libalpm: Check cachedir access before re-creating
by David Phillips 04 Feb '19

04 Feb '19

If users have mounted a filesystem such as sshfs or NFS that doesn't allow root access by default for security reasons, _alpm_filecache_setup will blindly try and re-create the components of the cachedir path, eating EACCES (to be liek mkdir -p). Then, it will return this path as if it is valid when it may not be readable by root, causing alpm_check_downloadspace to trigger a FPE since it assumes the cachedir is R/W and uses fsinfo which may be zero. This patch adds a check before trying to re-create the cachedir in order to determine if creating it will result in EACCES, and outputs a warning if so. It also discards the current cachedir from being considered. This causes a more meaningful and graceful failure than a FPE. --- lib/libalpm/util.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d33eef2a..d4375593 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -849,12 +849,16 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle) for(i = handle->cachedirs; i; i = i->next) { cachedir = i->data; if(stat(cachedir, &buf) != 0) { - /* cache directory does not exist.... try creating it */ - _alpm_log(handle, ALPM_LOG_WARNING, _("no %s cache exists, creating...\n"), - cachedir); - if(_alpm_makepath(cachedir) == 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); - return cachedir; + if (errno == EACCES) { + _alpm_log(handle, ALPM_LOG_WARNING, _("failed to stat %s: %s\n"), cachedir, strerror(errno)); + } else { + /* cache directory does not exist.... try creating it */ + _alpm_log(handle, ALPM_LOG_WARNING, _("no %s cache exists, creating...\n"), + cachedir); + if(_alpm_makepath(cachedir) == 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "using cachedir: %s\n", cachedir); + return cachedir; + } } } else if(!S_ISDIR(buf.st_mode)) { _alpm_log(handle, ALPM_LOG_DEBUG, -- 2.20.1

3 2

[pacman-dev] [PATCH] I blame everyone for this
by Allan McRae 04 Feb '19

04 Feb '19

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 6ae93a9d..ce39e0c5 100644 --- a/NEWS +++ b/NEWS @@ -816,7 +816,7 @@ VERSION DESCRIPTION - repo-add: use openssl instead of md5sum - simplify doc building process for ease of development - ensure correct handling of syscall interruptions - - read missing newline on -Qi/-Si output (FS#11331) + - re-add missing newline on -Qi/-Si output (FS#11331) - fix TotalDownload regression (FS#11339) - makepkg: - replace getopt with an internal function -- 2.20.1

1 0

[pacman-dev] [PATCH] fix various typos
by morganamilo 04 Feb '19

04 Feb '19

Signed-off-by: morganamilo <morganamilo(a)gmail.com> --- NEWS | 12 ++++++------ configure.ac | 2 +- doc/PKGBUILD.5.asciidoc | 4 ++-- lib/libalpm/package.h | 2 +- lib/libalpm/signing.c | 2 +- meson_options.txt | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 2 +- src/pacman/util.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index a182d65e..6ae93a9d 100644 --- a/NEWS +++ b/NEWS @@ -167,7 +167,7 @@ VERSION DESCRIPTION - fix triggering of Install hooks (FS#47996) - fix handling of stdin scripts called by pacman - hook activity is logged - - documentataion updates for alpm-hooks (FS#48080) + - documentation updates for alpm-hooks (FS#48080) - makepkg: - increase robustness of variable array checks - makepkg -g does not perform current architecture checks @@ -259,9 +259,9 @@ VERSION DESCRIPTION - Fix removal of static libraries when the shared library uses the absolute path in symbolic links (FS#43395) - Improve Bazaar cloning (FS#43448) - - Fix issues with architecture dependant checksum + - Fix issues with architecture dependent checksum verification (FS#43192) - - Fix .SRCINFO file with architecture dependant fields + - Fix .SRCINFO file with architecture dependent fields (FS#43247) - Fix compatibility with older bash versions - Allow git checkouts to be downloaded into directory ending @@ -351,7 +351,7 @@ VERSION DESCRIPTION - checkupdates: rename CHECKUPDATE_DB to CHECKUPDATES_DB - pacdiff: add a "Quit" option, and many other improvements - pacsysclean is removed -4.1.2 - validate %FILEPATH% when parsing repos to prevent arbitary +4.1.2 - validate %FILEPATH% when parsing repos to prevent arbitrary file overwrites from malicious databases - makepkg: - restrict package name from starting with a dot @@ -816,7 +816,7 @@ VERSION DESCRIPTION - repo-add: use openssl instead of md5sum - simplify doc building process for ease of development - ensure correct handling of syscall interruptions - - readd missing newline on -Qi/-Si output (FS#11331) + - read missing newline on -Qi/-Si output (FS#11331) - fix TotalDownload regression (FS#11339) - makepkg: - replace getopt with an internal function @@ -1262,7 +1262,7 @@ VERSION DESCRIPTION external download utility like wget - added a license field to package meta-data - add url support to -A and -U operations (download packages) - - -Ss now searches thru provides fields + - -Ss now searches through provides fields - added --dbonly option to -R 2.7.6 - added --print-uris option - fixed an http download bug (FS#667) diff --git a/configure.ac b/configure.ac index 6f336022..415ed3cb 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ if test "x$CFLAGS" = "x"; then CFLAGS="" fi -# Set subsitution values for version stuff in Makefiles and anywhere else, +# Set substitution values for version stuff in Makefiles and anywhere else, # and put LIB_VERSION in config.h AC_SUBST(LIB_VERSION) AC_SUBST(LIB_VERSION_INFO) diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc index f12effde..32668adc 100644 --- a/doc/PKGBUILD.5.asciidoc +++ b/doc/PKGBUILD.5.asciidoc @@ -60,8 +60,8 @@ systems (see below). allows package maintainers to make updates to the package's configure flags, for example. This is typically set to '1' for each new upstream software release and incremented for intermediate PKGBUILD updates. The - variable is a postive integer, with an optional subrelease level - specified by adding another postive integer separated by a period + variable is a positive integer, with an optional subrelease level + specified by adding another positive integer separated by a period (i.e. in the form x.y). *epoch*:: diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index b11d5dda..fbcde266 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -38,7 +38,7 @@ /** Package operations struct. This struct contains function pointers to * all methods used to access data in a package to allow for things such * as lazy package initialization (such as used by the file backend). Each - * backend is free to define a stuct containing pointers to a specific + * backend is free to define a struct containing pointers to a specific * implementation of these methods. Some backends may find using the * defined default_pkg_ops struct to work just fine for their needs. */ diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index df7ac6ca..92598b0e 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -182,7 +182,7 @@ static int init_gpgme(alpm_handle_t *handle) #endif /* NOTE: * The GPGME library installs a SIGPIPE signal handler automatically if - * the default signal hander is in use. The only time we set a handler + * the default signal handler is in use. The only time we set a handler * for SIGPIPE is in dload.c, and we reset it when we are done. Given that * we do this, we can let GPGME do its automagic. However, if we install * a library-wide SIGPIPE handler, we will have to be careful. diff --git a/meson_options.txt b/meson_options.txt index 422a9ae4..bf3fc22d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,7 +2,7 @@ option('use-git-version', type : 'boolean', value : false, description : 'take version information from git') option('buildstatic', type : 'boolean', value : false, - description : 'if true, build staticly linked binaries') + description : 'if true, build statically linked binaries') # directories and filenames option('root-dir', type : 'string', value : '/', diff --git a/scripts/libmakepkg/executable/strip.sh.in b/scripts/libmakepkg/executable/strip.sh.in index 867dc928..ab069a45 100644 --- a/scripts/libmakepkg/executable/strip.sh.in +++ b/scripts/libmakepkg/executable/strip.sh.in @@ -1,6 +1,6 @@ #!/usr/bin/bash # -# strip.sh - Confirm presense of strip binary +# strip.sh - Confirm presence of strip binary # # Copyright (c) 2011-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 298275a8..4163805d 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -38,7 +38,7 @@ array_build() { # it's an error to try to copy a value which doesn't exist. declare -p "$2" &>/dev/null || return 1 - # Build an array of the indicies of the source array. + # Build an array of the indices of the source array. eval "keys=(\"\${!$2[@]}\")" # Clear the destination array diff --git a/src/pacman/util.c b/src/pacman/util.c index 74e1037d..8f6290db 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1359,7 +1359,7 @@ static int multiselect_parse(char *array, int count, char *response) len--; include = 0; } else if(str) { - /* if first token is including, we unselect all targets */ + /* if first token is including, we deselect all targets */ memset(array, 0, count); } -- 2.20.1

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-130-g04e77591
by Allan McRae 04 Feb '19

04 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 04e77591d6333002815e9276ca08c01230fcf212 (commit) from 11bc315cdb3c2a3f227b4d05c13f615dfb453b5e (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 04e77591d6333002815e9276ca08c01230fcf212 Author: morganamilo <morganamilo(a)gmail.com> Date: Sat Feb 2 19:01:05 2019 +0000 fix various typos Signed-off-by: morganamilo <morganamilo(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 12 ++++++------ configure.ac | 2 +- doc/PKGBUILD.5.asciidoc | 4 ++-- lib/libalpm/package.h | 2 +- lib/libalpm/signing.c | 2 +- meson_options.txt | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 2 +- src/pacman/util.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Parallel downloads
by Dávid Bíró 01 Feb '19

01 Feb '19

Dear Pacman Devs I want to add a parallel download feature for Pacman. Is it a wanted feature? Should I do it? If yes, could you provide some docs for the code? David Judge dbiro97(a)gmail.com

2 1