add openmotif-2.2.3 with security fixes, bug #78111

(Portage version: 2.0.51-r15)

12 files changed, 311 insertions, 0 deletions

diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3 b/x11-libs/openmotif/files/digest-openmotif-2.2.3
new file mode 100644
index 000000000000..a6451299c75a
--- /dev/null
+++ b/x11-libs/openmotif/files/digest-openmotif-2.2.3
@@ -0,0 +1 @@
+MD5 94c96a0f94ee0d5e41d3dba2188b263d openMotif-2.2.3.tar.gz 5149785
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2 b/x11-libs/openmotif/files/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2
new file mode 100644
index 000000000000..b61d8e0d4f1e
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-CAN-2004-0914.patch.bz2 b/x11-libs/openmotif/files/openmotif-2.2.3-CAN-2004-0914.patch.bz2
new file mode 100644
index 000000000000..e2871ffac5df
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-CAN-2004-0914.patch.bz2
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-CAN-2004-0914_sec8.patch b/x11-libs/openmotif/files/openmotif-2.2.3-CAN-2004-0914_sec8.patch
new file mode 100644
index 000000000000..0bf4bcbc5530
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-CAN-2004-0914_sec8.patch
@@ -0,0 +1,14 @@
+--- openMotif-2.2.3/lib/Xm/XpmWrFFrI.c.CAN-2004-0914_sec8	2004-11-29 15:04:10.105373839 +0100
++++ openMotif-2.2.3/lib/Xm/XpmWrFFrI.c	2004-11-29 15:04:10.150367679 +0100
+@@ -322,10 +322,7 @@
+ #ifndef NO_ZPIPE
+ 	size_t len = strlen(filename);
+ 
+-	if(len == 0                        ||
+-	   filename[0] == '/'              ||
+-	   strstr(filename, "../") != NULL ||
+-	   filename[len-1] == '/')
++	if(len == 0)
+ 		return(XpmOpenFailed);
+ 
+ 	if (len > 2 && !strcmp(".Z", filename + (len - 2))) {
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-Mwm.defaults b/x11-libs/openmotif/files/openmotif-2.2.3-Mwm.defaults
new file mode 100644
index 000000000000..ea91b6fb8d86
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-Mwm.defaults
@@ -0,0 +1,14 @@
+Mwm*fontList:			variable
+Mwm*iconClick:			False
+Mwm*iconPlacement:		top left
+Mwm*moveOpaque:			True
+Mwm*rootButtonClick:		True
+Mwm*foreground:			#000000
+Mwm*background:			#B8B8C0
+Mwm*enableThinThickness:	True
+Mwm*enableEtchedInMenu:		True
+Mwm*menu*fontList:		-adobe-helvetica-medium-r-*--*-120-*-*-*-*-*-*
+Mwm*client*title*fontList:	-adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
+Mwm*icon*fontList:		-adobe-helvetica-bold-r-*--*-80-*-*-*-*-*-*
+Mwm*feedback*fontList:		-adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
+Mwm*multiClickTime:		300
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-XmResizeHashTable.patch b/x11-libs/openmotif/files/openmotif-2.2.3-XmResizeHashTable.patch
new file mode 100644
index 000000000000..5982f7224922
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-XmResizeHashTable.patch
@@ -0,0 +1,11 @@
+--- lib/Xm/Hash.c
++++ lib/Xm/Hash.c
+@@ -198,6 +198,8 @@
+ 	} else {
+ 	  table -> buckets[index] = current;
+ 	}
++      } else {
++	last = current;
+       }
+       current = next;
+     }
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-char_not_supported.patch b/x11-libs/openmotif/files/openmotif-2.2.3-char_not_supported.patch
new file mode 100644
index 000000000000..edd841b78cb6
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-char_not_supported.patch
@@ -0,0 +1,31 @@
+--- openMotif-2.2.3/lib/Xm/TextF.c.char_not_supported	2004-06-03 12:59:10.241822710 +0200
++++ openMotif-2.2.3/lib/Xm/TextF.c	2004-06-03 13:02:18.987890852 +0200
+@@ -3723,20 +3723,17 @@
+       cache_ptr = tmp = XmStackAlloc(buf_size, cache);
+    
+       tmp_str = (wchar_t *)str;
+-      ret_val = wctomb(tmp, *tmp_str);
++      // Fixed MZ BZ#1257: by Brad Despres <brad@sd.aonix.com>
+       count = 0;
+-      while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) )
+-	{
+-	  count += 1;
+-	  tmp += ret_val;
+-	  buf_size -= ret_val;
+-	  tmp_str++;
+-	  ret_val = wctomb(tmp, *tmp_str);
+-	}
+-         
++      do {
++	ret_val = wctomb(tmp, *tmp_str);
++	count += 1;
++	tmp += ret_val;
++	buf_size -= ret_val;
++	tmp_str++;
++      } while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) ) ;
+       if (ret_val == -1)    /* bad character */
+ 	return (False);
+- 
+       is_printable = XTextWidth(TextF_Font(tf), cache_ptr, tmp - cache_ptr);
+       XmStackFree(cache_ptr, cache);
+       return (is_printable);
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-mwm-configdir.patch b/x11-libs/openmotif/files/openmotif-2.2.3-mwm-configdir.patch
new file mode 100644
index 000000000000..c83f34aa9a27
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-mwm-configdir.patch
@@ -0,0 +1,39 @@
+diff -urN openMotif-2.2.2.orig/clients/mwm/WmResParse.c openMotif-2.2.2/clients/mwm/WmResParse.c
+--- openMotif-2.2.2.orig/clients/mwm/WmResParse.c	2002-01-10 21:55:37.000000000 +0100
++++ openMotif-2.2.2/clients/mwm/WmResParse.c	2003-06-04 22:20:22.000000000 +0200
+@@ -2411,7 +2411,7 @@
+ 	if (MwmBehavior)
+ 	{
+ 	    strcpy(cfileName, LIBDIR);
+-	    strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
++	    strncat(cfileName, "/mwm/", MAXWMPATH-strlen(cfileName));
+ 	    strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
+ 	    strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
+ 	}
+@@ -2427,7 +2427,7 @@
+ 	* Try /$LANG/system.mwmrc within the install tree
+ 	*/
+ 	strcpy(cfileName, LIBDIR);
+-	strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
++	strncat(cfileName, "/mwm/", MAXWMPATH-strlen(cfileName));
+ 	strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
+ 	strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
+ #endif /* WSM */
+@@ -2449,7 +2449,7 @@
+     if (MwmBehavior)
+     {
+ 	strcpy(cfileName, LIBDIR);
+-	strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
++	strncat(cfileName, "/mwm" SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
+ #ifdef PANELIST
+ 	fileP = fopen (cfileName, "r");
+ #else /* PANELIST */
+@@ -2473,7 +2473,7 @@
+      * Try /system.mwmrc within the install tree
+      */
+     strcpy(cfileName, LIBDIR);
+-    strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
++    strncat(cfileName, "/mwm" SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
+ 
+     if (LANG != NULL) 
+     {
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-no_demos.patch b/x11-libs/openmotif/files/openmotif-2.2.3-no_demos.patch
new file mode 100644
index 000000000000..d0a39693aa73
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-no_demos.patch
@@ -0,0 +1,101 @@
+--- openmotif/configure.in.no_demos	2003-09-19 18:40:33.000000000 +0200
++++ openmotif/configure.in	2003-12-16 12:16:33.000000000 +0100
+@@ -259,88 +259,4 @@
+ doc/man/man5/Makefile \
+ tools/Makefile \
+ tools/wml/Makefile \
+-demos/Makefile \
+-demos/lib/Makefile \
+-demos/lib/Xmd/Makefile \
+-demos/lib/Wsm/Makefile \
+-demos/lib/Exm/Makefile \
+-demos/lib/Exm/wml/Makefile \
+-demos/programs/Makefile \
+-demos/programs/Exm/Makefile \
+-demos/programs/Exm/app_in_c/Makefile \
+-demos/programs/Exm/app_in_uil/Makefile \
+-demos/programs/Exm/simple_app/Makefile \
+-demos/programs/airport/Makefile \
+-demos/programs/animate/Makefile \
+-demos/programs/drag_and_drop/Makefile \
+-demos/programs/draw/Makefile \
+-demos/programs/earth/Makefile \
+-demos/programs/filemanager/Makefile \
+-demos/programs/fileview/Makefile \
+-demos/programs/getsubres/Makefile \
+-demos/programs/hellomotif/Makefile \
+-demos/programs/hellomotifi18n/Makefile \
+-demos/programs/hellomotifi18n/C/Makefile \
+-demos/programs/hellomotifi18n/C/uid/Makefile \
+-demos/programs/hellomotifi18n/english/Makefile \
+-demos/programs/hellomotifi18n/english/uid/Makefile \
+-demos/programs/hellomotifi18n/french/Makefile \
+-demos/programs/hellomotifi18n/french/uid/Makefile \
+-demos/programs/hellomotifi18n/hebrew/Makefile \
+-demos/programs/hellomotifi18n/hebrew/uid/Makefile \
+-demos/programs/hellomotifi18n/japan/Makefile \
+-demos/programs/hellomotifi18n/japan/uid/Makefile \
+-demos/programs/hellomotifi18n/japanese/Makefile \
+-demos/programs/hellomotifi18n/japanese/uid/Makefile \
+-demos/programs/hellomotifi18n/swedish/Makefile \
+-demos/programs/hellomotifi18n/swedish/uid/Makefile \
+-demos/programs/i18ninput/Makefile \
+-demos/programs/panner/Makefile \
+-demos/programs/periodic/Makefile \
+-demos/programs/piano/Makefile \
+-demos/programs/popups/Makefile \
+-demos/programs/sampler2_0/Makefile \
+-demos/programs/setdate/Makefile \
+-demos/programs/todo/Makefile \
+-demos/programs/workspace/Makefile \
+-demos/programs/tooltips/Makefile \
+-demos/programs/FontSel/Makefile \
+-demos/programs/ButtonBox/Makefile \
+-demos/programs/ColorSel/Makefile \
+-demos/programs/Column/Makefile \
+-demos/programs/DropDown/Makefile \
+-demos/programs/MultiList/Makefile \
+-demos/programs/MultiList/pixmaps/Makefile \
+-demos/programs/IconB/Makefile \
+-demos/programs/Outline/Makefile \
+-demos/programs/Paned/Makefile \
+-demos/programs/TabStack/Makefile \
+-demos/programs/Tree/Makefile \
+-demos/programs/pixmaps/Makefile \
+-demos/unsupported/Makefile \
+-demos/unsupported/Exm/Makefile \
+-demos/unsupported/aicon/Makefile \
+-demos/unsupported/dainput/Makefile \
+-demos/unsupported/dogs/Makefile \
+-demos/unsupported/hellomotif/Makefile \
+-demos/unsupported/motifshell/Makefile \
+-demos/unsupported/uilsymdump/Makefile \
+-demos/unsupported/xmapdef/Makefile \
+-demos/unsupported/xmfonts/Makefile \
+-demos/unsupported/xmforc/Makefile \
+-demos/unsupported/xmform/Makefile \
+-demos/doc/Makefile \
+-demos/doc/programGuide/Makefile \
+-demos/doc/programGuide/ch05/Makefile \
+-demos/doc/programGuide/ch05/Scale/Makefile \
+-demos/doc/programGuide/ch06/Makefile \
+-demos/doc/programGuide/ch06/spin_box/Makefile \
+-demos/doc/programGuide/ch06/combo_box/Makefile \
+-demos/doc/programGuide/ch08/Makefile \
+-demos/doc/programGuide/ch08/Notebook/Makefile \
+-demos/doc/programGuide/ch08/Container/Makefile \
+-demos/doc/programGuide/ch16/Makefile \
+-demos/doc/programGuide/ch17/Makefile \
+-demos/doc/programGuide/ch17/simple_drop/Makefile \
+-demos/doc/programGuide/ch17/simple_drag/Makefile \
+ ])
+--- openmotif/Makefile.am.no_demos	2003-12-16 12:17:02.000000000 +0100
++++ openmotif/Makefile.am	2003-12-16 12:17:03.000000000 +0100
+@@ -28,6 +28,5 @@
+              include \
+              tools \
+              clients \
+-             doc \
+-             demos
++             doc
+ AUTOMAKE_OPTIONS = 1.4
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-pixel_length.patch b/x11-libs/openmotif/files/openmotif-2.2.3-pixel_length.patch
new file mode 100644
index 000000000000..7aba08b7ab92
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-pixel_length.patch
@@ -0,0 +1,11 @@
+--- openMotif-2.2.3/lib/Xm/DataF.c.pixel_length	2004-06-03 15:11:52.932820812 +0200
++++ openMotif-2.2.3/lib/Xm/DataF.c	2004-06-03 15:12:27.323091126 +0200
+@@ -8648,7 +8648,7 @@
+ 	    curr_str++;
+ 	    i++;
+ 	 } else {
+-	    wchar_t tmp;
++	    wchar_t tmp[XmTextF_max_char_size(tf)+1];
+ 	    int num_conv;
+ 	    num_conv = mbtowc(&tmp, curr_str, XmTextF_max_char_size(tf));
+             if (num_conv >= 0 && df_FindPixelLength(tf, (char*) &tmp, 1)) {
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-popup_timeout.patch b/x11-libs/openmotif/files/openmotif-2.2.3-popup_timeout.patch
new file mode 100644
index 000000000000..f216abeaf703
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-popup_timeout.patch
@@ -0,0 +1,12 @@
+--- openMotif-2.2.3/lib/Xm/MenuUtil.c.popup_timeout	2002-01-31 15:49:35.000000000 +0100
++++ openMotif-2.2.3/lib/Xm/MenuUtil.c	2004-06-08 17:14:46.311285603 +0200
+@@ -156,6 +156,9 @@
+ 				  cursor, time)) == GrabSuccess)
+ 	 break;
+ 
++      if (status == GrabInvalidTime)
++	time = CurrentTime;
++
+       XmeMicroSleep(1000);
+    }
+    if (status != GrabSuccess)
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-utf8.patch b/x11-libs/openmotif/files/openmotif-2.2.3-utf8.patch
new file mode 100644
index 000000000000..bb7c7f85d9a0
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-utf8.patch
@@ -0,0 +1,77 @@
+--- openMotif-2.2.3/tools/wml/UilSymCSet.h.utf8	2004-03-04 17:41:48.000000000 +0100
++++ openMotif-2.2.3/tools/wml/UilSymCSet.h	2004-03-17 12:54:23.000000000 +0100
+@@ -32,6 +32,7 @@
+     "JISX0201.1976-0",	/* jis_katakana */
+     "KSC5601.1987-0",	/* ksc_hangul */
+     "KSC5601.1987-1",	/* ksc_hangul_gr */
++    "UTF-8",		/* utf-8 */
+ };
+ externaldef(uil_sym_glbl) char **charset_xmstring_names_table =
+ 		charset_xmstring_names_table_vec;
+@@ -66,6 +67,7 @@
+     XmSTRING_DIRECTION_L_TO_R,	/* jis_katakana */
+     XmSTRING_DIRECTION_L_TO_R,	/* ksc_hangul */
+     XmSTRING_DIRECTION_L_TO_R,	/* ksc_hangul_gr */
++    XmSTRING_DIRECTION_L_TO_R,	/* utf-8 */
+ };
+ externaldef(uil_sym_glbl) unsigned char *charset_writing_direction_table =
+ 		charset_wrdirection_table_vec;
+@@ -100,6 +102,7 @@
+     XmSTRING_DIRECTION_L_TO_R,	/* jis_katakana */
+     XmSTRING_DIRECTION_L_TO_R,	/* ksc_hangul */
+     XmSTRING_DIRECTION_L_TO_R,	/* ksc_hangul_gr */
++    XmSTRING_DIRECTION_L_TO_R,	/* utf-8 */
+ };
+ externaldef(uil_sym_glbl) unsigned char *charset_parsing_direction_table =
+ 		charset_parsdirection_table_vec;
+@@ -134,6 +137,7 @@
+     sym_k_onebyte_charsize,	/* jis_katakana */
+     sym_k_twobyte_charsize,	/* ksc_hangul */
+     sym_k_twobyte_charsize,	/* ksc_hangul_gr */
++    sym_k_onebyte_charsize,	/* utf-8 */
+ };
+ externaldef(uil_sym_glbl) unsigned char *charset_character_size_table =
+ 		charset_charsize_table_vec;
+@@ -215,6 +219,7 @@
+     "KSC_HANGUL_GL",	/* ksc_hangul */
+     "KSC_HANGUL_GR",	/* ksc_hangul_gr */
+     "KSC5601.1987-1",	/* ksc_hangul_gr */
++    "UTF-8",		/* utf-8 */
+ };
+ externaldef(uil_sym_glbl) char **charset_lang_names_table =
+ 		charset_lang_names_table_vec;
+@@ -295,10 +300,11 @@
+     sym_k_ksc_hangul_charset,
+     sym_k_ksc_hangul_gr_charset,
+     sym_k_ksc_hangul_gr_charset,
++    sym_k_utf8_charset,
+ };
+ externaldef(uil_sym_glbl) unsigned short int *charset_lang_codes_table =
+ 		charset_lang_codes_table_vec;
+ /*
+  * The number of entries in charset_lang_..._table tables
+  */
+-externaldef(uil_sym_glbl) unsigned short int charset_lang_table_max = 72;
++externaldef(uil_sym_glbl) unsigned short int charset_lang_table_max = 73;
+--- openMotif-2.2.3/tools/wml/UilSymGen.h.utf8	2004-03-04 17:41:48.000000000 +0100
++++ openMotif-2.2.3/tools/wml/UilSymGen.h	2004-03-17 12:54:23.000000000 +0100
+@@ -1417,6 +1417,7 @@
+ #define sym_k_jis_katakana_charset	21
+ #define sym_k_ksc_hangul_charset	22
+ #define sym_k_ksc_hangul_gr_charset	23
++#define sym_k_utf8_charset	24
+ 
+ /*  Define literals for automatic children */
+ 
+--- openMotif-2.2.3/tools/wml/motif.wml.utf8	2003-10-08 23:07:47.000000000 +0200
++++ openMotif-2.2.3/tools/wml/motif.wml	2004-03-17 12:56:09.000000000 +0100
+@@ -163,6 +163,9 @@
+     ksc_hangul_gr
+                 { XmStringCharsetName = "KSC5601.1987-1";
+                   CharacterSize = TwoByte; };
++    utf8
++		{ XmStringCharsetName = "UTF-8"; };
++
+     XmFONTLIST_DEFAULT_TAG
+         { FontListElementTag = XmFONTLIST_DEFAULT_TAG; };
+