Upgraded to fresh upstream 0.8.0

CHANGELOG

@@ -4,9 +4,14 @@
              |_| \__,_|_|_/___|_.__/\__,_|_||_|
 
 =============================================================
-Fail2Ban (version 0.7.9)                           2007/04/19
+Fail2Ban (version 0.8.0)                           2007/05/03
 =============================================================
 
+ver. 0.8.0 (2007/05/03) - stable
+----------
+- Fixed RedHat init script. Thanks to Jonathan Underwood
+- Added Solaris 10 files. Thanks to Hanno 'Rince' Wagner
+
 ver. 0.7.9 (2007/04/19) - release candidate
 ----------
 - Close opened handlers. Thanks to Yaroslav Halchenko

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: fail2ban
-Version: 0.7.9
+Version: 0.8.0
 Summary: Ban IPs that make too many password failure
 Home-page: http://fail2ban.sourceforge.net
 Author: Cyril Jaquier

README

@@ -4,7 +4,7 @@
              |_| \__,_|_|_/___|_.__/\__,_|_||_|
 
 =============================================================
-Fail2Ban (version 0.7.9)                           2007/04/19
+Fail2Ban (version 0.8.0)                           2007/05/03
 =============================================================
 
 Fail2Ban scans log files like /var/log/pwdfail and bans IP
@@ -28,16 +28,15 @@ Optional:
 
 To install, just do:
 
-> tar xvfj fail2ban-0.7.9.tar.bz2
-> cd fail2ban-0.7.9
+> tar xvfj fail2ban-0.8.0.tar.bz2
+> cd fail2ban-0.8.0
 > python setup.py install
 
 This will install Fail2Ban into /usr/share/fail2ban. The
 executable scripts are placed into /usr/bin.
 
-Gentoo: ebuilds are available on the website.
-Debian: Fail2Ban is in Debian unstable.
-RedHat: packages are available on the website.
+It is possible that Fail2ban is already packaged for your
+distribution. In this case, you should use it.
 
 Fail2Ban should be correctly installed now. Just type:
 
@@ -74,7 +73,7 @@ Jonathan Kamens, Stephen Gildea, Markus Hoffmann, Mark
 Edgington, Patrick Börjesson, kojiro, zugeschmiert, Tyler,
 Nick Munger, Christoph Haas, Justin Shore, Joël Bertrand,
 René Berber, mEDI, Axel Thimm, Eric Gerbier, Christian Rauch,
-Michael C. Haller
+Michael C. Haller, Jonathan Underwood, Hanno 'Rince' Wagner
 
 License:
 --------

common/version.py

@@ -16,12 +16,12 @@
 
 # Author: Cyril Jaquier
 # 
-# $Revision: 571 $
+# $Revision: 578 $
 
 __author__ = "Cyril Jaquier"
-__version__ = "$Revision: 571 $"
-__date__ = "$Date: 2007-04-19 23:57:27 +0200 (Thu, 19 Apr 2007) $"
+__version__ = "$Revision: 578 $"
+__date__ = "$Date: 2007-05-03 22:30:28 +0200 (Thu, 03 May 2007) $"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"
 
-version = "0.7.9"
+version = "0.8.0"

files/redhat-initd

@@ -20,14 +20,14 @@ FAIL2BAN="/usr/bin/fail2ban-client"
 RETVAL=0
 
 getpid() {
-        #pid=`ps -ef | grep fail2ban-|grep -v grep|grep -v bash|awk '{print $2}'`
-        pid=`ps -ef | grep fail2ban-|grep -v grep|awk '{print $2}'`
+    pid=`ps -ef | grep fail2ban-|grep -v grep|awk '{print $2}'`
 }
 
 start() {
     echo -n $"Starting fail2ban: "
     getpid
     if [ -z "$pid" ]; then
+	rm -rf /tmp/fail2ban.sock # in case of unclean shutdown
         $FAIL2BAN start > /dev/null
         RETVAL=$?
     fi
@@ -47,7 +47,6 @@ stop() {
     RETVAL=$?
     if [ -n "$pid" ]; then
         $FAIL2BAN stop > /dev/null
-    fi
     sleep 1
     getpid
     if [ -z "$pid" ]; then
@@ -56,6 +55,9 @@ stop() {
     else
         echo_failure
     fi
+    else
+        echo_failure
+    fi
     echo
     return $RETVAL
 }
@@ -72,13 +74,14 @@ case "$1" in
         getpid
         if [ -n "$pid" ]; then
                 echo "Fail2ban (pid $pid) is running..."
+                $FAIL2BAN status
         else
                 RETVAL=1
                 echo "Fail2ban is stopped"
         fi
         ;;
   restart)
-  		stop
+        stop
         start
         ;;
   *)

files/solaris-fail2ban.xml

@@ -0,0 +1,74 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<!--
+	Hanno 'Rince' Wagner 03 2007
+	Service manifest for fail2ban
+	E-Mail: wagner@rince.de
+-->
+
+<service_bundle type='manifest' name='fail2ban:fail2ban'>
+
+<service
+	name='network/fail2ban'
+	type='service'
+	version='1'>
+	<create_default_instance enabled='false' />
+	<single_instance />
+
+	<dependency name='fs'
+		grouping='require_all'
+		restart_on='none'
+		type='service'>
+		<service_fmri value='svc:/system/filesystem/local' />
+	</dependency>
+
+	<dependency name='net'
+		grouping='require_all'
+		restart_on='none'
+		type='service'>
+		<service_fmri value='svc:/network/loopback' />
+	</dependency>
+
+
+	<exec_method
+		type='method'
+		name='start'
+		exec='/lib/svc/method/svc-fail2ban start'
+		timeout_seconds='-1'>
+		<method_context>
+			<method_credential user='root' group='root' />
+		</method_context>
+	</exec_method>
+
+	<exec_method
+		type='method'
+		name='stop'
+		exec='/lib/svc/method/svc-fail2ban stop'
+		timeout_seconds='-1'>
+	</exec_method>
+
+        <exec_method
+                type='method'
+                name='reload'
+                exec='/lib/svc/method/svc-fail2ban reload'
+                timeout_seconds='-1'>
+        </exec_method>
+
+       <exec_method
+                type='method'
+                name='refresh'
+                exec='/lib/svc/method/svc-fail2ban refresh'
+                timeout_seconds='-1'>
+        </exec_method>
+
+
+	<exec_method
+		type='method'
+		name='restart'
+		exec='/lib/svc/method/svc-fail2ban restart'
+		timeout_seconds='-1'>
+	</exec_method>
+
+</service>
+
+</service_bundle>

files/solaris-svc-fail2ban

@@ -0,0 +1,47 @@
+#!/usr/bin/bash -e
+#
+# fail2ban		This init.d script is used to start fail2ban.
+# (C) by Hanno Wagner <wagner@rince.de>, License is GPL
+
+#set -x
+
+. /lib/svc/share/smf_include.sh
+
+set -e
+
+
+F2B_CONF="/etc/fail2ban/fail2ban.conf"
+if [ -n "$2" ] && [ -f "$F2B_CONF" ]; then
+  F2B_CONF="$2"
+fi
+
+ENV="/usr/bin/env -i LANG=C PATH=/usr/local/bin:/usr/bin:/bin:/opt/sfw/bin:/usr/sfw/bin"
+
+case $1 in
+	start)
+		[ -f /etc/fail2ban.conf ] || touch /etc/fail2ban.conf
+		echo "Starting fail2ban-server with $F2B_CONF"
+		eval $ENV /usr/local/bin/fail2ban-client start &
+	;;
+	stop)
+		echo "Stopping fail2ban-server with $F2B_CONF"
+		eval $ENV /usr/local/bin/fail2ban-client stop &
+	;;
+	reload | refresh )
+		echo "Reloading fail2ban-server with $F2B_CONF"
+		eval $ENV /usr/local/bin/fail2ban-client reload &
+	;;
+	restart | force-reload)
+		echo "Forcing reload of fail2ban-server with $F2B_CONF"
+		eval $ENV /usr/local/bin/fail2ban-client stop &
+		sleep 2
+		eval $ENV /usr/local/bin/fail2ban-client start &
+	;;
+	status)
+		/usr/local/bin/fail2ban-client status &
+	;;
+	*)
+		echo "Usage: /lib/svc/method/svc-fail2ban start|stop|status|refresh|restart|reload|force-reload" >&2
+		exit 2
+	;;
+esac

man/fail2ban-client.1

@@ -1,11 +1,11 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH FAIL2BAN-CLIENT "1" "April 2007" "fail2ban-client v0.7.9" "User Commands"
+.TH FAIL2BAN-CLIENT "1" "May 2007" "fail2ban-client v0.8.0" "User Commands"
 .SH NAME
 fail2ban-client \- configure and control the server
 .SH DESCRIPTION
 [?1034hUsage: ../fail2ban\-client [OPTIONS] <COMMAND>
 .PP
-Fail2Ban v0.7.9 reads log file that contains password failure report
+Fail2Ban v0.8.0 reads log file that contains password failure report
 and bans the corresponding IP addresses using firewall rules.
 .SH OPTIONS
 .TP

man/fail2ban-regex.1

@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH FAIL2BAN-REGEX "1" "April 2007" "fail2ban-regex v0.7.9" "User Commands"
+.TH FAIL2BAN-REGEX "1" "May 2007" "fail2ban-regex v0.8.0" "User Commands"
 .SH NAME
 fail2ban-regex \- test Fail2ban "failregex" option
 .SH SYNOPSIS
 .B fail2ban-regex
 [\fIOPTIONS\fR] \fI<LOG> <REGEX>\fR
 .SH DESCRIPTION
-Fail2Ban v0.7.9 reads log file that contains password failure report
+Fail2Ban v0.8.0 reads log file that contains password failure report
 and bans the corresponding IP addresses using firewall rules.
 .PP
 This tools can test regular expressions for "fail2ban".

man/fail2ban-server.1

@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH FAIL2BAN-SERVER "1" "April 2007" "fail2ban-server v0.7.9" "User Commands"
+.TH FAIL2BAN-SERVER "1" "May 2007" "fail2ban-server v0.8.0" "User Commands"
 .SH NAME
 fail2ban-server \- start the server
 .SH SYNOPSIS
 .B fail2ban-server
 [\fIOPTIONS\fR]
 .SH DESCRIPTION
-Fail2Ban v0.7.9 reads log file that contains password failure report
+Fail2Ban v0.8.0 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