Merge pull request #164 from kou/denyhosts-make-buildable

DenyHosts: make buildable

specs/denyhosts/denyhosts-2.6-regex.patch

@@ -0,0 +1,17 @@
+diff -ur a/DenyHosts/regex.py b/DenyHosts/regex.py
+--- a/DenyHosts/regex.py	2006-12-07 13:47:04.000000000 -0600
++++ b/DenyHosts/regex.py	2007-06-19 18:51:54.000000000 -0500
+@@ -17,11 +17,11 @@
+
+ FAILED_ENTRY_REGEX4 = re.compile(r"""Authentication failure for (?P<user>.*) .*from (?P<host>.*)""")
+
+-FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P<user>.*) .*from (?P<host>.*) not allowed because none of user's groups are listed in AllowGroups""")
++FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P<user>.*) .*from (?P<host>.*) not allowed because none of user's groups are listed in AllowGroups$""")
+
+ FAILED_ENTRY_REGEX6 = re.compile(r"""Did not receive identification string .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""")
+
+-FAILED_ENTRY_REGEX7 = re.compile(r"""User (?P<user>.*) not allowed because not listed in AllowUsers""")
++FAILED_ENTRY_REGEX7 = re.compile(r"""User (?P<user>.*) .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) not allowed because not listed in AllowUsers""")
+
+
+ # these are reserved for future versions

specs/denyhosts/denyhosts.spec

@@ -9,12 +9,12 @@
 Summary: Scan ssh server logs and block hosts
 Name: denyhosts
 Version: 2.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://denyhosts.sourceforge.net/
 
-Source: http://dl.sf.net/denyhosts/%{real_name}-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/%{name}/%{real_name}-%{version}.tar.gz
 
 Patch0: denyhosts-2.6-regex.patch
 
@@ -70,10 +70,16 @@ fi
 %doc CHANGELOG.txt daemon-control-dist denyhosts.cfg-dist LICENSE.txt README.txt
 %{_bindir}/denyhosts.py*
 %{python_sitearch}/DenyHosts/
+%{python_sitearch}/DenyHosts-*.egg-info
 %config (noreplace) /etc/denyhosts/denyhosts.cfg
 /etc/init.d/denyhosts
 
 %changelog
+* Mon May 7 2012 Kouhei Sutou <kou@clear-code.com> - 2.6-5
+- Fixed download URL at SF.net.
+- Added missing imported regex security patch from Fedora.
+- Added .egg-info into .rpm.
+
 * Wed Sep 09 2009 Steve Huff <shuff@vecna.org> - 2.6-4
 - imported regex security patch from Fedora
   https://bugzilla.redhat.com/show_bug.cgi?id=244943