fixup commit for tag 'NSS_3_8_1_RTM' NSS_3_8_BRANCH NSS_3_8_1_RTM
authorcvs2hg
Fri, 11 Jul 2003 01:19:27 +0000
branchNSS_3_8_BRANCH
changeset 4619 e23151eae0c304f5a05da230a2b80f5cde3ae1c8
parent 4546 47a655b5bd662097a34381dbf5c07a72893697ff
child 4623 8d337b5f3daf4df33da3c1e371c50cff5a6fd6c7
push idunknown
push userunknown
push dateunknown
fixup commit for tag 'NSS_3_8_1_RTM'
security/nss/lib/nss/nss.h
security/nss/lib/pk11wrap/Makefile
security/nss/tests/ssl/sslreq.txt
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -44,21 +44,21 @@ SEC_BEGIN_PROTOS
 
 /*
  * NSS's major version, minor version, patch level, and whether
  * this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>] [<Beta>]"
  */
-#define NSS_VERSION  "3.8.1 Beta"
+#define NSS_VERSION  "3.8.1"
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   8
 #define NSS_VPATCH   1
-#define NSS_BETA     PR_TRUE
+#define NSS_BETA     PR_FALSE
 
 
 /*
  * Return a boolean that indicates whether the underlying library
  * will perform as the caller expects.
  *
  * The only argument is a string, which should be the verson
  * identifier of the NSS library. That string will be compared
--- a/security/nss/lib/pk11wrap/Makefile
+++ b/security/nss/lib/pk11wrap/Makefile
@@ -81,8 +81,13 @@ ifeq ($(OS_TARGET)$(OS_RELEASE),AIX4.3)
 ifeq ($(USE_64),1)
 ifndef BUILD_OPT
 $(OBJDIR)/pk11slot.o: pk11slot.c
 	@$(MAKE_OBJDIR)
 	$(CC) -o $@ -c -O2 $(CFLAGS) $<
 endif
 endif
 endif
+ifdef XP_OS2_VACPP
+$(OBJDIR)/pk11skey.obj: pk11skey.c
+	@$(MAKE_OBJDIR)
+	$(CC) -Fo$@ -c $(filter-out /O+, $(CFLAGS)) $(call abspath,$<)
+endif
--- a/security/nss/tests/ssl/sslreq.txt
+++ b/security/nss/tests/ssl/sslreq.txt
@@ -1,2 +1,3 @@
-GET / HTTP/1.0
-
+GET / HTTP/1.0
+
+