http/apache2/: 2006/06/15 sync stable from p4

6 files changed, 29 insertions, 14 deletions

diff --git a/http/apache2/BUILD b/http/apache2/BUILD
index 613dab9f69..cc52a35c90 100755
--- a/http/apache2/BUILD
+++ b/http/apache2/BUILD
@@ -9,6 +9,6 @@ rm  -fr  srclib/apr*/  &&
       --localstatedir=$INSTALL_ROOT/var            \
              --mandir=$INSTALL_ROOT/usr/share/man  \
       --enable-layout=GNU                          \
-     --enable-modules=most,max                     \
+     --enable-modules=most                         \
                       $OPTS                        &&
 make
diff --git a/http/apache2/CONFIGURE b/http/apache2/CONFIGURE
index 898d46283f..2b54eaec4a 100755
--- a/http/apache2/CONFIGURE
+++ b/http/apache2/CONFIGURE
@@ -92,6 +92,10 @@ output_module_config() {
   # (eg. for mod_auth, $NAME would be "auth").
 
   local TARGET=$( echo $OUTPUT | cut -d' ' -f1 )
+  if [ "${TARGET:0:1}" != "m" ]
+  then
+    TARGET=${TARGET:1}
+  fi
   local NAME
 
   for MODULE in $MODULELIST
diff --git a/http/apache2/DETAILS b/http/apache2/DETAILS
index 82c5da4c6c..6fa1236234 100755
--- a/http/apache2/DETAILS
+++ b/http/apache2/DETAILS
@@ -1,10 +1,11 @@
            SPELL=apache2
-         VERSION=2.0.54
+         VERSION=2.0.58
+     SOURCE_HASH='sha512:907f40feb8250e9834b972e86e27c07276562587ab0a35b7de433c9247bf82f82230fcf493f7fed9e53ae80bdb4070b9c0a1855d5b4b2b8582774b1148548583'
+  SECURITY_PATCH=1
           SOURCE=httpd-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION
    SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
    SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
-          MD5[0]='2c01d71b0714c7b518b7b0ff230a2fdc'
         WEB_SITE=http://www.apache.org/
          ENTERED=20020422
          UPDATED=20050923
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 4841f42ce2..07a4bdb73d 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,3 +1,17 @@
+2006-05-15 Sergey Lipnevich <sergey@sourcemage.org>
+	* DETAILS: upgrade to 2.0.58.
+
+2005-10-20 Jason Flatt <jflatt@sourcemage.org>
+	* PRE_BUILD: Removed unnecessary patches.
+
+2005-10-16 Sergey Lipnevich <sergey@sourcemage.org>
+	* DETAILS: upgrade to 2.0.55.
+
+2005-10-13 Jason Flatt <jflatt@sourcemage.org>
+	* BUILD: Removed invalid ./configure option.
+	* CONFIGURE: Work around problem with spurious tab being adding during
+	  configure process.
+
 2005-09-23 Thomas Houssin <Thomas.Houssin@sourcemage.org>
 	* 06_CAN_2005_2700.patch: added
 	* PRE_BUILD: apply patch, security fix for CAN_2005_2700
diff --git a/http/apache2/PRE_BUILD b/http/apache2/PRE_BUILD
index 177eab494f..917f8ff16f 100755
--- a/http/apache2/PRE_BUILD
+++ b/http/apache2/PRE_BUILD
@@ -1,9 +1,5 @@
 default_pre_build                                            &&
 cd  $SOURCE_DIRECTORY                                        &&
 patch  -p1  <  $SCRIPT_DIRECTORY/buildconf.patch             &&
-patch  -p0  <  $SCRIPT_DIRECTORY/byterange.patch             &&
 patch  -p1  <  $SCRIPT_DIRECTORY/03_all_redhat_xfsz.patch    &&
-patch  -p1  <  $SCRIPT_DIRECTORY/01_all_gentoo_ipv6.patch    &&
-patch  -p1  <  $SCRIPT_DIRECTORY/04_all_ssl_makefile.patch   &&
-patch  -p1  <  $SCRIPT_DIRECTORY/05_httpd-2.0.54_openssl-0.9.8.patch &&
-patch  -p3  <  $SCRIPT_DIRECTORY/06_CAN-2005-2700.patch
+patch  -p1  <  $SCRIPT_DIRECTORY/01_all_gentoo_ipv6.patch
diff --git a/http/apache2/buildconf.patch b/http/apache2/buildconf.patch
index 52e1b2117f..427a438187 100644
--- a/http/apache2/buildconf.patch
+++ b/http/apache2/buildconf.patch
@@ -1,12 +1,12 @@
-diff -Naur httpd-2.0.53.orig/buildconf httpd-2.0.53/buildconf
---- httpd-2.0.53.orig/buildconf	2005-02-07 13:07:47.183455368 -0800
-+++ httpd-2.0.53/buildconf	2005-02-07 13:09:11.810590088 -0800
-@@ -66,7 +66,7 @@
+diff -urN httpd-2.0.58/buildconf httpd/buildconf
+--- httpd-2.0.58/buildconf	2006-04-24 13:12:21.000000000 -0400
++++ httpd/buildconf	2006-05-15 22:28:32.000000000 -0400
+@@ -67,7 +67,7 @@
      should_exit=1
  fi
  
--if [ ! -d "$apu_src_dir" -o ! -f "$apu_src_dir/Makefile.in" ]; then
-+if [ ! -d "$apu_src_dir" -o ! -f "$apu_src_dir/build/find_apu.m4" ]; then
+-if [ ! -f "$apu_src_dir/Makefile.in" ]; then
++if [ ! -f "$apu_src_dir/build/apu-conf.m4" ]; then
      echo ""
      echo "You don't have a copy of the apr-util source in $apu_src_dir. "
      echo "Please get one the source using the following instructions, "