From ca3074506586420e95da37c342634dea30d60818 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Thu, 3 Jan 2008 14:11:26 -0500
Subject: [PATCH] removed X00_rigid_usrbinpython patch per requrest from
 security team

---
 debian/changelog                             |  4 +-
 debian/patches/00list                        |  1 -
 debian/patches/X00_rigid_usrbinpython.dpatch | 44 --------------------
 3 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100755 debian/patches/X00_rigid_usrbinpython.dpatch

diff --git a/debian/changelog b/debian/changelog
index e0632b863..d86f4fa99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-fail2ban (0.7.5-2etch1~pre4) stable-security; urgency=low
+fail2ban (0.7.5-2etch1~pre5) stable-security; urgency=low
 
   * NOT RELEASED YET
   * Propagated fix for asctime pattern from 0.7.8 release (closes: #421848)
@@ -10,8 +10,6 @@ fail2ban (0.7.5-2etch1~pre4) stable-security; urgency=low
     (introduced upstream in 0.7.6)
   * Propagated "Fixed removal of host in hosts.deny" from 0.7.6, to prevent
     possible DoS
-  * Rigid call to python2.4 instead of via /usr/bin/env to prevent
-    in-the-middle attack via environment poisoning
   * Anchored sshd and vsftpd failregex at the end of line to prevent DoS on
     those services, which is related to CVE-2007-4321 and closed in sid
     438187.
diff --git a/debian/patches/00list b/debian/patches/00list
index 3d0589b47..20c1342a6 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -9,5 +9,4 @@ X00_rigid_python24
 00_mail-whois-lines
 s00_asctime-0.7.8
 00_hostsdeny
-X00_rigid_usrbinpython
 00_stronger_failregex
diff --git a/debian/patches/X00_rigid_usrbinpython.dpatch b/debian/patches/X00_rigid_usrbinpython.dpatch
deleted file mode 100755
index 6802d1897..000000000
--- a/debian/patches/X00_rigid_usrbinpython.dpatch
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## rigid_python2.4.dpatch by  <debian@onerussian.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Due to currently default python2.3 we need to hardcode use of python2.4 
-## DP: for now
-
-@DPATCH@
-diff -urNad fail2ban~/fail2ban-client fail2ban/fail2ban-client
---- fail2ban~/fail2ban-client	2007-11-06 18:02:02.000000000 -0500
-+++ fail2ban/fail2ban-client	2007-11-06 18:02:27.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.4
-+#!/usr/bin/python2.4
- # This file is part of Fail2Ban.
- #
- # Fail2Ban is free software; you can redistribute it and/or modify
-diff -urNad fail2ban~/fail2ban-server fail2ban/fail2ban-server
---- fail2ban~/fail2ban-server	2007-11-06 18:02:02.000000000 -0500
-+++ fail2ban/fail2ban-server	2007-11-06 18:02:29.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.4
-+#!/usr/bin/python2.4
- # This file is part of Fail2Ban.
- #
- # Fail2Ban is free software; you can redistribute it and/or modify
-diff -urNad fail2ban~/fail2ban-testcases fail2ban/fail2ban-testcases
---- fail2ban~/fail2ban-testcases	2007-11-06 18:02:02.000000000 -0500
-+++ fail2ban/fail2ban-testcases	2007-11-06 18:02:31.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.4
-+#!/usr/bin/python2.4
- # This file is part of Fail2Ban.
- #
- # Fail2Ban is free software; you can redistribute it and/or modify
-diff -urNad fail2ban~/setup.py fail2ban/setup.py
---- fail2ban~/setup.py	2007-11-06 18:02:02.000000000 -0500
-+++ fail2ban/setup.py	2007-11-06 18:02:35.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.4
-+#!/usr/bin/python2.4
- 
- # This file is part of Fail2Ban.
- #