From 9aefc9a2a014cf2b6f66881035445d15ed0674ad Mon Sep 17 00:00:00 2001 From: Peter Pentchev Date: Fri, 18 Jun 2010 14:26:04 +0000 Subject: [PATCH] Update to 2010.06.17, part II: refresh the remaining patches. --- patches/09-typos.patch | 4 ++-- patches/17-mailname.patch | 6 +++--- patches/23-dirent-d_type.patch | 8 ++++---- patches/27-int-size.patch | 4 ++-- patches/28-valid-recipient.patch | 4 ++-- patches/29-double-free.patch | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/patches/09-typos.patch b/patches/09-typos.patch index 793628f..a2c4d40 100644 --- a/patches/09-typos.patch +++ b/patches/09-typos.patch @@ -3,11 +3,11 @@ Description: Fix a typo in an error message. Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/ Forwarded: no Author: Peter Pentchev -Last-Update: 2010-06-02 +Last-Update: 2010-06-18 --- a/crypto.c +++ b/crypto.c -@@ -262,7 +262,7 @@ +@@ -261,7 +261,7 @@ /* Send AUTH command according to RFC 2554 */ send_remote_command(fd, "AUTH CRAM-MD5"); if (read_remote(fd, sizeof(buffer), buffer) != 3) { diff --git a/patches/17-mailname.patch b/patches/17-mailname.patch index 606b6ce..3b671c9 100644 --- a/patches/17-mailname.patch +++ b/patches/17-mailname.patch @@ -6,7 +6,7 @@ Description: Several fixes to the mail name file parsing. Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/ Forwarded: no Author: Peter Pentchev -Last-Update: 2010-06-02 +Last-Update: 2010-06-18 --- a/dma.conf +++ b/dma.conf @@ -30,8 +30,8 @@ Last-Update: 2010-06-02 if (initialized) @@ -62,7 +63,9 @@ - if (config->mailnamefile != NULL && config->mailnamefile[0] != '\0') { - fp = fopen(config->mailnamefile, "r"); + if (config.mailnamefile != NULL && config.mailnamefile[0] != '\0') { + fp = fopen(config.mailnamefile, "r"); if (fp != NULL) { - if (fgets(name, sizeof(name), fp) != NULL) { + res = fgets(name, sizeof(name), fp); diff --git a/patches/23-dirent-d_type.patch b/patches/23-dirent-d_type.patch index 6018713..44afdeb 100644 --- a/patches/23-dirent-d_type.patch +++ b/patches/23-dirent-d_type.patch @@ -6,11 +6,11 @@ Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/ Bug-Debian: http://bugs.debian.org/544357 Forwarded: no Author: Peter Pentchev -Last-Update: 2010-06-02 +Last-Update: 2010-06-18 --- a/spool.c +++ b/spool.c -@@ -287,7 +287,8 @@ +@@ -291,7 +291,8 @@ mailfn = NULL; /* ignore temp files */ @@ -20,8 +20,8 @@ Last-Update: 2010-06-02 continue; if (de->d_name[0] != 'Q') continue; -@@ -296,6 +297,9 @@ - if (asprintf(&mailfn, "%s/M%s", config->spooldir, de->d_name + 1) < 0) +@@ -300,6 +301,9 @@ + if (asprintf(&mailfn, "%s/M%s", config.spooldir, de->d_name + 1) < 0) goto fail; + if (de->d_type == DT_UNKNOWN) diff --git a/patches/27-int-size.patch b/patches/27-int-size.patch index 930e609..e9ea9ef 100644 --- a/patches/27-int-size.patch +++ b/patches/27-int-size.patch @@ -3,11 +3,11 @@ Description: Cast correctly to uintmax_t when using %PRIxMAX. Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/ Forwarded: no Author: Peter Pentchev -Last-Update: 2010-06-02 +Last-Update: 2010-06-18 --- a/spool.c +++ b/spool.c -@@ -89,7 +89,7 @@ +@@ -92,7 +92,7 @@ */ if (fstat(fd, &st) != 0) goto fail; diff --git a/patches/28-valid-recipient.patch b/patches/28-valid-recipient.patch index 6d8fc19..32f7196 100644 --- a/patches/28-valid-recipient.patch +++ b/patches/28-valid-recipient.patch @@ -3,11 +3,11 @@ Description: Check the parsed recipient address for validity. Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/ Forwarded: no Author: Peter Pentchev -Last-Update: 2010-06-15 +Last-Update: 2010-06-18 --- a/mail.c +++ b/mail.c -@@ -428,8 +428,8 @@ +@@ -427,8 +427,8 @@ if (addr == NULL) errlog(1, NULL); diff --git a/patches/29-double-free.patch b/patches/29-double-free.patch index 847cc36..2391e8c 100644 --- a/patches/29-double-free.patch +++ b/patches/29-double-free.patch @@ -3,11 +3,11 @@ Description: Fix a double-free bug. Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/ Forwarded: no Author: Peter Pentchev -Last-Update: 2010-06-17 +Last-Update: 2010-06-18 --- a/spool.c +++ b/spool.c -@@ -315,7 +315,7 @@ +@@ -319,7 +319,7 @@ if (queuefn != NULL) free(queuefn); if (mailfn != NULL) -- 2.47.3