Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 mail/greylist/DETAILS       |    1 +
 mail/greylist/HISTORY       |    5 +++++
 mail/greylist/PRE_BUILD     |    3 +++
 mail/greylist/collect.patch |   23 +++++++++++++++++++++++
 4 files changed, 32 insertions(+)

New commits:
commit f3da855c3862086e1776f6c278d6d3780da69a63
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    greylist: fixed collecting triplets (init mode support)

diff --git a/mail/greylist/DETAILS b/mail/greylist/DETAILS
index 7ca9c6b..26f9a7d 100755
--- a/mail/greylist/DETAILS
+++ b/mail/greylist/DETAILS
@@ -1,5 +1,6 @@
            SPELL=greylist
          VERSION=2
+      PATCHLEVEL=1
           SOURCE=${SPELL}-release-${VERSION}.tar.gz
    SOURCE_URL[0]=http://mimo.gn.apc.org/system/files/file/${SOURCE}
      
SOURCE_HASH=sha512:cc31e0918226d5c704e950394667e83106ed9ce80540e8ba424c66d907f6e8fe5bfe36186c9e1869b290919db3cafa96c45ff787780b841b2c7ea7ddcdd5637b
diff --git a/mail/greylist/HISTORY b/mail/greylist/HISTORY
index 6398dda..0388899 100644
--- a/mail/greylist/HISTORY
+++ b/mail/greylist/HISTORY
@@ -1,3 +1,8 @@
+2013-06-26 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * PRE_BUILD: apply patch
+       * collect.patch: added, to fix collecting triplets (init mode support)
+
 2013-01-27 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: corrected license array
 
diff --git a/mail/greylist/PRE_BUILD b/mail/greylist/PRE_BUILD
index aed13af..458066b 100755
--- a/mail/greylist/PRE_BUILD
+++ b/mail/greylist/PRE_BUILD
@@ -10,6 +10,9 @@ patch -p0 < "$SPELL_DIRECTORY/dbi.patch" &&
 # fix build with new Boost >= 1.49
 patch -p0 < "$SPELL_DIRECTORY/boost-149.patch" &&
 
+# fix collecting triplets (timeout=0)
+patch -p0 < "$SPELL_DIRECTORY/collect.patch" &&
+
 # fixed SQL syntax error when doing query on table
 # (missing ` after table name in case with no 'where' clause)
 patch -p0 < "$SPELL_DIRECTORY/query.patch"
diff --git a/mail/greylist/collect.patch b/mail/greylist/collect.patch
new file mode 100644
index 0000000..0ebd19c
--- /dev/null
+++ b/mail/greylist/collect.patch
@@ -0,0 +1,23 @@
+--- src/greylist.h.orig        2010-09-07 01:55:58.000000000 +0400
++++ src/greylist.h     2013-06-26 19:19:21.958909736 +0400
+@@ -34,8 +34,18 @@
+     unsigned long count, uts;
+     if (!findTriplet(triplet, id, count, uts)) {
+       insertTriplet(triplet);
+-      extra.setPrefix("new");
+-      return Core::defer;
++      if (_timeout == 0) {
++        /* collecting triplets (from 
http://mimo.gn.apc.org/greylist/configuration/policy):
++
++           There is no support for the init mode - create the database 
structure manually
++           and use timeout=0 to collect triplets without greylisting.
++        */
++        extra.set("ok", 0, _timeout);
++        return Core::dunno;
++      } else {
++        extra.setPrefix("new");
++        return Core::defer;
++      }
+     }
+     unsigned long lNow = getNow();
+     unsigned long lTimeDiff = 0;