- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/4] paccache: read default cachedir from pacman.conf
by Dave Reisner 11 Aug '14

11 Aug '14

Implements FS#40738. --- contrib/paccache.sh.in | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 039ac8a..57c0458 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -25,7 +25,7 @@ declare -r myver='@PACKAGE_VERSION@' declare -a candidates=() cmdopts=() whitelist=() blacklist=() declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0 -declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' keep=3 movedir= scanarch= +declare cachedir= delim=$'\n' keep=3 movedir= scanarch= USE_COLOR='y' @@ -37,6 +37,19 @@ die() { exit 1 } +get_cachedir_from_config() { + local key value + + while IFS=$'= \t' read -r key value _; do + if [[ $key = CacheDir ]]; then + echo "$value" + return 0 + fi + done <"$1" + + return 1 +} + # reads a list of files on stdin and prints out deletion candidates pkgfilter() { # there's whitelist and blacklist parameters passed to this @@ -165,8 +178,7 @@ Usage: ${myname} <operation> [options] [targets...] Options: -a, --arch <arch> scan for "arch" (default: all architectures). - -c, --cachedir <dir> scan "dir" for packages. - (default: @localstatedir@/cache/pacman/pkg). + -c, --cachedir <dir> scan "dir" for packages. (default: $cachedir). -f, --force apply force to mv(1) and rm(1) operations. -h, --help display this help message and exit. -i, --ignore <pkgs> ignore "pkgs", comma-separated. Alternatively, specify @@ -191,6 +203,8 @@ OPT_SHORT=':a:c:dfhi:k:m:rsuVvz' OPT_LONG=('arch:' 'cachedir:' 'dryrun' 'force' 'help' 'ignore:' 'keep:' 'move' 'nocolor' 'remove' 'uninstalled' 'version' 'verbose' 'null') +cachedir=$(get_cachedir_from_config "@sysconfdir@/pacman.conf") + if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 fi -- 2.0.4

2 5

[pacman-dev] [PATCH 1/3] makepkg: break out check_checksums to reasonably sized functions
by Dave Reisner 10 Aug '14

10 Aug '14

--- scripts/makepkg.sh.in | 95 +++++++++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 41 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4b23a5b..cb5ded9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1111,53 +1111,66 @@ generate_checksums() { done } -check_checksums() { - (( SKIPCHECKSUMS )) && return 0 - (( ! ${#source[@]} )) && return 0 +verify_integrity_one() { + local source_name=$1 integ=$2 expectedsum=$3 - local correlation=0 - local integ required - for integ in "${known_hash_algos[@]}"; do - local sumname="${integ}sums[@]" - local integrity_sums=("${!sumname}") - if (( ${#integrity_sums[@]} == ${#source[@]} )); then - msg "$(gettext "Validating source files with %s...")" "${integ}sums" - correlation=1 - local idx errors=0 - for (( idx = 0; idx < ${#source[*]}; idx++ )); do - local file="$(get_filename "${source[idx]}")" - printf ' %s ... ' "$file" >&2 - - if [[ ${integrity_sums[idx]} = 'SKIP' ]]; then - printf '%s\n' "$(gettext "Skipped")" >&2 - continue - fi + local file="$(get_filename "$source_name")" + printf ' %s ... ' "$file" >&2 - if ! file="$(get_filepath "$file")"; then - printf '%s\n' "$(gettext "NOT FOUND")" >&2 - errors=1 - continue - fi + if [[ $expectedsum = 'SKIP' ]]; then + printf '%s\n' "$(gettext "Skipped")" >&2 + return + fi - local expectedsum="${integrity_sums[idx],,}" - local realsum="$(openssl dgst -${integ} "$file")" - realsum="${realsum##* }" - if [[ $expectedsum = "$realsum" ]]; then - printf '%s\n' "$(gettext "Passed")" >&2 - else - printf '%s\n' "$(gettext "FAILED")" >&2 - errors=1 - fi - done + if ! file="$(get_filepath "$file")"; then + printf '%s\n' "$(gettext "NOT FOUND")" >&2 + return 1 + fi - if (( errors )); then - error "$(gettext "One or more files did not pass the validity check!")" - exit 1 # TODO: error code - fi - elif (( ${#integrity_sums[@]} )); then - error "$(gettext "Integrity checks (%s) differ in size from the source array.")" "$integ" + local realsum="$(openssl dgst -${integ} "$file")" + realsum="${realsum##* }" + if [[ ${expectedsum,,} = "$realsum" ]]; then + printf '%s\n' "$(gettext "Passed")" >&2 + else + printf '%s\n' "$(gettext "FAILED")" >&2 + return 1 + fi + + return 0 +} + +verify_integrity_sums() { + local integ=$1 integrity_sums + + array_build integrity_sums "${integ}sums" + + if (( ${#integrity_sums[@]} == ${#source[@]} )); then + msg "$(gettext "Validating source files with %s...")" "${integ}sums" + local idx errors=0 + for (( idx = 0; idx < ${#source[*]}; idx++ )); do + verify_integrity_one "${source[idx]}" "$integ" "${integrity_sums[idx]}" || errors=1 + done + + if (( errors )); then + error "$(gettext "One or more files did not pass the validity check!")" exit 1 # TODO: error code fi + elif (( ${#integrity_sums[@]} )); then + error "$(gettext "Integrity checks (%s) differ in size from the source array.")" "$integ" + exit 1 # TODO: error code + else + return 1 + fi +} + +check_checksums() { + (( SKIPCHECKSUMS )) && return 0 + (( ! ${#source[@]} )) && return 0 + + local correlation=0 + local integ + for integ in "${known_hash_algos[@]}"; do + verify_integrity_sums "$integ" && correlation=1 done if (( ! correlation )); then -- 2.0.4

2 4

[pacman-dev] [PATCH] pacman-key: stricter parsing for -verify
by Allan McRae 09 Aug '14

09 Aug '14

Prevents trust being spoofed by using TRUST_FULLY in the signatory's name or in an added notation. Fixes FS#41147. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/pacman-key.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 82340f9..ba8d02e 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -482,7 +482,7 @@ verify_sig() { local ret=0 for sig; do msg "Checking %s ..." "$sig" - if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify "$sig" | grep -qE 'TRUST_(FULLY|ULTIMATE)'; then + if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify "$sig" | grep -qE '^\[GNUPG:\] TRUST_(FULLY|ULTIMATE)$'; then error "$(gettext "The signature identified by %s could not be verified.")" "$sig" ret=1 fi -- 2.0.4

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-406-g3e19cd3
by allan＠archlinux.org 09 Aug '14

09 Aug '14

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 3e19cd366add23390ce4d0c9531b2c07e009a217 (commit) via ab07dfdeb9b4ecc443aa25f40fa530a730f65cde (commit) via 37634d22e501538e5a4b12105a0b56542841e71f (commit) via db14815f463c5128a2fc25df8d7570293987e18f (commit) via 99a5017f5591d17784ac2456b1401628f2749eea (commit) via 17ed9eb7342670a18337516312a25e6cc0b8936c (commit) via 2b556d89de0d3f10466b4db4d8915a3ffb1163de (commit) via cbd6c300b5bdf61b7df80f42cf06c69a6e4fde60 (commit) via 8d5d7f676196c9ec56dddc39de260eb40a51e843 (commit) via 8a02abcf194a7d4479c39cf0ce2dc03db9b199e1 (commit) via b694d8455453f06158f51a276c61f9d90ecc10fe (commit) via 1431d244f741b5ea2c7fc16324174d59d13ffc33 (commit) via 574e45df28769b4919c0c7e5c7cb10d521066adc (commit) via 7c75564af933ad5258b2e2bee6ce63b9bcbf6561 (commit) via 2025279eb64c397e408baab7ff686624604f415a (commit) via d981f93f18449e2cb7b67bfb417aac4737c84b57 (commit) via 4ccf49d3e74bf2af010fc90d9cd6fbeb71402f99 (commit) via 0bf4ae726d6a98142a176b9ac0b9ed8f00389e67 (commit) via 03b9bf08ac3b1e3f2c3b950ce995654af2c40503 (commit) via 7f1360b44089d69bae9a793741c0292fe91e32e4 (commit) via f4992960ad4a325184802a47dc23d53d15be452f (commit) via 0c43198ee0817d7acea47ea5d15b4704db78308f (commit) via 22e478d20322a1d224fc41866d018d4b8a774057 (commit) via 85c80542a5c52311fdde71459a924d87ec95cc93 (commit) via 32413ad44b874d622034ebd63da57159446a91d3 (commit) via dce82f9d198aed6ee1700048cd49dd3f95bdc9a7 (commit) via 7e87614665f667cc550acab3626ab6ad655541c7 (commit) from fbb0945bfb6a9535dc42a120466b44c0b39c915d (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 3e19cd366add23390ce4d0c9531b2c07e009a217 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Thu Aug 7 00:43:21 2014 -0400 pkgdelta(8): Fix broken example of --min-pkg-size with human-readable values The example for human-readable values must not contain a space between the value and the unit; otherwise, pkgdelta will not recognize the command options and will error out. In prose, however, there should be a space between the value and the unit. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ab07dfdeb9b4ecc443aa25f40fa530a730f65cde Author: Jason St. John <jstjohn(a)purdue.edu> Date: Thu Aug 7 00:43:20 2014 -0400 man: Improve grammar and add missing single quotes around command options Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 37634d22e501538e5a4b12105a0b56542841e71f Author: Jason St. John <jstjohn(a)purdue.edu> Date: Thu Aug 7 00:43:19 2014 -0400 man: Use uniform line spacing between sections Remove blank lines immediately following section headings. Ensure two blank lines before the start of a new section. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit db14815f463c5128a2fc25df8d7570293987e18f Author: Jason St. John <jstjohn(a)purdue.edu> Date: Thu Aug 7 00:43:18 2014 -0400 pacman(8): Improve grammar and quoting Notable changes: * Add double quotes around printf-like formatting options for "--print-format" * Add a missing backslash in '--force' Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 99a5017f5591d17784ac2456b1401628f2749eea Author: Olivier Brunel <jjk(a)jjacky.com> Date: Sat Aug 9 00:41:35 2014 +0200 Fix loading invalid package In 5acfa65f when adding a new variable (hit_mtree), the initialization of a variable (config) was dropped, which could lead to loading invalid package files, i.e. files that aren't archive (no metadata loaded) would return a new alpm_pkg_t with everything set to 0/NULL. Depending on the operation/use of the package, this could lead to segfault. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 17ed9eb7342670a18337516312a25e6cc0b8936c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Aug 2 20:28:05 2014 -0400 makepkg: replace bare eval with var extraction functions commit 2b556d89de0d3f10466b4db4d8915a3ffb1163de Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 25 14:01:48 2014 -0400 PKGBUILD: handle arch specific attributes This introduces support for architecture-specific conflicts, depends, optdepends, makedepends, replaces, and conflicts by appending "_$CARCH" to the array name. For example, in the global section: arch=('i686' 'x86_64') depends=('foo') depends_x86_64=('bar') This will generate depends of 'foo' and 'bar' on x86_64, but only 'foo' on i686. Moreover, this is supported in the package functions with the same heuristics as the generic names, e.g. ... arch=('i686' 'x86_64') depends=('foo') ... package_somepkg() { depends_x86_64=('bar') ... } Again, will cause x86_64 to have depends of 'foo' and 'bar', but only 'foo' for i686. commit cbd6c300b5bdf61b7df80f42cf06c69a6e4fde60 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Aug 1 16:59:58 2014 -0400 makepkg: refactor check_sanity, give it some sanity of its own Break apart each of the blocks into their own separate functions. And, instead of the hand crafted eval statements, reuse the logic from pkgbuild-introspection[0] to abstract away the complexities of parsing bash. This commit fixes at least 3 bugs in check_sanity: 1) The wrong variable is shown for the error which would be thrown when, e.g. pkgname=('foopkg' 'bar^pkg') 2) The "arch" variable is not sanity checked when the PKGBUILD has an arch override, but only one output package. 3) https://bugs.archlinux.org/task/40361 Lastly, there's some string changes here which should help to clarify a few errors emitted in the linting process. [0] https://github.com/falconindy/pkgbuild-introspection commit 8d5d7f676196c9ec56dddc39de260eb40a51e843 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Aug 8 13:41:27 2014 +1000 Update PKGBUILD documentation for removed override options Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8a02abcf194a7d4479c39cf0ce2dc03db9b199e1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Aug 4 08:48:05 2014 -0400 makepkg: disallow pkgver/pkgrel/epoch overrides in packages This is a confusing feature, and no one uses it. commit b694d8455453f06158f51a276c61f9d90ecc10fe Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Aug 7 19:22:21 2014 -0400 remove --destination-dir argument from a2x options This option is only for HTML output, and we're building manpages here. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1431d244f741b5ea2c7fc16324174d59d13ffc33 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Aug 4 15:34:01 2014 +1000 Add Andrew to maintainers list. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 574e45df28769b4919c0c7e5c7cb10d521066adc Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Apr 6 11:04:18 2014 -0400 trans_commit: log beginning and end of transaction This makes it clear whether a transaction successfully completed and allows log parsers to group related actions. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7c75564af933ad5258b2e2bee6ce63b9bcbf6561 Author: Ryo Munakata <ryomnktml(a)gmail.com> Date: Mon Jul 14 19:15:40 2014 +0900 filecache_find_url: dereference the 'filebase' pointer Signed-off-by: Ryo Munakata <ryomnktml(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2025279eb64c397e408baab7ff686624604f415a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 1 14:19:54 2014 -0700 replace strdup with STRDUP Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d981f93f18449e2cb7b67bfb417aac4737c84b57 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 1 14:19:53 2014 -0700 sync.c: fix style violations Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4ccf49d3e74bf2af010fc90d9cd6fbeb71402f99 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 1 14:19:52 2014 -0700 pacman.c: simplify stdin parsing Incorporate memory exhaustion and end-of-stream checks into the main loop. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0bf4ae726d6a98142a176b9ac0b9ed8f00389e67 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 1 14:19:51 2014 -0700 handle_unlock: log error when lock file is missing Problems due to concurrent running instances of pacman can be difficult to diagnose. Log a warning to make it more obvious that that's what happened, that it's a bad idea, and hopefully encourage people who do things like removing the lock file to run pacman from an install script to at least be courteous enough to put it back when they're done. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 03b9bf08ac3b1e3f2c3b950ce995654af2c40503 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 1 14:19:50 2014 -0700 handle_unlock: log lock removal failure Rather than have individual callers log failure, just do it directly in _alpm_handle_unlock. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7f1360b44089d69bae9a793741c0292fe91e32e4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 1 14:19:49 2014 -0700 signing.c: remove useless error check CHECK_ERR checks gpg_err which is a local variable. Calling gpg_op_import_result cannot modify it. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f4992960ad4a325184802a47dc23d53d15be452f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 1 14:19:48 2014 -0700 deps.c: use alpm_list_find_ptr Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0c43198ee0817d7acea47ea5d15b4704db78308f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 1 14:19:47 2014 -0700 dep_graph_init: filter ignored packages by name Ignored packages are from the transaction remove list which consists of duplicated packages so a direct pointer comparison is not appropriate. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 22e478d20322a1d224fc41866d018d4b8a774057 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 1 14:19:46 2014 -0700 pactest: delay test object creation The actual test object is only used to run the test. Storing test cases as strings limits the test object scope and allows it to be garbage collected, reducing memory usage when multiple tests are run. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 85c80542a5c52311fdde71459a924d87ec95cc93 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 1 14:19:45 2014 -0700 pactest: only snapshot needed files Only a few of our tests need file snapshots at all and most of them only need a few files. Taking snapshots of the entire test environment for every single test is a massive waste. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 32413ad44b874d622034ebd63da57159446a91d3 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Aug 1 14:19:44 2014 -0700 handle: factor out string list option handling Consolidates repeated code and replaces dangerous strdup calls with STRDUP. Also fix a couple variables named "pkg" that refer to file paths. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dce82f9d198aed6ee1700048cd49dd3f95bdc9a7 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 29 23:23:09 2014 +1000 makepkg: skip dependency checking with --verifysource Dependencies are now handled with --nobuild unless specificially skipped. Using --verifysource will skip dependency checks unless --syncdeps is specified. Fixes FS#35057 and FS#36999. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7e87614665f667cc550acab3626ab6ad655541c7 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jun 29 22:36:22 2014 +1000 makepkg: ensure vcs download tool are installed when required Add an array VCSCLIENTS to makepkg.conf that matches vcs source protocols to the package containing the software needed for handling the source. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 3 +- doc/PKGBUILD.5.txt | 33 ++- doc/footer.txt | 1 + doc/makepkg-template.1.txt | 7 +- doc/makepkg.8.txt | 16 +- doc/makepkg.conf.5.txt | 10 +- doc/pacman-key.8.txt | 4 +- doc/pacman.8.txt | 14 +- doc/pacman.conf.5.txt | 13 +- doc/pactree.8.txt | 15 +- doc/pkgdelta.8.txt | 7 +- doc/repo-add.8.txt | 11 +- doc/submitting-patches.txt | 16 +- doc/translation-help.txt | 27 +-- doc/vercmp.8.txt | 7 +- lib/libalpm/alpm.h | 8 +- lib/libalpm/be_package.c | 4 +- lib/libalpm/be_sync.c | 6 +- lib/libalpm/deps.c | 13 +- lib/libalpm/diskspace.c | 6 +- lib/libalpm/dload.c | 2 +- lib/libalpm/handle.c | 115 ++++----- lib/libalpm/package.c | 2 +- lib/libalpm/signing.c | 1 - lib/libalpm/trans.c | 17 +- scripts/makepkg.sh.in | 577 ++++++++++++++++++++++++++++++++++----------- src/pacman/pacman.c | 27 +-- src/pacman/sync.c | 12 +- test/pacman/pmenv.py | 6 +- test/pacman/pmrule.py | 6 + test/pacman/pmtest.py | 17 +- 31 files changed, 667 insertions(+), 336 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/4] pacman(8): Improve grammar and quoting
by Jason St. John 09 Aug '14

09 Aug '14

Notable changes: * Add double quotes around printf-like formatting options for "--print-format" * Add a missing backslash in '--force' Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- doc/pacman.8.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index ccc0a01..28a12cf 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -123,7 +123,7 @@ Options Specify an alternative database location (a typical default is +{localstatedir}/lib/pacman+). This should not be used unless you know what you are doing. - *NOTE*: if specified, this is an absolute path, and the root path is + *NOTE*: If specified, this is an absolute path, and the root path is not automatically prepended. *-r, \--root* <path>:: @@ -176,7 +176,7 @@ Options Bypass any and all ``Are you sure?'' messages. It's not a good idea to do this unless you want to run pacman from a script. -Transaction Options (apply to '-S', '-R' and '-U') +Transaction Options (apply to '-S', '-R', and '-U') -------------------------------------------------- *-d, \--nodeps*:: Skips dependency version checks. Package names are still checked. Normally, @@ -203,8 +203,8 @@ Transaction Options (apply to '-S', '-R' and '-U') *\--print-format* <format>:: Specify a printf-like format to control the output of the '\--print' - operation. The possible attributes are: %n for pkgname, %v for pkgver, - %l for location, %r for repo, and %s for size. Implies '\--print'. + operation. The possible attributes are: "%n" for pkgname, "%v" for pkgver, + "%l" for location, "%r" for repository, and "%s" for size. Implies '\--print'. Upgrade Options (apply to '-S' and '-U')[[UO]] -------------------------------------------- @@ -212,7 +212,7 @@ Upgrade Options (apply to '-S' and '-U')[[UO]] Bypass file conflict checks and overwrite conflicting files. If the package that is about to be installed contains files that are already installed, this option will cause all those files to be overwritten. - Using '--force' will not allow overwriting a directory with a file or + Using '\--force' will not allow overwriting a directory with a file or installing packages with conflicting files and directories. This option should be used with care, ideally not at all. @@ -406,7 +406,7 @@ select sync packages whose versions do not match with the local versions. This can be useful when the user switches from a testing repository to a stable one. + Additional targets can also be specified manually, so that '-Su foo' will do a -system upgrade and install/upgrade the foo package in the same operation. +system upgrade and install/upgrade the "foo" package in the same operation. *-w, \--downloadonly*:: Retrieve all packages from the server, but do not install/upgrade anything. -- 2.0.4

2 4

[pacman-dev] [PATCH 1/6] remove --destination-dir argument from a2x options
by Dave Reisner 09 Aug '14

09 Aug '14

This option is only for HTML output, and we're building manpages here. --- doc/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index a7908df..60a70b3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -124,8 +124,7 @@ A2X_OPTS = \ --no-xmllint \ -d manpage \ -f manpage \ - --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' \ - --destination-dir='./' + --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' # These rules are due to the includes and files of the asciidoc text $(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile.am -- 2.0.4

3 9

[pacman-dev] [PATCH] Fix loading invalid package
by Olivier Brunel 08 Aug '14

08 Aug '14

In 5acfa65f when adding a new variable (hit_mtree), the initialization of a variable (config) was dropped, which could lead to loading invalid package files, i.e. files that aren't archive (no metadata loaded) would return a new alpm_pkg_t with everything set to 0/NULL. Depending on the operation/use of the package, this could lead to segfault. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- lib/libalpm/be_package.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 2275129..6ec8888 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -540,7 +540,9 @@ error: alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, const char *pkgfile, int full) { - int ret, fd, config, hit_mtree = 0; + int ret, fd; + int config = 0; + int hit_mtree = 0; struct archive *archive; struct archive_entry *entry; alpm_pkg_t *newpkg; -- 2.0.4

1 0

[pacman-dev] [PATCH] Update PKGBUILD documentation for removed override options
by Allan McRae 08 Aug '14

08 Aug '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 17e8af2..da225a4 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -368,9 +368,9 @@ Each split package uses a corresponding packaging function with name All options and directives for the split packages default to the global values given in the PKGBUILD. Nevertheless, the following ones can be overridden within each split package's packaging function: -`pkgver`, `pkgrel`, `epoch`, `pkgdesc`, `arch`, `url`, `license`, `groups`, -`depends`, `optdepends`, `provides`, `conflicts`, `replaces`, `backup`, -`options`, `install` and `changelog`. +`pkgdesc`, `arch`, `url`, `license`, `groups`, `depends`, `optdepends`, +`provides`, `conflicts`, `replaces`, `backup`, `options`, `install` and +`changelog`. An optional global directive is available when building a split package: -- 2.0.4

1 0

[pacman-dev] [PATCH 1/2] pacman: set SA_RESTART for signal handler
by Andrew Gregory 07 Aug '14

07 Aug '14

Calling a signal handler interrupts some functions, most notably read() and therefore fgets(). This was less of an issue in the past because signals generally resulted in the termination of the program, the recently added SIGWINCH handler does not. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- For an easy and safe way to see the problem fixed by this and the next patch resize the terminal while pacman is waiting for a user response. src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 12a4f7a..6787e72 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1029,7 +1029,7 @@ int main(int argc, char *argv[]) /* Set up the structure to specify the new action. */ new_action.sa_handler = handler; sigemptyset(&new_action.sa_mask); - new_action.sa_flags = 0; + new_action.sa_flags = SA_RESTART; /* assign our handler to any signals we care about */ for(i = 0; i < sizeof(signals) / sizeof(signals[0]); i++) { -- 2.0.1

2 2

[pacman-dev] [PATCH 1/2] Refactor check_sanity, to give it some sanity of its own
by Dave Reisner 04 Aug '14

04 Aug '14

Break apart each of the blocks into their own separate functions. And, instead of the hand crafted eval statements, reuse the logic from pkgbuild-introspection[0] to abstract away the complexities of parsing bash. This commit fixes at least 3 bugs in check_sanity, and one other: 1) The wrong variable is shown for the error which would be thrown when, e.g. pkgname=('foopkg' 'bar@pkg') 2) The "arch" variable is not sanity checked when the PKGBUILD has package_$pkgname() instead of package(). 3) Avoid linting pkgrel/epoch in package functions (because we don't actually support these overrides). 4) The "arch" variable is leaked when processing arch overrides in packages. For example: pkgname=(foo libfoo) arch=('i686' 'x86_64') .... package_foo() { arch=('any') : } package_libfoo() { : } This leaks arch=('any') into package_libfoo. Reversing the order of pkgname will mask this bug. Lastly, there's some string changes here which should help to clarify a few errors emitted in the linting process. [0] https://github.com/falconindy/pkgbuild-introspection --- scripts/makepkg.sh.in | 391 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 284 insertions(+), 107 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ee70e43..baa3720 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2202,18 +2202,89 @@ have_function() { declare -f "$1" >/dev/null } -check_sanity() { - # check for no-no's in the build script - local i - local ret=0 - for i in 'pkgname' 'pkgrel'; do - if [[ -z ${!i} ]]; then - error "$(gettext "%s is not allowed to be empty.")" "$i" - ret=1 - fi - done +array_build() { + eval "$1=(\"\${$2[@]}\")" +} + +funcgrep() { + { declare -f "$1" || declare -f package; } 2>/dev/null | grep -E "$2" +} + +extract_global_var() { + # $1: variable name + # $2: multivalued + # $3: name of output var + + local attr=$1 isarray=$2 outputvar=$3 + + if (( isarray )); then + array_build ref "$attr" + [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" + else + [[ -v $attr ]] && printf -v "$outputvar" %s "${!attr}" + fi +} + +extract_function_var() { + # $1: function name + # $2: variable name + # $3: multivalued + # $4: name of output var + + local funcname=$1 attr=$2 isarray=$3 outputvar=$4 attr_regex= decl= r=1 + + if (( isarray )); then + printf -v attr_regex '^[[:space:]]*(declare( -[[:alpha:]])*)? %q\+?=\(' "$2" + else + printf -v attr_regex '^[[:space:]]*(declare( -[[:alpha:]])*)? %q\+?=[^(]' "$2" + fi + + while read -r; do + # strip leading whitespace and any usage of declare + decl=${REPLY##*([[:space:]])?(declare +(-+([[:alpha:]]) ))} + eval "${decl/#$attr/$outputvar}" + + # entering this loop at all means we found a match, so notify the caller. + r=0 + done < <(funcgrep "$funcname" "$attr_regex") + + return $r +} + +pkgbuild_get_attribute() { + # $1: package name + # $2: attribute name + # $3: name of output var + # $4: multivalued + + local pkgname=$1 attrname=$2 outputvar=$3 isarray=$4 + + printf -v "$outputvar" %s '' + + if [[ $pkgname ]]; then + extract_global_var "$attrname" "$isarray" "$outputvar" + extract_function_var "package_$pkgname" "$attrname" "$isarray" "$outputvar" + else + extract_global_var "$attrname" "$isarray" "$outputvar" + fi +} + +lint_pkgbase() { + if [[ ${pkgbase:0:1} = "-" ]]; then + error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" + return 1 + fi +} + +lint_pkgname() { + local ret=0 i for i in "${pkgname[@]}"; do + if [[ -z $i ]]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgname" + ret=1 + continue + fi if [[ ${i:0:1} = "-" ]]; then error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" ret=1 @@ -2224,155 +2295,261 @@ check_sanity() { fi if [[ $i = *[^[:alnum:]+_.@-]* ]]; then error "$(gettext "%s contains invalid characters: '%s'")" \ - 'pkgname' "${pkgname//[[:alnum:]+_.@-]}" + 'pkgname' "${i//[[:alnum:]+_.@-]}" ret=1 fi done - if [[ ${pkgbase:0:1} = "-" ]]; then - error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgbase" + return $ret +} + +lint_pkgrel() { + local ret=0 + + if [[ -z $pkgrel ]]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgrel" ret=1 fi - if (( ! PKGVERFUNC )) ; then - check_pkgver || ret=1 + if [[ $pkgrel != +([0-9])?(.+([0-9])) ]]; then + error "$(gettext "%s must be a decimal, not %s.")" "pkgrel" "$pkgrel" + ret=1 fi - awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | - while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "${i%%+([[:space:]])}")\" - if [[ $i != +([0-9])?(.+([0-9])) ]]; then - error "$(gettext "%s must be a decimal.")" "pkgrel" - return 1 - fi - done || ret=1 + return $ret +} - awk -F'=' '$1 ~ /^[[:space:]]*epoch$/' "$BUILDFILE" | - while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "${i%%+([[:space:]])}")\" - if [[ $i != *([[:digit:]]) ]]; then - error "$(gettext "%s must be an integer.")" "epoch" - return 1 - fi - done || ret=1 +lint_pkgver() { + if (( PKGVERFUNC )); then + # defer check to after getting version from pkgver function + return 0 + fi + + check_pkgver +} + +lint_epoch() { + if [[ $epoch != *([[:digit:]]) ]]; then + error "$(gettext "%s must be an integer, not %s.")" "epoch" "$e" + return 1 + fi +} + +lint_arch() { + local name list=("${@:-"${arch[@]}"}") - if [[ $arch != 'any' ]]; then - if ! in_array $CARCH "${arch[@]}"; then + if [[ $list == 'any' ]]; then + return 0 + fi + + if ! in_array "$CARCH" "${list[@]}" && (( ! IGNOREARCH )); then + error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" + plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" + plain "$(gettext "such as %s.")" "arch=('$CARCH')" + return 1 + fi + + for name in "${pkgname[@]}"; do + pkgbuild_get_attribute "$name" 'arch' list 1 + if [[ $list && $list != 'any' ]] && ! in_array $CARCH "${list[@]}"; then if (( ! IGNOREARCH )); then - error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" - plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" - plain "$(gettext "such as %s.")" "arch=('$CARCH')" + error "$(gettext "%s is not available for the '%s' architecture.")" "$name" "$CARCH" ret=1 fi fi - fi + done +} - if (( ${#pkgname[@]} > 1 )); then - for i in ${pkgname[@]}; do - local arch_list="" - eval $(declare -f package_${i} | sed -n 's/$^[[:space:]]*arch=$/arch_list=/p') - if [[ ${arch_list[@]} && ${arch_list} != 'any' ]]; then - if ! in_array $CARCH "${arch_list[@]}"; then - if (( ! IGNOREARCH )); then - error "$(gettext "%s is not available for the '%s' architecture.")" "$i" "$CARCH" - ret=1 - fi - fi - fi - done - fi +lint_provides() { + local list name provides_list ret=0 - local provides_list=() - eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | \ - sed -e "s/provides=/provides_list+=/" -e "s/#.*//" -e 's/\\$//') - for i in ${provides_list[@]}; do - if [[ $i == *['<>']* ]]; then + provides_list=("${provides[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" provides 1 list + provides_list+=("${list[@]}") + done + + for provide in "${provides_list[@]}"; do + if [[ $provide == *['<>']* ]]; then error "$(gettext "%s array cannot contain comparison (< or >) operators.")" "provides" ret=1 fi done - local backup_list=() - eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | \ - sed -e "s/backup=/backup_list+=/" -e "s/#.*//" -e 's/\\$//') - for i in "${backup_list[@]}"; do - if [[ ${i:0:1} = "/" ]]; then - error "$(gettext "%s entry should not contain leading slash : %s")" "backup" "$i" + return $ret +} + +lint_backup() { + local list name backup_list ret=0 + + backup_list=("${backup[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" backup 1 list + backup_list+=("${list[@]}") + done + + for name in "${backup_list[@]}"; do + if [[ ${name:0:1} = "/" ]]; then + error "$(gettext "%s entry should not contain leading slash : %s")" "backup" "$name" ret=1 fi done - local optdepends_list=() - eval $(awk '/^[[:space:]]*optdepends=$/,/$[[:space:]]*(#.*)?$/' "$BUILDFILE" | \ - sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//" -e 's/\\$//') - for i in "${optdepends_list[@]}"; do - local pkg=${i%%:[[:space:]]*} + return $ret +} + +lint_optdepends() { + local list name optdepends_list ret=0 + + optdepends_list=("${optdepends[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" optdepends 1 list + optdepends_list+=("${list[@]}") + done + + for name in "${optdepends_list[@]}"; do + local pkg=${name%%:[[:space:]]*} # the '-' character _must_ be first or last in the character range if [[ $pkg != +([-[:alnum:]><=.+_:]) ]]; then - error "$(gettext "Invalid syntax for %s : '%s'")" "optdepend" "$i" + error "$(gettext "Invalid syntax for %s: '%s'")" "optdepend" "$name" ret=1 fi done - for i in 'changelog' 'install'; do - local file - while read -r file; do - # evaluate any bash variables used - eval file=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "$file")\" - if [[ $file && ! -f $file ]]; then - error "$(gettext "%s file (%s) does not exist.")" "$i" "$file" - ret=1 - fi - done < <(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE") + return $ret +} + +check_files_exist() { + local kind=$1 files=("${@:2}") file ret + + for file in "${files[@]}"; do + if [[ $file && ! -f $file ]]; then + error "$(gettext "%s file (%s) does not exist or is not a regular file.")" \ + "$kind" "$file" + ret=1 + fi + done + + return $ret +} + +lint_install() { + local list file name install_list ret=0 + + install_list=("${install[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" install 0 file + install_list+=("$file") + done + + check_files_exist 'install' "${install_list[@]}" +} + +lint_changelog() { + local list name file changelog_list ret=0 + + changelog_list=("${changelog[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" changelog 0 file + changelog_list+=("$file") + done + + check_files_exist 'changelog' "${changelog_list[@]}" +} + +lint_options() { + local ret=0 list name kopt options_list + + options_list=("${options[@]}") + for name in "${pkgname[@]}"; do + extract_function_var "package_$name" options 1 list + options_list+=("${list[@]}") done - local valid_options=1 - local known kopt options_list - eval $(awk '/^[[:space:]]*options=/,/\)/' "$BUILDFILE" | \ - sed -e "s/options=/options_list+=/" -e "s/#.*//" -e 's/\\$//') - for i in ${options_list[@]}; do - known=0 + for i in "${options_list[@]}"; do # check if option matches a known option or its inverse - for kopt in ${packaging_options[@]} ${other_options[@]}; do - if [[ ${i} = "${kopt}" || ${i} = "!${kopt}" ]]; then - known=1 + for kopt in "${packaging_options[@]}" "${other_options[@]}"; do + if [[ $i = "$kopt" || $i = "!$kopt" ]]; then + # continue to the next $i + continue 2 fi done - if (( ! known )); then - error "$(gettext "%s array contains unknown option '%s'")" "options" "$i" - valid_options=0 - fi - done - if (( ! valid_options )); then + + error "$(gettext "%s array contains unknown option '%s'")" "options" "$i" ret=1 + done + + return $ret +} + +lint_source() { + local idx=("${!source[@]}") + + if (( ${#source[*]} > 0 && (idx[-1] + 1) != ${#source[*]} )); then + error "$(gettext "Sparse arrays are not allowed for source")" + return 1 fi +} + +lint_pkglist() { + local i ret=0 + + for i in "${PKGLIST[@]}"; do + if ! in_array "$i" "${pkgname[@]}"; then + error "$(gettext "Requested package %s is not provided in %s")" "$i" "$BUILDFILE" + ret=1 + fi + done + + return $ret +} + +lint_packagefn() { + local i ret=0 if (( ${#pkgname[@]} == 1 )); then - if have_function build && ! ( have_function package || have_function package_${pkgname}); then + if have_function 'build' && ! { have_function 'package' || have_function "package_$pkgname"; }; then error "$(gettext "Missing %s function in %s")" "package()" "$BUILDFILE" ret=1 fi else - for i in ${pkgname[@]}; do - if ! have_function package_${i}; then + for i in "${pkgname[@]}"; do + if ! have_function "package_$i"; then error "$(gettext "Missing %s function for split package '%s'")" "package_$i()" "$i" ret=1 fi done fi - for i in ${PKGLIST[@]}; do - if ! in_array $i ${pkgname[@]}; then - error "$(gettext "Requested package %s is not provided in %s")" "$i" "$BUILDFILE" - ret=1 - fi - done + return $ret +} - local idx=("${!source[@]}") - if (( ${#source[*]} > 0 && (idx[-1] + 1) != ${#source[*]} )); then - error "$(gettext "Sparse arrays are not allowed for source")" - ret=1 - fi +check_sanity() { + # check for no-no's in the build script + local ret=0 + local lintfn lint_functions + + lint_functions=( + lint_pkgbase + lint_pkgname + lint_pkgver + lint_pkgrel + lint_epoch + lint_arch + lint_provides + lint_backup + lint_optdepends + lint_changelog + lint_install + lint_options + lint_packagefn + lint_pkglist + lint_source + ) + + for lintfn in "${lint_functions[@]}"; do + "$lintfn" || ret=1 + done return $ret } -- 2.0.3

3 11