diff options
| author | clement <clement@FreeBSD.org> | 2006-07-30 17:12:41 +0800 |
|---|---|---|
| committer | clement <clement@FreeBSD.org> | 2006-07-30 17:12:41 +0800 |
| commit | 2e14e314e7b6a46d627138ddf5e42894206549bd (patch) | |
| tree | 8d9e5c6c0d1884d22368d55ff92eea7e046696ca /www | |
| parent | 3db6bc8cc5a2ea7525150573a6ab6f961b4b30cc (diff) | |
| download | freebsd-ports-gnome-2e14e314e7b6a46d627138ddf5e42894206549bd.tar.gz freebsd-ports-gnome-2e14e314e7b6a46d627138ddf5e42894206549bd.tar.zst freebsd-ports-gnome-2e14e314e7b6a46d627138ddf5e42894206549bd.zip | |
- Update apache to 1.3.37
- Fix CONFLICTS
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache13-modperl/Makefile | 6 | ||||
| -rw-r--r-- | www/apache13-modperl/distinfo | 6 | ||||
| -rw-r--r-- | www/apache13-modperl/files/patch-secfix-CVE-2006-3747 | 13 |
3 files changed, 6 insertions, 19 deletions
diff --git a/www/apache13-modperl/Makefile b/www/apache13-modperl/Makefile index de68a058573f..218f67181bb5 100644 --- a/www/apache13-modperl/Makefile +++ b/www/apache13-modperl/Makefile @@ -7,7 +7,6 @@ PORTNAME= apache+mod_perl PORTVERSION= ${VERSION_APACHE} -PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD:S/$/:apache/} \ ${MASTER_SITE_PERL_CPAN:S/$/Apache\/:modperl/} @@ -27,7 +26,8 @@ CONFLICTS= apache-1.* apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+ apache+mod_ssl+mod_snmp+mod_accel-1.* \ apache+ipv6-1.* apache+ssl-1.* apache-2.* apache_fp-1.* \ caudium-devel-1.* caudium10-1.* caudium12-* \ - ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* + ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* \ + apache-*-2.* USE_PERL5= YES USE_RC_SUBR= yes @@ -43,7 +43,7 @@ MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .include <bsd.port.pre.mk> -VERSION_APACHE= 1.3.36 +VERSION_APACHE= 1.3.37 VERSION_MODPERL= 1.29 WRKSRC_MODPERL= ${WRKDIR}/mod_perl-${VERSION_MODPERL} diff --git a/www/apache13-modperl/distinfo b/www/apache13-modperl/distinfo index 8416b1450068..0dc63244b44e 100644 --- a/www/apache13-modperl/distinfo +++ b/www/apache13-modperl/distinfo @@ -1,6 +1,6 @@ -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 (apache_1.3.37.tar.gz) = b278f0969a9ccadeb781316e79e3520f +SHA256 (apache_1.3.37.tar.gz) = 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc +SIZE (apache_1.3.37.tar.gz) = 2665370 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-CVE-2006-3747 b/www/apache13-modperl/files/patch-secfix-CVE-2006-3747 deleted file mode 100644 index fc06bed772bb..000000000000 --- a/www/apache13-modperl/files/patch-secfix-CVE-2006-3747 +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/modules/standard/mod_rewrite.c -=================================================================== ---- src/modules/standard/mod_rewrite.c (revision 421288) -+++ src/modules/standard/mod_rewrite.c (working copy) -@@ -2736,7 +2736,7 @@ - int c = 0; - - token[0] = cp = ap_pstrdup(p, cp); -- while (*cp && c < 5) { -+ while (*cp && c < 4) { - if (*cp == '?') { - token[++c] = cp + 1; - *cp = '\0'; |