# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1450713378 28800
# Node ID 0e736950a117520837e523a5e64dea4c70c550d4
# Parent  47db94733fe2763bb8511564b50f740334510ad2
fix post uninstall script; allow config bucket count zero to disable a pattern

diff -r 47db94733fe2 -r 0e736950a117 ChangeLog
--- a/ChangeLog	Sat Dec 19 12:57:42 2015 -0800
+++ b/ChangeLog	Mon Dec 21 07:56:18 2015 -0800
@@ -1,5 +1,9 @@
-1.16 2015-12-19
+1.16 2015-12-21
      good authentication prevents ip blocking for awhile
+     fix default config regular expressions for geedy matching
+     add manual blocking and unblocking expressions
+     fix post uninstall script
+     allow config bucket count zero to disable a pattern
 
 1.15 2014-10-02
      add script to build syslog2iptables.conf
diff -r 47db94733fe2 -r 0e736950a117 src/syslogconfig.cpp
--- a/src/syslogconfig.cpp	Sat Dec 19 12:57:42 2015 -0800
+++ b/src/syslogconfig.cpp	Mon Dec 21 07:56:18 2015 -0800
@@ -95,7 +95,7 @@
             }
         }
 
-        else {  // amount < 0
+        else if (amount < 0) {
             char buf[maxlen];
             in_addr ad;
             ad.s_addr = htonl(ip);
diff -r 47db94733fe2 -r 0e736950a117 syslog2iptables.conf.top
--- a/syslog2iptables.conf.top	Sat Dec 19 12:57:42 2015 -0800
+++ b/syslog2iptables.conf.top	Mon Dec 21 07:56:18 2015 -0800
@@ -80,11 +80,11 @@
             bucket 100;
             message "sendmail authentication attack";
         };
-        pattern "rejecting commands from.* \[(.*)\] due to pre-greeting traffic" {
-            index 1;    // zero based
-            bucket 0;   // disable - iphone setup trips this; bucket 1800;
-            message "sendmail pre-greeting";
-        };
+        #pattern "rejecting commands from.* \[(.*)\] due to pre-greeting traffic" {
+        #    index 1;    // zero based
+        #    bucket 0;   // disable - iphone setup trips this; bucket 1800;
+        #    message "sendmail pre-greeting";
+        #};
         pattern "authentication failure: checkpass failed, .*\[(.*)\]" {
             index 1;    // zero based
             bucket 100;
diff -r 47db94733fe2 -r 0e736950a117 syslog2iptables.spec.in
--- a/syslog2iptables.spec.in	Sat Dec 19 12:57:42 2015 -0800
+++ b/syslog2iptables.spec.in	Mon Dec 21 07:56:18 2015 -0800
@@ -3,7 +3,7 @@
 Summary:            Syslog to iptables dynamic firewall
 Name:               @PACKAGE@
 Version:            @VERSION@
-Release:            2%{?dist}
+Release:            3%{?dist}
 License:            GPLv3+
 Group:              System Environment/Daemons
 Source:             http://www.five-ten-sg.com/%{name}/packages/%{name}-%{version}.tar.gz
@@ -54,7 +54,7 @@
 
 
 %postun
-[ $1 = 0 ] && /sbin/chkconfig --del %{name}
+[ $1 = 0 ] && /sbin/chkconfig --del %{name} || :
 
 
 %files
@@ -72,6 +72,10 @@
 
 
 %changelog
+* Mon Dec 21 2015 Carl Byington <carl@five-ten-sg.com> - 1.16-3
+- fix post uninstall script
+- allow config bucket count zero to disable a pattern
+
 * Sat Dec 19 2015 Carl Byington <carl@five-ten-sg.com> - 1.16-2
 - fix default config regular expressions