rpms/vnc/devel vnc-clipboard.patch, NONE, 1.1 vnc-getimage.patch, NONE, 1.1 vnc-manminor.patch, NONE, 1.1 vnc-xorg.patch, 1.1, 1.2 vnc.spec, 1.186, 1.187 vnc-F9mesa.patch, 1.1, NONE vnc-ppc64.patch, 1.4, NONE

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/vnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14577

Modified Files:
	vnc-xorg.patch vnc.spec 
Added Files:
	vnc-clipboard.patch vnc-getimage.patch vnc-manminor.patch 
Removed Files:
	vnc-F9mesa.patch vnc-ppc64.patch 
Log Message:
- removed obsolete vnc-ppc64.patch
- minor vncviewer manpage fixes (#427672, #427701)
- fixed overflow on heap (#430468)
- start vncconfig earlier in vncserver (#430965)
- next BuildRequires cleanup


vnc-clipboard.patch:

--- NEW FILE vnc-clipboard.patch ---
diff -up vnc-4_1_2-unixsrc/unix/vncserver.clipboard vnc-4_1_2-unixsrc/unix/vncserver
--- vnc-4_1_2-unixsrc/unix/vncserver.clipboard	2008-03-13 16:17:07.000000000 +0100
+++ vnc-4_1_2-unixsrc/unix/vncserver	2008-03-13 16:18:14.000000000 +0100
@@ -42,13 +42,13 @@ $xauthorityFile = "$ENV{XAUTHORITY}" || 
 
 $defaultXStartup
     = ("#!/bin/sh\n\n".
+       "vncconfig -iconic &\n".
        "# Uncomment the following two lines for normal desktop:\n".
        "# unset SESSION_MANAGER\n".
        "# exec /etc/X11/xinit/xinitrc\n\n".
        "[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup\n".
        "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
        "xsetroot -solid grey\n".
-       "vncconfig -iconic &\n".
        "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
        "twm &\n");
 

vnc-getimage.patch:

--- NEW FILE vnc-getimage.patch ---
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc.getimage vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc
--- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc.getimage	2008-03-13 14:53:06.000000000 +0100
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc	2008-03-13 14:53:51.000000000 +0100
@@ -746,8 +746,8 @@ void XserverDesktop::grabRegion(const rf
   std::vector<rfb::Rect>::iterator i;
   region.get_rects(&rects);
   for (i = rects.begin(); i != rects.end(); i++) {
-    for (int y = i->tl.y; y < i->br.y; y++) {
-      (*pScreen->GetImage) ((DrawablePtr)WindowTable[pScreen->myNum],
+    for (int y = i->tl.y; y < i->br.y && y <= pScreen->height; y++) {
+      (*pScreen->GetImage) (&WindowTable[pScreen->myNum]->drawable,
                             i->tl.x, y, i->width(), 1,
                             ZPixmap, (unsigned long)~0L,
                             ((char*)data

vnc-manminor.patch:

--- NEW FILE vnc-manminor.patch ---
diff -up vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.man.pedantic vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.man
--- vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.man.pedantic	2008-03-13 14:55:08.000000000 +0100
+++ vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.man	2008-03-13 14:55:58.000000000 +0100
@@ -8,6 +8,10 @@ vncviewer \- VNC viewer for X
 .br
 .B vncviewer
 .RI [ options ] 
+.RI [ host ][:: port ]
+.br
+.B vncviewer
+.RI [ options ] 
 .B \-listen
 .RI [ port ]
 .SH DESCRIPTION
@@ -182,8 +186,8 @@ prefix from the entries in "/usr/include
 .TP
 \fB\-via\fR \fIgateway\fR
 Automatically create encrypted TCP tunnel to the \fIgateway\fR machine
-before connection, connect to the \fIhost\fR through that tunnel
-(TightVNC\-specific). By default, this option invokes SSH local port
+before connection, connect to the \fIhost\fR through that tunnel. By default,
+this option invokes SSH local port
 forwarding, assuming that SSH client binary can be accessed as
 /usr/bin/ssh. Note that when using the \fB\-via\fR option, the host
 machine name should be specified as known to the gateway machine, e.g.

vnc-xorg.patch:

Index: vnc-xorg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc-xorg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vnc-xorg.patch	11 Mar 2008 12:54:57 -0000	1.1
+++ vnc-xorg.patch	13 Mar 2008 15:23:57 -0000	1.2
@@ -1,20 +1,3 @@
-diff -up xorg-x11-server-source/os/WaitFor.c.orig xorg/os/WaitFor.c
---- xorg-x11-server-source/os/WaitFor.c.orig	2008-01-28 10:20:35.000000000 +0100
-+++ xorg-x11-server-source/os/WaitFor.c	2008-01-28 10:21:08.000000000 +0100
-@@ -332,13 +332,11 @@ WaitForSomething(int *pClientsReady)
- 
- 	    if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))
- 		break;
--#ifdef WIN32
- 	    /* Windows keyboard and mouse events are added to the input queue
- 	       in Block- and WakupHandlers. There is no device to check if  
- 	       data is ready. So check here if new input is available */
- 	    if (*checkForInput[0] != *checkForInput[1])
- 		return 0;
--#endif
- 	}
-     }
- 
 diff -up xorg-x11-server-source/mi/miinitext.c.orig xorg/mi/miinitext.c
 --- xorg-x11-server-source/mi/miinitext.c.orig	2008-01-28 10:18:46.000000000 +0100
 +++ xorg-x11-server-source/mi/miinitext.c	2008-01-28 10:18:58.000000000 +0100


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- vnc.spec	11 Mar 2008 13:46:35 -0000	1.186
+++ vnc.spec	13 Mar 2008 15:23:57 -0000	1.187
@@ -3,7 +3,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   26%{?dist}
+Release:   27%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   Makefile.am
@@ -24,7 +24,6 @@
 Patch15:   vnc-viewer-reparent.patch
 Patch16:   vnc-64bit.patch
 Patch17:   vnc-select.patch
-Patch19:   vnc-ppc64.patch
 Patch21:   vnc-newfbsize.patch
 Patch23:   vnc-210617.patch
 Patch24:   vnc-102434.patch
@@ -43,6 +42,9 @@
 Patch44:   vnc-noxkb.patch
 Patch45:   vnc-paint.patch
 Patch46:   vnc-selections.patch
+Patch47:   vnc-getimage.patch
+Patch48:   vnc-manminor.patch
+Patch49:   vnc-clipboard.patch
 License:   GPLv2
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -51,10 +53,10 @@
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: autoconf,  automake, libtool, flex, bison, pkgconfig, patchutils
 BuildRequires: expat-devel, freetype-devel
-BuildRequires: libX11-devel, xorg-x11-xtrans-devel, libXau-devel
-BuildRequires: libXdmcp-devel, libxkbfile-devel, libXfont-devel
-BuildRequires: xorg-x11-proto-devel, libXext-devel, tcp_wrappers-devel
-BuildRequires: libXtst-devel, libfontenc-devel, xorg-x11-util-macros
+BuildRequires: libX11-devel, xorg-x11-xtrans-devel
+BuildRequires: libxkbfile-devel, libXfont-devel
+BuildRequires: tcp_wrappers-devel
+BuildRequires: libXtst-devel, xorg-x11-util-macros
 BuildRequires: libXt-devel, libXv-devel, pixman-devel
 BuildRequires: libselinux-devel
 BuildRequires: xorg-x11-server-source
@@ -110,7 +112,6 @@
 %patch15 -p1 -b .viewer-reparent
 %patch16 -p1 -b .64bit
 %patch17 -p1 -b .select
-%patch19 -p1 -b .ppc64
 %patch21 -p1 -b .newfbsize
 %patch23 -p1 -b .ipv6
 %patch24 -p1 -b .102434
@@ -136,6 +137,9 @@
 %patch44 -p1 -b .noxkb
 %patch45 -p1 -b .paint
 %patch46 -p1 -b .selections
+%patch47 -p1 -b .getimage
+%patch48 -p1 -b .misc
+%patch49 -p1 -b .clipboard
 
 %build
 export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0"
@@ -326,6 +330,13 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Thu Mar 13 2008 Adam Tkac <atkac redhat com> 4.1.2-27
+- removed obsolete vnc-ppc64.patch
+- minor vncviewer manpage fixes (#427672, #427701)
+- fixed overflow on heap (#430468)
+- start vncconfig earlier in vncserver (#430965)
+- next BuildRequires cleanup
+
 * Mon Mar 11 2008 Adam Tkac <atkac redhat com> 4.1.2-26
 - BuildRequires and Requires cleanup
 - don't build java viewer (problems due new gcj)


--- vnc-F9mesa.patch DELETED ---


--- vnc-ppc64.patch DELETED ---