rpms/vnc/devel vnc-102434.patch, 1.1, 1.2 vnc-render.patch, 1.14, 1.15 vnc.spec, 1.159, 1.160
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Dec 5 14:48:53 UTC 2006
- Previous message (by thread): rpms/kernel/devel kernel-2.6.spec, 1.2848, 1.2849 linux-2.6-cell-mambo-drivers.patch, 1.6, 1.7
- Next message (by thread): rpms/gtk2-engines/devel .cvsignore, 1.25, 1.26 gtk2-engines.spec, 1.49, 1.50 sources, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: atkac
Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2410/vnc/devel
Modified Files:
vnc-102434.patch vnc-render.patch vnc.spec
Log Message:
some minority fixes
- throw away render extensions
- fixed potential buffer overflow in vnc-102434.patch
vnc-102434.patch:
CConn.cxx | 11 +++++++++++
parameters.h | 1 +
vncviewer.cxx | 1 +
vncviewer.man | 5 +++++
4 files changed, 18 insertions(+)
Index: vnc-102434.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-102434.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vnc-102434.patch 18 Oct 2006 08:54:08 -0000 1.1
+++ vnc-102434.patch 5 Dec 2006 14:48:50 -0000 1.2
@@ -1,33 +1,5 @@
---- vnc_4_1_2-unixsrc/unix/vncviewer/CConn.cxx.102434 2006-10-18 10:10:58.000000000 +0200
-+++ vnc_4_1_2-unixsrc/unix/vncviewer/CConn.cxx 2006-10-18 10:12:26.000000000 +0200
-@@ -206,6 +206,15 @@
- return;
- }
-
-+ if(passwdInput)
-+ {
-+ char s[25];
-+ fgets(s, 25, stdin);
-+ *password = strDup(s);
-+ if(user) *user = 0;
-+ return;
-+ }
-+
- const char* secType = secTypeName(getCurrentCSecurity()->getType());
- const char* titlePrefix = "VNC Authentication";
- CharArray title(strlen(titlePrefix) + strlen(secType) + 4);
---- vnc_4_1_2-unixsrc/unix/vncviewer/parameters.h.102434 2006-10-18 10:12:45.000000000 +0200
-+++ vnc_4_1_2-unixsrc/unix/vncviewer/parameters.h 2006-10-18 10:13:12.000000000 +0200
-@@ -38,6 +38,7 @@
- extern rfb::BoolParameter fullScreen;
- extern rfb::StringParameter geometry;
- extern rfb::StringParameter embedParent;
-+extern rfb::BoolParameter passwdInput;
-
- extern char aboutText[];
- extern char* programName;
---- vnc_4_1_2-unixsrc/unix/vncviewer/vncviewer.cxx.102434 2006-10-18 10:13:28.000000000 +0200
-+++ vnc_4_1_2-unixsrc/unix/vncviewer/vncviewer.cxx 2006-10-18 10:14:21.000000000 +0200
+--- vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.cxx.102434 2006-12-01 13:37:27.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.cxx 2006-12-01 13:37:27.000000000 +0100
@@ -52,6 +52,7 @@
"manager decoration around a window", 24);
StringParameter passwordFile("PasswordFile",
@@ -36,8 +8,8 @@
AliasParameter rfbauth("passwd", "Alias for PasswordFile", &passwordFile);
BoolParameter useLocalCursor("UseLocalCursor",
---- vnc_4_1_2-unixsrc/unix/vncviewer/vncviewer.man.102434 2006-10-18 10:14:37.000000000 +0200
-+++ vnc_4_1_2-unixsrc/unix/vncviewer/vncviewer.man 2006-10-18 10:17:22.000000000 +0200
+--- vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.man.102434 2006-12-01 13:37:27.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/vncviewer/vncviewer.man 2006-12-01 13:37:27.000000000 +0100
@@ -108,6 +108,11 @@
"~/.vnc/passwd".
@@ -50,3 +22,40 @@
.B \-Shared
When you make a connection to a VNC server, all other existing connections are
normally closed. This option requests that they be left open, allowing you to
+--- vnc-4_1_2-unixsrc/unix/vncviewer/parameters.h.102434 2006-12-01 13:37:27.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/vncviewer/parameters.h 2006-12-01 13:37:27.000000000 +0100
+@@ -38,6 +38,7 @@
+ extern rfb::BoolParameter fullScreen;
+ extern rfb::StringParameter geometry;
+ extern rfb::StringParameter embedParent;
++extern rfb::BoolParameter passwdInput;
+
+ extern char aboutText[];
+ extern char* programName;
+--- vnc-4_1_2-unixsrc/unix/vncviewer/CConn.cxx.102434 2006-12-01 13:37:27.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/vncviewer/CConn.cxx 2006-12-01 13:41:42.000000000 +0100
+@@ -37,6 +37,8 @@
+ #include "ServerDialog.h"
+ #include "PasswdDialog.h"
+ #include "parameters.h"
++#include <string>
++#include <iostream>
+
+ using namespace rfb;
+
+@@ -206,6 +208,15 @@
+ return;
+ }
+
++ if(passwdInput)
++ {
++ std::string s;
++ std::cin >> s;
++ *password = strdup(s.c_str());
++ if(user) *user = 0;
++ return;
++ }
++
+ const char* secType = secTypeName(getCurrentCSecurity()->getType());
+ const char* titlePrefix = "VNC Authentication";
+ CharArray title(strlen(titlePrefix) + strlen(secType) + 4);
vnc-render.patch:
Imakefile | 2 -
Xvnc/xvnc.cc | 50 +++++++++++++++++++++++++++++++++++++++++++++++-
module/Imakefile | 2 -
vncHooks.cc | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 108 insertions(+), 3 deletions(-)
Index: vnc-render.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-render.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vnc-render.patch 23 Nov 2006 15:22:25 -0000 1.14
+++ vnc-render.patch 5 Dec 2006 14:48:50 -0000 1.15
@@ -1,28 +1,36 @@
-unchanged:
---- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.render 2005-03-17 09:57:08.000000000 +0000
-+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2005-03-17 10:31:39.000000000 +0000
-@@ -135,6 +135,9 @@
+--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.render 2006-12-05 12:01:54.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2006-12-05 15:41:20.000000000 +0100
+@@ -130,6 +130,13 @@
static Bool vfbPixmapDepths[33];
static char needswap = 0;
static int lastScreen = -1;
+#ifdef RENDER
++#if (defined(__ppc64__) || defined(__powerpc64__))
+static Bool Render = TRUE;
++#else
++static Bool Render = FALSE;
++#endif
+#endif
static bool displaySpecified = false;
static bool wellKnownSocketsCreated = false;
-@@ -226,6 +229,10 @@
+@@ -221,6 +228,15 @@
VENDOR_STRING);
ErrorF("-screen scrn WxHxD set screen's width, height, depth\n");
ErrorF("-pixdepths list-of-int support given pixmap depths\n");
+#ifdef RENDER
++#if (defined(__ppc64__) || defined(__powerpc64__))
+ ErrorF("+/-render turn on/off RENDER extension support"
+ "(default on)\n");
++#else
++ ErrorF("+/-render turn on/off RENDER extension support"
++ "(default off)\n");
++#endif
+#endif
ErrorF("-linebias n adjust thin line pixelization\n");
ErrorF("-blackpixel n pixel value for black\n");
ErrorF("-whitepixel n pixel value for white\n");
-@@ -322,6 +329,20 @@
+@@ -317,6 +333,20 @@
return ret;
}
@@ -43,7 +51,7 @@
if (strcmp (argv[i], "-blackpixel") == 0) /* -blackpixel n */
{
Pixel pix;
-@@ -822,7 +843,12 @@
+@@ -817,7 +847,12 @@
if (!fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel))
return FALSE;
@@ -57,7 +65,7 @@
switch (pvfb->bitsPerPixel)
{
case 1:
-@@ -943,6 +969,19 @@
+@@ -938,6 +973,19 @@
vfbPixmapDepths[vfbScreens[i].depth] = TRUE;
}
@@ -77,21 +85,8 @@
for (i = 1; i <= 32; i++)
{
if (vfbPixmapDepths[i])
-unchanged:
---- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile.render 2005-03-17 09:57:09.000000000 +0000
-+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile 2005-03-17 09:57:09.000000000 +0000
-@@ -13,7 +13,7 @@
- OBJS = vncExtInit.o vncHooks.o xf86vncModule.o XserverDesktop.o
- INCLUDES = -I.. -I../../include -I$(EXTINCSRC) -I$(XINCLUDESRC) \
- -I$(FONTINCSRC) -I$(XF86COMSRC) \
-- $(VNCINCLUDE)
-+ -I../../render $(VNCINCLUDE)
- DEFINES = $(STD_DEFINES) -DGC_HAS_COMPOSITE_CLIP -DXFree86LOADER
-
- LinkSourceFile(vncExtInit.cc,..)
-unchanged:
---- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile.render 2005-03-17 09:57:09.000000000 +0000
-+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile 2005-03-17 09:57:09.000000000 +0000
+--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile.render 2006-12-05 12:01:54.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile 2006-12-05 12:01:54.000000000 +0100
@@ -19,7 +19,7 @@
SRCS = vncExtInit.cc vncHooks.cc XserverDesktop.cc
OBJS = vncExtInit.o vncHooks.o XserverDesktop.o
@@ -101,9 +96,19 @@
#if defined(XFree86Version) && XFree86Version >= 4000
VNCDEFINES = -DGC_HAS_COMPOSITE_CLIP
#endif
-diff -u vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc
---- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc 2005-03-17 09:57:09.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc 2005-03-31 12:43:05.000000000 +0100
+--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile.render 2006-12-05 12:01:54.000000000 +0100
++++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile 2006-12-05 12:01:54.000000000 +0100
+@@ -13,7 +13,7 @@
+ OBJS = vncExtInit.o vncHooks.o xf86vncModule.o XserverDesktop.o
+ INCLUDES = -I.. -I../../include -I$(EXTINCSRC) -I$(XINCLUDESRC) \
+ -I$(FONTINCSRC) -I$(XF86COMSRC) \
+- $(VNCINCLUDE)
++ -I../../render $(VNCINCLUDE)
+ DEFINES = $(STD_DEFINES) -DGC_HAS_COMPOSITE_CLIP -DXFree86LOADER
+
+ LinkSourceFile(vncExtInit.cc,..)
+--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc.render 2006-05-15 18:56:20.000000000 +0200
++++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc 2006-12-05 12:01:54.000000000 +0100
@@ -29,6 +29,9 @@
#include "regionstr.h"
#include "dixfontstr.h"
Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- vnc.spec 4 Dec 2006 14:32:00 -0000 1.159
+++ vnc.spec 5 Dec 2006 14:48:50 -0000 1.160
@@ -5,7 +5,7 @@
Summary: A remote display system.
Name: vnc
Version: 4.1.2
-Release: 7.1%{?dist}
+Release: 7.2%{?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
@@ -293,6 +293,11 @@
%{_libdir}/xorg/modules/extensions/libvnc.so
%changelog
+* Tue Dec 05 2006 Adam Tkac <atkac redhat com> 4.1.2-7.2.fc7
+- fixed vnc-102434.patch - potential buffer overflow error
+- only ppc64 architecture has enabled render extensions
+ default (conflict between glx&render)
+
* Mon Dec 4 2006 Thomas Woerner <twoerner at redhat.com> 4.1.2-7.1.fc7
- tcp_wrappers has a new devel and libs sub package, therefore changing build
requirement for tcp_wrappers to tcp_wrappers-devel
- Previous message (by thread): rpms/kernel/devel kernel-2.6.spec, 1.2848, 1.2849 linux-2.6-cell-mambo-drivers.patch, 1.6, 1.7
- Next message (by thread): rpms/gtk2-engines/devel .cvsignore, 1.25, 1.26 gtk2-engines.spec, 1.49, 1.50 sources, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list