diff options
author | Hye-Shik Chang <perky@FreeBSD.org> | 2003-04-04 02:36:57 +0000 |
---|---|---|
committer | Hye-Shik Chang <perky@FreeBSD.org> | 2003-04-04 02:36:57 +0000 |
commit | 408824d8e0f42ca5c43882512d73070a89598089 (patch) | |
tree | df32c42f8f914fffe934e8966ad88d266532c124 /www/apache21 | |
parent | Update to 2.5. (diff) |
Update to 2.0.45. This update fixes a DDOS vulnerability.
PR: 50564 [1]
Submitted by: Cy Schubert <cy@FreeBSD.org>, delphij@hotmail.com [1]
Requested by: many
Notes
Notes:
svn path=/head/; revision=78078
Diffstat (limited to 'www/apache21')
-rw-r--r-- | www/apache21/Makefile | 2 | ||||
-rw-r--r-- | www/apache21/distinfo | 2 | ||||
-rw-r--r-- | www/apache21/files/patch-configure | 24 | ||||
-rw-r--r-- | www/apache21/files/patch-srclib:apr:include:apr.h | 17 | ||||
-rw-r--r-- | www/apache21/pkg-plist | 45 |
5 files changed, 51 insertions, 39 deletions
diff --git a/www/apache21/Makefile b/www/apache21/Makefile index 30b386619cf9..ddbdff33664d 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -6,7 +6,7 @@ # PORTNAME= apache -PORTVERSION= 2.0.44 +PORTVERSION= 2.0.45 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache21/distinfo b/www/apache21/distinfo index 2f0ffa4038be..4e45e806fa32 100644 --- a/www/apache21/distinfo +++ b/www/apache21/distinfo @@ -1,2 +1,2 @@ -MD5 (httpd-2.0.44.tar.gz) = 786c8d62bf18c6c88d2d82a9443cd1e1 +MD5 (httpd-2.0.45.tar.gz) = 1f33e9a2e2de06da190230fa72738d75 MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 diff --git a/www/apache21/files/patch-configure b/www/apache21/files/patch-configure index 7a85d2f86f30..8a3cef3275c6 100644 --- a/www/apache21/files/patch-configure +++ b/www/apache21/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu Oct 3 14:43:28 2002 -+++ configure Wed Jan 8 19:58:11 2003 -@@ -1520,7 +1520,7 @@ +--- configure.orig Mon Mar 31 16:48:51 2003 ++++ configure Thu Apr 3 21:18:08 2003 +@@ -1513,7 +1513,7 @@ $srcdir/config.layout > $pldconf layout_name=$LAYOUT . $pldconf @@ -9,25 +9,25 @@ for var in prefix exec_prefix bindir sbindir libexecdir mandir \ sysconfdir datadir errordir iconsdir htdocsdir cgidir \ includedir localstatedir runtimedir logfiledir libdir \ -@@ -2627,7 +2627,7 @@ +@@ -2613,7 +2613,7 @@ + ac_sub_cache_file="$ac_popdir/$cache_file" ;; esac - # The eval makes quoting arguments work. -- if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir" -+ if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir" +- if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir ++ if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir then : echo "srclib/apr configured properly" else -@@ -2908,7 +2908,7 @@ +@@ -2888,7 +2888,7 @@ + ac_sub_cache_file="$ac_popdir/$cache_file" ;; esac - # The eval makes quoting arguments work. -- if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir" -+ if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir" +- if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir ++ if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir then : echo "srclib/apr-util configured properly" else -@@ -15652,6 +15652,9 @@ +@@ -15634,6 +15634,9 @@ cat >>confdefs.h <<_ACEOF #define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf" diff --git a/www/apache21/files/patch-srclib:apr:include:apr.h b/www/apache21/files/patch-srclib:apr:include:apr.h deleted file mode 100644 index f6e2e55f0de5..000000000000 --- a/www/apache21/files/patch-srclib:apr:include:apr.h +++ /dev/null @@ -1,17 +0,0 @@ ---- srclib/apr/include/apr.h.in.orig Fri Nov 15 17:33:00 2002 -+++ srclib/apr/include/apr.h.in Fri Nov 15 17:33:10 2002 -@@ -299,11 +299,11 @@ - #endif - - /* header files for PATH_MAX, _POSIX_PATH_MAX */ --#if APR_HAVE_SYS_SYSLIMITS_H --#include <sys/syslimits.h> --#endif - #if APR_HAVE_LIMITS_H - #include <limits.h> -+#endif -+#if APR_HAVE_SYS_SYSLIMITS_H -+#include <sys/syslimits.h> - #endif - - #if defined(PATH_MAX) diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist index 98c1f6b61c40..e6a91c409f70 100644 --- a/www/apache21/pkg-plist +++ b/www/apache21/pkg-plist @@ -34,6 +34,7 @@ include/apache2/apr_compat.h include/apache2/apr_date.h include/apache2/apr_dbm.h include/apache2/apr_dso.h +include/apache2/apr_env.h include/apache2/apr_errno.h include/apache2/apr_file_info.h include/apache2/apr_file_io.h @@ -213,6 +214,7 @@ share/apache2/build/ltlib.mk share/apache2/build/program.mk share/apache2/build/rules.mk share/apache2/build/special.mk +%%PORTDOCS%%share/apache2/build/apr_rules.mk %%PORTDOCS%%share/doc/apache2/LICENSE %%PORTDOCS%%share/doc/apache2/bind.html.en %%PORTDOCS%%share/doc/apache2/bind.html.ja.jis @@ -331,32 +333,39 @@ share/apache2/build/special.mk %%PORTDOCS%%share/doc/apache2/invoking.html.de %%PORTDOCS%%share/doc/apache2/invoking.html.en %%PORTDOCS%%share/doc/apache2/invoking.html.ja.jis +%%PORTDOCS%%share/doc/apache2/invoking.html.ru.koi8-r %%PORTDOCS%%share/doc/apache2/invoking.xml %%PORTDOCS%%share/doc/apache2/invoking.xml.de %%PORTDOCS%%share/doc/apache2/invoking.xml.ja +%%PORTDOCS%%share/doc/apache2/invoking.xml.ru %%PORTDOCS%%share/doc/apache2/logs.html.en %%PORTDOCS%%share/doc/apache2/logs.html.ja.jis %%PORTDOCS%%share/doc/apache2/logs.xml %%PORTDOCS%%share/doc/apache2/logs.xml.ja -%%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html -%%PORTDOCS%%share/doc/apache2/misc/descriptors.html -%%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.html -%%PORTDOCS%%share/doc/apache2/misc/footer.html -%%PORTDOCS%%share/doc/apache2/misc/header.html +%%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.html.en +%%PORTDOCS%%share/doc/apache2/misc/custom_errordocs.xml +%%PORTDOCS%%share/doc/apache2/misc/descriptors.html.en +%%PORTDOCS%%share/doc/apache2/misc/descriptors.xml +%%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.html.en +%%PORTDOCS%%share/doc/apache2/misc/fin_wait_2.xml %%PORTDOCS%%share/doc/apache2/misc/index.html.en %%PORTDOCS%%share/doc/apache2/misc/index.xml -%%PORTDOCS%%share/doc/apache2/misc/known_client_problems.html +%%PORTDOCS%%share/doc/apache2/misc/known_client_problems.html.en +%%PORTDOCS%%share/doc/apache2/misc/known_client_problems.xml %%PORTDOCS%%share/doc/apache2/misc/perf-tuning.html.en %%PORTDOCS%%share/doc/apache2/misc/perf-tuning.xml %%PORTDOCS%%share/doc/apache2/misc/rewriteguide.html.en %%PORTDOCS%%share/doc/apache2/misc/rewriteguide.xml %%PORTDOCS%%share/doc/apache2/misc/security_tips.html.en %%PORTDOCS%%share/doc/apache2/misc/security_tips.xml -%%PORTDOCS%%share/doc/apache2/misc/tutorials.html +%%PORTDOCS%%share/doc/apache2/misc/tutorials.html.en +%%PORTDOCS%%share/doc/apache2/misc/tutorials.xml %%PORTDOCS%%share/doc/apache2/mod/beos.html.en %%PORTDOCS%%share/doc/apache2/mod/beos.xml +%%PORTDOCS%%share/doc/apache2/mod/core.html.de %%PORTDOCS%%share/doc/apache2/mod/core.html.en %%PORTDOCS%%share/doc/apache2/mod/core.xml +%%PORTDOCS%%share/doc/apache2/mod/core.xml.de %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.en %%PORTDOCS%%share/doc/apache2/mod/directive-dict.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/directive-dict.xml @@ -364,9 +373,11 @@ share/apache2/build/special.mk %%PORTDOCS%%share/doc/apache2/mod/directives.html.de %%PORTDOCS%%share/doc/apache2/mod/directives.html.en %%PORTDOCS%%share/doc/apache2/mod/directives.html.ja.jis +%%PORTDOCS%%share/doc/apache2/mod/directives.html.ru.koi8-r %%PORTDOCS%%share/doc/apache2/mod/directives.xml %%PORTDOCS%%share/doc/apache2/mod/directives.xml.de %%PORTDOCS%%share/doc/apache2/mod/directives.xml.ja +%%PORTDOCS%%share/doc/apache2/mod/directives.xml.ru %%PORTDOCS%%share/doc/apache2/mod/footer.html %%PORTDOCS%%share/doc/apache2/mod/header.html %%PORTDOCS%%share/doc/apache2/mod/index.html.de @@ -427,6 +438,7 @@ share/apache2/build/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_dav.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_dav_fs.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_dav_fs.xml +%%PORTDOCS%%share/doc/apache2/mod/mod_dav_fs.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_deflate.xml @@ -485,6 +497,8 @@ share/apache2/build/special.mk %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml %%PORTDOCS%%share/doc/apache2/mod/mod_negotiation.xml.ja +%%PORTDOCS%%share/doc/apache2/mod/mod_nw_ssl.html.en +%%PORTDOCS%%share/doc/apache2/mod/mod_nw_ssl.xml %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.html.en %%PORTDOCS%%share/doc/apache2/mod/mod_proxy.xml %%PORTDOCS%%share/doc/apache2/mod/mod_proxy_connect.html.en @@ -531,41 +545,53 @@ share/apache2/build/special.mk %%PORTDOCS%%share/doc/apache2/mod/module-dict.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/module-dict.xml %%PORTDOCS%%share/doc/apache2/mod/module-dict.xml.ja +%%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.de %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.en %%PORTDOCS%%share/doc/apache2/mod/mpm_common.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml +%%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml.de %%PORTDOCS%%share/doc/apache2/mod/mpm_common.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mpm_netware.html.en %%PORTDOCS%%share/doc/apache2/mod/mpm_netware.xml +%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.de %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.en %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml +%%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml.de %%PORTDOCS%%share/doc/apache2/mod/mpm_winnt.xml.ja %%PORTDOCS%%share/doc/apache2/mod/mpmt_os2.html.en %%PORTDOCS%%share/doc/apache2/mod/mpmt_os2.xml %%PORTDOCS%%share/doc/apache2/mod/perchild.html.en %%PORTDOCS%%share/doc/apache2/mod/perchild.xml +%%PORTDOCS%%share/doc/apache2/mod/prefork.html.de %%PORTDOCS%%share/doc/apache2/mod/prefork.html.en %%PORTDOCS%%share/doc/apache2/mod/prefork.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/prefork.xml +%%PORTDOCS%%share/doc/apache2/mod/prefork.xml.de %%PORTDOCS%%share/doc/apache2/mod/prefork.xml.ja %%PORTDOCS%%share/doc/apache2/mod/quickreference.html.de %%PORTDOCS%%share/doc/apache2/mod/quickreference.html.en %%PORTDOCS%%share/doc/apache2/mod/quickreference.html.ja.jis +%%PORTDOCS%%share/doc/apache2/mod/quickreference.html.ru.koi8-r %%PORTDOCS%%share/doc/apache2/mod/quickreference.xml %%PORTDOCS%%share/doc/apache2/mod/quickreference.xml.de %%PORTDOCS%%share/doc/apache2/mod/quickreference.xml.ja +%%PORTDOCS%%share/doc/apache2/mod/quickreference.xml.ru %%PORTDOCS%%share/doc/apache2/mod/threadpool.html.en %%PORTDOCS%%share/doc/apache2/mod/threadpool.xml +%%PORTDOCS%%share/doc/apache2/mod/worker.html.de %%PORTDOCS%%share/doc/apache2/mod/worker.html.en %%PORTDOCS%%share/doc/apache2/mod/worker.html.ja.jis %%PORTDOCS%%share/doc/apache2/mod/worker.xml +%%PORTDOCS%%share/doc/apache2/mod/worker.xml.de %%PORTDOCS%%share/doc/apache2/mod/worker.xml.ja %%PORTDOCS%%share/doc/apache2/mpm.html.en %%PORTDOCS%%share/doc/apache2/mpm.html.ja.jis %%PORTDOCS%%share/doc/apache2/mpm.html.ko.euc-kr +%%PORTDOCS%%share/doc/apache2/mpm.html.ru.koi8-r %%PORTDOCS%%share/doc/apache2/mpm.xml %%PORTDOCS%%share/doc/apache2/mpm.xml.ja +%%PORTDOCS%%share/doc/apache2/mpm.xml.ru %%PORTDOCS%%share/doc/apache2/new_features_2_0.html.de %%PORTDOCS%%share/doc/apache2/new_features_2_0.html.en %%PORTDOCS%%share/doc/apache2/new_features_2_0.html.fr @@ -611,6 +637,7 @@ share/apache2/build/special.mk %%PORTDOCS%%share/doc/apache2/sections.html.en %%PORTDOCS%%share/doc/apache2/sections.html.ja.jis %%PORTDOCS%%share/doc/apache2/sections.xml +%%PORTDOCS%%share/doc/apache2/sections.xml.ja %%PORTDOCS%%share/doc/apache2/server-wide.html.en %%PORTDOCS%%share/doc/apache2/server-wide.html.ja.jis %%PORTDOCS%%share/doc/apache2/server-wide.xml @@ -646,9 +673,11 @@ share/apache2/build/special.mk %%PORTDOCS%%share/doc/apache2/stopping.html.de %%PORTDOCS%%share/doc/apache2/stopping.html.en %%PORTDOCS%%share/doc/apache2/stopping.html.ja.jis +%%PORTDOCS%%share/doc/apache2/stopping.html.ru.koi8-r %%PORTDOCS%%share/doc/apache2/stopping.xml %%PORTDOCS%%share/doc/apache2/stopping.xml.de %%PORTDOCS%%share/doc/apache2/stopping.xml.ja +%%PORTDOCS%%share/doc/apache2/stopping.xml.ru %%PORTDOCS%%share/doc/apache2/style/common.dtd %%PORTDOCS%%share/doc/apache2/style/css/manual-loose-100pc.css %%PORTDOCS%%share/doc/apache2/style/css/manual-print.css @@ -718,6 +747,7 @@ share/apache2/build/special.mk %%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.en %%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.ja.jis %%PORTDOCS%%share/doc/apache2/vhosts/name-based.xml +%%PORTDOCS%%www/data-dist/index.html.sv @exec mkdir -p %D/www @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi @exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin-dist %D/www/cgi-bin @@ -757,7 +787,6 @@ www/data-dist/index.html.ru.cp866 www/data-dist/index.html.ru.iso-ru www/data-dist/index.html.ru.koi8-r www/data-dist/index.html.ru.utf8 -www/data-dist/index.html.se www/data-dist/index.html.var www/data-dist/index.html.zh @unexec if [ -L %D/www/error ]; then rm -f %D/www/error; fi |