aboutsummaryrefslogtreecommitdiff
path: root/mail/dbmail
diff options
context:
space:
mode:
authorPawel Pekala <pawel@FreeBSD.org>2014-02-25 18:39:00 +0000
committerPawel Pekala <pawel@FreeBSD.org>2014-02-25 18:39:00 +0000
commit1724495404da4ef5c6a64f7784243671ae5454f9 (patch)
tree0f7f402d9c2f8fc5c1e3f7050c93bb0607c58f11 /mail/dbmail
parent251f4effc1f7f851497a7ddbc6b549ab2bbbd8a8 (diff)
downloadports-1724495404da4ef5c6a64f7784243671ae5454f9.tar.gz
ports-1724495404da4ef5c6a64f7784243671ae5454f9.zip
Notes
Diffstat (limited to 'mail/dbmail')
-rw-r--r--mail/dbmail/Makefile2
-rw-r--r--mail/dbmail/files/patch-src_db__dm.c15
-rw-r--r--mail/dbmail/files/patch-src_pop3.c20
3 files changed, 36 insertions, 1 deletions
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index b79df57688cd..2829aeb22972 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dbmail
PORTVERSION= 3.1.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://www.dbmail.org/download/3.1/ \
http://git.dbmail.eu/paul/dbmail/snapshot/
diff --git a/mail/dbmail/files/patch-src_db__dm.c b/mail/dbmail/files/patch-src_db__dm.c
new file mode 100644
index 000000000000..3430ced2e91a
--- /dev/null
+++ b/mail/dbmail/files/patch-src_db__dm.c
@@ -0,0 +1,15 @@
+diff --git src/dm_db.c b/src/dm_db.c
+index 559d83c..529a48e 100644
+--- src/dm_db.c
++++ src/dm_db.c
+@@ -1832,7 +1832,9 @@ char * db_get_message_lines(uint64_t message_idnr, long lines)
+ return NULL;
+
+ msg = dbmail_message_new(NULL);
+- msg = dbmail_message_retrieve(msg, physmessage_id);
++ if (! (msg = dbmail_message_retrieve(msg, physmessage_id)))
++ return NULL;
++
+ stream = msg->crlf;
+
+ if (lines >=0) {
diff --git a/mail/dbmail/files/patch-src_pop3.c b/mail/dbmail/files/patch-src_pop3.c
new file mode 100644
index 000000000000..5d021fabdd21
--- /dev/null
+++ b/mail/dbmail/files/patch-src_pop3.c
@@ -0,0 +1,20 @@
+diff --git src/pop3.c src/pop3.c
+index 2b8792e..a09524e 100644
+--- src/pop3.c
++++ src/pop3.c
+@@ -302,7 +302,6 @@ int pop3_error(ClientSession_T * session, const char *formatstring, ...)
+
+ if (session->error_count >= MAX_ERRORS) {
+ ci_write(ci, "-ERR too many errors\r\n");
+- client_session_bailout(&session);
+ return -3;
+ }
+ va_start(ap, formatstring);
+@@ -314,7 +313,6 @@ int pop3_error(ClientSession_T * session, const char *formatstring, ...)
+ g_free(s);
+
+ if (ci->client_state & CLIENT_ERR) {
+- client_session_bailout(&session);
+ return -3;
+ }
+