From d583637c506439ecb738b595ed232cefabef67a9 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Sun, 17 Nov 2013 17:32:25 -0500 Subject: [PATCH] changeset_ac061155f093464fb6cd2329d3d513b15c68e256.diff absorbed upstream --- debian/changelog | 2 ++ ...c061155f093464fb6cd2329d3d513b15c68e256.diff | 17 ----------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 debian/patches/changeset_ac061155f093464fb6cd2329d3d513b15c68e256.diff diff --git a/debian/changelog b/debian/changelog index 037362d2..3bd6c8a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ fail2ban (0.8.11-1) unstable; urgency=low - changeset_d4f6ca4f8531f332bcb7ce3a89102f60afaaa08e.diff post-release change to support native proftpd date format which includes milliseconds (Closes: #648276) + - changeset_ac061155f093464fb6cd2329d3d513b15c68e256.diff + absorbed upstream -- Yaroslav Halchenko Sun, 17 Nov 2013 17:29:06 -0500 diff --git a/debian/patches/changeset_ac061155f093464fb6cd2329d3d513b15c68e256.diff b/debian/patches/changeset_ac061155f093464fb6cd2329d3d513b15c68e256.diff deleted file mode 100644 index c3c78495..00000000 --- a/debian/patches/changeset_ac061155f093464fb6cd2329d3d513b15c68e256.diff +++ /dev/null @@ -1,17 +0,0 @@ -From: Yaroslav Halchenko -Subject: BF: anchor introduced nginx-http-auth at the end - needed since request probably could be not a correct HTTP statement but -continue with all those to match till the end and then injected ", client: -VICTIM, server..." thus allowing injection. We better anchor at the end then - ---- a/config/filter.d/nginx-http-auth.conf -+++ b/config/filter.d/nginx-http-auth.conf -@@ -4,7 +4,7 @@ - [Definition] - - --failregex = ^ \[error\] \d+#\d+: \*\d+ user "\S+":? (password mismatch|was not found in ".*"), client: , server: \S+, request: "\S+ \S+ HTTP/\d+\.\d+", host: "\S+" -+failregex = ^ \[error\] \d+#\d+: \*\d+ user "\S+":? (password mismatch|was not found in ".*"), client: , server: \S+, request: "\S+ \S+ HTTP/\d+\.\d+", host: "\S+"\s*$ - - ignoreregex = - diff --git a/debian/patches/series b/debian/patches/series index bf39f012..74695279 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ changeset_d4f6ca4f8531f332bcb7ce3a89102f60afaaa08e.diff deb_manpages_reportbug -changeset_ac061155f093464fb6cd2329d3d513b15c68e256.diff