head	1.10;
access;
symbols
	old_RELEASE_5_2_1:1.9
	old_RELEASE_5_2_0:1.9
	old_RELEASE_4_9_0:1.9
	old_RELEASE_5_1_0:1.9
	old_RELEASE_4_8_0:1.7
	old_RELEASE_5_0_0:1.6
	old_RELEASE_4_7_0:1.6
	old_RELEASE_4_6_2:1.6
	old_RELEASE_4_6_1:1.6
	old_RELEASE_4_6_0:1.6
	old_RELEASE_5_0_DP1:1.4
	old_RELEASE_4_5_0:1.3
	old_RELEASE_4_4_0:1.2
	old_RELEASE_4_3_0:1.2;
locks; strict;
comment	@# @;


1.10
date	2004.01.08.17.42.03;	author clement;	state dead;
branches;
next	1.9;

1.9
date	2003.06.01.00.09.42;	author perky;	state Exp;
branches;
next	1.8;

1.8
date	2003.04.04.02.36.57;	author perky;	state Exp;
branches;
next	1.7;

1.7
date	2003.01.08.11.29.55;	author perky;	state Exp;
branches;
next	1.6;

1.6
date	2002.05.09.03.55.18;	author cy;	state Exp;
branches;
next	1.5;

1.5
date	2002.04.08.06.45.33;	author pat;	state Exp;
branches;
next	1.4;

1.4
date	2002.03.23.08.31.55;	author pat;	state Exp;
branches;
next	1.3;

1.3
date	2001.11.19.22.47.47;	author dwcjr;	state Exp;
branches;
next	1.2;

1.2
date	2001.04.17.17.26.55;	author will;	state Exp;
branches;
next	1.1;

1.1
date	2001.04.13.04.43.48;	author will;	state Exp;
branches;
next	;


desc
@@


1.10
log
@Apache2 PORTREVISION 2:
- Move docs-related stuff to Makefile.doc
- Better MPM handling (for slave ports)
- Fix HTTP_PORT behaviour
- Make suExec more configurable [1]
- Now config script are regenerated by buildconfig, to improve slave
  ports support and minimize apr/apache2 ports conflict [2]
- Fix typo in AUTH_MODULES routine [3] [4]
- apr threaded support [5]
- Fix Segmentation fault with LDAP [6]
- Add db42 support. [7] (just uncomment related lines
  if you installed it from shar)
- add SLAVE_DESIGNED_FOR variable for slave ports to
  automaticaly mark them as BROKEN, if they are out of sync with
  apache2

PRs:                60444 [1], 61030 [4]
Requested by:       Matthias Andree <matthias.andree@@gmx.de> [7]
Suggested by:       kuriyama [2] [5]
Submitted by:       Daniel Tasov <danielt@@pilgerer.org> [1],
                    kuriyama [5],
                    motoyuki [3],
                    Scott Michel <scottm@@cs.ucla.edu> [4]
Obtained from:      Apache CVS [6]
Reviewed by:        erwin, linimon
Approved by:        erwin (mentor)
@
text
@--- configure.orig	Wed May 28 14:11:27 2003
+++ configure	Fri May 30 07:47:42 2003
@@@@ -1513,7 +1513,7 @@@@
       $srcdir/config.layout > $pldconf
   layout_name=$LAYOUT
   . $pldconf
-  rm $pldconf
+  rm -f $pldconf
   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 @@@@
   done
 
 
-              if eval $SHELL $ac_abs_srcdir/configure $apr_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 $apr_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
@@@@ -2928,7 +2928,7 @@@@
   done
 
 
-              if eval $SHELL $ac_abs_srcdir/configure $apr_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 $apr_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
@@@@ -15719,6 +15719,9 @@@@
 
 cat >>confdefs.h <<_ACEOF
 #define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf"
+#define DEFAULT_ERRORLOG "${rel_logfiledir}/httpd-error.log"
+#define AP_TYPES_CONFIG_FILE "${rel_sysconfdir}/mime.types"
+#define DOCUMENT_LOCATION "${rel_htdocsdir}"
 _ACEOF
 
 
@


1.9
log
@[SECURITY FIX]
Update to 2.0.46

See vulnerability details at:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0245
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0189

PR:		52768 [1]
Submitted by:	Xin Li <delphij@@freebsdchina.org> [1],
		Miguel Mendez <flynn@@energyhq.es.eu.org>,
		Trevor Johnson <trevor@@FreeBSD.org>,
		Mark Gooderum <mark@@verniernetworks.com>,
		John Walsh <zed@@maths.tcd.ie>
@
text
@@


1.8
log
@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
@
text
@d1 2
a2 2
--- configure.orig	Mon Mar 31 16:48:51 2003
+++ configure	Thu Apr  3 21:18:08 2003
d12 2
a13 3
@@@@ -2613,7 +2613,7 @@@@
     ac_sub_cache_file="$ac_popdir/$cache_file" ;;
   esac
d15 3
a17 2
-              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
d21 3
a23 3
@@@@ -2888,7 +2888,7 @@@@
     ac_sub_cache_file="$ac_popdir/$cache_file" ;;
   esac
d25 2
a26 2
-              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
d30 1
a30 1
@@@@ -15634,6 +15634,9 @@@@
@


1.7
log
@Move bin/ap[ru]-config to lib/apache2/ to coexist with devel/apr-devel
Bumped PORTREVISION accordingly.

PR:		ports/39091
Submitted by:	Marc Recht <marc@@informatik.uni-bremen.de>
@
text
@d1 3
a3 3
--- configure.orig	Thu Oct  3 14:43:28 2002
+++ configure	Wed Jan  8 19:58:11 2003
@@@@ -1520,7 +1520,7 @@@@
d12 2
a13 1
@@@@ -2627,7 +2627,7 @@@@
d16 2
a17 3
   # 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"
d21 2
a22 1
@@@@ -2908,7 +2908,7 @@@@
d25 2
a26 3
   # 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"
d30 1
a30 1
@@@@ -15652,6 +15652,9 @@@@
@


1.6
log
@1.  Upgrade 2.0.35 --> 2.0.36

2.  Port printed message to "pw userdel www" if port removed permanently.
    However master.passwd 1.25.2.5 has user www by default, so this is no
    longer correct advice.  Removed pkg-deinstall to correct this.

PR:		37849 and 36907
Approved by:	MAINTAINER:  Hye-Shik Chang <perky@@fallin.lv>
@
text
@d1 3
a3 3
--- configure.orig	Thu May  2 05:53:00 2002
+++ configure	Wed May  8 16:12:46 2002
@@@@ -1503,7 +1503,7 @@@@
d12 19
a30 1
@@@@ -15077,6 +15077,9 @@@@
@


1.5
log
@Update to 2.0.35 (first GA release!)

PR:		36834
Submitted by:	maintainer
@
text
@d1 12
a12 3
--- configure.orig	Sat Apr  6 15:19:30 2002
+++ configure	Sun Apr  7 09:13:07 2002
@@@@ -12087,6 +12087,9 @@@@
d14 1
a14 1
 cat >> confdefs.h <<EOF
d19 2
a20 1
 EOF
a21 1
 cat >> confdefs.h <<EOF
@


1.4
log
@Update to 2.0.32

PR:		36040
Submitted by:	maintainer
@
text
@d1 3
a3 4
--- configure.orig	Fri Feb 22 03:43:38 2002
+++ configure	Fri Feb 22 03:44:56 2002
@@@@ -11095,7 +11095,10 @@@@
 EOF
d6 4
a9 5
-#define SERVER_CONFIG_FILE "conf/$progname.conf"
+#define SERVER_CONFIG_FILE "etc/apache2/$progname.conf"
+#define DEFAULT_ERRORLOG "/var/log/httpd-error.log"
+#define AP_TYPES_CONFIG_FILE "etc/apache2/mime.types"
+#define DOCUMENT_LOCATION HTTPD_ROOT "/www/data"
@


1.3
log
@Update to 2.0.28

PR:		32043
Submitted by:	maintainer
@
text
@d1 3
a3 21
--- configure.orig	Tue Nov 13 04:07:39 2001
+++ configure	Fri Nov 16 23:32:52 2001
@@@@ -1084,7 +1084,7 @@@@
   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 $disable_shared"
+  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "$apache_apr_flags --prefix=$prefix $disable_shared"
   then :
     echo "srclib/apr configured properly"
   else
@@@@ -1175,7 +1175,7 @@@@
   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 $disable_shared"
+  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir --includedir=$includedir "--with-apr=../apr --prefix=$prefix $disable_shared"
   then :
     echo "srclib/apr-util configured properly"
   else
@@@@ -10508,7 +10508,10 @@@@
d8 1
a8 1
+#define SERVER_CONFIG_FILE "etc/apache/$progname.conf"
d10 1
a10 1
+#define AP_TYPES_CONFIG_FILE "etc/apache/mime.types"
@


1.2
log
@Fix problems with configure bug that doesn't evaluate variables for
support/*.in.

PR:		26570
Submitted by:	maintainer
Found by:	mharo
@
text
@d1 4
a4 29
--- configure.orig	Wed Apr  4 12:45:36 2001
+++ configure	Sat Apr 14 18:25:08 2001
@@@@ -3760,7 +3760,9 @@@@
       -e "s/[ 	]*$/'/g" \
       $srcdir/config.layout > $pldconf
   layout_name=$LAYOUT
+  prefix_backup=$prefix # poor patch to prevent override prefix arg with default
   . $pldconf
+  prefix=$prefix_backup
   rm $pldconf
   for var in prefix exec_prefix bindir sbindir libexecdir mandir \
              sysconfdir datadir iconsdir htdocsdir cgidir includedir \
@@@@ -3777,7 +3779,7 @@@@
         ;;
     esac
     val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
-    val=`echo $val | sed -e 's:$\([a-z_]*\):$(\1):g'`
+    val=`echo $val | sed -e 's:$\([a-z_]*\):${\1}:g'`
     if test "$autosuffix" = "yes"; then
       if echo $val | grep apache >/dev/null; then
         addtarget=no
@@@@ -3788,7 +3790,7 @@@@
         val="$val/apache"
       fi
     fi
-    eval "$var='$val'"
+    eval "$var=\"$val\""
   done
   
d6 8
a13 1
@@@@ -9678,6 +9680,10 @@@@
d15 7
a21 10
   
   APACHE_VAR_SUBST="$APACHE_VAR_SUBST sysconfdir"
+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST runtimedir"
+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST logfiledir"
+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST mandir"
+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST libdir"
   
 
   
@@@@ -9814,7 +9820,7 @@@@
d27 3
@


1.1
log
@Bring in Apache 2.0.16-beta.  Just in time for the release...

PR:		26410
Submitted by:	Chang, Hye-Shik <perky@@python.or.kr>
Repocopied by:	asami
@
text
@d2 1
a2 1
+++ configure	Sun Apr  8 03:25:31 2001
d13 18
@

