Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (91e1da7e0fe808593854b07064767b09bf501072)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (91e1da7e0fe808593854b07064767b09bf501072)
  • Date: Fri, 9 Mar 2012 13:23:28 -0600

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

mail/dspam/DETAILS | 2 -
mail/dspam/HISTORY | 4 ++-
mail/dspam/PRE_BUILD | 4 ++-
mail/dspam/rset.patch | 62
++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 69 insertions(+), 3 deletions(-)

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

dspam: fixed daemon crash in some case (official patch)

diff --git a/mail/dspam/DETAILS b/mail/dspam/DETAILS
index 7c01ae4..bb6d66d 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -18,7 +18,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-scm"
#SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
VERSION=3.10.1
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index 2a09561..fc8a3b0 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,5 +1,7 @@
2012-03-09 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: PATCHLEVEL=1
+ * DETAILS: PATCHLEVEL=2
+ * PRE_BUILD: apply the patch for non-scm version
+ * rset.patch: added official patch to prevent daemon crash in some
case
* init.d/dspam: renewed init script for recent version -- it can fork
to
background now finally

diff --git a/mail/dspam/PRE_BUILD b/mail/dspam/PRE_BUILD
index 0a0667e..137213d 100755
--- a/mail/dspam/PRE_BUILD
+++ b/mail/dspam/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
-if [[ $DSPAM_BRANCH == scm ]]; then
cd $SOURCE_DIRECTORY &&
+if [[ $DSPAM_BRANCH == scm ]]; then
aclocal &&
NOCONFIGURE=1 ./autogen.sh
+else
+ patch -p0 < "$SPELL_DIRECTORY/rset.patch"
fi
diff --git a/mail/dspam/rset.patch b/mail/dspam/rset.patch
new file mode 100644
index 0000000..883bc58
--- /dev/null
+++ b/mail/dspam/rset.patch
@@ -0,0 +1,62 @@
+--- src/daemon.c.orig
++++ src/daemon.c
+@@ -1,4 +1,4 @@
+-/* $Id: daemon.c,v 1.22 2011/06/28 00:13:48 sbajic Exp $ */
++/* $Id: daemon.c,v 1.23 2012/02/09 22:05:07 sbajic Exp $ */
+
+ /*
+ DSPAM
+@@ -992,33 +992,37 @@ char *daemon_expect(THREAD_CTX *TTX, const char
*command) {
+ char buf[128];
+ char *cmd;
+
+- cmd = daemon_getline(TTX, 300);
++ cmd = daemon_getline(TTX, 300);
+ if (cmd == NULL)
+ return NULL;
+
+ while(strncasecmp(cmd, command, strlen(command))) {
+ if (!strncasecmp(cmd, "QUIT", 4)) {
+ free(cmd);
+- daemon_reply(TTX, LMTP_QUIT, "2.0.0", "OK");
++ daemon_reply(TTX, LMTP_QUIT, "2.0.0", "OK");
+ return NULL;
+- }
+- if (!strncasecmp(cmd, "RSET", 4)) {
++ } else if (!strncasecmp(cmd, "RSET", 4)) {
+ snprintf(buf, sizeof(buf), "%d OK", LMTP_OK);
+ if (send_socket(TTX, buf)<=0)
+ return NULL;
+ free(cmd);
+- return "RSET";
++ if (!strncasecmp(command, "LHLO", 4)) {
++ cmd = daemon_getline(TTX, 300);
++ if (cmd == NULL)
++ return NULL;
++ } else {
++ return "RSET";
++ }
++ } else {
++ snprintf(buf, sizeof(buf), "%d 5.0.0 Need %s here.", LMTP_BAD_CMD,
command);
++ if (send_socket(TTX, buf)<=0)
++ return NULL;
++ free(cmd);
++ cmd = daemon_getline(TTX, 300);
++ if (cmd == NULL)
++ return NULL;
+ }
+-
+- snprintf(buf, sizeof(buf), "%d 5.0.0 Need %s here.", LMTP_BAD_CMD,
command);
+-
+- if (send_socket(TTX, buf)<=0)
+- return NULL;
+- free(cmd);
+- cmd = daemon_getline(TTX, 300);
+- if (cmd == NULL)
+- return NULL;
+- }
++ }
+ return cmd;
+ }
+
+--



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (91e1da7e0fe808593854b07064767b09bf501072), Vlad Glagolev, 03/09/2012

Archive powered by MHonArc 2.6.24.

Top of Page