[csw-devel] SF.net SVN: gar:[17135] csw/mgar/pkg/miltergreylist/trunk

[bonivart at users.sourceforge.net]

Revision: 17135
          http://gar.svn.sourceforge.net/gar/?rev=17135&view=rev
Author:   bonivart
Date:     2012-02-22 19:52:21 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
miltergreylist/trunk: test upstream patch for urlcheck.c

Modified Paths:
--------------
    csw/mgar/pkg/miltergreylist/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/miltergreylist/trunk/files/0003-upstream-bug-fixes.patch

Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/Makefile	2012-02-22 15:50:40 UTC (rev 17134)
+++ csw/mgar/pkg/miltergreylist/trunk/Makefile	2012-02-22 19:52:21 UTC (rev 17135)
@@ -21,8 +21,8 @@
 GARCOMPILER = GNU
 
 RUNTIME_DEP_PKGS  = CSWgeoip
+RUNTIME_DEP_PKGS += CSWlibcurl4
 RUNTIME_DEP_PKGS += CSWlibspf2-2
-#RUNTIME_DEP_PKGS += CSWcurlrt
 
 PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
@@ -31,6 +31,7 @@
 
 PATCHFILES += 0001-Path-and-user-changes-in-conf-file.patch
 PATCHFILES += 0002-change-socket-path.patch
+PATCHFILES += 0003-upstream-bug-fixes.patch
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS  = --prefix=/opt/csw
@@ -43,7 +44,7 @@
 CONFIGURE_ARGS += --with-libGeoIP=/opt/csw/lib
 CONFIGURE_ARGS += --with-libspf2=/opt/csw/lib
 CONFIGURE_ARGS += --mandir=/opt/csw/share/man
-#CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib
+CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib
 
 # milter-greylist has no tests
 TEST_SCRIPTS = 

Added: csw/mgar/pkg/miltergreylist/trunk/files/0003-upstream-bug-fixes.patch
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/files/0003-upstream-bug-fixes.patch	                        (rev 0)
+++ csw/mgar/pkg/miltergreylist/trunk/files/0003-upstream-bug-fixes.patch	2012-02-22 19:52:21 UTC (rev 17135)
@@ -0,0 +1,48 @@
+From d677e25bf0b5092fb780b2caa8989809f30a0808 Mon Sep 17 00:00:00 2001
+From: Peter Bonivart <bonivart at opencsw.org>
+Date: Wed, 22 Feb 2012 20:25:29 +0100
+Subject: [PATCH] upstream-bug-fixes
+
+---
+ urlcheck.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/urlcheck.c b/urlcheck.c
+index df627fb..d34b313 100644
+--- a/urlcheck.c
++++ b/urlcheck.c
+@@ -299,7 +299,7 @@ find_boundary(priv, boundary)
+ 				goto next;
+ 			
+ 		TAILQ_FOREACH(l, &priv->priv_body, l_list)
+-			if (strstr(l->l_lines, boundary) != NULL)
++			if (strstr(l->l_line, boundary) != NULL)
+ 				goto next;
+ 
+ 		return 0;
+@@ -362,7 +362,7 @@ curl_post(buffer, size, nmemb, userp)
+ 			 * the body on next time we are called.
+ 			 */
+ 			if (pd->pd_curhdr == NULL) 
+-				pd->pd_curptr = pd->pd_curbody->b_lines;
++				pd->pd_curptr = pd->pd_curbody->l_line;
+ 			else
+ 				pd->pd_curptr = pd->pd_curhdr->l_line;
+ 
+@@ -388,11 +388,11 @@ curl_post(buffer, size, nmemb, userp)
+ 
+ 			/* Move to the next one */
+ 			pd->pd_curbody = 
+-			    TAILQ_NEXT(pd->pd_curbody, b_list);
++			    TAILQ_NEXT(pd->pd_curbody, l_list);
+ 
+ 			/* If it's not the last one... */
+ 			if (pd->pd_curbody != NULL)
+-				pd->pd_curptr = pd->pd_curbody->b_lines;
++				pd->pd_curptr = pd->pd_curbody->l_line;
+ 			else
+ 				pd->pd_curptr = NULL;
+ 		} else {
+-- 
+1.7.9
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.