rpms/tigervnc/F-13 tigervnc11-rh597172.patch, NONE, 1.1 tigervnc11-rh600070.patch, NONE, 1.1 tigervnc.spec, 1.35, 1.36

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15301

Modified Files:
	tigervnc.spec 
Added Files:
	tigervnc11-rh597172.patch tigervnc11-rh600070.patch 
Log Message:
- fix memory leak in Xvnc input code (#597172)
- don't crash when receive negative encoding (#600070)
- explicitly disable udev configuration support


tigervnc11-rh597172.patch:
 Input.cc |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE tigervnc11-rh597172.patch ---
diff -up tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc.rh597172 tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc
--- tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc.rh597172	2010-06-10 16:14:57.779534382 +0200
+++ tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc	2010-06-10 16:16:24.317762477 +0200
@@ -681,6 +681,8 @@ ModeSwitchFound:
 	action = down ? KeyPress : KeyRelease;
 	n = GetKeyboardEvents(eventq, keyboardDev, action, kc);
 	enqueueEvents(keyboardDev, n);
+
+        FREE_MAPS;
 	
 	/*
 	 * When faking a modifier we are putting a keycode (which can

tigervnc11-rh600070.patch:
 ConnParams.cxx |    2 +-
 Encoder.cxx    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tigervnc11-rh600070.patch ---
--- tigervnc-1.0.90-20100420svn4030/common/rfb/ConnParams.cxx.rh600070	2010-06-07 17:01:56.990676103 +0200
+++ tigervnc-1.0.90-20100420svn4030/common/rfb/ConnParams.cxx	2010-06-07 17:02:21.518022631 +0200
@@ -129,7 +129,7 @@ void ConnParams::setEncodings(int nEncod
 	       encodings[i] <= pseudoEncodingQualityLevel9) {
       noJpeg = false;
       qualityLevel = encodings[i] - pseudoEncodingQualityLevel0;
-    } else if (encodings[i] <= encodingMax && Encoder::supported(encodings[i]))
+    } else if (Encoder::supported(encodings[i]))
       currentEncoding_ = encodings[i];
   }
 }
--- tigervnc-1.0.90-20100420svn4030/common/rfb/Encoder.cxx.rh600070	2010-06-07 17:00:34.249636665 +0200
+++ tigervnc-1.0.90-20100420svn4030/common/rfb/Encoder.cxx	2010-06-07 17:02:38.286209287 +0200
@@ -34,12 +34,12 @@ EncoderCreateFnType Encoder::createFns[e
 
 bool Encoder::supported(int encoding)
 {
-  return encoding <= encodingMax && createFns[encoding];
+  return encoding >= 0 && encoding <= encodingMax && createFns[encoding];
 }
 
 Encoder* Encoder::createEncoder(int encoding, SMsgWriter* writer)
 {
-  if (encoding <= encodingMax && createFns[encoding])
+  if (supported(encoding))
     return (*createFns[encoding])(writer);
   return 0;
 }


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-13/tigervnc.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- tigervnc.spec	13 May 2010 10:24:54 -0000	1.35
+++ tigervnc.spec	24 Jun 2010 09:49:31 -0000	1.36
@@ -2,7 +2,7 @@
 
 Name:		tigervnc
 Version:	1.0.90
-Release:	0.11.%{snap}%{?dist}
+Release:	0.12.%{snap}%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -43,6 +43,8 @@ Patch8:		tigervnc-viewer-reparent.patch
 Patch9:		tigervnc11-rh586406.patch
 Patch10:	tigervnc11-ldnow.patch
 Patch11:	tigervnc11-libvnc.patch
+Patch12:	tigervnc11-rh600070.patch
+Patch13:	tigervnc11-rh597172.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -98,6 +100,8 @@ to access the desktop on your machine.
 %patch9 -p1 -b .rh586406
 %patch10 -p1 -b .ldnow
 %patch11 -p1 -b .libvnc
+%patch12 -p1 -b .rh600070
+%patch13 -p1 -b .rh597172
 
 cp -r /usr/share/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
@@ -136,6 +140,7 @@ autoreconf -fiv
 	--enable-glx \
 	--disable-config-dbus \
 	--disable-config-hal \
+	--disable-config-udev \
 	--with-dri-driver-path=%{_libdir}/dri
 
 make %{?_smp_mflags}
@@ -243,6 +248,11 @@ fi
 %endif
 
 %changelog
+* Thu Jun 24 2010 Adam Tkac <atkac redhat com> 1.0.90-0.12.20100420svn4030
+- fix memory leak in Xvnc input code (#597172)
+- don't crash when receive negative encoding (#600070)
+- explicitly disable udev configuration support
+
 * Thu May 13 2010 Adam Tkac <atkac redhat com> 1.0.90-0.11.20100420svn4030
 - link libvnc.so "now" to catch "undefined symbol" errors during Xorg startup
 - use always XkbConvertCase instead of XConvertCase (#580159, #586406)