diff --git a/debian/changelog b/debian/changelog index 3d757864..ab9a40c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fail2ban (0.7.5-2etch1~pre1) stable-security; urgency=low + + * Propagated fix for asctime pattern from 0.7.8 release (closes: #421848) + + -- Yaroslav Halchenko Tue, 01 May 2007 22:18:03 -0400 + fail2ban (0.7.5-2) unstable; urgency=low * NEWS.Debian confusions - the latest NEWS entry and postinst message were diff --git a/debian/patches/00list b/debian/patches/00list index 66ed4e58..4bf90324 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -4,3 +4,4 @@ X00_rigid_python24 10_dbts_manpages 10_wuftpd_section 00_mail-whois-lines +s00_asctime-0.7.8 diff --git a/debian/patches/s00_asctime-0.7.8.dpatch b/debian/patches/s00_asctime-0.7.8.dpatch new file mode 100644 index 00000000..c7927202 --- /dev/null +++ b/debian/patches/s00_asctime-0.7.8.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## s00_asctime-0.7.8.dpatch by Yaroslav Halchenko +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Propagates fix from 0.7.8 to have #421848 fixed + +@DPATCH@ +diff -urNad fail2ban-0.7.5~/server/datedetector.py fail2ban-0.7.5/server/datedetector.py +--- fail2ban-0.7.5~/server/datedetector.py 2006-11-12 12:18:35.000000000 -0500 ++++ fail2ban-0.7.5/server/datedetector.py 2007-05-01 22:35:51.000000000 -0400 +@@ -51,7 +51,7 @@ + # asctime + template = DateStrptime() + template.setName("Weekday Month Day Hour:Minute:Second Year") +- template.setRegex("\S{3} \S{3} \d{2} \d{2}:\d{2}:\d{2} \d{4}") ++ template.setRegex("\S{3} \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2} \d{4}") + template.setPattern("%a %b %d %H:%M:%S %Y") + self.__templates.append(template) + # simple date