Your message dated Wed, 05 Apr 2006 11:33:57 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#359992: fixed in zsh 4.3.2-6
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--- Begin Message ---
Package: zsh
Version: 4.3.2-2
Severity: wishlist
Tags: patch

Hi!

The current _hosts completion does not use IP addresses, and
completes using host names alone. This patch optionally enables the
inclusion of IP addresses by a boolean style (the default behaviour
is unchanged). Further, currently only ~/.ssh/known_hosts file is
read. Added /etc/ssh/known_hosts to this list, if present. Further,
observing that any plain list of hostnames would anyway be
parseable, and that ~"`id -nu`"/.ssh/known_hosts and not
~/.ssh/known_hosts might be readable under sudo environments, made
the list of known host files customizable (defaulting to the two
files initially specified). Here is the patch:



--- _hosts      2006-03-30 05:00:08.000000000 +0530
+++ _hosts.new  2006-03-30 05:21:37.000000000 +0530
@@ -2,29 +2,52 @@
 
 # avoid calling variable "hosts", it's an obvious candidate for use in
 #  zstyle -e '*' hosts 'reply=($hosts)'
-local expl _hosts tmp
+local expl _hosts tmp useip
 
 if ! zstyle -a ":completion:${curcontext}:hosts" hosts _hosts; then
   if (( $+_cache_hosts == 0 )); then
     # uniquify
     typeset -gUa _cache_hosts
+    local ipstrip='[:blank:]#[^[:blank:]]#'
+
+    # This boolean style determines whether hosts completes IP addresses. The
+    # default is no (not using IP addresses).
+    zstyle -t ":completion:${curcontext}:hosts" use-ip && useip=yes
+    [[ -n $useip ]] && ipstrip=
     if (( ${+commands[getent]} )); then
       # pws: we were using the horrible ": ${(A)...:=}" syntax to assign
       # to _cache_hosts, overriding the typeset as well as being unreadable
       # and having obscure splitting behaviour.  Why?  We've just
       # tested _cache_hosts doesn't exist.
-      _cache_hosts=(${(s: :)${(ps:\t:)${(f)~~"$(_call_program hosts getent 
hosts 2>/dev/null)"}##[:blank:]#[^[:blank:]]#}})
+      _cache_hosts=(${(s: :)${(ps:\t:)${(f)~~"$(_call_program hosts getent 
hosts 2>/dev/null)"}##${~ipstrip}}})
     else
-      _cache_hosts=(${(s: 
:)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}})
+      _cache_hosts=(${(s: 
:)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##${~ipstrip}}})
       if (( ${+commands[ypcat]} )) &&
        tmp=$(_call_program hosts ypcat hosts.byname 2>/dev/null); then
-        _cache_hosts+=( ${=${(f)tmp}##[:blank:]#[^[:blank:]]#} ) # If you use 
YP
+        _cache_hosts+=( ${=${(f)tmp}##${~ipstrip}} ) # If you use YP
       fi
     fi
 
-    if [[ -r ~/.ssh/known_hosts ]]; then
-      _cache_hosts+=(${${${(u)${(f)"$(<~/.ssh/known_hosts)"}%%[ 
,|#]*}:#(#s)[0-9]##.[0-9]##.[0-9]##.[0-9]##(#e)}:#(#s)[0-9a-f:]##(#e)})
-    fi
+    local khostfile
+    typeset -Ua khostfiles
+
+    # This style specifies a list of files to look up for host names and IP
+    # addresses, if asked to. The files can contain comma separated host names
+    # and IP's, and any text on a line after the first whitespace,| or # is
+    # discarded. ssh's known_hosts files are thus supported. This style 
defaults
+    # to the list /etc/ssh/ssh_known_hosts, ~/.ssh/known_hosts
+    zstyle -a ":completion:${curcontext}:hosts" known-hosts-files khostfiles ||
+    khostfiles=(/etc/ssh/ssh_known_hosts ~/.ssh/known_hosts)
+
+    for khostfile in $khostfiles; do
+      if [[ -r $khostfile ]]; then
+        khosts=(${(s:,:)${(j:,:)${(u)${(f)"$(<$khostfile)"}%%[ |#]*}}})
+        if [[ -z $useip ]]; then
+         
khosts=(${${khosts:#(#s)[0-9]##.[0-9]##.[0-9]##.[0-9]##(#e)}:#(#s)[0-9a-f:]##(#e)})
+        fi
+        _cache_hosts+=($khosts)
+      fi
+    done
   fi
 
   _hosts=( "[EMAIL PROTECTED]" )
Regards,
Ramkumar.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (101, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/dash
Kernel: Linux 2.6.15-archck2
Locale: LANG=en_IN, LC_CTYPE=en_IN (charmap=UTF-8)

Versions of packages zsh depends on:
ii  debconf [debconf-2.0]         1.4.72     Debian configuration management sy
ii  libc6                         2.3.6-3    GNU C Library: Shared libraries an
ii  libncurses5                   5.5-1      Shared libraries for terminal hand

Versions of packages zsh recommends:
ii  libcap1                       1:1.10-14  support for getting/setting POSIX.
ii  libpcre3                      6.4-1.1    Perl 5 Compatible Regular Expressi

-- no debconf information

-- 
WARN_(accel)("msg null; should hang here to be win compatible\n");
                                   -- WINE source code

--- End Message ---
--- Begin Message ---
Source: zsh
Source-Version: 4.3.2-6

We believe that the bug you reported is fixed in the latest version of
zsh, which is due to be installed in the Debian FTP archive:

zsh-dbg_4.3.2-6_sparc.deb
  to pool/main/z/zsh/zsh-dbg_4.3.2-6_sparc.deb
zsh-dev_4.3.2-6_sparc.deb
  to pool/main/z/zsh/zsh-dev_4.3.2-6_sparc.deb
zsh-doc_4.3.2-6_all.deb
  to pool/main/z/zsh/zsh-doc_4.3.2-6_all.deb
zsh-static_4.3.2-6_sparc.deb
  to pool/main/z/zsh/zsh-static_4.3.2-6_sparc.deb
zsh_4.3.2-6.diff.gz
  to pool/main/z/zsh/zsh_4.3.2-6.diff.gz
zsh_4.3.2-6.dsc
  to pool/main/z/zsh/zsh_4.3.2-6.dsc
zsh_4.3.2-6_sparc.deb
  to pool/main/z/zsh/zsh_4.3.2-6_sparc.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Clint Adams <[EMAIL PROTECTED]> (supplier of updated zsh package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Fri, 31 Mar 2006 09:09:31 -0500
Source: zsh
Binary: zsh zsh-dev zsh-static zsh-dbg zsh-doc
Architecture: source sparc all
Version: 4.3.2-6
Distribution: unstable
Urgency: medium
Maintainer: Clint Adams <[EMAIL PROTECTED]>
Changed-By: Clint Adams <[EMAIL PROTECTED]>
Description: 
 zsh        - A shell with lots of features
 zsh-dbg    - A shell with lots of features (development files)
 zsh-dev    - A shell with lots of features (development files)
 zsh-doc    - zsh documentation - info/HTML format
 zsh-static - A shell with lots of features (static link)
Closes: 339635 356676 359992
Changes: 
 zsh (4.3.2-6) unstable; urgency=medium
 .
   * Add completion for analyseplugin (ladspa) from R.Ramkumar.
     closes: #356676.
   * Patch from R.Ramkumar to fix "zsh-mime-handler used even in
     the case of executable files".  closes: #339635.
   * Patch from R.Ramkumar to enable use of IP addresses and
     multiple host files in _hosts closes: #359992.
Files: 
 feaea010cc0f9e1a15c93e1732047b27 722 shells optional zsh_4.3.2-6.dsc
 c41ca3ae24459f5ed006875d86e0a14e 260625 shells optional zsh_4.3.2-6.diff.gz
 8a11719c9487cc6b3fc4bcc9ef20cfd5 700892 shells optional zsh-doc_4.3.2-6_all.deb
 782e922e3f8d3d8a65222e1d0ea32281 2230118 shells optional zsh_4.3.2-6_sparc.deb
 c1d81d6abeb653c7b0f2b0107d295115 735196 devel extra zsh-dbg_4.3.2-6_sparc.deb
 ae62e0a6e7f3bde0db2a10589cacf9d3 803218 shells optional 
zsh-static_4.3.2-6_sparc.deb
 529438b528113b51b29940efbee68b36 62004 libdevel optional 
zsh-dev_4.3.2-6_sparc.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Debian!

iD8DBQFENAkm5m0u66uWM3ARAlxOAKCborVsg9NeOcT8hv/V4F6pCi8dugCeLB6r
oK+wqzVS7q/9y+YZA2VF/jo=
=wFiQ
-----END PGP SIGNATURE-----


--- End Message ---

Reply via email to