19816248 zsh 5.0.7
authorDanek Duvall <danek.duvall@oracle.com>
Wed, 15 Oct 2014 13:30:54 -0700
changeset 2210 96a1346fe8ad
parent 2209 69f745d47612
child 2211 a99bbd5139c0
19816248 zsh 5.0.7 19816404 problem in UTILITY/ZSH
components/zsh/Makefile
components/zsh/patches/completion.patch
components/zsh/zsh.p5m
--- a/components/zsh/Makefile	Fri Nov 14 15:24:09 2014 -0800
+++ b/components/zsh/Makefile	Wed Oct 15 13:30:54 2014 -0700
@@ -27,16 +27,16 @@
 include ../../make-rules/shared-targets.mk
 
 COMPONENT_NAME=		zsh
-COMPONENT_VERSION=	5.0.5
+COMPONENT_VERSION=	5.0.7
 COMPONENT_PROJECT_URL=	http://www.zsh.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:6624d2fb6c8fa4e044d2b009f86ed1617fe8583c83acfceba7ec82826cfa8eaf
+    sha256:544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3
 COMPONENT_ARCHIVE_URL=	http://downloads.sourceforge.net/project/zsh/zsh/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/zsh
 
-TPNO=			19296
+TPNO=			19477
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/zsh/patches/completion.patch	Fri Nov 14 15:24:09 2014 -0800
+++ b/components/zsh/patches/completion.patch	Wed Oct 15 13:30:54 2014 -0700
@@ -846,234 +846,6 @@
  	("uninstall")
  		_arguments -A "-*" \
  			'-F[Force]' \
---- zsh-5.0.5/Completion/Unix/Command/_pgrep	Wed Nov 27 11:00:19 2013
-+++ zsh-5.0.5/Completion/Unix/Command/_pgrep	Sat Mar 29 09:41:30 2014
[email protected]@ -1,32 +1,71 @@
--#compdef pgrep pkill 
-+#compdef pgrep pkill
- 
- local context state line ret=1 expl
- typeset -A opt_args
- typeset -a arguments
- 
--arguments=('-P[parent process id]:parent process id:->ppid' 
--     '-g[match only in process group ids]:group:->pgid' 
--     '-G[match only real group id]:group:_groups' 
--     '-s[match only session id]:session id:->sid' 
-+arguments=('-P[parent process id]:parent process id:->ppid'
-+     '-F[match only in process in pidfile]:files:_files'
-+     '-g[match only in process group ids]:group:->pgid'
-+     '-G[match only real group id]:group:_groups'
-+     '-j[match only in processes inside jails]:jail id:->jid'
-+     '-J[match only in project ids]:project id:->projid'
-+     '-M[extract the name list from the specified core]:files:_files'
-+     '-N[extract the name list from the specified system]:files:_files'
-+     '-s[match only session id]:session id:->sid'
-      '-t[match only controlled by terminal]:terminal device:->tty'
--     '-u[match only effective user id]:user:_users' 
--     '-U[match only real user id]:user:_users' 
--           '(-n)-o[oldest process]' 
--     '(-o)-n[newest process]' 
--     '-f[match against full command line]' 
--     '-v[negate matching]' 
--     '-x[match exactly]' 
--     '*:process name:->pname')
-+     '-T[match only in processes specified routing table in rtable]'
-+     '-u[match only effective user id]:user:_users'
-+     '-U[match only real user id]:user:_users'
-+     '(-n)-o[oldest process]'
-+     '(-o)-n[newest process]'
-+     '-a[include process ancestors in the match list]'
-+     '-c[print a count of matching processes]'
-+     '-f[match against full command line]'
-+     '-i[ignore case distinctions]'
-+     '-I[confirmation before attempting to single each process]'
-+     '-L[given pidfile must be locked]'
-+     '-q[do not write anything to standard output]'
-+     '-S[search also in system processes]'
-+     '-v[negate matching]'
-+     '-x[match exactly]'
-+     '-z[match only in zones]:zone:_zones')
- 
--if [[ $service == 'pkill' ]]
--then
-+if [[ $service == 'pkill' ]]; then
-   arguments+=('-'${^signals}'[signal]')
--elif [[ $service == 'pgrep' ]]
--then
-+elif [[ $service == 'pgrep' ]]; then
-   arguments+=('-d[output delimiter]:delimiter:compadd ${(s\:\:)IFS}'
-         '-l[list name in addition to id]')
- fi
- 
-+local optchars
-+case "$OSTYPE" in
-+  linux*)
-+    optchars="cflvxdnoPgsuUGt"
-+    ;;
-+  freebsd*)
-+    optchars="LSafilnoqvxFGMNPUdgjstu"
-+    ;;
-+  openbsd*)
-+    optchars="flnoqvxdGgPsTtUu"
-+    ;;
-+  darwin*)
-+    optchars="LafilnoqvxFGPUdgtu"
-+    ;;
-+  solaris*)
-+    optchars="flvxdnoPgsuUGJtTcz"
-+    arguments=( ${arguments##-T*} )
-+    arguments=( ${arguments##-c*} )
-+    arguments+=( '-T[match only processes in task ids]:taskid:->task' )
-+    arguments+=( '-c[match only processes in contract ids]:taskid:->contract' )
-+    ;;
-+  *)
-+    optchars="flvxdnoPgsuUGt"
-+    ;;
-+esac
-+arguments=( ${(M)arguments:#(|\*)(|\(*\))-[$optchars]*}
-+     '*:process name:->pname')
-+
- _arguments -s -w $arguments && ret=0
- 
- case $state in
[email protected]@ -39,23 +78,45 @@
-     ttys=( /dev/tty*(N) /dev/pts/*(N) )
-     _wanted tty expl 'terminal device' compadd -S ',' -q -F used ${ttys#/dev/}
-     ;;
--    
-+
-   (sid)
-+    if [[ $OSTYPE == openbsd* ]]; then
-+      break
-+    fi
-+
-     compset -P '*,'
- 
-     local -a used sid
-     used=(${(s:,:)IPREFIX})
--    sid=(${(uon)$(ps -A o sid=)})
-+    if [[ $OSTYPE == freebsd* ]]; then
-+      sid=(${(uon)$(ps -ax -o sid=)})
-+    else
-+      sid=(${(uon)$(ps -A -o sid=)})
-+    fi
- 
-     _wanted sid expl 'session id' compadd -S ',' -q -F used $sid
-     ;;
--  
-+
-+  (jid)
-+    compset -P '*,'
-+
-+    local -a used jid
-+    used=(${(s:,:)IPREFIX})
-+    jid=(${(uon)$(ps -ax -o jid=)})
-+
-+    _wanted jid expl 'jail id' compadd -S ',' -q -F used $jid
-+    ;;
-+
-   (ppid)
-     compset -P '*,'
- 
-     local -a used ppid
-     used=(${(s:,:)IPREFIX})
--    ppid=(${(uon)$(ps -A o ppid=)})
-+    if [[ $OSTYPE == (freebsd|openbsd|darwin)* ]]; then
-+      ppid=(${(uon)$(ps -ax -o ppid=)})
-+    else
-+      ppid=(${(uon)$(ps -A -o ppid=)})
-+    fi
- 
-     _wanted ppid expl 'parent process id' compadd -S ',' -q -F used $ppid
-     ;;
[email protected]@ -65,25 +126,77 @@
- 
-     local -a used pgid
-     used=(${(s:,:)IPREFIX})
--    pgid=(${(uon)$(ps -A o pgid=)})
-+    if [[ $OSTYPE == (freebsd|openbsd|darwin)* ]]; then
-+      pgid=(${(uon)$(ps -ax -o pgid=)})
-+    else
-+      pgid=(${(uon)$(ps -A -o pgid=)})
-+    fi
- 
-     _wanted pgid expl 'process group id' compadd -S ',' -q -F used $pgid
-     ;;
--  
-+
-+  (projid)
-+    compset -P '*,'
-+
-+    local -a used projid
-+    used=(${(s:,:)IPREFIX})
-+    projid=(${(uon)$(ps -A -o project=)})
-+
-+    _wanted projid expl 'project id' compadd -S ',' -q -F used $projid
-+    ;;
-+
-+  (contract)
-+    compset -P '*,'
-+
-+    local -a used ctid
-+    used=(${(s:,:)IPREFIX})
-+    ctid=(${(uon)$(ps -A -o ctid=)})
-+
-+    _wanted ctid expl 'contract id' compadd -S ',' -q -F used $ctid
-+    ;;
-+
-+  (task)
-+    compset -P '*,'
-+
-+    local -a used taskid
-+    used=(${(s:,:)IPREFIX})
-+    taskid=(${(uon)$(ps -A -o project=)})
-+
-+    _wanted taskid expl 'task id' compadd -S ',' -q -F used $taskid
-+    ;;
-+
-   (pname)
-     local ispat="pattern matching "
--    if (( ${+opt_args[-x]} ))
--    then
-+    if (( ${+opt_args[-x]} )); then
-       ispat=""
-     fi
--    if (( ${+opt_args[-f]} ))
--    then
--      _wanted pname expl $ispat'process command line' compadd ${(u)${(f)"$(ps -A o cmd=)"}}
-+
-+    local command
-+    if (( ${+opt_args[-f]} )); then
-+      if [[ "$OSTYPE" == freebsd* ]] && (( ${+opt_args[-S]} )); then
-+        command="$(ps -axH -o command=)"
-+      elif [[ "$OSTYPE" == (freebsd|openbsd|darwin)* ]]; then
-+        command="$(ps -ax -o command=)"
-+      elif [[ "$OSTYPE" == solaris* ]]; then
-+        command="$(ps -A -o args=)"
-+      else
-+        command="$(ps -A o cmd=)"
-+      fi
-+      _wanted pname expl $ispat'process command line' compadd ${(u)${(f)${command}}}
-     else
--      _wanted pname expl $ispat'process name' compadd ${(u)${(f)"$(ps -A co cmd=)"}}
-+      if [[ "$OSTYPE" == freebsd* ]] && (( ${+opt_args[-S]} )); then
-+        command="$(ps -axcH -o command=)"
-+      elif [[ "$OSTYPE" == (freebsd|openbsd|darwin)* ]]; then
-+        command="$(ps -axc -o command=)"
-+      elif [[ "$OSTYPE" == solaris* ]]; then
-+        command="$(ps -A -o comm=)"
-+      else
-+        command="$(ps -A co cmd=)"
-+      fi
-+      _wanted pname expl $ispat'process name' compadd ${(u)${(f)${command}}}
-     fi
-     ;;
--  
-+
- esac && ret=0
- 
- return ret
 --- zsh-5.0.5/Completion/Unix/Command/_zfs	Thu Jan  2 14:23:56 2014
 +++ zsh-5.0.5/Completion/Unix/Command/_zfs	Sat Mar 29 11:35:15 2014
 @@ -1,5 +1,5 @@
--- a/components/zsh/zsh.p5m	Fri Nov 14 15:24:09 2014 -0800
+++ b/components/zsh/zsh.p5m	Wed Oct 15 13:30:54 2014 -0700
@@ -203,6 +203,8 @@
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_expand_word
 file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_extensions
+file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_generic
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_guard
 file \
@@ -247,6 +249,8 @@
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_sep_parts
 file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_sequence
+file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_set_command
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_setup
 file \
@@ -298,6 +302,8 @@
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_softwareupdate
 file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_system_profiler
+file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_a2utils
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_apt
 file \
@@ -434,9 +440,11 @@
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_rpmbuild
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_schedtool
+file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_ss
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_sshfs
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_strace
+file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_sysstat
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_tpb
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_tpconfig
@@ -528,6 +536,7 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_arping
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_at
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_attr
+file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_augeas
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_awk
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_baz
 file \
@@ -537,6 +546,7 @@
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bittorrent
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bogofilter
+file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bpython
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bzip2
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bzr
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cal
@@ -554,6 +564,7 @@
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_chkconfig
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_chmod
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_chown
+file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_chsh
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_clay
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_comm
 file \
@@ -594,6 +605,7 @@
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dmidecode
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_domains
+file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dsh
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_du
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dvi
 file \
@@ -723,6 +735,7 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_module
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_monotone
+file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_moosic
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mosh
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mount
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mpc
@@ -750,6 +763,7 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_npm
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_nslookup
+file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_od
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_other_accounts
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pack
@@ -1101,8 +1115,6 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_ulimit
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_unhash
 file \
-    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_unsetopt
-file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_user_math_func
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_value
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_vared
@@ -1132,7 +1144,7 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/compinit
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/compinstall
 file \
-    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/openSUSE/_SuSEconfig
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/openSUSE/_SUSEconfig
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/openSUSE/_hwinfo
 file \
@@ -1357,6 +1369,7 @@
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/down-line-or-beginning-search
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/edit-command-line
+file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/expand-absolute-path
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/forward-word-match
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/history-beginning-search-menu
@@ -1387,6 +1400,7 @@
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/quote-and-complete-word
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/read-from-minibuffer
+file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/replace-argument
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/replace-string
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/replace-string-again
@@ -1405,6 +1419,7 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/url-quote-magic
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/which-command
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/zed-set-file-name
+file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/zcalc-auto-insert
 file path=usr/share/zsh/$(COMPONENT_VERSION)/help/alias
 link path=usr/share/zsh/$(COMPONENT_VERSION)/help/autoload target=functions
 file path=usr/share/zsh/$(COMPONENT_VERSION)/help/bg