rpms/milter-greylist/devel spamd-null.patch, NONE, 1.1 milter-greylist.spec, 1.41, 1.42
ensc
ensc at fedoraproject.org
Fri Jul 9 08:09:55 UTC 2010
Author: ensc
Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9671
Modified Files:
milter-greylist.spec
Added Files:
spamd-null.patch
Log Message:
added spamd-null patch
spamd-null.patch:
milter-greylist.c | 4 ++++
milter-greylist.h | 2 ++
spamd.c | 4 ++--
3 files changed, 8 insertions(+), 2 deletions(-)
--- NEW FILE spamd-null.patch ---
Index: milter-greylist-4.2.5/milter-greylist.c
===================================================================
--- milter-greylist-4.2.5.orig/milter-greylist.c
+++ milter-greylist-4.2.5/milter-greylist.c
@@ -735,6 +735,7 @@ real_header(ctx, name, value)
strcat(h->h_line, sep);
strcat(h->h_line, value);
strcat(h->h_line, crlf);
+ h->h_len = len;
TAILQ_INSERT_TAIL(&priv->priv_header, h, h_list);
@@ -814,6 +815,7 @@ real_body(ctx, chunk, size)
exit(EX_OSERR);
}
+ b->b_len = strlen(crlf);
TAILQ_INSERT_TAIL(&priv->priv_body, b, b_list);
priv->priv_msgcount += strlen(crlf);
@@ -847,6 +849,7 @@ real_body(ctx, chunk, size)
memcpy(b->b_lines + priv->priv_buflen, chunk, i);
b->b_lines[linelen] = '\0';
+ b->b_len = linelen;
priv->priv_buflen = 0;
TAILQ_INSERT_TAIL(&priv->priv_body, b, b_list);
@@ -904,6 +907,7 @@ real_eom(ctx)
}
b->b_lines = priv->priv_buf;
+ b->b_len = priv->priv_buflen - 1;
b->b_lines[priv->priv_buflen - 1] = '\0';
priv->priv_buf = NULL;
Index: milter-greylist-4.2.5/milter-greylist.h
===================================================================
--- milter-greylist-4.2.5.orig/milter-greylist.h
+++ milter-greylist-4.2.5/milter-greylist.h
@@ -173,11 +173,13 @@ struct rcpt {
struct header {
char *h_line;
+ size_t h_len;
TAILQ_ENTRY(header) h_list;
};
struct body {
char *b_lines;
+ size_t b_len;
TAILQ_ENTRY(body) b_list;
};
Index: milter-greylist-4.2.5/spamd.c
===================================================================
--- milter-greylist-4.2.5.orig/spamd.c
+++ milter-greylist-4.2.5/spamd.c
@@ -186,11 +186,11 @@ spamd_check(ad, stage, ap, priv)
return -1;
TAILQ_FOREACH(h, &priv->priv_header, h_list)
- if (spamd_write(sock, h->h_line, strlen(h->h_line)) == -1)
+ if (spamd_write(sock, h->h_line, h->h_len) == -1)
return -1;
TAILQ_FOREACH(b, &priv->priv_body, b_list)
- if (spamd_write(sock, b->b_lines, strlen(b->b_lines)) == -1)
+ if (spamd_write(sock, b->b_lines, b->b_len) == -1)
return -1;
if (spamd_read(sock, buffer, SPAMD_BUFLEN) == -1)
Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- milter-greylist.spec 9 Jun 2010 19:58:54 -0000 1.41
+++ milter-greylist.spec 9 Jul 2010 08:09:51 -0000 1.42
@@ -24,7 +24,7 @@
Summary: Milter for greylisting, the next step in the spam control war
Name: milter-greylist
Version: 4.2.5
-Release: %release_func 1400
+Release: %release_func 1401
License: BSD with advertising
Group: System Environment/Daemons
URL: http://hcpnet.free.fr/milter-greylist/
@@ -35,6 +35,8 @@ Patch4: ai_addrconfig.patch
Patch7: milter-greylist-dkim-reentrant.patch
# http://tech.groups.yahoo.com/group/milter-greylist/message/5551
Patch8: cloexec.patch
+# http://tech.groups.yahoo.com/group/milter-greylist/message/5564
+Patch9: spamd-null.patch
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: init(%name)
Provides: user(%username) = 7
@@ -108,6 +110,7 @@ This package provides the upstart initsc
%apply -n4 -p1
%apply -n7 -p1
%apply -n8 -p1
+%apply -n9 -p1
install -p -m0644 %SOURCE1 .
@@ -226,6 +229,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 9 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.5-1401
+- added spamd-null patch
+
* Wed Jun 9 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.5-1400
- updated to 4.2.5
- added cloexec patch
More information about the scm-commits
mailing list