fixup commit for tag 'NSPR_4_2_1_RELEASE'NSPR_4_2_1_RELEASE

7 files changed, 19 insertions, 13 deletions

diff --git a/admin/repackage.sh b/admin/repackage.sh
index fb2a464a..338c6de1 100755
--- a/admin/repackage.sh
+++ b/admin/repackage.sh
@@ -60,10 +60,10 @@
 #
 # These variables should be modified for each NSPR release.
 #
-FROMTOP=/share/builds/components/nspr20/v4.2
-TOTOP=./v4.2
-NSPRDIR=nspr-4.2
-SOURCETAG=NSPR_4_2_RELEASE
+FROMTOP=/share/builds/components/nspr20/v4.2.1
+TOTOP=./v4.2.1
+NSPRDIR=nspr-4.2.1
+SOURCETAG=NSPR_4_2_1_RELEASE
 
 #
 # enumerate Unix object directories on /s/b/c
diff --git a/config/rules.mk b/config/rules.mk
index ffd63dfc..29e56a79 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -206,7 +206,7 @@ ifdef RELEASE_BINS
 	$(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
 endif
 ifdef RELEASE_HEADERS
-	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)
+	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
 endif
 ifdef RELEASE_LIBS
 	$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)
diff --git a/pr/include/obsolete/Makefile.in b/pr/include/obsolete/Makefile.in
index 88342b0b..f2d78313 100644
--- a/pr/include/obsolete/Makefile.in
+++ b/pr/include/obsolete/Makefile.in
@@ -48,7 +48,7 @@ HEADERS = $(wildcard $(srcdir)/*.h)
 RELEASE_HEADERS = $(HEADERS)
 RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/obsolete
 
-includedir := $(includedir)/obsolete
+include_subdir = obsolete
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/pr/include/prinit.h b/pr/include/prinit.h
index 811cbae9..4bd983a2 100644
--- a/pr/include/prinit.h
+++ b/pr/include/prinit.h
@@ -60,10 +60,10 @@ PR_BEGIN_EXTERN_C
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.2"
+#define PR_VERSION  "4.2.1"
 #define PR_VMAJOR   4
 #define PR_VMINOR   2
-#define PR_VPATCH   0
+#define PR_VPATCH   1
 #define PR_BETA     PR_FALSE
 
 /*
diff --git a/pr/include/private/Makefile.in b/pr/include/private/Makefile.in
index 31c82552..cafb86c8 100644
--- a/pr/include/private/Makefile.in
+++ b/pr/include/private/Makefile.in
@@ -49,7 +49,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/private
 
 HEADERS = $(RELEASE_HEADERS) $(srcdir)/pprmwait.h $(srcdir)/primpl.h
 
-includedir := $(includedir)/private
+include_subdir = private
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/pr/src/md/os2/os2io.c b/pr/src/md/os2/os2io.c
index 12e2f2a2..acccf6a6 100644
--- a/pr/src/md/os2/os2io.c
+++ b/pr/src/md/os2/os2io.c
@@ -253,6 +253,12 @@ _PR_MD_WRITE(PRFileDesc *fd, const void *buf, PRInt32 len)
         return -1;
     }
 
+    if (len != bytes) {
+        rv = ERROR_DISK_FULL;
+        _PR_MD_MAP_WRITE_ERROR(rv);
+        return -1;
+    }
+
     return bytes;
 } /* --- end _PR_MD_WRITE() --- */
 
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index 4235a832..cf3da2e7 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -49,12 +49,12 @@
 #include <stdlib.h>
 
 /*
- * This release (4.2) is backward compatible with the
- * 4.0.x and 4.1.x releases.  It, of course, is compatible
+ * This release (4.2.1) is backward compatible with the
+ * 4.0.x, 4.1.x, and 4.2 releases.  It, of course, is compatible
  * with itself.
  */
 static char *compatible_version[] = {
-    "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3", PR_VERSION
+    "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3", "4.2", PR_VERSION
 };
 
 /*
@@ -69,7 +69,7 @@ static char *incompatible_version[] = {
     "3.0", "3.0.1",
     "3.1", "3.1.1", "3.1.2", "3.1.3",
     "3.5", "3.5.1",
-    "4.2.3",
+    "4.2.2", "4.2.3",
     "4.3", "4.3.1",
     "10.0", "11.1", "12.14.20"
 };