summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Walker <ka0ttic@gentoo.org>2005-04-20 18:03:42 +0000
committerAaron Walker <ka0ttic@gentoo.org>2005-04-20 18:03:42 +0000
commit195390bb1824e1bb6397e46d75ac1d68d6842670 (patch)
tree2fc69cc50a484979169c3fe2dc823930a27b7722 /app-shells/bash-completion/files
parentVersion bump, fixes security bug #88926. (diff)
downloadgentoo-2-195390bb1824e1bb6397e46d75ac1d68d6842670.tar.gz
gentoo-2-195390bb1824e1bb6397e46d75ac1d68d6842670.tar.bz2
gentoo-2-195390bb1824e1bb6397e46d75ac1d68d6842670.zip
Tidy.
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-shells/bash-completion/files')
-rw-r--r--app-shells/bash-completion/files/20041017-gentoo.diff39
-rw-r--r--app-shells/bash-completion/files/20041017-rcs.diff19
-rw-r--r--app-shells/bash-completion/files/20050121-find.diff23
-rw-r--r--app-shells/bash-completion/files/20050121-muttng.diff69
-rw-r--r--app-shells/bash-completion/files/20050121-tar.diff13
-rw-r--r--app-shells/bash-completion/files/digest-bash-completion-20041017-r32
6 files changed, 0 insertions, 165 deletions
diff --git a/app-shells/bash-completion/files/20041017-gentoo.diff b/app-shells/bash-completion/files/20041017-gentoo.diff
deleted file mode 100644
index f1c5eb855e00..000000000000
--- a/app-shells/bash-completion/files/20041017-gentoo.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN bash_completion.orig/bash_completion bash_completion/bash_completion
---- bash_completion.orig/bash_completion 2004-11-27 04:26:41.356337311 -0500
-+++ bash_completion/bash_completion 2004-11-27 04:27:07.461009682 -0500
-@@ -104,7 +104,8 @@
- complete -f -X '!*.@(ogg|OGG|m3u|flac|spx)' ogg123
- complete -f -X '!*.@(mp3|MP3|ogg|OGG|pls|m3u)' gqmpeg freeamp
- complete -f -X '!*.fig' xfig
--complete -f -X '!*.@(mid?(i))' timidity playmidi
-+complete -f -X '!*.@(mid?(i))' playmidi
-+complete -f -X '!*.@(mid?(i)|rmi|RMI)' timidity
- complete -f -X '*.@(o|so|so.!(conf)|a|tar?(.@(gz|bz2))|tgz|tbz2|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview
- complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' emacs
- complete -f -X '!*.@(exe|EXE|com|COM|scr|SCR)' wine
-@@ -4693,7 +4694,7 @@
- return 0
- ;;
- -audiofile)
-- _filedir '@(mp3|MP3|mpg|MPG|ogg|OGG|wav|WAV)'
-+ _filedir '@(mp3|MP3|mpg|MPG|ogg|OGG|wav|WAV|mid|MID)'
- return 0
- ;;
- -font)
-@@ -4985,7 +4986,7 @@
- -xvidencopts -of --verbose' -- $cur) )
- ;;
- *)
-- _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fli|FLI|viv|VIV|rm|RM|ram|RAM|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|og[gm]|OG[GM]|wav|WAV|dump|DUMP|mkv|MKV|m4a|M4A|aac|AAC|m2v|M2V|dv|DV)'
-+ _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fli|FLI|viv|VIV|rm|RM|ram|RAM|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|og[gm]|OG[GM]|wav|WAV|dump|DUMP|mkv|MKV|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|mid|MID|ts|TS)'
- ;;
- esac
-
-diff -urN bash_completion.orig/contrib/gkrellm bash_completion/contrib/gkrellm
---- bash_completion.orig/contrib/gkrellm 2004-11-27 04:26:41.354337642 -0500
-+++ bash_completion/contrib/gkrellm 2004-11-27 04:33:27.155938637 -0500
-@@ -34,3 +34,4 @@
-
- }
- complete -F _gkrellm gkrellm
-+complete -F _gkrellm gkrellm2
diff --git a/app-shells/bash-completion/files/20041017-rcs.diff b/app-shells/bash-completion/files/20041017-rcs.diff
deleted file mode 100644
index 75602c017051..000000000000
--- a/app-shells/bash-completion/files/20041017-rcs.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- bash_completion/bash_completion 2004/12/21 21:40:48 1.1
-+++ bash_completion/bash_completion 2004/12/21 21:41:49
-@@ -4409,10 +4409,15 @@ _rcs()
-
- for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
- file=${COMPREPLY[$i]##*/}
-- file=${file%,v}
- dir=${COMPREPLY[$i]%RCS/*}
- COMPREPLY[$i]=$dir$file
- done
-+
-+ COMPREPLY=( "${COMPREPLY[@]}" $( compgen -G "$dir/$file*,v" ) )
-+
-+ for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
-+ COMPREPLY[$i]=${COMPREPLY[$i]%,v}
-+ done
-
- # default to files if nothing returned and we're checking in.
- # otherwise, default to directories
diff --git a/app-shells/bash-completion/files/20050121-find.diff b/app-shells/bash-completion/files/20050121-find.diff
deleted file mode 100644
index 9950fe478349..000000000000
--- a/app-shells/bash-completion/files/20050121-find.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- bash_completion.orig 2005-04-06 12:19:18.102705608 +0100
-+++ bash_completion 2005-04-06 12:23:24.310276368 +0100
-@@ -925,8 +925,8 @@
- _command
- return 0
- ;;
-- -[acm]min|-[acm]time|-?(i)?(l)name|-inum|-?(i)path|-?(i)regex| \
-- -links|-perm|-size|-used|-printf)
-+ -[acm]min|-[acm]time|-?(i)?(l)?(whole)name|-inum|-?(i)path| \
-+ -?(i)regex|-links|-perm|-size|-used|-printf)
- # do nothing, just wait for a parameter to be given
- return 0
- ;;
-@@ -953,7 +953,8 @@
- -links -lname -mmin -mtime -name -newer -nouser \
- -nogroup -perm -regex -size -true -type -uid -used \
- -user -xtype -exec -fls -fprint -fprint0 -fprintf -ok \
-- -print -print0 -printf -prune -ls' -- $cur ) )
-+ -print -print0 -printf -prune -ls -wholename \
-+ -iwholename' -- $cur ) )
-
- # this removes any options from the list of completions that have
- # already been specified somewhere on the command line, as long as
diff --git a/app-shells/bash-completion/files/20050121-muttng.diff b/app-shells/bash-completion/files/20050121-muttng.diff
deleted file mode 100644
index 04f06ace04f8..000000000000
--- a/app-shells/bash-completion/files/20050121-muttng.diff
+++ /dev/null
@@ -1,69 +0,0 @@
---- bash_completion.orig 2005-03-27 23:40:42.000000000 -0500
-+++ bash_completion 2005-03-27 23:42:50.000000000 -0500
-@@ -4544,7 +4544,7 @@
- #
- # Mutt doesn't have an "addressbook" like Pine, but it has aliases and
- # a "query" function to retrieve addresses, so that's what we use here.
--have mutt && {
-+have mutt || have muttng && {
- _muttaddr()
- {
- _muttaliases
-@@ -4577,9 +4577,10 @@
- local -a conffiles aliases
- cur=${COMP_WORDS[COMP_CWORD]}
-
-- [ -f ~/.mutt/muttrc ] && muttrc="~/.mutt/muttrc"
-- [ -f ~/.muttrc ] && muttrc="~/.muttrc"
-+ [ -f ~/.${muttcmd}/${muttcmd}rc ] && muttrc="~/.${muttcmd}/${muttcmd}rc"
-+ [ -f ~/.${muttcmd}rc ] && muttrc="~/.${muttcmd}rc"
- [ -z "$muttrc" ] && return 0
-+
- conffiles=( $(eval _muttconffiles $muttrc $muttrc) )
- aliases=( $( sed -rn 's|^alias[[:space:]]+([^[:space:]]+).*$|\1|p' \
- $(eval echo ${conffiles[@]}) ) )
-@@ -4594,7 +4595,7 @@
- local -a queryresults
- cur=${COMP_WORDS[COMP_CWORD]}
-
-- querycmd="$( mutt -Q query_command | sed -r 's|^query_command=\"(.*)\"$|\1|; s|%s|'$cur'|' )"
-+ querycmd="$( $muttcmd -Q query_command | sed -r 's|^query_command=\"(.*)\"$|\1|; s|%s|'$cur'|' )"
- if [ -z "$cur" -o -z "$querycmd" ]; then
- queryresults=()
- else
-@@ -4616,7 +4617,7 @@
- # This is currently not working so well. Perhaps this function should
- # just call _filedir() for the moment.
- if [[ $cur == [=+]* ]]; then
-- folder="$( mutt -Q folder | sed -r 's|^folder=\"(.*)\"$|\1|' )"
-+ folder="$( $muttcmd -Q folder | sed -r 's|^folder=\"(.*)\"$|\1|' )"
- : folder:=~/Mail
-
- # Match any file in $folder beginning with $cur
-@@ -4625,7 +4626,7 @@
- COMPREPLY=( ${COMPREPLY[@]#$folder/} )
- return 0
- elif [ "$cur" == !* ]; then
-- spoolfile="$( mutt -Q spoolfile | sed -r 's|^spoolfile=\"(.*)\"$|\1|' )"
-+ spoolfile="$( $muttcmd -Q spoolfile | sed -r 's|^spoolfile=\"(.*)\"$|\1|' )"
- [ ! -z "$spoolfile" ] && eval cur="${cur/^!/$spoolfile}";
- fi
- _filedir
-@@ -4640,6 +4641,8 @@
- prev=${COMP_WORDS[COMP_CWORD-1]}
-
- COMPREPLY=()
-+
-+ [ ${COMP_WORDS[0]} == muttng ] && muttcmd="muttng" || muttcmd="mutt"
-
- case "$cur" in
- -*)
-@@ -4670,7 +4673,7 @@
- esac
-
- }
--complete -F _mutt $default $filenames mutt
-+complete -F _mutt $default $filenames mutt muttng
- }
-
- _configure_func()
diff --git a/app-shells/bash-completion/files/20050121-tar.diff b/app-shells/bash-completion/files/20050121-tar.diff
deleted file mode 100644
index eecacb9ebb5f..000000000000
--- a/app-shells/bash-completion/files/20050121-tar.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- bash_completion.orig 2005-03-28 23:32:38.000000000 -0500
-+++ bash_completion 2005-03-28 23:42:13.000000000 -0500
-@@ -2773,8 +2773,8 @@
- return 0
- ;;
- +([^IZzjy])f)
-- ext='tar'
-- regex=$ext
-+ ext='t?(ar?(.))@(gz|Z|bz?(2))'
-+ regex='t\(ar?(\.)\)\(gz\|Z\|bz2\?\)'
- ;;
- *[Zz]*f)
- ext='t?(ar.)@(gz|Z)'
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20041017-r3 b/app-shells/bash-completion/files/digest-bash-completion-20041017-r3
deleted file mode 100644
index 216ce7e723b7..000000000000
--- a/app-shells/bash-completion/files/digest-bash-completion-20041017-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3fd0836127d01606a9dc4262f3e2e1fb bash-completion-20041017.tar.bz2 86227
-MD5 d6d22c935ff339c2ebcc0757f5d306d0 gentoo-bashcomp-1.0_beta4.tar.gz 15477