Date: Sunday, March 18, 2012 @ 02:04:33 Author: eric Revision: 153695
archrelease: copy trunk to testing-any Added: bash-completion/repos/testing-any/PKGBUILD (from rev 153694, bash-completion/trunk/PKGBUILD) bash-completion/repos/testing-any/modinfo-path.diff (from rev 153694, bash-completion/trunk/modinfo-path.diff) Deleted: bash-completion/repos/testing-any/PKGBUILD -------------------+ PKGBUILD | 59 +++++++++++++++++++++++++++------------------------- modinfo-path.diff | 15 +++++++++++++ 2 files changed, 46 insertions(+), 28 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2012-03-18 06:03:07 UTC (rev 153694) +++ PKGBUILD 2012-03-18 06:04:33 UTC (rev 153695) @@ -1,28 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=bash-completion -pkgver=1.99 -pkgrel=1 -pkgdesc="Programmable completion for the bash shell" -arch=('any') -url="http://bash-completion.alioth.debian.org/" -license=('GPL') -depends=('bash') -options=('!emptydirs') -source=("http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2") -md5sums=('3cf478b7f1065f424d3d6ec35f80e4f2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - -# bash-completion is sourced in /etc/bash.bashrc so that non-bash shell don't source it - rm "${pkgdir}/etc/profile.d/bash_completion.sh" -} Copied: bash-completion/repos/testing-any/PKGBUILD (from rev 153694, bash-completion/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2012-03-18 06:04:33 UTC (rev 153695) @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=bash-completion +pkgver=1.99 +pkgrel=1 +pkgdesc="Programmable completion for the bash shell" +arch=('any') +url="http://bash-completion.alioth.debian.org/" +license=('GPL') +depends=('bash') +options=('!emptydirs') +source=(http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2 \ + modinfo-path.diff) +md5sums=('3cf478b7f1065f424d3d6ec35f80e4f2' + '7047eb6f484323e8d1d22fb260a43a8e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/modinfo-path.diff" + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + +# bash-completion is sourced in /etc/bash.bashrc so that non-bash shell don't source it + rm "${pkgdir}/etc/profile.d/bash_completion.sh" +} Copied: bash-completion/repos/testing-any/modinfo-path.diff (from rev 153694, bash-completion/trunk/modinfo-path.diff) =================================================================== --- modinfo-path.diff (rev 0) +++ modinfo-path.diff 2012-03-18 06:04:33 UTC (rev 153695) @@ -0,0 +1,15 @@ +Subject: [PATCH 1/1] insmod, modprobe: Don't hardcode path to modinfo (Alioth: #313569) + +--- a/completions/insmod ++++ b/completions/insmod +@@ -9,8 +9,8 @@ _insmod() + + if [[ $cword -gt 1 && "${words[cword-1]}" != -* ]]; then + # do module parameter completion +- COMPREPLY=( $( compgen -W "$( /sbin/modinfo -p ${words[1]} | \ +- cut -d: -f1 )" -- "$cur" ) ) ++ COMPREPLY=( $( compgen -W "$( PATH="$PATH:/sbin" modinfo \ ++ -p ${words[1]} 2>/dev/null | cut -d: -f1 )" -- "$cur" ) ) + else + _modules $(uname -r) + fi