- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-196-g80f7c17
by dan＠archlinux.org 25 May '10

25 May '10

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 80f7c1707c2b25cbb88120f5d12e7e038beba36c (commit) via ae73d756607edc8733ddb5facc7066316c34d11f (commit) via 3cd237dec34801963b8cd522038e1a86948d2c91 (commit) via 52c3f871db3142c5157b898b46ca4f1eef05ff73 (commit) via f948cb25bb3bc4ebfdd9d759451586e1baeb7b86 (commit) from 9ab6bfad223ce65d3c37785d0aae8676bfc2702f (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 80f7c1707c2b25cbb88120f5d12e7e038beba36c Author: Andres P <stderr(a)mail.com> Date: Tue May 18 17:56:47 2010 -0430 bash_completion : full rewrite with many improvements * Undeclared local vars with common enough names to warrant breakage * Performance issues with _pacman trying to replicate /usr/bin/pacman with find and other slow tools. * Performance issues with expanding an array (with sometimes hundreds of items) over three times. * Expanding said array to remove already completed entries had the side effect of braking filenames with spaces and or \n. * add -D --database options and --print * fix dirs showing up when they shouldn't in completions * completions regarding database entries shouldn't trigger filename completion. This is now down to 106 lines. The original one (master) is 365 lines long, yet this one retains all functionality. The work is documented in FS#16630. Signed-off-by: Andres P <stderr(a)mail.com> Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ae73d756607edc8733ddb5facc7066316c34d11f Author: Andres P <aepd87(a)gmail.com> Date: Sat May 22 00:36:52 2010 -0430 makepkg: replace unnecessary uses of grep Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3cd237dec34801963b8cd522038e1a86948d2c91 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 22 22:27:14 2010 +1000 makepkg: fix permissions on install and changelog files The .INSTALL and .CHANGELOG files in a package retained the permissions that they had in $startdir. Do a chmod after copying to ensure that the permissions are sane. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 52c3f871db3142c5157b898b46ca4f1eef05ff73 Author: Andres P <aepd87(a)gmail.com> Date: Mon May 24 17:02:55 2010 -0430 makepkg: don't decompress when stripping binaries f569c4a042 wrongly relied on file's output. The fix is to not decompress files in the first place. Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f948cb25bb3bc4ebfdd9d759451586e1baeb7b86 Author: Allan McRae <allan(a)archlinux.org> Date: Wed May 19 20:33:35 2010 +1000 Change directory in package function in PKGBUILD.proto makepkg goes back to the $startdir between the build() and package() functions so we need to change directory at the start of the package function. TODO: fix makepkg to make this unnecessary Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD.proto | 2 + contrib/bash_completion | 434 ++++++++++------------------------------------- scripts/makepkg.sh.in | 20 +- 3 files changed, 98 insertions(+), 358 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: fix permissions on install and changelog files
by Allan McRae 22 May '10

22 May '10

The .INSTALL and .CHANGELOG files in a package retained the permissions that they had in $startdir. Do a chmod after copying to ensure that the permissions are sane. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1707245..4a6040d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1015,6 +1015,7 @@ create_package() { if [[ -n $install ]]; then msg2 "$(gettext "Adding install script...")" cp "$startdir/$install" .INSTALL + chmod 644 .INSTALL comp_files="$comp_files .INSTALL" fi @@ -1022,6 +1023,7 @@ create_package() { if [[ -n $changelog ]]; then msg2 "$(gettext "Adding package changelog...")" cp "$startdir/$changelog" .CHANGELOG + chmod 644 .CHANGELOG comp_files="$comp_files .CHANGELOG" fi -- 1.7.1

1 0

[pacman-dev] [PATCH] [makepkg] split debug support
by Arerep Serdna 22 May '10

22 May '10

~ Less code repetition ~ Drop -t flag; OPTIONS=(splitdbg) only ~ secure_dir isn't really secure but I couldn't think of a better name Signed-off-by: Arerep Serdna <aepd87(a)gmail.com> --- Original by Jan M. (funkyou): http://bugs.archlinux.org/task/10975 etc/makepkg.conf.in | 1 + scripts/makepkg.sh.in | 134 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 89 insertions(+), 46 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index f0d1c44..f744ac3 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -62,6 +62,7 @@ BUILDENV=(fakeroot !distcc color !ccache) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries in STRIP_DIRS +#-- splitdbg: Same as above, while keeping the symbols in usr/lib/debug #-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1707245..93548ef 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -43,8 +43,9 @@ BUILDSCRIPT='@BUILDSCRIPT@' startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" +dbgdir="$startdir/dbg" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') +packaging_options=('strip' 'splitdbg' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') other_options=('ccache' 'distcc' 'makeflags' 'force') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ @@ -808,6 +809,28 @@ run_package() { run_function "$pkgfunc" } +secure_dir() { + [[ -d $1 ]] || mkdir -p "$1"; chmod a-s "$1" +} + +# strip_flags must be declared local in the inclosing function +pre_strip() { + local binary + while read binary; do + case "$(file -biz "$binary")" in + *application/x-sharedlib*) # Libraries (.so) + strip_flags="$STRIP_SHARED";; + *application/x-archive*) # Libraries (.a) + strip_flags="$STRIP_STATIC";; + *application/x-executable*) # Binaries + strip_flags="$STRIP_BINARIES";; + *) + continue;; + esac + echo "$binary" + done < <(find "${STRIP_DIRS[@]}" -type f -perm -u+w 2>/dev/null) +} + tidy_install() { cd "$pkgdir" msg "$(gettext "Tidying install...")" @@ -865,21 +888,32 @@ tidy_install() { done fi - if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then - msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" - local binary - find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -biz "$binary")" in - *compressed-encoding*) # Skip compressed binaries - ;; - *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip $STRIP_SHARED "$binary";; - *application/x-archive*) # Libraries (.a) - /usr/bin/strip $STRIP_STATIC "$binary";; - *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; - esac - done + if [[ -n ${STRIP_DIRS[*]} ]]; then + local strip_flags + if [[ $(check_option splitdbg) = "y" ]]; then + msg2 "$(gettext "Moving debugging symbols from binaries and libraries into separate files...")" + pre_strip | while read binary; do + basename="${binary%%*/}" + dirname="${dirname%/*}" + dbg_file="$basename.debug" + dbg_dest="$dbgdir/usr/lib/debug/$binary.debug" + dbg_destdir="${dbg_dest%/*}" + pushd "$dirname" &>/dev/null + /usr/bin/objcopy --only-keep-debug "$basename" "$dbg_file" + /usr/bin/strip $strip_flags "$basename" + /usr/bin/objcopy --add-gnu-debuglink="$dbg_file" "$basename" + if [[ ! -d $dbg_destdir ]]; then + mkdir -p "$dbg_destdir" + fi + mv "$dbg_file" "$dbg_dest" + popd &>/dev/null + done + elif [[ $(check_option strip) = "y" ]]; then + msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" + pre_strip | while read binary; do + /usr/bin/strip $strip_flags "$binary" + done + fi fi if [[ $(check_option libtool) = "n" ]]; then @@ -1070,12 +1104,23 @@ create_package() { fi } +create_dbgpackage() { + [[ -n $(find "$dbgdir" -type f -name \*.debug -print -quit) && + $(check_option splitdbg) = "y" ]] || return 0 + local pkg="${1:-$pkgname}" + pkgdesc+=" (Debug symbols)" + pkgdir="$dbgdir" + depends=("$pkg") + unset backup build changelog conflicts install optdepends \ + provides replaces source + create_package "$pkg-debug" +} + create_srcpackage() { cd "$startdir" # Get back to our src directory so we can begin with sources. - mkdir -p "$srcdir" - chmod a-s "$srcdir" + secure_dir "$srcdir" cd "$srcdir" if (( ! SKIPINTEG || SOURCEONLY == 2 )); then download_sources @@ -1417,6 +1462,24 @@ restore_package_variables() { done } +process_splitpkg() { + for pkg in ${pkgname[@]}; do + for dir in {pkg,dbg}dir; do + read $dir <<<"${!dir}/$pkg" + secure_dir "${!dir}" + done + backup_package_variables + run_package $pkg + tidy_install + create_package $pkg + create_dbgpackage $pkg + restore_package_variables + for dir in {pkg,dbg}dir; do + read $dir <<<"${!dir%/*}" + done + done +} + # getopt like parser parse_options() { local short_options=$1; shift; @@ -1782,8 +1845,7 @@ else fi if (( GENINTEG )); then - mkdir -p "$srcdir" - chmod a-s "$srcdir" + secure_dir "$srcdir" cd "$srcdir" download_sources generate_checksums @@ -1884,18 +1946,9 @@ if (( INFAKEROOT )); then tidy_install fi create_package + create_dbgpackage else - for pkg in ${pkgname[@]}; do - pkgdir="$pkgdir/$pkg" - mkdir -p "$pkgdir" - chmod a-s "$pkgdir" - backup_package_variables - run_package $pkg - tidy_install - create_package $pkg - restore_package_variables - pkgdir="${pkgdir%/*}" - done + process_splitpkg fi msg "$(gettext "Leaving fakeroot environment.")" @@ -1949,8 +2002,7 @@ fi umask 0022 # get back to our src directory so we can begin with sources -mkdir -p "$srcdir" -chmod a-s "$srcdir" +secure_dir "$srcdir" cd "$srcdir" if (( NOEXTRACT )); then @@ -1989,8 +2041,7 @@ else msg "$(gettext "Removing existing pkg/ directory...")" rm -rf "$pkgdir" fi - mkdir -p "$pkgdir" - chmod a-s "$pkgdir" + secure_dir "$pkgdir" cd "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it @@ -2012,18 +2063,9 @@ else fi fi create_package + create_dbgpackage else - for pkg in ${pkgname[@]}; do - pkgdir="$pkgdir/$pkg" - mkdir -p "$pkgdir" - chmod a-s "$pkgdir" - backup_package_variables - run_package $pkg - tidy_install - create_package $pkg - restore_package_variables - pkgdir="${pkgdir%/*}" - done + process_splitpkg fi else if (( ! REPKG && ( PKGFUNC || SPLITPKG ) )); then -- 1.7.1

3 4

[pacman-dev] [PATCH 2/2] ensure package download sizes are invalidated when an error occurs
by Jonathan Conder 22 May '10

22 May '10

Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> --- lib/libalpm/sync.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index d9f4c28..9e140dc 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -855,9 +855,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(files) { EVENT(trans, PM_TRANS_EVT_RETRIEVE_START, current->treename, NULL); - errors = _alpm_download_files(files, current->servers, cachedir); - - if (errors) { + if(_alpm_download_files(files, current->servers, cachedir)) { _alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"), current->treename); if(pm_errno == 0) { @@ -869,12 +867,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) } } - for(j = trans->add; j; j = j->next) { - pmpkg_t *pkg = j->data; - pkg->infolevel &= ~INFRQ_DSIZE; - pkg->download_size = 0; - } - /* clear out value to let callback know we are done */ if(handle->totaldlcb) { handle->totaldlcb(0); @@ -1003,6 +995,12 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) ret = 0; error: + for(j = trans->add; j; j = j->next) { + pmpkg_t *pkg = j->data; + pkg->infolevel &= ~INFRQ_DSIZE; + pkg->download_size = 0; + } + FREELIST(files); alpm_list_free(deltas); return(ret); -- 1.7.1

4 8

[pacman-dev] [PATCH] database/print options, fix dirs, other
by Andres P 21 May '10

21 May '10

* add -D --database options and --print (shining) * fix dirs showing up when they shouldn't in completions The 5 month old log of fixes still applies: http://www.mail-archive.com/pacman-dev@archlinux.org/msg04121.html This is now down to 106 lines. The original one (master) is 365 lines long, yet this one retains all functionality. --- contrib/bash_completion | 430 +++++++++-------------------------------------- 1 files changed, 83 insertions(+), 347 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index f0b5f9c..216c664 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -1,370 +1,106 @@ -# vim: set ft=sh ts=2 sw=2 et: -# file: /etc/bash_completion.d/pacman - -# Bash completion for pacman -# Original: Manolis Tzanidakis <mtzanidakis(a)freemail.gr> -# -# Distributed under the terms of the GNU General Public License, v2 or later. -# - -## initial functions - -rem_selected () -{ - # (Adapted from bash_completion by Ian Macdonald <ian(a)caliban.org>) - # This removes any options from the list of completions that have - # already been specified on the command line. - COMPREPLY=($(\echo "${COMP_WORDS[@]}" | \ - (while read -d ' ' i; do - [ "${i}" == "" ] && continue - # flatten array with spaces on either side, - # otherwise we cannot grep on word boundaries of - # first and last word - COMPREPLY=" ${COMPREPLY[@]} " - # remove word from list of completions - COMPREPLY=(${COMPREPLY/ ${i%% *} / }) +# This file is in the public domain. + +_arch_compgen() { + local i r + COMPREPLY=($(compgen -W '$list' -- $cur)) + for ((i=1; i < ${#COMP_WORDS[@]}-1; i++)); do + for r in ${!COMPREPLY[@]}; do + if [[ ${COMP_WORDS[i]} == ${COMPREPLY[r]} ]]; then + unset 'COMPREPLY[r]'; break + fi done - \echo ${COMPREPLY[@]}))) - return 0 -} - -_available_repos () -{ - COMPREPLY=( $( compgen -W "$(\grep '\[' /etc/pacman.conf | \grep -v -e 'options' -e '^#' | \tr -d '[]' )" -- $cur ) ) -} - -_installed_pkgs () -{ - local installed_pkgs - installed_pkgs=$( \ls /var/lib/pacman/local/ ) - COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do \echo ${i%-*-*}; done )" -- $cur ) ) -} - -_available_pkgs () -{ - #find balks easilly on a find /foo/*/* type dir, especially one like - # /var/lib/pacman/*/* - # This little change-up removes the find *and* only uses enabled repos - local available_pkgs - local enabled_repos - enabled_repos=$( \grep '\[' /etc/pacman.conf | \grep -v -e 'options' -e '^#' | \tr -d '[]' ) - available_pkgs=$( for r in $enabled_repos; do \echo /var/lib/pacman/sync/$r/*; done ) - COMPREPLY=( $( compgen -W "$( for i in $available_pkgs; do j=${i##*/}; echo ${j%-*-*}; done )" -- $cur ) ) + done } -_installed_groups () -{ - local installed_groups - installed_groups=$( \find /var/lib/pacman/local -name desc -exec \sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | \sort -u ) - COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do \echo ${i%-*-*}; done )" -- $cur ) ) +_arch_ptr2comp() { + local list= x y + for x; do + for y in '0 --' '1 -'; do + eval 'set -- ${'"$x"'[${y% *}]}' + list+=\ ${@/#/${y#* }} + done + done + _arch_compgen } -_available_groups () -{ - #find balks easilly on a find /foo/*/* type dir, especially one like - # /var/lib/pacman/*/* - # This little change-up removes the find *and* only uses enabled repos - local available_groups - local enabled_repos - enabled_repos=$( \grep '\[' /etc/pacman.conf | \grep -v -e 'options' -e '^#' | tr -d '[]' ) - available_groups=$( for r in $enabled_repos; do \sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/sync/$r/*/desc | \sort -u; done ) - COMPREPLY=( $( compgen -W "$( for i in $available_groups; do \echo ${i%-*-*}; done )" -- $cur ) ) +_arch_incomp() { + local regex="\s-(-${1#* }\s|${1% *})"; [[ $COMP_LINE =~ $regex ]] } -## makepkg completion - -_makepkg () -{ - local cur prev +_makepkg() { + local cur opts prev COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} + cur=$(_get_cword) prev=${COMP_WORDS[COMP_CWORD-1]} - - case "$prev" in - -p) - _filedir - return 0 - ;; - --help|--cleancache) - COMPREPLY='' - return 0 - ;; - esac - - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '\ - -A --ignorearch \ - -b --builddeps \ - -c --clean \ - -C --cleancache \ - -d --nodeps \ - -e --noextract \ - -f --force \ - -g --geninteg \ - -h --help \ - -i --install \ - -L --log \ - -m --nocolor \ - -o --nobuild \ - -p \ - -r --rmdeps \ - -s --syncdeps \ - --asroot \ - --source \ - --noconfirm \ - --noprogressbar' -- $cur ) ) + if [[ $cur == -* && $prev != @(--@(cleancache|config|help)|-@(C|h|p)) ]]; then + opts=('allsource asroot clean cleancache config force geninteg help + holdver ignorearch install log nobuild nocolor noconfirm nodeps + noextract noprogressbar pkg repackage rmdeps skipinteg source + syncdeps' 'A C L R c d e f g h i m o p r s') + _arch_ptr2comp opts fi - - rem_selected + true } -complete -o default -F _makepkg makepkg -## pacman completion - -_instring () -{ - str="${1}" - shift 1 - for c in "${@}"; do - if [ $(\expr index "${str}" "${c}") -gt 0 ]; then - return 0 +_pacman_pkg() { + local list=$( + if [[ $2 ]]; then + \pacman -$1 | \cut -d' ' -f1 | \sort -u + else + \pacman -$1 fi - done - return 1 + ) + _arch_compgen } -_pacman () -{ - local a arg toparse op mod cur +_pacman() { + local common core cur prev query remove sync upgrade o COMPREPLY=() - - # This argument parsing is done so we can check for flag existance later - # right now it's a tad crappy, but does the job - for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )); do - a=${COMP_WORDS[i]} - arg="${a:0:2}" - toparse="${a:2}" - - case "${arg}" in - -@(U|R|S|Q|h|V)) - op="${arg/-}" - mod="${mod}${a:2}" - ;; - --) - arg="${a:2}" - case "${arg}" in - remove) op="R" ;; - upgrade) op="U" ;; - query) op="Q" ;; - sync) op="S" ;; - help) op="h" ;; - version) op="V" ;; - verbose) mod="${mod}v" ;; - root) mod="${mod}r" ;; - dbpath) mod="${mod}b" ;; - nodeps) mod="${mod}d" ;; - force) mod="${mod}f" ;; - groups) mod="${mod}g" ;; - info) mod="${mod}i" ;; - list) mod="${mod}l" ;; - print) mod="${mod}p" ;; - search) mod="${mod}s" ;; - sysupgrade) mod="${mod}u" ;; - upgrades) mod="${mod}u" ;; - downloadonly) mod="${mod}w" ;; - refresh) mod="${mod}y" ;; - changelog) mod="${mod}c" ;; - deps) mod="${mod}d" ;; - explicit) mod="${mod}e" ;; - unrequired) mod="${mod}t" ;; - foreign) mod="${mod}m" ;; - owns) mod="${mod}o" ;; - file) mod="${mod}p" ;; - search) mod="${mod}s" ;; - upgrades) mod="${mod}u" ;; - cascade) mod="${mod}c" ;; - check) mod="${mod}k" ;; - dbonly) mod="${mod}k" ;; - nosave) mod="${mod}n" ;; - recursive) mod="${mod}s" ;; - unneeded) mod="${mod}u" ;; - esac ;; - *) toparse="${a}" ;; - esac - - arglen=$(( ${#toparse}-1 )) - for c in $(\seq 0 "${arglen}"); do - arg=${toparse:$c:1} - [ "${arg}" != "-" ] && mod="${mod}${arg}" - done + cur=$(_get_cword) + prev=${COMP_WORDS[COMP_CWORD-1]} + database=('asdeps asexplicit') + query=('changelog check deps explicit file foreign groups info + list owns quiet search unrequired upgrades' 'c e g i k l m o p q s t u') + remove=('cascade dbonly nodeps nosave print recursive unneeded' 'c k n p s u') + sync=('asdeps asexplicit clean downloadonly force groups ignore + ignoregroup info list needed nodeps print quiet refresh search + sysupgrade' 'c f g i l p q s u w y') + upgrade=('asdeps asexplicit force nodeps print' 'f p') + common=('arch cachedir config dbpath debug help logfile noconfirm + noprogressbar noscriptlet root verbose' 'b d h r v') + core=('database help query remove sync upgrade version' 'D Q R S U V h') + + for o in 'D database' 'Q query' 'R remove' 'S sync' 'U upgrade'; do + _arch_incomp "$o" && break done - cur=${COMP_WORDS[COMP_CWORD]} - - if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '\ - -h --help \ - -Q --query \ - -R --remove \ - -S --sync \ - -U --upgrade \ - -V --version \ - ' -- $cur ) ) - rem_selected - return 0 - fi - - if [[ "$cur" == -* ]]; then - case "${op}" in - U) - COMPREPLY=( $( compgen -W '\ - --asdeps \ - --asexplicit \ - -d --nodeps \ - -f --force \ - -h --help \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - -p --print \ - --print-format \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - R) - COMPREPLY=( $( compgen -W '\ - -c --cascade \ - -d --nodeps \ - -h --help \ - -k --dbonly \ - -n --nosave \ - -s --recursive \ - -u --unneeded \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - -p --print \ - --print-format \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - S) - COMPREPLY=( $( compgen -W '\ - --asdeps \ - --asexplicit \ - -c --clean \ - -d --nodeps \ - -f --force \ - -g --groups \ - -h --help \ - -i --info \ - -l --list \ - -s --search \ - -u --sysupgrade \ - -w --downloadonly \ - -y --refresh \ - --needed \ - --ignore \ - --ignoregroup \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - -p --print \ - --print-format \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - Q) - COMPREPLY=( $( compgen -W '\ - -c --changelog \ - -d --deps \ - -e --explicit \ - -g --groups \ - -h --help \ - -i --info \ - -k --check \ - -l --list \ - -m --foreign \ - -o --owns \ - -p --file \ - -s --search \ - -t --unrequired \ - -u --upgrades \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - esac - rem_selected + if [[ $? != 0 ]]; then + _arch_ptr2comp core + elif [[ $prev != @(V|b|h|o|r) && $cur == -* && + $prev != --@(cachedir|config|dbpath|file|help|logfile|owns|root|version) ]] + then + _arch_ptr2comp ${o#* } common else - case "${op}" in - U) - COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -X '!*.pkg.tar.*' -- "$cur" ) ) - return 0 - ;; - h|V) - COMPREPLY='' - return 0 - ;; - Q) - if _instring $mod g; then - _installed_groups - elif _instring $mod o; then - COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -- "$cur" ) ) - elif _instring $mod p; then - COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -X '!*.pkg.tar.*' -- "$cur" ) ) - elif _instring $mod u; then - COMPREPLY='' - return 0 - else - _installed_pkgs - fi - return 0 - ;; - R) - _installed_pkgs - return 0 - ;; - S) - if _instring $mod l; then - _available_repos - else - _available_pkgs - fi - return 0 - ;; + case ${o% *} in + D|R) + _pacman_pkg Qq;; + Q) + _arch_incomp 'g groups' && _pacman_pkg Qg sort || + _arch_incomp 'p file' && _filedir 'pkg.tar.*' || + _arch_incomp 'o owns' || _arch_incomp 'u upgrades' || + _pacman_pkg Qq;; + S) + _arch_incomp 'g groups' && _pacman_pkg Sg || + _arch_incomp 'l list' && _pacman_pkg Sl sort || + _pacman_pkg Slq;; + U) + _filedir 'pkg.tar.*';; esac fi - - rem_selected + true } + +complete -o default -F _makepkg makepkg complete -o filenames -F _pacman pacman + +# ex:et ts=2 sw=2 ft=sh -- 1.7.1

2 5

Re: [pacman-dev] [PATCH] redirect scriptlet stderr through alpm
by Jonathan Conder 21 May '10

21 May '10

Fixes FS#18770, and hopefully an occasional deadlock in my frontend as well. For simplicity it redirects all scriptlet output through SCRIPTLET_INFO, and all callbacks in the child process have been replaced for thread-safety. Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> --- lib/libalpm/util.c | 84 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 49 insertions(+), 35 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2b006e2..c88be2d 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -462,6 +462,7 @@ int _alpm_run_chroot(const char *root, const char *cmd) { char cwd[PATH_MAX]; pid_t pid; + int pipefd[2]; int restore_cwd = 0; int retval = 0; @@ -485,6 +486,12 @@ int _alpm_run_chroot(const char *root, const char *cmd) /* Flush open fds before fork() to avoid cloning buffers */ fflush(NULL); + if(pipe(pipefd) == -1) { + _alpm_log(PM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno)); + retval = 1; + goto cleanup; + } + /* fork- parent and child each have seperate code blocks below */ pid = fork(); if(pid == -1) { @@ -494,53 +501,60 @@ int _alpm_run_chroot(const char *root, const char *cmd) } if(pid == 0) { - FILE *pipe; /* this code runs for the child only (the actual chroot/exec) */ - _alpm_log(PM_LOG_DEBUG, "chrooting in %s\n", root); + close(1); + close(2); + close(pipefd[0]); + while(dup2(pipefd[1], 1) == -1 && errno == EINTR); + while(dup2(pipefd[1], 2) == -1 && errno == EINTR); + close(pipefd[1]); + if(chroot(root) != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change the root directory (%s)\n"), - strerror(errno)); + printf(_("could not change the root directory (%s)\n"), strerror(errno)); exit(1); } if(chdir("/") != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change directory to / (%s)\n"), - strerror(errno)); + printf(_("could not change directory to / (%s)\n"), strerror(errno)); exit(1); } umask(0022); - pipe = popen(cmd, "r"); - if(!pipe) { - _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)\n"), - strerror(errno)); - exit(1); - } - while(!feof(pipe)) { - char line[PATH_MAX]; - if(fgets(line, PATH_MAX, pipe) == NULL) - break; - alpm_logaction("%s", line); - EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); - } - retval = pclose(pipe); - exit(WEXITSTATUS(retval)); + execl("/bin/sh", "sh", "-c", cmd, (char *) NULL); + printf(_("call to execl failed (%s)\n"), strerror(errno)); + exit(1); } else { /* this code runs for the parent only (wait on the child) */ - pid_t retpid; int status; - while((retpid = waitpid(pid, &status, 0)) == -1 && errno == EINTR); - if(retpid == -1) { - _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), - strerror(errno)); - retval = 1; - goto cleanup; + FILE *pipe; + + close(pipefd[1]); + pipe = fdopen(pipefd[0], "r"); + if(pipe == NULL) { + close(pipefd[0]); } else { - /* check the return status, make sure it is 0 (success) */ - if(WIFEXITED(status)) { - _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); - if(WEXITSTATUS(status) != 0) { - _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); - retval = 1; - } + while(!feof(pipe)) { + char line[PATH_MAX]; + if(fgets(line, PATH_MAX, pipe) == NULL) + break; + alpm_logaction("%s", line); + EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); + } + fclose(pipe); + } + + while(waitpid(pid, &status, 0) == -1) { + if(errno != EINTR) { + _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), strerror(errno)); + retval = 1; + goto cleanup; + } + } + + /* check the return status, make sure it is 0 (success) */ + if(WIFEXITED(status)) { + _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); + if(WEXITSTATUS(status) != 0) { + _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); + retval = 1; } } } -- 1.7.1

1 0

[pacman-dev] [PATCH] Change directory in package function in PKGBUILD.proto
by Allan McRae 19 May '10

19 May '10

makepkg goes back to the $startdir between the build() and package() functions so we need to change directory at the start of the package function. TODO: fix makepkg to make this unnecessary Signed-off-by: Allan McRae <allan(a)archlinux.org> --- PKGBUILD.proto | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/PKGBUILD.proto b/PKGBUILD.proto index 0134574..b4d9c94 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -34,6 +34,8 @@ build() { } package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install } -- 1.7.1

2 2

[pacman-dev] pacman -D --help output
by Allan McRae 19 May '10

19 May '10

Saw this when I was playing some more with -D today. > ./src/pacman/pacman -D --help usage: lt-pacman {-D --database} <options> <package(s)> options: --asdeps mark packages as non-explicitly installed --asexplicit mark packages as explicitly installed --config <path> set an alternate configuration file --logfile <path> set an alternate log file --noconfirm do not ask for any confirmation --noprogressbar do not show a progress bar when downloading files --noscriptlet do not execute the install scriptlet if one exists -v, --verbose be verbose --debug display debug messages -r, --root <path> set an alternate installation root -b, --dbpath <path> set an alternate database location --cachedir <dir> set an alternate package cache location --arch <arch> set an alternate architecture Are some of these options used with -D, or can they be removed? I am thinking of --noprogressbar, --noscriptlet, --arch, --noconfirm (?). Allan

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-191-g9ab6bfa
by dan＠archlinux.org 18 May '10

18 May '10

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 9ab6bfad223ce65d3c37785d0aae8676bfc2702f (commit) via ac722c93274157cb10f0a7b341bdbdb340847dc7 (commit) from c1fc00508e337f20eb94e95978e193d23cfeaf10 (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 9ab6bfad223ce65d3c37785d0aae8676bfc2702f Author: Jonathan Conder <j(a)skurvy.no-ip.org> Date: Sun May 16 17:34:38 2010 +1200 fix memory leak in _alpm_sync_commit Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ac722c93274157cb10f0a7b341bdbdb340847dc7 Author: Daenyth <Daenyth%2BArch(a)gmail.com> Date: Sat Mar 20 15:03:45 2010 -0400 rankmirrors: Add a --repo option to target a specific repo Signed-off-by: Daenyth <Daenyth%2BArch(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 3 ++- scripts/rankmirrors.sh.in | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Fwd: [PATCH] rankmirrors: Add a --repo option to target a specific repo
by Daenyth Blank 18 May '10

18 May '10

--- scripts/rankmirrors.sh.in | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index d5cbadd..9b4e973 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -35,6 +35,7 @@ usage() { echo " -t, --times only output mirrors and their response times" echo " -u, --url test a specific url" echo " -v, --verbose be verbose in ouptut" + echo " -r, --repo specify a specific repo name instead of guessing" exit 0 } @@ -69,13 +70,18 @@ ARCH="$(uname -m)" getfetchurl() { local strippedurl="${1%/}" - local replacedurl="${strippedurl//'$repo'/core}" - replacedurl="${replacedurl//'$arch'/$ARCH}" + local replacedurl="${replacedurl//'$arch'/$ARCH}" + if [[ ! $TARGETREPO ]]; then + replacedurl="${strippedurl//'$repo'/core}" + local tmp="${replacedurl%/*}" + tmp="${tmp%/*}" - local tmp="${replacedurl%/*}" - tmp="${tmp%/*}" + local reponame="${tmp##*/}" + else + replacedurl="${strippedurl//'$repo'/$TARGETREPO}" + local reponame="$TARGETREPO" + fi - local reponame="${tmp##*/}" if [[ -z $reponame || $reponame = $replacedurl ]]; then echo "fail" else @@ -119,6 +125,7 @@ while [[ $1 ]]; do times) TIMESONLY=1 ; shift ;; verbose) VERBOSE=1 ; shift ;; url) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; shift 2;; + repo) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; shift 2;; *) err "\`$1' is an invalid argument." esac elif [[ ${1:0:1} = - ]]; then @@ -136,6 +143,7 @@ while [[ $1 ]]; do t) TIMESONLY=1 ;; v) VERBOSE=1 ;; u) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; snum=2;; + r) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; snum=2;; n) [[ $2 ]] || err "Must specify number." ; NUM="$2" ; snum=2;; *) err "\`-$1' is an invald argument." ;; esac @@ -182,6 +190,7 @@ for line in "${linearray[@]}"; do # Getting values and times and such server="${line#*= }" + server="${server%%#*}" url="$(getfetchurl "$server")" [[ $url = fail ]] && err "url \`$URL' is malformed." time=$(gettime "$url") -- 1.7.1

4 16