rpms/tigervnc
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix vncpasswd crash on long passwords (#499401)

Browse Source 
- start session dbus daemon correctly (#497592)
This commit is contained in:
Adam Tkac 2009-05-18 14:03:36 +00:00
parent 8341d7307a
commit 7da8bd2d49
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tigervnc.spec
View File

@ -1,6 +1,6 @@
Name: tigervnc Name: tigervnc
Version: 0.0.90 Version: 0.0.90
Release: 0.8.1%{?dist} Release: 0.9%{?dist}
Summary: A TigerVNC remote display system Summary: A TigerVNC remote display system
Group: User Interface/Desktops Group: User Interface/Desktops
@ -39,6 +39,8 @@ Patch0: tigervnc-102434.patch
Patch1: tigervnc-bounds.patch Patch1: tigervnc-bounds.patch
Patch4: tigervnc-cookie.patch Patch4: tigervnc-cookie.patch
Patch8: tigervnc-viewer-reparent.patch Patch8: tigervnc-viewer-reparent.patch
Patch9: tigervnc10-rh499401.patch
Patch10: tigervnc10-rh497592.patch
%description %description
Virtual Network Computing (VNC) is a remote display system which Virtual Network Computing (VNC) is a remote display system which
@ -97,6 +99,8 @@ popd
%patch1 -p1 -b .bounds %patch1 -p1 -b .bounds
%patch4 -p1 -b .cookie %patch4 -p1 -b .cookie
%patch8 -p1 -b .viewer-reparent %patch8 -p1 -b .viewer-reparent
%patch9 -p0 -b .rh499401
%patch10 -p1 -b .rh497592
# Use newer gettext # Use newer gettext
sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \ sed -i 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_VERSION([0.17])/' \
@ -236,6 +240,10 @@ fi
%{_libdir}/xorg/modules/extensions/libvnc.so %{_libdir}/xorg/modules/extensions/libvnc.so
%changelog %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 * Mon May 11 2009 Adam Tkac <atkac redhat com> 0.0.90-0.8.1
- remove merged tigervnc-manminor.patch - remove merged tigervnc-manminor.patch

11
tigervnc10-rh497592.patch Normal file
View File

@ -0,0 +1,11 @@
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".

26
tigervnc10-rh499401.patch Normal file
View File

@ -0,0 +1,26 @@
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);