--- ./srclib/apr/build/ltmain.sh	Wed May 28 01:11:04 2003
+++ ../httpd-2.0.46/./srclib/apr/build/ltmain.sh	Sun Jun 29 16:42:54 2003
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"
 
--- ./srclib/pcre/ltmain.sh	Wed Mar 20 00:54:14 2002
+++ ../httpd-2.0.46/./srclib/pcre/ltmain.sh	Sun Jun 29 16:42:54 2003
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"
 
--- ./srclib/apr-util/xml/expat/conftools/ltmain.sh	Wed May 28 01:11:17 2003
+++ ../httpd-2.0.46/./srclib/apr-util/xml/expat/conftools/ltmain.sh	Sun Jun 29 16:42:55 2003
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"
 
--- ./srclib/apr-util/crypto/getuuid.c	Tue Dec 31 19:02:18 2002
+++ ../httpd-2.0.46/./srclib/apr-util/crypto/getuuid.c	Sun Jun 29 23:39:43 2003
@@ -94,9 +94,13 @@
 {
 #if APR_HAS_RANDOM
 
-    (void) apr_generate_random_bytes(node, NODE_LENGTH);
+    apr_status_t rv;
+    rv = apr_generate_random_bytes(node, NODE_LENGTH);
+    if (rv == APR_SUCCESS) {
+      return;
+    } else {
 
-#else
+#endif
 
     unsigned char seed[MD5_DIGESTSIZE];
     apr_md5_ctx_t c;
@@ -130,7 +134,11 @@
     apr_md5_final(seed, &c);
 
     memcpy(node, seed, NODE_LENGTH);    /* use a subset of the seed bytes */
+
+#if APR_HAS_RANDOM
+    }
 #endif
+
 }
 
 /* This implementation generates a random node ID instead of a
--- ./srclib/apr-util/configure	Wed May 28 01:11:17 2003
+++ ../httpd-2.0.46/./srclib/apr-util/configure	Sun Jun 29 16:42:55 2003
@@ -13281,6 +13281,11 @@
     expat_libs="-lexpat"
     expat_libtool="$abs_expatdir/lib/libexpat.la"
   elif test -r "$abs_expatdir/include/expat.h" -a \
+    -r "$abs_expatdir/lib32/libexpat.so"; then
+        expat_include_dir="$abs_expatdir/include"
+    expat_ldflags=""
+    expat_libs="-lexpat"
+  elif test -r "$abs_expatdir/include/expat.h" -a \
     -r "$abs_expatdir/lib64/libexpat.la"; then
         expat_include_dir="$abs_expatdir/include"
     expat_ldflags="-L$abs_expatdir/lib64"
--- ./modules/arch/win32/mod_isapi.c	Wed Feb 26 13:42:30 2003
+++ ../httpd-2.0.46/./modules/arch/win32/mod_isapi.c	Mon Jun 30 00:50:05 2003
@@ -535,6 +535,7 @@
     request_rec *r = cid->r;
     const char *result;
     apr_uint32_t len;
+    char *tmp = (char *)buf_data;
 
     if (!strcmp(variable_name, "ALL_HTTP")) 
     {
@@ -559,16 +560,16 @@
     
         for (i = 0; i < arr->nelts; i++) {
             if (!strncmp(elts[i].key, "HTTP_", 5)) {
-                strcpy(buf_data, elts[i].key);
-                ((char*)buf_data) += strlen(elts[i].key);
-                *(((char*)buf_data)++) = ':';
-                strcpy(buf_data, elts[i].val);
-                ((char*)buf_data) += strlen(elts[i].val);
-                *(((char*)buf_data)++) = '\n';
+                strcpy(tmp, elts[i].key);
+                tmp += strlen(elts[i].key);
+                *(tmp++) = ':';
+                strcpy(tmp, elts[i].val);
+                tmp += strlen(elts[i].val);
+                *(tmp++) = '\n';
             }
         }
 
-        *(((char*)buf_data)++) = '\0';
+        *(tmp++) = '\0';
         *buf_size = len + 1;
         return 1;
     }
@@ -593,15 +594,15 @@
         }
     
         for (i = 0; i < arr->nelts; i++) {
-            strcpy(buf_data, elts[i].key);
-            ((char*)buf_data) += strlen(elts[i].key);
-            *(((char*)buf_data)++) = ':';
-            *(((char*)buf_data)++) = ' ';
-            strcpy(buf_data, elts[i].val);
-            ((char*)buf_data) += strlen(elts[i].val);
-            *(((char*)buf_data)++) = '\n';
+            strcpy(tmp, elts[i].key);
+            tmp += strlen(elts[i].key);
+            *(tmp++) = ':';
+            *(tmp++) = ' ';
+            strcpy(tmp, elts[i].val);
+            tmp += strlen(elts[i].val);
+            *(tmp++) = '\n';
         }
-        *(((char*)buf_data)++) = '\0';
+        *(tmp++) = '\0';
         *buf_size = len + 1;
         return 1;
     }
@@ -616,7 +617,7 @@
             SetLastError(ERROR_INSUFFICIENT_BUFFER);
             return 0;
         }
-        strcpy(buf_data, result);
+        strcpy(tmp, result);
         *buf_size = len + 1;
         return 1;
     }
@@ -824,7 +825,7 @@
             return 0;
         }
 
-        (char*)buf_data += ate;
+        buf_data = (char*)buf_data + ate;
         buf_size -= ate;
     }
 
@@ -890,7 +891,7 @@
         apr_table_unset(r->headers_in, "Content-Length");
 
         /* AV fault per PR3598 - redirected path is lost! */
-        (char*)buf_data = apr_pstrdup(r->pool, (char*)buf_data);
+        buf_data = apr_pstrdup(r->pool, (char*)buf_data);
         ap_internal_redirect((char*)buf_data, r);
         return 1;
 
--- ./configure	Wed May 28 01:11:27 2003
+++ ../httpd-2.0.46/./configure	Sun Jun 29 16:42:55 2003
@@ -9904,7 +9904,7 @@
   echo "$as_me:$LINENO: checking for SSL/TLS toolkit libraries" >&5
 echo $ECHO_N "checking for SSL/TLS toolkit libraries... $ECHO_C" >&6
   ap_ssltk_libdir=""
-  for p in $ap_ssltk_base/lib /usr/local/openssl/lib \
+  for p in $ap_ssltk_base/lib32 /usr/local/openssl/lib \
            /usr/local/ssl/lib /usr/local/lib /usr/lib /lib /usr/lib64; do
     if test -f "$p/libssl.a" -o -f "$p/libssl.so" -o -f "$p/libssl.dylib"; then
       ap_ssltk_libdir="$p"