[110907] trunk/dports/www/mod_antispam

[jmr at macports.org]

Revision: 110907
          https://trac.macports.org/changeset/110907
Author:   jmr at macports.org
Date:     2013-09-09 12:50:22 -0700 (Mon, 09 Sep 2013)
Log Message:
-----------
mod_antispam: fix apache version checks

Modified Paths:
--------------
    trunk/dports/www/mod_antispam/Portfile

Added Paths:
-----------
    trunk/dports/www/mod_antispam/files/
    trunk/dports/www/mod_antispam/files/apache_versions.diff

Modified: trunk/dports/www/mod_antispam/Portfile
===================================================================
--- trunk/dports/www/mod_antispam/Portfile	2013-09-09 19:31:10 UTC (rev 110906)
+++ trunk/dports/www/mod_antispam/Portfile	2013-09-09 19:50:22 UTC (rev 110907)
@@ -17,6 +17,8 @@
 
 depends_lib		port:apache2
 
+patchfiles		apache_versions.diff
+
 use_configure	no
 
 build.cmd		${prefix}/apache2/bin/apxs

Added: trunk/dports/www/mod_antispam/files/apache_versions.diff
===================================================================
--- trunk/dports/www/mod_antispam/files/apache_versions.diff	                        (rev 0)
+++ trunk/dports/www/mod_antispam/files/apache_versions.diff	2013-09-09 19:50:22 UTC (rev 110907)
@@ -0,0 +1,29 @@
+--- mod_antispam.c.orig	2005-10-17 23:22:23.000000000 +1000
++++ mod_antispam.c	2013-09-10 05:48:13.000000000 +1000
+@@ -403,7 +403,7 @@ int antispam_addlist (request_rec * r, c
+ int antispam_checkregexlist (request_rec * r, char *file, char *ref)
+ {
+   char line[HEAD_LEN];
+-#if (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER == 1)
++#if (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER >= 1)
+   /* for Apache-2.1 */
+   ap_regex_t *regexp;
+ #elif (defined(AP_SERVER_MAJORVERSION) && defined(AP_SERVER_MINORVERSION))
+@@ -430,7 +430,7 @@ int antispam_checkregexlist (request_rec
+     if (line[0] == '#' || !line[0])
+       continue;
+ 
+-#if (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER == 1)
++#if (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER >= 1)
+     /* for Apache-2.1 */
+     regexp = ap_pregcomp(r->pool, line, AP_REG_EXTENDED);
+ #elif (defined(AP_SERVER_MAJORVERSION) && defined(AP_SERVER_MINORVERSION))
+@@ -488,7 +488,7 @@ int antispam_htsearch(request_rec *r, ch
+   char buf[buf_len], *data_send, *contents;
+ 
+   /* create socket */
+-#if (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER == 1)
++#if (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER >= 1)
+   /* for Apache-2.1 */
+   val = apr_socket_create(&socket, APR_INET, SOCK_STREAM, APR_PROTO_TCP, r->pool);
+ #elif (defined(AP_SERVER_MAJORVERSION) && defined(AP_SERVER_MINORVERSION))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130909/11061504/attachment-0001.html>