From 9e8e4dde69c4c5df5cfd681d59e12c816ecd0afa Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 27 Oct 2014 21:27:51 -0400 Subject: [PATCH 1/6] Populated MANIFEST with more entries which were preiously missed or duplicated. Sorted within each "section" --- MANIFEST | 348 ++++++++++++++++++++++++++++------------------------ MANIFEST.in | 2 +- RELEASE | 4 + 3 files changed, 195 insertions(+), 159 deletions(-) diff --git a/MANIFEST b/MANIFEST index 92edcca8..eeb13eef 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,11 +1,14 @@ -README.md -README.Solaris -ChangeLog -TODO -THANKS +CONTRIBUTING.md COPYING +ChangeLog DEVELOP FILTERS +README.Solaris +README.md +RELEASE +THANKS +TODO +Vagrantfile fail2ban-2to3 fail2ban-testcases-all fail2ban-testcases-all-python3 @@ -14,109 +17,108 @@ bin/fail2ban-server bin/fail2ban-testcases bin/fail2ban-regex doc/run-rootless.txt -fail2ban/client/configreader.py -fail2ban/client/configparserinc.py -fail2ban/client/jailreader.py -fail2ban/client/fail2banreader.py -fail2ban/client/jailsreader.py -fail2ban/client/beautifier.py -fail2ban/client/filterreader.py -fail2ban/client/actionreader.py fail2ban/client/__init__.py +fail2ban/client/actionreader.py +fail2ban/client/beautifier.py +fail2ban/client/configparserinc.py +fail2ban/client/configreader.py fail2ban/client/configurator.py fail2ban/client/csocket.py -fail2ban/server/asyncserver.py -fail2ban/server/database.py -fail2ban/server/filter.py -fail2ban/server/filterpyinotify.py -fail2ban/server/filtergamin.py -fail2ban/server/filterpoll.py -fail2ban/server/filtersystemd.py -fail2ban/server/iso8601.py -fail2ban/server/server.py +fail2ban/client/fail2banreader.py +fail2ban/client/filterreader.py +fail2ban/client/jailreader.py +fail2ban/client/jailsreader.py +fail2ban/server/__init__.py +fail2ban/server/action.py fail2ban/server/actions.py +fail2ban/server/asyncserver.py +fail2ban/server/banmanager.py +fail2ban/server/database.py +fail2ban/server/datedetector.py +fail2ban/server/datetemplate.py fail2ban/server/faildata.py fail2ban/server/failmanager.py -fail2ban/server/datedetector.py -fail2ban/server/jailthread.py -fail2ban/server/transmitter.py -fail2ban/server/action.py -fail2ban/server/ticket.py +fail2ban/server/failregex.py +fail2ban/server/filter.py +fail2ban/server/filtergamin.py +fail2ban/server/filterpoll.py +fail2ban/server/filterpyinotify.py +fail2ban/server/filtersystemd.py +fail2ban/server/iso8601.py fail2ban/server/jail.py fail2ban/server/jails.py -fail2ban/server/__init__.py -fail2ban/server/banmanager.py -fail2ban/server/datetemplate.py +fail2ban/server/jailthread.py fail2ban/server/mytime.py -fail2ban/server/failregex.py -fail2ban/server/database.py -fail2ban/tests/banmanagertestcase.py -fail2ban/tests/failmanagertestcase.py -fail2ban/tests/clientreadertestcase.py -fail2ban/tests/filtertestcase.py +fail2ban/server/server.py +fail2ban/server/strptime.py +fail2ban/server/ticket.py +fail2ban/server/transmitter.py fail2ban/tests/__init__.py -fail2ban/tests/dummyjail.py -fail2ban/tests/samplestestcase.py -fail2ban/tests/datedetectortestcase.py +fail2ban/tests/action_d/__init__.py +fail2ban/tests/action_d/test_badips.py +fail2ban/tests/action_d/test_smtp.py +fail2ban/tests/actionstestcase.py fail2ban/tests/actiontestcase.py -fail2ban/tests/servertestcase.py -fail2ban/tests/sockettestcase.py -fail2ban/tests/utils.py -fail2ban/tests/misctestcase.py -fail2ban/tests/databasetestcase.py -fail2ban/tests/config/jail.conf +fail2ban/tests/banmanagertestcase.py +fail2ban/tests/clientreadertestcase.py +fail2ban/tests/config/action.d/brokenaction.conf fail2ban/tests/config/fail2ban.conf +fail2ban/tests/config/filter.d/simple.conf +fail2ban/tests/config/jail.conf fail2ban/tests/config/paths-common.conf +fail2ban/tests/config/paths-debian.conf fail2ban/tests/config/paths-freebsd.conf fail2ban/tests/config/paths-osx.conf -fail2ban/tests/config/paths-debian.conf -fail2ban/tests/config/filter.d/simple.conf -fail2ban/tests/config/action.d/brokenaction.conf -fail2ban/tests/files/config/apache-auth/digest/.htaccess -fail2ban/tests/files/config/apache-auth/digest/.htpasswd -fail2ban/tests/files/config/apache-auth/digest_time/.htaccess -fail2ban/tests/files/config/apache-auth/digest_time/.htpasswd +fail2ban/tests/databasetestcase.py +fail2ban/tests/datedetectortestcase.py +fail2ban/tests/dummyjail.py +fail2ban/tests/failmanagertestcase.py +fail2ban/tests/files/action.d/action.py +fail2ban/tests/files/action.d/action_errors.py +fail2ban/tests/files/action.d/action_modifyainfo.py +fail2ban/tests/files/action.d/action_noAction.py +fail2ban/tests/files/action.d/action_nomethod.py +fail2ban/tests/files/config/apache-auth/README fail2ban/tests/files/config/apache-auth/basic/authz_owner/.htaccess -fail2ban/tests/files/config/apache-auth/basic/authz_owner/cant_get_me.html fail2ban/tests/files/config/apache-auth/basic/authz_owner/.htpasswd +fail2ban/tests/files/config/apache-auth/basic/authz_owner/cant_get_me.html fail2ban/tests/files/config/apache-auth/basic/file/.htaccess fail2ban/tests/files/config/apache-auth/basic/file/.htpasswd fail2ban/tests/files/config/apache-auth/digest.py -fail2ban/tests/files/config/apache-auth/digest_wrongrelm/.htaccess -fail2ban/tests/files/config/apache-auth/digest_wrongrelm/.htpasswd +fail2ban/tests/files/config/apache-auth/digest/.htaccess +fail2ban/tests/files/config/apache-auth/digest/.htpasswd fail2ban/tests/files/config/apache-auth/digest_anon/.htaccess fail2ban/tests/files/config/apache-auth/digest_anon/.htpasswd -fail2ban/tests/files/config/apache-auth/README +fail2ban/tests/files/config/apache-auth/digest_time/.htaccess +fail2ban/tests/files/config/apache-auth/digest_time/.htpasswd +fail2ban/tests/files/config/apache-auth/digest_wrongrelm/.htaccess +fail2ban/tests/files/config/apache-auth/digest_wrongrelm/.htpasswd fail2ban/tests/files/config/apache-auth/noentry/.htaccess fail2ban/tests/files/database_v1.db -fail2ban/tests/files/ignorecommand.py fail2ban/tests/files/filter.d/substition.conf fail2ban/tests/files/filter.d/testcase-common.conf fail2ban/tests/files/filter.d/testcase01.conf -fail2ban/tests/files/testcase01.log -fail2ban/tests/files/testcase02.log -fail2ban/tests/files/testcase03.log -fail2ban/tests/files/testcase04.log -fail2ban/tests/files/testcase-usedns.log -fail2ban/tests/files/testcase-journal.log -fail2ban/tests/files/testcase-multiline.log -fail2ban/tests/files/logs/bsd/syslog-plain.txt -fail2ban/tests/files/logs/bsd/syslog-v.txt -fail2ban/tests/files/logs/bsd/syslog-vv.txt +fail2ban/tests/files/ignorecommand.py fail2ban/tests/files/logs/3proxy fail2ban/tests/files/logs/apache-auth fail2ban/tests/files/logs/apache-badbots fail2ban/tests/files/logs/apache-botscripts +fail2ban/tests/files/logs/apache-botsearch fail2ban/tests/files/logs/apache-modsecurity fail2ban/tests/files/logs/apache-nohome fail2ban/tests/files/logs/apache-noscript fail2ban/tests/files/logs/apache-overflows +fail2ban/tests/files/logs/apache-shellshock fail2ban/tests/files/logs/assp fail2ban/tests/files/logs/asterisk +fail2ban/tests/files/logs/bsd/syslog-plain.txt +fail2ban/tests/files/logs/bsd/syslog-v.txt +fail2ban/tests/files/logs/bsd/syslog-vv.txt fail2ban/tests/files/logs/counter-strike fail2ban/tests/files/logs/courier-auth fail2ban/tests/files/logs/courier-smtp fail2ban/tests/files/logs/cyrus-imap +fail2ban/tests/files/logs/directadmin fail2ban/tests/files/logs/dovecot fail2ban/tests/files/logs/dropbear fail2ban/tests/files/logs/ejabberd-auth @@ -126,42 +128,60 @@ fail2ban/tests/files/logs/freeswitch fail2ban/tests/files/logs/groupoffice fail2ban/tests/files/logs/gssftpd fail2ban/tests/files/logs/guacamole +fail2ban/tests/files/logs/horde fail2ban/tests/files/logs/kerio fail2ban/tests/files/logs/lighttpd-auth +fail2ban/tests/files/logs/monit fail2ban/tests/files/logs/mysqld-auth fail2ban/tests/files/logs/nagios -fail2ban/tests/files/logs/nsd -fail2ban/tests/files/logs/perdition -fail2ban/tests/files/logs/php-url-fopen -fail2ban/tests/files/logs/postfix-sasl fail2ban/tests/files/logs/named-refused fail2ban/tests/files/logs/nginx-http-auth +fail2ban/tests/files/logs/nsd +fail2ban/tests/files/logs/openwebmail +fail2ban/tests/files/logs/oracleims fail2ban/tests/files/logs/pam-generic +fail2ban/tests/files/logs/perdition +fail2ban/tests/files/logs/php-url-fopen +fail2ban/tests/files/logs/portsentry fail2ban/tests/files/logs/postfix +fail2ban/tests/files/logs/postfix-sasl fail2ban/tests/files/logs/proftpd fail2ban/tests/files/logs/pure-ftpd fail2ban/tests/files/logs/qmail fail2ban/tests/files/logs/recidive fail2ban/tests/files/logs/roundcube-auth fail2ban/tests/files/logs/selinux-ssh +fail2ban/tests/files/logs/sendmail-auth +fail2ban/tests/files/logs/sendmail-reject fail2ban/tests/files/logs/sendmail-spam fail2ban/tests/files/logs/sieve -fail2ban/tests/files/logs/squid -fail2ban/tests/files/logs/stunnel -fail2ban/tests/files/logs/suhosin fail2ban/tests/files/logs/sogo-auth fail2ban/tests/files/logs/solid-pop3d +fail2ban/tests/files/logs/squid +fail2ban/tests/files/logs/squirrelmail fail2ban/tests/files/logs/sshd fail2ban/tests/files/logs/sshd-ddos +fail2ban/tests/files/logs/stunnel +fail2ban/tests/files/logs/suhosin +fail2ban/tests/files/logs/tine20 +fail2ban/tests/files/logs/uwimap-auth fail2ban/tests/files/logs/vsftpd fail2ban/tests/files/logs/webmin-auth fail2ban/tests/files/logs/wuftpd -fail2ban/tests/files/logs/uwimap-auth fail2ban/tests/files/logs/xinetd-fail -fail2ban/tests/config/jail.conf -fail2ban/tests/config/fail2ban.conf -fail2ban/tests/config/filter.d/simple.conf -fail2ban/tests/config/action.d/brokenaction.conf +fail2ban/tests/files/testcase-journal.log +fail2ban/tests/files/testcase-multiline.log +fail2ban/tests/files/testcase-usedns.log +fail2ban/tests/files/testcase01.log +fail2ban/tests/files/testcase02.log +fail2ban/tests/files/testcase03.log +fail2ban/tests/files/testcase04.log +fail2ban/tests/filtertestcase.py +fail2ban/tests/misctestcase.py +fail2ban/tests/samplestestcase.py +fail2ban/tests/servertestcase.py +fail2ban/tests/sockettestcase.py +fail2ban/tests/utils.py setup.py setup.cfg fail2ban/__init__.py @@ -169,126 +189,136 @@ fail2ban/exceptions.py fail2ban/helpers.py fail2ban/version.py fail2ban/protocol.py -setup.py -setup.cfg kill-server -config/jail.conf +config/action.d/apf.conf +config/action.d/badips.conf +config/action.d/badips.py +config/action.d/blocklist_de.conf +config/action.d/bsd-ipfw.conf +config/action.d/cloudflare.conf +config/action.d/complain.conf +config/action.d/dshield.conf +config/action.d/dummy.conf +config/action.d/firewallcmd-ipset.conf +config/action.d/firewallcmd-new.conf +config/action.d/hostsdeny.conf +config/action.d/ipfilter.conf +config/action.d/ipfw.conf +config/action.d/iptables-allports.conf +config/action.d/iptables-common.conf +config/action.d/iptables-ipset-proto4.conf +config/action.d/iptables-ipset-proto6-allports.conf +config/action.d/iptables-ipset-proto6.conf +config/action.d/iptables-multiport-log.conf +config/action.d/iptables-multiport.conf +config/action.d/iptables-new.conf +config/action.d/iptables-xt_recent-echo.conf +config/action.d/iptables.conf +config/action.d/mail-buffered.conf +config/action.d/mail-whois-lines.conf +config/action.d/mail-whois.conf +config/action.d/mail.conf +config/action.d/mynetwatchman.conf +config/action.d/osx-afctl.conf +config/action.d/osx-ipfw.conf +config/action.d/pf.conf +config/action.d/route.conf +config/action.d/sendmail-buffered.conf +config/action.d/sendmail-common.conf +config/action.d/sendmail-whois-ipjailmatches.conf +config/action.d/sendmail-whois-ipmatches.conf +config/action.d/sendmail-whois-lines.conf +config/action.d/sendmail-whois-matches.conf +config/action.d/sendmail-whois.conf +config/action.d/sendmail.conf +config/action.d/shorewall.conf +config/action.d/smtp.py +config/action.d/symbiosis-blacklist-allports.conf +config/action.d/ufw.conf +config/action.d/xarf-login-attack.conf config/fail2ban.conf -config/filter.d/common.conf +config/filter.d/3proxy.conf config/filter.d/apache-auth.conf config/filter.d/apache-badbots.conf config/filter.d/apache-botsearch.conf +config/filter.d/apache-common.conf config/filter.d/apache-modsecurity.conf config/filter.d/apache-nohome.conf config/filter.d/apache-noscript.conf config/filter.d/apache-overflows.conf -config/filter.d/nginx-http-auth.conf +config/filter.d/apache-shellshock.conf +config/filter.d/assp.conf +config/filter.d/asterisk.conf +config/filter.d/common.conf config/filter.d/counter-strike.conf config/filter.d/courier-auth.conf config/filter.d/courier-smtp.conf config/filter.d/cyrus-imap.conf +config/filter.d/directadmin.conf +config/filter.d/dovecot.conf +config/filter.d/dropbear.conf config/filter.d/ejabberd-auth.conf +config/filter.d/exim-common.conf +config/filter.d/exim-spam.conf config/filter.d/exim.conf config/filter.d/freeswitch.conf +config/filter.d/groupoffice.conf config/filter.d/gssftpd.conf -config/filter.d/kerio.conf +config/filter.d/guacamole.conf config/filter.d/horde.conf -config/filter.d/suhosin.conf +config/filter.d/kerio.conf +config/filter.d/lighttpd-auth.conf +config/filter.d/monit.conf +config/filter.d/mysqld-auth.conf config/filter.d/nagios.conf config/filter.d/named-refused.conf +config/filter.d/nginx-http-auth.conf config/filter.d/nsd.conf config/filter.d/openwebmail.conf +config/filter.d/oracleims.conf config/filter.d/pam-generic.conf +config/filter.d/pam-generic.conf +config/filter.d/pam-generic.conf +config/filter.d/perdition.conf config/filter.d/php-url-fopen.conf +config/filter.d/php-url-fopen.conf +config/filter.d/php-url-fopen.conf +config/filter.d/portsentry.conf +config/filter.d/postfix-sasl.conf config/filter.d/postfix-sasl.conf -config/filter.d/pam-generic.conf -config/filter.d/php-url-fopen.conf config/filter.d/postfix-sasl.conf config/filter.d/postfix.conf config/filter.d/proftpd.conf config/filter.d/pure-ftpd.conf config/filter.d/qmail.conf -config/filter.d/pam-generic.conf -config/filter.d/php-url-fopen.conf -config/filter.d/postfix-sasl.conf +config/filter.d/recidive.conf +config/filter.d/roundcube-auth.conf +config/filter.d/selinux-common.conf +config/filter.d/selinux-ssh.conf config/filter.d/sendmail-auth.conf config/filter.d/sendmail-reject.conf +config/filter.d/sendmail-spam.conf config/filter.d/sieve.conf +config/filter.d/sogo-auth.conf config/filter.d/solid-pop3d.conf config/filter.d/squid.conf -config/filter.d/sshd.conf +config/filter.d/squirrelmail.conf config/filter.d/sshd-ddos.conf +config/filter.d/sshd.conf config/filter.d/stunnel.conf +config/filter.d/suhosin.conf +config/filter.d/tine20.conf +config/filter.d/uwimap-auth.conf config/filter.d/vsftpd.conf config/filter.d/webmin-auth.conf config/filter.d/wuftpd.conf config/filter.d/xinetd-fail.conf -config/filter.d/asterisk.conf -config/filter.d/dovecot.conf -config/filter.d/dropbear.conf -config/filter.d/lighttpd-auth.conf -config/filter.d/recidive.conf -config/filter.d/roundcube-auth.conf -config/filter.d/assp.conf -config/filter.d/sogo-auth.conf -config/filter.d/mysqld-auth.conf -config/filter.d/selinux-common.conf -config/filter.d/selinux-ssh.conf -config/filter.d/3proxy.conf -config/filter.d/apache-common.conf -config/filter.d/exim-common.conf -config/filter.d/exim-spam.conf -config/filter.d/freeswitch.conf -config/filter.d/groupoffice.conf -config/filter.d/perdition.conf -config/filter.d/uwimap-auth.conf -config/filter.d/courier-auth.conf -config/filter.d/courier-smtp.conf -config/filter.d/ejabberd-auth.conf -config/filter.d/guacamole.conf -config/filter.d/sendmail-spam.conf -config/action.d/apf.conf -config/action.d/blocklist_de.conf -config/action.d/osx-afctl.conf -config/action.d/osx-ipfw.conf -config/action.d/sendmail-common.conf -config/action.d/badips.conf -config/action.d/bsd-ipfw.conf -config/action.d/dummy.conf -config/action.d/firewallcmd-new.conf -config/action.d/firewallcmd-ipset.conf -config/action.d/iptables-ipset-proto6-allports.conf -config/action.d/iptables-common.conf -config/action.d/iptables-ipset-proto4.conf -config/action.d/iptables-ipset-proto6.conf -config/action.d/iptables-xt_recent-echo.conf -config/action.d/route.conf -config/action.d/complain.conf -config/action.d/dshield.conf -config/action.d/hostsdeny.conf -config/action.d/ipfw.conf -config/action.d/ipfilter.conf -config/action.d/iptables.conf -config/action.d/iptables-allports.conf -config/action.d/iptables-multiport.conf -config/action.d/iptables-multiport-log.conf -config/action.d/iptables-new.conf -config/action.d/mail.conf -config/action.d/mail-buffered.conf -config/action.d/mail-whois.conf -config/action.d/mail-whois-lines.conf -config/action.d/mynetwatchman.conf -config/action.d/pf.conf -config/action.d/sendmail.conf -config/action.d/sendmail-buffered.conf -config/action.d/sendmail-whois-ipmatches.conf -config/action.d/sendmail-whois.conf -config/action.d/sendmail-whois-lines.conf -config/action.d/shorewall.conf -config/action.d/xarf-login-attack.conf -config/action.d/ufw.conf -config/fail2ban.conf -doc/run-rootless.txt +config/jail.conf +config/paths-common.conf +config/paths-debian.conf +config/paths-fedora.conf +config/paths-freebsd.conf +config/paths-osx.conf man/fail2ban-client.1 man/fail2ban.1 man/jail.conf.5 @@ -306,6 +336,8 @@ files/solaris-fail2ban.xml files/solaris-svc-fail2ban files/suse-initd files/fail2ban-logrotate +files/fail2ban.upstart +files/logwatch/fail2ban files/cacti/fail2ban_stats.sh files/cacti/cacti_host_template_fail2ban.xml files/cacti/README diff --git a/MANIFEST.in b/MANIFEST.in index a0d9c2a3..9473d3a6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -include ChangeLog COPYING DEVELOP FILTERS README.* THANKS TODO +include ChangeLog COPYING DEVELOP FILTERS README.* THANKS TODO CONTRIBUTING* Vagrantfile graft doc graft files recursive-include config *.conf *.py diff --git a/RELEASE b/RELEASE index 9002b75e..6cc60400 100644 --- a/RELEASE +++ b/RELEASE @@ -47,6 +47,10 @@ Preparation * Ensure the MANIFEST is complete + ad-hoc bash script to run in a clean clone: + + find -type f | grep -v -e '\.git' -e '/doc/' -e '\.travis' -e MANIFEST | sed -e 's,^\./,,g' | while read f; do grep -ne "^$f\$" MANIFEST >/dev/null || echo "$f" ; done + * Run:: python setup.py sdist From 987356d6c0cf9ed14ca683341b3fdc6c6041e87d Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 27 Oct 2014 21:38:15 -0400 Subject: [PATCH 2/6] Changes for the 0.9.1 release versioning --- ChangeLog | 4 ++-- README.md | 2 +- RELEASE | 2 +- fail2ban/version.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e9d99b4..cc3999ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,10 +4,10 @@ |_| \__,_|_|_/___|_.__/\__,_|_||_| ================================================================================ -Fail2Ban (version 0.9.0.dev) 2014/xx/xx +Fail2Ban (version 0.9.1) 2014/10/29 ================================================================================ -ver. 0.9.1 (2014/xx/xx) - better, faster, stronger +ver. 0.9.1 (2014/10/29) - better, faster, stronger ---------- - Refactoring (IMPORTANT -- Please review your setup and configuration): diff --git a/README.md b/README.md index 2679fe53..54d5e3bb 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ / _|__ _(_) |_ ) |__ __ _ _ _ | _/ _` | | |/ /| '_ \/ _` | ' \ |_| \__,_|_|_/___|_.__/\__,_|_||_| - v0.9.0 2014/03/14 + v0.9.1 2014/10/29 ## Fail2Ban: ban hosts that cause multiple authentication errors diff --git a/RELEASE b/RELEASE index 6cc60400..9ce304c0 100644 --- a/RELEASE +++ b/RELEASE @@ -185,7 +185,7 @@ Post Release Add the following to the top of the ChangeLog:: - ver. 0.9.1 (2014/XX/XXX) - wanna-be-released + ver. 0.9.2 (2014/XX/XXX) - wanna-be-released ----------- - Fixes: diff --git a/fail2ban/version.py b/fail2ban/version.py index 914cfe29..f7b776cd 100644 --- a/fail2ban/version.py +++ b/fail2ban/version.py @@ -24,4 +24,4 @@ __author__ = "Cyril Jaquier, Yaroslav Halchenko, Steven Hiscocks, Daniel Black" __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2011-2014 Yaroslav Halchenko, 2013-2013 Steven Hiscocks, Daniel Black" __license__ = "GPL-v2+" -version = "0.9.0.dev" +version = "0.9.1" From 564eb3389bd226c16e3f3f4e6f0873f9a24489fb Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 27 Oct 2014 21:45:43 -0400 Subject: [PATCH 3/6] ENH: fail early in generate-man + provide PYTHONPATH upstairs --- man/generate-man | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/man/generate-man b/man/generate-man index 0907e738..f18c3604 100755 --- a/man/generate-man +++ b/man/generate-man @@ -1,5 +1,9 @@ #!/bin/bash +set -eu + +export PYTHONPATH=.. + # fail2ban-client echo -n "Generating fail2ban-client " help2man --section=1 --no-info --include=fail2ban-client.h2m --output fail2ban-client.1 ../bin/fail2ban-client From d0a5fe620f87c3a7b57c874d0280353faba1d369 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 27 Oct 2014 21:47:48 -0400 Subject: [PATCH 4/6] Refreshed manpages --- man/fail2ban-client.1 | 52 ++++++++++++++++++------------------------- man/fail2ban-regex.1 | 21 +++++++++-------- man/fail2ban-server.1 | 8 +++---- 3 files changed, 38 insertions(+), 43 deletions(-) diff --git a/man/fail2ban-client.1 b/man/fail2ban-client.1 index e2df68ed..c760f8ed 100644 --- a/man/fail2ban-client.1 +++ b/man/fail2ban-client.1 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.2. -.TH FAIL2BAN-CLIENT "1" "March 2014" "fail2ban-client v0.9.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. +.TH FAIL2BAN-CLIENT "1" "October 2014" "fail2ban-client v0.9.1" "User Commands" .SH NAME fail2ban-client \- configure and control the server .SH SYNOPSIS .B fail2ban-client -[\fIOPTIONS\fR] \fI\fR +[\fI\,OPTIONS\/\fR] \fI\,\/\fR .SH DESCRIPTION -Fail2Ban v0.9.0 reads log file that contains password failure report +Fail2Ban v0.9.1 reads log file that contains password failure report and bans the corresponding IP addresses using firewall rules. .SH OPTIONS .TP @@ -35,10 +35,10 @@ decrease verbosity force execution of the server (remove socket file) .TP \fB\-b\fR -start the server in background mode (default) +start server in background (default) .TP \fB\-f\fR -start the server in foreground mode (note that the client forks once itself) +start server in foreground (note that the client forks once itself) .TP \fB\-h\fR, \fB\-\-help\fR display this help message @@ -217,9 +217,8 @@ for \fBset maxlines \fR sets the number of to buffer for regex search for -.IP -set addaction [ ] -.IP +.TP +\fBset addaction [ ]\fR adds a new action named for . Optionally for a Python based action, a and @@ -231,45 +230,38 @@ removes the action from .IP COMMAND ACTION CONFIGURATION -.IP -set action actionstart -.IP +.TP +\fBset action actionstart \fR sets the start command of the action for -.IP -set action actionstop sets the stop command of the -.IP +.TP +\fBset action actionstop sets the stop command of the\fR action for -.IP -set action actioncheck -.IP +.TP +\fBset action actioncheck \fR sets the check command of the action for .TP \fBset action actionban \fR sets the ban command of the action for -.IP -set action actionunban -.IP +.TP +\fBset action actionunban \fR sets the unban command of the action for -.IP -set action timeout -.IP +.TP +\fBset action timeout \fR sets as the command timeout in seconds for the action for .IP GENERAL ACTION CONFIGURATION -.IP -set action -.IP +.TP +\fBset action \fR sets the of for the action for -.IP -set action [ ] -.IP +.TP +\fBset action [ ]\fR calls the with for the action for diff --git a/man/fail2ban-regex.1 b/man/fail2ban-regex.1 index ec773b02..05379351 100644 --- a/man/fail2ban-regex.1 +++ b/man/fail2ban-regex.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.2. -.TH FAIL2BAN-REGEX "1" "March 2014" "fail2ban-regex 0.9.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. +.TH FAIL2BAN-REGEX "1" "October 2014" "fail2ban-regex 0.9.1" "User Commands" .SH NAME fail2ban-regex \- test Fail2ban "failregex" option .SH SYNOPSIS .B fail2ban-regex -[\fIOPTIONS\fR] \fI \fR[\fIIGNOREREGEX\fR] +[\fI\,OPTIONS\/\fR] \fI\, \/\fR[\fI\,IGNOREREGEX\/\fR] .SH DESCRIPTION Fail2Ban reads log file that contains password failure report and bans the corresponding IP addresses using firewall rules. @@ -16,7 +16,7 @@ string a string representing a log line .TP filename -path to a log file (\fI/var/log/auth.log\fP) +path to a log file (\fI\,/var/log/auth.log\/\fP) .TP "systemd\-journal" search systemd journal (systemd\-python required) @@ -42,20 +42,20 @@ show program's version number and exit \fB\-h\fR, \fB\-\-help\fR show this help message and exit .TP -\fB\-d\fR DATEPATTERN, \fB\-\-datepattern\fR=\fIDATEPATTERN\fR +\fB\-d\fR DATEPATTERN, \fB\-\-datepattern\fR=\fI\,DATEPATTERN\/\fR set custom pattern used to match date/times .TP -\fB\-e\fR ENCODING, \fB\-\-encoding\fR=\fIENCODING\fR +\fB\-e\fR ENCODING, \fB\-\-encoding\fR=\fI\,ENCODING\/\fR File encoding. Default: system locale .TP -\fB\-L\fR MAXLINES, \fB\-\-maxlines\fR=\fIMAXLINES\fR +\fB\-L\fR MAXLINES, \fB\-\-maxlines\fR=\fI\,MAXLINES\/\fR maxlines for multi\-line regex .TP -\fB\-m\fR JOURNALMATCH, \fB\-\-journalmatch\fR=\fIJOURNALMATCH\fR +\fB\-m\fR JOURNALMATCH, \fB\-\-journalmatch\fR=\fI\,JOURNALMATCH\/\fR journalctl style matches overriding filter file. "systemd\-journal" only .TP -\fB\-l\fR LOG_LEVEL, \fB\-\-log\-level\fR=\fILOG_LEVEL\fR +\fB\-l\fR LOG_LEVEL, \fB\-\-log\-level\fR=\fI\,LOG_LEVEL\/\fR Log level for the Fail2Ban logger to use .TP \fB\-v\fR, \fB\-\-verbose\fR @@ -70,6 +70,9 @@ Do not print any missed lines \fB\-\-print\-no\-ignored\fR Do not print any ignored lines .TP +\fB\-\-print\-all\-matched\fR +Print all matched lines +.TP \fB\-\-print\-all\-missed\fR Print all missed lines, no matter how many .TP diff --git a/man/fail2ban-server.1 b/man/fail2ban-server.1 index b49c0173..6aa51053 100644 --- a/man/fail2ban-server.1 +++ b/man/fail2ban-server.1 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.2. -.TH FAIL2BAN-SERVER "1" "March 2014" "fail2ban-server v0.9.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. +.TH FAIL2BAN-SERVER "1" "October 2014" "fail2ban-server v0.9.1" "User Commands" .SH NAME fail2ban-server \- start the server .SH SYNOPSIS .B fail2ban-server -[\fIOPTIONS\fR] +[\fI\,OPTIONS\/\fR] .SH DESCRIPTION -Fail2Ban v0.9.0 reads log file that contains password failure report +Fail2Ban v0.9.1 reads log file that contains password failure report and bans the corresponding IP addresses using firewall rules. .PP Only use this command for debugging purpose. Start the server with From a0115ee4582e0befbcd7664989b6ab87f8d226a2 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 27 Oct 2014 21:49:40 -0400 Subject: [PATCH 5/6] ENH: additional versioning changes --- README.md | 4 ++-- RELEASE | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 54d5e3bb..6afb5457 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ Optional: To install, just do: - tar xvfj fail2ban-0.9.0.tar.bz2 - cd fail2ban-0.9.0 + tar xvfj fail2ban-0.9.1.tar.bz2 + cd fail2ban-0.9.1 python setup.py install This will install Fail2Ban into the python library directory. The executable diff --git a/RELEASE b/RELEASE index 9ce304c0..23bb8382 100644 --- a/RELEASE +++ b/RELEASE @@ -61,24 +61,24 @@ Preparation * Which indicates that testcases/files/logs/mysqld.log has been moved or is a directory:: - tar -C /tmp -jxf dist/fail2ban-0.9.0.tar.bz2 + tar -C /tmp -jxf dist/fail2ban-0.9.1.tar.bz2 * clean up current direcory:: - diff -rul --exclude \*.pyc . /tmp/fail2ban-0.9.0/ + diff -rul --exclude \*.pyc . /tmp/fail2ban-0.9.1/ * Only differences should be files that you don't want distributed. * Ensure the tests work from the tarball:: - cd /tmp/fail2ban-0.9.0/ && export PYTHONPATH=`pwd` && bin/fail2ban-testcases + cd /tmp/fail2ban-0.9.1/ && export PYTHONPATH=`pwd` && bin/fail2ban-testcases * Add/finalize the corresponding entry in the ChangeLog * To generate a list of committers use e.g.:: - git shortlog -sn 0.8.12.. | sed -e 's,^[ 0-9\t]*,,g' | tr '\n' '\|' | sed -e 's:|:, :g' + git shortlog -sn 0.9.1.. | sed -e 's,^[ 0-9\t]*,,g' | tr '\n' '\|' | sed -e 's:|:, :g' * Ensure the top of the ChangeLog has the right version and current date. * Ensure the top entry of the ChangeLog has the right version and current date. From 7acddcbe4afd1df547da151414cbe4f245d60ca1 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 27 Oct 2014 23:45:51 -0400 Subject: [PATCH 6/6] Post-release boost to .dev --- ChangeLog | 12 +++++++++++- README.md | 2 +- RELEASE | 14 +++++++------- fail2ban/version.py | 2 +- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc3999ce..ffddd52b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,9 +4,19 @@ |_| \__,_|_|_/___|_.__/\__,_|_||_| ================================================================================ -Fail2Ban (version 0.9.1) 2014/10/29 +Fail2Ban (version 0.9.1.dev) 2014/10/29 ================================================================================ +ver. 0.9.2 (2014/XX/XXX) - wanna-be-released +----------- + +- Fixes: + +- New Features: + +- Enhancements: + + ver. 0.9.1 (2014/10/29) - better, faster, stronger ---------- diff --git a/README.md b/README.md index 6afb5457..8210837e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ / _|__ _(_) |_ ) |__ __ _ _ _ | _/ _` | | |/ /| '_ \/ _` | ' \ |_| \__,_|_|_/___|_.__/\__,_|_||_| - v0.9.1 2014/10/29 + v0.9.1.dev 2014/??/?? ## Fail2Ban: ban hosts that cause multiple authentication errors diff --git a/RELEASE b/RELEASE index 23bb8382..db425a45 100644 --- a/RELEASE +++ b/RELEASE @@ -61,24 +61,24 @@ Preparation * Which indicates that testcases/files/logs/mysqld.log has been moved or is a directory:: - tar -C /tmp -jxf dist/fail2ban-0.9.1.tar.bz2 + tar -C /tmp -jxf dist/fail2ban-0.9.2.tar.bz2 * clean up current direcory:: - diff -rul --exclude \*.pyc . /tmp/fail2ban-0.9.1/ + diff -rul --exclude \*.pyc . /tmp/fail2ban-0.9.2/ * Only differences should be files that you don't want distributed. * Ensure the tests work from the tarball:: - cd /tmp/fail2ban-0.9.1/ && export PYTHONPATH=`pwd` && bin/fail2ban-testcases + cd /tmp/fail2ban-0.9.2/ && export PYTHONPATH=`pwd` && bin/fail2ban-testcases * Add/finalize the corresponding entry in the ChangeLog * To generate a list of committers use e.g.:: - git shortlog -sn 0.9.1.. | sed -e 's,^[ 0-9\t]*,,g' | tr '\n' '\|' | sed -e 's:|:, :g' + git shortlog -sn 0.9.2.. | sed -e 's,^[ 0-9\t]*,,g' | tr '\n' '\|' | sed -e 's:|:, :g' * Ensure the top of the ChangeLog has the right version and current date. * Ensure the top entry of the ChangeLog has the right version and current date. @@ -101,7 +101,7 @@ Preparation * Tag the release by using a signed (and annotated) tag. Cut/paste release ChangeLog entry as tag annotation:: - git tag -s 0.9.1 + git tag -s 0.9.2 Pre Release =========== @@ -144,7 +144,7 @@ Pre Release * https://bugs.mageia.org/buglist.cgi?quicksearch=fail2ban - * An potentially to the fail2ban-users email list. + * And potentially to the fail2ban-users email list. * Wait for feedback from distributors @@ -185,7 +185,7 @@ Post Release Add the following to the top of the ChangeLog:: - ver. 0.9.2 (2014/XX/XXX) - wanna-be-released + ver. 0.9.3 (2014/XX/XXX) - wanna-be-released ----------- - Fixes: diff --git a/fail2ban/version.py b/fail2ban/version.py index f7b776cd..146b76aa 100644 --- a/fail2ban/version.py +++ b/fail2ban/version.py @@ -24,4 +24,4 @@ __author__ = "Cyril Jaquier, Yaroslav Halchenko, Steven Hiscocks, Daniel Black" __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2011-2014 Yaroslav Halchenko, 2013-2013 Steven Hiscocks, Daniel Black" __license__ = "GPL-v2+" -version = "0.9.1" +version = "0.9.1.dev"