merge release to dev

12 files changed, 40 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 964c8e2..3779032 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2012-07-24  Don Porter  <dgp@users.sourceforge.net>
+
+	*** 8.5.12 TAGGED FOR RELEASE ***
+
+	* generic/tcl.h:	Bump to 8.5.12 for release.
+	* library/init.tcl:
+	* tools/tcl.wse.in:
+	* unix/configure.in:
+	* unix/tcl.spec:
+	* win/configure.in:
+	* README:
+
+	* unix/configure:	autoconf-2.59
+	* win/configure:
+
+	* changes:	Update for 8.5.12 release.
+
 2012-07-19  Joe Mistachkin  <joe@mistachkin.com>
 
 	* generic/tclTest.c: Fix several more missing mutex-locks in
diff --git a/README b/README
index b3bbc2e..f7cf68c 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 README:  Tcl
-    This is the Tcl 8.5.11 source distribution.
+    This is the Tcl 8.5.12 source distribution.
 	http://tcl.sourceforge.net/
     You can get any source release of Tcl from the file distributions
     link at the above URL.
diff --git a/changes b/changes
index ba08980..6c4bb5a 100644
--- a/changes
+++ b/changes
@@ -7636,9 +7636,6 @@ problems where [file *able] would return false results on Win/Samba (porter)
 2012-05-17 (bug fix)[3106532] proper [switch -indexvar] values (fellows)
 	*** POTENTIAL INCOMPATIBILITY ***
 
-2012-06-21 (bug fix)[3362446] [registry keys] failure (nijtmans)
-=> registry 1.2.2
-
 2012-06-25 (bug fix)[3537605] [encoding dirs a b] error message (fellows)
 
 2012-06-25 (bug fix)[3024359] crash when multi-thread concurrent [file system]
@@ -7649,6 +7646,11 @@ and Tcl_FSMountsChanged(). (porter)
 
 2012-07-05 (bug fix)[1189293] make "<<" redirect binary safe (porter)
 
+2012-07-11 (bug fix)[3362446] [registry keys] failure (nijtmans)
+=> registry 1.2.2
+
+2012-07-16 (bug fix)[3544683] reentrant syscalls on BSD (cassoff,fellows)
+
 2012-07-24 (bug fix) stop mem corruption in stacked channel events (max,porter)
 
 2012-07-25 (bug fix)[3546275] [auto_execok] search match [exec] (danckaert)
diff --git a/generic/tcl.h b/generic/tcl.h
index ec6f9b0..29a95a8 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -58,10 +58,10 @@ extern "C" {
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   5
 #define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TCL_RELEASE_SERIAL  11
+#define TCL_RELEASE_SERIAL  12
 
 #define TCL_VERSION	    "8.5"
-#define TCL_PATCH_LEVEL	    "8.5.11"
+#define TCL_PATCH_LEVEL	    "8.5.12"
 
 /*
  * The following definitions set up the proper options for Windows compilers.
diff --git a/library/init.tcl b/library/init.tcl
index 4a345ec..16957b3 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -15,7 +15,7 @@
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.5.11
+package require -exact Tcl 8.5.12
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index 69690a8..1baddfe 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -12,7 +12,7 @@ item: Global
   Log Pathname=%MAINDIR%\INSTALL.LOG
   Message Font=MS Sans Serif
   Font Size=8
-  Disk Label=tcl8.5.11
+  Disk Label=tcl8.5.12
   Disk Filename=setup
   Patch Flags=0000000000000001
   Patch Threshold=85
diff --git a/unix/configure b/unix/configure
index 0603bfc..753f7c0 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1335,7 +1335,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".11"
+TCL_PATCH_LEVEL=".12"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/configure.in b/unix/configure.in
index 5f0fe0b..8bab86e 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -25,7 +25,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".11"
+TCL_PATCH_LEVEL=".12"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/tcl.spec b/unix/tcl.spec
index a91a53b..265cca4 100644
--- a/unix/tcl.spec
+++ b/unix/tcl.spec
@@ -4,7 +4,7 @@
 
 Name:          tcl
 Summary:       Tcl scripting language development environment
-Version:       8.5.11
+Version:       8.5.12
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in
index 1f1513d..9774ce9 100644
--- a/unix/tclConfig.h.in
+++ b/unix/tclConfig.h.in
@@ -19,8 +19,8 @@
 /* Define to 1 if the system has the type `blkcnt_t'. */
 #undef HAVE_BLKCNT_T
 
-/* Do we have BSDgettimeofday()? */
-#undef HAVE_BSDGETTIMEOFDAY
+/* Defined when compiler supports casting to union type. */
+#undef HAVE_CAST_TO_UNION
 
 /* Define to 1 if you have the `chflags' function. */
 #undef HAVE_CHFLAGS
@@ -34,6 +34,9 @@
 /* Do we have access to Darwin CoreFoundation.framework? */
 #undef HAVE_COREFOUNDATION
 
+/* Is the cpuid instruction usable? */
+#undef HAVE_CPUID
+
 /* Do we have fts functions? */
 #undef HAVE_FTS
 
@@ -256,6 +259,9 @@
 /* Default libtommath precision. */
 #undef MP_PREC
 
+/* Is no debugging enabled? */
+#undef NDEBUG
+
 /* Is Darwin CoreFoundation unavailable for 64-bit? */
 #undef NO_COREFOUNDATION_64
 
@@ -340,9 +346,6 @@
 /* What encoding should be used for embedded configuration info? */
 #undef TCL_CFGVAL_ENCODING
 
-/* Is debugging enabled? */
-#undef NDEBUG
-
 /* Is this a 64-bit build? */
 #undef TCL_CFG_DO64BIT
 
diff --git a/win/configure b/win/configure
index 3609a02..0ddd590 100755
--- a/win/configure
+++ b/win/configure
@@ -1311,7 +1311,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".11"
+TCL_PATCH_LEVEL=".12"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3
diff --git a/win/configure.in b/win/configure.in
index 955ba29..71e677d 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -14,7 +14,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".11"
+TCL_PATCH_LEVEL=".12"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3