--- a/open-src/xserver/xvnc/Makefile	Fri Apr 24 12:43:24 2009 -0700
+++ b/open-src/xserver/xvnc/Makefile	Mon Apr 27 15:44:50 2009 -0700
@@ -32,7 +32,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.17 09/01/14
+# @(#)Makefile	1.18 09/04/26
 #
 
 # Package name used in tarballs
@@ -71,6 +71,7 @@
 	vnc-autotools.patch,-p1 \
 	vnc-autotools-compile.patch,-p1 \
 	vnc-always_use_fb.patch,-p1 \
+	vnc-vsnprintf.patch,-p1 \
 	vnc-24bit.patch,-p1 \
 	vnc-gcc43.patch,-p1 \
 	vnc-privates.patch,-p1 \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xvnc/vnc-vsnprintf.patch	Mon Apr 27 15:44:50 2009 -0700
@@ -0,0 +1,26 @@
+## Patch originally from Fedora - Revision 1.1 of:
+http://cvs.fedoraproject.org/viewvc/rpms/vnc/devel/vnc-vsnprintf.patch
+
+Needed to prevent crash when Xprintf calls vsnprintf with NULL string/0 length
+to measure length of text (Sun bug 6833541).
+
+--- vnc-4_1_2-unixsrc/common/rfb/Logger.cxx.vsnprintf	2007-02-26 12:29:25.000000000 +0100
++++ vnc-4_1_2-unixsrc/common/rfb/Logger.cxx	2007-02-26 12:30:03.000000000 +0100
+@@ -34,7 +34,7 @@
+ 
+ using namespace rfb;
+ 
+-#ifndef HAVE_VSNPRINTF
++/*#ifndef HAVE_VSNPRINTF
+ #ifdef __RFB_THREADING_IMPL
+ static Mutex fpLock;
+ #endif
+@@ -63,7 +63,7 @@
+   return len;
+ }
+ #endif
+-
++*/
+ 
+ Logger* Logger::loggers = 0;
+