Merge branch 'master' into cde-next

Need to resync before folding current cde-next into master.

cde/HISTORY

@@ -5,7 +5,69 @@ use 'git log', or peruse the commit history at:
 
 https://sourceforge.net/p/cdesktopenv/code/commit_browser
 
-# 2.2.4a 06/08/2018
+### 2.3.0 (stable) 07/06/2018
+
+This is a very long overdue stable release.  It incorporates all of
+the fixes in the 2.2.4a development release plus:
+
+- tooltalk/ttsession:
+
+  - on newer Linux/TIRPC systems, make sure listen() is called on a
+    server socket.  This fixes an infinite loop problem seen with with
+    newer glibc and TIRPC implementations (SUSE Tumbleweed, ArchLinux)
+
+  - default to localhost when hostname IP resolution fails (all
+    platforms).  There is no longer any need to add your unresolvable
+    hostname to the localhosts line in your /etc/hosts file.
+
+- improved build support on Solaris/OpenIndiana systems (gcc and SunStudio).
+
+- BSD improvments:
+  - no need to create X11/Motif symlinks prior to compiling CDE.
+  - Fix native clang builds
+  - Fix some GCC builds
+
+- remove ancient XmeXpm* defines
+
+Here is the git shortlog since the 2.2.4a development release:
+
+Jon Trulson (14):
+      libDtTerm: Fix for a coredump seen on OpenBSD
+      dtinfo/freebsd: fix a (int)NULL cast in DtSR_SearchEngine.C
+      FreeBSD 11: Don't use imported x11/motif, use installed versions for build
+      building_release_archive: omit '-src' in archive filename
+      OpenBSD 6+: use installed X11 and Motif
+      XPM: Replace calls to XmeXpm*() with regular Xpm*()
+      FreeBSD 11: Fix clang (v6) builds
+      FreeBSD: turn off some warnings
+      CDE-ICONS: create compatibility symlinks as relative rather than absolute
+      OpenBSD: tone down compiler warnings a bit
+      libtt: if local hostname lookup fails, default to localhost
+      linux/site.def: use an if !defined() gaurd for DtLocalesToBuild
+      slib/mp_rpc_server: TIRPC: force a listen() call on the server socket
+      dwtm/WmResource.c: Stop printing garbage when XmeRenderTableGetDefaultFont() fails.
+
+Matthew R. Trower (7):
+      nsgml: Resolve symbol collision when building with SunStudio 12.1
+      imake: Refactor and fix get_sun_compiler_versions()
+      Add SMF service on Sun
+      Resolve inconsistent strcasestr availability on Sun
+      Minor corrections and cleanup to sun.cf
+      Enable building against an arbitrary Motif installation
+      Fix DtMail compilation on Sun with GCC
+
+Ulrich Wilkens (3):
+      create .depend files for Solaris+Illumos
+      Reenable gcc support on FreeBSD and OpenBSD
+      Use installed X11 includes and libs
+
+chase (3):
+      Remove reallyoldsun defines
+      installCDE.src: remove duplicate code
+      docnook.tcl: Add shebang
+
+
+  ## 2.2.4a (development) 06/08/2018
 
   This is a long overdue development release.
 
@@ -283,7 +345,7 @@ chase (23):
 
 
 
-# 2.2.4 06/19/2016
+### 2.2.4 (stable) 06/19/2016
 
 This release incorporates several fixes for newer operating systems
 (linux and the BSD's primarily).  It also removes the requirement to
@@ -342,7 +404,7 @@ alx (14):
       dtfile: Enable FILE_MAP_OPTIMIZE on Linux. This avoids unnecessary tt_file_netfile calls on local host.
 
 
-# 2.2.3 05/09/2015
+### 2.2.3 (stable) 05/09/2015
 
 This release incorporates several hundred fixes identified by various
 Coverity scans and patches supplied by users.  In addition,
@@ -503,7 +565,7 @@ alx (1):
       dtcopy: Fix file removal
 
 
-# 2.2.2 07/27/2014
+### 2.2.2 (stable) 07/27/2014
 
 A lot of fixes and improvements in this release.  CDE can be built on
 more modern Linuxes and BSDs.  An initial stab at illimios support is
@@ -588,11 +650,10 @@ alx (2):
       DtWidget: Don't free random pointer on Control widget destruction
 
 
-# 2.2.1 03/01/2014
+### 2.2.1 (stable) 03/01/2014
 
 - Forgot to update this file for the release.  Oops.  At any rate,
-  only the git shortlogs for each release will be listed here in the
+  only the git shortlogs for each release will be listed here.
-  future. 
 
 Shortlog:
 
@@ -671,7 +732,7 @@ alx (4):
       wwl: fixed dtinfo segfault due to missing copy constructor in WArgList
 
 
-# 2.2.0d (beta) 05/30/2013
+  ## 2.2.0d (development, beta) 05/30/2013
 
   - We are being bold this time, and promoting CDE to Beta.
 
@@ -694,7 +755,7 @@ alx (4):
   - Resolve many more more compiler warnings
 
 
-# 2.2.0c (alpha) 10/4/2012
+  ## 2.2.0c (development, alpha3) 10/4/2012
 
   - Many 64b issues have been fixed, related to XtVaGetValues(), missing
     prototypes, erroneous assumptions regarding the size of ints and
@@ -714,7 +775,7 @@ alx (4):
   - more missing prototypes added to XmPrivate.h
 
 
-# 2.2.0b (alpha) 9/6/2012
+  ## 2.2.0b (development, alpha2) 9/6/2012
 
   - This release incoporates approximately 200 patches from various
     people around the planet.
@@ -738,7 +799,7 @@ alx (4):
     Some of this code is *old*.
 
 
-# 2.2.0a (alpha) 8/6/2012
+  ## 2.2.0a (development, alpha1) 8/6/2012
 
   - This is the initial release of CDE form The Open Group based on
     2.1.30.   

cde/Makefile

@@ -1,5 +1,5 @@
 # $TOG: Makefile /main/15 1999/10/12 09:33:30 mgreess $
-     RELEASE = Release 2.2.4a
+     RELEASE = Release 2.3.0
      PRODUCT = CDE
        SHELL = /bin/sh
           RM = rm -f

cde/copyright

@@ -1,7 +1,7 @@
 
 
 
-		Common Desktop Environment Version 2.2.4a (dev)
+		Common Desktop Environment Version 2.3.0 (stable)
 
 (c) Copyright 1993-2012 The Open Group
 (c) Copyright 2012-2018 CDE Project contributors, see CONTRIBUTORS for details

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.2.4a</GlossTerm>,
+<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.3.0</GlossTerm>,
 
 &copy; Copyright 1993-2012 The Open Group
-&copy; Copyright 2012-2016 CDE Project contributors, see CONTRIBUTORS for details
+&copy; Copyright 2012-2018 CDE Project contributors, see CONTRIBUTORS for details
 
 Project Website: http://cdesktopenv.sourceforge.net/
 

cde/lib/DtSvc/DtUtil1/Dt.h

@@ -51,14 +51,14 @@ extern "C" {
 /* CDE Version information */
 
 #define DtVERSION     		2
-#define DtREVISION    		2
+#define DtREVISION    		3
-#define DtUPDATE_LEVEL    	4
+#define DtUPDATE_LEVEL    	0
 
 #define DtVERSION_NUMBER	(DtVERSION * 10000 +  \
 				DtREVISION * 100 + \
 				DtUPDATE_LEVEL)
 
-#define DtVERSION_STRING "CDE Version 2.2.4a"
+#define DtVERSION_STRING "CDE Version 2.3.0"
 
 
 /* 

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.2.4a" "CDE"
+.TH TTAUTH 1 "Release 2.3.0" "CDE"
 .SH NAME
 ttauth \- ToolTalk authority file utility
 .SH SYNOPSIS

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.2.4a"
+TT_VERSION = "CDE Version 2.3.0"
 TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"