[109462] trunk/dports/security/fail2ban
larryv at macports.org
larryv at macports.org
Thu Aug 15 15:10:00 PDT 2013
Revision: 109462
https://trac.macports.org/changeset/109462
Author: larryv at macports.org
Date: 2013-08-15 15:10:00 -0700 (Thu, 15 Aug 2013)
Log Message:
-----------
fail2ban: Update to 0.8.10 (maintainer, #40121).
Modified Paths:
--------------
trunk/dports/security/fail2ban/Portfile
trunk/dports/security/fail2ban/files/patch-fail2ban-client.diff
trunk/dports/security/fail2ban/files/patch-fail2ban-regex.diff
trunk/dports/security/fail2ban/files/patch-fail2ban-server.diff
trunk/dports/security/fail2ban/files/patch-server-server.py.diff
trunk/dports/security/fail2ban/files/patch-setup.py.diff
Modified: trunk/dports/security/fail2ban/Portfile
===================================================================
--- trunk/dports/security/fail2ban/Portfile 2013-08-15 22:04:01 UTC (rev 109461)
+++ trunk/dports/security/fail2ban/Portfile 2013-08-15 22:10:00 UTC (rev 109462)
@@ -5,8 +5,7 @@
PortGroup github 1.0
PortGroup python27 1.0
-github.setup fail2ban fail2ban 0.8.8
-revision 1
+github.setup fail2ban fail2ban 0.8.10
categories security python
license GPL-2+
maintainers free.fr:fclaire openmaintainer
@@ -24,8 +23,8 @@
or ejecting CD-ROM tray) could also be configured. Out of the box \
Fail2Ban comes with filters for various services (apache, curier, ssh, etc).
-checksums rmd160 9f50cc84d77e47e378da71860e738528f39f7c42 \
- sha256 5b020aaa2316dc4348a1489187db2cb124c4cf2a13f84aed7064fc5bc948a8ab
+checksums rmd160 17f3535a4b92740f5203dfdee874d71d2377e5c9 \
+ sha256 7bed38372a24e35268d9c9ff5b272f7e88e91074f9bb24d5be5c70196f19e7be
set f2bconfdir ${prefix}/etc/${name}
set f2bbindir ${prefix}/bin
Modified: trunk/dports/security/fail2ban/files/patch-fail2ban-client.diff
===================================================================
--- trunk/dports/security/fail2ban/files/patch-fail2ban-client.diff 2013-08-15 22:04:01 UTC (rev 109461)
+++ trunk/dports/security/fail2ban/files/patch-fail2ban-client.diff 2013-08-15 22:10:00 UTC (rev 109462)
@@ -1,26 +1,15 @@
---- fail2ban-client.orig 2013-02-18 17:09:05.000000000 +0100
-+++ fail2ban-client 2013-02-19 19:55:57.000000000 +0100
-@@ -26,13 +26,14 @@
- import getopt, time, shlex, socket
-
- # Inserts our own modules path first in the list
--# fix for bug #343821
--if os.path.abspath(__file__).startswith('/usr/'):
-- # makes sense to use system-wide library iff -client is also under /usr/
+--- fail2ban-client.orig 2013-06-12 19:21:12.000000000 +0200
++++ fail2ban-client 2013-08-15 23:38:31.000000000 +0200
+@@ -30,7 +30,7 @@
+ try:
+ from common.version import version
+ except ImportError, e:
- sys.path.insert(1, "/usr/share/fail2ban")
-+# Camusensei issue #112 - https://github.com/fail2ban/fail2ban/issues/112
-+try:
-+ from common.version import version
-+except ImportError, e:
+ sys.path.insert(1, "@@PREFIX@@/share/fail2ban")
-+ from common.version import version
+ from common.version import version
- # Now we can import our modules
--from common.version import version
- from common.protocol import printFormatted
- from client.csocket import CSocket
- from client.configurator import Configurator
-@@ -55,7 +56,7 @@
+ # Now we can import the rest of modules
+@@ -56,7 +56,7 @@
self.__stream = None
self.__configurator = Configurator()
self.__conf = dict()
Modified: trunk/dports/security/fail2ban/files/patch-fail2ban-regex.diff
===================================================================
--- trunk/dports/security/fail2ban/files/patch-fail2ban-regex.diff 2013-08-15 22:04:01 UTC (rev 109461)
+++ trunk/dports/security/fail2ban/files/patch-fail2ban-regex.diff 2013-08-15 22:10:00 UTC (rev 109462)
@@ -1,16 +1,16 @@
---- fail2ban-regex.orig 2013-02-19 16:30:48.000000000 +0100
-+++ fail2ban-regex 2013-02-19 19:37:00.000000000 +0100
-@@ -25,7 +25,7 @@
- # fix for bug #343821
- if os.path.abspath(__file__).startswith('/usr/'):
- # makes sense to use system-wide library iff -regex is also under /usr/
-- sys.path.insert(1, "/usr/share/fail2ban")
-+ sys.path.insert(1, "@@PREFIX@@/share/fail2ban")
+--- fail2ban-regex.orig 2013-06-12 19:21:12.000000000 +0200
++++ fail2ban-regex 2013-08-15 23:36:34.000000000 +0200
+@@ -29,7 +29,7 @@
+ try:
+ from common.version import version
+ except ImportError, e:
+- sys.path.insert(1, "/usr/share/fail2ban")
++ sys.path.insert(1, "@@PREFIX@@/share/fail2ban")
+ from common.version import version
from client.configparserinc import SafeConfigParserWithIncludes
- from ConfigParser import NoOptionError, NoSectionError, MissingSectionHeaderError
-@@ -62,7 +62,7 @@
-
+@@ -70,7 +70,7 @@
+
test = None
- CONFIG_DEFAULTS = {'configpath' : "/etc/fail2ban/"}
@@ -18,3 +18,12 @@
def __init__(self):
self.__filter = Filter(None)
+@@ -116,7 +116,7 @@
+ print
+ print "Log:"
+ print " string a string representing a log line"
+- print " filename path to a log file (/var/log/auth.log)"
++ print " filename path to a log file (/var/log/secure.log)"
+ print
+ print "Regex:"
+ print " string a string representing a 'failregex'"
Modified: trunk/dports/security/fail2ban/files/patch-fail2ban-server.diff
===================================================================
--- trunk/dports/security/fail2ban/files/patch-fail2ban-server.diff 2013-08-15 22:04:01 UTC (rev 109461)
+++ trunk/dports/security/fail2ban/files/patch-fail2ban-server.diff 2013-08-15 22:10:00 UTC (rev 109462)
@@ -1,30 +1,22 @@
---- fail2ban-server.orig 2013-02-19 16:39:38.000000000 +0100
-+++ fail2ban-server 2013-02-19 20:23:45.000000000 +0100
-@@ -25,12 +25,13 @@
- import getopt, sys, logging, os
-
- # Inserts our own modules path first in the list
--# fix for bug #343821
--if os.path.abspath(__file__).startswith('/usr/'):
-- # makes sense to use system-wide library iff -server is also under /usr/
+--- fail2ban-server.orig 2013-06-12 19:21:12.000000000 +0200
++++ fail2ban-server 2013-08-15 23:33:56.000000000 +0200
+@@ -29,7 +29,7 @@
+ try:
+ from common.version import version
+ except ImportError, e:
- sys.path.insert(1, "/usr/share/fail2ban")
-+# Camusensei issue #112 - https://github.com/fail2ban/fail2ban/issues/112
-+try:
-+ from common.version import version
-+except ImportError, e:
+ sys.path.insert(1, "@@PREFIX@@/share/fail2ban")
-+ from common.version import version
+ from common.version import version
--from common.version import version
from server.server import Server
-
- # Gets the instance of the logger.
-@@ -52,7 +53,7 @@
+@@ -53,8 +53,8 @@
self.__conf = dict()
self.__conf["background"] = True
self.__conf["force"] = False
- self.__conf["socket"] = "/var/run/fail2ban/fail2ban.sock"
+- self.__conf["pidfile"] = "/var/run/fail2ban/fail2ban.pid"
+ self.__conf["socket"] = "@@PREFIX@@/var/run/fail2ban/fail2ban.sock"
-
++ self.__conf["pidfile"] = "@@PREFIX@@/var/run/fail2ban/fail2ban.pid"
+
def dispVersion(self):
print "Fail2Ban v" + version
Modified: trunk/dports/security/fail2ban/files/patch-server-server.py.diff
===================================================================
--- trunk/dports/security/fail2ban/files/patch-server-server.py.diff 2013-08-15 22:04:01 UTC (rev 109461)
+++ trunk/dports/security/fail2ban/files/patch-server-server.py.diff 2013-08-15 22:10:00 UTC (rev 109462)
@@ -1,11 +1,11 @@
---- server/server.py.orig 2012-04-26 22:18:49.000000000 +0200
-+++ server/server.py 2012-04-26 22:19:08.000000000 +0200
-@@ -40,7 +40,7 @@
-
- class Server:
-
-- PID_FILE = "/var/run/fail2ban/fail2ban.pid"
-+ PID_FILE = "@@PREFIX@@/var/run/fail2ban/fail2ban.pid"
-
- def __init__(self, daemon = False):
- self.__loggingLock = Lock()
+--- server/server.py.orig 2013-06-12 19:21:12.000000000 +0200
++++ server/server.py 2013-08-15 21:54:21.000000000 +0200
+@@ -352,7 +352,7 @@
+ # Syslog daemons already add date to the message.
+ formatter = logging.Formatter("%(name)-16s: %(levelname)-6s %(message)s")
+ facility = logging.handlers.SysLogHandler.LOG_DAEMON
+- hdlr = logging.handlers.SysLogHandler("/dev/log",
++ hdlr = logging.handlers.SysLogHandler("/var/run/syslog",
+ facility = facility)
+ elif target == "STDOUT":
+ hdlr = logging.StreamHandler(sys.stdout)
Modified: trunk/dports/security/fail2ban/files/patch-setup.py.diff
===================================================================
--- trunk/dports/security/fail2ban/files/patch-setup.py.diff 2013-08-15 22:04:01 UTC (rev 109461)
+++ trunk/dports/security/fail2ban/files/patch-setup.py.diff 2013-08-15 22:10:00 UTC (rev 109462)
@@ -1,27 +1,42 @@
---- setup.py.orig 2013-02-19 16:35:30.000000000 +0100
-+++ setup.py 2013-04-30 08:46:35.000000000 +0200
-@@ -56,16 +56,16 @@
+--- setup.py.orig 2013-06-12 19:21:12.000000000 +0200
++++ setup.py 2013-08-15 22:51:49.000000000 +0200
+@@ -29,8 +29,8 @@
+ from glob import glob
+
+ longdesc = '''
+-Fail2Ban scans log files like /var/log/pwdfail or
+-/var/log/apache/error_log and bans IP that makes
++Fail2Ban scans log files like @@PREFIX@@/var/log/pwdfail or
++@@PREFIX@@/var/log/apache/error_log and bans IP that makes
+ too many password failures. It updates firewall rules
+ to reject the IP address or executes user defined
+ commands.'''
+@@ -56,19 +56,19 @@
'server'
- ],
+ ],
data_files = [
-- ('/etc/fail2ban',
-+ ('@@PREFIX@@/etc/fail2ban',
+- ('/etc/fail2ban',
++ ('@@PREFIX@@/etc/fail2ban',
glob("config/*.conf")
- ),
-- ('/etc/fail2ban/filter.d',
-+ ('@@PREFIX@@/etc/fail2ban/filter.d',
+ ),
+- ('/etc/fail2ban/filter.d',
++ ('@@PREFIX@@/etc/fail2ban/filter.d',
glob("config/filter.d/*.conf")
- ),
-- ('/etc/fail2ban/action.d',
-+ ('@@PREFIX@@/etc/fail2ban/action.d',
+ ),
+- ('/etc/fail2ban/action.d',
++ ('@@PREFIX@@/etc/fail2ban/action.d',
glob("config/action.d/*.conf")
),
- ('/var/run/fail2ban',
+ ('@@PREFIX@@/var/run/fail2ban',
''
+ ),
+- ('/usr/share/doc/fail2ban',
++ ('@@PREFIX@@/share/doc/fail2ban',
+ ['README.md', 'DEVELOP', 'doc/run-rootless.txt']
)
]
-@@ -75,21 +75,21 @@
+@@ -78,15 +78,15 @@
# Search for obsolete files.
obsoleteFiles = []
elements = {
@@ -29,25 +44,18 @@
+ "@@PREFIX@@/etc/":
[
"fail2ban.conf"
- ],
+ ],
- "/usr/bin/":
-+ "@@PREFIX@@/bin/":
++ "@@PREFIX@@/usr/bin/":
[
"fail2ban.py"
],
-- "/usr/lib/fail2ban/firewall/":
-+ "@@PREFIX@@/lib/fail2ban/firewall/":
- [
- "iptables.py",
- "ipfwadm.py",
- "ipfw.py"
- ],
- "/usr/lib/fail2ban/":
-+ "@@PREFIX@@/lib/fail2ban/":
++ "@@PREFIX@@/usr/lib/fail2ban/":
[
- "version.py",
+ "version.py",
"protocol.py"
-@@ -112,16 +112,16 @@
+@@ -109,16 +109,16 @@
print "\t" + f
print
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130815/76e8b4e2/attachment.html>
More information about the macports-changes
mailing list