[arch-commits] CVS update of extra/network/denyhosts (3 files)

[Simo Leone]

    Date: Monday, February 11, 2008 @ 20:17:09
  Author: simo
    Path: /home/cvs-extra/extra/network/denyhosts

   Added: regex-fixes.diff (1.1)
Modified: PKGBUILD (1.7 -> 1.8)
 Removed: log-injection-fix.diff (1.1)

upgpkg: denyhosts 2.6-3


------------------------+
 PKGBUILD               |   13 ++++++-------
 log-injection-fix.diff |   11 -----------
 regex-fixes.diff       |   22 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 18 deletions(-)


Index: extra/network/denyhosts/PKGBUILD
diff -u extra/network/denyhosts/PKGBUILD:1.7 extra/network/denyhosts/PKGBUILD:1.8
--- extra/network/denyhosts/PKGBUILD:1.7	Tue Feb  5 03:58:25 2008
+++ extra/network/denyhosts/PKGBUILD	Mon Feb 11 20:17:09 2008
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD,v 1.7 2008/02/05 08:58:25 simo Exp $
+# $Id: PKGBUILD,v 1.8 2008/02/12 01:17:09 simo Exp $
 # Contributor : phrakture < aaron m griffin :: gmail-com >
 # Maintainer: simo <simo at archlinux.org>
 pkgname=denyhosts
 pkgver=2.6
-pkgrel=2
+pkgrel=3
 pkgdesc="DenyHosts is a script to help thwart ssh server attacks"
 arch=('i686' 'x86_64')
 url="http://denyhosts.sourceforge.net/"
 license=('GPL')
 depends=('python')
 backup=('etc/denyhosts/denyhosts.cfg')
-source=(http://dl.sourceforge.net/sourceforge/$pkgname/DenyHosts-$pkgver.tar.gz \
+source=(http://switch.dl.sourceforge.net/sourceforge/$pkgname/DenyHosts-$pkgver.tar.gz \
         denyhosts.cfg \
         denyhosts \
         archify.diff
-		log-injection-fix.diff)
-
+        regex-fixes.diff)
 md5sums=('fc2365305a9402886a2b0173d1beb7df'
          '5352744bf34b29bfc95c54bfb14eb3e3'
          '0f186257e2473b8710c9b9e9f601ff19'
          'ab8b175618f76b53c9cc81355cad0f86'
-         'a68b0405e2a10f20232193ced183c73b')
+         '3171c2fd783321af724a8539151bbd8d')
 
 build()
 {
   cd $startdir/src/DenyHosts-$pkgver
   patch -p1 < $startdir/src/archify.diff
-  patch -p1 < $startdir/src/log-injection-fix.diff 
+  patch -p1 < $startdir/src/regex-fixes.diff 
   python setup.py install --root=$startdir/pkg
   install -D -m644 $startdir/src/denyhosts.cfg $startdir/pkg/etc/denyhosts/denyhosts.cfg
   install -D -m755 $startdir/src/denyhosts $startdir/pkg/etc/rc.d/denyhosts
Index: extra/network/denyhosts/log-injection-fix.diff
diff -u extra/network/denyhosts/log-injection-fix.diff:1.1 extra/network/denyhosts/log-injection-fix.diff:removed
--- extra/network/denyhosts/log-injection-fix.diff:1.1	Tue Feb  5 03:58:25 2008
+++ extra/network/denyhosts/log-injection-fix.diff	Mon Feb 11 20:17:09 2008
@@ -1,11 +0,0 @@
---- DenyHosts-2.6/DenyHosts/regex-old.py	2008-01-29 03:07:51.000000000 +0100
-+++ DenyHosts-2.6/DenyHosts/regex.py	2008-01-29 03:07:53.000000000 +0100
-@@ -17,7 +17,7 @@
- 
- 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})""")
- 
Index: extra/network/denyhosts/regex-fixes.diff
diff -u /dev/null extra/network/denyhosts/regex-fixes.diff:1.1
--- /dev/null	Mon Feb 11 20:17:09 2008
+++ extra/network/denyhosts/regex-fixes.diff	Mon Feb 11 20:17:09 2008
@@ -0,0 +1,22 @@
+--- DenyHosts-2.6/DenyHosts/regex-old.py	2008-01-29 03:07:51.000000000 +0100
++++ DenyHosts-2.6/DenyHosts/regex.py	2008-01-29 03:07:53.000000000 +0100
+@@ -17,7 +17,7 @@
+ 
+ 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})""")
+ 
+--- DenyHosts-2.6/DenyHosts/regex.py	2007-04-23 17:22:21.000000000 +0100
++++ DenyHosts-2.6/DenyHosts/regex.py	2007-04-23 17:24:35.000000000 +0100
+@@ -21,7 +21,7 @@
+ 
+ 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