diff options
| author | tron <tron> | 2014-02-11 20:50:43 +0000 |
|---|---|---|
| committer | tron <tron> | 2014-02-11 20:50:43 +0000 |
| commit | 062662456e4d7a51e12103f5803a7acf122a52f1 (patch) | |
| tree | df08435cd92863e91703cc1afac38331f8eaa75c | |
| parent | c157ef3c478a77705fb27459409b9c6e1ec69af9 (diff) | |
| download | pkgsrc-062662456e4d7a51e12103f5803a7acf122a52f1.tar.gz | |
Pullup ticket #4321 - requested by pettai
security/py-denyhosts: security patch
Revisions pulled up:
- security/py-denyhosts/Makefile 1.11
- security/py-denyhosts/distinfo 1.6
- security/py-denyhosts/patches/patch-af 1.3
---
Module Name: pkgsrc
Committed By: pettai
Date: Tue Feb 4 15:38:16 UTC 2014
Modified Files:
pkgsrc/security/py-denyhosts: Makefile distinfo
pkgsrc/security/py-denyhosts/patches: patch-af
Log Message:
Added DSA-2826-2 fix
| -rw-r--r-- | security/py-denyhosts/Makefile | 4 | ||||
| -rw-r--r-- | security/py-denyhosts/distinfo | 4 | ||||
| -rw-r--r-- | security/py-denyhosts/patches/patch-af | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/security/py-denyhosts/Makefile b/security/py-denyhosts/Makefile index 9add3f46cc8..2bcf6cd5bec 100644 --- a/security/py-denyhosts/Makefile +++ b/security/py-denyhosts/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.9 2013/12/26 23:30:41 pettai Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2014/02/11 20:50:43 tron Exp $ # VER= 2.6 DISTNAME= DenyHosts-${VER} PKGNAME= ${PYPKGPREFIX}-denyhosts-${VER} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=denyhosts/} LICENSE= gnu-gpl-v2 diff --git a/security/py-denyhosts/distinfo b/security/py-denyhosts/distinfo index 8ab50939f59..41f9392c495 100644 --- a/security/py-denyhosts/distinfo +++ b/security/py-denyhosts/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2013/12/29 20:27:55 pettai Exp $ +$NetBSD: distinfo,v 1.5.2.1 2014/02/11 20:50:43 tron Exp $ SHA1 (DenyHosts-2.6.tar.gz) = 02143843cb7c37c986c222b7acc11f7b75eb7373 RMD160 (DenyHosts-2.6.tar.gz) = cab4206af992f5405ed1c9b302341c7b5649c71a @@ -8,4 +8,4 @@ SHA1 (patch-ab) = 3bb578421dc776cd42e769978d09872bc79098e8 SHA1 (patch-ac) = 67eec2ff93ecfffeda2ed92fe7943fa5bc161083 SHA1 (patch-ad) = 744c65a2f4bec4c5553ba6c15f9ff0b45932e6fb SHA1 (patch-ae) = 16f53356508632a8e9f7e905e399614011f7b038 -SHA1 (patch-af) = 4ce30eef4df19715ff2cedae193ea3dd8876c186 +SHA1 (patch-af) = df52c4b0e842ab311b3a698ba29ad7d20bd7fbf0 diff --git a/security/py-denyhosts/patches/patch-af b/security/py-denyhosts/patches/patch-af index 241bebe581c..6b56f29ff5c 100644 --- a/security/py-denyhosts/patches/patch-af +++ b/security/py-denyhosts/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.2 2013/12/26 23:30:41 pettai Exp $ +$NetBSD: patch-af,v 1.2.2.1 2014/02/11 20:50:43 tron Exp $ -Fix for CVE-2013-6890 -(See http://seclists.org/oss-sec/2013/q4/535) +Fix for CVE-2013-6890 (See http://seclists.org/oss-sec/2013/q4/535) +Added DSA-2826-2 fix for regression (See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734329) --- DenyHosts/regex.py.orig 2013-12-26 22:46:33.000000000 +0000 +++ DenyHosts/regex.py @@ -14,7 +14,7 @@ Fix for CVE-2013-6890 #SSHD_FORMAT_REGEX = re.compile(r""".* sshd.*: (?P<message>.*)""") -FAILED_ENTRY_REGEX = re.compile(r"""Failed (?P<method>.*) for (?P<invalid>invalid user |illegal user )?(?P<user>.*?) .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") -+FAILED_ENTRY_REGEX = re.compile(r"""Failed (?P<method>\S*) for (?P<invalid>invalid user |illegal user )?(?P<user>.*) from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$""") ++FAILED_ENTRY_REGEX = re.compile(r"""Failed (?P<method>\S*) for (?P<invalid>invalid user |illegal user )?(?P<user>.*) from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})( port \d+)?( ssh2)?$""") -FAILED_ENTRY_REGEX2 = re.compile(r"""(?P<invalid>(Illegal|Invalid)) user (?P<user>.*?) .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") +FAILED_ENTRY_REGEX2 = re.compile(r"""(?P<invalid>(Illegal|Invalid)) user (?P<user>.*) from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$""") |