- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] document commit a33cdac10bf1a68279ea1b9baa26aa09126f1ca4
by Eli Schwartz 26 Apr '21

26 Apr '21

Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/makepkg.8.asciidoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/makepkg.8.asciidoc b/doc/makepkg.8.asciidoc index 3b5e61b31..38032e7bb 100644 --- a/doc/makepkg.8.asciidoc +++ b/doc/makepkg.8.asciidoc @@ -279,6 +279,14 @@ Environment Variables **SOURCE_DATE_EPOCH=**"<date>":: Used for link:https://reproducible-builds.org/docs/[Reproducible Builds]. +**BUILDTOOL=**"<name>":: + The name of a tool ecosystem used to set up the build environment. Used for + defining a spec for reproducible builds, e.g. the linkman:makepkg.conf[5] + used. + +**BUILDTOOLVER=**"<version>":: + The version of the '$BUILDTOOL' used. + Configuration ------------- See linkman:makepkg.conf[5] for more details on configuring makepkg using the -- 2.31.1

2 1

[pacman-dev] [PATCH] makepkg: add tool details to buildinfo to aid determining flags
by anthraxx＠archlinux.org 23 Apr '21

23 Apr '21

From: Levente Polyak <anthraxx(a)archlinux.org> If a makepkg consumer uses a build wrapper to override compiler flags this may lead to unreproducible packages as there is no way to know which exact files were used for tooling that tries to reproduce said package. Instead of vendoring the whole used makepkg.conf file into buildinfo, this patch adds two new properties to the .BUILDINFO file named BUILDTOOL and BUILDTOOLVER which by default are simply makepkg's own values. Downstream consumers may override those values: For example in Arch Linux the devtools package can set those values and allow reproducible builds tooling to fetch the appropriate makepkg.conf. Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> --- scripts/makepkg.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 92cb6398..e58edfa1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -651,6 +651,8 @@ write_buildinfo() { write_kv_pair "builddate" "${SOURCE_DATE_EPOCH}" write_kv_pair "builddir" "${BUILDDIR}" write_kv_pair "startdir" "${startdir}" + write_kv_pair "buildtool" "${BUILDTOOL:-makepkg}" + write_kv_pair "buildtoolver" "${BUILDTOOLVER:-$makepkg_version}" write_kv_pair "buildenv" "${BUILDENV[@]}" write_kv_pair "options" "${OPTIONS[@]}" -- 2.31.1

6 12

[pacman-dev] [PATCH 1/2] libmakepkg: always remap debug prefix
by morganamilo 23 Apr '21

23 Apr '21

Sometimes non debug flags still generate debug symbols. So always remap them. diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in index 60913080..52ff4750 100644 --- a/scripts/libmakepkg/buildenv/debugflags.sh.in +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in @@ -30,9 +30,6 @@ buildenv_functions+=('buildenv_debugflags') buildenv_debugflags() { if check_option "debug" "y"; then - DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" - DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" - DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}" CFLAGS+=" $DEBUG_CFLAGS" CXXFLAGS+=" $DEBUG_CXXFLAGS" RUSTFLAGS+=" $DEBUG_RUSTFLAGS" diff --git a/scripts/libmakepkg/buildenv/flags.sh.in b/scripts/libmakepkg/buildenv/flags.sh.in new file mode 100644 index 00000000..d41556d3 --- /dev/null +++ b/scripts/libmakepkg/buildenv/flags.sh.in @@ -0,0 +1,34 @@ +#!/usr/bin/bash +# +# debugflags.sh - Specify default flags for building a package +# +# Copyright (c) 2012-2021 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_BUILDENV_FLAGS_SH" ]] && return +LIBMAKEPKG_BUILDENV_FLAGS_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/option.sh" + +buildenv_functions+=('buildenv_flags') + +buildenv_flags() { + CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}" +} diff --git a/scripts/libmakepkg/buildenv/meson.build b/scripts/libmakepkg/buildenv/meson.build index b72d91c0..a69accb7 100644 --- a/scripts/libmakepkg/buildenv/meson.build +++ b/scripts/libmakepkg/buildenv/meson.build @@ -4,6 +4,7 @@ sources = [ 'buildflags.sh.in', 'compiler.sh.in', 'debugflags.sh.in', + 'flags.sh.in', 'lto.sh.in', 'makeflags.sh.in', ] -- 2.31.1

3 7

[pacman-dev] Fwd: pacman-6.0 slushy freeze
by Luna Jernberg 23 Apr '21

23 Apr '21

Started helping with the Swedish translation today ---------- Forwarded message --------- From: Luna Jernberg <droidbittin(a)gmail.com> Date: Fri, Apr 23, 2021 at 5:00 AM Subject: Re: [pacman-dev] pacman-6.0 slushy freeze To: <allan(a)archlinux.org> 2 strings left i am unsure of at the moment On Fri, Apr 23, 2021 at 4:41 AM Luna Jernberg <droidbittin(a)gmail.com> wrote: > Started with the Swedish translation now > > On Fri, Apr 23, 2021 at 2:04 AM Allan McRae <allan(a)archlinux.org> wrote: > >> Hi all, >> >> We are now in a slushy freeze for pacman-6.0. >> >> This means I will not look at new patches unless they fix a breakage. >> However, I aim to get through the few patches I have not looked at that >> were submitted before now (and revisions of those patches if quickly >> done). >> >> I will also pull the final 5.2.x translation files from Transifex, and >> push the 6.0 strings (again noting, slushy freeze, so strings may change). >> >> Allan >> >

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-99-g558d08d8
by Allan McRae 23 Apr '21

23 Apr '21

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 558d08d821a6797c972acdf02e03aa1a1ff49917 (commit) via 15270d4a344a5d5cbf992aac58913c9356a80927 (commit) from 8fe552070945561a0cd4dc24d3fcb22ed377f1a0 (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 558d08d821a6797c972acdf02e03aa1a1ff49917 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Apr 23 10:44:27 2021 +1000 Prepare translations for next release Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 15270d4a344a5d5cbf992aac58913c9356a80927 Author: Andrew Gregory <andrew(a)archlinux.org> Date: Mon Jun 22 02:12:41 2020 -0700 update NEWS for 5.2.2 Signed-off-by: Andrew Gregory <andrew(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 30 + lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/ar.po | 267 +++--- lib/libalpm/po/ast.po | 267 +++--- lib/libalpm/po/bg.po | 267 +++--- lib/libalpm/po/br.po | 267 +++--- lib/libalpm/po/ca.po | 267 +++--- lib/libalpm/po/cs.po | 282 +++--- lib/libalpm/po/da.po | 267 +++--- lib/libalpm/po/de.po | 284 +++--- lib/libalpm/po/el.po | 295 ++++--- lib/libalpm/po/en_GB.po | 267 +++--- lib/libalpm/po/eo.po | 499 +++++------ lib/libalpm/po/es.po | 267 +++--- lib/libalpm/po/es_419.po | 271 +++--- lib/libalpm/po/eu.po | 271 +++--- lib/libalpm/po/eu_ES.po | 271 +++--- lib/libalpm/po/fi.po | 267 +++--- lib/libalpm/po/fr.po | 275 +++--- lib/libalpm/po/gl.po | 267 +++--- lib/libalpm/po/hi.po | 1038 ++++++++++++++++++++++ lib/libalpm/po/hr.po | 267 +++--- lib/libalpm/po/hu.po | 267 +++--- lib/libalpm/po/id.po | 267 +++--- lib/libalpm/po/it.po | 273 +++--- lib/libalpm/po/ja.po | 271 +++--- lib/libalpm/po/kk.po | 267 +++--- lib/libalpm/po/ko.po | 267 +++--- lib/libalpm/po/libalpm.pot | 271 +++--- lib/libalpm/po/lt.po | 267 +++--- lib/libalpm/po/nb.po | 281 +++--- lib/libalpm/po/nl.po | 269 +++--- lib/libalpm/po/pl.po | 280 +++--- lib/libalpm/po/pt.po | 267 +++--- lib/libalpm/po/pt_BR.po | 267 +++--- lib/libalpm/po/ro.po | 271 +++--- lib/libalpm/po/ru.po | 267 +++--- lib/libalpm/po/sk.po | 290 ++++--- lib/libalpm/po/sl.po | 269 +++--- lib/libalpm/po/sr.po | 277 +++--- lib/libalpm/po/sr(a)latin.po | 277 +++--- lib/libalpm/po/sv.po | 340 ++++---- lib/libalpm/po/tr.po | 275 +++--- lib/libalpm/po/uk.po | 267 +++--- lib/libalpm/po/zh_CN.po | 286 ++++--- lib/libalpm/po/zh_TW.po | 267 +++--- scripts/po/LINGUAS | 1 + scripts/po/bg.po | 645 +++++++------- scripts/po/br.po | 636 +++++++------- scripts/po/ca.po | 676 ++++++++------- scripts/po/cs.po | 686 +++++++-------- scripts/po/da.po | 649 +++++++------- scripts/po/de.po | 701 +++++++-------- scripts/po/el.po | 688 +++++++-------- scripts/po/en_GB.po | 648 +++++++------- scripts/po/eo.po | 662 +++++++------- scripts/po/es.po | 673 ++++++++------- scripts/po/es_419.po | 662 +++++++------- scripts/po/eu.po | 645 +++++++------- scripts/po/eu_ES.po | 645 +++++++------- scripts/po/fi.po | 589 ++++++------- scripts/po/fr.po | 668 ++++++++------- scripts/po/gl.po | 659 +++++++------- scripts/po/hi.po | 1609 ++++++++++++++++++++++++++++++++++ scripts/po/hu.po | 659 +++++++------- scripts/po/id.po | 633 +++++++------- scripts/po/it.po | 661 +++++++------- scripts/po/ja.po | 672 ++++++++------- scripts/po/ko.po | 650 +++++++------- scripts/po/lt.po | 667 ++++++++------- scripts/po/nb.po | 664 +++++++------- scripts/po/nl.po | 656 +++++++------- scripts/po/pacman-scripts.pot | 564 ++++++------ scripts/po/pl.po | 687 +++++++-------- scripts/po/pt.po | 646 +++++++------- scripts/po/pt_BR.po | 660 +++++++------- scripts/po/ro.po | 643 +++++++------- scripts/po/ru.po | 653 +++++++------- scripts/po/sk.po | 642 +++++++------- scripts/po/sl.po | 620 +++++++------- scripts/po/sr.po | 658 +++++++------- scripts/po/sr(a)latin.po | 658 +++++++------- scripts/po/sv.po | 732 ++++++++-------- scripts/po/tr.po | 662 +++++++------- scripts/po/uk.po | 653 +++++++------- scripts/po/zh_CN.po | 714 ++++++++-------- scripts/po/zh_TW.po | 667 ++++++++------- src/pacman/po/LINGUAS | 1 + src/pacman/po/ar.po | 565 ++++++------ src/pacman/po/ast.po | 565 ++++++------ src/pacman/po/bg.po | 565 ++++++------ src/pacman/po/br.po | 569 ++++++------ src/pacman/po/ca.po | 569 ++++++------ src/pacman/po/cs.po | 643 +++++++------- src/pacman/po/da.po | 567 ++++++------ src/pacman/po/de.po | 1052 ++++++++++++----------- src/pacman/po/el.po | 632 +++++++------- src/pacman/po/en_GB.po | 567 ++++++------ src/pacman/po/eo.po | 603 +++++++------ src/pacman/po/es.po | 577 +++++++------ src/pacman/po/es_419.po | 594 +++++++------ src/pacman/po/eu.po | 570 ++++++------ src/pacman/po/eu_ES.po | 570 ++++++------ src/pacman/po/fi.po | 568 ++++++------ src/pacman/po/fr.po | 610 +++++++------ src/pacman/po/gl.po | 573 +++++++------ src/pacman/po/hi.po | 1902 +++++++++++++++++++++++++++++++++++++++++ src/pacman/po/hr.po | 588 +++++++------ src/pacman/po/hu.po | 563 ++++++------ src/pacman/po/id.po | 567 ++++++------ src/pacman/po/it.po | 573 +++++++------ src/pacman/po/ja.po | 571 +++++++------ src/pacman/po/ko.po | 573 +++++++------ src/pacman/po/lt.po | 577 +++++++------ src/pacman/po/nb.po | 625 +++++++------- src/pacman/po/nl.po | 717 ++++++++-------- src/pacman/po/pacman.pot | 561 ++++++------ src/pacman/po/pl.po | 628 +++++++------- src/pacman/po/pt.po | 570 ++++++------ src/pacman/po/pt_BR.po | 569 ++++++------ src/pacman/po/ro.po | 576 +++++++------ src/pacman/po/ru.po | 563 ++++++------ src/pacman/po/sk.po | 569 ++++++------ src/pacman/po/sl.po | 594 +++++++------ src/pacman/po/sr.po | 575 +++++++------ src/pacman/po/sr(a)latin.po | 575 +++++++------ src/pacman/po/sv.po | 655 +++++++------- src/pacman/po/tr.po | 575 +++++++------ src/pacman/po/uk.po | 573 +++++++------ src/pacman/po/zh_CN.po | 625 +++++++------- src/pacman/po/zh_TW.po | 563 ++++++------ 131 files changed, 37438 insertions(+), 29866 deletions(-) create mode 100644 lib/libalpm/po/hi.po create mode 100644 scripts/po/hi.po create mode 100644 src/pacman/po/hi.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, release/5.2.x, updated. v5.2.2-1-gf55c9f30
by Allan McRae 23 Apr '21

23 Apr '21

1 0

[pacman-dev] pacman-6.0 slushy freeze
by Allan McRae 23 Apr '21

23 Apr '21

Hi all, We are now in a slushy freeze for pacman-6.0. This means I will not look at new patches unless they fix a breakage. However, I aim to get through the few patches I have not looked at that were submitted before now (and revisions of those patches if quickly done). I will also pull the final 5.2.x translation files from Transifex, and push the 6.0 strings (again noting, slushy freeze, so strings may change). Allan

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v6.0.0alpha1-97-g8fe55207
by Allan McRae 22 Apr '21

22 Apr '21

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 8fe552070945561a0cd4dc24d3fcb22ed377f1a0 (commit) via 079b9d44e2faadd83856de07f890bae5cc51c5a4 (commit) via 41f9c50abf08e71aa5fd03568934ab80abc7715c (commit) via 63ad8b8b7639ac29fad6c4e0dcc699510c47d587 (commit) via a33cdac10bf1a68279ea1b9baa26aa09126f1ca4 (commit) via 3179db108a83104d9de6d1d607f55f8118e92160 (commit) via abdb4d7fa699ae3b8ff09ba79656f6853b9a1357 (commit) via 0699321b3ce71c46fbd0a10fede3959d0fac7009 (commit) via 288cd1c74afc5ff2e28b9a45a76d2146da583903 (commit) via 3688c947f86f1ddbb24d6bf3b8b42fbe0be6fd0e (commit) via 207f0439eeecb505f74590af481236ec60c09876 (commit) from c294b7cb4c3a160cbbbe404baeaa23a3c8290a99 (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 8fe552070945561a0cd4dc24d3fcb22ed377f1a0 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Mon Apr 19 22:25:51 2021 -0400 meson: make our symlinking script more portable We do not need the --relative case as it is dead code (we only ever link a filename without directory components). For the rest, GNU-specific ln -T does two things: - if the link name is an existing directory, ln fails instead of creating a surprising link inside the directory - if the link name is a symlink to a directory, ln treats it as a file, and due to -f, unlinks it The second case can be portably solved by ln -n, and both cases can be solved by doing what the original autotools Makefile did: rm -f && ln -s If the file exists, it will be removed. If it cannot be removed, it must be an ordinary directory, and the script aborts with an error. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 079b9d44e2faadd83856de07f890bae5cc51c5a4 Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun Apr 18 20:59:44 2021 +0100 Only enable total progress when downloads > 1 Otherwise the total progress will just match the one package and be pretty useless. commit 41f9c50abf08e71aa5fd03568934ab80abc7715c Author: morganamilo <morganamilo(a)archlinux.org> Date: Sun Apr 18 20:59:43 2021 +0100 Always enable TotalDownload Previously TotalDownload would switch the % download from per package to overall. Meaning you had a choice of which information to dispplay. Now with parallel downloads TotalDownload adds an extra progress bar. There's no reason to have this an off by default feature. Let's just make it always on. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 63ad8b8b7639ac29fad6c4e0dcc699510c47d587 Author: morganamilo <morganamilo(a)archlinux.org> Date: Tue Apr 20 09:48:20 2021 +0100 pacman: fix total bar leaking Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a33cdac10bf1a68279ea1b9baa26aa09126f1ca4 Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Thu Apr 22 21:46:56 2021 +0200 makepkg: add tool details to buildinfo to aid determining flags If a makepkg consumer uses a build wrapper to override compiler flags this may lead to unreproducible packages as there is no way to know which exact files were used for tooling that tries to reproduce said package. Instead of vendoring the whole used makepkg.conf file into buildinfo, this patch adds two new properties to the .BUILDINFO file named BUILDTOOL and BUILDTOOLVER which by default are simply makepkg's own values. Downstream consumers may override those values: For example in Arch Linux the devtools package can set those values and allow reproducible builds tooling to fetch the appropriate makepkg.conf. Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3179db108a83104d9de6d1d607f55f8118e92160 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Apr 21 22:47:13 2021 +1000 Add support for multiple 'Architecture' values This allows architecture to be multivalued. On x86-64 machines, this could be something like: Architecture = x86-64-v3 x86-64 We use the first specified Architecture value in mirrorlist $arch variable replacement, as this is backwards-compatible and sane. Original-patch-by: Dan McGee <dan(a)archlinux.org> Patch-updated-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit abdb4d7fa699ae3b8ff09ba79656f6853b9a1357 Author: morganamilo <morganamilo(a)archlinux.org> Date: Mon Apr 19 10:36:14 2021 +0100 pacman: stop eta timer breaking allignment When the download estimate is over an hour the format displayed changes from mm:ss to hh:mm:ss. This causes everything to be out of alignment due to the extra characters. So instead lets just go back to --:-- when the download => 100 minutes. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0699321b3ce71c46fbd0a10fede3959d0fac7009 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Apr 18 23:25:13 2021 -0400 meson: make -uninstalled.pc correct This pkg-config file is automatically created in the meson-uninstalled/ directory of the build tree, and points to the built artifacts there. If this directory is added to PKG_CONFIG_PATH, it will be preferred over an installed copy. Making this work properly means it becomes trivially possible to build a private copy of libalpm, and then compile other projects using it rather than the system copy. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 288cd1c74afc5ff2e28b9a45a76d2146da583903 Author: Mark Weiman <mark.weiman(a)markzz.com> Date: Fri Apr 16 23:45:23 2021 -0400 Fix build error when SIGPOLL is not available On Linux, SIGPOLL is a valid signal, but on systems like FreeBSD, it is not. This patch does a preprocessor check to see if SIGPOLL is available or not. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3688c947f86f1ddbb24d6bf3b8b42fbe0be6fd0e Author: Mark Weiman <mark.weiman(a)markzz.com> Date: Fri Apr 16 23:45:22 2021 -0400 Add an include for signal.h when needed On Linux, signal.h is not required to have access to the signal constants. On FreeBSD, this is not the case and requires signal.h to be explicitly included. This patch adds an include for signal.h in any source file that uses it. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 207f0439eeecb505f74590af481236ec60c09876 Author: Mark Weiman <mark.weiman(a)markzz.com> Date: Fri Apr 16 23:45:21 2021 -0400 meson.build: Fix detection of symbols This patch changes the behavior of meson to define configuration options *only* when the symbol checked is present. Currently, it defines all of them in config.h whether the symbol exists or not and the code that looks for it doesn't check the macro's value, but whether it's defined. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 4 +-- build-aux/meson-make-symlink.sh | 8 ++--- doc/pacman.conf.5.asciidoc | 15 +++------ etc/pacman.conf.in | 1 - lib/libalpm/alpm.h | 30 ++++++++++++------ lib/libalpm/handle.c | 30 ++++++++++++++---- lib/libalpm/handle.h | 2 +- lib/libalpm/trans.c | 21 ++++++++++-- lib/libalpm/util.c | 9 ++++-- meson.build | 5 ++- scripts/completion/zsh_completion.in | 1 - scripts/makepkg.sh.in | 2 ++ src/pacman/callback.c | 18 +++++------ src/pacman/conf.c | 37 +++++++++++++--------- src/pacman/conf.h | 7 ++-- src/pacman/pacman-conf.c | 7 ++-- src/pacman/pacman.c | 2 +- test/pacman/meson.build | 2 ++ .../{upgrade071.py => multiple-architectures01.py} | 8 ++--- .../{upgrade084.py => multiple-architectures02.py} | 8 ++--- 20 files changed, 132 insertions(+), 85 deletions(-) copy test/pacman/tests/{upgrade071.py => multiple-architectures01.py} (57%) copy test/pacman/tests/{upgrade084.py => multiple-architectures02.py} (54%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] pacman: fix total bar leaking
by morganamilo 22 Apr '21

22 Apr '21

diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 5e910136..faecbc5b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -340,7 +340,7 @@ void cb_event(alpm_event_t *event) on_progress = 1; list_total_pkgs = event->pkg_retrieve.num; list_total = event->pkg_retrieve.total_size; - total_enabled = config->totaldownload && list_total; + total_enabled = config->totaldownload && list_total && dload_progressbar_enabled(); if(total_enabled) { init_total_progressbar(); } @@ -405,9 +405,10 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_PKG_RETRIEVE_DONE: case ALPM_EVENT_PKG_RETRIEVE_FAILED: console_cursor_move_end(); - if(total_enabled && dload_progressbar_enabled()) { + if(total_enabled) { update_bar_finalstats(totalbar); draw_pacman_progress_bar(totalbar); + free(totalbar); printf("\n"); } total_enabled = 0; -- 2.31.1

2 1

[pacman-dev] [PATCH] Add support for multiple 'Architecture' values
by Allan McRae 22 Apr '21

22 Apr '21

From: Dan McGee <dan(a)archlinux.org> This allows architecture to be multivalued. On x86-64 machines, this could be something like: Architecture = x86-64-v3 x86-64 We use the first specified Architecture value in mirrorlist $arch variable replacement, as this is backwards-compatible and sane. Original-patch-by: Dan McGee <dan(a)archlinux.org> Patch-updated-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Here is the link to Dan's original patch from 2012! https://code.toofishes.net/cgit/dan/pacman.git/commit/?h=multiarch&id=673c7… Getting this patch to apply did not require much effort, so I left Dan as the author. We guess the original patch did not get applied because it got lost due to no-one pushing it for inclusion. doc/pacman.conf.5.asciidoc | 10 +++--- lib/libalpm/alpm.h | 30 ++++++++++++----- lib/libalpm/handle.c | 30 +++++++++++++---- lib/libalpm/handle.h | 2 +- lib/libalpm/trans.c | 21 ++++++++++-- src/pacman/conf.c | 33 ++++++++++++------- src/pacman/conf.h | 4 +-- src/pacman/pacman-conf.c | 4 +-- src/pacman/pacman.c | 2 +- test/pacman/meson.build | 2 ++ test/pacman/tests/multiple-architectires01.py | 14 ++++++++ test/pacman/tests/multiple-architectires02.py | 16 +++++++++ 12 files changed, 127 insertions(+), 41 deletions(-) create mode 100644 test/pacman/tests/multiple-architectires01.py create mode 100644 test/pacman/tests/multiple-architectires02.py diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index 9bd31916..11ca1e4f 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -113,9 +113,9 @@ Options general configuration options. Wildcards in the specified paths will get expanded based on linkman:glob[7] rules. -*Architecture =* auto | i686 | x86_64 | ...:: - If set, pacman will only allow installation of packages of the given - architecture (e.g. 'i686', 'x86_64', etc). The special value 'auto' will +*Architecture =* auto &| i686 &| x86_64 | ...:: + If set, pacman will only allow installation of packages with the given + architectures (e.g. 'i686', 'x86_64', etc). The special value 'auto' will use the system architecture, provided via ``uname -m''. If unset, no architecture checks are made. *NOTE*: Packages with the special architecture 'any' can always be installed, as they are meant to be @@ -252,8 +252,8 @@ number. During parsing, pacman will define the `$repo` variable to the name of the current section. This is often utilized in files specified using the 'Include' directive so all repositories can use the same mirrorfile. pacman also defines -the `$arch` variable to the value of `Architecture`, so the same mirrorfile can -even be used for different architectures. +the `$arch` variable to the first (or only) value of the `Architecture` option, +so the same mirrorfile can even be used for different architectures. *SigLevel =* ...:: Set the signature verification level for this repository. For more diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 833df829..2e99d4d8 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -2016,25 +2016,37 @@ int alpm_option_remove_assumeinstalled(alpm_handle_t *handle, const alpm_depend_ /** @} */ -/** @name Accessors for the configured architecture - * - * libalpm will only install packages that match the configured architecture. - * The architecture does not need to match the physical architecture. - * It can just be treated as a label. +/** @name Accessors to the list of allowed architectures. + * libalpm will only install packages that match one of the configured + * architectures. The architectures do not need to match the physical + architecture. They can just be treated as a label. * @{ */ /** Returns the allowed package architecture. * @param handle the context handle - * @return the configured package architecture + * @return the configured package architectures */ -const char *alpm_option_get_arch(alpm_handle_t *handle); +alpm_list_t *alpm_option_get_architectures(alpm_handle_t *handle); -/** Sets the allowed package architecture. +/** Adds an allowed package architecture. * @param handle the context handle * @param arch the architecture to set */ -int alpm_option_set_arch(alpm_handle_t *handle, const char *arch); +int alpm_option_add_architecture(alpm_handle_t *handle, const char *arch); + +/** Sets the allowed package architecture. + * @param handle the context handle + * @param arches the architecture to set + */ +int alpm_option_set_architectures(alpm_handle_t *handle, alpm_list_t *arches); + +/** Removes an allowed package architecture. + * @param handle the context handle + * @param arch the architecture to remove + */ +int alpm_option_remove_architecture(alpm_handle_t *handle, const char *arch); + /* End of arch accessors */ /** @} */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 7b8cb1da..46224a25 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -77,7 +77,7 @@ void _alpm_handle_free(alpm_handle_t *handle) FREELIST(handle->hookdirs); FREE(handle->logfile); FREE(handle->lockfile); - FREE(handle->arch); + FREELIST(handle->architectures); FREE(handle->gpgdir); FREELIST(handle->noupgrade); FREELIST(handle->noextract); @@ -276,10 +276,10 @@ alpm_list_t SYMEXPORT *alpm_option_get_assumeinstalled(alpm_handle_t *handle) return handle->assumeinstalled; } -const char SYMEXPORT *alpm_option_get_arch(alpm_handle_t *handle) +alpm_list_t SYMEXPORT *alpm_option_get_architectures(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); - return handle->arch; + return handle->architectures; } int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) @@ -720,11 +720,29 @@ int SYMEXPORT alpm_option_remove_assumeinstalled(alpm_handle_t *handle, const al return 0; } -int SYMEXPORT alpm_option_set_arch(alpm_handle_t *handle, const char *arch) +int SYMEXPORT alpm_option_add_architecture(alpm_handle_t *handle, const char *arch) { + handle->architectures = alpm_list_add(handle->architectures, strdup(arch)); + return 0; +} + +int SYMEXPORT alpm_option_set_architectures(alpm_handle_t *handle, alpm_list_t *arches) +{ + CHECK_HANDLE(handle, return -1); + if(handle->architectures) FREELIST(handle->architectures); + handle->architectures = alpm_list_strdup(arches); + return 0; +} + +int SYMEXPORT alpm_option_remove_architecture(alpm_handle_t *handle, const char *arch) +{ + char *vdata = NULL; CHECK_HANDLE(handle, return -1); - if(handle->arch) FREE(handle->arch); - STRDUP(handle->arch, arch, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + handle->architectures = alpm_list_remove_str(handle->architectures, arch, &vdata); + if(vdata != NULL) { + FREE(vdata); + return 1; + } return 0; } diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 2d8d0f9e..52dc2125 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -96,7 +96,7 @@ struct __alpm_handle_t { alpm_list_t *assumeinstalled; /* List of virtual packages used to satisfy dependencies */ /* options */ - char *arch; /* Architecture of packages we should allow */ + alpm_list_t *architectures; /* Architectures of packages we should allow */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int checkspace; /* Check disk space before installing */ char *dbext; /* Sync DB extension */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index c6ec7eea..939ab05a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -71,14 +71,29 @@ static alpm_list_t *check_arch(alpm_handle_t *handle, alpm_list_t *pkgs) alpm_list_t *i; alpm_list_t *invalid = NULL; - const char *arch = handle->arch; - if(!arch) { + if(!handle->architectures) { + _alpm_log(handle, ALPM_LOG_DEBUG, "skipping architecture checks\n"); return NULL; } for(i = pkgs; i; i = i->next) { alpm_pkg_t *pkg = i->data; + alpm_list_t *j; + int found = 0; const char *pkgarch = alpm_pkg_get_arch(pkg); - if(pkgarch && strcmp(pkgarch, arch) && strcmp(pkgarch, "any")) { + + /* always allow non-architecture packages and those marked "any" */ + if(!pkgarch || strcmp(pkgarch, "any") == 0) { + continue; + } + + for(j = handle->architectures; j; j = j->next) { + if(strcmp(pkgarch, j->data) == 0) { + found = 1; + break; + } + } + + if(!found) { char *string; const char *pkgname = pkg->name; const char *pkgver = pkg->version; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cde96716..9578daa3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -159,7 +159,7 @@ int config_free(config_t *oldconfig) FREELIST(oldconfig->cachedirs); free(oldconfig->xfercommand); free(oldconfig->print_format); - free(oldconfig->arch); + FREELIST(oldconfig->architectures); wordsplit_free(oldconfig->xfercommand_argv); free(oldconfig); @@ -394,16 +394,19 @@ cleanup: } -int config_set_arch(const char *arch) +int config_add_architecture(char *arch) { if(strcmp(arch, "auto") == 0) { struct utsname un; + char *newarch; uname(&un); - config->arch = strdup(un.machine); - } else { - config->arch = strdup(arch); + newarch = strdup(un.machine); + free(arch); + arch = newarch; } - pm_printf(ALPM_LOG_DEBUG, "config: arch: %s\n", config->arch); + + pm_printf(ALPM_LOG_DEBUG, "config: arch: %s\n", arch); + config->architectures = alpm_list_add(config->architectures, arch); return 0; } @@ -638,9 +641,12 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "HookDir") == 0) { setrepeatingoption(value, "HookDir", &(config->hookdirs)); } else if(strcmp(key, "Architecture") == 0) { - if(!config->arch) { - config_set_arch(value); + alpm_list_t *i, *arches = NULL; + setrepeatingoption(value, "Architecture", &arches); + for(i = arches; i; i = alpm_list_next(i)) { + config_add_architecture(i->data); } + alpm_list_free(arches); } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { @@ -751,17 +757,20 @@ static int _parse_options(const char *key, char *value, static char *replace_server_vars(config_t *c, config_repo_t *r, const char *s) { - if(c->arch == NULL && strstr(s, "$arch")) { + if(c->architectures == NULL && strstr(s, "$arch")) { pm_printf(ALPM_LOG_ERROR, _("mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"), s, "$arch", "Architecture"); return NULL; } - if(c->arch) { + /* use first specified architecture */ + if(c->architectures) { char *temp, *replaced; + alpm_list_t *i = config->architectures; + const char *arch = i->data; - replaced = strreplace(s, "$arch", c->arch); + replaced = strreplace(s, "$arch", arch); temp = replaced; replaced = strreplace(temp, "$repo", r->name); @@ -893,7 +902,7 @@ static int setup_libalpm(void) pm_printf(ALPM_LOG_WARNING, _("no '%s' configured\n"), "XferCommand"); } - alpm_option_set_arch(handle, config->arch); + alpm_option_set_architectures(handle, config->architectures); alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 1b9fb337..316c8d0f 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -57,7 +57,6 @@ typedef struct __config_t { unsigned short usesyslog; unsigned short color; unsigned short disable_dl_timeout; - char *arch; char *print_format; /* unfortunately, we have to keep track of paths both here and in the library * because they can come from both the command line or config file, and we @@ -70,6 +69,7 @@ typedef struct __config_t { char *sysroot; alpm_list_t *hookdirs; alpm_list_t *cachedirs; + alpm_list_t *architectures; unsigned short op_q_isfile; unsigned short op_q_info; @@ -244,7 +244,7 @@ int config_free(config_t *oldconfig); void config_repo_free(config_repo_t *repo); -int config_set_arch(const char *arch); +int config_add_architecture(char *arch); int parseconfig(const char *file); int parseconfigfile(const char *file); int setdefaults(config_t *c); diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index f8fac75d..6ca21119 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -258,7 +258,7 @@ static void dump_config(void) show_list_str("NoUpgrade", config->noupgrade); show_list_str("NoExtract", config->noextract); - show_str("Architecture", config->arch); + show_list_str("Architecture", config->architectures); show_str("XferCommand", config->xfercommand); show_bool("UseSyslog", config->usesyslog); @@ -364,7 +364,7 @@ static int list_directives(void) } else if(strcasecmp(i->data, "Architecture") == 0) { - show_str("Architecture", config->arch); + show_list_str("Architecture", config->architectures); } else if(strcasecmp(i->data, "XferCommand") == 0) { show_str("XferCommand", config->xfercommand); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index b2aabc08..7e810127 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -377,7 +377,7 @@ static int parsearg_global(int opt) { switch(opt) { case OP_ARCH: - config_set_arch(optarg); + config_add_architecture(strdup(optarg)); break; case OP_ASK: config->noask = 1; diff --git a/test/pacman/meson.build b/test/pacman/meson.build index 52ff9b9a..60722a8a 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -85,6 +85,8 @@ pacman_tests = [ 'tests/mode001.py', 'tests/mode002.py', 'tests/mode003.py', + 'tests/multiple-architectires01.py', + 'tests/multiple-architectires02.py', 'tests/noupgrade-inverted.py', 'tests/overwrite-files-match-negated.py', 'tests/overwrite-files-match.py', diff --git a/test/pacman/tests/multiple-architectires01.py b/test/pacman/tests/multiple-architectires01.py new file mode 100644 index 00000000..39f3e1f7 --- /dev/null +++ b/test/pacman/tests/multiple-architectires01.py @@ -0,0 +1,14 @@ +self.description = "Install a package (multiple Architecture options, wrong)" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +p.arch = 'i686' +self.addpkg(p) + +self.option["Architecture"] = ['i586', 'i486', 'i386'] + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=dummy") diff --git a/test/pacman/tests/multiple-architectires02.py b/test/pacman/tests/multiple-architectires02.py new file mode 100644 index 00000000..18625ec6 --- /dev/null +++ b/test/pacman/tests/multiple-architectires02.py @@ -0,0 +1,16 @@ +self.description = "Install a package (multiple Architecture options)" + +p = pmpkg("dummy") +p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +p.arch = 'i486' +self.addpkg(p) + +self.option["Architecture"] = ['i586', 'i486', 'i386'] + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dummy") +for f in p.files: + self.addrule("FILE_EXIST=%s" % f) \ No newline at end of file -- 2.31.1

3 3