From a71ee09728241e10157a52ffb8f38e1169d67bf9 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Fri, 17 May 2013 23:22:33 -0600
Subject: [PATCH 1/3] dtksh: fix a build issue with Kubuntu x86_64.

Remove an apparently unnecessary 'mac' definition for feature/fs and
an unnecessary struct stat forward declaration.
---
 cde/programs/dtksh/ksh93/src/lib/libast/features/fs       | 1 -
 cde/programs/dtksh/ksh93/src/lib/libast/include/ast_std.h | 2 --
 2 files changed, 3 deletions(-)

diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/features/fs b/cde/programs/dtksh/ksh93/src/lib/libast/features/fs
index 5dfd5d27a..f9c7c3b67 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/features/fs
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/features/fs
@@ -1,4 +1,3 @@
-mac	_STAT_VER,fstat,lstat,stat,_MKNOD_VER,mknod sys/types.h sys/stat.h
 cat{
 	#if defined(__uxp__)
 	#include <sys/types.h>
diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/include/ast_std.h b/cde/programs/dtksh/ksh93/src/lib/libast/include/ast_std.h
index 0835df572..97004e580 100644
--- a/cde/programs/dtksh/ksh93/src/lib/libast/include/ast_std.h
+++ b/cde/programs/dtksh/ksh93/src/lib/libast/include/ast_std.h
@@ -341,8 +341,6 @@ typedef unsigned short wchar_t;
 #include <ast_types.h>
 #endif
 
-struct stat;
-
 #if defined(__cplusplus) || !defined(_std_stdlib) && !defined(__STDC__)
 
 /* <stdlib.h> */

From 3bd9b4c4da9bdd206eac95d65aa2cd10bed94950 Mon Sep 17 00:00:00 2001
From: Peter Howkins <flibble@users.sourceforge.net>
Date: Mon, 20 May 2013 15:53:44 +0100
Subject: [PATCH 2/3] dtstyle: Sort color palette names into alphabetical order
 for displaying.

---
 cde/programs/dtstyle/ColorFile.c | 45 +++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/cde/programs/dtstyle/ColorFile.c b/cde/programs/dtstyle/ColorFile.c
index bd1199c09..5222515ed 100644
--- a/cde/programs/dtstyle/ColorFile.c
+++ b/cde/programs/dtstyle/ColorFile.c
@@ -361,26 +361,57 @@ ReadPalette(
 */
     if (add == TRUE)
     {
-      /* set the item_position for the scrolled list */
-       new_palette->item_position = NumOfPalettes + 1;
-
       /* set the next pointer to NULL*/
        new_palette->next = NULL;
 
       /* increment the total number of palettes in the customizer */
        NumOfPalettes++;
 
-       if( pHeadPalette == NULL )
+       if( pHeadPalette == NULL /* First entry */
+          || (pHeadPalette != NULL && strcmp(pHeadPalette->name, new_palette->name) > 0)) /* Earlier entry than current list head */
+       {
+           new_palette->item_position = 1;
+           if(pHeadPalette)
+           {
+               new_palette->next = pHeadPalette;
+               /* Increment position poineter of other items in the list */
+	       tmp_palette = pHeadPalette;
+               while( tmp_palette != NULL)
+               {
+                   tmp_palette->item_position += 1;
+                   tmp_palette = tmp_palette->next;
+               }
+           }
+
            pHeadPalette = new_palette;
+       }
        else
        {
            tmp_palette = pHeadPalette;
-           while( tmp_palette->next != NULL)
-              tmp_palette = tmp_palette->next;
+
+           /* Search through the linked list to find the first entry with a 
+              name > new entries name, new item will be inserted after it */
+           while(tmp_palette->next && strcmp(tmp_palette->next->name, new_palette->name) < 0) 
+           {
+               tmp_palette = tmp_palette->next;
+           }
+
+           /* Insert the new palette */
+           new_palette->next = tmp_palette->next;
            tmp_palette->next = new_palette;
+           new_palette->item_position = tmp_palette->item_position + 1;
+
+           /* Now continue incrementing through the list increasing the position
+              count of all items following the new entry */
+           tmp_palette = new_palette->next;
+           while( tmp_palette != NULL)
+           {
+              tmp_palette->item_position += 1;
+              tmp_palette = tmp_palette->next;
+           }
        }
     }
-   
+
   /* done with filename so XtFree it */
    XtFree(filename);
 

From 8a8619bfa8a25342d898d2cc4decd7bb66b9c060 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Sun, 26 May 2013 17:47:00 -0600
Subject: [PATCH 3/3] Enable the use of the TIRPC library on Linux.

This should avoid the need to run rpcbind in insecure mode.  You will
need to have the libtirpc-dev package, or equivalent installed.
---
 cde/config/cf/linux.cf | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index c217dbdd9..b852e12e3 100644
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -118,15 +118,11 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 
 #define LinuxLocaleDefines	/**/
 
-XCOMM If you have the tirpc library on your system, and you have the
-XCOMM libtirpc-dev installed, then define HasTIRPCLib to YES in either
-XCOMM your host.def or site.def file.  Using the tirpc lib should
-XCOMM allow running rpcbind in secure mode (ie: without the -i option).
-XCOMM The default is NO.
+XCOMM Using the tirpc lib should allow running rpcbind in secure
+XCOMM mode (ie: without the -i option).  Make sure you install the 
+XCOMM libtirpc-dev package or equivalent.
 
-#ifndef HasTIRPCLib
-# define HasTIRPCLib NO
-#endif
+#define HasTIRPCLib  YES
 
 #if HasTIRPCLib
 TIRPCLIB = -ltirpc