Skip to Content.
Sympa Menu

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

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 (3080a1b81ec74da0809900131d9cd458d18ccd49)
  • Date: Fri, 27 Apr 2012 06:02:55 -0500

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

mail/dspam/DETAILS | 3 --
mail/dspam/HISTORY | 3 ++
mail/dspam/PRE_BUILD | 2 -
mail/dspam/rset.patch | 62
--------------------------------------------------
mail/postfix/DETAILS | 2 -
mail/postfix/HISTORY | 3 ++
6 files changed, 8 insertions(+), 67 deletions(-)

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

postfix: => 2.9.2

commit 0fdc0b284a131f4f767556918ee9e4d17b0937e0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dspam: => 3.10.2

diff --git a/mail/dspam/DETAILS b/mail/dspam/DETAILS
index 1715e1d..5d160a3 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -17,8 +17,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-scm"
#
SOURCE_HASH=sha512:fd70938b3ef368fbfb992921a596972dc665ce9c6869ca362274c4bd02174fbfd3419438f63c1cdef06167fcde1ceea30fe359228642010bef4d77036e6bcf2f
#SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
- VERSION=3.10.1
- PATCHLEVEL=2
+ VERSION=3.10.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 f90e720..a460a84 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,6 @@
+2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.10.2
+
2012-03-15 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: better handling of daemon <-> sqlite interaction

diff --git a/mail/dspam/PRE_BUILD b/mail/dspam/PRE_BUILD
index 137213d..ac99efe 100755
--- a/mail/dspam/PRE_BUILD
+++ b/mail/dspam/PRE_BUILD
@@ -3,6 +3,4 @@ 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
deleted file mode 100644
index 883bc58..0000000
--- a/mail/dspam/rset.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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;
- }
-
---
diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index 582f2c0..7efb93e 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -4,7 +4,7 @@ if [[ "${POSTFIX_EXP}" == "y" ]]; then
VERSION=2.9-20110615
PFIX_BRANCH=experimental
else
- VERSION=2.8.3
+ VERSION=2.9.2
PFIX_BRANCH=official
fi

diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index a795e42..dd7b0bd 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2012-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.9.2
+
2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added masqmail




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3080a1b81ec74da0809900131d9cd458d18ccd49), Vlad Glagolev, 04/27/2012

Archive powered by MHonArc 2.6.24.

Top of Page