fielding 99/08/09 00:38:50
Modified: . INSTALL
src CHANGES Configure
src/helpers GuessOS
src/include ap_config.h
src/os/unix os.c
Log:
Improved compilation and DSO support on Sequent DYNIX/ptx.
PR: 4735
Submitted by: Ian Turner <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding
Revision Changes Path
1.59 +1 -1 apache-1.3/INSTALL
Index: INSTALL
===================================================================
RCS file: /home/cvs/apache-1.3/INSTALL,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- INSTALL 1999/07/30 09:53:07 1.58
+++ INSTALL 1999/08/09 07:38:32 1.59
@@ -82,7 +82,7 @@
- Linux - SunOS - UnixWare - Mac OS X Server
- FreeBSD - Solaris - AIX - Mac OS
- OpenBSD - IRIX - SCO - OpenStep/Mach
- - NetBSD - HPUX - ReliantUNIX
+ - NetBSD - HPUX - ReliantUNIX - DYNIX/ptx
- BSDI - Digital Unix - DGUX
o Entirely unsupported platforms are:
1.1413 +10 -5 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1412
retrieving revision 1.1413
diff -u -r1.1412 -r1.1413
--- CHANGES 1999/08/09 00:04:30 1.1412
+++ CHANGES 1999/08/09 07:38:36 1.1413
@@ -1,5 +1,11 @@
Changes with Apache 1.3.8
+ *) PORT: Improved compilation and DSO support on Sequent DYNIX/ptx.
+ [Ian Turner <[EMAIL PROTECTED]>] PR#4735
+
+ *) Local struct mmap in http_core.c conflicted with system structure
+ name on DYNIX -- changed to mmap_rec. [Roy Fielding] PR#4735
+
*) Added updated mod_digest as modules/experimental/mod_auth_digest.
[Ronald Tschalär <[EMAIL PROTECTED]>]
@@ -13,17 +19,16 @@
*) RewriteLock/RewriteMap didn't work properly with virtual hosts.
[Dmitry Khrustalev <[EMAIL PROTECTED]>] PR#3874
- *) Support for compaq/tandem/com.
- [Ottati, Michael" <[EMAIL PROTECTED]>, dirkx]
+ *) PORT: Support for compaq/tandem/com.
+ [Michael Ottati <[EMAIL PROTECTED]>, dirkx]
*) Added SHA1 password encryption support to easy migration from
- Netscape servers. See support/SHA1 for more information; based
- on the code contributed by Clinton Wong <[EMAIL PROTECTED]>.
+ Netscape servers. See support/SHA1 for more information.
Caused the separation of ap_md5.c into md5, sha1 and a general
ap_checkpass.c with just a validate_passwd routine. Added a
couple of flags to support/htpasswd. Some reuse of the to64()
function; hence renamed to ap_to64().
- [dirkx]
+ [Dirk-Willem van Gulik, Clinton Wong <[EMAIL PROTECTED]>]
*) Change for EBCDIC platforms (TPF and BS2000) to correctly deal
with ASCII/EBCDIC conversions in "ident" query.
1.367 +59 -3 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- Configure 1999/08/06 22:15:54 1.366
+++ Configure 1999/08/09 07:38:37 1.367
@@ -699,11 +699,42 @@
OS='Paragon OSF/1'
CFLAGS="$CFLAGS -DPARAGON"
;;
- *DYNIX*)
+ *-sequent-ptx2.*.*)
DEF_WANTHSREGEX=yes
- OS='SEQUENT'
- CFLAGS="$CFLAGS -DSEQUENT"
+ OS='SEQUENT DYNIX/ptx v2.*.*'
+ CFLAGS="$CFLAGS -DSEQUENT=20 -Wc,-pw"
+ LIBS="$LIBS -lsocket -linet -lnsl -lc -lseq"
;;
+ *-sequent-ptx4.0.*)
+ DEF_WANTHSREGEX=yes
+ OS='SEQUENT DYNIX/ptx v4.0.*'
+ CFLAGS="$CFLAGS -DSEQUENT=40 -Wc,-pw"
+ LIBS="$LIBS -lsocket -linet -lnsl -lc"
+ ;;
+ *-sequent-ptx4.[123].*)
+ DEF_WANTHSREGEX=yes
+ OS='SEQUENT DYNIX/ptx v4.1.*/v4.2.*'
+ CFLAGS="$CFLAGS -DSEQUENT=41 -Wc,-pw"
+ LIBS="$LIBS -lsocket -lnsl -lc"
+ ;;
+ *-sequent-ptx4.4.*)
+ DEF_WANTHSREGEX=yes
+ OS='SEQUENT DYNIX/ptx v4.4.*'
+ CFLAGS="$CFLAGS -DSEQUENT=44 -Wc,-pw"
+ LIBS="$LIBS -lsocket -lnsl -lc"
+ ;;
+ *-sequent-ptx4.5.*)
+ DEF_WANTHSREGEX=yes
+ OS='SEQUENT DYNIX/ptx v4.5.*'
+ CFLAGS="$CFLAGS -DSEQUENT=45 -Wc,-pw"
+ LIBS="$LIBS -lsocket -lnsl -lc"
+ ;;
+ *-sequent-ptx5.0.*)
+ DEF_WANTHSREGEX=yes
+ OS='SEQUENT DYNIX/ptx v5.0.*'
+ CFLAGS="$CFLAGS -DSEQUENT=50 -Wc,-pw"
+ LIBS="$LIBS -lsocket -lnsl -lc"
+ ;;
*NEWS-OS*)
DEF_WANTHSREGEX=yes
OS='SONY NEWS-OS'
@@ -1132,6 +1163,20 @@
LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
SHLIB_SUFFIX_DEPTH=1
;;
+ *-sequent-ptx*)
+ case $PLAT in
+ *-sequent-ptx2*)
+ ;;
+ *-sequent-ptx4.0*)
+ ;;
+ *-sequent-ptx*)
+ CFLAGS_SHLIB="-KPIC"
+ LDFLAGS_SHLIB="-G"
+ LDFLAGS_SHLIB_EXPORT="-Wl,-Bexport"
+ LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
+ ;;
+ esac
+ ;;
RM*-siemens-sysv4*)
# MIPS hosts can take advantage of the LDFLAGS_SHLIB_EXPORT switch
case $CC in
@@ -1916,6 +1961,17 @@
case $PLAT in
*-ibm-aix* )
DL_LIB="-lld"
+ ;;
+ *-sequent-ptx* )
+ case $PLAT in
+ *-sequent-ptx2*)
+ ;;
+ *-sequent-ptx4.0*)
+ ;;
+ *-sequent-ptx*)
+ DL_LIB="-ldl"
+ ;;
+ esac
;;
*-hp-hpux*)
if ./helpers/TestCompile func shl_load; then
1.63 +9 -2 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===================================================================
RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- GuessOS 1999/08/02 10:45:30 1.62
+++ GuessOS 1999/08/09 07:38:44 1.63
@@ -198,8 +198,15 @@
echo "${MACHINE}-whatever-unixware212"; exit 0
;;
- DYNIX/ptx:4*:*)
- echo "${MACHINE}-whatever-sysv4"; exit 0
+ DYNIX/ptx:4*:*:i386)
+ PTXVER=`echo ${VERSION}|sed -e 's/[^.]//'`
+ echo "${MACHINE}-sequent-ptx${PTXVER}"; exit 0
+ ;;
+
+ *:3.2.0:*:i386)
+ # uname on DYNIX/ptx below V4.0.0 is brain dead
+ PTXVER=`echo ${VERSION}|sed -e 's/[^.]//'`
+ echo "${MACHINE}-sequent-ptx${PTXVER}"; exit 0
;;
*:4.0:3.0:[345][0-9]?? | *:4.0:3.0:3[34]??[/,]* | library:*)
1.267 +27 -4 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- ap_config.h 1999/08/06 04:01:19 1.266
+++ ap_config.h 1999/08/09 07:38:45 1.267
@@ -318,11 +318,34 @@
typedef int rlim_t;
#elif defined(SEQUENT)
-#define HAVE_GMTOFF 1
-#undef NO_KILLPG
-#define NO_SETSID
-#define NEED_STRDUP
+#define DEFAULT_USER "nobody"
+#define DEFAULT_GROUP "nobody"
+#define NO_SHMGET 1
+#define HAVE_MMAP 1
#define HAVE_SYSLOG 1
+#define USE_MMAP_FILES 1
+#define USE_MMAP_SCOREBOARD 1
+#define USE_FCNTL_SERIALIZED_ACCEPT 1
+#define JMP_BUF sigjmp_buf
+#undef NO_SETSID
+#if SEQUENT < 40
+typedef int rlim_t;
+#define NO_GETTIMEOFDAY
+#undef HAVE_SYS_RESOURCE_H /* exists but does not provide *rlimit funcs */
+#include <sys/times.h>
+#endif
+#if SEQUENT < 42
+#define NEED_STRCASECMP
+#define NEED_STRNCASECMP
+#endif
+#if SEQUENT < 44
+#define NO_KILLPG 1
+#define NET_SIZE_T int
+#endif
+#if SEQUENT >= 44
+#undef NO_KILLPG
+#define NET_SIZE_T size_t
+#endif
#elif defined(NEXT)
typedef unsigned short mode_t;
1.17 +4 -1 apache-1.3/src/os/unix/os.c
Index: os.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/unix/os.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- os.c 1999/05/03 23:06:05 1.16
+++ os.c 1999/08/09 07:38:48 1.17
@@ -109,7 +109,7 @@
return NULL;
return NSLinkModule(image, path, TRUE);
-#elif defined(OSF1) ||\
+#elif defined(OSF1) || defined(SEQUENT) ||\
(defined(__FreeBSD_version) && (__FreeBSD_version >= 220000))
return dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL);
@@ -160,6 +160,9 @@
retval = dlsym(handle, symbol);
free(symbol);
return retval;
+
+#elif defined(SEQUENT)
+ return dlsym(handle, (char *)symname);
#else
return dlsym(handle, symname);
