Bugzilla bug #60143: checked in OpenVMS patch from Colin Blake

<colin@theblakes.com>.
Modified Files:
	coreconf/OpenVMS.mk coreconf/arch.mk coreconf/rules.mk
	coreconf/ruleset.mk nss/cmd/lib/secpwd.c nss/lib/nss/nss.h
	nss/lib/nss/nssinit.c

security/coreconf/OpenVMS.mk

@@ -32,13 +32,18 @@ endif
 
 RANLIB			= /bin/true
 
-CPU_ARCH_TAG		= _$(CPU_ARCH)
+CPU_ARCH		:= $(shell uname -Wh)
 
 OS_CFLAGS              = -DVMS -DVMS_AS_IS -Wc,names=\(short,as\) \
                          -DGENERIC_PTHREAD_REDEFINES -DNO_UDSOCK
 OS_CXXFLAGS            = -DVMS -DVMS_AS_IS -Wc,names=\(short,as\) \
                          -DGENERIC_PTHREAD_REDEFINES -DNO_UDSOCK
 
+# Maybe this should go into rules.mk or something?
+ifdef NSPR_INCLUDE_DIR
+INCLUDES += -I$(NSPR_INCLUDE_DIR)
+endif
+
 #
 # XCFLAGS are the only CFLAGS that are used during a link operation. Defining
 # OPTIMIZER in XCFLAGS means that each compilation line gets OPTIMIZER

security/coreconf/arch.mk

@@ -146,6 +146,11 @@ ifeq ($(OS_ARCH),OS_2)
 	OS_RELEASE := $(shell uname -v)
 endif
 
+ifneq (,$(findstring OpenVMS,$(OS_ARCH)))
+	OS_ARCH = OpenVMS
+	OS_RELEASE := $(shell uname -v)
+endif
+
 #######################################################################
 # Master "Core Components" macros for getting the OS target           #
 #######################################################################

security/coreconf/rules.mk

@@ -99,6 +99,9 @@ ifdef LIBRARY
 endif
 ifdef SHARED_LIBRARY
 	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
+ifeq ($(OS_ARCH),OpenVMS)
+	$(INSTALL) -m 775 $(SHARED_LIBRARY:$(DLL_SUFFIX)=vms) $(SOURCE_LIB_DIR)
+endif
 endif
 ifdef IMPORT_LIBRARY
 	$(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR)
@@ -376,6 +379,9 @@ else
 	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
 endif
 	chmod +x $@
+ifeq ($(OS_ARCH),OpenVMS)
+	@echo "`translate $@`" > $(@:$(DLL_SUFFIX)=vms)
+endif
 endif
 endif
 ifneq ($(POLICY),)

security/coreconf/ruleset.mk

@@ -99,6 +99,13 @@ ifeq ($(OS_ARCH), Linux)
 	CPU_TAG = _$(CPU_ARCH)
 endif
 
+#
+# Always set CPU_TAG on OpenVMS.
+#
+ifeq ($(OS_ARCH), OpenVMS)
+	CPU_TAG = _$(CPU_ARCH)
+endif
+
 #
 #  At this time, the COMPILER_TAG value is actually assigned.
 #

security/nss/cmd/lib/secpwd.c

@@ -43,6 +43,7 @@
 
 #ifdef XP_UNIX
 #include <termios.h>
+#include <unistd.h>
 #endif
 
 #ifdef _WINDOWS

security/nss/lib/nss/nss.h

@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: nss.h,v 1.5 2001-01-18 20:28:59 wtc%netscape.com Exp $
+ * $Id: nss.h,v 1.6 2001-02-04 05:52:42 wtc%netscape.com Exp $
  */
 
 #ifndef __nss_h_
@@ -98,7 +98,7 @@ extern SECStatus NSS_InitReadWrite(const char *configdir);
  */
 extern SECStatus NSS_Initialize(const char *configdir, 
 	const char *certPrefix, const char *keyPrefix, const char *secmodName,
-	PRBool readonly);
+	PRBool readOnly);
 
 /*
  * initialize NSS without a creating cert db's, key db's, or secmod db's.

security/nss/lib/nss/nssinit.c

@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- # $Id: nssinit.c,v 1.12 2001-02-01 19:09:18 relyea%netscape.com Exp $
+ # $Id: nssinit.c,v 1.13 2001-02-04 05:52:42 wtc%netscape.com Exp $
  */
 
 #include <ctype.h>
@@ -251,10 +251,10 @@ NSS_InitReadWrite(const char *configdir)
 }
 
 SECStatus
-NSS_Initialize(const char *configdir, const char *certPrefix, const char *keyPrefix, const char *secmodName, PRBool readonly)
+NSS_Initialize(const char *configdir, const char *certPrefix, const char *keyPrefix, const char *secmodName, PRBool readOnly)
 {
     return nss_Init(configdir, certPrefix, keyPrefix, 
-						secmodName, readonly, PR_TRUE);
+						secmodName, readOnly, PR_TRUE);
 }
 
 /*