Hi modssl-users,

I have successfully ported 2.4.9-1.3.9 to the HP MPE/iX OS.  See attached
for my diffs.

I had to make the following changes:

1) configure needed to be MPE/iX aware so etc/patch/configure would work
properly

2) I changed the order of the configure touch commands for ssl_expr_scan.c,
ssl_expr_parse.c, and ssl_expr_parse.h.  The Makefile has ssl_expr_scan.c
depending on ssl_expr_parse.h, and since previously ssl_expr_parse.h was
being touched last, that was forcing a remake of ssl_expr_scan.c, which was
trying to run flex which may or may not exist on all MPE machines, and if it
does, may generate broken code.

3) libssl.module needed to be MPE/iX aware so the library link order could
be adjusted so the openssl libraries come first (on MPE those libraries
contain dependencies on other libraries that must come after them in the
link sequence).

4) mod_ssl.h was tweaked to ignore an include file missing on MPE/iX.

5) mkcert.sh needed to be MPE/iX aware to work around the broken inline cat
command.

Please let me know if these changes are acceptable, or if you want me to
revise them.

- Mark Bixby
HP CSY MPE/iX Internet & Interoperability team member

diff -ru mod_ssl-2.4.9-1.3.9/configure mod_ssl-2.4.9-1.3.9-mpe/configure
--- mod_ssl-2.4.9-1.3.9/configure       Thu Oct 21 12:01:50 1999
+++ mod_ssl-2.4.9-1.3.9-mpe/configure   Fri Dec 10 17:33:36 1999
@@ -122,6 +122,15 @@
 
 
 #
+#   The MPE/iX OS needs some help
+#
+if [ -f '/SYS/PUB/MPEXLDIR' -a ".$HPSUSAN" != . ]; then
+    # this is MPE/iX
+    alias -x cat=/bin/cat                # builtin cat has a few problems
+    export CPPFLAGS="-D_POSIX_SOURCE"    # so the patch program will configure
+fi
+
+#
 #   determine versions
 #
 V_MODSSL=`cat pkg.sslmod/libssl.version | sed -e 's;-.*;;' -e 's;.*/;;'`
@@ -534,9 +543,9 @@
     echo "$prefixe creating: [FILE] src/modules/ssl/$file" | eval $disp_ver
     cp -p pkg.sslmod/$file $apache/src/modules/ssl/
 done
-touch $apache/src/modules/ssl/ssl_expr_scan.c
 touch $apache/src/modules/ssl/ssl_expr_parse.c
 touch $apache/src/modules/ssl/ssl_expr_parse.h
+touch $apache/src/modules/ssl/ssl_expr_scan.c
 
 #
 #   Applying: SSL Support
diff -ru mod_ssl-2.4.9-1.3.9/pkg.sslmod/libssl.module 
mod_ssl-2.4.9-1.3.9-mpe/pkg.sslmod/libssl.module
--- mod_ssl-2.4.9-1.3.9/pkg.sslmod/libssl.module        Thu Sep 30 05:24:27 1999
+++ mod_ssl-2.4.9-1.3.9-mpe/pkg.sslmod/libssl.module    Fri Dec 10 16:06:53 1999
@@ -528,7 +528,10 @@
     else
         #   else we are linked with httpd
         LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
-        LIBS="$LIBS $SSL_LIBS"
+        case "$OS" in
+            MPE/iX ) LIBS="$SSL_LIBS $LIBS" ;;
+                 * ) LIBS="$LIBS $SSL_LIBS" ;;
+        esac
     fi
     CFLAGS="$CFLAGS -DMOD_SSL=$A_VER_HEX"
     if [ ".$P_ID" != . ]; then
diff -ru mod_ssl-2.4.9-1.3.9/pkg.sslmod/mod_ssl.h 
mod_ssl-2.4.9-1.3.9-mpe/pkg.sslmod/mod_ssl.h
--- mod_ssl-2.4.9-1.3.9/pkg.sslmod/mod_ssl.h    Wed Nov 24 02:41:45 1999
+++ mod_ssl-2.4.9-1.3.9-mpe/pkg.sslmod/mod_ssl.h        Thu Dec  9 15:51:38 1999
@@ -83,7 +83,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <time.h>
-#ifndef WIN32
+#if !defined(WIN32) && !defined(MPE)
 #include <sys/time.h>
 #endif
 #include <sys/stat.h>
diff -ru mod_ssl-2.4.9-1.3.9/pkg.sslsup/mkcert.sh 
mod_ssl-2.4.9-1.3.9-mpe/pkg.sslsup/mkcert.sh
--- mod_ssl-2.4.9-1.3.9/pkg.sslsup/mkcert.sh    Fri Oct 22 12:46:53 1999
+++ mod_ssl-2.4.9-1.3.9-mpe/pkg.sslsup/mkcert.sh        Fri Dec 10 16:00:14 1999
@@ -15,6 +15,14 @@
 key="$8"
 view="$9"
 
+#  
+#   The MPE/iX OS needs some help
+#
+if [ -f '/SYS/PUB/MPEXLDIR' -a ".$HPSUSAN" != . ]; then
+    # this is MPE/iX 
+    alias -x cat=/bin/cat                # builtin cat has a few problems
+fi
+
 #   we can operate only inside the Apache 1.3 source
 #   tree and only when mod_ssl+OpenSSL is actually configured.
 if [ ! -f "../README.configure" ]; then

Reply via email to