rpms/milter-greylist/F-12 spamd-null.patch, NONE, 1.1 verinfo, 1.2, 1.3 sources, 1.16, 1.17 milter-greylist.spec, 1.38, 1.39 lastver, 1.6, 1.7 .cvsignore, 1.7, 1.8

[ensc]

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23192

Modified Files:
	verinfo sources milter-greylist.spec lastver .cvsignore 
Added Files:
	spamd-null.patch 
Log Message:
- updated to 4.2.6
- 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: verinfo
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/F-12/verinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- verinfo	10 Nov 2007 17:09:09 -0000	1.2
+++ verinfo	14 Jul 2010 07:58:57 -0000	1.3
@@ -1,2 +1,2 @@
 ftp://ftp.espci.fr/pub/milter-greylist/
-milter-greylist-([0-9.]*?)\.t(?:gz|ar)
+milter-greylist-(4\.2\.[0-9.]*?)\.t(?:gz|ar)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	9 Jun 2010 20:19:55 -0000	1.16
+++ sources	14 Jul 2010 07:58:57 -0000	1.17
@@ -1 +1 @@
-fa1e68ff0a8b759b946c09f92d40af9d  milter-greylist-4.2.5.tgz
+2572068e2b1b5b47fe4239f0ddebbce2  milter-greylist-4.2.6.tgz


Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/F-12/milter-greylist.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- milter-greylist.spec	9 Jun 2010 20:19:55 -0000	1.38
+++ milter-greylist.spec	14 Jul 2010 07:58:57 -0000	1.39
@@ -19,7 +19,7 @@
 
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
-Version:	4.2.5
+Version:	4.2.6
 Release:	%release_func 1200%{?beta}
 License:	BSD with advertising
 Group:		System Environment/Daemons
@@ -31,6 +31,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
@@ -104,10 +106,11 @@ This package provides the upstart initsc
 %patch4 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 install -p -m0644 %SOURCE1 .
 
-sed -i -e 's!/usr/lib/libresolv.a!/no-such-lib.a!g' configure
+sed -i -e 's!/libresolv.a!/../../../no-such-lib.a!g' configure
 sed -i -e 's!^\#\?user .*!user "%username"!;
            s!^\#socket !socket !;
 	   s!^pidfile .*!\#\0!;
@@ -218,6 +221,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 14 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 4.2.6-1400
+- updated to 4.2.6
+- 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


Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/F-12/lastver,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lastver	19 Aug 2009 19:50:38 -0000	1.6
+++ lastver	14 Jul 2010 07:58:57 -0000	1.7
@@ -1 +1 @@
-4.3.3
+4.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	19 Aug 2009 19:50:38 -0000	1.7
+++ .cvsignore	14 Jul 2010 07:58:57 -0000	1.8
@@ -1 +1 @@
-milter-greylist-4.2.3.tgz
+milter-greylist-4.2.6.tgz