From afa639f1215d720cbef34b3055871245548ac705 Mon Sep 17 00:00:00 2001 From: Ivan Rako Date: Wed, 28 Aug 2013 16:10:12 +0200 Subject: [PATCH] priprema za wheezy --- debian/changelog | 10 ++++++++++ debian/compat | 2 +- debian/control | 8 ++++---- debian/copyright | 2 +- debian/install | 1 - debian/postinst | 22 ++++------------------ debian/postrm | 51 --------------------------------------------------- dovecot.conf | 21 --------------------- 8 files changed, 20 insertions(+), 97 deletions(-) delete mode 100644 debian/install delete mode 100755 debian/postrm delete mode 100644 dovecot.conf diff --git a/debian/changelog b/debian/changelog index ca68088..950a1ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +fail2ban-cn (0.8.6~cn0) stable; urgency=low + + * Prva verzija za wheezy + * Podrska za Dovecot je sada u Debianovom paketu + * Ispravke za Lintian + * Izbacen debian/postrm jer nije potreban (izbacivao je konfiguraciju + za Dovecot) + + -- Ivan Rako Wed, 28 Aug 2013 15:57:09 +0200 + fail2ban-cn (0.8.5) stable; urgency=low * nova Dovecot pravila diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index e0c5363..d302e40 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ Source: fail2ban-cn Section: net Priority: optional -Maintainer: Dinko Korunic -Build-Depends: debhelper (>= 7) -Standards-Version: 3.9.1 +Maintainer: Ivan Rako +Build-Depends: debhelper (>= 8) +Standards-Version: 3.9.3 Package: fail2ban-cn Architecture: all -Depends: fail2ban (>= 0.8.4-3), gamin (>= 0.1.10-2+b1), python-gamin (>= 0.1.10-2+b1), ${misc:Depends} +Depends: ${misc:Depends}, fail2ban (>= 0.8.6), gamin (>= 0.1.10-4.1), python-gamin (>= 0.1.10-4.1) Description: bans IPs that cause multiple authentication errors Monitors log files (e.g. /var/log/auth.log, /var/log/apache/access.log) and temporarily or persistently bans diff --git a/debian/copyright b/debian/copyright index 5350ae7..28add9f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Copyright 2011 CARNet +Copyright 2006 CARNet You are free to distribute this software package under the terms of the GNU General Public License. diff --git a/debian/install b/debian/install deleted file mode 100644 index e124ce9..0000000 --- a/debian/install +++ /dev/null @@ -1 +0,0 @@ -dovecot.conf etc/fail2ban/filter.d diff --git a/debian/postinst b/debian/postinst index 86f1150..4adc7bc 100755 --- a/debian/postinst +++ b/debian/postinst @@ -30,35 +30,21 @@ esac # import CN-functions . /usr/share/carnet-tools/functions.sh -CONF=/etc/fail2ban/jail.conf +CONF="/etc/fail2ban/jail.conf" if [ -e "$CONF" ]; then # enable ssh, pam-generic, sasl, proftpd and vsftpd service - echo "CN: Enabling SSH, PAM-generic, SASL, Proftpd and Vsftpd support" - perl -ne 'if (/^\[(ssh|pam-generic|sasl|proftpd|vsftpd)\]/ .. /^enabled/) { $_ =~ s/^enabled\s+=\s+false/enabled = true/gi }; print $_' "$CONF" > "$CONF.$$" && \ + echo "CN: Enabling SSH, PAM-generic, SASL, ProFTPD, vsftpd and Dovecot support..." + perl -ne 'if (/^\[(ssh|pam-generic|sasl|proftpd|vsftpd|dovecot)\]/ .. /^enabled/) { $_ =~ s/^enabled\s+=\s+false/enabled = true/gi }; print $_' "$CONF" > "$CONF.$$" && \ cp_mv "$CONF.$$" "$CONF" rm -f "$CONF.$$" - # enable dovecot service - echo "CN: Enabling full Dovecot support" - cp -a "$CONF" "$CONF.$$" - cp-update fail2ban-cn "$CONF.$$" < `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' overwrit>r> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -case "$1" in - purge) - # continue below - ;; - - *) - exit 0 - ;; -esac - -# import CN-functions -. /usr/share/carnet-tools/functions.sh - -CONF=/etc/fail2ban/jail.conf - -# remove us from inittab -echo "CN: Removing Dovecot support" -cp-update -r fail2ban-cn "$CONF" - -# restart the services -if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d fail2ban restart || exit $? -else - /etc/init.d/fail2ban restart || exit $? -fi - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/dovecot.conf b/dovecot.conf deleted file mode 100644 index d3bd851..0000000 --- a/dovecot.conf +++ /dev/null @@ -1,21 +0,0 @@ -# Fail2Ban configuration file -# -# Author: CARNet grupa za pakete - -[Definition] - -# Option: failregex -# Notes.: regex to match the password failures messages in the logfile. The -# host must be matched by a group named "host". The tag "" can -# be used for standard IP/hostname matching and is only an alias for -# (?:::f{4,6}:)?(?P\S+) -# Values: TEXT -# -#failregex = dovecot.*auth\(default\): pam\(.*,\): pam_authenticate\(\) failed: -failregex = (?: pop3-login|imap-login): (?:Authentication failure|Aborted login \(auth failed|Aborted login \(tried to use disabled|Disconnected \(auth failed).*rip=(?P\S*),.* - -# Option: ignoreregex -# Notes.: regex to ignore. If this regex matches, the line is ignored. -# Values: TEXT -# -ignoreregex = -- 1.7.10.4