|
[-]
[+]
|
Changed |
cluebringer.changes
|
|
|
|
[-]
[+]
|
Changed |
cluebringer.spec
^
|
|
|
|
[-]
[+]
|
Changed |
cluebringer-2.0.12.tar.bz2/ChangeLog
^
|
| @@ -1,3 +1,65 @@
+commit d225600c4b9f6565f8469deaf124896deb651fd3
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date: Thu May 10 06:31:54 2012 +0000
+
+ Bumped to v2.0.12
+
+commit e85b3b11fb3b096e914c331255dd28b35e413c59
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date: Mon Feb 27 05:24:03 2012 +0000
+
+ Fixed name of changelog file
+
+commit 37cbed57c8190c630a77f005eb9fcaa7a7db6c64
+Merge: 19e264a c487e36
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date: Sun Jul 31 21:48:44 2011 +0000
+
+ Merge branch 'v2.0.x' of git.devlabs.linuxassist.net:policyd into v2.0.x
+
+commit 19e264acd5b870b9e7bac3b2d54734e145d85d71
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date: Sun Jul 31 21:46:29 2011 +0000
+
+ Fixed splitting up of cidr_allow & cidr_deny
+ - Thanks Ben Heilman
+ ref: http://devlabs.linuxassist.net/issues/91
+
+commit c487e36f95c29051d7921c75b140357bf0428e43
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date: Thu Jul 7 09:47:48 2011 +0000
+
+ Added patch by randerson to support MySQL 5.5
+
+commit c7e5131c104c58ef97987ecbf9954a5c8c7d3f39
+Author: Robert Anderson <randerson@lbsd.net>
+Date: Fri May 6 11:41:24 2011 +0000
+
+ Improved error handling for cleanup
+
+ Return -1 as used in the rest of policyd cleanup instead of carrying on after an error
+
+commit e6e98822bb8c571f6c05272c884dcdae4858f770
+Author: Robert Anderson <randerson@lbsd.net>
+Date: Tue May 3 08:35:28 2011 +0000
+
+ Use size values as kbyte instead of byte
+
+ Convert bytes to kbytes on a new request
+ Updated UPGRADING file with details on how to modify the database to accommodate the changes to policyd
+
+ NOTE: This commit will change the behaviour of message size counters used in policyd!
+
+ The following changes will need to be made to your database:
+
+ UPDATE quotas_limits, quotas_tracking
+ SET quotas_limits.CounterLimit = ceil(quotas_limits.CounterLimit / 1024),
+ quotas_tracking.Counter = ceil(quotas_tracking.Counter / 1024)
+ WHERE quotas_tracking.QuotasLimitsID = quotas_limits.ID
+ AND quotas_limits.Type = "MessageCumulativeSize";
+
+ UPDATE session_tracking SET Size = ceil(Size / 1024);
+
commit 21ef1a8029cfde32b4a1c1943bc450bbe5e84484
Author: Nigel Kukard <nkukard@lbsd.net>
Date: Thu Apr 21 06:13:44 2011 +0000
|
|
[-]
[+]
|
Added |
cluebringer-2.0.12.tar.bz2/UPGRADING
^
|
| @@ -0,0 +1,10 @@
+Updating database for 7ad3d831d7862d95d59a72ed19764264cc77c4b7
+--------------------------------------------------------------
+
+UPDATE quotas_limits, quotas_tracking
+ SET quotas_limits.CounterLimit = ceil(quotas_limits.CounterLimit / 1024),
+ quotas_tracking.Counter = ceil(quotas_tracking.Counter / 1024)
+ WHERE quotas_tracking.QuotasLimitsID = quotas_limits.ID
+ AND quotas_limits.Type = "MessageCumulativeSize";
+
+UPDATE session_tracking SET Size = ceil(Size / 1024);
|
|
[-]
[+]
|
Changed |
cluebringer-2.0.12.tar.bz2/cbp/modules/Core.pm
^
|
| @@ -53,6 +53,7 @@
");
if (!$sth) {
$server->log(LOG_ERR,"[CORE] Failed to remove old session tracking records: ".cbp::dblayer::Error());
+ return -1;
}
$server->log(LOG_INFO,"[CORE] Removed ".( $sth ne "0E0" ? $sth : 0)." records from session tracking table");
}
|
|
[-]
[+]
|
Changed |
cluebringer-2.0.12.tar.bz2/cbp/modules/Quotas.pm
^
|
| @@ -730,6 +730,7 @@
");
if (!$sth) {
$server->log(LOG_ERR,"[QUOTAS] Failed to remove old quota tracking records: ".cbp::dblayer::Error());
+ return -1;
}
$server->log(LOG_INFO,"[QUOTAS] Removed ".( $sth ne "0E0" ? $sth : 0).." records from tracking table");
}
|
|
[-]
[+]
|
Changed |
cluebringer-2.0.12.tar.bz2/cbp/tracking.pm
^
|
| @@ -37,6 +37,7 @@
use cbp::logging;
use cbp::policies;
use cbp::system qw(parseCIDR);
+use POSIX qw( ceil );
use Data::Dumper;
@@ -138,6 +139,12 @@
return -1;
}
+ # Change size to kbyte, we don't want to use bytes
+ my $requestSize;
+ if (defined($request->{'size'})) {
+ $requestSize = ceil($request->{'size'} / 1024);
+ }
+
my $row = $sth->fetchrow_hashref();
# If no state information, create everything we need
@@ -176,7 +183,7 @@
".DBQuote($request->{'sasl_username'}).",
".DBQuote($request->{'helo_name'}).",
".DBQuote($request->{'sender'}).",
- ".DBQuote($request->{'size'})."
+ ".DBQuote($requestSize)."
)
");
if (!$sth) {
@@ -203,7 +210,7 @@
$sessionData->{'SASLUsername'} = $request->{'sasl_username'};
$sessionData->{'Helo'} = $request->{'helo_name'};
$sessionData->{'Sender'} = $request->{'sender'};
- $sessionData->{'Size'} = $request->{'size'};
+ $sessionData->{'Size'} = $requestSize;
$sessionData->{'RecipientData'} = "";
}
@@ -232,7 +239,7 @@
$server->log(LOG_DEBUG,"[TRACKING] Decoded into: ".Dumper($sessionData->{'_Recipient_To_Policy'})) if ($log);
# This must be updated here ... we may of got actual size
- $sessionData->{'Size'} = $request->{'size'};
+ $sessionData->{'Size'} = $requestSize;
# Only get a queue id once we have gotten the message
$sessionData->{'QueueID'} = $request->{'queue_id'};
}
|
|
[-]
[+]
|
Changed |
cluebringer-2.0.12.tar.bz2/cbp/version.pm
^
|
| @@ -34,7 +34,7 @@
use constant {
- VERSION => "2.0.11",
+ VERSION => "2.0.12",
};
# vim: ts=4
|
|
[-]
[+]
|
Changed |
cluebringer-2.0.12.tar.bz2/cbpolicyd
^
|
| @@ -126,11 +126,11 @@
# Fix up these ...
if (defined($server->{'cidr_allow'})) {
- my @lst = split(/,\s;/,$server->{'cidr_allow'});
+ my @lst = split(/[,\s;]+/,$server->{'cidr_allow'});
$server->{'cidr_allow'} = \@lst;
}
if (defined($server->{'cidr_deny'})) {
- my @lst = split(/,\s;/,$server->{'cidr_deny'});
+ my @lst = split(/[,\s;]+/,$server->{'cidr_deny'});
$server->{'cidr_deny'} = \@lst;
}
|
|
[-]
[+]
|
Changed |
cluebringer-2.0.12.tar.bz2/cluebringer.spec
^
|
| @@ -2,7 +2,7 @@
# this path is hardcoded
%define cblibdir %{_libdir}/policyd-2.0
-%define version 2.0.11a
+%define version 2.0.12
%define release 1
%define tarver %{version}
@@ -93,7 +93,7 @@
# Docdir
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/contrib
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/database
-install -m 644 AUTHORS INSTALL LICENSE TODO WISHLIST CHANGELOG $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 AUTHORS INSTALL LICENSE TODO WISHLIST ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -R contrib $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/contrib/amavisd-new
install -m 644 database/*.sql $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/database
@@ -127,6 +127,9 @@
%changelog
+* Thu May 10 2012 Nigel Kukard <nkukard@lbsd.net>
+- 2.0.12 release
+
* Wed Oct 14 2009 Nigel Kukard <nkukard@lbsd.net>
- 2.0.8 release
|
|
[-]
[+]
|
Changed |
cluebringer-2.0.12.tar.bz2/database/convert-tsql
^
|
| @@ -26,6 +26,7 @@
echo "Usage: $0 <database type> <file>"
echo
echo "Valid database types:"
+ echo " mysql55 - For MySQL v5.5"
echo " mysql4 - For MySQL v4"
echo " mysql - For MySQL v5"
echo " pgsql - For PostgreSQL"
@@ -52,6 +53,19 @@
# Check what we converting for
case "$database" in
+ "mysql55")
+ sed \
+ -e "s/@PREFIX@/$prefix/g" \
+ -e 's/@PRELOAD@/SET FOREIGN_KEY_CHECKS=0;/' \
+ -e 's/@POSTLOAD@/SET FOREIGN_KEY_CHECKS=1;/' \
+ -e 's/@CREATE_TABLE_SUFFIX@/ENGINE=InnoDB CHARACTER SET latin1 COLLATE latin1_bin/' \
+ -e 's/@SERIAL_TYPE@/SERIAL/' \
+ -e 's/@BIGINT_UNSIGNED@/BIGINT UNSIGNED/' \
+ -e 's/@INT_UNSIGNED@/INT UNSIGNED/' \
+ -e 's/@TRACK_KEY_LEN@/512/' \
+ -e 's/@SERIAL_REF_TYPE@/BIGINT UNSIGNED/' < "$file"
+ ;;
+
"mysql4")
sed \
-e 's/@PRELOAD@/SET FOREIGN_KEY_CHECKS=0;/' \
|
