Bug 50564

	Apache is the most popular web server around the world. Apache foundation 
released a new version of Apache2 port yesterday in response of security 
vulnerabilities discovered recently. Accroading to the change log, SECURITY 
[CAN-2003-0132], and Apache PR 17206 are the most serious problems.
	To keep the FreeBSD ported version of Apache2 safe, it's important to 
update it as soon as possible.

Fix: Apply the following patch:

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/ \
@@ -138,6 +138,8 @@
	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
	@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
	@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
+	@${SED} ${RC_SUB} ${FILESDIR}/config.layout 
 >>${WRKSRC}/srclib/apr/config.layout
+	@${SED} ${RC_SUB} ${FILESDIR}/config.layout 
 >>${WRKSRC}/srclib/apr-util/config.layout
	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr

pre-install:
-   # 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"


_________________________________________________________________
STOP MORE SPAM with the new MSN 8 and get 2 months FREE* 
http://join.msn.com/?page=features/junkmail--ENiggbsUY4soJFCEMheFia5Mqurad19OipQwyvYtpisN9OCV
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -ruN apache2.orig/Makefile apache2/Makefile
--- apache2.orig/Makefile	Tue Feb 25 14:25:35 2003
+++ apache2/Makefile	Thu Apr  3 20:41:46 2003
@@ -6,7 +6,7 @@
#
How-To-Repeat: 	The detailed information are to be disclosed on 8th, April.