diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache13-modperl/Makefile | 25 | ||||
| -rw-r--r-- | www/apache13-modperl/distinfo | 6 | ||||
| -rw-r--r-- | www/apache13-modperl/files/patch-secfix-CAN-2005-3352 | 35 |
3 files changed, 11 insertions, 55 deletions
diff --git a/www/apache13-modperl/Makefile b/www/apache13-modperl/Makefile index 67d7f458019a..c8ba0f494da6 100644 --- a/www/apache13-modperl/Makefile +++ b/www/apache13-modperl/Makefile @@ -7,7 +7,6 @@ PORTNAME= apache+mod_perl PORTVERSION= ${VERSION_APACHE} -PORTREVISION= 3 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD:S/$/:apache/} \ ${MASTER_SITE_PERL_CPAN:S/$/Apache\/:modperl/} @@ -18,6 +17,7 @@ DISTFILES= apache_${VERSION_APACHE}${EXTRACT_SUFX}:apache \ MAINTAINER= apache@FreeBSD.org COMMENT= The Apache 1.3 webserver with a statically embedded perl interpreter +LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2 BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww RUN_DEPENDS= ${BUILD_DEPENDS} @@ -42,19 +42,12 @@ MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .include <bsd.port.pre.mk> -VERSION_APACHE= 1.3.34 +VERSION_APACHE= 1.3.36 VERSION_MODPERL= 1.29 WRKSRC_MODPERL= ${WRKDIR}/mod_perl-${VERSION_MODPERL} -.if defined(WITHOUT_APACHE_EXPAT) && ${WITHOUT_APACHE_EXPAT} == yes -EXPAT_CONF+= --disable-rule=EXPAT -.else -LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2 -EXPAT_CONF+= --enable-rule=EXPAT -.endif - -.if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes +.if defined(WITH_APACHE_SUEXEC) APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT} APACHE_SUEXEC_USERDIR?=public_html @@ -97,7 +90,6 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --enable-shared=max \ --activate-module=src/modules/perl/libperl.a \ --enable-module=perl \ - ${EXPAT_CONF} \ ${SUEXEC_CONF} CFLAGS+=-DDOCUMENT_LOCATION=\\\\\"${DOCUMENT_ROOT}\\\\\" \ @@ -109,13 +101,13 @@ CFLAGS+=-DDOCUMENT_LOCATION=\\\\\"${DOCUMENT_ROOT}\\\\\" \ .if defined(APACHE_HARD_SERVER_LIMIT) CFLAGS+=-DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT} .else -CFLAGS+=-DHARD_SERVER_LIMIT=512 +CFLAGS+=-DHARD_SERVER_LIMIT=2048 .endif # # Set WITH_APACHE_PERF_TUNING env. variable to yes to get maximum performance # -.if defined(WITH_APACHE_PERF_TUNING) && ${WITH_APACHE_PERF_TUNING} == YES +.if defined(WITH_APACHE_PERF_TUNING) CFLAGS+= -DBUFFERED_LOGS CFLAGS+= -O6 -fomit-frame-pointer .endif @@ -124,11 +116,10 @@ CFLAGS+= -O6 -fomit-frame-pointer OPTIM+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 .endif -# For expat. -CFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/libs +CFLAGS= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='${LIBS}' +CONFIGURE_ENV= OPTIM='${OPTIM}' LIBS='${LIBS}' \ MAN1= dbmmanage.1 htdigest.1 htpasswd.1 diff --git a/www/apache13-modperl/distinfo b/www/apache13-modperl/distinfo index d2a33c2573a3..8416b1450068 100644 --- a/www/apache13-modperl/distinfo +++ b/www/apache13-modperl/distinfo @@ -1,6 +1,6 @@ -MD5 (apache_1.3.34.tar.gz) = 9978cc552b423f0015c1052d23ab619e -SHA256 (apache_1.3.34.tar.gz) = ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4 -SIZE (apache_1.3.34.tar.gz) = 2468056 +MD5 (apache_1.3.36.tar.gz) = d6c0709fc1f20d6d93d30435fcfc4843 +SHA256 (apache_1.3.36.tar.gz) = 2178e3249e7cc08229036e2311baa6e2d964b51ec4c9de7f6942591577ba43c9 +SIZE (apache_1.3.36.tar.gz) = 2477854 MD5 (mod_perl-1.29.tar.gz) = 1491931790509b9af06fc037d02b0e7a SHA256 (mod_perl-1.29.tar.gz) = b401efaa105dd5f82d6e61f0efa372d4018db15e0748ca34a52d8daa209dea6b SIZE (mod_perl-1.29.tar.gz) = 378877 diff --git a/www/apache13-modperl/files/patch-secfix-CAN-2005-3352 b/www/apache13-modperl/files/patch-secfix-CAN-2005-3352 deleted file mode 100644 index 8febc0e58935..000000000000 --- a/www/apache13-modperl/files/patch-secfix-CAN-2005-3352 +++ /dev/null @@ -1,35 +0,0 @@ ---- src/main/util.c (original) -+++ src/main/util.c Mon Dec 12 08:36:54 2005 -@@ -1722,6 +1722,8 @@ - j += 3; - else if (s[i] == '&') - j += 4; -+ else if (s[i] == '"') -+ j += 5; - - if (j == 0) - return ap_pstrndup(p, s, i); -@@ -1739,6 +1741,10 @@ - else if (s[i] == '&') { - memcpy(&x[j], "&", 5); - j += 4; -+ } -+ else if (s[i] == '"') { -+ memcpy(&x[j], """, 6); -+ j += 5; - } - else - x[j] = s[i]; - ---- src/modules/standard/mod_imap.c (original) -+++ src/modules/standard/mod_imap.c Mon Dec 12 08:36:54 2005 -@@ -328,7 +328,7 @@ - if (!strcasecmp(value, "referer")) { - referer = ap_table_get(r->headers_in, "Referer"); - if (referer && *referer) { -- return ap_pstrdup(r->pool, referer); -+ return ap_escape_html(r->pool, referer); - } - else { - /* XXX: This used to do *value = '\0'; ... which is totally bogus - |