From d15f9d0206fcc640965ed500c306260092da64b5 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 20 Apr 2007 01:44:43 +0000 Subject: [PATCH] * New upstream release * Updated copyright to include current year * Removed patches absorbed upstream --- debian/changelog | 8 ++ debian/copyright | 2 +- debian/patches/00_close_log.dpatch | 32 ------- debian/patches/00_gamin_cleanup.dpatch | 26 ------ debian/patches/00_reload.dpatch | 121 ------------------------- debian/patches/00list | 3 - 6 files changed, 9 insertions(+), 183 deletions(-) delete mode 100644 debian/patches/00_close_log.dpatch delete mode 100644 debian/patches/00_gamin_cleanup.dpatch delete mode 100755 debian/patches/00_reload.dpatch diff --git a/debian/changelog b/debian/changelog index ebca65bf..7a8fa3e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +fail2ban (0.7.9-1) unstable; urgency=low + + * New upstream release + * Updated copyright to include current year + * Removed patches absorbed upstream + + -- Yaroslav Halchenko Thu, 19 Apr 2007 21:44:28 -0400 + fail2ban (0.7.8-1) unstable; urgency=low * New upstream release diff --git a/debian/copyright b/debian/copyright index cfaba9d9..3cccad34 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ It was downloaded from http://www.sourceforge.net/projects/fail2ban Author: Cyril Jaquier: http://fail2ban.sourceforge.net -Copyright: 2004, 2005, 2006 Cyril Jaquier +Copyright: 2004, 2005, 2006, 2007 Cyril Jaquier This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/patches/00_close_log.dpatch b/debian/patches/00_close_log.dpatch deleted file mode 100644 index de5d7a16..00000000 --- a/debian/patches/00_close_log.dpatch +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 00_close_log.dpatch by Yaroslav Halchenko -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: post release patches - -@DPATCH@ -diff -urNad fail2ban-0.7.8~/server/server.py fail2ban-0.7.8/server/server.py ---- fail2ban-0.7.8~/server/server.py 2007-02-07 14:22:44.000000000 -0500 -+++ fail2ban-0.7.8/server/server.py 2007-03-24 18:39:32.000000000 -0400 -@@ -326,15 +326,18 @@ - else: - # Target should be a file - try: -- open(target, "a") -+ open(target, "a").close() - hdlr = logging.FileHandler(target) - except IOError: - logSys.error("Unable to log to " + target) - logSys.info("Logging to previous target " + self.__logTarget) - return False - self.__logTarget = target -- # Remove previous handler -- logging.getLogger("fail2ban").handlers = [] -+ # Removes previous handlers -+ for handler in logging.getLogger("fail2ban").handlers: -+ # Closes the handler. -+ handler.close() -+ logging.getLogger("fail2ban").removeHandler(handler) - # set a format which is simpler for console use - formatter = logging.Formatter("%(asctime)s %(name)-16s: %(levelname)-6s %(message)s") - # tell the handler to use this format diff --git a/debian/patches/00_gamin_cleanup.dpatch b/debian/patches/00_gamin_cleanup.dpatch deleted file mode 100644 index 8c96ee42..00000000 --- a/debian/patches/00_gamin_cleanup.dpatch +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 00_gamin_cleanup.dpatch by Yaroslav Halchenko -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad fail2ban-0.7.8~/server/filtergamin.py fail2ban-0.7.8/server/filtergamin.py ---- fail2ban-0.7.8~/server/filtergamin.py 2006-11-06 17:47:30.000000000 -0500 -+++ fail2ban-0.7.8/server/filtergamin.py 2007-03-24 18:40:13.000000000 -0400 -@@ -117,5 +117,15 @@ - time.sleep(self.getSleepTime()) - else: - time.sleep(self.getSleepTime()) -+ # Cleanup Gamin -+ self.__cleanup() - logSys.debug(self.jail.getName() + ": filter terminated") - return True -+ -+ ## -+ # Desallocates the resources used by Gamin. -+ -+ def __cleanup(self): -+ for path in Filter.getLogPath(self): -+ self.monitor.stop_watch(path) -+ del self.monitor diff --git a/debian/patches/00_reload.dpatch b/debian/patches/00_reload.dpatch deleted file mode 100755 index b22a7127..00000000 --- a/debian/patches/00_reload.dpatch +++ /dev/null @@ -1,121 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 00_reload.dpatch by Yaroslav Halchenko -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad fail2ban-0.7.8~/server/actions.py fail2ban-0.7.8/server/actions.py ---- fail2ban-0.7.8~/server/actions.py 2007-03-07 15:54:33.000000000 -0500 -+++ fail2ban-0.7.8/server/actions.py 2007-03-26 17:43:24.000000000 -0400 -@@ -125,10 +125,10 @@ - # @return True when the thread exits nicely - - def run(self): -+ self.setActive(True) - for action in self.__actions: - action.execActionStart() -- self.setActive(True) -- while self.isActive(): -+ while self._isActive(): - if not self.getIdle(): - #logSys.debug(self.jail.getName() + ": action") - ret = self.__checkBan() -diff -urNad fail2ban-0.7.8~/server/filter.py fail2ban-0.7.8/server/filter.py ---- fail2ban-0.7.8~/server/filter.py 2007-02-01 15:50:16.000000000 -0500 -+++ fail2ban-0.7.8/server/filter.py 2007-03-26 17:43:24.000000000 -0400 -@@ -385,7 +385,7 @@ - self.__setFilePos() - lastLine = None - for line in self.__crtHandler: -- if not self.isActive(): -+ if not self._isActive(): - # The jail has been stopped - break - try: -diff -urNad fail2ban-0.7.8~/server/filtergamin.py fail2ban-0.7.8/server/filtergamin.py ---- fail2ban-0.7.8~/server/filtergamin.py 2007-03-26 17:43:18.000000000 -0400 -+++ fail2ban-0.7.8/server/filtergamin.py 2007-03-26 17:43:24.000000000 -0400 -@@ -99,7 +99,7 @@ - - def run(self): - self.setActive(True) -- while self.isActive(): -+ while self._isActive(): - if not self.getIdle(): - # We cannot block here because we want to be able to - # exit. -diff -urNad fail2ban-0.7.8~/server/filterpoll.py fail2ban-0.7.8/server/filterpoll.py ---- fail2ban-0.7.8~/server/filterpoll.py 2006-12-23 11:37:21.000000000 -0500 -+++ fail2ban-0.7.8/server/filterpoll.py 2007-03-26 17:43:24.000000000 -0400 -@@ -93,7 +93,7 @@ - - def run(self): - self.setActive(True) -- while self.isActive(): -+ while self._isActive(): - if not self.getIdle(): - # Get file modification - for f in self.getLogPath(): -diff -urNad fail2ban-0.7.8~/server/jail.py fail2ban-0.7.8/server/jail.py ---- fail2ban-0.7.8~/server/jail.py 2006-11-06 17:48:53.000000000 -0500 -+++ fail2ban-0.7.8/server/jail.py 2007-03-26 17:43:24.000000000 -0400 -@@ -89,10 +89,10 @@ - self.__filter.join() - self.__action.join() - -- def isActive(self): -- isActive0 = self.__filter.isActive() -- isActive1 = self.__action.isActive() -- return isActive0 or isActive1 -+ def isAlive(self): -+ isAlive0 = self.__filter.isAlive() -+ isAlive1 = self.__action.isAlive() -+ return isAlive0 or isAlive1 - - def setIdle(self, value): - self.__filter.setIdle(value) -diff -urNad fail2ban-0.7.8~/server/jailthread.py fail2ban-0.7.8/server/jailthread.py ---- fail2ban-0.7.8~/server/jailthread.py 2006-10-24 15:38:42.000000000 -0400 -+++ fail2ban-0.7.8/server/jailthread.py 2007-03-26 17:43:24.000000000 -0400 -@@ -105,7 +105,7 @@ - # Check if the filter thread is running. - # @return True if the thread is running - -- def isActive(self): -+ def _isActive(self): - return self.__isRunning - - ## -diff -urNad fail2ban-0.7.8~/server/server.py fail2ban-0.7.8/server/server.py ---- fail2ban-0.7.8~/server/server.py 2007-03-26 17:43:18.000000000 -0400 -+++ fail2ban-0.7.8/server/server.py 2007-03-26 17:43:24.000000000 -0400 -@@ -96,7 +96,7 @@ - def startJail(self, name): - try: - self.__lock.acquire() -- if not self.isActive(name): -+ if not self.isAlive(name): - self.__jails.get(name).start() - finally: - self.__lock.release() -@@ -104,7 +104,7 @@ - def stopJail(self, name): - try: - self.__lock.acquire() -- if self.isActive(name): -+ if self.isAlive(name): - self.__jails.get(name).stop() - self.delJail(name) - finally: -@@ -118,8 +118,8 @@ - finally: - self.__lock.release() - -- def isActive(self, name): -- return self.__jails.get(name).isActive() -+ def isAlive(self, name): -+ return self.__jails.get(name).isAlive() - - def setIdleJail(self, name, value): - self.__jails.get(name).setIdle(value) diff --git a/debian/patches/00list b/debian/patches/00list index 58e9b3d6..7b3bdf7e 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,5 +1,2 @@ 00_mail-whois-lines 10_dbts_manpages -00_close_log -00_gamin_cleanup -00_reload