rpms/openmotif/FC-3 openMotif-2.2.3-CAN-2005-0605.patch, NONE, 1.1 openMotif-2.2.3-long64.patch, NONE, 1.1 openMotif-2.2.3-motifzone_1193.patch, NONE, 1.1 openMotif-2.2.3-motifzone_1202.patch, NONE, 1.1 openMotif-2.2.3-multiscreen.patch, NONE, 1.1 openMotif-2.2.3-vizcount.patch, NONE, 1.1 openmotif.spec, 1.25, 1.26

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/openmotif/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv16442

Modified Files:
	openmotif.spec 
Added Files:
	openMotif-2.2.3-CAN-2005-0605.patch 
	openMotif-2.2.3-long64.patch 
	openMotif-2.2.3-motifzone_1193.patch 
	openMotif-2.2.3-motifzone_1202.patch 
	openMotif-2.2.3-multiscreen.patch 
	openMotif-2.2.3-vizcount.patch 
Log Message:
[tw]
- fixed possible libXpm overflows (#151642)
- Upstream Fix: Multiscreen mode
- Upstream Fix: Crash when restarting by a session manager (motifzone#1193)
- Upstream Fix: Crash when duplicating a window menu containing f.circle_up
  (motifzone#1202)
- fixed divide by zero error in ComputeVizCount() (#144420)
- Xpmcreate: define LONG64 on 64 bit architectures (#143689)



openMotif-2.2.3-CAN-2005-0605.patch:
 Xpmcreate.c |    4 ++--
 Xpmscan.c   |    7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE openMotif-2.2.3-CAN-2005-0605.patch ---
--- openMotif-2.2.3/lib/Xm/Xpmscan.c.CAN-2005-0605	2005-04-04 12:53:36.603530341 +0200
+++ openMotif-2.2.3/lib/Xm/Xpmscan.c	2005-04-04 12:53:36.665521839 +0200
@@ -593,8 +593,8 @@
     char *dst;
     unsigned int *iptr;
     char *data;
-    unsigned int x, y, i;
-    int bits, depth, ibu, ibpp, offset;
+    unsigned int x, y;
+    int bits, depth, ibu, ibpp, offset, i;
     unsigned long lbt;
     Pixel pixel, px;
 
@@ -605,6 +605,9 @@
     ibpp = image->bits_per_pixel;
     offset = image->xoffset;
 
+    if (image->bitmap_unit < 0)
+        return (XpmNoMemory);
+
     if ((image->bits_per_pixel | image->depth) == 1) {
 	ibu = image->bitmap_unit;
 	for (y = 0; y < height; y++)
--- openMotif-2.2.3/lib/Xm/Xpmcreate.c.CAN-2005-0605	2005-04-04 12:53:36.595531438 +0200
+++ openMotif-2.2.3/lib/Xm/Xpmcreate.c	2005-04-04 12:53:36.668521428 +0200
@@ -1170,10 +1170,10 @@
     register char *src;
     register char *dst;
     register unsigned int *iptr;
-    register unsigned int x, y, i;
+    register unsigned int x, y;
     register char *data;
     Pixel pixel, px;
-    int nbytes, depth, ibu, ibpp;
+    int nbytes, depth, ibu, ibpp, i;
 
     data = image->data;
     iptr = pixelindex;

openMotif-2.2.3-long64.patch:
 XpmI.h |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE openMotif-2.2.3-long64.patch ---
--- openMotif-2.2.3/lib/Xm/XpmI.h.long64	2005-02-24 18:30:16.269554536 +0100
+++ openMotif-2.2.3/lib/Xm/XpmI.h	2005-02-24 18:34:27.713683807 +0100
@@ -111,6 +111,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <X11/Xmd.h>
 #include <limits.h>
 /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
 #ifdef sequent

openMotif-2.2.3-motifzone_1193.patch:
 WmXSMP.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE openMotif-2.2.3-motifzone_1193.patch ---
--- openMotif-2.2.3/clients/mwm/WmXSMP.c.1193	2005-02-28 14:58:53.168896287 +0100
+++ openMotif-2.2.3/clients/mwm/WmXSMP.c	2005-02-28 15:00:02.460388707 +0100
@@ -446,10 +446,14 @@
 static void
 freeNewRestartCmd(char **restartCmd)
 {
-    while (*restartCmd != (char *)NULL)
-	XtFree(*(restartCmd++));
+    if(restartCmd)
+    {
+        char **tmp = restartCmd;
+	while (*restartCmd != (char *)NULL)
+	    XtFree(*(restartCmd++));
 
-    XtFree((char *)restartCmd);
+	XtFree((char *)restartCmd);
+    }
 }
 
 #endif /* ! WSM */

openMotif-2.2.3-motifzone_1202.patch:
 WmMenu.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE openMotif-2.2.3-motifzone_1202.patch ---
--- openMotif-2.2.3/clients/mwm/WmMenu.c.1202	2005-02-28 14:56:45.700387149 +0100
+++ openMotif-2.2.3/clients/mwm/WmMenu.c	2005-02-28 14:57:48.819725980 +0100
@@ -532,6 +532,8 @@
 	newMenuItem->wmFunction = curMenuItem->wmFunction;
 
 	if ((curMenuItem->wmFunction == F_Send_Msg)
+	    || (curMenuItem->wmFunction == F_Circle_Up)
+	    || (curMenuItem->wmFunction == F_Circle_Down)
 #ifdef WSM
 	    || (curMenuItem->wmFunction == F_Set_Context)
 # ifdef PANELIST

openMotif-2.2.3-multiscreen.patch:
 WmInitWs.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE openMotif-2.2.3-multiscreen.patch ---
--- openMotif-2.2.3/clients/mwm/WmInitWs.c.multiscreen	2002-01-10 21:55:34.000000000 +0100
+++ openMotif-2.2.3/clients/mwm/WmInitWs.c	2005-02-28 14:55:23.579656012 +0100
@@ -1490,6 +1490,8 @@
 	    ScreenOfDisplay(DISPLAY, sNum)); 	argnum++;
     XtSetArg (args[argnum], XtNcolormap, 
 	    DefaultColormap(DISPLAY, sNum)); 	argnum++;
+    XtSetArg (args[argnum], XtNvisual,
+	      DefaultVisual(DISPLAY, sNum));	argnum++;
 
     pSD->screenTopLevelW = XtCreatePopupShell ((String) wmGD.screenNames[sNum],
 					       vendorShellWidgetClass,

openMotif-2.2.3-vizcount.patch:
 List.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE openMotif-2.2.3-vizcount.patch ---
--- openMotif-2.2.3/lib/Xm/List.c.vizcount	2002-01-10 21:56:41.000000000 +0100
+++ openMotif-2.2.3/lib/Xm/List.c	2005-01-04 11:45:38.046987886 +0100
@@ -1432,8 +1432,11 @@
 	lineheight = 1;
     }
 
-  viz = ((int)(listheight + lw->list.spacing) /
-	 (int)(lineheight + lw->list.spacing));
+  if (lineheight + lw->list.spacing != 0)
+    viz = ((int)(listheight + lw->list.spacing) /
+	   (int)(lineheight + lw->list.spacing));
+  else
+    viz = (int)(listheight + lw->list.spacing);
 
   if (!viz)
     viz++;			/* Always have at least one item visible */


Index: openmotif.spec
===================================================================
RCS file: /cvs/dist/rpms/openmotif/FC-3/openmotif.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- openmotif.spec	29 Nov 2004 14:16:52 -0000	1.25
+++ openmotif.spec	4 Apr 2005 14:47:46 -0000	1.26
@@ -3,7 +3,7 @@
 Summary: Open Motif runtime libraries and executables.
 Name: openmotif
 Version: 2.2.3
-Release: 6.FC3.2
+Release: 9.FC3.1
 License: Open Group Public License
 Group: System Environment/Libraries
 Source:  %{intern_name}-%{version}.tar.gz
@@ -32,6 +32,12 @@
 Patch33: openMotif-2.2.3-CAN-2004-0914_autofoo.patch
 Patch34: openMotif-2.2.3-tmpnam.patch
 Patch35: openmotif-2.2.3-CAN-2004-0914_sec8.patch
+Patch36: openMotif-2.2.3-vizcount.patch
+Patch37: openMotif-2.2.3-long64.patch
+Patch38: openMotif-2.2.3-multiscreen.patch
+Patch39: openMotif-2.2.3-motifzone_1193.patch
+Patch40: openMotif-2.2.3-motifzone_1202.patch
+Patch41: openMotif-2.2.3-CAN-2005-0605.patch
 
 Conflicts: lesstif <= 0.92.32-6
 
@@ -69,6 +75,12 @@
 %patch33 -p1 -b .CAN-2004-0914_autofoo
 %patch34 -p1 -b .tmpnam
 %patch35 -p1 -b .CAN-2004-0914_sec8
+%patch36 -p1 -b .vizcount
+%patch37 -p1 -b .long64
+%patch38 -p1 -b .multiscreen
+%patch39 -p1 -b .motifzone_1193
+%patch40 -p1 -b .motifzone_1202
+%patch41 -p1 -b .CAN-2005-0605
 
 
 %build
@@ -147,6 +159,15 @@
 %{prefix}/man/man5/*
 
 %changelog
+* Mon Apr  4 2005 Thomas Woerner <twoerner at redhat.com> 2.2.3-9.FC3.1
+- fixed possible libXpm overflows (#151642)
+- Upstream Fix: Multiscreen mode
+- Upstream Fix: Crash when restarting by a session manager (motifzone#1193)
+- Upstream Fix: Crash when duplicating a window menu containing f.circle_up
+  (motifzone#1202)
+- fixed divide by zero error in ComputeVizCount() (#144420)
+- Xpmcreate: define LONG64 on 64 bit architectures (#143689)
+
 * Mon Nov 29 2004 Thomas Woerner <twoerner at redhat.com> 2.2.3-6.FC3.2
 - allow to write XPM files with absolute path names again (#140815)