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)

5 files changed, 250 insertions, 118 deletions

diff --git a/www/apache20/files/patch-configure b/www/apache20/files/patch-configure
deleted file mode 100644
index d5e81693c4c9..000000000000
--- a/www/apache20/files/patch-configure
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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
- 
- 
diff --git a/www/apache20/files/patch-configure.in b/www/apache20/files/patch-configure.in
new file mode 100644
index 000000000000..bce5e602c918
--- /dev/null
+++ b/www/apache20/files/patch-configure.in
@@ -0,0 +1,33 @@
+--- configure.in.orig	Mon Jan  5 14:40:31 2004
++++ configure.in	Mon Jan  5 14:44:51 2004
+@@ -69,7 +69,7 @@
+ 
+ if test "$apr_found" = "reconfig"; then
+   APR_SUBDIR_CONFIG(srclib/apr,
+-                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
++                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir],
+                     [--enable-layout=*|\'--enable-layout=*])
+   dnl We must be the first to build and the last to be cleaned
+   AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
+@@ -96,7 +96,7 @@
+ 
+ if test "$apu_found" = "reconfig"; then
+   APR_SUBDIR_CONFIG(srclib/apr-util,
+-                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir],
++                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir],
+                     [--enable-layout=*|\'--enable-layout=*])
+   dnl We must be the last to build and the first to be cleaned
+   AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
+@@ -532,8 +532,12 @@
+ 	[Root directory of the Apache install area])
+ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
+ 	[Location of the config file, relative to the Apache root directory])
++AC_DEFINE_UNQUOTED(DEFAULT_ERRORLOG, "${rel_logfiledir}/httpd-error.log",
++	[Location of error log file])
+ AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
+ 	[Location of the MIME types config file, relative to the Apache root directory])
++AC_DEFINE_UNQUOTED(DOCUMENT_LOCATION, "${rel_htdocsdir}",
++	[Location of document root])
+ AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
+ 	[Location of the source for the current MPM])
+ 
diff --git a/www/apache20/files/patch-srclib:apr-util:build:dbm.4 b/www/apache20/files/patch-srclib:apr-util:build:dbm.4
new file mode 100644
index 000000000000..72acc608912c
--- /dev/null
+++ b/www/apache20/files/patch-srclib:apr-util:build:dbm.4
@@ -0,0 +1,192 @@
+--- srclib/apr-util/build/dbm.m4.orig	Sun Aug 31 15:27:23 2003
++++ srclib/apr-util/build/dbm.m4	Thu Jan  8 17:11:11 2004
+@@ -48,6 +48,7 @@
+ 
+   # Save the original values of the flags we tweak.
+   apu_check_lib_save_libs="$LIBS"
++  apu_check_lib_save_ldflags="$LDFLAGS"
+   apu_check_lib_save_cppflags="$CPPFLAGS"
+ 
+   # The variable `found' is the prefix under which we've found
+@@ -69,15 +70,21 @@
+         description="$header and $lib"
+       ;;
+       * )
+-        LDFLAGS="$LDFLAGS -L$bdb_place/lib"
+-        CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
++        if test -d $bdb_place; then
++          LDFLAGS="$LDFLAGS -L$bdb_place/lib"
++          CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
++        else
++          AC_MSG_CHECKING([for Berkeley DB $bdb_version in $bdb_place])
++          AC_MSG_RESULT([directory not found])
++          continue
++        fi
+         description="$bdb_place"
+       ;;
+     esac
+ 
+     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
+     # trick to display a message instead.
+-    AC_MSG_CHECKING([checking for Berkeley DB $bdb_version in $description])
++    AC_MSG_CHECKING([for Berkeley DB $bdb_version in $description])
+     AC_MSG_RESULT()
+ 
+     for bdb_libname in $bdb_default_search_lib_names; do
+@@ -99,7 +106,7 @@
+                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
+             changequote([,])
+ 
+-            AC_MSG_CHECKING([for $bdb_libname])
++            AC_MSG_CHECKING([for -l$bdb_libname])
+             dnl We can't use AC_CACHE_CHECK here, because that won't print out
+             dnl the value of the computed cache variable properly.
+             AC_CACHE_VAL($cache_id,
+@@ -291,8 +298,8 @@
+   fi
+   APU_CHECK_BERKELEY_DB(1, -1, -1,
+     "$places",
+-    "db_185.h",
+-    "db"
++    "db.h",
++    "c"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=185
+@@ -350,12 +357,12 @@
+ AC_DEFUN(APU_CHECK_DB4, [
+   places=$1
+   if test -z "$places"; then
+-    places="std /usr/local /usr/local/BerkeleyDB.4.0"
++    places="std /usr/local /usr/local/BerkeleyDB.4.0 /boot/home/config"
+   fi
+   APU_CHECK_BERKELEY_DB("4", "0", "-1",
+     "$places",
+-    "db4/db.h db.h",
+-    "db-4.0 db4 db"
++    "db4/db.h",
++    "db4"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=4
+@@ -371,12 +378,33 @@
+ AC_DEFUN(APU_CHECK_DB41, [
+   places=$1
+   if test -z "$places"; then
+-    places="std /usr/local/BerkeleyDB.4.1"
++    places="std /usr/local/BerkeleyDB.4.1 /boot/home/config"
+   fi
+   APU_CHECK_BERKELEY_DB("4", "1", "-1",
+     "$places",
+-    "db4/db.h db.h",
+-    "db-4.1 db4 db"
++    "db41/db.h",
++    "db41"
++  )
++  if test "$apu_have_db" = "1"; then
++    apu_db_version=4
++  fi
++])
++
++
++dnl
++dnl APU_CHECK_DB42: is DB4.2 present?
++dnl
++dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
++dnl
++AC_DEFUN(APU_CHECK_DB42, [
++  places=$1
++  if test -z "$places"; then
++    places="${LOCALBASE}/include:${LOCALBASE}/lib/db42 /usr/local/BerkeleyDB.4.2 /boot/home/config"
++  fi
++  APU_CHECK_BERKELEY_DB("4", "2", "-1",
++    "$places",
++    "db42/db.h",
++    "db-4.2 db-4.2.2"
+   )
+   if test "$apu_have_db" = "1"; then
+     apu_db_version=4
+@@ -431,6 +459,12 @@
+       AC_MSG_ERROR(Berkeley db4 not found)
+     fi
+     ;;
++  db42)
++    APU_CHECK_DB42("$check_places")
++    if test "$apu_db_version" != "4"; then
++      AC_MSG_ERROR(Berkeley db4 not found)
++    fi
++    ;;
+   default)
+     APU_CHECK_DB_ALL("$check_places")
+     ;;
+@@ -438,22 +472,25 @@
+ ])
+ 
+ dnl
+-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.1 to 1.
++dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1.
+ dnl
+ AC_DEFUN(APU_CHECK_DB_ALL, [
+   all_places=$1
+-  
+-  APU_CHECK_DB41("$all_places")
++ 
++  APU_CHECK_DB42("$all_places")
+   if test "$apu_db_version" != "4"; then
+-    APU_CHECK_DB4("$all_places")
++    APU_CHECK_DB41("$all_places")
+     if test "$apu_db_version" != "4"; then
+-      APU_CHECK_DB3("$all_places")
+-      if test "$apu_db_version" != "3"; then
+-        APU_CHECK_DB2("$all_places")
+-        if test "$apu_db_version" != "2"; then
+-          APU_CHECK_DB1("$all_places")
+-          if test "$apu_db_version" != "1"; then
+-            APU_CHECK_DB185("$all_places")
++      APU_CHECK_DB4("$all_places")
++      if test "$apu_db_version" != "4"; then
++        APU_CHECK_DB3("$all_places")
++        if test "$apu_db_version" != "3"; then
++          APU_CHECK_DB2("$all_places")
++          if test "$apu_db_version" != "2"; then
++            APU_CHECK_DB1("$all_places")
++            if test "$apu_db_version" != "1"; then
++              APU_CHECK_DB185("$all_places")
++            fi
+           fi
+         fi
+       fi
+@@ -487,11 +524,11 @@
+ 
+   AC_ARG_WITH(dbm, [
+     --with-dbm=DBM          choose the DBM type to use.
+-      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4}
++      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42}
+   ], [
+     if test "$withval" = "yes"; then
+       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
+-        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4])
++        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
+     fi
+     requested="$withval"
+   ], [
+@@ -665,6 +702,10 @@
+       apu_use_db=1
+       apu_default_dbm=db4
+       ;;
++    db42)
++      apu_use_db=1
++      apu_default_dbm=db4
++      ;;
+     default)
+       dnl ### use more sophisticated DBMs for the default?
+       apu_default_dbm="sdbm (default)"
+@@ -672,7 +713,7 @@
+       ;;
+     *)
+       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
+-        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4])
++        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
+       ;;
+   esac
+ 
diff --git a/www/apache20/files/patch-srclib:apr-util:configure b/www/apache20/files/patch-srclib:apr-util:configure
deleted file mode 100644
index 7f28b2950788..000000000000
--- a/www/apache20/files/patch-srclib:apr-util:configure
+++ /dev/null
@@ -1,79 +0,0 @@
---- srclib/apr-util/configure.orig	Thu Nov  6 13:05:46 2003
-+++ srclib/apr-util/configure	Thu Nov  6 13:05:30 2003
-@@ -7586,8 +7586,8 @@
-     fi
-   fi
-   bdb_places="$places"
--  bdb_default_search_headers="db4/db.h db.h"
--  bdb_default_search_lib_names="db-4.1 db4 db"
-+  bdb_default_search_headers="db41/db.h db4/db.h db.h"
-+  bdb_default_search_lib_names="db41 db-4.1 db4 db"
- 
- 
-   apu_have_db=0
-@@ -11281,8 +11281,8 @@
-     fi
-   fi
-   bdb_places="$places"
--  bdb_default_search_headers="db_185.h"
--  bdb_default_search_lib_names="db"
-+  bdb_default_search_headers="db.h"
-+  bdb_default_search_lib_names="c"
- 
- 
-   apu_have_db=0
-@@ -13401,8 +13401,8 @@
-     fi
-   fi
-   bdb_places="$places"
--  bdb_default_search_headers="db4/db.h db.h"
--  bdb_default_search_lib_names="db-4.1 db4 db"
-+  bdb_default_search_headers="db41/db.h db4/db.h db.h"
-+  bdb_default_search_lib_names="db41 db-4.1 db4 db"
- 
- 
-   apu_have_db=0
-@@ -13934,8 +13934,8 @@
-     fi
-   fi
-   bdb_places="$places"
--  bdb_default_search_headers="db4/db.h db.h"
--  bdb_default_search_lib_names="db-4.1 db4 db"
-+  bdb_default_search_headers="db41/db.h db4/db.h db.h"
-+  bdb_default_search_lib_names="db41 db-4.1 db4 db"
- 
- 
-   apu_have_db=0
-@@ -17113,8 +17113,8 @@
-     fi
-   fi
-   bdb_places="$places"
--  bdb_default_search_headers="db4/db.h db.h"
--  bdb_default_search_lib_names="db-4.1 db4 db"
-+  bdb_default_search_headers="db41/db.h db4/db.h db.h"
-+  bdb_default_search_lib_names="db41 db-4.1 db4 db"
- 
- 
-   apu_have_db=0
-@@ -22928,8 +22928,8 @@
-     fi
-   fi
-   bdb_places="$places"
--  bdb_default_search_headers="db4/db.h db.h"
--  bdb_default_search_lib_names="db-4.1 db4 db"
-+  bdb_default_search_headers="db41/db.h db4/db.h db.h"
-+  bdb_default_search_lib_names="db41 db-4.1 db4 db"
- 
- 
-   apu_have_db=0
-@@ -23461,8 +23461,8 @@
-     fi
-   fi
-   bdb_places="$places"
--  bdb_default_search_headers="db4/db.h db.h"
--  bdb_default_search_lib_names="db-4.1 db4 db"
-+  bdb_default_search_headers="db41/db.h db4/db.h db.h"
-+  bdb_default_search_lib_names="db41 db-4.1 db4 db"
- 
- 
-   apu_have_db=0
diff --git a/www/apache20/files/patch-srclib:apr:build:apr_hints.m4 b/www/apache20/files/patch-srclib:apr:build:apr_hints.m4
new file mode 100644
index 000000000000..444351563b7f
--- /dev/null
+++ b/www/apache20/files/patch-srclib:apr:build:apr_hints.m4
@@ -0,0 +1,25 @@
+--- srclib/apr/build/apr_hints.m4.orig	Tue Jun  3 00:52:28 2003
++++ srclib/apr/build/apr_hints.m4	Mon Jan  5 12:36:32 2004
+@@ -130,14 +130,15 @@
+ 	APR_ADDTO(CPPFLAGS, [-DNETBSD])
+ 	;;
+     *-freebsd*)
+-	case $host in
+-	    *freebsd[2345]*)
+-		APR_ADDTO(CFLAGS, [-funsigned-char])
+-		;;
+-	esac
+-	APR_SETIFNULL(enable_threads, [no])
++	os_version=`sysctl -n kern.osreldate`
++	APR_ADDTO(CFLAGS, [-funsigned-char])
+         APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
+-	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
++	if test $os_version -lt "500016"; then
++		ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT"
++		LIBS="$LIBS -pthread"
++	else
++		ac_cv_pthreads_lib="c_r"
++	fi
+ 	;;
+     *-next-nextstep*)
+ 	APR_SETIFNULL(CFLAGS, [-O])