*** INSTALL.orig	2007-12-16 17:07:02.000000000 -0800
--- INSTALL	2007-12-27 10:04:52.000000000 -0800
***************
*** 104,108 ****
      /etc/logwatch/scripts/services/blockhosts
      /usr/bin/bhrss.py
!     /usr/bin/blockhosts.py
      /usr/share/doc/BlockHosts-2.2.0/
      /usr/share/doc/BlockHosts-2.2.0/CHANGES
--- 104,108 ----
      /etc/logwatch/scripts/services/blockhosts
      /usr/bin/bhrss.py
!     /usr/local/bin/blockhosts.py
      /usr/share/doc/BlockHosts-2.2.0/
      /usr/share/doc/BlockHosts-2.2.0/CHANGES
***************
*** 197,201 ****
  # line to signal continuation:
  
! sshd, proftpd, vsftpd: ALL: spawn /usr/bin/blockhosts.py \
       --echo "%c-%s" --ipblock=iptables \
       --whitelist="10\..*,127.0.0.1" --blacklist="192.168.1.1,192.168.1.2" \
--- 197,201 ----
  # line to signal continuation:
  
! sshd, proftpd, vsftpd: ALL: spawn /usr/local/bin/blockhosts.py \
       --echo "%c-%s" --ipblock=iptables \
       --whitelist="10\..*,127.0.0.1" --blacklist="192.168.1.1,192.168.1.2" \
***************
*** 227,231 ****
  # for non-verbose, with identification, to syslog only (/var/log/messages),
  # triggered on any service (using ALL as first word):
! #ALL: ALL: spawn /usr/bin/blockhosts.py --echo "%c-%s" & : allow
  #----
  # To test hosts.allow, and to find out exact names of SSH/FTP services,
--- 227,231 ----
  # for non-verbose, with identification, to syslog only (/var/log/messages),
  # triggered on any service (using ALL as first word):
! #ALL: ALL: spawn /usr/local/bin/blockhosts.py --echo "%c-%s" & : allow
  #----
  # To test hosts.allow, and to find out exact names of SSH/FTP services,
***************
*** 235,239 ****
  # IMPORTANT: after your test is done, remove this line from hosts.allow!
  # Otherwise everyone will always have access.
! #ALL : ALL: spawn (/usr/bin/blockhosts.py --verbose --echo "%c-%s" >> /var/log/blockhosts.log 2>&1 )& : allow
  
  # -------------------------------------------------------------------------
--- 235,239 ----
  # IMPORTANT: after your test is done, remove this line from hosts.allow!
  # Otherwise everyone will always have access.
! #ALL : ALL: spawn (/usr/local/bin/blockhosts.py --verbose --echo "%c-%s" >> /var/log/blockhosts.log 2>&1 )& : allow
  
  # -------------------------------------------------------------------------
***************
*** 246,250 ****
  for example:
  
! sshd: ALL: spawn /usr/bin/blockhosts.py --verbose --mail & : allow
  
  # -------------------------------------------------------------------------
--- 246,250 ----
  for example:
  
! sshd: ALL: spawn /usr/local/bin/blockhosts.py --verbose --mail & : allow
  
  # -------------------------------------------------------------------------
***************
*** 270,274 ****
  
  Example:
! sshd: ALL: spawn /usr/bin/blockhosts.py --echo "%c-%s" --ipblock="ip route" & : allow
  
  Root permission for the run of blockhosts.py script is needed, since
--- 270,274 ----
  
  Example:
! sshd: ALL: spawn /usr/local/bin/blockhosts.py --echo "%c-%s" --ipblock="ip route" & : allow
  
  Root permission for the run of blockhosts.py script is needed, since