aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Laforet <clement@FreeBSD.org>2004-04-21 20:39:23 +0000
committerClement Laforet <clement@FreeBSD.org>2004-04-21 20:39:23 +0000
commit673b269d01296898aefb67389d06518fc935fa58 (patch)
tree17e626d1effed1dda0fff8bbd35f333da034c0ab
parente99b5c6140653c69be5f3dcc6910adb9ba0edc03 (diff)
downloadports-673b269d01296898aefb67389d06518fc935fa58.tar.gz
ports-673b269d01296898aefb67389d06518fc935fa58.zip
Notes
-rw-r--r--www/mod_clamav/Makefile8
-rw-r--r--www/mod_clamav/files/patch-mod_clamav.c19
2 files changed, 25 insertions, 2 deletions
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index 1eeafbf9eef9..a337dc39518b 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -28,8 +28,12 @@ CLAMAV_PORT= security/clamav
CONFIGURE_ARGS= --with-apxs=${PREFIX}/sbin/apxs \
--libdir=${PREFIX}/lib/apache2
CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+CPPFLAGS+= -I${LOCALBASE}/include \
+ ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib \
+ ${PTHREAD_LIBS}
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/www/mod_clamav/files/patch-mod_clamav.c b/www/mod_clamav/files/patch-mod_clamav.c
new file mode 100644
index 000000000000..cf2ec9f46cde
--- /dev/null
+++ b/www/mod_clamav/files/patch-mod_clamav.c
@@ -0,0 +1,19 @@
+--- mod_clamav.c.orig Wed Apr 21 18:29:42 2004
++++ mod_clamav.c Wed Apr 21 18:30:07 2004
+@@ -310,6 +310,7 @@
+ int rc = 1, i, l;
+ char *ct;
+ const char *action;
++ clamav_safeuri *p;
+
+ /* requests with only headers can be bypassed */
+ if (f->r->header_only) {
+@@ -339,7 +340,7 @@
+ }
+
+ /* check safe uri */
+- clamav_safeuri *p = (clamav_safeuri *)(rec->safeuris->elts);
++ p = (clamav_safeuri *)(rec->safeuris->elts);
+ for (i = 0; i < rec->safeuris->nelts; i++) {
+ switch (p[i].matchtype) {
+ case MATCH_SAFE_URI: