- Pacman-dev - lists.archlinux.org

[pacman-dev] paccache: needsroot faulty set to 1
by Maxim Andersson 27 Aug '14

27 Aug '14

"Privilege escalation required" will be printed even when root isn't required If paccache runs without the -m parameter and $PWD is read only, $needsroot will be set to 1 even if the cache dir has read/write. pacman 4.1.2-6 Steps to reproduce: $ whoami maxim $ pwd /var/cache $ ls -l /var/ drwxr-xr-x 12 root root 4,0K 8 jun 09.06 cache $ ls -l /var/cache/ drwxr-xr-x 2 maxim root 12K 25 aug 15.36 yaourt $ paccache -rc /var/cache/yaourt ==> Privilege escalation required Cause: This happens because [[ ${movedir:0:1} != '/' ]] is true when $movedir is empty, causing $movedir to be set to $PWD (on line 276). And if $PWD is read only, $needsroot will be set to 1 on the next row. 274 if (( move || delete )); then 275 # make it an absolute path since we're about to chdir 276 [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir 277 [[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1 278 fi Fix: - [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir + [[ $movedir && ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir I'll send in a patch. //Maxim

2 5

[pacman-dev] [PATCH v3] paccache: adding the possibility for multiple cachedirs
by Maxim Andersson 26 Aug '14

26 Aug '14

Either by specifing several -c parameters or only one -c parameter with a comma separated value. One could for example be for the official arch packages and one for the aur. Signed-off-by: Maxim Andersson <thesilentboatman(a)gmail.com> --- contrib/paccache.sh.in | 90 +++++++++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 37 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 039ac8a..6d0a21b 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -23,9 +23,9 @@ shopt -s extglob declare -r myname='paccache' declare -r myver='@PACKAGE_VERSION@' -declare -a candidates=() cmdopts=() whitelist=() blacklist=() +declare -a cachedirs=() 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 delim=$'\n' keep=3 movedir= scanarch= USE_COLOR='y' @@ -133,13 +133,13 @@ summarize() { [[ $pkg =~ $pkg_re ]] && name=${BASH_REMATCH[1]} arch=${BASH_REMATCH[2]} if [[ -z $seen || $seenarch != "$arch" || $seen != "$name" ]]; then seen=$name seenarch=$arch - printf '%s (%s):\n' "$name" "$arch" + printf '%s (%s):\n' "$(basename $name)" "$arch" fi - printf ' %s\n' "$pkg" + printf ' %s\n' "$(basename $pkg)" elif (( verbose >= 2 )); then - printf "$PWD/%s$delim" "$pkg" - else printf "%s$delim" "$pkg" + else + printf "%s$delim" "$(basename $pkg)" fi done < <(printf '%s\n' "$@" | pacsort --files) fi @@ -159,25 +159,25 @@ A flexible pacman cache cleaning utility. Usage: ${myname} <operation> [options] [targets...] Operations: - -d, --dryrun perform a dry run, only finding candidate packages. - -m, --move <dir> move candidate packages to "dir". - -r, --remove remove candidate packages. + -d, --dryrun perform a dry run, only finding candidate packages. + -m, --move <dir> move candidate packages to "dir". + -r, --remove remove candidate packages. Options: - -a, --arch <arch> scan for "arch" (default: all architectures). - -c, --cachedir <dir> scan "dir" for packages. - (default: @localstatedir@/cache/pacman/pkg). - -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 - "-" to read package names from stdin, newline- - delimited. - -k, --keep <num> keep "num" of each package in the cache (default: 3). - --nocolor remove color from output. - -u, --uninstalled target uninstalled packages. - -v, --verbose increase verbosity. specify up to 3 times. - -z, --null use null delimiters for candidate names (only with -v - and -vv). + -a, --arch <arch> scan for "arch" (default: all architectures). + -c, --cachedir <dirs> scan "dirs" for packages, comma-separated. + (default: @localstatedir@/cache/pacman/pkg). + -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, + pecify "-" to read package names from stdin, newline- + delimited. + -k, --keep <num> keep "num" of each package in the cache (default: 3). + --nocolor remove color from output. + -u, --uninstalled target uninstalled packages. + -v, --verbose increase verbosity. specify up to 3 times. + -z, --null use null delimiters for candidate names (only with -v + and -vv). EOF } @@ -203,7 +203,9 @@ while :; do scanarch=$2 shift ;; -c|--cachedir) - cachedir=$2 + IFS=',' read -r -a dirs <<< "$2" + cachedirs+=("${dirs[@]}") + unset dirs shift ;; -d|--dryrun) dryrun=1 ;; @@ -256,6 +258,9 @@ done m4_include(../scripts/library/term_colors.sh) +# setting default cachedir +cachedirs=("${cachedirs[@]:-@localstatedir@/cache/pacman/pkg}") + # remaining args are a whitelist whitelist=("$@") @@ -265,28 +270,39 @@ case $(( dryrun+delete+move )) in [^1]) die "only one operation may be used at a time" ;; esac -[[ -d $cachedir ]] || - die "cachedir '%s' does not exist or is not a directory" "$cachedir" - [[ $movedir && ! -d $movedir ]] && die "destination directory '%s' does not exist or is not a directory" "$movedir" if (( move || delete )); then # make it an absolute path since we're about to chdir [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir - [[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1 + [[ $movedir && ! -w $movedir ]] && needsroot=1 fi -# unlikely that this will fail, but better make sure -cd "$cachedir" >/dev/null || die "failed to chdir to '%s'" "$cachedir" +for cachedir in "${cachedirs[@]}"; do + [[ -d $cachedir ]] || + die "cachedir '%s' does not exist or is not a directory" "$cachedir" + + if (( move || delete )); then + [[ ! -w $cachedir ]] && needsroot=1 + fi + + # unlikely that this will fail, but better make sure + pushd "$cachedir" &>/dev/null || die "failed to chdir to '%s'" "$cachedir" + + # note that these results are returned in an arbitrary order from awk, but + # they'll be resorted (in summarize) iff we have a verbosity level set. + IFS=$'\n' read -r -d '' -a cand < \ + <(printf $PWD'/%s\n' *.pkg.tar?(.+([^.])) | pacsort --files | + pkgfilter "$keep" "$scanarch" \ + "${#whitelist[*]}" "${whitelist[@]}" \ + "${#blacklist[*]}" "${blacklist[@]}") -# note that these results are returned in an arbitrary order from awk, but -# they'll be resorted (in summarize) iff we have a verbosity level set. -IFS=$'\n' read -r -d '' -a candidates < \ - <(printf '%s\n' *.pkg.tar?(.+([^.])) | pacsort --files | - pkgfilter "$keep" "$scanarch" \ - "${#whitelist[*]}" "${whitelist[@]}" \ - "${#blacklist[*]}" "${blacklist[@]}") + candidates+=("${cand[@]}") + unset cand + + popd &>/dev/null +done if (( ! ${#candidates[*]} )); then msg 'no candidate packages found for pruning' -- 2.0.3

3 6

[pacman-dev] [PATCH] paccache: needsroot faulty set to 1
by Maxim Andersson 26 Aug '14

26 Aug '14

"Privilege escalation required" will be printed even when root isn't required. If paccache runs without the -m parameter and $PWD is read only, $needsroot will be set to 1 even if the cache dir has read/write. Signed-off-by: Maxim Andersson <thesilentboatman(a)gmail.com> --- contrib/paccache.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 039ac8a..a88ae1f 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -273,7 +273,7 @@ esac if (( move || delete )); then # make it an absolute path since we're about to chdir - [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir + [[ $movedir && ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir [[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1 fi -- 2.0.3

1 0

[pacman-dev] [PATCH v2] paccache: adding the possibility for multiple cachedirs
by Maxim Andersson 26 Aug '14

26 Aug '14

Either by specifing several -c parameters or only one -c parameter with a comma separated value. One could for example be for the official arch packages and one for the aur. Signed-off-by: Maxim Andersson <thesilentboatman(a)gmail.com> --- contrib/paccache.sh.in | 82 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 33 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 039ac8a..e96bf81 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -23,9 +23,9 @@ shopt -s extglob declare -r myname='paccache' declare -r myver='@PACKAGE_VERSION@' -declare -a candidates=() cmdopts=() whitelist=() blacklist=() +declare -a cachedirs=() 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 delim=$'\n' keep=3 movedir= scanarch= USE_COLOR='y' @@ -159,25 +159,25 @@ A flexible pacman cache cleaning utility. Usage: ${myname} <operation> [options] [targets...] Operations: - -d, --dryrun perform a dry run, only finding candidate packages. - -m, --move <dir> move candidate packages to "dir". - -r, --remove remove candidate packages. + -d, --dryrun perform a dry run, only finding candidate packages. + -m, --move <dir> move candidate packages to "dir". + -r, --remove remove candidate packages. Options: - -a, --arch <arch> scan for "arch" (default: all architectures). - -c, --cachedir <dir> scan "dir" for packages. - (default: @localstatedir@/cache/pacman/pkg). - -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 - "-" to read package names from stdin, newline- - delimited. - -k, --keep <num> keep "num" of each package in the cache (default: 3). - --nocolor remove color from output. - -u, --uninstalled target uninstalled packages. - -v, --verbose increase verbosity. specify up to 3 times. - -z, --null use null delimiters for candidate names (only with -v - and -vv). + -a, --arch <arch> scan for "arch" (default: all architectures). + -c, --cachedir <dirs> scan "dirs" for packages, comma-separated. + (default: @localstatedir@/cache/pacman/pkg). + -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, + pecify "-" to read package names from stdin, newline- + delimited. + -k, --keep <num> keep "num" of each package in the cache (default: 3). + --nocolor remove color from output. + -u, --uninstalled target uninstalled packages. + -v, --verbose increase verbosity. specify up to 3 times. + -z, --null use null delimiters for candidate names (only with -v + and -vv). EOF } @@ -203,7 +203,9 @@ while :; do scanarch=$2 shift ;; -c|--cachedir) - cachedir=$2 + IFS=',' read -r -a dirs <<< "$2" + cachedirs+=("${dirs[@]}") + unset dirs shift ;; -d|--dryrun) dryrun=1 ;; @@ -256,6 +258,11 @@ done m4_include(../scripts/library/term_colors.sh) +# setting default cachedir +if [ "${#cachedirs[@]}" -eq 0 ]; then + cachedirs[0]='@localstatedir@/cache/pacman/pkg' +else + # remaining args are a whitelist whitelist=("$@") @@ -265,28 +272,37 @@ case $(( dryrun+delete+move )) in [^1]) die "only one operation may be used at a time" ;; esac -[[ -d $cachedir ]] || - die "cachedir '%s' does not exist or is not a directory" "$cachedir" - [[ $movedir && ! -d $movedir ]] && die "destination directory '%s' does not exist or is not a directory" "$movedir" if (( move || delete )); then # make it an absolute path since we're about to chdir [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir - [[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1 + [[ $movedir && ! -w $movedir ]] && needsroot=1 fi -# unlikely that this will fail, but better make sure -cd "$cachedir" >/dev/null || die "failed to chdir to '%s'" "$cachedir" +for cachedir in "${cachedirs[@]}"; do + [[ -d $cachedir ]] || + die "cachedir '%s' does not exist or is not a directory" "$cachedir" + + if (( move || delete )); then + [[ ! -w $cachedir ]] && needsroot=1 + fi -# note that these results are returned in an arbitrary order from awk, but -# they'll be resorted (in summarize) iff we have a verbosity level set. -IFS=$'\n' read -r -d '' -a candidates < \ - <(printf '%s\n' *.pkg.tar?(.+([^.])) | pacsort --files | - pkgfilter "$keep" "$scanarch" \ - "${#whitelist[*]}" "${whitelist[@]}" \ - "${#blacklist[*]}" "${blacklist[@]}") + # unlikely that this will fail, but better make sure + cd "$cachedir" >/dev/null || die "failed to chdir to '%s'" "$cachedir" + + # note that these results are returned in an arbitrary order from awk, but + # they'll be resorted (in summarize) iff we have a verbosity level set. + IFS=$'\n' read -r -d '' -a cand < \ + <(printf '%s\n' *.pkg.tar?(.+([^.])) | pacsort --files | + pkgfilter "$keep" "$scanarch" \ + "${#whitelist[*]}" "${whitelist[@]}" \ + "${#blacklist[*]}" "${blacklist[@]}") + + candidates+=("${cand[@]}") + unset cand +done if (( ! ${#candidates[*]} )); then msg 'no candidate packages found for pruning' -- 2.0.3

2 2

[pacman-dev] [PATCH] paccache: adding the possibility for multiple cachedirs. (fixed)
by Maxim Andersson 25 Aug '14

25 Aug '14

Either by specifing several -c parameters or only one -c parameter with a comma separated value. One could for example be for the official arch packages and one for the aur. Signed-off-by: Maxim Andersson <thesilentboatman(a)gmail.com> --- contrib/paccache.sh.in | 89 +++++++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 38 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 039ac8a..2170d76 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -23,9 +23,9 @@ shopt -s extglob declare -r myname='paccache' declare -r myver='@PACKAGE_VERSION@' -declare -a candidates=() cmdopts=() whitelist=() blacklist=() +declare -a cachedirs=() 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 delim=$'\n' keep=3 movedir= scanarch= USE_COLOR='y' @@ -159,25 +159,25 @@ A flexible pacman cache cleaning utility. Usage: ${myname} <operation> [options] [targets...] Operations: - -d, --dryrun perform a dry run, only finding candidate packages. - -m, --move <dir> move candidate packages to "dir". - -r, --remove remove candidate packages. + -d, --dryrun perform a dry run, only finding candidate packages. + -m, --move <dir> move candidate packages to "dir". + -r, --remove remove candidate packages. Options: - -a, --arch <arch> scan for "arch" (default: all architectures). - -c, --cachedir <dir> scan "dir" for packages. - (default: @localstatedir@/cache/pacman/pkg). - -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 - "-" to read package names from stdin, newline- - delimited. - -k, --keep <num> keep "num" of each package in the cache (default: 3). - --nocolor remove color from output. - -u, --uninstalled target uninstalled packages. - -v, --verbose increase verbosity. specify up to 3 times. - -z, --null use null delimiters for candidate names (only with -v - and -vv). + -a, --arch <arch> scan for "arch" (default: all architectures). + -c, --cachedir <dirs> scan "dirs" for packages, comma-separated. + (default: @localstatedir@/cache/pacman/pkg). + -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, + pecify "-" to read package names from stdin, newline- + delimited. + -k, --keep <num> keep "num" of each package in the cache (default: 3). + --nocolor remove color from output. + -u, --uninstalled target uninstalled packages. + -v, --verbose increase verbosity. specify up to 3 times. + -z, --null use null delimiters for candidate names (only with -v + and -vv). EOF } @@ -203,7 +203,9 @@ while :; do scanarch=$2 shift ;; -c|--cachedir) - cachedir=$2 + IFS=',' read -r -a cdrs <<< "$2" + cachedirs+=("${cdrs[@]}") + unset cdrs shift ;; -d|--dryrun) dryrun=1 ;; @@ -256,6 +258,9 @@ done m4_include(../scripts/library/term_colors.sh) +# setting default cachedir +cachedirs=${cachedirs:-@localstatedir@/cache/pacman/pkg} + # remaining args are a whitelist whitelist=("$@") @@ -265,28 +270,36 @@ case $(( dryrun+delete+move )) in [^1]) die "only one operation may be used at a time" ;; esac -[[ -d $cachedir ]] || - die "cachedir '%s' does not exist or is not a directory" "$cachedir" +for cachedir in "${cachedirs[@]}" +do + [[ -d $cachedir ]] || + die "cachedir '%s' does not exist or is not a directory" "$cachedir" -[[ $movedir && ! -d $movedir ]] && - die "destination directory '%s' does not exist or is not a directory" "$movedir" + [[ $movedir && ! -d $movedir ]] && + die "destination directory '%s' does not exist or is not a directory" "$movedir" + + if (( move || delete )); then + # make it an absolute path since we're about to chdir + [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir + [[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1 + fi + + # unlikely that this will fail, but better make sure + cd "$cachedir" >/dev/null || die "failed to chdir to '%s'" "$cachedir" + + # note that these results are returned in an arbitrary order from awk, but + # they'll be resorted (in summarize) iff we have a verbosity level set. + IFS=$'\n' read -r -d '' -a tmpcandidates < \ + <(printf '%s\n' *.pkg.tar?(.+([^.])) | pacsort --files | + pkgfilter "$keep" "$scanarch" \ + "${#whitelist[*]}" "${whitelist[@]}" \ + "${#blacklist[*]}" "${blacklist[@]}") + + candidates+=(${tmpcandidates[@]}) +done -if (( move || delete )); then - # make it an absolute path since we're about to chdir - [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir - [[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1 -fi -# unlikely that this will fail, but better make sure -cd "$cachedir" >/dev/null || die "failed to chdir to '%s'" "$cachedir" -# note that these results are returned in an arbitrary order from awk, but -# they'll be resorted (in summarize) iff we have a verbosity level set. -IFS=$'\n' read -r -d '' -a candidates < \ - <(printf '%s\n' *.pkg.tar?(.+([^.])) | pacsort --files | - pkgfilter "$keep" "$scanarch" \ - "${#whitelist[*]}" "${whitelist[@]}" \ - "${#blacklist[*]}" "${blacklist[@]}") if (( ! ${#candidates[*]} )); then msg 'no candidate packages found for pruning' -- 2.0.3

3 2

[pacman-dev] [PATCH] paccache: adding the possibility for multiple cachedirs
by silent boatman 25 Aug '14

25 Aug '14

Either by specifing several -c parameters or only one -c parameter with a comma separated value. One charedir could for example be for the official arch packages and one for the aur. Signed-off-by: Maxim Andersson <thesilentboatman(a)gmail.com> --- contrib/paccache.sh.in | 89 +++++++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 38 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 039ac8a..2170d76 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -23,9 +23,9 @@ shopt -s extglob declare -r myname='paccache' declare -r myver='@PACKAGE_VERSION@' -declare -a candidates=() cmdopts=() whitelist=() blacklist=() +declare -a cachedirs=() 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 delim=$'\n' keep=3 movedir= scanarch= USE_COLOR='y' @@ -159,25 +159,25 @@ A flexible pacman cache cleaning utility. Usage: ${myname} <operation> [options] [targets...] Operations: - -d, --dryrun perform a dry run, only finding candidate packages. - -m, --move <dir> move candidate packages to "dir". - -r, --remove remove candidate packages. + -d, --dryrun perform a dry run, only finding candidate packages. + -m, --move <dir> move candidate packages to "dir". + -r, --remove remove candidate packages. Options: - -a, --arch <arch> scan for "arch" (default: all architectures). - -c, --cachedir <dir> scan "dir" for packages. - (default: @localstatedir@/cache/pacman/pkg). - -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 - "-" to read package names from stdin, newline- - delimited. - -k, --keep <num> keep "num" of each package in the cache (default: 3). - --nocolor remove color from output. - -u, --uninstalled target uninstalled packages. - -v, --verbose increase verbosity. specify up to 3 times. - -z, --null use null delimiters for candidate names (only with -v - and -vv). + -a, --arch <arch> scan for "arch" (default: all architectures). + -c, --cachedir <dirs> scan "dirs" for packages, comma-separated. + (default: @localstatedir@/cache/pacman/pkg). + -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, + pecify "-" to read package names from stdin, newline- + delimited. + -k, --keep <num> keep "num" of each package in the cache (default: 3). + --nocolor remove color from output. + -u, --uninstalled target uninstalled packages. + -v, --verbose increase verbosity. specify up to 3 times. + -z, --null use null delimiters for candidate names (only with -v + and -vv). EOF } @@ -203,7 +203,9 @@ while :; do scanarch=$2 shift ;; -c|--cachedir) - cachedir=$2 + IFS=',' read -r -a cdrs <<< "$2" + cachedirs+=("${cdrs[@]}") + unset cdrs shift ;; -d|--dryrun) dryrun=1 ;; @@ -256,6 +258,9 @@ done m4_include(../scripts/library/term_colors.sh) +# setting default cachedir +cachedirs=${cachedirs:-@localstatedir@/cache/pacman/pkg} + # remaining args are a whitelist whitelist=("$@") @@ -265,28 +270,36 @@ case $(( dryrun+delete+move )) in [^1]) die "only one operation may be used at a time" ;; esac -[[ -d $cachedir ]] || - die "cachedir '%s' does not exist or is not a directory" "$cachedir" +for cachedir in "${cachedirs[@]}" +do + [[ -d $cachedir ]] || + die "cachedir '%s' does not exist or is not a directory" "$cachedir" -[[ $movedir && ! -d $movedir ]] && - die "destination directory '%s' does not exist or is not a directory" "$movedir" + [[ $movedir && ! -d $movedir ]] && + die "destination directory '%s' does not exist or is not a directory" "$movedir" + + if (( move || delete )); then + # make it an absolute path since we're about to chdir + [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir + [[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1 + fi + + # unlikely that this will fail, but better make sure + cd "$cachedir" >/dev/null || die "failed to chdir to '%s'" "$cachedir" + + # note that these results are returned in an arbitrary order from awk, but + # they'll be resorted (in summarize) iff we have a verbosity level set. + IFS=$'\n' read -r -d '' -a tmpcandidates < \ + <(printf '%s\n' *.pkg.tar?(.+([^.])) | pacsort --files | + pkgfilter "$keep" "$scanarch" \ + "${#whitelist[*]}" "${whitelist[@]}" \ + "${#blacklist[*]}" "${blacklist[@]}") + + candidates+=(${tmpcandidates[@]}) +done -if (( move || delete )); then - # make it an absolute path since we're about to chdir - [[ ${movedir:0:1} != '/' ]] && movedir=$PWD/$movedir - [[ ! -w $cachedir || ( $movedir && ! -w $movedir ) ]] && needsroot=1 -fi -# unlikely that this will fail, but better make sure -cd "$cachedir" >/dev/null || die "failed to chdir to '%s'" "$cachedir" -# note that these results are returned in an arbitrary order from awk, but -# they'll be resorted (in summarize) iff we have a verbosity level set. -IFS=$'\n' read -r -d '' -a candidates < \ - <(printf '%s\n' *.pkg.tar?(.+([^.])) | pacsort --files | - pkgfilter "$keep" "$scanarch" \ - "${#whitelist[*]}" "${whitelist[@]}" \ - "${#blacklist[*]}" "${blacklist[@]}") if (( ! ${#candidates[*]} )); then msg 'no candidate packages found for pruning' -- 2.0.3

2 2

[pacman-dev] Bug with remove conflicting packages and their depends
by Allan McRae 21 Aug '14

21 Aug '14

[2014-08-21 21:27] [PACMAN] Running 'pacman -Syu vim-minimal' ... [2014-08-22 09:17] [ALPM] removed vim (7.4.404-1) .. [2014-08-22 09:17] [ALPM] upgraded vim-runtime (7.4.404-1 -> 7.4.410-1) [2014-08-22 09:17] [ALPM] installed vim-minimal (7.4.410-1) ... [2014-08-22 09:17] [ALPM] installed ruby (2.1.2-1) [2014-08-22 09:17] [ALPM] installed lua (5.2.3-1) Ruby and lua are dependencies of vim which is removed. They were orphans after this transaction. Here is debug output: ... [09:38:49] debug: pulling dependency ruby (needed by vim) [09:38:49] debug: started resolving dependencies [09:38:49] debug: checkdeps: package lua-5.2.3-1 [09:38:49] debug: finished resolving dependencies [09:38:49] debug: pulling dependency lua (needed by vim) [09:38:49] debug: finished resolving dependencies looking for conflicting packages... [09:38:49] debug: looking for conflicts [09:38:49] debug: check targets vs targets [09:38:49] debug: check targets vs targets [09:38:49] debug: package vim-minimal conflicts with vim (by vim) [09:38:49] debug: package vim conflicts with vim-minimal (by vim-minimal) [09:38:49] debug: conflicting packages in the sync list: 'vim-minimal' <-> 'vim' [09:38:49] warning: removing 'vim' from target list because it conflicts with 'vim-minimal' [09:38:49] debug: check targets vs db and db vs targets [09:38:49] debug: check targets vs db [09:38:49] debug: package vim-minimal conflicts with vim (by vim) [09:38:49] debug: check db vs targets [09:38:49] debug: package 'vim-minimal' conflicts with 'vim' :: vim-minimal and vim are in conflict. Remove vim? [y/N] So I guess the fix is to consider explicitly stated packages first. I'll file a bug report later. Allan

1 0

[pacman-dev] [PATCH] fix improper FREELIST calls
by Andrew Gregory 20 Aug '14

20 Aug '14

* conflicts need to be freed with alpm_conflict_free * sync dbs need to be unregistered and are handled by alpm_release Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/conflict.c | 8 ++++++-- lib/libalpm/handle.c | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 961e3a7..db07102 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -449,7 +449,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, conflicts = add_fileconflict(handle, conflicts, path, p1, p2); if(handle->pm_errno == ALPM_ERR_MEMORY) { - FREELIST(conflicts); + alpm_list_free_inner(conflicts, + (alpm_list_fn_free) alpm_conflict_free); + alpm_list_free(conflicts); alpm_list_free(common_files); return NULL; } @@ -622,7 +624,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, if(!resolved_conflict) { conflicts = add_fileconflict(handle, conflicts, path, p1, NULL); if(handle->pm_errno == ALPM_ERR_MEMORY) { - FREELIST(conflicts); + alpm_list_free_inner(conflicts, + (alpm_list_fn_free) alpm_conflict_free); + alpm_list_free(conflicts); alpm_list_free(tmpfiles); return NULL; } diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index fdd269b..7652d1f 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -81,7 +81,6 @@ void _alpm_handle_free(alpm_handle_t *handle) FREE(handle->lockfile); FREE(handle->arch); FREE(handle->gpgdir); - FREELIST(handle->dbs_sync); FREELIST(handle->noupgrade); FREELIST(handle->noextract); FREELIST(handle->ignorepkg); -- 2.1.0

1 0

[pacman-dev] [PATCH v2] Extend database upgrade script to handle alpm db version 9
by Allan McRae 20 Aug '14

20 Aug '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2: Use awk to do symlink to actual directory replacement As an example of what changes get made: diff -Naur local.tmp/glibc-2.18-4/files local/glibc-2.18-4/files --- local.tmp/glibc-2.18-4/files 2013-09-18 18:45:35.747068765 +1000 +++ local/glibc-2.18-4/files 2013-09-18 18:51:29.633643945 +1000 @@ -4,8 +4,8 @@ etc/locale.gen etc/nscd.conf etc/rpc -lib/ -lib/libc.a +usr/lib/ +usr/lib/libc.a usr/ usr/bin/ usr/bin/catchsegv Note that now usr/lib/ is present twice in the file (may not always be the case) and these entries are out of alphabetical order. Both these are cosmetic to pacman. scripts/pacman-db-upgrade.sh.in | 59 ++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index a1630c5..d6f4169 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -109,18 +109,57 @@ fi # do not let pacman run while we do this touch "$lockfile" -# pacman-3.4 to 3.5 upgrade - merge depends into desc -if [[ $(find "$dbroot"/local -name depends) ]]; then - msg "$(gettext "Pre-3.5 database format detected - upgrading...")" - for i in "$dbroot"/local/*; do - if [[ -f "$i"/depends ]]; then - cat "$i"/depends >> "$i"/desc - rm "$i"/depends - fi - done - msg "$(gettext "Done.")" +if [[ -f "${dbroot}"/local/.alpm_db_version ]]; then + db_version=$(cat "${dbroot}"/local/.alpm_db_version) fi +if [[ -z "$db_version" ]]; then + # pacman-3.4 to 3.5 upgrade - merge depends into desc + if [[ $(find "$dbroot"/local -name depends) ]]; then + msg "$(gettext "Pre-3.5 database format detected - upgrading...")" + for i in "$dbroot"/local/*; do + if [[ -f "$i"/depends ]]; then + cat "$i"/depends >> "$i"/desc + rm "$i"/depends + fi + done + msg "$(gettext "Done.")" + fi + + # pacman 4.1 to 4.2 upgrade - remove directory symlink support + dirlist=() + + unset GREP_OPTIONS + while IFS= read -r dir; do + dirlist+=("/${dir%/}") + done < <(grep -h '/$' "$dbroot"/local/*/files | sort -u) + + mapfile -t dirlist < <(find "${dirlist[@]}" -maxdepth 0 -type l) + + if [[ ${#dirlist[@]} != 0 ]]; then + msg "$(gettext "Pre-4.2 database format detected - upgrading...")" + for dir in "${dirlist[@]}"; do + realdir="$(cd $dir; pwd -P)" + for f in "$dbroot"/local/*/files; do + awk -v "dir=${dir#/}/" -v "realdir=${realdir#/}/" ' + BEGIN { + i = length(dir) + 1 + } + { + if (index($0, dir) == 1) { + printf("%s%s\n", realdir, substr($0, i)) + } else { + print + } + }' $f > $f.tmp + mv $f.tmp $f + done + done + fi +fi + +echo "9" > "$dbroot"/local/.alpm_db_version + # remove the lock file rm -f "$lockfile" -- 1.8.4

2 9

[pacman-dev] [PATCH] pacman.c: Add -gg, -ii, and -yy to help summary
by Johannes Löthberg 14 Aug '14

14 Aug '14

The sync help summaries was missing the information about: * -gg: View all groups and members * -ii: View extended information * -yy: Force refresh even if DBs are up to date Original-work-by: Earnestly <zibeon(a)gmail.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- src/pacman/pacman.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 345fb0a..f3b5672 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -153,14 +153,16 @@ static void usage(int op, const char * const myname) printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); addlist(_(" -c, --clean remove old packages from cache directory (-cc for all)\n")); - addlist(_(" -g, --groups view all members of a package group\n")); - addlist(_(" -i, --info view package information\n")); + addlist(_(" -g, --groups view all members of a package group\n" + " (-gg to view all groups and members)\n")); + addlist(_(" -i, --info view package information (-ii for extended information)\n")); addlist(_(" -l, --list <repo> view a list of packages in a repo\n")); addlist(_(" -q, --quiet show less information for query and search\n")); addlist(_(" -s, --search <regex> search remote repositories for matching strings\n")); addlist(_(" -u, --sysupgrade upgrade installed packages (-uu allows downgrade)\n")); addlist(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); - addlist(_(" -y, --refresh download fresh package databases from the server\n")); + addlist(_(" -y, --refresh download fresh package databases from the server\n" + " (-yy to force a refresh even if up to date)\n")); addlist(_(" --needed do not reinstall up to date packages\n")); } else if(op == PM_OP_DATABASE) { printf("%s: %s {-D --database} <%s> <%s>\n", str_usg, myname, str_opt, str_pkg); -- 2.0.4

1 1