Prepare for 2.3.2 release: HISTORY and version number change

diff --git a/cde/HISTORY b/cde/HISTORY
index fe21bf7f598708dfbdda1bf2981906c1449e72ed..a662d79ef883312f78cfdfaf658e48d14a6e8f09 100644 (file)
--- a/cde/HISTORY
+++ b/cde/HISTORY
@@ -5,6 +5,15 @@ use 'git log', or peruse the commit history at:
 
 https://sourceforge.net/p/cdesktopenv/code/commit_browser
 
+#######################################################################
+### 2.3.2 (stable) 01/14/2020
+
+The only change in this version from 2.3.1 is a fix for CERT
+CVE-2020-2692, a potential privilege escalation exploit in dtsession.
+There is POC for Solaris.  Exploiting this on our CDE would be
+significantly more difficult, but we fixed them just the same.
+
+
 #######################################################################
 ### 2.3.1 (stable) 11/15/2019
 

diff --git a/cde/Makefile b/cde/Makefile
index 875be9cc7ddd0a553c82a470237b0d1e11ec8c26..95157d47978f9b7df29a3ac4c8bef8df93e1bbee 100644 (file)
--- a/cde/Makefile
+++ b/cde/Makefile
@@ -1,5 +1,5 @@
 # $TOG: Makefile /main/15 1999/10/12 09:33:30 mgreess $
-     RELEASE = Release 2.3.1
+     RELEASE = Release 2.3.2
      PRODUCT = CDE
        SHELL = /bin/sh
           RM = rm -f

diff --git a/cde/copyright b/cde/copyright
index d43fe5ca8bbeab0cb6e027ee981e751b5cd9b02e..167c32be293aeb430bbfab4b3d2a3fc88859f5f1 100644 (file)
--- a/cde/copyright
+++ b/cde/copyright
@@ -1,10 +1,10 @@
 
 
 
-               Common Desktop Environment Version 2.3.1
+               Common Desktop Environment Version 2.3.2
 
 (c) Copyright 1993-2012 The Open Group
-(c) Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details
+(c) Copyright 2012-2020 CDE Project contributors
 
 Project Website: http://cdesktopenv.sourceforge.net/
 

diff --git a/cde/doc/common/help/HELPEnt.sgm b/cde/doc/common/help/HELPEnt.sgm
index ecf10dc1cfc7cf031e631134335da1793246e673..6fd3db1255c77390db5e27da48902d5822d52ef8 100644 (file)
--- a/cde/doc/common/help/HELPEnt.sgm
+++ b/cde/doc/common/help/HELPEnt.sgm
@@ -1,8 +1,8 @@
 <!-- $TOG: HELPEnt.sgm /main/12 1999/10/12 09:35:15 mgreess $ -->
-<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.3.1</GlossTerm>,
+<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.3.2</GlossTerm>,
 
 &copy; Copyright 1993-2012 The Open Group
-&copy; Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details
+&copy; Copyright 2012-2020 CDE Project contributors
 
 Project Website: http://cdesktopenv.sourceforge.net/
 

diff --git a/cde/lib/DtSvc/DtUtil1/Dt.h b/cde/lib/DtSvc/DtUtil1/Dt.h
index a164404a404d72096c429a3846f0ace02ea36c56..7cf3d93f5770384020dc71e32e90ffe38d3e3498 100644 (file)
--- a/cde/lib/DtSvc/DtUtil1/Dt.h
+++ b/cde/lib/DtSvc/DtUtil1/Dt.h
@@ -52,13 +52,13 @@ extern "C" {
 
 #define DtVERSION              2
 #define DtREVISION             3
-#define DtUPDATE_LEVEL         1
+#define DtUPDATE_LEVEL         2
 
 #define DtVERSION_NUMBER       (DtVERSION * 10000 +  \
                                DtREVISION * 100 + \
                                DtUPDATE_LEVEL)
 
-#define DtVERSION_STRING "CDE Version 2.3.1"
+#define DtVERSION_STRING "CDE Version 2.3.2"
 
 
 /* 

diff --git a/cde/lib/tt/bin/ttauth/ttauth.man b/cde/lib/tt/bin/ttauth/ttauth.man
index bbda31c01902d8e76671e71bec4499112941cfc4..56f6df6722c0fc00f9b3dac4dfe61a74d7067ab4 100644 (file)
--- a/cde/lib/tt/bin/ttauth/ttauth.man
+++ b/cde/lib/tt/bin/ttauth/ttauth.man
@@ -18,7 +18,7 @@
 .\" not be used in advertising or otherwise to promote the sale, use or
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
-.TH TTAUTH 1 "Release 2.3.1" "CDE"
+.TH TTAUTH 1 "Release 2.3.2" "CDE"
 .SH NAME
 ttauth \- ToolTalk authority file utility
 .SH SYNOPSIS

diff --git a/cde/lib/tt/tooltalk.tmpl b/cde/lib/tt/tooltalk.tmpl
index f4dd5e7faf2a578efdfe66e551420f583029fc94..fb2015cae2b7cdd9915a930a38ff7b8435b3ecdf 100644 (file)
--- a/cde/lib/tt/tooltalk.tmpl
+++ b/cde/lib/tt/tooltalk.tmpl
@@ -6,7 +6,7 @@
 /* TT_VERSION defines the version string which is imbedded in all the */
 /* binaries and shipped libraries. */
 
-TT_VERSION = "CDE Version 2.3.1"
+TT_VERSION = "CDE Version 2.3.2"
 TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"