rpms/vnc/F-8 vnc-bounds.patch, NONE, 1.1 vnc-manminor.patch, NONE, 1.1 vnc.spec, 1.182, 1.183

Adam Tkac (atkac) fedora-extras-commits at redhat.com
Wed Mar 19 11:44:45 UTC 2008


Author: atkac

Update of /cvs/pkgs/rpms/vnc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4245

Modified Files:
	vnc.spec 
Added Files:
	vnc-bounds.patch vnc-manminor.patch 
Log Message:
- minor vncviewer manpage fixes (#427672, #427701)
- validate framebuffer bounds before GetImage call (#430468)


vnc-bounds.patch:

--- NEW FILE vnc-bounds.patch ---
diff -up vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc.bounds 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.bounds	2008-03-17 16:46:27.000000000 +0100
+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/XserverDesktop.cc	2008-03-17 16:59:11.000000000 +0100
@@ -486,32 +486,36 @@ void XserverDesktop::add_changed(RegionP
 {
   if (ignoreHooks_) return;
   if (grabbing) return;
+
+  BoxRec screenbox;
+  RegionPtr newreg = REGION_CREATE(pScreen, 0, 0);
+
+  screenbox.x1 = screenbox.y1 = 0;
+  screenbox.x2 = pScreen->width;
+  screenbox.y2 = pScreen->height;
+
+  RegionPtr screenreg = REGION_CREATE(pScreen, &screenbox, 0);
+  REGION_INTERSECT(pScreen, newreg, reg, screenreg);
+  REGION_DESTROY (pScreen, screenreg);
+
   try {
     rfb::Region rfbReg;
-    rfbReg.setExtentsAndOrderedRects((ShortRect*)REGION_EXTENTS(pScreen, reg),
-                                     REGION_NUM_RECTS(reg),
-                                     (ShortRect*)REGION_RECTS(reg));
+    rfbReg.setExtentsAndOrderedRects((ShortRect*)REGION_EXTENTS(pScreen, newreg),
+                                     REGION_NUM_RECTS(newreg),
+                                     (ShortRect*)REGION_RECTS(newreg));
     server->add_changed(rfbReg);
     deferUpdate();
   } catch (rdr::Exception& e) {
     vlog.error("XserverDesktop::add_changed: %s",e.str());
   }
+  REGION_DESTROY (pScreen, newreg);
 }
 
 void XserverDesktop::add_copied(RegionPtr dst, int dx, int dy)
 {
-  if (ignoreHooks_) return;
-  if (grabbing) return;
-  try {
-    rfb::Region rfbReg;
-    rfbReg.setExtentsAndOrderedRects((ShortRect*)REGION_EXTENTS(pScreen, dst),
-                                     REGION_NUM_RECTS(dst),
-                                     (ShortRect*)REGION_RECTS(dst));
-    server->add_copied(rfbReg, rfb::Point(dx, dy));
-    deferUpdate();
-  } catch (rdr::Exception& e) {
-    vlog.error("XserverDesktop::add_copied: %s",e.str());
-  }
+  add_changed (dst);
+  REGION_TRANSLATE (pScreen, dst, -dx, -dy);
+  add_changed (dst);
 }
 
 void XserverDesktop::positionCursor()

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.


Index: vnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vnc/F-8/vnc.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- vnc.spec	20 Dec 2007 15:17:47 -0000	1.182
+++ vnc.spec	19 Mar 2008 11:44:10 -0000	1.183
@@ -4,7 +4,7 @@
 Summary:   A remote display system
 Name:      vnc
 Version:   4.1.2
-Release:   23.1%{?dist}
+Release:   24%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -37,6 +37,8 @@
 Patch34:   vnc-vsnprintf.patch
 Patch36:   vnc-24bit.patch
 Patch37:   vnc-noxorg.patch
+Patch38:   vnc-getimage.patch
+Patch39:   vnc-manminor.patch
 License:   GPLv2
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -124,6 +126,9 @@
 sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
 	unix/xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h
 
+%patch38 -p1 -b .getimage
+%patch39 -p1 -b .minor
+
 %build
 cd common
 autoreconf --install --force
@@ -152,7 +157,7 @@
 	--enable-xcsecurity \
 	--with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
 	--with-fontdir=%{_datadir}/X11/fonts \
-        --with-os-name="Fedora Core 8" \
+        --with-os-name="Fedora 8" \
         --with-os-vendor="Red Hat, Inc." \
         --with-xkb-output=%{_localstatedir}/lib/xkb \
         --with-rgb-path=%{_datadir}/X11/rgb \
@@ -312,6 +317,10 @@
 %{_libdir}/librfb.so.*
 
 %changelog
+* Wed Mar 19 2008 Adam Tkac <atkac redhat com> 4.1.2-24
+- minor vncviewer manpage fixes (#427672, #427701)
+- validate framebuffer bounds before GetImage call (#430468)
+
 * Wed Dec 19 2007 Adam Tkac <atkac redhat com> 4.1.2-23.1
 - changed default fontpath to
   catalogue:/etc/X11/fontpath.d,built-ins (#390971)




More information about the fedora-extras-commits mailing list