diff --git a/fail2ban-0.8.2-fd_cloexec.patch b/fail2ban-0.8.2-fd_cloexec.patch deleted file mode 100644 index e031885..0000000 --- a/fail2ban-0.8.2-fd_cloexec.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- fail2ban-0.8.2/server/filter.py.orig 2008-03-27 16:26:59.000000000 +0000 -+++ fail2ban-0.8.2/server/filter.py 2008-03-27 15:29:48.000000000 +0000 -@@ -428,6 +428,7 @@ - # is computed and compared to the previous hash of this line. - - import md5 -+import fcntl - - class FileContainer: - -@@ -455,6 +456,11 @@ - - def open(self): - self.__handler = open(self.__filename) -+ -+ # Set the file descriptor to be FD_CLOEXEC -+ fd = self.__handler.fileno() -+ fcntl.fcntl (self.__handler.fileno(), fcntl.F_SETFD, fd | fcntl.FD_CLOEXEC) -+ - firstLine = self.__handler.readline() - # Computes the MD5 of the first line. - myHash = md5.new(firstLine).digest() diff --git a/fail2ban-0.8.4.tar.bz2 b/fail2ban-0.8.4.tar.bz2 deleted file mode 100644 index 46e59fa..0000000 --- a/fail2ban-0.8.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a4fc0ea6dffde1db1d096757878e1b2c5f0b087a05ed7e7ca0202fb0b127982 -size 71818 diff --git a/fail2ban-0.8.5-update-fsf-address.patch b/fail2ban-0.8.5-update-fsf-address.patch new file mode 100644 index 0000000..3b480c1 --- /dev/null +++ b/fail2ban-0.8.5-update-fsf-address.patch @@ -0,0 +1,650 @@ +Index: fail2ban-0.8.5/client/__init__.py +=================================================================== +--- fail2ban-0.8.5.orig/client/__init__.py ++++ fail2ban-0.8.5/client/__init__.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/client/actionreader.py +=================================================================== +--- fail2ban-0.8.5.orig/client/actionreader.py ++++ fail2ban-0.8.5/client/actionreader.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/client/beautifier.py +=================================================================== +--- fail2ban-0.8.5.orig/client/beautifier.py ++++ fail2ban-0.8.5/client/beautifier.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/client/configparserinc.py +=================================================================== +--- fail2ban-0.8.5.orig/client/configparserinc.py ++++ fail2ban-0.8.5/client/configparserinc.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Yaroslav Halchenko + # Modified: Cyril Jaquier +Index: fail2ban-0.8.5/client/configreader.py +=================================================================== +--- fail2ban-0.8.5.orig/client/configreader.py ++++ fail2ban-0.8.5/client/configreader.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # Modified by: Yaroslav Halchenko (SafeConfigParserWithIncludes) +Index: fail2ban-0.8.5/client/configurator.py +=================================================================== +--- fail2ban-0.8.5.orig/client/configurator.py ++++ fail2ban-0.8.5/client/configurator.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/client/csocket.py +=================================================================== +--- fail2ban-0.8.5.orig/client/csocket.py ++++ fail2ban-0.8.5/client/csocket.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/client/fail2banreader.py +=================================================================== +--- fail2ban-0.8.5.orig/client/fail2banreader.py ++++ fail2ban-0.8.5/client/fail2banreader.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/client/filterreader.py +=================================================================== +--- fail2ban-0.8.5.orig/client/filterreader.py ++++ fail2ban-0.8.5/client/filterreader.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/client/jailreader.py +=================================================================== +--- fail2ban-0.8.5.orig/client/jailreader.py ++++ fail2ban-0.8.5/client/jailreader.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/client/jailsreader.py +=================================================================== +--- fail2ban-0.8.5.orig/client/jailsreader.py ++++ fail2ban-0.8.5/client/jailsreader.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/common/__init__.py +=================================================================== +--- fail2ban-0.8.5.orig/common/__init__.py ++++ fail2ban-0.8.5/common/__init__.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/common/helpers.py +=================================================================== +--- fail2ban-0.8.5.orig/common/helpers.py ++++ fail2ban-0.8.5/common/helpers.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # Author: Arturo 'Buanzo' Busleiman +Index: fail2ban-0.8.5/common/protocol.py +=================================================================== +--- fail2ban-0.8.5.orig/common/protocol.py ++++ fail2ban-0.8.5/common/protocol.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/common/version.py +=================================================================== +--- fail2ban-0.8.5.orig/common/version.py ++++ fail2ban-0.8.5/common/version.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/fail2ban-client +=================================================================== +--- fail2ban-0.8.5.orig/fail2ban-client ++++ fail2ban-0.8.5/fail2ban-client +@@ -13,7 +13,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/fail2ban-regex +=================================================================== +--- fail2ban-0.8.5.orig/fail2ban-regex ++++ fail2ban-0.8.5/fail2ban-regex +@@ -13,7 +13,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/fail2ban-server +=================================================================== +--- fail2ban-0.8.5.orig/fail2ban-server ++++ fail2ban-0.8.5/fail2ban-server +@@ -13,7 +13,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/fail2ban-testcases +=================================================================== +--- fail2ban-0.8.5.orig/fail2ban-testcases ++++ fail2ban-0.8.5/fail2ban-testcases +@@ -13,7 +13,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/files/cacti/fail2ban_stats.sh +=================================================================== +--- fail2ban-0.8.5.orig/files/cacti/fail2ban_stats.sh ++++ fail2ban-0.8.5/files/cacti/fail2ban_stats.sh +@@ -13,7 +13,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + # + # This script can be used to collect data for Cacti. One parameter is needed, + # the jail name. It must be a currently running jail. The script returns two +Index: fail2ban-0.8.5/files/gentoo-initd +=================================================================== +--- fail2ban-0.8.5.orig/files/gentoo-initd ++++ fail2ban-0.8.5/files/gentoo-initd +@@ -13,7 +13,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + # + # Author: Sireyessire, Cyril Jaquier + # +Index: fail2ban-0.8.5/server/__init__.py +=================================================================== +--- fail2ban-0.8.5.orig/server/__init__.py ++++ fail2ban-0.8.5/server/__init__.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/action.py +=================================================================== +--- fail2ban-0.8.5.orig/server/action.py ++++ fail2ban-0.8.5/server/action.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/actions.py +=================================================================== +--- fail2ban-0.8.5.orig/server/actions.py ++++ fail2ban-0.8.5/server/actions.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/asyncserver.py +=================================================================== +--- fail2ban-0.8.5.orig/server/asyncserver.py ++++ fail2ban-0.8.5/server/asyncserver.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/banmanager.py +=================================================================== +--- fail2ban-0.8.5.orig/server/banmanager.py ++++ fail2ban-0.8.5/server/banmanager.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/datedetector.py +=================================================================== +--- fail2ban-0.8.5.orig/server/datedetector.py ++++ fail2ban-0.8.5/server/datedetector.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/datetemplate.py +=================================================================== +--- fail2ban-0.8.5.orig/server/datetemplate.py ++++ fail2ban-0.8.5/server/datetemplate.py +@@ -13,7 +13,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/faildata.py +=================================================================== +--- fail2ban-0.8.5.orig/server/faildata.py ++++ fail2ban-0.8.5/server/faildata.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/failmanager.py +=================================================================== +--- fail2ban-0.8.5.orig/server/failmanager.py ++++ fail2ban-0.8.5/server/failmanager.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/failregex.py +=================================================================== +--- fail2ban-0.8.5.orig/server/failregex.py ++++ fail2ban-0.8.5/server/failregex.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/filter.py +=================================================================== +--- fail2ban-0.8.5.orig/server/filter.py ++++ fail2ban-0.8.5/server/filter.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/filtergamin.py +=================================================================== +--- fail2ban-0.8.5.orig/server/filtergamin.py ++++ fail2ban-0.8.5/server/filtergamin.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/filterpoll.py +=================================================================== +--- fail2ban-0.8.5.orig/server/filterpoll.py ++++ fail2ban-0.8.5/server/filterpoll.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/jail.py +=================================================================== +--- fail2ban-0.8.5.orig/server/jail.py ++++ fail2ban-0.8.5/server/jail.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/jails.py +=================================================================== +--- fail2ban-0.8.5.orig/server/jails.py ++++ fail2ban-0.8.5/server/jails.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/jailthread.py +=================================================================== +--- fail2ban-0.8.5.orig/server/jailthread.py ++++ fail2ban-0.8.5/server/jailthread.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/mytime.py +=================================================================== +--- fail2ban-0.8.5.orig/server/mytime.py ++++ fail2ban-0.8.5/server/mytime.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/server.py +=================================================================== +--- fail2ban-0.8.5.orig/server/server.py ++++ fail2ban-0.8.5/server/server.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/ticket.py +=================================================================== +--- fail2ban-0.8.5.orig/server/ticket.py ++++ fail2ban-0.8.5/server/ticket.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/server/transmitter.py +=================================================================== +--- fail2ban-0.8.5.orig/server/transmitter.py ++++ fail2ban-0.8.5/server/transmitter.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/setup.py +=================================================================== +--- fail2ban-0.8.5.orig/setup.py ++++ fail2ban-0.8.5/setup.py +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/testcases/__init__.py +=================================================================== +--- fail2ban-0.8.5.orig/testcases/__init__.py ++++ fail2ban-0.8.5/testcases/__init__.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/testcases/actiontestcase.py +=================================================================== +--- fail2ban-0.8.5.orig/testcases/actiontestcase.py ++++ fail2ban-0.8.5/testcases/actiontestcase.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/testcases/banmanagertestcase.py +=================================================================== +--- fail2ban-0.8.5.orig/testcases/banmanagertestcase.py ++++ fail2ban-0.8.5/testcases/banmanagertestcase.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/testcases/clientreadertestcase.py +=================================================================== +--- fail2ban-0.8.5.orig/testcases/clientreadertestcase.py ++++ fail2ban-0.8.5/testcases/clientreadertestcase.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/testcases/datedetectortestcase.py +=================================================================== +--- fail2ban-0.8.5.orig/testcases/datedetectortestcase.py ++++ fail2ban-0.8.5/testcases/datedetectortestcase.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/testcases/failmanagertestcase.py +=================================================================== +--- fail2ban-0.8.5.orig/testcases/failmanagertestcase.py ++++ fail2ban-0.8.5/testcases/failmanagertestcase.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/testcases/filtertestcase.py +=================================================================== +--- fail2ban-0.8.5.orig/testcases/filtertestcase.py ++++ fail2ban-0.8.5/testcases/filtertestcase.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # +Index: fail2ban-0.8.5/testcases/servertestcase.py +=================================================================== +--- fail2ban-0.8.5.orig/testcases/servertestcase.py ++++ fail2ban-0.8.5/testcases/servertestcase.py +@@ -12,7 +12,7 @@ + # + # You should have received a copy of the GNU General Public License + # along with Fail2Ban; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + # Author: Cyril Jaquier + # diff --git a/fail2ban-0.8.5.tar.bz2 b/fail2ban-0.8.5.tar.bz2 new file mode 100644 index 0000000..4d6fd3a --- /dev/null +++ b/fail2ban-0.8.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6834a26cd12c6606c901289fd07de2fbe182630001c8a4595db03cf4ed71bbbb +size 72996 diff --git a/fail2ban.changes b/fail2ban.changes index ae25733..5f0d037 100644 --- a/fail2ban.changes +++ b/fail2ban.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 18 22:04:03 UTC 2011 - lchiquitto@suse.com + +- Update to version 0.8.5: many bug fixes, enhancements and, as + a bonus, drop two patches that are now upstream +- Update FSF address to silent rpmlint warnings +- Drop stale socket files on startup (bnc#537239, bnc#730044) + ------------------------------------------------------------------- Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de @@ -7,12 +15,12 @@ Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de ------------------------------------------------------------------- Thu Sep 1 14:07:28 UTC 2011 - coolo@suse.com -- Use /var/run/fail2ban instead of /tmp for temp files in +- Use /var/run/fail2ban instead of /tmp for temp files in actions: see bugs.debian.org/544232, bnc#690853, CVE-2009-5023 ------------------------------------------------------------------- -Thu Jan 6 16:56:30 UTC 2011 - lchiquitto@novell.com +Thu Jan 6 16:56:30 UTC 2011 - lchiquitto@suse.com - Use $FAIL2BAN_OPTIONS when starting (bnc#662495) - Clean up sysconfig file @@ -20,10 +28,10 @@ Thu Jan 6 16:56:30 UTC 2011 - lchiquitto@novell.com ------------------------------------------------------------------- Tue Jul 27 20:39:41 UTC 2010 - cristian.rodriguez@opensuse.org -- Use O_CLOEXEC on fds (patch from Fedora) +- Use O_CLOEXEC on fds (patch from Fedora) ------------------------------------------------------------------- -Wed May 5 16:48:46 UTC 2010 - lchiquitto@novell.com +Wed May 5 16:48:46 UTC 2010 - lchiquitto@suse.com - Create /var/run/fail2ban during startup to support systems that mount /var/run as tmpfs @@ -33,14 +41,14 @@ Wed May 5 16:48:46 UTC 2010 - lchiquitto@novell.com daemon is running ------------------------------------------------------------------- -Thu Nov 26 16:05:42 CET 2009 - lchiquitto@suse.de +Thu Nov 26 16:05:42 CET 2009 - lchiquitto@suse.com - Update to version 0.8.4. Important changes: * New "Ban IP" command * New filters: lighttpd-fastcgi php-url-fopen cyrus-imap sieve * Fixed the 'unexpected communication error' problem * Remove socket file on startup if fail2ban crashed (bnc#537239) - + ------------------------------------------------------------------- Wed Feb 4 18:19:39 CET 2009 - kssingvo@suse.de diff --git a/fail2ban.init b/fail2ban.init index ee1aae4..d5e2c1e 100644 --- a/fail2ban.init +++ b/fail2ban.init @@ -1,24 +1,5 @@ #!/bin/sh # -# Template SUSE system startup script for example daemon fail2ban -# Copyright (C) 2010 Klaus Sinvogel, SUSE / Novell Inc. -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or (at -# your option) any later version. -# -# This library is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, -# USA. -# -# ### BEGIN INIT INFO # Provides: fail2ban # Required-Start: $syslog $remote_fs $local_fs @@ -27,32 +8,28 @@ # Should-Stop: $time $network iptables # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Short-Description: Bans IPs with too many password failures +# Short-Description: Bans IPs with too many authentication failures # Description: Start fail2ban to scan logfiles and ban IP addresses -# which make too many logfiles failures, and/or sent e-mails about +# which make too many logfiles failures, and/or sent e-mails about ### END INIT INFO # Check for missing binaries (stale symlinks should not happen) FAIL2BAN_CLI=/usr/bin/fail2ban-client -test -x $FAIL2BAN_CLI || { echo "$FAIL2BAN_CLI not installed"; +test -x $FAIL2BAN_CLI || { echo "$FAIL2BAN_CLI not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } FAIL2BAN_SRV=/usr/bin/fail2ban-server -test -x $FAIL2BAN_SRV || { echo "$FAIL2BAN_SRV not installed"; +test -x $FAIL2BAN_SRV || { echo "$FAIL2BAN_SRV not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } -# Check for existence of needed config file and read it -FAIL2BAN_CONFIG=/etc/sysconfig/fail2ban -test -r $FAIL2BAN_CONFIG || { echo "$FAIL2BAN_CONFIG not existing"; - if [ "$1" = "stop" ]; then exit 0; - else exit 6; fi; } +FAIL2BAN_CONFIG="/etc/sysconfig/fail2ban" +FAIL2BAN_SOCKET_DIR="/var/run/fail2ban" +FAIL2BAN_SOCKET="$FAIL2BAN_SOCKET_DIR/fail2ban.sock" -# Socket directory -FAIL2BAN_SOCK_DIR="/var/run/fail2ban" - -# Read config -. $FAIL2BAN_CONFIG +if [ -e $FAIL2BAN_CONFIG ]; then + . $FAIL2BAN_CONFIG +fi . /etc/rc.status rc_reset @@ -61,103 +38,59 @@ case "$1" in start) echo -n "Starting fail2ban " - if [ ! -d $FAIL2BAN_SOCK_DIR ]; then - mkdir -p $FAIL2BAN_SOCK_DIR + if [ ! -d $FAIL2BAN_SOCKET_DIR ]; then + mkdir -p $FAIL2BAN_SOCKET_DIR fi - ## Start daemon with startproc(8). If this fails - ## the return value is set appropriately by startproc. - startproc $FAIL2BAN_CLI -q $FAIL2BAN_OPTIONS start > /dev/null 2>&1 - # Remember status and be verbose + if [ -e $FAIL2BAN_SOCKET ]; then + if ! lsof -n $FAIL2BAN_SOCKET &>/dev/null; then + rm $FAIL2BAN_SOCKET + fi + fi + /sbin/startproc $FAIL2BAN_CLI -q $FAIL2BAN_OPTIONS start &>/dev/null 2>&1 + rc_status -v ;; stop) echo -n "Shutting down fail2ban " ## Stop daemon with built-in functionality 'stop' - startproc -w $FAIL2BAN_CLI -q stop > /dev/null 2>&1 + /sbin/startproc -w $FAIL2BAN_CLI -q stop > /dev/null 2>&1 - # Remember status and be verbose rc_status -v ;; try-restart|condrestart) - ## Do a restart only if the service was active before. - ## Note: try-restart is now part of LSB (as of 1.9). - ## RH has a similar command named condrestart. - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi - # Remember status and be quiet rc_status ;; restart) - ## Stop the service and regardless of whether it was - ## running or not, start it again. $0 stop + i=60 + while [ -e $FAIL2BAN_SOCKET ] && [ $i -gt 0 ]; do + sleep 1 + i=$[$i-1] + echo -n "." + done $0 start - # Remember status and be quiet rc_status ;; - force-reload) - ## Signal the daemon to reload its config. Most daemons - ## do this on signal 1 (SIGHUP). - ## If it does not support it, restart the service if it - ## is running. - - echo -n "Reload service fail2ban " - killproc -HUP $FAIL2BAN_SRV - rc_status -v - - ## Otherwise: - #$0 try-restart - #rc_status - ;; - reload) - ## Like force-reload, but if daemon does not support - ## signaling, do nothing (!) - - # If it supports signaling: - echo -n "Reload service fail2ban " - startproc $FAIL2BAN_CLI -q reload > /dev/null 2>&1 + reload|force-reload) + echo -n "Reload service Fail2ban " + /sbin/startproc $FAIL2BAN_CLI -q reload > /dev/null 2>&1 rc_status -v - - ## Otherwise if it does not support reload: - #rc_failed 3 - #rc_status -v ;; status) echo -n "Checking for service fail2ban " - ## Check status with checkproc(8), if process is running - ## checkproc will return with exit status 0. + /sbin/checkproc $FAIL2BAN_SRV - # Return value is slightly different for the status command: - # 0 - service up and running - # 1 - service dead, but /var/run/ pid file exists - # 2 - service dead, but /var/lock/ lock file exists - # 3 - service not running (unused) - # 4 - service status unknown :-( - # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - - # NOTE: checkproc returns LSB compliant status values. - checkproc $FAIL2BAN_SRV - # NOTE: rc_status knows that we called this init script with - # "status" option and adapts its messages accordingly. rc_status -v ;; - probe) - ## Optional: Probe for the necessity of a reload, print out the - ## argument to this init script which is required for a reload. - ## Note: probe is not (yet) part of LSB (as of 1.9) - - test /etc/fail2ban/fail2ban.conf -nt /var/run/fail2ban/fail2ban.pid && echo reload - ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 diff --git a/fail2ban.spec b/fail2ban.spec index c6fb95f..a985a77 100644 --- a/fail2ban.spec +++ b/fail2ban.spec @@ -15,23 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: fail2ban License: GPLv2+ Group: Productivity/Networking/Security -Requires: python >= 2.5, logrotate, cron +Requires: python >= 2.5, logrotate, cron, lsof BuildRequires: python-devel PreReq: %fillup_prereq -Version: 0.8.4 +Version: 0.8.5 Release: 13 Url: http://www.fail2ban.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Summary: Bans IP addresses that make too many authentication failures -Source0: http://download.sourceforge.net/sourceforge/fail2ban/%{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: %{name}.sysconfig -Patch: fail2ban-0.8.2-fd_cloexec.patch -Patch1: fix-tmp-usage.diff +Patch0: fail2ban-0.8.5-update-fsf-address.patch %description Fail2ban scans log files like /var/log/messages and bans IP addresses @@ -42,9 +43,7 @@ files such as sshd or Apache web server ones. %prep %setup -perl -pi -e 's;/usr/local/;/usr/;g' files/suse-initd -%patch -p1 -%patch1 -p1 +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" diff --git a/fix-tmp-usage.diff b/fix-tmp-usage.diff deleted file mode 100644 index 72eda2a..0000000 --- a/fix-tmp-usage.diff +++ /dev/null @@ -1,60 +0,0 @@ -From: yarikoptic -Date: Wed, 23 Mar 2011 20:35:56 +0000 (+0000) -Subject: BF: Use /var/run/fail2ban instead of /tmp for temp files in actions: see http://bugs... -X-Git-Tag: upstream/0.8.4+svn20110323^2~8 -X-Git-Url: http://git.onerussian.com/?p=deb%2Ffail2ban.git;a=commitdiff_plain;h=ea7d352616b1e2232fcaa99b11807a86ce29ed8b - -BF: Use /var/run/fail2ban instead of /tmp for temp files in actions: see bugs.debian.org/544232 - -It should be robust since /var/run/fail2ban is guaranteed to exist to carry the -socket file, and it will be owned by root (or some other dedicated fail2ban -user) thus avoiding possibility for the exploit - -git-svn-id: https://fail2ban.svn.sourceforge.net/svnroot/fail2ban/branches/FAIL2BAN-0_8@767 a942ae1a-1317-0410-a47c-b1dcaea8d605 ---- - -diff --git a/config/action.d/dshield.conf b/config/action.d/dshield.conf -index b80698b..8549a55 100644 ---- a/config/action.d/dshield.conf -+++ b/config/action.d/dshield.conf -@@ -206,5 +206,5 @@ dest = reports@dshield.org - # Notes.: Base name of temporary files used for buffering - # Values: [ STRING ] Default: /tmp/fail2ban-dshield - # --tmpfile = /tmp/fail2ban-dshield -+tmpfile = /var/run/fail2ban/tmp-dshield - -diff --git a/config/action.d/mail-buffered.conf b/config/action.d/mail-buffered.conf -index 8a33d0e..6fd51d2 100644 ---- a/config/action.d/mail-buffered.conf -+++ b/config/action.d/mail-buffered.conf -@@ -81,7 +81,7 @@ lines = 5 - - # Default temporary file - # --tmpfile = /tmp/fail2ban-mail.txt -+tmpfile = /var/run/fail2ban/tmp-mail.txt - - # Destination/Addressee of the mail - # -diff --git a/config/action.d/mynetwatchman.conf b/config/action.d/mynetwatchman.conf -index 15b91b1..f0e5515 100644 ---- a/config/action.d/mynetwatchman.conf -+++ b/config/action.d/mynetwatchman.conf -@@ -141,4 +141,4 @@ mnwurl = http://mynetwatchman.com/insertwebreport.asp - # Notes.: Base name of temporary files - # Values: [ STRING ] Default: /tmp/fail2ban-mynetwatchman - # --tmpfile = /tmp/fail2ban-mynetwatchman -+tmpfile = /var/run/fail2ban/tmp-mynetwatchman -diff --git a/config/action.d/sendmail-buffered.conf b/config/action.d/sendmail-buffered.conf -index de8166a..25a23b7 100644 ---- a/config/action.d/sendmail-buffered.conf -+++ b/config/action.d/sendmail-buffered.conf -@@ -101,5 +101,5 @@ lines = 5 - - # Default temporary file - # --tmpfile = /tmp/fail2ban-mail.txt -+tmpfile = /var/run/fail2ban/tmp-mail.txt -