components/shell/zsh/patches/completion.patch

   1 --- zsh-5.3.1/Completion/Solaris/Command/_flowadm.~1~   2016-08-27 22:54:44.000000000 +0300
   2 +++ zsh-5.3.1/Completion/Solaris/Command/_flowadm       2017-05-03 13:38:46.625666240 +0300
   3 @@ -12,7 +12,7 @@
   4    reset-flowprop show-flowprop
   5  )
   6  tr=( tcp udp sctp icmp icmpv6 )
   7 -props=( maxbw )
   8 +props=( maxbw priority )
   9
  10  if [[ $service == "flowadm" ]]; then
  11         _arguments -C -A "-*" \
  12 @@ -33,7 +33,7 @@
  13
  14         ("show-flow")
  15         _arguments -A "-*" \
  16 -               '-o[specify field to display]:field:(flow link ipaddr proto port dsfield)' \
  17 +               '-o[specify field to display]:field:(flow link ipaddr proto lport rport dsfield)' \
  18                 '-p[parsable output]' \
  19                 '-P[persistent flow property information]' \
  20                 - set1 \
  21 --- zsh-5.0.5/Completion/Solaris/Command/_ipadm Wed Nov 27 11:00:18 2013
  22 +++ zsh-5.0.5/Completion/Solaris/Command/_ipadm Fri Mar 28 16:02:55 2014
  23 @@ -1,5 +1,5 @@
  24  #compdef ipadm
  25 -# Synced with the S11U1 build 19 man page
  26 +# Synced with the S11U2 build 34 man page
  27
  28  _ipadm_ifs() {
  29         local -a extra
  30 @@ -122,11 +122,13 @@
  31
  32         addrobj_properties=(
  33                 "addrobj" "type" "state" "current" "persistent" "addr"
  34 -               "cid-type" "cid-value" "begin" "expire" "renew"
  35 +               "cid-type" "cid-value" "begin" "expire" "renew" "vrrp-router"
  36         )
  37
  38 -       proto_ipv4_properties=( "hostmodel" "ttl" "forwarding" )
  39 -       proto_ipv6_properties=( "hostmodel" "hoplimit" "forwarding" )
  40 +       proto_ipv4_properties=( "arp_publish_count" "arp_publish_interval" "hostmodel"
  41 +               "ttl" "forwarding" "ndp_unsolicit_count" "ndp_unsolicit_interval" "send_redirects" )
  42 +       proto_ipv6_properties=( "arp_publish_count" "arp_publish_interval" "hostmodel"
  43 +               "hoplimit" "forwarding" "ndp_unsolicit_count" "ndp_unsolicit_interval" "send_redirects" )
  44         proto_tcp_properties=( "cong_default" "cong_enabled" "ecn" "extra_priv_ports" "max_buf" "recv_buf"
  45                 "send_buf" "sack" "smallest_anon_port" "largest_anon_port" "smallest_nonpriv_port" )
  46         proto_udp_properties=( "extra_priv_ports" "max_buf" "recv_buf" "send_buf" "smallest_anon_port"
  47 @@ -265,7 +267,7 @@
  48                         case ${opt_args[-T]#-T:} in
  49                         ("static:"*)
  50                                 local -a addrthingsv4
  51 -                               addrthingsv4=( "local:address: " "remote:address: ")
  52 +                               addrthingsv4=( "local:address: " "remote:address: " )
  53                                 _arguments -A "-*" \
  54                                 '(-d --down)'{-d,--down}'[Address should be marked down]' \
  55                                 '(-a --address)'{-a,--address}'[Address specification]:address:_values -s , "address" $addrthingsv4' \
  56 @@ -281,7 +283,7 @@
  57
  58                         ("addrconf:"*)
  59                                 local -a addrthingsv6 statefulness
  60 -                               addrthingsv6=( "local:interface id: " "remote:interface id: ")
  61 +                               addrthingsv6=( "local:interface id: " "remote:interface id: " )
  62                                 statefulness=( "stateful:statefulness:(yes no)" "stateless:statelessness:(yes no)" )
  63                                 _arguments -A "-*" \
  64                                 '(-i --interface-id)'{-i,--interface-id}'[Interface ID]:address:_values -s , "interface id" $addrthingsv6' \
  65 @@ -288,6 +290,16 @@
  66                                 '(-p --prop)'{-p,--prop}'[Statefulness configuration]:statefulness configuration:_values -s , "statefulness" $statefulness' \
  67                                 ':address object name:_ipadm_addrobjs_or_ifs'
  68                                 ;;
  69 +
  70 +                       ("vrrp:"*)
  71 +                               local -a addrthingsvrrp
  72 +                               addrthingsvrrp=( "local:address: " )
  73 +                               _arguments -A "-*" \
  74 +                               '(-a --address)'{-a,--address}'[Address specification]:address:_values -s , "address" $addrthingsvrrp' \
  75 +                               '-n[VRRP router name]:router name: ' \
  76 +                               ':address object name:_ipadm_addrobjs_or_ifs'
  77 +                               ;;
  78 +
  79                         (*)
  80                                 _wanted commands expl "address type" compadd static dhcp addrconf
  81                                 ;;
  82 --- a/Completion/Solaris/Command/_svcs
  83 +++ b/Completion/Solaris/Command/_svcs
  84 @@ -1,4 +1,5 @@
  85  #compdef svcs
  86 +# Synced with the S11U2 build 34 man page
  87
  88  local -a cols
  89
  90 @@ -12,17 +13,18 @@ cols=(
  91  )
  92
  93  _arguments -s \
  94 -  '(-l -x -d -D)-a[list all instances]' \
  95 -  '(-l -x -D -a -R)-d[list dependencies]' \
  96 -  '(-l -x -d -a -R)-D[list dependents]' \
  97 -  '(-l -x)-H[suppress header line]' \
  98 +  '(-l -L -x -d -D)-a[list all instances]' \
  99 +  '(-l -L -x -D -a -R)-d[list dependencies]' \
 100 +  '(-l -L -x -d -a -R)-D[list dependents]' \
 101 +  '(-l -L -x)-H[suppress header line]' \
 102    '(-x -d -D -a -R -s)-l[print detailed status about services and instances]' \
 103 -  '(-l -x)-o[display specific columns]:column:_values -s , "column" ${^cols/\:/[}\]' \
 104 -  '(-l -x)-p[list processes]' \
 105 -  '(-l -x -d -D)-R[list services with the given restarter]:instance FMRI:_svcs_fmri -i' \
 106 -  '(-l -x)-s[sort by a column]:column:(($cols))' \
 107 -  '(-l -x)-S[reverse sort by a column]:column:(($cols))' \
 108 +  '(-a -d -D -H -l -o -p -R -s -S)-L[print path to service logfile]' \
 109 +  '(-l -L -x)-o[display specific columns]:column:_values -s , "column" ${^cols/\:/[}\]' \
 110 +  '(-l -L -x)-p[list processes]' \
 111 +  '(-l -L -x -d -D)-R[list services with the given restarter]:instance FMRI:_svcs_fmri -i' \
 112 +  '(-l -L -x)-s[sort by a column]:column:(($cols))' \
 113 +  '(-l -L -x)-S[reverse sort by a column]:column:(($cols))' \
 114    '-v[verbose columns]' \
 115    '(-l)-x[display explanation for service states]' \
 116 -  '(-l -x)-\?[print help]' \
 117 +  '(-l -L -x)-\?[print help]' \
 118    '*:FMRI or pattern:_svcs_fmri -i'
 119 --- zsh-5.9/Completion/Solaris/Command/_svcadm.orig     2022-05-08 08:18:22.000000000 +0000
 120 +++ zsh-5.9/Completion/Solaris/Command/_svcadm  2022-05-16 16:39:45.089063528 +0000
 121 @@ -22,16 +22,16 @@
 122    (enable)
 123      _arguments -A "-*" \
 124        '-r[recursively enable dependencies]' \
 125 -      '-s[wait for service to come online]' \
 126 -      '-T[timeout for -s]:timeout (seconds)' \
 127 +      '-s[Synchronous mode: wait for service to come online]' \
 128 +      '-T[Timeout for synchronous mode]:seconds:' \
 129        '-t[state change is temporary]' \
 130        '*:instance FMRI:_svcs_fmri -i'
 131      ;;
 132
 133    (disable)
 134      _arguments -A "-*" \
 135 -      '-s[wait for service to become disabled]' \
 136 -      '-T[timeout for -s]:timeout (seconds)' \
 137 +      '-s[Synchronous mode: wait for service to become disabled]' \
 138 +      '-T[Timeout for synchronous mode]:seconds:' \
 139        '-t[state change is temporary]' \
 140        '*:instance FMRI:_svcs_fmri -i'
 141    ;;
 142 @@ -39,8 +39,8 @@
 143    (mark)
 144      _arguments -A "-*" \
 145        '-I[change state immediately]' \
 146 -      "-s[wait for service to reach the new state]" \
 147 -      '-T[timeout for -s]:timeout (seconds)' \
 148 +      "-s[Synchronous mode: wait for service to reach the new state]" \
 149 +      '-T[Timeout for synchronous mode]:seconds:' \
 150        '-t[state change is temporary]' \
 151        ':state:(degraded maintenance)' \
 152        ':instance FMRI:_svcs_fmri -i'
 153 @@ -48,15 +48,15 @@
 154
 155    (restart|refresh|clear)
 156      _arguments \
 157 -      "-s[wait for service to $service]" \
 158 -      '-T[timeout for -s]:timeout (seconds)' \
 159 +      "-s[Synchronous mode: wait for service to $service]" \
 160 +      '-T[Timeout for synchronous mode]:seconds:' \
 161        '*:instance FMRI:_svcs_fmri -i'
 162    ;;
 163
 164    (delegate)
 165      _arguments -A "-*" \
 166 -      '-s[wait for instances to come online]' \
 167 -      '-T[timeout for -s]:timeout (seconds)' \
 168 +      '-s[Synchronous mode: wait for instances to come online]' \
 169 +      '-T[Timeout for synchronous mode]:seconds:' \
 170        ':restarter FMRI:_svcs_fmri -r' \
 171        '*:FMRI:_svcs_fmri -i'
 172    ;;
 173 @@ -64,8 +64,8 @@
 174    (milestone)
 175      _arguments -A "-*" \
 176        '-d[make milestone the default]' \
 177 -      '-s[wait for the transition to the new milestone]' \
 178 -      '-T[timeout for -s]:timeout (seconds)' \
 179 +      '-s[Synchronous mode: wait for the transition to the new milestone]' \
 180 +      '-T[Timeout for synchronous mode]:seconds:' \
 181        '*:milestone FMRI:_svcs_fmri -m'
 182    ;;
 183