rpms/tigervnc/F-11 tigervnc10-rh497592.patch, NONE, 1.1 tigervnc10-rh499401.patch, NONE, 1.1 tigervnc.spec, 1.8, 1.9

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/tigervnc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2238

Modified Files:
	tigervnc.spec 
Added Files:
	tigervnc10-rh497592.patch tigervnc10-rh499401.patch 
Log Message:
- fix vncpasswd crash on long passwords (#499401)
- start session dbus daemon correctly (#497592)


tigervnc10-rh497592.patch:

--- NEW FILE tigervnc10-rh497592.patch ---
diff -up tigervnc-0.0.90/unix/vncserver.rh497592 tigervnc-0.0.90/unix/vncserver
--- tigervnc-0.0.90/unix/vncserver.rh497592	2009-05-18 15:49:33.000000000 +0200
+++ tigervnc-0.0.90/unix/vncserver	2009-05-18 15:50:26.000000000 +0200
@@ -57,6 +57,7 @@ $defaultXStartup
     = ("#!/bin/sh\n\n".
        "vncconfig -iconic &\n".
        "unset SESSION_MANAGER\n".
+       "unset DBUS_SESSION_BUS_ADDRESS\n".
        "OS=`uname -s`\n".
        "if [ \$OS = 'Linux' ]; then\n".
        "  case \"\$WINDOWMANAGER\" in\n".

tigervnc10-rh499401.patch:

--- NEW FILE tigervnc10-rh499401.patch ---
Index: common/rfb/Password.cxx
===================================================================
--- common/rfb/Password.cxx	(revision 3810)
+++ common/rfb/Password.cxx	(revision 3812)
@@ -38,6 +38,9 @@
 PlainPasswd::PlainPasswd(char* pwd) : CharArray(pwd) {
 }
 
+PlainPasswd::PlainPasswd(int len) : CharArray(len) {
+}
+
 PlainPasswd::PlainPasswd(const ObfuscatedPasswd& obfPwd) : CharArray(9) {
   if (obfPwd.length < 8)
     throw rdr::Exception("bad obfuscated password length");
Index: common/rfb/Password.h
===================================================================
--- common/rfb/Password.h	(revision 3810)
+++ common/rfb/Password.h	(revision 3812)
@@ -28,6 +28,7 @@
   public:
     PlainPasswd();
     PlainPasswd(char* pwd);
+    PlainPasswd(int len);
     PlainPasswd(const ObfuscatedPasswd& obfPwd);
     ~PlainPasswd();
     void replaceBuf(char* b);


Index: tigervnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigervnc/F-11/tigervnc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tigervnc.spec	11 May 2009 11:26:52 -0000	1.8
+++ tigervnc.spec	18 May 2009 14:01:09 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	0.0.90
-Release:	0.8.1%{?dist}
+Release:	0.9%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -39,6 +39,8 @@ Patch0:		tigervnc-102434.patch
 Patch1:		tigervnc-bounds.patch
 Patch4:		tigervnc-cookie.patch
 Patch8:		tigervnc-viewer-reparent.patch
+Patch9:		tigervnc10-rh499401.patch
+Patch10:	tigervnc10-rh497592.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -97,6 +99,8 @@ popd
 %patch1 -p1 -b .bounds
 %patch4 -p1 -b .cookie
 %patch8 -p1 -b .viewer-reparent
+%patch9 -p0 -b .rh499401
+%patch10 -p1 -b .rh497592
 
 # Use newer gettext
 sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@@ -236,6 +240,10 @@ fi
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Mon May 18 2009 Adam Tkac <atkac redhat com> 0.0.90-9
+- fix vncpasswd crash on long passwords (#499401)
+- start session dbus daemon correctly (#497592)
+
 * Mon May 11 2009 Adam Tkac <atkac redhat com> 0.0.90-0.8.1
 - remove merged tigervnc-manminor.patch