denyhosts: 2.5 -> 2.6

cleaned up README
edited patch and Pkgfile to remove the .py off files in /usr/bin

5 files changed, 97 insertions, 55 deletions

diff --git a/denyhosts/.footprint b/denyhosts/.footprint
index b846260d0..bcf0999e6 100644
--- a/denyhosts/.footprint
+++ b/denyhosts/.footprint
@@ -5,54 +5,54 @@ drwxr-xr-x	root/root	etc/rc.d/
 lrwxrwxrwx	root/root	etc/rc.d/denyhosts -> /usr/share/denyhosts/daemon-control
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/denyhosts.py
+-rwxr-xr-x	root/root	usr/bin/denyhosts
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python2.5/
-drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts-2.5-py2.5.egg-info
-drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/DenyHosts/
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/__init__.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/allowedhosts.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/allowedhosts.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/constants.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/constants.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/counter.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/counter.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/daemon.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/daemon.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/deny_hosts.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/deny_hosts.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/denyfileutil.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/denyfileutil.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/filetracker.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/filetracker.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/lockfile.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/lockfile.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/loginattempt.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/loginattempt.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/old-daemon.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/old-daemon.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/plugin.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/plugin.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/prefs.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/prefs.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/purgecounter.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/purgecounter.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/python_version.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/python_version.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/regex.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/regex.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/report.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/report.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/restricted.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/restricted.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/sync.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/sync.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/util.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/util.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/version.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/DenyHosts/version.pyc
+drwxr-xr-x	root/root	usr/lib/python2.4/
+drwxr-xr-x	root/root	usr/lib/python2.4/site-packages/
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts-2.6-py2.4.egg-info
+drwxr-xr-x	root/root	usr/lib/python2.4/site-packages/DenyHosts/
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/allowedhosts.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/allowedhosts.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/constants.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/constants.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/counter.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/counter.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/daemon.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/daemon.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/deny_hosts.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/deny_hosts.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/denyfileutil.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/denyfileutil.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/filetracker.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/filetracker.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/lockfile.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/lockfile.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/loginattempt.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/loginattempt.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/old-daemon.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/old-daemon.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/plugin.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/plugin.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/prefs.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/prefs.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/purgecounter.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/purgecounter.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/python_version.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/python_version.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/regex.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/regex.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/report.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/report.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/restricted.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/restricted.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/sync.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/sync.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/util.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/util.pyc
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/version.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/DenyHosts/version.pyc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/denyhosts/
 -rwx------	root/root	usr/share/denyhosts/daemon-control
diff --git a/denyhosts/.md5sum b/denyhosts/.md5sum
index 73e88e555..f9c692964 100644
--- a/denyhosts/.md5sum
+++ b/denyhosts/.md5sum
@@ -1,2 +1,2 @@
-b33f0cdae6448ae559c5f22dbffe59f2  DenyHosts-2.5.tar.gz
-8c79b4c44d01ffd14482d317f5eb4e74  denyhosts-2.5-config.patch
+fc2365305a9402886a2b0173d1beb7df  DenyHosts-2.6.tar.gz
+a0abe102add4420e766cc90d0709f425  denyhosts-2.6-config.patch
diff --git a/denyhosts/Pkgfile b/denyhosts/Pkgfile
index 2d5ad2622..bbfaa31d8 100644
--- a/denyhosts/Pkgfile
+++ b/denyhosts/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: python
 
 name=denyhosts
-version=2.5
+version=2.6
 release=1
 source=(http://dl.sourceforge.net/sourceforge/$name/DenyHosts-$version.tar.gz \
 	$name-$version-config.patch)
@@ -15,7 +15,7 @@ build() {
 	patch -p0 -i $SRC/$name-$version-config.patch
 	python setup.py install --root=$PKG
 	
-	rm -fr $PKG/usr/share/denyhosts/*.txt
+	rm $PKG/usr/share/denyhosts/*.txt
 	
 	install -d \
 		$PKG/etc/ \
@@ -30,7 +30,8 @@ build() {
 	
 	chmod 700 $PKG/usr/share/denyhosts/daemon-control
 	
-	ln -sf /usr/share/denyhosts/daemon-control $PKG/etc/rc.d/denyhosts
+	ln -s /usr/share/denyhosts/daemon-control $PKG/etc/rc.d/denyhosts
 	rm $PKG/usr/share/denyhosts/plugins/README.contrib
+	mv $PKG/usr/bin/denyhosts.py $PKG/usr/bin/denyhosts
 }
 
diff --git a/denyhosts/README b/denyhosts/README
index 764159440..b00c75eed 100644
--- a/denyhosts/README
+++ b/denyhosts/README
@@ -1,5 +1,3 @@
-# $Id:	
-
 REQUIREMENTS:
 
 PRECAUTION:
@@ -31,5 +29,5 @@ Edit /etc/hosts.deny and comment out the "ALL: ALL: DENY" part, also the "#End o
 
 (note the config in inetd.conf dosn't seem to be right or needed? see messages apon boot up, any corections email me :) )
 
-Danny Rawlins, <romster@shortcircuit.net.au>
+Danny Rawlins, <romster at shortcircuit dot net dot au
 
diff --git a/denyhosts/denyhosts-2.6-config.patch b/denyhosts/denyhosts-2.6-config.patch
new file mode 100644
index 000000000..68de8a41d
--- /dev/null
+++ b/denyhosts/denyhosts-2.6-config.patch
@@ -0,0 +1,43 @@
+--- daemon-control-dist~	2006-04-22 09:04:43.000000000 +1000
++++ daemon-control-dist	2007-01-03 01:47:12.000000000 +1100
+@@ -11,9 +11,9 @@
+ #### Edit these to suit your configuration ####
+ ###############################################
+ 
+-DENYHOSTS_BIN   = "/usr/bin/denyhosts.py"
+-DENYHOSTS_LOCK  = "/var/lock/subsys/denyhosts"
+-DENYHOSTS_CFG   = "/usr/share/denyhosts/denyhosts.cfg"
++DENYHOSTS_BIN   = "/usr/bin/denyhosts"
++DENYHOSTS_LOCK  = "/var/run/denyhosts.pid"
++DENYHOSTS_CFG   = "/etc/denyhosts/denyhosts.conf"
+ 
+ PYTHON_BIN      = "/usr/bin/env python"
+ 
+--- denyhosts.cfg-dist~	2006-08-21 00:09:57.000000000 +1000
++++ denyhosts.cfg-dist	2007-01-03 01:44:25.000000000 +1100
+@@ -8,8 +8,11 @@
+ # The file to process can be overridden with the --file command line
+ # argument
+ #
++# CRUX
++SECURE_LOG = /var/log/auth
++#
+ # Redhat or Fedora Core:
+-SECURE_LOG = /var/log/secure
++#SECURE_LOG = /var/log/secure
+ #
+ # Mandrake, FreeBSD or OpenBSD: 
+ #SECURE_LOG = /var/log/auth.log
+@@ -191,8 +194,11 @@
+ # and deleted upon exit.  This ensures that only one instance is
+ # running at a time.
+ #
++# CRUX
++LOCK_FILE = /var/run/denyhosts.pid
++#
+ # Redhat/Fedora:
+-LOCK_FILE = /var/lock/subsys/denyhosts
++#LOCK_FILE = /var/lock/subsys/denyhosts
+ #
+ # Debian
+ #LOCK_FILE = /var/run/denyhosts.pid