diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2008-08-31 23:04:14 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2008-08-31 23:04:14 +0000 |
| commit | a52a71b6f27eb6777aeeecce86c782f220b0789e (patch) | |
| tree | dffefbc9c3c3aea3c9c7e972ed670ecf4fdbd415 | |
| parent | 2846acd7a89e1d41098b4fcbdf9d8c952a8120aa (diff) | |
Notes
| -rw-r--r-- | www/apache20/Makefile | 4 | ||||
| -rw-r--r-- | www/apache20/files/patch-CVE-2008-2939 | 11 | ||||
| -rw-r--r-- | www/apache20/pkg-plist | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/www/apache20/Makefile b/www/apache20/Makefile index e4903f68c618..81946d9f805f 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -9,7 +9,7 @@ PORTNAME= apache PORTVERSION= 2.0.63 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITE_LOCAL:S/$/:powerlogo/} @@ -52,7 +52,7 @@ USE_ICONV= yes USE_AUTOTOOLS= autoconf:262 libtool:15 USE_PERL5= yes USE_RC_SUBR= apache2.sh -#SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} +SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} USE_APACHE= common20 LIBTOOLFILES= configure USE_LDCONFIG= ${PREFIX}/lib/apache2 diff --git a/www/apache20/files/patch-CVE-2008-2939 b/www/apache20/files/patch-CVE-2008-2939 new file mode 100644 index 000000000000..be2a8ab992a4 --- /dev/null +++ b/www/apache20/files/patch-CVE-2008-2939 @@ -0,0 +1,11 @@ +--- modules/proxy/proxy_ftp.c 2008/08/05 19:01:50 682870 ++++ modules/proxy/proxy_ftp.c 2008/08/05 19:03:38 682871 +@@ -382,6 +382,7 @@ + c->bucket_alloc)); + } + if (wildcard != NULL) { ++ wildcard = ap_escape_html(p, wildcard); + APR_BRIGADE_INSERT_TAIL(out, apr_bucket_pool_create(wildcard, + strlen(wildcard), p, + c->bucket_alloc)); + diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist index 472e07195547..5904defb46ee 100644 --- a/www/apache20/pkg-plist +++ b/www/apache20/pkg-plist @@ -521,7 +521,7 @@ share/apache2/build/special.mk %%WWWDATA%%@dirrm www/data-dist %%CGI%%@dirrm www/cgi-bin-dist @dirrm %%EXAMPLESDIR%% -@dirrm %%DOCSDIR%% +@dirrmtry %%DOCSDIR%% @dirrm share/apache2/build @dirrm share/apache2 @dirrmtry libexec/apache2 |